fogact 1.2.5 → 1.2.6

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

@@ -100,19 +100,13 @@ function padCell(value, width) {
 function formatNodeLine(result, best) {
   const mark = result.available ? "✓" : "✗";
   const name = padCell(result.name || result.url || "FogAct", 12);
-  const service = padCell(result.serviceLabel || result.region || "Global", 9);
 
   if (!result.available) {
-    return `  ${mark} ${name} ${service} --        --      不可达  --`;
+    return `  ${mark} ${name} 不可达`;
   }
 
-  const latency = padCell(`${result.avgLatency}ms`, 8);
-  const jitter = padCell(`±${result.latencyStdDev}ms`, 7);
-  const stability = padCell(stabilityLabel(result.latencyStdDev), 6);
-  const score = padCell(`${getResultScore(result)}分`, 5);
-  const level = padCell(latencyLevel(result.avgLatency), 4);
   const bestMark = best && best === result ? " ★ 最优" : "";
-  return `  ${mark} ${name} ${service} ${latency} ${jitter} ${stability} ${score} ${level}${bestMark}`;
+  return `  ${mark} ${name} ${result.avgLatency}ms (±${result.latencyStdDev}ms)  ${stabilityLabel(result.latencyStdDev)}  ${getResultScore(result)}分${bestMark}`;
 }
 
 function formatNodeResults(results, options = {}) {
@@ -123,21 +117,16 @@ function formatNodeResults(results, options = {}) {
   const title = options.title || "节点测试结果";
 
   lines.push(`  ${title}`);
-  lines.push("  ────────────────────────────────────────────────────────────");
-  lines.push("  状态 节点         服务      延迟     波动    稳定性  评分  等级");
-  lines.push("  ────────────────────────────────────────────────────────────");
+  lines.push("  ───────────────────────────────────────────────────");
+  lines.push("");
 
   for (const result of sorted) {
     lines.push(formatNodeLine(result, best));
   }
 
-  lines.push("  ────────────────────────────────────────────────────────────");
+  lines.push("");
+  lines.push("  ───────────────────────────────────────────────────");
   lines.push(`  测试完成，共 ${results.length} 个节点，${availableCount} 个可用`);
-  if (best) {
-    lines.push(`  推荐节点: ${best.name || best.url} · ${best.avgLatency}ms · ${getResultScore(best)}分`);
-  } else {
-    lines.push("  暂无可用节点，请稍后重试或联系管理员");
-  }
   return lines.join("\n");
 }
 

package/package.json

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