mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-09-01 17:10:24 +08:00
* feat: add file-based admin settings panel at /admin
Settings saved in the panel are written to data/settings.json and
overlaid onto process.env, taking precedence over environment
variables and applying immediately without restart. Enable by setting
ADMIN_PASSWORD; on serverless platforms without persistent disk the
panel degrades to read-only.
* polish: admin panel UI improvements
- Provider logos in credential rows (shared ProviderLogo component,
extracted from model-config-dialog)
- Scroll-spy active state in the sidebar nav
- Green success state in the save bar that clears after a few seconds
- Wider content column (max-w-6xl) for less wasted space on desktop
* polish: admin panel section toggles and reorder
- Move Quota & Rate Limits to the end of the settings page
- Add enable switches to Observability and Quota sections; default off
with fields grayed out, auto-on when any field is already configured
* polish: make section enable switch more visible
Wrap the switch in a labeled pill ('Enabled'/'Disabled') with border
and background so the off state is clearly visible.
* refactor: derive admin registry from PROVIDER_INFO, simplify page state
- Provider options, labels, and base-URL placeholders now come from
PROVIDER_INFO instead of hand-copied lists (fixes SiliconFlow .com/.cn
placeholder drift; panel names now match the model-config dialog)
- Replace free-text subgroup strings + SUBGROUP_PROVIDERS reverse map
with a typed provider field on SettingDef
- Precompute SETTINGS_BY_GROUP and PROVIDER_SUBGROUPS at module level
- Merge justSaved into saveMessage, drop unused mainRef, hoist
fetchSettings out of the component, dedupe savedText logic
- Serialize from SETTINGS_REGISTRY directly; json validators in a map
instead of a hardcoded key check
- Make allowPrivateUrls a function so ALLOW_PRIVATE_URLS edits in the
admin panel apply without restart
* feat: graphical model management in admin panel
Replace the provider credential fields and raw AI_MODELS_CONFIG JSON
textarea with a Models section mirroring the in-app model settings UI:
provider instance list with logos, credential fields per provider type,
model add/remove with suggestions, per-model connectivity test, and a
default-provider star.
On save the server derives everything the runtime needs into
settings.json: credential env vars (with _2 suffixes for multiple
instances of one provider), AI_MODELS_CONFIG, and AI_PROVIDER/AI_MODEL
for the default. Secrets round-trip as masked markers and are never
sent back to the browser. The general settings registry now only
covers non-provider settings (generation, access, features,
observability, quota).
* fix: allow testing unsaved providers in admin panel
The test button previously looked up credentials by providerId in the
saved settings, so testing a newly added (unsaved) provider failed with
'Unknown provider or model'. The test endpoint now accepts the client's
current provider state; newly typed secrets are used as-is and masked
markers are resolved against the stored values, so testing works both
before and after saving.
* fix: merge env AI_MODELS_CONFIG with admin panel providers
Previously, saving in the admin panel wrote a complete AI_MODELS_CONFIG
into settings.json, which (by overlay precedence) replaced any config
from .env or ai-models.json — admins lost their env-configured models.
The panel no longer writes AI_MODELS_CONFIG. Instead its providers are
merged with the env baseline at read time in loadRawServerModelsConfig,
and panel credentials go to ADMIN_-prefixed env vars wired up via
apiKeyEnv/baseUrlEnv so they never shadow standard vars. Env-based
providers now appear read-only in the panel, name clashes are rejected,
and a panel default overrides the env default. data/ is now gitignored.
* fix: block global-credential providers already managed via env
Bedrock, Vertex AI, and Ollama credentials live in fixed env vars with
no apiKeyEnv redirection, so a panel instance of one of these would
silently override the credentials that env-configured models rely on.
The API now rejects saving such a provider when the env config already
uses that type, and the Add Provider dropdown disables it with a
'managed via env' note.
* fix: address admin panel review findings
- Security: test-model no longer resolves a stored secret when the
request's baseUrl/provider differs from the stored entry, closing a
path where a tampered baseUrl could exfiltrate a saved key
- Save failures are now visible: the save bar shows the error in red
(was masked by the persistent 'Unsaved changes' text), and per-field
validation errors from the settings API are surfaced under each field
- The Observability/Quota enable switch is now real: toggling off stages
deletion of the group's saved values, and the toggle no longer snaps
back to Enabled after saving
- Env provider's default star is hidden when a panel provider is the
active default (no more double star)
- Clearing a credential field reverts to the stored value instead of
silently deleting it; an explicit X button removes a stored secret
- Form inputs are disabled during an in-flight save
* refactor(admin): split 1549-line admin page into focused modules
Extract admin-shared.ts (types + fetch helper), setting-field.tsx
(registry-driven fields), and models-section.tsx (provider/model
manager) from page.tsx. Pure mechanical move, no behavior change.
* feat(admin): share credential fields with user dialog and localize panel
Extract ProviderCredentialsFields (display name + per-provider
credential inputs) used by both the user ModelConfigDialog and the
admin Models panel; secret input passed via renderSecret (plaintext
vs masked), test button via footer slot. Add full i18n for the admin
panel across en/zh/ja/zh-Hant, reusing modelConfig.* for shared parts.
* fix(admin): address Copilot review findings
- Reflect built-in defaults for boolean settings (ALLOW_PRIVATE_URLS
defaults on) and allow clearing a saved boolean back to default,
so the SSRF toggle matches actual runtime behavior.
- Harden JSON loading: filter settings values to strings only, and
schema-validate stored ADMIN_PROVIDERS entries, dropping malformed
ones instead of letting them reach runtime code.
- Set beforeunload returnValue so the unsaved-changes prompt shows in
all browsers; reject non-finite numbers in settings validation.
- Fix README/CN/JA docs that claimed the panel auto-generates
AI_MODELS_CONFIG (providers are merged at read time, not written).
- Add unit tests for corrupted-file value filtering and provider
schema validation.
* docs: move admin panel details to dedicated docs/{en,cn,ja}/admin-panel.md
The READMEs now carry a short blurb + link, matching the existing
per-topic docs (docker.md, ai-providers.md, ...). Removes the ~22-line
inline section and the duplicated data/settings.json mentions.
* fix(admin): address follow-up Copilot findings on the prior fixes
- loadAdminProviders now validates against a stored-shape schema where
secrets are plain strings, so a hand-edited ADMIN_PROVIDERS holding an
{isSet} marker is dropped instead of later crashing maskSecret().
- loadSettings guards against array values (typeof [] === 'object'),
which would otherwise overlay numeric keys onto process.env.
- Admin SecretInput uses the bare id so the shared component's
<Label htmlFor> stays associated (only one ProviderDetail mounts).
- Add tests: marker-secret rejection, array-values guard, bedrock
multi-secret round-trip.
159 lines
5.0 KiB
TypeScript
159 lines
5.0 KiB
TypeScript
import fs from "fs"
|
|
import os from "os"
|
|
import path from "path"
|
|
import { afterEach, beforeEach, describe, expect, it } from "vitest"
|
|
import {
|
|
_resetForTests,
|
|
applyToEnv,
|
|
getEnvFallback,
|
|
getValueSource,
|
|
isSettingsWritable,
|
|
loadSettings,
|
|
saveSettings,
|
|
} from "@/lib/admin/settings"
|
|
|
|
let tmpDir: string
|
|
|
|
beforeEach(() => {
|
|
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "admin-settings-"))
|
|
process.env.SETTINGS_FILE = path.join(tmpDir, "settings.json")
|
|
_resetForTests()
|
|
})
|
|
|
|
afterEach(() => {
|
|
_resetForTests()
|
|
delete process.env.SETTINGS_FILE
|
|
fs.rmSync(tmpDir, { recursive: true, force: true })
|
|
delete process.env.TEST_ADMIN_VAR
|
|
})
|
|
|
|
describe("loadSettings", () => {
|
|
it("returns empty object when file does not exist", () => {
|
|
expect(loadSettings()).toEqual({})
|
|
})
|
|
|
|
it("reads values from the settings file", () => {
|
|
fs.writeFileSync(
|
|
process.env.SETTINGS_FILE!,
|
|
JSON.stringify({ version: 1, values: { TEST_ADMIN_VAR: "abc" } }),
|
|
)
|
|
expect(loadSettings()).toEqual({ TEST_ADMIN_VAR: "abc" })
|
|
})
|
|
|
|
it("drops non-string values from a corrupted file", () => {
|
|
fs.writeFileSync(
|
|
process.env.SETTINGS_FILE!,
|
|
JSON.stringify({
|
|
version: 1,
|
|
values: {
|
|
GOOD: "ok",
|
|
NUM: 5,
|
|
OBJ: { nested: true },
|
|
ARR: [1, 2],
|
|
NULL: null,
|
|
},
|
|
}),
|
|
)
|
|
expect(loadSettings()).toEqual({ GOOD: "ok" })
|
|
})
|
|
|
|
it("returns empty object when values is null", () => {
|
|
fs.writeFileSync(
|
|
process.env.SETTINGS_FILE!,
|
|
JSON.stringify({ version: 1, values: null }),
|
|
)
|
|
expect(loadSettings()).toEqual({})
|
|
})
|
|
|
|
it("returns empty object when values is an array (no numeric keys)", () => {
|
|
fs.writeFileSync(
|
|
process.env.SETTINGS_FILE!,
|
|
JSON.stringify({ version: 1, values: ["a", "b"] }),
|
|
)
|
|
// Without the Array.isArray guard this would yield { "0": "a", ... }
|
|
expect(loadSettings()).toEqual({})
|
|
})
|
|
})
|
|
|
|
describe("applyToEnv / saveSettings", () => {
|
|
it("overlays file values onto process.env", () => {
|
|
saveSettings({ TEST_ADMIN_VAR: "from-file" })
|
|
expect(process.env.TEST_ADMIN_VAR).toBe("from-file")
|
|
})
|
|
|
|
it("file value wins over pre-existing env value", () => {
|
|
process.env.TEST_ADMIN_VAR = "from-env"
|
|
saveSettings({ TEST_ADMIN_VAR: "from-file" })
|
|
expect(process.env.TEST_ADMIN_VAR).toBe("from-file")
|
|
})
|
|
|
|
it("deleting a key restores the original env value", () => {
|
|
process.env.TEST_ADMIN_VAR = "from-env"
|
|
saveSettings({ TEST_ADMIN_VAR: "from-file" })
|
|
saveSettings({ TEST_ADMIN_VAR: null })
|
|
expect(process.env.TEST_ADMIN_VAR).toBe("from-env")
|
|
})
|
|
|
|
it("deleting a key unsets env when there was no original value", () => {
|
|
saveSettings({ TEST_ADMIN_VAR: "from-file" })
|
|
saveSettings({ TEST_ADMIN_VAR: null })
|
|
expect(process.env.TEST_ADMIN_VAR).toBeUndefined()
|
|
})
|
|
|
|
it("persists across cache reset (file round-trip)", () => {
|
|
saveSettings({ TEST_ADMIN_VAR: "persisted" })
|
|
_resetForTests()
|
|
applyToEnv()
|
|
expect(process.env.TEST_ADMIN_VAR).toBe("persisted")
|
|
})
|
|
})
|
|
|
|
describe("getValueSource / getEnvFallback", () => {
|
|
it("reports file source when key is in settings", () => {
|
|
saveSettings({ TEST_ADMIN_VAR: "x" })
|
|
expect(getValueSource("TEST_ADMIN_VAR")).toBe("file")
|
|
})
|
|
|
|
it("reports env source when only env is set", () => {
|
|
process.env.TEST_ADMIN_VAR = "from-env"
|
|
applyToEnv()
|
|
expect(getValueSource("TEST_ADMIN_VAR")).toBe("env")
|
|
})
|
|
|
|
it("reports default when neither is set", () => {
|
|
expect(getValueSource("TEST_ADMIN_VAR")).toBe("default")
|
|
})
|
|
|
|
it("returns the shadowed env value as fallback", () => {
|
|
process.env.TEST_ADMIN_VAR = "from-env"
|
|
saveSettings({ TEST_ADMIN_VAR: "from-file" })
|
|
expect(getEnvFallback("TEST_ADMIN_VAR")).toBe("from-env")
|
|
})
|
|
})
|
|
|
|
describe("isSettingsWritable", () => {
|
|
it("returns true for a writable temp dir", () => {
|
|
expect(isSettingsWritable()).toBe(true)
|
|
})
|
|
|
|
it("returns false for an unwritable path", () => {
|
|
_resetForTests()
|
|
process.env.SETTINGS_FILE = "/nonexistent-root-dir/settings.json"
|
|
expect(isSettingsWritable()).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe("settings file on disk", () => {
|
|
it("writes valid JSON with restrictive permissions", () => {
|
|
saveSettings({ TEST_ADMIN_VAR: "secret" })
|
|
const filePath = process.env.SETTINGS_FILE!
|
|
const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"))
|
|
expect(parsed).toEqual({
|
|
version: 1,
|
|
values: { TEST_ADMIN_VAR: "secret" },
|
|
})
|
|
const mode = fs.statSync(filePath).mode & 0o777
|
|
expect(mode).toBe(0o600)
|
|
})
|
|
})
|