npm - fogact - Versions diffs - 1.2.0 → 1.2.2 - Mend

fogact 1.2.0 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/bin/web-server.js +288 -105
package/frontend/admin/admin-panel-v2.js +8 -5
package/frontend/user/assets/Dashboard-rPsmltm5.js +1 -1
package/frontend/user/assets/DashboardLayout-DDkxHYFj.js +2 -2
package/frontend/user/assets/Welcome-Dtfp6oER.js +1 -1
package/frontend/user/assets/announcement-35mOnjRL.js +1 -1
package/frontend/user/assets/index-Da98HOxL.js +3 -3
package/frontend/user/index.html +5 -5
package/lib/commands/activate.js +1 -8
package/lib/config/claude.js +1 -0
package/lib/config/codex.js +1 -1
package/lib/config/upstream.js +3 -0
package/lib/index.js +57 -17
package/lib/platforms/opencode.js +1 -1
package/lib/services/activation-orchestrator.js +30 -166
package/lib/services/fogact-api.js +12 -9
package/package.json +1 -1

package/frontend/user/index.html CHANGED Viewed

@@ -8,15 +8,15 @@
       href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%239ca3af' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9Z'%3E%3C/path%3E%3C/svg%3E"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>CLIProxy - API 使用监控</title>
-    <meta name="description" content="CLIProxy API 使用量监控平台" />
+    <title>FogAct - API 使用监控</title>
+    <meta name="description" content="FogAct API 使用量监控平台" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@600;700;800&family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet" />
     <script>
       // 阻塞式主题初始化 — 防止 FOUC + 设置内联背景色
       ;(function () {
-        var t = localStorage.getItem('yunyi_user_theme') || 'system'
+        var t = localStorage.getItem('fogact_user_theme') || 'system'
         var d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches)
         var el = document.documentElement
         if (d) {
@@ -28,10 +28,10 @@
         }
       })()
     </script>
-    <script type="module" crossorigin src="assets/index-Da98HOxL.js"></script>
+    <script type="module" crossorigin src="assets/index-Da98HOxL.js?v=20260619-fogact-loading-fix"></script>
     <link rel="modulepreload" crossorigin href="assets/chart-vendor-CULJE59K.js">
     <link rel="stylesheet" crossorigin href="assets/index-B8QSyYhS.css">
-    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-user-restore" />
+    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-fogact-copy2" />
   </head>
   <body class="market-user min-h-screen">
     <span class="market-mouse-light" aria-hidden="true"></span>

package/lib/commands/activate.js CHANGED Viewed

@@ -6,7 +6,7 @@ const { testNodes, selectBestNode, formatNodeResults } = require("../services/no
 const { createBackup } = require("../services/backup-service");
 const { writeClaudeConfig, getClaudeConfigPath } = require("../config/claude");
 const { writeCodexConfig, getCodexConfigPath } = require("../config/codex");
-const { runActivationWizard, runNewApiActivation } = require("../services/activation-orchestrator");
+const { runActivationWizard } = require("../services/activation-orchestrator");
 async function runLegacyCodeActivation(options = {}) {
   console.log("");
@@ -131,13 +131,6 @@ async function runActivateCommand(options = {}) {
     return;
   }
-  if (options.service && options.apiKey && (options.yes || options.auto)) {
-    console.log("");
-    console.log("=== NewAPI Multi-Platform Activation ===");
-    await runNewApiActivation(options);
-    return;
-  }
   await runActivationWizard(options);
 }

package/lib/config/claude.js CHANGED Viewed

@@ -59,6 +59,7 @@ function writeClaudeConfig(apiKey, baseUrl) {
       ...existingEnv,
       ANTHROPIC_BASE_URL: baseUrl,
       ANTHROPIC_AUTH_TOKEN: apiKey,
+      FOGACT_ACTIVATION_CODE: apiKey,
     },
   });

package/lib/config/codex.js CHANGED Viewed

