fogact 1.1.7 → 1.1.9

package/README.md

@@ -2,7 +2,7 @@
 
 [简体中文](./README.zh-CN.md) | English
 
-FogAct is a simple activation helper for Claude Code and Codex. It is designed to be used like `npx yunyi-activator`: run one command, choose from the menu, paste your activation code or API key, and let the tool write the local config automatically.
+FogAct is a simple activation helper for Claude Code and Codex. It is designed to be used like `npx fogact`: run one command, choose from the menu, paste your activation code, and let FogAct auto-detect the Codex / Claude entitlement before writing local config.
 
 ## Start
 
@@ -27,7 +27,7 @@ That is the user-facing command. Running it opens the interactive menu:
 
 Do not run `npm fogact`; npm treats that as an npm subcommand. Use `npx fogact`.
 
-FogAct checks npm for the latest version before opening the menu. If an older installed version is detected, it updates first and then continues. Set `FOGACT_SKIP_UPDATE=1` to skip this check.
+FogAct checks npm for the latest version before opening the menu. If an older installed version is detected, it updates first and then continues. Activation codes use the public panel `https://cliproxy.fogidc.com` by default; set `FOGACT_API_BASE` to use another backend. Set `FOGACT_SKIP_UPDATE=1` to skip the update check.
 
 ## Clean VPS
 
@@ -49,8 +49,8 @@ Minimum bootstrap requirement: the machine needs `curl` or `wget`. The installer
 
 1. Run `npx fogact`.
 2. Choose `1. Activate service`.
-3. Select Claude Code or Codex when prompted.
-4. Enter the activation code or API key.
+3. Enter the activation / redeem code.
+4. FogAct auto-detects the Codex / Claude entitlement and shows only supported targets.
 5. Confirm the plan and restart the target tool.
 
 FogAct backs up existing configuration before writing new files.
@@ -73,7 +73,7 @@ Most users only need `npx fogact`. Advanced operators can still use:
 fogact web
 ```
 
-The Web UI defaults to `http://localhost:34020/`. You can set `PORT`, `ADMIN_PASSWORD`, `NEWAPI_BASE_URL`, `NEWAPI_API_KEY`, `CLIPROXY_API_BASE`, or `CLIPROXY_UPSTREAM_CONFIG` when needed.
+The Web UI defaults to `http://localhost:34020/`. You can set `PORT`, `ADMIN_PASSWORD`, `NEWAPI_BASE_URL`, `NEWAPI_API_KEY`, `FOGACT_API_BASE`, or `FOGACT_UPSTREAM_CONFIG` when needed.
 
 ## Repository
 

package/README.zh-CN.md

@@ -1,6 +1,6 @@
 # FogAct
 
-FogAct 是一个简单的 Claude Code / Codex 激活工具。它的使用方式要和 `npx yunyi-activator` 一样：用户只运行一个命令，进入菜单，输入激活码或 API Key，然后自动写入本地配置。
+FogAct 是一个简单的 Claude Code / Codex 激活工具。它的使用方式要和 `npx fogact` 一样：用户只运行一个命令，进入菜单，输入激活码，FogAct 自动识别 Codex / Claude 能力并写入本地配置。
 
 [English](./README.md) | 简体中文
 
@@ -27,7 +27,7 @@ npx fogact
 
 不要运行 `npm fogact`；npm 会把它当成 npm 子命令。正确方式是 `npx fogact`。
 
-FogAct 启动时会自动检查 npm 最新版本；检测到旧版本会先更新，再进入菜单。需要跳过检查时可设置 `FOGACT_SKIP_UPDATE=1`。
+FogAct 启动时会自动检查 npm 最新版本；检测到旧版本会先更新，再进入菜单。激活码默认连接公网面板 `https://cliproxy.fogidc.com`，需要切换测试后端时可设置 `FOGACT_API_BASE`。需要跳过更新检查时可设置 `FOGACT_SKIP_UPDATE=1`。
 
 ## 干净 VPS
 
