fogact 1.2.4 → 1.2.6

package/lib/commands/restore.js

@@ -3,49 +3,72 @@
 const prompts = require("prompts");
 const { listBackups, restoreBackup, clearBackups } = require("../services/backup-service");
 
+function getServiceLabel(service) {
+  if (service === "codex") return "Codex";
+  if (service === "claude") return "Claude Code";
+  return service || "未知服务";
+}
+
+function getBackupFiles(backup) {
+  if (Array.isArray(backup.files)) {
+    return backup.files.map((file) => file.originalPath).filter(Boolean);
+  }
+  return [backup.originalPath].filter(Boolean);
+}
+
+function formatBackupTime(backup) {
+  const date = backup.timestamp ? new Date(backup.timestamp) : null;
+  if (!date || Number.isNaN(date.getTime())) return "未知时间";
+  return date.toLocaleString("zh-CN");
+}
+
 function formatBackupTitle(backup) {
-  const service = backup.service === "codex" ? "Codex" : backup.service === "claude" ? "Claude Code" : backup.service;
-  const time = backup.timestamp ? new Date(backup.timestamp).toLocaleString("zh-CN") : "未知时间";
-  const count = Array.isArray(backup.files) ? ` · ${backup.files.length} 个文件` : "";
-  return `${service || "未知服务"} · ${time}${count}`;
+  const fileCount = getBackupFiles(backup).length;
+  return `${getServiceLabel(backup.service)} · ${formatBackupTime(backup)} · ${fileCount} 个文件`;
 }
 
