fogact 1.1.8 → 1.1.9

package/README.md

@@ -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
 

package/README.zh-CN.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
 

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,6 +213,65 @@ 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(/\/+$/, "");
 }
@@ -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;
       }

package/frontend/assets/market-ui.css

@@ -731,128 +731,6 @@ body.market-dark .market-auth-card::before {
   color: var(--market-primary);
 }
 
-.market-service-card {
-  position: relative;
-  overflow: hidden;
-  border: 1px solid var(--market-line);
-  border-radius: 28px;
-  padding: 18px;
-  background:
-    radial-gradient(circle at 8% 0%, color-mix(in srgb, var(--market-primary) 14%, transparent), transparent 42%),
-    var(--market-panel);
-  box-shadow: var(--market-shadow-soft);
-}
-
-.market-service-head {
-  display: grid;
-  grid-template-columns: 44px 1fr auto;
-  gap: 12px;
-  align-items: center;
-}
-
-.market-service-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 44px;
-  height: 44px;
-  border-radius: 16px;
-  color: #fff;
-  background: linear-gradient(135deg, var(--market-primary), var(--market-primary-3));
-  box-shadow: 0 14px 32px color-mix(in srgb, var(--market-primary) 24%, transparent);
-}
-
-.market-service-head p,
-.market-service-head h3,
-.market-service-copy {
-  margin: 0;
-}
-
-.market-service-head p {
-  color: var(--market-muted);
-  font-size: 12px;
-  font-weight: 900;
-}
-
-.market-service-head h3 {
-  margin-top: 3px;
-  color: var(--market-ink);
-  font-family: var(--market-headline);
-  font-size: 17px;
-  letter-spacing: -0.04em;
-}
-
-.market-port-badge {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  height: 32px;
-  padding: 0 10px;
-  border: 1px solid var(--market-line);
-  border-radius: 999px;
-  color: var(--market-muted);
-  background: var(--market-panel-muted);
-  font-size: 12px;
-  font-weight: 900;
-}
-
-.market-service-copy {
-  margin-top: 14px;
-  color: var(--market-muted);
-  font-size: 13px;
-  line-height: 1.65;
-}
-
-.market-entry-grid {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 10px;
-  margin-top: 16px;
-}
-
-.market-entry-card {
-  display: grid;
-  gap: 5px;
-  min-height: 92px;
-  border: 1px solid var(--market-line);
-  border-radius: 18px;
-  padding: 13px;
-  color: var(--market-ink);
-  background: color-mix(in srgb, var(--market-panel-strong) 78%, transparent);
-  text-decoration: none;
-  transition: transform 0.18s ease, border-color 0.18s ease, background 0.18s ease, box-shadow 0.18s ease;
-}
-
-.market-entry-card .material-symbols-outlined {
-  width: 30px;
-  height: 30px;
-  border-radius: 12px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--market-primary);
-  background: color-mix(in srgb, var(--market-primary) 12%, transparent);
-  font-size: 18px;
-}
-
-.market-entry-card strong {
-  font-size: 13px;
-  font-weight: 900;
-}
-
-.market-entry-card small {
-  color: var(--market-muted);
-  font-size: 12px;
-  font-weight: 700;
-}
-
-.market-entry-card:hover {
-  transform: translateY(-2px);
-  border-color: color-mix(in srgb, var(--market-primary) 42%, var(--market-line));
-  background: color-mix(in srgb, var(--market-primary) 8%, var(--market-panel-strong));
-  box-shadow: var(--market-shadow-soft);
-}
-
 .market-result-list {
   display: grid;
   gap: 10px;

package/frontend/index.html

@@ -103,40 +103,14 @@
               </div>
             </div>
 
-            <div class="market-service-card">
-              <div class="market-service-head">
-                <span class="market-service-icon material-symbols-outlined">conversion_path</span>
-                <div>
-                  <p>本地服务</p>
-                  <h3>选择要进入的工作区</h3>
-                </div>
-                <span class="market-port-badge"><span class="market-kicker-dot"></span> :34020</span>
+            <div class="market-panel" style="border-radius: 26px; padding: 18px;">
+              <div class="market-card-footer">
+                <span class="market-tag">本地服务</span>
+                <span class="market-status-pill"><span class="market-kicker-dot"></span> 34020</span>
               </div>
-              <p class="market-service-copy">
-                Web 控制台已按角色拆成独立入口，直接选择当前要处理的任务。
+              <p class="market-mini-copy" style="margin-top: 14px; font-size: 14px; line-height: 1.7;">
+                本地 Web 服务默认运行在 34020 端口，提供首页、用户中心、管理中心和激活入口。
               </p>
-              <div class="market-entry-grid" aria-label="本地服务快捷入口">
-                <a class="market-entry-card" href="/">
-                  <span class="material-symbols-outlined">home</span>
-                  <strong>首页</strong>
-                  <small>查看入口总览</small>
-                </a>
-                <a class="market-entry-card" href="/user/">
-                  <span class="material-symbols-outlined">person</span>
-                  <strong>用户中心</strong>
-                  <small>用量与配额</small>
-                </a>
-                <a class="market-entry-card" href="/admin/">
-                  <span class="material-symbols-outlined">admin_panel_settings</span>
-                  <strong>管理中心</strong>
-                  <small>用户与 CDK</small>
-                </a>
-                <a class="market-entry-card" href="/activate.html">
-                  <span class="material-symbols-outlined">bolt</span>
-                  <strong>激活入口</strong>
-                  <small>绑定服务</small>
-                </a>
-              </div>
             </div>
           </aside>
         </section>

package/lib/services/fogact-api.js

@@ -4,8 +4,9 @@ const packageJson = require("../../package.json");
 const https = require("https");
 const http = require("http");
 
-// 支持环境变量配置 API 地址
-const API_BASE = process.env.FOGACT_API_BASE || "http://localhost:34020";
+// 支持环境变量覆盖 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;
 
 function makeRequest(path, options = {}) {
   return new Promise((resolve, reject) => {

package/package.json

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