@@ -49,8 +49,8 @@ fogact
 
 1. 运行 `npx fogact`。
 2. 选择 `1. 激活服务`。
-3. 根据提示选择 Claude Code 或 Codex。
-4. 输入激活码或 API Key。
+3. 输入激活码 / 兑换码。
+4. FogAct 自动识别 Codex / Claude 能力，并只展示可激活的平台。
 5. 确认激活计划，然后重启对应工具。
 
 FogAct 写入新配置前会自动备份旧配置。
@@ -73,7 +73,7 @@ FogAct 写入新配置前会自动备份旧配置。
 fogact web
 ```
 
-Web UI 默认地址是 `http://localhost:34020/`。需要时可以设置 `PORT`、`ADMIN_PASSWORD`、`NEWAPI_BASE_URL`、`NEWAPI_API_KEY`、`CLIPROXY_API_BASE` 或 `CLIPROXY_UPSTREAM_CONFIG`。
+Web UI 默认地址是 `http://localhost:34020/`。需要时可以设置 `PORT`、`ADMIN_PASSWORD`、`NEWAPI_BASE_URL`、`NEWAPI_API_KEY`、`FOGACT_API_BASE` 或 `FOGACT_UPSTREAM_CONFIG`。
 
 ## 项目链接
 

package/bin/web-server.js

@@ -6,7 +6,7 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 const { userDb, codeDb, initializeSampleData } = require("../lib/services/database");
-const { DEFAULT_CONFIG_PATH, loadUpstreamConfig } = require("../lib/config/upstream");
+const { DEFAULT_CONFIG_PATH, getServiceBaseUrl, loadUpstreamConfig } = require("../lib/config/upstream");
 const { readJsonFile, writeJsonFile } = require("../lib/utils/json-file");
 const { maskKey, verifyNewApiKey } = require("../lib/services/newapi");
 
@@ -213,12 +213,71 @@ function serializeCode(code) {
   };
 }
 