-async function runRestoreCommand(options = {}) {
+function printRestoreHeader() {
   console.log("");
   console.log("  恢复备份");
   console.log("  ─────────────────────────────────────");
+}
 
-  let service = options.service;
-  if (!service) {
-    const response = await prompts({
-      type: "select",
-      name: "service",
-      message: "请选择要查看的备份",
-      choices: [
-        { title: "Claude Code", value: "claude" },
-        { title: "Codex", value: "codex" },
-        { title: "全部备份", value: null },
-      ],
-      initial: 2,
-    }, { onCancel: () => false });
-
-    if (response.service === undefined) {
-      console.log("");
-      console.log("  已取消");
-      console.log("");
-      return;
-    }
-    service = response.service;
+function printBackupDetail(backup) {
+  console.log("");
+  console.log("  备份详情");
+  console.log("  ─────────────────────────────────────");
+  console.log(`  服务类型:   ${getServiceLabel(backup.service)}`);
+  console.log(`  备份时间:   ${formatBackupTime(backup)}`);
+  console.log(`  备份类型:   ${backup.kind === "manifest" ? "激活配置备份" : "单文件备份"}`);
+  console.log(`  文件数量:   ${getBackupFiles(backup).length}`);
+  if (backup.path) console.log(`  备份位置:   ${backup.path}`);
+  console.log("");
+  console.log("  将恢复文件:");
+  for (const filePath of getBackupFiles(backup)) {
+    console.log(`    ${filePath}`);
   }
+  console.log("");
+}
 
-  const backups = listBackups(service);
-  if (backups.length === 0) {
-    console.log("");
-    console.log("  ℹ 暂无可恢复备份");
-    console.log("");
-    return;
-  }
+async function promptBackupService(defaultService) {
+  if (defaultService) return defaultService;
+
+  const response = await prompts({
+    type: "select",
+    name: "service",
+    message: "请选择要查看的备份",
+    choices: [
+      { title: "Claude Code", value: "claude" },
+      { title: "Codex", value: "codex" },
+      { title: "全部备份", value: null },
+    ],
+    initial: 2,
+  }, { onCancel: () => false });
+
+  return response.service;
+}
 
+async function promptBackup(backups) {
   const response = await prompts({
     type: "select",
     name: "backup",
@@ -56,14 +79,71 @@ async function runRestoreCommand(options = {}) {
     ],
   }, { onCancel: () => false });
 
-  if (!response.backup) {
+  return response.backup;
+}
+
+async function confirmRestore(backup) {
+  printBackupDetail(backup);
+  const response = await prompts({
+    type: "confirm",
+    name: "confirmed",
+    message: "确认恢复此备份?",
+    initial: true,
+  }, { onCancel: () => false });
+  return Boolean(response.confirmed);
+}
+
+function printRestoreResult(success, restoredPaths, service, error = null) {
+  console.log("");
+  if (success) {
+    console.log("  ✓ 备份已恢复");
+    console.log("");
+    console.log("  已恢复文件:");
+    for (const restoredPath of restoredPaths) {
+      console.log(`    ${restoredPath}`);
+    }
+    console.log("");
+    const tip = service === "claude"
+      ? "请重启 Claude Code 以使配置生效"
+      : "请重启 Codex / VSCode / Cursor / OpenCode 以使配置生效";
+    console.log(`  ${tip}`);
+    console.log("");
+    return;
+  }
+
+  console.log("  ✗ 恢复失败");
+  if (error) console.log(`  ${error}`);
+  console.log("");
+}
+
+async function runRestoreCommand(options = {}) {
+  printRestoreHeader();
+
+  const service = await promptBackupService(options.service);
+  if (service === undefined) {
     console.log("");
     console.log("  已取消");
     console.log("");
     return;
   }
 
-  if (response.backup === "__clear__") {
+  const backups = listBackups(service);
+  if (backups.length === 0) {
+    console.log("");
+    console.log("  ℹ 暂无可恢复备份");
+    console.log("");
+    return;
+  }
+
+  const backupPath = await promptBackup(backups);
+  if (!backupPath) {
+    console.log("");
+    console.log("  已取消");
+    console.log("");
+    return;
+  }
+
+  if (backupPath === "__clear__") {
     const confirm = await prompts({
       type: "confirm",
       name: "value",
@@ -85,21 +165,30 @@ async function runRestoreCommand(options = {}) {
     return;
   }
 
-  console.log("");
-  console.log("  正在恢复备份...");
-  try {
-    const restoredPaths = restoreBackup(response.backup);
-    console.log("  ✓ 备份已恢复");
-    for (const restoredPath of restoredPaths) {
-      console.log(`    ${restoredPath}`);
-    }
+  const backup = backups.find((item) => item.path === backupPath);
+  if (!backup) {
     console.log("");
-    console.log("  请重启相关工具以应用恢复后的配置");
+    console.log("  ✗ 备份不存在");
     console.log("");
-  } catch (err) {
-    console.log(`  ✗ 恢复失败: ${err.message}`);
+    return;
+  }
+
+  if (!await confirmRestore(backup)) {
+    console.log("  已取消恢复");
     console.log("");
+    return;
+  }
+
+  try {
+    const restoredPaths = restoreBackup(backupPath);
+    printRestoreResult(true, restoredPaths, backup.service);
+  } catch (err) {
+    printRestoreResult(false, [], backup.service, err.message);
   }
 }
 
-module.exports = { runRestoreCommand };
+module.exports = {
+  formatBackupTitle,
+  printBackupDetail,
+  runRestoreCommand,
+};

package/lib/commands/test.js

@@ -3,32 +3,67 @@
 const { getNodes } = require("../services/fogact-api");
 const { testNodes, formatNodeResults } = require("../services/node-service");
 
-async function runTestCommand() {
-  console.log("");
-  console.log("  测试节点");
-  console.log("  ─────────────────────────────────────");
+function updateProgress(message) {
+  if (process.stdout.isTTY) {
+    process.stdout.write(`\r  ${message}${" ".repeat(20)}`);
+    return;
+  }
+  console.log(`  ${message}`);
+}
+
+function normalizeNodeUrl(value) {
+  try {
+    const url = new URL(value);
+    return url.origin;
+  } catch (_error) {
+    return String(value || "").replace(/\/$/, "");
+  }
+}
 
-  const services = [
-    { key: "claude", label: "Claude Code" },
-    { key: "codex", label: "Codex" },
-  ];
+async function collectUniqueNodes() {
+  const services = ["claude", "codex"];
+  const byUrl = new Map();
 
   for (const service of services) {
-    console.log("");
-    console.log(`  正在测试 ${service.label} 节点...`);
-    const nodes = await getNodes(service.key);
-
-    if (nodes.length === 0) {
-      console.log("  ℹ 暂无可用节点");
-      continue;
+    const nodes = await getNodes(service);
+    for (const node of nodes) {
+      const url = normalizeNodeUrl(node.url);
+      if (!url || byUrl.has(url)) continue;
+      byUrl.set(url, {
+        ...node,
+        url,
+        name: node.name || new URL(url).hostname,
+      });
     }
+  }
 
-    const results = await testNodes(nodes);
+  return [...byUrl.values()];
+}
+
+async function runTestCommand() {
+  console.log("");
+  console.log("  正在测试所有节点...");
+
+  const nodes = await collectUniqueNodes();
+
+  if (nodes.length === 0) {
+    console.log("");
+    console.log("  ℹ 暂无可用节点");
     console.log("");
-    console.log(formatNodeResults(results));
+    return;
   }
 
+  updateProgress(`测试中... (0/${nodes.length} 完成)`);
+  const results = await testNodes(nodes, (_node, done, total) => {
+    updateProgress(`测试中... (${done}/${total} 完成)`);
+  });
+
+  if (process.stdout.isTTY) {
+    process.stdout.write("\r" + " ".repeat(60) + "\r");
+  }
+  console.log("");
+  console.log(formatNodeResults(results));
   console.log("");
 }
 
-module.exports = { runTestCommand };
+module.exports = { collectUniqueNodes, runTestCommand };

package/lib/services/activation-orchestrator.js

@@ -353,6 +353,7 @@ function printResultSummary(service, backupPath, results, redeemResult) {
   console.log("");
   if (backupPath) {
     console.log("  ✓ 备份已创建");
+    console.log(`    位置: ${backupPath}`);
   }
 
   const printConfigured = (entry, label) => {

package/lib/services/database.js

@@ -7,6 +7,7 @@ const DATA_DIR = path.join(__dirname, "..", "..", "data");
 const USERS_FILE = path.join(DATA_DIR, "users.json");
 const CODES_FILE = path.join(DATA_DIR, "codes.json");
 const USAGE_FILE = path.join(DATA_DIR, "usage.json");
+const CARD_MERGES_FILE = path.join(DATA_DIR, "card-merges.json");
 
 // 确保数据目录存在
 function ensureDataDir() {
@@ -136,6 +137,11 @@ const codeDb = {
       name: codeData.name || `Code-${Date.now()}`,
       service: codeData.service || "Claude Code",
       category: codeData.category || "标准运营",
+      subServiceType: codeData.subServiceType || codeData.category || "标准运营",
+      billingType: codeData.billingType || codeData.quota?.billingType || codeData.quota?.type || "quota",
+      cycleType: codeData.cycleType || codeData.quota?.cycleType || codeData.quota?.type || "fixed",
+      quotaUnit: codeData.quotaUnit || codeData.quota?.unit || "tokens",
+      resetTimezone: codeData.resetTimezone || codeData.quota?.resetTimezone || "Asia/Shanghai",
       status: codeData.status || "未使用",
       enabled: codeData.enabled !== undefined ? codeData.enabled : true,
       usedBy: codeData.usedBy || null,
@@ -148,9 +154,14 @@ const codeDb = {
         total: codeData.quota?.total || 100000,
         used: codeData.quota?.used || 0,
         dailyLimit: codeData.quota?.dailyLimit || 5000,
+        dailyQuota: codeData.quota?.dailyQuota || codeData.quota?.dailyLimit || 5000,
         dailyUsed: codeData.quota?.dailyUsed || 0,
         periodDays: codeData.quota?.periodDays || 30,
         periodLimit: codeData.quota?.periodLimit || 50000,
+        billingType: codeData.billingType || codeData.quota?.billingType || codeData.quota?.type || "quota",
+        cycleType: codeData.cycleType || codeData.quota?.cycleType || codeData.quota?.type || "fixed",
+        unit: codeData.quotaUnit || codeData.quota?.unit || "tokens",
+        resetTimezone: codeData.resetTimezone || codeData.quota?.resetTimezone || "Asia/Shanghai",
       },
       // 计费设置
       billing: {
@@ -303,6 +314,52 @@ const usageDb = {
   },
 };
 
+// 叠卡合并记录数据库操作
+const cardMergeDb = {
+  getAll() {
+    return readJsonFile(CARD_MERGES_FILE, []);
+  },
+
+  create(mergeData) {
+    const items = this.getAll();
+    const now = new Date().toISOString();
+    const newItem = {
+      id: mergeData.id || `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      parentCodeId: mergeData.parentCodeId,
+      parentCode: mergeData.parentCode,
+      childCodeId: mergeData.childCodeId,
+      childCode: mergeData.childCode,
+      serviceType: mergeData.serviceType,
+      subServiceType: mergeData.subServiceType || "",
+      billingType: mergeData.billingType,
+      cycleType: mergeData.cycleType,
+      quotaUnit: mergeData.quotaUnit,
+      timezone: mergeData.timezone || "Asia/Shanghai",
+      mergeMode: mergeData.mergeMode,
+      parentDailyQuota: Number(mergeData.parentDailyQuota || 0),
+      childDailyQuota: Number(mergeData.childDailyQuota || 0),
+      childDays: Number(mergeData.childDays || 0),
+      childTotalValue: Number(mergeData.childTotalValue || 0),
+      addedDays: Number(mergeData.addedDays || 0),
+      addedQuota: Number(mergeData.addedQuota || 0),
+      oldExpiresAt: mergeData.oldExpiresAt || null,
+      newExpiresAt: mergeData.newExpiresAt || null,
+      createdAt: mergeData.createdAt || now,
+    };
+    items.push(newItem);
+    writeJsonFile(CARD_MERGES_FILE, items);
+    return newItem;
+  },
+
+  getByParent(parentCodeId) {
+    return this.getAll().filter((item) => item.parentCodeId === parentCodeId);
+  },
+
+  getByChild(childCodeId) {
+    return this.getAll().filter((item) => item.childCodeId === childCodeId);
+  },
+};
+
 // 初始化示例数据
 function initializeSampleData() {
   ensureDataDir();
@@ -504,5 +561,6 @@ module.exports = {
   userDb,
   codeDb,
   usageDb,
+  cardMergeDb,
   initializeSampleData,
 };

package/lib/services/node-service.js

@@ -6,7 +6,6 @@ async function testNodes(nodes, onProgress = null) {
   const results = [];
 
   for (const node of nodes) {
-    if (onProgress) onProgress(node, results.length, nodes.length);
     const probes = [];
     for (let index = 0; index < 3; index += 1) {
       const result = await testNode(node.url);
@@ -35,6 +34,8 @@ async function testNodes(nodes, onProgress = null) {
       score: scoreNode({ available, avgLatency, latencyStdDev, successRate }),
       error: available ? undefined : probes.find((probe) => probe.error)?.error || "节点不可达",
     });
+
+    if (onProgress) onProgress(node, results.length, nodes.length);
   }
 
   return results;
@@ -72,11 +73,15 @@ function selectBestNode(testResults) {
   return available[0];
 }
 
-function latencyLabel(latency) {
-  if (latency <= 50) return `${latency}ms`;
-  if (latency <= 100) return `${latency}ms`;
-  if (latency <= 300) return `${latency}ms`;
-  return `${latency}ms`;
+function sortNodeResults(results) {
+  return [...results].sort((left, right) => getResultScore(right) - getResultScore(left) || getResultLatency(left) - getResultLatency(right));
+}
+
+function latencyLevel(latency) {
+  if (latency <= 50) return "优秀";
+  if (latency <= 100) return "良好";
+  if (latency <= 300) return "一般";
+  return "较慢";
 }
 
 function stabilityLabel(stdDev) {
@@ -86,27 +91,39 @@ function stabilityLabel(stdDev) {
   return "波动";
 }
 
-function formatNodeResults(results) {
-  const sorted = [...results].sort((left, right) => right.score - left.score || left.avgLatency - right.avgLatency);
+function padCell(value, width) {
+  const text = String(value || "");
+  const displayWidth = Array.from(text).reduce((sum, char) => sum + (char.charCodeAt(0) > 0xff ? 2 : 1), 0);
+  return `${text}${" ".repeat(Math.max(0, width - displayWidth))}`;
+}
+
+function formatNodeLine(result, best) {
+  const mark = result.available ? "✓" : "✗";
+  const name = padCell(result.name || result.url || "FogAct", 12);
+
+  if (!result.available) {
+    return `  ${mark} ${name} 不可达`;
+  }
+
+  const bestMark = best && best === result ? " ★ 最优" : "";
+  return `  ${mark} ${name} ${result.avgLatency}ms (±${result.latencyStdDev}ms)  ${stabilityLabel(result.latencyStdDev)}  ${getResultScore(result)}分${bestMark}`;
+}
+
+function formatNodeResults(results, options = {}) {
+  const sorted = sortNodeResults(results);
   const best = sorted.find((result) => result.available);
+  const availableCount = results.filter((result) => result.available).length;
   const lines = [];
+  const title = options.title || "节点测试结果";
 
-  lines.push("  节点测试结果");
+  lines.push(`  ${title}`);
   lines.push("  ───────────────────────────────────────────────────");
   lines.push("");
 
   for (const result of sorted) {
-    const mark = result.available ? "✓" : "✗";
-    const name = String(result.name || result.url).padEnd(10);
-    if (!result.available) {
-      lines.push(`  ${mark} ${name} 不可达`);
-      continue;
-    }
-    const bestMark = best && best.url === result.url ? " ★ 最优" : "";
-    lines.push(`  ${mark} ${name} ${latencyLabel(result.avgLatency)} (±${result.latencyStdDev}ms)  ${stabilityLabel(result.latencyStdDev)}  ${result.score}分${bestMark}`);
+    lines.push(formatNodeLine(result, best));
   }
 
-  const availableCount = results.filter((result) => result.available).length;
   lines.push("");
   lines.push("  ───────────────────────────────────────────────────");
   lines.push(`  测试完成，共 ${results.length} 个节点，${availableCount} 个可用`);
@@ -117,4 +134,5 @@ module.exports = {
   testNodes,
   selectBestNode,
   formatNodeResults,
+  sortNodeResults,
 };

package/package.json

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