@@ -148,7 +148,7 @@ function writeCodexConfig(apiKey, baseUrl) {
   delete auth[LEGACY_AUTH_KEY];
   fs.writeFileSync(
     authPath,
-    JSON.stringify({ ...auth, auth_mode: "apikey", OPENAI_API_KEY: apiKey }, null, 2),
+    JSON.stringify({ ...auth, auth_mode: "apikey", OPENAI_API_KEY: apiKey, FOGACT_ACTIVATION_CODE: apiKey }, null, 2),
     "utf8"
   );

package/lib/config/upstream.js CHANGED Viewed

@@ -56,6 +56,9 @@ function loadUpstreamConfig(options = {}) {
 }
 function getServiceBaseUrl(config, service) {
+  if (config && config.proxy === true && config.baseUrl) {
+    return trimTrailingSlash(config.baseUrl);
+  }
   const serviceConfig = (config.services && config.services[service]) || {};
   return trimTrailingSlash(serviceConfig.baseUrl || config.baseUrl);
 }

package/lib/index.js CHANGED Viewed

@@ -170,6 +170,53 @@ function printBanner() {
   console.log(renderMenu(0));
 }
+function moveMenuCursor(cursor, direction, total) {
+  return (cursor + direction + total) % total;
+}
+function applyMenuInput(input, cursor, total = MENU_CHOICES.length) {
+  const text = String(input || "");
+  const result = { cursor, action: null };
+  const tokenPattern = /\u001b(?:\[[0-9;]*[AB]|O[AB])|\r|\n|\u0003|\u001b|[1-9jksw]/gi;
+  let match;
+  while ((match = tokenPattern.exec(text)) !== null) {
+    const token = match[0];
+    const lower = token.toLowerCase();
+    if (token === "\u0003" || token === "\u001b") {
+      result.action = "exit";
+      break;
+    }
+    if (token === "\r" || token === "\n") {
+      result.action = "submit";
+      break;
+    }
+    if (/^\u001b(?:\[[0-9;]*A|OA)$/i.test(token) || lower === "k" || lower === "w") {
+      result.cursor = moveMenuCursor(result.cursor, -1, total);
+      continue;
+    }
+    if (/^\u001b(?:\[[0-9;]*B|OB)$/i.test(token) || lower === "j" || lower === "s") {
+      result.cursor = moveMenuCursor(result.cursor, 1, total);
+      continue;
+    }
+    if (/^[1-9]$/.test(token)) {
+      const selected = Number(token) - 1;
+      if (selected >= 0 && selected < total) {
+        result.cursor = selected;
+        result.action = "submit";
+        break;
+      }
+    }
+  }
+  return result;
+}
 async function runInteractiveMenu() {
   await runToolsMenu();
 }
@@ -214,22 +261,21 @@ function selectMenuAction() {
     };
     const onData = (data) => {
-      const key = data.toString("utf8");
-      if (key === "\u0003" || key === "\u001b") {
+      const next = applyMenuInput(data.toString("utf8"), cursor, MENU_CHOICES.length);
+      const cursorChanged = next.cursor !== cursor;
+      cursor = next.cursor;
+      if (next.action === "exit") {
         cancel();
         return;
       }
-      if (key === "\r" || key === "\n") {
+      if (next.action === "submit") {
         submit();
         return;
       }
-      if (key === "\u001b[A") {
-        cursor = cursor === 0 ? MENU_CHOICES.length - 1 : cursor - 1;
-        render();
-        return;
-      }
-      if (key === "\u001b[B") {
-        cursor = cursor === MENU_CHOICES.length - 1 ? 0 : cursor + 1;
+      if (cursorChanged) {
         render();
       }
     };
@@ -292,15 +338,11 @@ function buildProgram() {
     .command("activate")
     .description("Open the multi-platform activation flow")
     .option("-s, --service <service>", "target service: claude or codex")
-    .option("-k, --api-key <apiKey>", "NewAPI key; defaults to config/upstream.json or NEWAPI_API_KEY")
     .option("-y, --yes", "auto-confirm activation plan")
     .option("--auto", "alias for --yes")
     .option("--all", "configure optional platforms even when their config files do not exist")
     .option("--platforms <ids>", "comma-separated platform ids to activate")
-    .option("--skip-verify", "skip upstream /v1/models key verification")
-    .option("--upstream-config <path>", "path to upstream config JSON")
     .option("-c, --code <code>", "activation / redeem code")
-    .option("--legacy", "use legacy activation-code node switching flow")
     .option("--no-redeem", "do not mark activation code as redeemed after writing config")
     .action(runActivateCommand);
@@ -308,13 +350,10 @@ function buildProgram() {
     .command("wizard")
     .description("Open FogAct activation wizard")
     .option("-s, --service <service>", "target service: claude or codex")
-    .option("-k, --api-key <apiKey>", "NewAPI key")
     .option("-c, --code <code>", "activation / redeem code")
     .option("--platforms <ids>", "comma-separated platform ids to activate")
     .option("--all", "select all configurable platforms")
     .option("--yes", "auto-confirm activation plan")
-    .option("--skip-verify", "skip upstream /v1/models key verification")
-    .option("--upstream-config <path>", "path to upstream config JSON")
     .option("--no-redeem", "do not mark activation code as redeemed after writing config")
     .action(runActivationWizard);
@@ -362,6 +401,7 @@ async function runCli(argv = process.argv) {
 }
 module.exports = {
+  applyMenuInput,
   buildProgram,
   ensureLatestVersion,
   isNewerVersion,

package/lib/platforms/opencode.js CHANGED Viewed

@@ -21,7 +21,7 @@ function buildClaudeConfig(existingConfig, baseUrl, apiKey) {
     name: "fogact-claude",
     npm: "@ai-sdk/anthropic",
     options: {
-      baseURL: `${baseUrl.replace(/\/+$/, "")}/v1`,
+      baseURL: baseUrl.replace(/\/+$/, ""),
       apiKey,
     },
   };

package/lib/services/activation-orchestrator.js CHANGED Viewed

@@ -2,10 +2,9 @@
 const prompts = require("prompts");
 const { detectPlatforms, getPlatforms } = require("../platforms");
-const { loadUpstreamConfig } = require("../config/upstream");
 const { createActivationBackup } = require("./backup-service");
-const { getNodes, inspectActivationCode, redeemActivationCode, testNode } = require("./fogact-api");
-const { maskKey, verifyNewApiKey } = require("./newapi");
+const { getNodes, inspectActivationCode, testNode, verifyActivationCode } = require("./fogact-api");
+const { maskKey } = require("./newapi");
 const SUPPORTED_SERVICES = ["codex", "claude"];
 const SERVICE_LABELS = {
@@ -149,6 +148,9 @@ function normalizeEntitlement(raw = {}, fallbackServices = []) {
 function extractApiKeyFromEntitlement(entitlement, fallback) {
   const raw = entitlement && entitlement.raw ? entitlement.raw : {};
   const credential = raw.credential || raw.credentials || {};
+  if (raw.proxy === true) {
+    return String(raw.apiKey || raw.key || raw.token || fallback || "").trim();
+  }
   return String(
     raw.apiKey ||
     raw.key ||
@@ -176,6 +178,16 @@ function extractBaseUrlFromEntitlement(entitlement) {
   ).trim().replace(/\/+$/, "");
 }
+function extractProxyBaseUrlFromEntitlement(entitlement) {
+  const raw = entitlement && entitlement.raw ? entitlement.raw : {};
+  const service = raw.serviceKey || (entitlement.services && entitlement.services[0]);
+  return String(
+    raw.baseUrl ||
+    (raw.publicBaseUrl && service === "codex" ? `${String(raw.publicBaseUrl).replace(/\/+$/, "")}/v1` : raw.publicBaseUrl) ||
+    ""
+  ).trim().replace(/\/+$/, "");
+}
 function isServiceAllowed(entitlement, service) {
   return !entitlement.services.length || entitlement.services.includes(service);
 }
@@ -249,36 +261,6 @@ async function promptService(defaultService, entitlement = normalizeEntitlement(
   return response.service || null;
 }
-async function promptApiKey(defaultApiKey) {
-  if (defaultApiKey) {
-    return defaultApiKey;
-  }
-  const response = await prompts({
-    type: "password",
-    name: "apiKey",
-    message: "请输入 NewAPI API Key",
-    validate: (value) => value && value.trim() ? true : "API Key 不能为空",
-  }, { onCancel: () => false });
-  return response.apiKey ? response.apiKey.trim() : null;
-}
-async function promptBaseUrl(defaultBaseUrl) {
-  if (defaultBaseUrl) {
-    return defaultBaseUrl;
-  }
-  const response = await prompts({
-    type: "text",
-    name: "baseUrl",
-    message: "请输入 NewAPI Base URL",
-    validate: (value) => value && value.trim() ? true : "Base URL 不能为空",
-  }, { onCancel: () => false });
-  return response.baseUrl ? response.baseUrl.trim().replace(/\/+$/, "") : null;
-}
 async function promptActivationCode(defaultCode) {
   if (defaultCode) {
     return defaultCode;
@@ -287,36 +269,13 @@ async function promptActivationCode(defaultCode) {
   const response = await prompts({
     type: "password",
     name: "code",
-    message: "请输入 API Key / 激活码:",
-    validate: (value) => value && value.trim() ? true : "API Key / 激活码不能为空",
+    message: "请输入激活码:",
+    validate: (value) => value && value.trim() ? true : "激活码不能为空",
   }, { onCancel: () => false });
   return response.code ? response.code.trim() : null;
 }
-async function promptCredentialType(options, upstream) {
-  if (options.code) {
-    return "code";
-  }
-  if (options.apiKey || upstream.apiKey) {
-    return "api-key";
-  }
-  const response = await prompts({
-    type: "select",
-    name: "credentialType",
-    message: "请选择激活方式",
-    hint: "↑↓ 选择，回车确认",
-    choices: [
-      { title: "输入激活码 / 兑换码", value: "code" },
-      { title: "输入 NewAPI API Key", value: "api-key" },
-    ],
-    initial: 0,
-  }, { onCancel: () => false });
-  return response.credentialType || null;
-}
 async function confirmActivation(yes, service) {
   if (yes) {
     return true;
@@ -368,7 +327,7 @@ function printCredentialProfile(service, upstream, apiKey, entitlement) {
   console.log(divider());
   console.log(`  服务类型:   ${getServiceLabel(service)}`);
   console.log(`  接入地址:   ${upstream.baseUrl}`);
-  console.log(`  API Key:    ${maskKey(apiKey)}`);
+  console.log(`  激活码:     ${maskKey(apiKey)}`);
   if (entitlement.planName) {
     console.log(`  套餐名称:   ${entitlement.planName}`);
   }
@@ -454,9 +413,6 @@ function printResultSummary(service, backupPath, results, redeemResult) {
   if (failed.length) {
     console.log(`  激活完成：${succeeded.length} 成功，${failed.length} 失败，${skipped.length} 跳过`);
   }
-  if (redeemResult) {
-    console.log(`  兑换记录: ${redeemResult.valid ? "已完成" : `未完成（${redeemResult.error || "接口不可用"}）`}`);
-  }
   if (service === "claude") {
     const tools = ["Claude Code"];
     if (byId.get("opencode")?.result.success) tools.push("OpenCode");
@@ -516,28 +472,20 @@ async function resolveCodeCredential(options, upstream) {
   const entitlement = normalizeEntitlement(inspection, options.service ? [options.service] : []);
   const apiKey = extractApiKeyFromEntitlement(entitlement, code);
-  const entitlementBaseUrl = extractBaseUrlFromEntitlement(entitlement);
+  const entitlementBaseUrl = extractProxyBaseUrlFromEntitlement(entitlement);
+  if (!apiKey || !entitlementBaseUrl || entitlement.raw.proxy !== true) {
+    console.log("✗ 激活接口没有返回 FogAct 中转配置，请联系管理员检查服务端代理设置。");
+    return { cancelled: true };
+  }
   return {
     activationCode: code,
     apiKey,
     entitlement,
-    upstream: entitlementBaseUrl ? { ...upstream, baseUrl: entitlementBaseUrl } : upstream,
+    upstream: { services: {}, baseUrl: entitlementBaseUrl, proxy: true },
     inspection,
   };
 }
-async function resolveApiKeyCredential(options, upstream) {
-  const apiKey = await promptApiKey(options.apiKey || upstream.apiKey);
-  if (!apiKey) {
-    return { cancelled: true };
-  }
-  return {
-    apiKey,
-    entitlement: normalizeEntitlement({}, options.service ? [options.service] : []),
-    upstream,
-  };
-}
 async function activateTargets({ service, upstream, apiKey, targets, activationCode, options = {} }) {
   const backupPath = createActivationBackup(service, getBackupPaths(targets), {
     upstream: upstream.baseUrl,
@@ -558,85 +506,15 @@ async function activateTargets({ service, upstream, apiKey, targets, activationC
     }
   }
-  let redeemResult = null;
+  let activationRecord = null;
   const failures = results.filter(({ result }) => !result.success && !result.skipped);
-  if (activationCode && failures.length === 0 && !options.noRedeem) {
-    redeemResult = await redeemActivationCode(activationCode, service);
+  if (activationCode && failures.length === 0) {
+    activationRecord = await verifyActivationCode(activationCode, service);
   }
-  return { backupPath, results, redeemResult };
+  return { backupPath, results, redeemResult: null, activationRecord };
 }
-async function verifyCredential(upstream, apiKey, options = {}) {
-  if (options.skipVerify) {
-    console.log("跳过 NewAPI 连通性验证。");
-    return { valid: true, skipped: true };
-  }
-  console.log("正在验证 NewAPI Key...");
-  const verification = await verifyNewApiKey(upstream, apiKey);
-  if (!verification.valid) {
-    console.log(`✗ NewAPI 验证失败: ${verification.error}`);
-    return verification;
-  }
-  console.log(`✓ NewAPI 验证通过（可见 ${verification.models.length} 个模型）`);
-  return verification;
-}
-async function runNewApiActivation(options = {}) {
-  const baseUpstream = loadUpstreamConfig({ configPath: options.upstreamConfig });
-  const upstream = { ...baseUpstream };
-  upstream.baseUrl = await promptBaseUrl(upstream.baseUrl);
-  if (!upstream.baseUrl) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-  const apiKey = await promptApiKey(options.apiKey || upstream.apiKey);
-  if (!apiKey) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-  const entitlement = normalizeEntitlement({}, options.service ? [options.service] : []);
-  const service = await promptService(options.service, entitlement);
-  if (!service) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-  console.log("");
-  const verification = await verifyCredential(upstream, apiKey, options);
-  if (!verification.valid) {
-    return { success: false, verification };
-  }
-  const detectedPlatforms = detectPlatforms(service);
-  const selectedPlatformIds = options.platforms ? parsePlatformIds(options.platforms) : null;
-  const targets = getActivationTargets(detectedPlatforms, Boolean(options.all), selectedPlatformIds);
-  printCredentialProfile(service, upstream, apiKey, entitlement);
-  if (!(await confirmActivation(Boolean(options.yes || options.auto), service))) {
-    console.log("");
-    console.log("  已取消");
-    console.log("");
-    return { success: false, cancelled: true };
-  }
-  console.log("");
-  console.log("  正在写入配置...");
-  const activation = await activateTargets({ service, upstream, apiKey, targets, options });
-  const failures = activation.results.filter(({ result }) => !result.success && !result.skipped);
-  console.log("  配置完成");
-  printResultSummary(service, activation.backupPath, activation.results, activation.redeemResult);
-  return {
-    success: failures.length === 0,
-    backupPath: activation.backupPath,
-    results: activation.results,
-  };
-}
 async function runActivationWizard(options = {}) {
   if (!options.noNodeCheck) {
@@ -646,37 +524,24 @@ async function runActivationWizard(options = {}) {
     }
   }
-  const baseUpstream = loadUpstreamConfig({ configPath: options.upstreamConfig });
-  const credentialType = !options.code && options.apiKey ? "api-key" : "code";
-  const credential = credentialType === "code"
-    ? await resolveCodeCredential(options, baseUpstream)
-    : await resolveApiKeyCredential(options, baseUpstream);
+  const credential = await resolveCodeCredential(options, {});
   if (credential.cancelled) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
   const upstream = { ...credential.upstream };
-  upstream.baseUrl = await promptBaseUrl(upstream.baseUrl);
   if (!upstream.baseUrl) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
-  const service = await promptService(options.service, credential.entitlement, { allowPrompt: credentialType === "api-key" });
+  const service = await promptService(options.service, credential.entitlement, { allowPrompt: false });
   if (!service) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
-  console.log("");
-  if (credentialType === "api-key") {
-    const verification = await verifyCredential(upstream, credential.apiKey, options);
-    if (!verification.valid) {
-      return { success: false, verification };
-    }
-  }
   const allDetectedPlatforms = detectPlatforms(service);
   const allowedPlatforms = allDetectedPlatforms.filter((entry) => isPlatformAllowed(entry, credential.entitlement, service));
@@ -727,5 +592,4 @@ module.exports = {
   normalizeServices,
   parsePlatformIds,
   runActivationWizard,
-  runNewApiActivation,
 };

package/lib/services/fogact-api.js CHANGED Viewed

@@ -6,7 +6,7 @@ const http = require("http");
 // 支持环境变量覆盖 API 地址；默认连接公网 FogAct 面板。
 const DEFAULT_API_BASE = "https://cliproxy.fogidc.com";
-const API_BASE = process.env.FOGACT_API_BASE || process.env.CLIPROXY_API_BASE || DEFAULT_API_BASE;
+const API_BASE = process.env.FOGACT_API_BASE || DEFAULT_API_BASE;
 function makeRequest(path, options = {}) {
   return new Promise((resolve, reject) => {
@@ -57,7 +57,6 @@ function makeRequest(path, options = {}) {
 async function verifyActivationCode(code, service) {
   try {
-    // 调用本地激活 API
     const response = await makeRequest("/api/activate", {
       method: "POST",
       body: {
@@ -67,17 +66,18 @@ async function verifyActivationCode(code, service) {
       },
     });
-    if (response.status === 200 && response.data.success) {
+    const normalized = normalizeActivationResponse(response);
+    if (response.status >= 200 && response.status < 300 && normalized.valid) {
       return {
         valid: true,
-        service: response.data.data.service,
-        expiresAt: response.data.data.expiresAt,
-        quota: response.data.data.quota,
-        nodes: response.data.data.nodes || [],
+        ...normalized.data,
+        data: normalized.data,
+        nodes: normalized.data.nodes || [],
       };
     }
-    return { valid: false, error: response.data.message || "Invalid code" };
+    return { valid: false, error: normalized.message || "Invalid code" };
   } catch (err) {
     return { valid: false, error: err.message };
   }
@@ -116,7 +116,10 @@ async function inspectActivationCode(code) {
 }
 async function redeemActivationCode(code, service) {
-  return verifyActivationCode(code, service);
+  const result = await inspectActivationCode(code);
+  return result.valid
+    ? { valid: true, service: result.service, expiresAt: result.expiresAt, quota: result.quota, nodes: result.nodes || [] }
+    : result;
 }
 async function getNodes(service) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "fogact",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "FogAct activation helper for Claude Code and Codex",
   "keywords": [
     "fogact",