+function getActivationPlatforms(serviceKey) {
+  if (serviceKey === "codex") return ["codex-cli"];
+  if (serviceKey === "claude") return ["claude-code"];
+  return [];
+}
+
+function buildActivationData(serializedCode) {
+  const serviceKey = serializedCode.serviceKey;
+  const upstream = loadUpstreamConfig({ configPath: getUpstreamConfigPath() });
+  const serviceConfig = serializedCode.serviceConfig || {};
+  const baseUrl = trimTrailingSlash(
+    serializedCode.baseUrl ||
+    serializedCode.baseURL ||
+    serializedCode.url ||
+    serviceConfig.baseUrl ||
+    serviceConfig.baseURL ||
+    serviceConfig.url ||
+    getServiceBaseUrl(upstream, serviceKey) ||
+    upstream.baseUrl
+  );
+  const apiKey = String(
+    serializedCode.apiKey ||
+    serializedCode.key ||
+    serializedCode.token ||
+    serviceConfig.apiKey ||
+    serviceConfig.key ||
+    serviceConfig.token ||
+    upstream.apiKey ||
+    ""
+  ).trim();
+
+  return {
+    code: serializedCode.code,
+    service: serializedCode.service,
+    serviceKey,
+    services: [serviceKey],
+    platforms: getActivationPlatforms(serviceKey),
+    allowedModels: serializedCode.allowedModels,
+    quota: serializedCode.quota,
+    expiresAt: serializedCode.expiresAt,
+    baseUrl,
+    apiKey,
+  };
+}
+
+function ensureActivationDataReady(res, activationData) {
+  if (activationData.baseUrl && activationData.apiKey) {
+    return true;
+  }
+
+  res.writeHead(500, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify({
+    success: false,
+    valid: false,
+    message: '上游服务未配置完整，请先在管理面板设置 NewAPI Base URL 和 API Key'
+  }));
+  return false;
+}
+
 function trimTrailingSlash(value) {
   return String(value || "").trim().replace(/\/+$/, "");
 }
 
 function getUpstreamConfigPath() {
-  return process.env.CLIPROXY_UPSTREAM_CONFIG || DEFAULT_CONFIG_PATH;
+  return process.env.FOGACT_UPSTREAM_CONFIG || DEFAULT_CONFIG_PATH;
 }
 
 function readRawUpstreamConfig() {
@@ -865,6 +924,11 @@ const server = http.createServer((req, res) => {
         return;
       }
 
+      const activationData = buildActivationData(serializedCode);
+      if (!ensureActivationDataReady(res, activationData)) {
+        return;
+      }
+
       // 更新激活码状态
       const updatedCode = codeDb.update(code.id, {
         status: 'used',
@@ -886,12 +950,7 @@ const server = http.createServer((req, res) => {
         success: true,
         message: '激活成功',
         data: {
-          code: updatedCode.code,
-          service: serializeCode(updatedCode).service,
-          serviceKey: serializeCode(updatedCode).serviceKey,
-          allowedModels: serializeCode(updatedCode).allowedModels,
-          quota: updatedCode.quota,
-          expiresAt: updatedCode.expiresAt,
+          ...buildActivationData(serializeCode(updatedCode)),
           activatedAt: updatedCode.lastUsedAt
         }
       }));
@@ -1095,20 +1154,17 @@ const server = http.createServer((req, res) => {
           return;
         }
 
+        const activationData = buildActivationData(serializedCode);
+        if (!ensureActivationDataReady(res, activationData)) {
+          return;
+        }
+
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify({
           success: true,
           valid: true,
           message: '验证成功',
-          data: {
-            code: serializedCode.code,
-            service: serializedCode.service,
-            services: [serializedCode.serviceKey],
-            platforms: serializedCode.serviceKey === 'codex' ? ['codex-cli'] : ['claude-code'],
-            allowedModels: serializedCode.allowedModels,
-            quota: serializedCode.quota,
-            expiresAt: serializedCode.expiresAt
-          }
+          data: activationData
         }));
         return;
       }
@@ -1277,10 +1333,18 @@ const server = http.createServer((req, res) => {
     return;
   }
 
-  // Proxy requests to yunyi.cfd API for user frontend
+  // Proxy requests to configured upstream API for user frontend
   if (urlPath.startsWith("/proxy/")) {
     const targetPath = urlPath.replace("/proxy", "");
-    const targetUrl = `https://yunyi.cfd${targetPath}`;
+    const proxyBaseUrl = trimTrailingSlash(process.env.FOGACT_PROXY_TARGET || readRawUpstreamConfig().baseUrl || "");
+
+    if (!proxyBaseUrl) {
+      res.writeHead(502, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ success: false, message: "Proxy target is not configured" }));
+      return;
+    }
+
+    const targetUrl = `${proxyBaseUrl}${targetPath}`;
 
     const options = {
       method: req.method,

package/frontend/activate.html

@@ -7,7 +7,7 @@
     <meta name="description" content="输入 FogAct 激活码，完成服务绑定并查看额度与有效期。" />
     <script>
       ;(function () {
-        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || localStorage.getItem('yunyi_user_theme') || 'system';
+        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || 'system';
         var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
         var isDark = theme === 'dark' || (theme === 'system' && prefersDark);
         document.documentElement.classList.toggle('dark', isDark);

package/frontend/admin/admin-panel-v2.js

@@ -270,7 +270,7 @@ const DEFAULT_SETTINGS = {
     notifyLowQuota: true
   },
   app: {
-    appName: 'CLIProxy Client',
+    appName: 'FogAct Client',
     appDownloadUrl: '',
     iosUrl: '',
     androidUrl: '',
@@ -1277,7 +1277,7 @@ const LogsManagement = {
 };
 
 const SettingsManagement = {
-  storageKey: 'cliproxy_admin_settings_v1',
+  storageKey: 'fogact_admin_settings_v1',
 
   sections: [
     {

package/frontend/admin/index.html

@@ -7,7 +7,7 @@
 
     <script>
       ;(function () {
-        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || localStorage.getItem('yunyi_user_theme') || 'system';
+        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || 'system';
         var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
         var isDark = theme === 'dark' || (theme === 'system' && prefersDark);
         document.documentElement.classList.toggle('dark', isDark);

package/frontend/assets/market-ui.css

@@ -731,35 +731,6 @@ body.market-dark .market-auth-card::before {
   color: var(--market-primary);
 }
 
-.market-quick-links {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 8px;
-  margin-top: 16px;
-}
-
-.market-quick-links a {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 36px;
-  border: 1px solid var(--market-line);
-  border-radius: 14px;
-  color: var(--market-ink);
-  background: var(--market-panel-muted);
-  text-decoration: none;
-  font-size: 13px;
-  font-weight: 800;
-  transition: transform 0.18s ease, border-color 0.18s ease, background 0.18s ease, color 0.18s ease;
-}
-
-.market-quick-links a:hover {
-  transform: translateY(-1px);
-  border-color: color-mix(in srgb, var(--market-primary) 42%, var(--market-line));
-  color: var(--market-primary);
-  background: color-mix(in srgb, var(--market-primary) 10%, var(--market-panel-muted));
-}
-
 .market-result-list {
   display: grid;
   gap: 10px;
@@ -1212,190 +1183,6 @@ body.market-user {
   transform: translateY(-1px);
 }
 
-/* Distinct motion layer */
-.market-orbit-stage {
-  position: absolute;
-  inset: auto 28px 28px auto;
-  width: min(48vw, 440px);
-  height: min(48vw, 440px);
-  pointer-events: none;
-  opacity: 0.98;
-}
-
-.market-orbit-stage::before,
-.market-orbit-stage::after {
-  content: "";
-  position: absolute;
-  inset: 12%;
-  border: 1px solid color-mix(in srgb, var(--market-ink) 12%, transparent);
-  border-radius: 999px;
-  background:
-    radial-gradient(circle at center, color-mix(in srgb, var(--market-primary) 7%, transparent), transparent 62%);
-  animation: orbitSpin 22s linear infinite;
-}
-
-.market-orbit-stage::after {
-  inset: 25%;
-  border-style: dashed;
-  animation-duration: 16s;
-  animation-direction: reverse;
-  opacity: 0.72;
-}
-
-.market-orbit-core {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  z-index: 2;
-  display: grid;
-  place-items: center;
-  width: 132px;
-  height: 132px;
-  padding: 18px;
-  border: 1px solid color-mix(in srgb, var(--market-primary) 30%, var(--market-line));
-  border-radius: 36px;
-  color: var(--market-ink);
-  background:
-    linear-gradient(145deg, color-mix(in srgb, var(--market-panel-strong) 92%, transparent), var(--market-panel-muted)),
-    radial-gradient(circle at 30% 20%, color-mix(in srgb, var(--market-primary) 24%, transparent), transparent 58%);
-  box-shadow: 0 24px 60px color-mix(in srgb, var(--market-primary) 20%, transparent);
-  transform: translate(-50%, -50%) rotate(-2deg);
-}
-
-.market-orbit-core .material-symbols-outlined {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 42px;
-  height: 42px;
-  border-radius: 16px;
-  color: #fff;
-  background: linear-gradient(135deg, var(--market-primary), var(--market-primary-2));
-  box-shadow: 0 14px 32px color-mix(in srgb, var(--market-primary) 28%, transparent);
-}
-
-.market-orbit-core strong {
-  margin-top: 8px;
-  font-family: var(--market-headline);
-  font-size: 18px;
-  letter-spacing: -0.04em;
-}
-
-.market-orbit-core small {
-  color: var(--market-muted);
-  font-size: 12px;
-  font-weight: 800;
-}
-
-.market-orbit-node {
-  position: absolute;
-  z-index: 3;
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  min-width: 118px;
-  min-height: 54px;
-  padding: 10px 12px;
-  border: 1px solid color-mix(in srgb, var(--node-a, var(--market-primary)) 30%, var(--market-line));
-  border-radius: 20px;
-  color: var(--market-ink);
-  background:
-    linear-gradient(145deg, color-mix(in srgb, var(--market-panel-strong) 94%, transparent), var(--market-panel-muted)),
-    radial-gradient(circle at 15% 0%, color-mix(in srgb, var(--node-a, var(--market-primary)) 24%, transparent), transparent 64%);
-  box-shadow: 0 18px 44px color-mix(in srgb, var(--node-a, var(--market-primary)) 18%, transparent);
-  transform: translate3d(0, 0, 0) rotate(var(--tilt, 0deg));
-  animation: nodeFloat var(--speed, 6s) ease-in-out infinite;
-}
-
-.market-orbit-node .material-symbols-outlined {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  flex: 0 0 auto;
-  width: 32px;
-  height: 32px;
-  border-radius: 13px;
-  color: #fff;
-  background: linear-gradient(135deg, var(--node-a, var(--market-primary)), var(--node-b, var(--market-primary-2)));
-  font-size: 18px;
-}
-
-.market-orbit-node span:last-child {
-  color: var(--market-ink);
-  font-size: 13px;
-  font-weight: 900;
-  white-space: nowrap;
-}
-
-.market-orbit-node-cli {
-  --node-a: #6d5dfc;
-  --node-b: #b86bff;
-  --tilt: -8deg;
-  --speed: 6.5s;
-  left: 1%;
-  top: 18%;
-}
-
-.market-orbit-node-cdk {
-  --node-a: #ff7a59;
-  --node-b: #ffd166;
-  --tilt: 7deg;
-  --speed: 7.5s;
-  right: 2%;
-  top: 9%;
-  animation-delay: -1.8s;
-}
-
-.market-orbit-node-quota {
-  --node-a: #17c3b2;
-  --node-b: #5eead4;
-  --tilt: 8deg;
-  --speed: 8s;
-  right: 0;
-  bottom: 20%;
-  animation-delay: -3s;
-}
-
-.market-orbit-node-sync {
-  --node-a: #111827;
-  --node-b: #6d5dfc;
-  --tilt: -7deg;
-  --speed: 7s;
-  left: 7%;
-  bottom: 8%;
-  animation-delay: -4.3s;
-}
-
-.market-signal-line {
-  position: absolute;
-  left: 8%;
-  right: 8%;
-  top: 50%;
-  height: 1px;
-  background: linear-gradient(90deg, transparent, color-mix(in srgb, var(--market-primary) 55%, transparent), transparent);
-  transform: rotate(-18deg);
-  opacity: 0.72;
-  overflow: hidden;
-}
-
-.market-signal-line-alt {
-  transform: rotate(36deg);
-  opacity: 0.42;
-}
-
-.market-signal-line::after {
-  content: "";
-  position: absolute;
-  inset: 0 auto 0 0;
-  width: 38%;
-  background: linear-gradient(90deg, transparent, #fff, transparent);
-  animation: signalSweep 2.6s cubic-bezier(0.16, 1, 0.3, 1) infinite;
-}
-
-.market-signal-line-alt::after {
-  animation-delay: -1.1s;
-}
-
 .market-card-lab {
   min-height: 318px;
   padding: 0;
@@ -1837,16 +1624,6 @@ body.is-pointer-active .market-mouse-light {
   to { transform: rotate(360deg); }
 }
 
-@keyframes nodeFloat {
-  0%, 100% { transform: translate3d(0, 0, 0) rotate(var(--tilt)); }
-  50% { transform: translate3d(0, -3px, 0) rotate(var(--tilt)); }
-}
-
-@keyframes signalSweep {
-  0% { transform: translateX(-120%); }
-  100% { transform: translateX(360%); }
-}
-
 @keyframes cardShine {
   from { transform: translateX(-120%); }
   to { transform: translateX(120%); }
@@ -1909,14 +1686,6 @@ body.is-pointer-active .market-mouse-light {
 }
 
 @media (max-width: 980px) {
-  .market-orbit-stage {
-    position: relative;
-    inset: auto;
-    width: min(100%, 420px);
-    height: 300px;
-    margin: 28px auto 0;
-  }
-
   .market-hero,
   .market-activation {
     grid-template-columns: 1fr;
@@ -1984,32 +1753,6 @@ body.is-pointer-active .market-mouse-light {
     min-height: 150px;
   }
 
-  .market-orbit-stage {
-    height: 240px;
-  }
-
-  .market-orbit-core {
-    width: 104px;
-    height: 104px;
-    border-radius: 28px;
-  }
-
-  .market-orbit-core strong {
-    font-size: 16px;
-  }
-
-  .market-orbit-node {
-    min-width: 58px;
-    min-height: 58px;
-    padding: 8px;
-    border-radius: 20px;
-    justify-content: center;
-  }
-
-  .market-orbit-node span:last-child {
-    display: none;
-  }
-
   .market-mouse-light {
     display: none;
   }

package/frontend/color-test.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>配色方案测试 | FogIDC Activator</title>
+    <title>配色方案测试 | FogAct</title>
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@600;700;800&family=Inter:wght@400;500;600&display=swap" rel="stylesheet">
     <script src="https://cdn.tailwindcss.com"></script>
     <script>

package/frontend/index.html

@@ -7,7 +7,7 @@
     <meta name="description" content="FogAct 提供用户中心、激活码管理、配额查看和多平台 CLI 接入入口。" />
     <script>
       ;(function () {
-        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || localStorage.getItem('yunyi_user_theme') || 'system';
+        var theme = localStorage.getItem('fogact_theme') || localStorage.getItem('admin_theme') || 'system';
         var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
         var isDark = theme === 'dark' || (theme === 'system' && prefersDark);
         document.documentElement.classList.toggle('dark', isDark);
@@ -73,31 +73,6 @@
               <span class="market-ambient-item"><span class="material-symbols-outlined">query_stats</span></span>
             </div>
 
-            <div class="market-orbit-stage" aria-label="FogAct 服务流程拓扑">
-              <div class="market-orbit-core">
-                <span class="material-symbols-outlined">hub</span>
-                <strong>FogAct</strong>
-                <small>统一入口</small>
-              </div>
-              <span class="market-orbit-node market-orbit-node-cli">
-                <span class="material-symbols-outlined">terminal</span>
-                <span>CLI 接入</span>
-              </span>
-              <span class="market-orbit-node market-orbit-node-cdk">
-                <span class="material-symbols-outlined">vpn_key</span>
-                <span>CDK 校验</span>
-              </span>
-              <span class="market-orbit-node market-orbit-node-quota">
-                <span class="material-symbols-outlined">monitoring</span>
-                <span>配额监控</span>
-              </span>
-              <span class="market-orbit-node market-orbit-node-sync">
-                <span class="material-symbols-outlined">cloud_sync</span>
-                <span>上游同步</span>
-              </span>
-              <span class="market-signal-line market-signal-line-main"></span>
-              <span class="market-signal-line market-signal-line-alt"></span>
-            </div>
           </div>
 
           <aside class="market-hero-side" aria-label="服务状态概览">
@@ -136,12 +111,6 @@
               <p class="market-mini-copy" style="margin-top: 14px; font-size: 14px; line-height: 1.7;">
                 本地 Web 服务默认运行在 34020 端口，提供首页、用户中心、管理中心和激活入口。
               </p>
-              <div class="market-quick-links" aria-label="本地服务快捷入口">
-                <a href="/">首页</a>
-                <a href="/user/">用户中心</a>
-                <a href="/admin/">管理中心</a>
-                <a href="/activate.html">激活入口</a>
-              </div>
             </div>
           </aside>
         </section>