ai-zero-token 2.0.1 → 2.0.2

package/dist/core/store/github-image-bed-store.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+import fs from "node:fs/promises";
+import path from "node:path";
+import { ensureStateMigrated, getStateDir } from "./state-paths.js";
+function createEmptyStore() {
+  return {
+    version: 1,
+    github: {
+      token: ""
+    }
+  };
+}
+async function loadGithubImageBedStore() {
+  try {
+    await ensureStateMigrated();
+    const raw = await fs.readFile(getGithubImageBedStorePath(), "utf8");
+    const parsed = JSON.parse(raw);
+    return {
+      version: 1,
+      github: {
+        token: typeof parsed.github?.token === "string" ? parsed.github.token.trim() : ""
+      }
+    };
+  } catch {
+    return createEmptyStore();
+  }
+}
+async function saveGithubImageBedStore(store) {
+  await ensureStateMigrated();
+  await fs.mkdir(getStateDir(), { recursive: true });
+  await fs.writeFile(getGithubImageBedStorePath(), `${JSON.stringify(store, null, 2)}
+`, "utf8");
+}
+async function updateGithubImageBedToken(token) {
+  const store = await loadGithubImageBedStore();
+  store.github.token = token.trim();
+  await saveGithubImageBedStore(store);
+  return store;
+}
+async function clearGithubImageBedStore() {
+  await saveGithubImageBedStore(createEmptyStore());
+}
+function getGithubImageBedStorePath() {
+  return path.join(getStateDir(), "github-image-bed.json");
+}
+export {
+  clearGithubImageBedStore,
+  getGithubImageBedStorePath,
+  loadGithubImageBedStore,
+  saveGithubImageBedStore,
+  updateGithubImageBedToken
+};

package/dist/desktop/main.js

@@ -1,13 +1,18 @@
 #!/usr/bin/env node
 import { app as electronApp, BrowserWindow, dialog, shell } from "electron";
