fogact 1.2.0 → 1.2.3

package/lib/services/database.js

@@ -6,6 +6,7 @@ const path = require("path");
 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");
 
 // 确保数据目录存在
 function ensureDataDir() {
@@ -257,6 +258,51 @@ const codeDb = {
   },
 };
 
+// 用量日志数据库操作
+const usageDb = {
+  getAll() {
+    return readJsonFile(USAGE_FILE, []);
+  },
+
+  create(usageData) {
+    const items = this.getAll();
+    const now = new Date().toISOString();
+    const newItem = {
+      id: usageData.id || `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      codeId: usageData.codeId || null,
+      code: usageData.code || null,
+      service: usageData.service || "claude",
+      model: usageData.model || "unknown",
+      inputTokens: Number(usageData.inputTokens || 0),
+      outputTokens: Number(usageData.outputTokens || 0),
+      totalTokens: Number(usageData.totalTokens || 0),
+      requests: Number(usageData.requests || 1),
+      statusCode: usageData.statusCode || null,
+      success: usageData.success !== false,
+      cost: Number(usageData.cost || 0),
+      path: usageData.path || null,
+      createdAt: usageData.createdAt || now,
+    };
+    items.push(newItem);
+    writeJsonFile(USAGE_FILE, items);
+    return newItem;
+  },
+
+  getByCode(code) {
+    const value = String(code || "").trim();
+    if (!value) return [];
+    return this.getAll().filter((item) => item.code === value);
+  },
+
+  getSince(code, since) {
+    const sinceTime = since ? new Date(since).getTime() : 0;
+    return this.getByCode(code).filter((item) => {
+      const createdAt = new Date(item.createdAt || 0).getTime();
+      return Number.isFinite(createdAt) && createdAt >= sinceTime;
+    });
+  },
+};
+
 // 初始化示例数据
 function initializeSampleData() {
   ensureDataDir();
@@ -457,5 +503,6 @@ function initializeSampleData() {
 module.exports = {
   userDb,
   codeDb,
+  usageDb,
   initializeSampleData,
 };

package/lib/services/fogact-api.js

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

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