+import { readFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { startServer } from "../server/index.js";
 let gatewayServer = null;
 let mainWindow = null;
 let isQuitting = false;
+let isRestarting = false;
+let currentGatewayUrl = null;
+let currentAdminUrl = null;
 const desktopDir = path.dirname(fileURLToPath(import.meta.url));
 const appIconPath = path.resolve(desktopDir, "../../build/icon.png");
+const startupPageUrl = buildStartupPageUrl("\u6B63\u5728\u542F\u52A8\u672C\u5730\u7F51\u5173");
 electronApp.setName("AI Zero Token");
 function createBrowserUrl(host, port) {
   if (host === "0.0.0.0" || host === "::") {
@@ -28,11 +33,143 @@ function resolveAdminUrl(gatewayUrl) {
   const devUrl = process.env.AZT_ADMIN_UI_DEV_URL?.trim();
   return devUrl || gatewayUrl;
 }
+function resolvePreferredGatewayParams() {
+  const devUrl = process.env.AZT_DEV_GATEWAY_URL?.trim();
+  if (!devUrl) {
+    return void 0;
+  }
+  try {
+    const parsed = new URL(devUrl);
+    const host = parsed.hostname || void 0;
+    const port = Number.parseInt(parsed.port, 10);
+    return {
+      host,
+      port: Number.isFinite(port) ? port : void 0
+    };
+  } catch {
+    return void 0;
+  }
+}
+function isAllowedAppUrl(targetUrl) {
+  return Boolean(currentAdminUrl && isGatewayUrl(targetUrl, currentAdminUrl) || currentGatewayUrl && isGatewayUrl(targetUrl, currentGatewayUrl));
+}
+async function restartGateway() {
+  if (isRestarting) {
+    return;
+  }
+  isRestarting = true;
+  try {
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      await mainWindow.loadURL(buildStartupPageUrl("\u6B63\u5728\u91CD\u542F\u672C\u5730\u7F51\u5173"));
+    }
+    await closeGatewayServer().catch((error) => {
+      console.error("[desktop:gateway:restart-close]", error);
+    });
+    const server = await ensureGatewayServer();
+    const gatewayUrl = createBrowserUrl(server.host, server.port);
+    const adminUrl = resolveAdminUrl(gatewayUrl);
+    currentGatewayUrl = gatewayUrl;
+    currentAdminUrl = adminUrl;
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      await mainWindow.loadURL(adminUrl);
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error("[desktop:gateway:restart]", error);
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      await mainWindow.loadURL(buildStartupPageUrl(`\u7F51\u5173\u91CD\u542F\u5931\u8D25\uFF1A${message}`)).catch(() => void 0);
+    }
+    dialog.showErrorBox("AI Zero Token \u7F51\u5173\u91CD\u542F\u5931\u8D25", message);
+  } finally {
+    isRestarting = false;
+  }
+}
+function buildStartupPageUrl(subtitle) {
+  const iconUrl = `data:image/png;base64,${readFileSync(appIconPath).toString("base64")}`;
+  const html = `<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <style>
+      :root { color-scheme: dark; }
+      html, body {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        background: #050816;
+        color: #f8fafc;
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      }
+      body {
+        display: grid;
+        place-items: center;
+      }
+      .wrap {
+        display: grid;
+        gap: 18px;
+        justify-items: center;
+      }
+      .mark {
+        width: 96px;
+        height: 96px;
+        border-radius: 24px;
+        box-shadow: 0 18px 60px rgba(0, 0, 0, 0.35);
+      }
+      .title {
+        font-size: 22px;
+        font-weight: 700;
+        letter-spacing: 0;
+      }
+      .sub {
+        font-size: 14px;
+        color: rgba(248, 250, 252, 0.66);
+      }
+      .bar {
+        width: 220px;
+        height: 4px;
+        border-radius: 999px;
+        background: rgba(255,255,255,0.08);
+        overflow: hidden;
+      }
+      .bar::after {
+        content: "";
+        display: block;
+        width: 45%;
+        height: 100%;
+        border-radius: inherit;
+        background: linear-gradient(90deg, #93c5fd 0%, #66f0c0 55%, #f97316 100%);
+        animation: load 1.2s ease-in-out infinite;
+      }
+      @keyframes load {
+        0% { transform: translateX(-30%); }
+        50% { transform: translateX(80%); }
+        100% { transform: translateX(-30%); }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="wrap">
+      <img class="mark" src="${iconUrl}" alt="" />
+      <div class="title">AI Zero Token</div>
+      <div class="sub">${escapeHtml(subtitle)}</div>
+      <div class="bar" aria-hidden="true"></div>
+    </div>
+  </body>
+</html>`;
+  return `data:text/html;charset=utf-8,${encodeURIComponent(html)}`;
+}
+function escapeHtml(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+}
 async function ensureGatewayServer() {
   if (gatewayServer) {
     return gatewayServer;
   }
-  gatewayServer = await startServer();
+  gatewayServer = await startServer({
+    ...resolvePreferredGatewayParams(),
+    onRestart: restartGateway
+  });
   const adminUrl = createBrowserUrl(gatewayServer.host, gatewayServer.port);
   console.log("AI Zero Token desktop gateway started.");
   console.log(`admin: ${adminUrl}`);
@@ -41,9 +178,6 @@ async function ensureGatewayServer() {
   return gatewayServer;
 }
 async function createMainWindow() {
-  const server = await ensureGatewayServer();
-  const gatewayUrl = createBrowserUrl(server.host, server.port);
-  const adminUrl = resolveAdminUrl(gatewayUrl);
   mainWindow = new BrowserWindow({
     width: 1440,
     height: 960,
@@ -51,7 +185,8 @@ async function createMainWindow() {
     minHeight: 720,
     title: "AI Zero Token",
     icon: appIconPath,
-    backgroundColor: "#f8fafc",
+    backgroundColor: "#050816",
+    show: false,
     webPreferences: {
       contextIsolation: true,
       nodeIntegration: false,
@@ -63,7 +198,7 @@ async function createMainWindow() {
     return { action: "deny" };
   });
   mainWindow.webContents.on("will-navigate", (event, url) => {
-    if (isGatewayUrl(url, adminUrl) || isGatewayUrl(url, gatewayUrl)) {
+    if (isAllowedAppUrl(url)) {
       return;
     }
     event.preventDefault();
@@ -72,6 +207,23 @@ async function createMainWindow() {
   mainWindow.on("closed", () => {
     mainWindow = null;
   });
+  mainWindow.once("ready-to-show", () => {
+    if (mainWindow) {
+      mainWindow.show();
+    }
+  });
+  await mainWindow.loadURL(startupPageUrl);
+  if (mainWindow && !mainWindow.isVisible()) {
+    mainWindow.show();
+  }
+  const server = await ensureGatewayServer();
+  if (!mainWindow) {
+    return;
+  }
+  const gatewayUrl = createBrowserUrl(server.host, server.port);
+  const adminUrl = resolveAdminUrl(gatewayUrl);
+  currentGatewayUrl = gatewayUrl;
+  currentAdminUrl = adminUrl;
   await mainWindow.loadURL(adminUrl);
 }
 function focusMainWindow() {

package/dist/server/app.js

@@ -8,7 +8,6 @@ import cors from "@fastify/cors";
 import { z } from "zod";
 import { createGatewayContext } from "../core/context.js";
 import { requestText } from "../core/providers/http-client.js";
-import { renderAdminPage } from "./admin-page.js";
 const packageRoot = path.dirname(fileURLToPath(new URL("../../package.json", import.meta.url)));
 const adminUiDistDir = path.join(packageRoot, "admin-ui", "dist");
 const adminUiIndexPath = path.join(adminUiDistDir, "index.html");
@@ -26,14 +25,6 @@ const assetContentTypes = {
   ".svg": "image/svg+xml",
   ".webp": "image/webp"
 };
-async function pathExists(targetPath) {
-  try {
-    await fs.access(targetPath);
-    return true;
-  } catch {
-    return false;
-  }
-}
 function getContentType(filePath) {
   return assetContentTypes[path.extname(filePath).toLowerCase()] ?? "application/octet-stream";
 }
@@ -123,6 +114,9 @@ const settingsUpdateSchema = z.object({
   }).optional(),
   autoSwitch: z.object({
     enabled: z.boolean()
+  }).optional(),
+  server: z.object({
+    port: z.number().int().min(1).max(65535)
   }).optional()
 });
 const proxyTestSchema = z.object({
@@ -146,6 +140,19 @@ const profileExportSchema = z.object({
 const codexApplySchema = z.object({
   profileId: z.string().min(1)
 });
+const githubImageBedConfigSchema = z.object({
+  token: z.string().min(1)
+});
+const githubImageBedUploadSchema = z.object({
+  filename: z.string().min(1),
+  dataUrl: z.string().min(1)
+});
+const githubImageBedHistoryQuerySchema = z.object({
+  limit: z.coerce.number().int().min(1).max(100).optional()
+});
+const githubImageBedHistoryParamsSchema = z.object({
+  id: z.string().min(1)
+});
 const imageGenerationsBodySchema = z.object({
   prompt: z.string().min(1),
   model: z.string().optional(),
@@ -486,7 +493,7 @@ function createApp(params) {
   const ctx = createGatewayContext();
   void app.register(cors, {
     origin: params?.corsOrigin ?? true,
-    methods: ["GET", "POST", "PUT", "OPTIONS"]
+    methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"]
   });
   app.setErrorHandler((error, request, reply) => {
     const normalized = normalizeError(error);
@@ -529,6 +536,7 @@ function createApp(params) {
       codex: codexStatus,
       adminUrl: `${origin}/`,
       baseUrl: `${origin}/v1`,
+      restartSupported: Boolean(params?.onRestart),
       supportedEndpoints: [
         {
           method: "GET",
@@ -559,12 +567,18 @@ function createApp(params) {
     };
   }
   app.get("/", async (_request, reply) => {
-    if (await pathExists(adminUiIndexPath)) {
+    try {
       reply.header("Content-Type", "text/html; charset=utf-8");
       return fs.readFile(adminUiIndexPath, "utf8");
+    } catch {
+      reply.code(503);
+      return {
+        error: {
+          type: "admin_ui_missing",
+          message: "React \u7BA1\u7406\u9875\u672A\u6784\u5EFA\uFF0C\u8BF7\u5148\u8FD0\u884C npm run build:ui\u3002"
+        }
+      };
     }
-    reply.header("Content-Type", "text/html; charset=utf-8");
-    return renderAdminPage();
   });
   app.get("/assets/*", async (request, reply) => {
     const assetPath = request.params["*"];
@@ -753,8 +767,31 @@ function createApp(params) {
     if (parsed.data.autoSwitch) {
       await ctx.configService.setAutoSwitch(parsed.data.autoSwitch);
     }
+    if (parsed.data.server) {
+      await ctx.configService.setServerConfig({ port: parsed.data.server.port });
+    }
     return buildAdminConfig(request);
   });
+  app.post("/_gateway/admin/restart", async (_request, reply) => {
+    if (!params?.onRestart) {
+      reply.code(501);
+      return {
+        error: {
+          type: "not_supported",
+          message: "\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u91CD\u542F\u3002"
+        }
+      };
+    }
+    setTimeout(() => {
+      void Promise.resolve(params.onRestart?.()).catch((error) => {
+        console.error("[gateway:restart]", error);
+      });
+    }, 100);
+    return {
+      ok: true,
+      restarting: true
+    };
+  });
   app.post("/_gateway/admin/settings/proxy-test", async (request, reply) => {
     const parsed = proxyTestSchema.safeParse(request.body);
     if (!parsed.success) {
@@ -809,6 +846,64 @@ function createApp(params) {
     const settings = await ctx.configService.getSettings();
     return ctx.networkDetectService.collectReport(settings.networkProxy);
   });
+  app.get("/_gateway/image-bed/config", async () => ctx.githubImageBedService.getConfig());
+  app.post("/_gateway/image-bed/validate", async () => ctx.githubImageBedService.testConnection());
+  app.get("/_gateway/image-bed/history", async (request, reply) => {
+    const parsed = githubImageBedHistoryQuerySchema.safeParse(request.query ?? {});
+    if (!parsed.success) {
+      reply.code(400);
+      return {
+        error: {
+          type: "validation_error",
+          message: parsed.error.issues[0]?.message ?? "\u8BF7\u6C42\u53C2\u6570\u683C\u5F0F\u9519\u8BEF"
+        }
+      };
+    }
+    return ctx.githubImageBedService.listHistory(parsed.data.limit ?? 50);
+  });
+  app.put("/_gateway/image-bed/config", async (request, reply) => {
+    const parsed = githubImageBedConfigSchema.safeParse(request.body);
+    if (!parsed.success) {
+      reply.code(400);
+      return {
+        error: {
+          type: "validation_error",
+          message: parsed.error.issues[0]?.message ?? "\u8BF7\u6C42\u4F53\u683C\u5F0F\u9519\u8BEF"
+        }
+      };
+    }
+    return ctx.githubImageBedService.saveToken(parsed.data.token);
+  });
+  app.delete("/_gateway/image-bed/config", async () => ctx.githubImageBedService.clearToken());
+  app.post("/_gateway/image-bed/upload", async (request, reply) => {
+    const parsed = githubImageBedUploadSchema.safeParse(request.body);
+    if (!parsed.success) {
+      reply.code(400);
+      return {
+        error: {
+          type: "validation_error",
+          message: parsed.error.issues[0]?.message ?? "\u8BF7\u6C42\u4F53\u683C\u5F0F\u9519\u8BEF"
+        }
+      };
+    }
+    const uploaded = await ctx.githubImageBedService.uploadImage(parsed.data);
+    await ctx.githubImageBedService.rememberUpload(uploaded);
+    return uploaded;
+  });
+  app.delete("/_gateway/image-bed/history/:id", async (request, reply) => {
+    const parsed = githubImageBedHistoryParamsSchema.safeParse(request.params);
+    if (!parsed.success) {
+      reply.code(400);
+      return {
+        error: {
+          type: "validation_error",
+          message: parsed.error.issues[0]?.message ?? "\u8BF7\u6C42\u53C2\u6570\u683C\u5F0F\u9519\u8BEF"
+        }
+      };
+    }
+    return ctx.githubImageBedService.deleteHistoryItem(parsed.data.id);
+  });
+  app.delete("/_gateway/image-bed/history", async () => ctx.githubImageBedService.clearHistory());
   app.get("/v1/models", async () => ({
     object: "list",
     data: (await ctx.modelService.listModels()).map((model) => ({

package/dist/server/index.js

@@ -21,27 +21,53 @@ function resolveBodyLimitBytes() {
   }
   return Math.floor(value * 1024 * 1024);
 }
+function isPortInUseError(error) {
+  const normalized = error;
+  if (normalized.code === "EADDRINUSE") {
+    return true;
+  }
+  return typeof normalized.message === "string" && normalized.message.includes("EADDRINUSE");
+}
 async function startServer(params) {
   const bodyLimit = resolveBodyLimitBytes();
-  const app = createApp({
-    corsOrigin: resolveCorsOrigin(),
-    bodyLimit
-  });
   const configService = new ConfigService();
   const defaults = await configService.getServerConfig();
   const host = params?.host ?? defaults.host;
   const port = params?.port ?? defaults.port;
-  await app.listen({
-    host,
-    port
-  });
-  return {
-    app,
-    host,
-    port,
-    corsOrigin: process.env.AZT_CORS_ORIGIN?.trim() || "*",
-    bodyLimit
-  };
+  const maxPortAttempts = 20;
+  let lastError;
+  for (let offset = 0; offset <= maxPortAttempts; offset += 1) {
+    const listenPort = port + offset;
+    const app = createApp({
+      corsOrigin: resolveCorsOrigin(),
+      bodyLimit,
+      onRestart: params?.onRestart
+    });
+    try {
+      await app.listen({
+        host,
+        port: listenPort
+      });
+      if (offset > 0) {
+        console.warn(`[server] port ${port} was busy, using ${listenPort} instead.`);
+        await configService.setServerConfig({ port: listenPort });
+      }
+      return {
+        app,
+        host,
+        port: listenPort,
+        corsOrigin: process.env.AZT_CORS_ORIGIN?.trim() || "*",
+        bodyLimit
+      };
+    } catch (error) {
+      await app.close().catch(() => void 0);
+      if (!isPortInUseError(error) || offset === maxPortAttempts) {
+        throw error;
+      }
+      lastError = error;
+    }
+  }
+  throw lastError ?? new Error("\u65E0\u6CD5\u542F\u52A8\u672C\u5730\u670D\u52A1\u3002");
 }
 export {
   startServer

package/docs/PRODUCT_UPDATE_DESKTOP_TOOLBOX.md

@@ -38,7 +38,7 @@
 
 ### 2.2 第二阶段：桌面端 React 管理台
 
-当前管理页是服务端字符串 HTML，适合验证功能，但不适合长期维护桌面端和工具箱。
+管理页已迁移为 React/Vite 应用，网关生产环境只托管 `admin-ui/dist` 静态构建产物。
 
 第二阶段将管理界面迁移为 React/Vite 应用，但迁移范围只限 UI 层。
 
@@ -49,7 +49,7 @@
 - 封装 `/_gateway/*` 管理接口客户端
 - 网关生产环境托管前端静态构建产物
 - 桌面端加载同一套管理台 UI
-- 移除或降级当前 `admin-page.ts` 的职责
+- 删除服务端内嵌管理页，保留一套 React 管理台
 
 这一阶段结束后，项目形态应变为：
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-zero-token",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Local-first OpenAI-compatible AI CLI and gateway with Codex OAuth, multi-account management, and gpt-image-2 image generation/editing.",
   "license": "MIT",
   "author": "AI Zero Token Contributors",
@@ -50,7 +50,9 @@
     "desktop:dev": "node scripts/dev.mjs desktop",
     "dist": "npm run build && electron-builder",
     "dist:dir": "npm run build && electron-builder --dir",
-    "dist:mac": "npm run build && electron-builder --mac",
+    "dist:mac": "npm run build && electron-builder --mac --universal",
+    "dist:mac:arm64": "npm run build && electron-builder --mac --arm64",
+    "dist:mac:x64": "npm run build && electron-builder --mac --x64",
     "dist:win": "npm run build && electron-builder --win",
     "typecheck": "npm run typecheck:server && npm run typecheck:ui",
     "typecheck:server": "bunx tsc -p tsconfig.json --noEmit",
@@ -119,6 +121,7 @@
   "files": [
     "dist",
     "admin-ui/dist",
+    "build/icon.svg",
     "build/icon.png",
     "build/icon.icns",
     "build/icon.ico",

package/admin-ui/dist/assets/app-mark-Gd2QnHMO.svg

@@ -1,9 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect x="10" y="10" width="108" height="108" rx="26" fill="#111827"/>
-  <rect x="18" y="18" width="92" height="92" rx="20" fill="#FFFFFF" fill-opacity=".08"/>
-  <path d="M39 36h50c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12H39c-6.627 0-12-5.373-12-12V48c0-6.627 5.373-12 12-12Z" fill="#F8FAFC"/>
-  <path d="M42 54h20M42 66h34M42 78h25" stroke="#111827" stroke-width="7" stroke-linecap="round"/>
-  <path d="M83 53l8 11-8 11-8-11 8-11Z" fill="#2563EB"/>
-  <path d="M71 36c3.2-9.2 11-14 23-14 0 12-4.9 19.9-14.7 23.7" stroke="#22C55E" stroke-width="7" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M48 92c-3.2 9.2-11 14-23 14 0-12 4.9-19.9 14.7-23.7" stroke="#F59E0B" stroke-width="7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>