aihezu 2.8.9 → 2.8.11

package/commands/usage.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { postJson, getJson } = require('../lib/http');
+const { getJson } = require('../lib/http');
 const platform = require('../lib/platform');
 
 function normalizeHttpUrl(url) {
@@ -295,32 +295,49 @@ function usageHint(current, limit) {
   return '';
 }
 
-function getCodexUsageBase(baseUrl) {
-  // 用户的 Codex base_url 形如 https://xxx.aihezu.dev/openai 或 https://xxx.aihezu.dev
-  // 新 usage 接口位于 /v1/usage，需要去掉可能存在的 /openai 后缀
+function getUsageApiBase(baseUrl) {
+  // 去掉路径中的 /openai 或 /api 后缀
+  // - Codex base_url 常见格式 https://xxx/openai
+  // - 部分用户 base_url 为 https://xxx/api
+  // - Claude 默认 base_url 不带后缀，等价于 no-op
+  const stripSuffix = (pathname) => {
+    let p = pathname.replace(/\/+$/, '');
+    const lower = p.toLowerCase();
+    if (lower.endsWith('/openai')) {
+      p = p.slice(0, -'/openai'.length);
+    } else if (lower.endsWith('/api')) {
+      p = p.slice(0, -'/api'.length);
+    }
+    return p;
+  };
+
   try {
     const url = new URL(baseUrl);
-    let pathname = url.pathname.replace(/\/+$/, '');
-    if (pathname.toLowerCase().endsWith('/openai')) {
-      pathname = pathname.slice(0, -'/openai'.length);
-    }
+    const pathname = stripSuffix(url.pathname);
     return `${url.origin}${pathname}`;
   } catch (error) {
-    return baseUrl.replace(/\/+$/, '').replace(/\/openai$/i, '');
+    return stripSuffix(baseUrl.replace(/\/+$/, ''));
   }
 }
 
-async function queryCodexUsage(baseUrl, authToken) {
+async function queryUnifiedUsage(baseUrl, authToken) {
   try {
-    const apiBase = getCodexUsageBase(baseUrl);
+    const apiBase = getUsageApiBase(baseUrl);
     const usageUrl = `${apiBase}/v1/usage`;
     const res = await getJson(usageUrl, {
       headers: { Authorization: `Bearer ${authToken}` }
     });
 
     if (res.statusCode < 200 || res.statusCode >= 300) {
-      const msg = res.json && (res.json.message || res.json.error || res.json.code);
-      return { error: msg ? `HTTP ${res.statusCode} - ${msg}` : `HTTP ${res.statusCode}` };
+      let detail = '';
+      const j = res.json;
+      if (j) {
+        if (typeof j.message === 'string') detail = j.message;
+        else if (typeof j.error === 'string') detail = j.error;
+        else if (j.error && typeof j.error.message === 'string') detail = j.error.message;
+        else if (typeof j.code === 'string') detail = j.code;
+      }
+      return { error: detail ? `HTTP ${res.statusCode} - ${detail}` : `HTTP ${res.statusCode}` };
     }
 
     if (!res.json || typeof res.json !== 'object') {
@@ -333,7 +350,7 @@ async function queryCodexUsage(baseUrl, authToken) {
   }
 }
 
-function displayCodexUsageStats(stats, origin, source) {
+function displayUnifiedUsageStats(stats, origin, source) {
   const subscription = stats.subscription || {};
   const today = (stats.usage && stats.usage.today) || {};
   const total = (stats.usage && stats.usage.total) || {};
@@ -456,141 +473,6 @@ function displayCodexUsageStats(stats, origin, source) {
   console.log('');
 }
 
-async function queryUsage(baseUrl, authToken) {
-  try {
-    const origin = new URL(baseUrl).origin;
-    const keyIdUrl = `${origin}/apiStats/api/get-key-id`;
-    const statsUrl = `${origin}/apiStats/api/user-stats`;
-
-    const keyIdRes = await postJson(keyIdUrl, { apiKey: authToken });
-    if (keyIdRes.statusCode < 200 || keyIdRes.statusCode >= 300) {
-      return { error: `HTTP ${keyIdRes.statusCode}` };
-    }
-
-    const apiId = keyIdRes?.json?.data?.id || keyIdRes?.json?.id || null;
-    if (!apiId) {
-      return { error: '未找到 API Key ID' };
-    }
-
-    const statsRes = await postJson(statsUrl, { apiId });
-    if (statsRes.statusCode < 200 || statsRes.statusCode >= 300) {
-      return { error: `HTTP ${statsRes.statusCode}` };
-    }
-
-    if (!statsRes.json || typeof statsRes.json !== 'object') {
-      return { error: '返回内容不是合法的 JSON' };
-    }
-
-    const stats = (statsRes?.json?.data) ? statsRes.json.data : (statsRes.json || {});
-    return { stats, origin };
-  } catch (error) {
-    return { error: error.message };
-  }
-}
-
-function displayUsageStats(stats, origin, source) {
-  const limits = (stats && typeof stats === 'object' && stats.limits && typeof stats.limits === 'object')
-    ? stats.limits
-    : {};
-
-  const currentDailyCost = (stats.currentDailyCost !== undefined) ? stats.currentDailyCost : limits.currentDailyCost;
-  const dailyCostLimit = (stats.dailyCostLimit !== undefined) ? stats.dailyCostLimit : limits.dailyCostLimit;
-  const currentWindowCost = (stats.currentWindowCost !== undefined) ? stats.currentWindowCost : limits.currentWindowCost;
-  const rateLimitCost = (stats.rateLimitCost !== undefined) ? stats.rateLimitCost : limits.rateLimitCost;
-  const windowStartTime = (stats.windowStartTime !== undefined) ? stats.windowStartTime : limits.windowStartTime;
-  const windowEndTime = (stats.windowEndTime !== undefined) ? stats.windowEndTime : limits.windowEndTime;
-  const windowRemainingSeconds = (() => {
-    const raw = (stats.windowRemainingSeconds !== undefined)
-      ? stats.windowRemainingSeconds
-      : limits.windowRemainingSeconds;
-    const provided = asNumber(raw);
-    if (provided !== null) return provided;
-    const endMs = normalizeEpochMs(windowEndTime);
-    if (endMs === null) return null;
-    return Math.max(0, Math.floor((endMs - Date.now()) / 1000));
-  })();
-  const windowDurationMinutes = (() => {
-    const startMs = normalizeEpochMs(windowStartTime);
-    const endMs = normalizeEpochMs(windowEndTime);
-    if (startMs !== null && endMs !== null && endMs > startMs) {
-      return Math.round((endMs - startMs) / 60000);
-    }
-    const raw = (stats.rateLimitWindow !== undefined) ? stats.rateLimitWindow : limits.rateLimitWindow;
-    const minutes = asNumber(raw);
-    if (minutes !== null) return minutes;
-    return null;
-  })();
-
-  const dailyRemaining = (() => {
-    const c = asNumber(currentDailyCost);
-    const l = asNumber(dailyCostLimit);
-    if (c === null || l === null) return null;
-    return l - c;
-  })();
-
-  const windowRemaining = (() => {
-    const c = asNumber(currentWindowCost);
-    const l = asNumber(rateLimitCost);
-    if (c === null || l === null) return null;
-    return l - c;
-  })();
-
-  // 提取日请求次数和 Token 用量（API 中 currentWindowRequests/Tokens 实际为日数据）
-  const currentDailyRequests = (stats.currentDailyRequests !== undefined) ? stats.currentDailyRequests
-    : (limits.currentDailyRequests !== undefined) ? limits.currentDailyRequests
-    : (stats.currentWindowRequests !== undefined) ? stats.currentWindowRequests : limits.currentWindowRequests;
-  const currentDailyTokens = (stats.currentDailyTokens !== undefined) ? stats.currentDailyTokens
-    : (limits.currentDailyTokens !== undefined) ? limits.currentDailyTokens
-    : (stats.currentWindowTokens !== undefined) ? stats.currentWindowTokens : limits.currentWindowTokens;
-
-  console.log(`域名: ${origin}`);
-  console.log(`来源: ${source}`);
-  console.log('');
-  console.log(
-    `日额度: ${formatCost(currentDailyCost)} / ${formatCost(dailyCostLimit)} (${formatPercent(currentDailyCost, dailyCostLimit)}) ` +
-    `${renderBar(currentDailyCost, dailyCostLimit)} ${usageHint(currentDailyCost, dailyCostLimit)}`.trimEnd()
-  );
-  if (dailyRemaining !== null) {
-    console.log(`日剩余: ${formatCost(dailyRemaining)}`);
-  }
-  if (asNumber(currentDailyRequests) !== null || asNumber(currentDailyTokens) !== null) {
-    const parts = [];
-    if (asNumber(currentDailyRequests) !== null) parts.push(`请求 ${formatNumber(currentDailyRequests)} 次`);
-    if (asNumber(currentDailyTokens) !== null) parts.push(`Token ${formatCompactNumber(currentDailyTokens)}`);
-    console.log(`日统计: ${parts.join(' | ')}`);
-  }
-
-  console.log('');
-  console.log(
-    `窗口:   ${formatCost(currentWindowCost)} / ${formatCost(rateLimitCost)} (${formatPercent(currentWindowCost, rateLimitCost)}) ` +
-    `${renderBar(currentWindowCost, rateLimitCost)} ${usageHint(currentWindowCost, rateLimitCost)}`.trimEnd()
-  );
-  if (windowRemaining !== null) {
-    console.log(`窗口剩余: ${formatCost(windowRemaining)}`);
-  }
-  const windowStartText = formatDateTime(windowStartTime);
-  const windowEndText = formatDateTime(windowEndTime);
-  if (windowStartText !== '-' || windowEndText !== '-') {
-    if (windowStartText !== '-' && windowEndText !== '-') {
-      console.log(`时间窗口: ${windowStartText} ~ ${windowEndText}`);
-    } else if (windowStartText !== '-') {
-      console.log(`时间窗口开始: ${windowStartText}`);
-    } else {
-      console.log(`时间窗口结束: ${windowEndText}`);
-    }
-  }
-  const windowDurationText = formatDurationMinutes(windowDurationMinutes);
-  if (windowDurationText !== '-') {
-    console.log(`周时间窗口: ${windowDurationText}`);
-  }
-  const resetCountdownText = formatDurationSeconds(windowRemainingSeconds);
-  if (resetCountdownText !== '-') {
-    console.log(`窗口剩余时间: ${resetCountdownText} (距重置)`);
-  }
-
-  console.log('');
-}
-
 function showUsageHelp() {
   console.log('用法: aihezu usage [service] [--json] [--key <apiKey>]');
   console.log('');
@@ -688,10 +570,10 @@ async function usageCommand(args = []) {
       const effectiveKey = overrideKey || config.authToken;
       const sourceLabel = overrideKey ? `命令行 Key (${config.source})` : config.source;
       console.log(`[查询中] ${sourceLabel} - Token: ${maskToken(effectiveKey)}`);
-      const promise = service.name === 'Codex'
-        ? queryCodexUsage(config.baseUrl, effectiveKey)
-        : queryUsage(config.baseUrl, effectiveKey);
-      return { sourceLabel, promise };
+      return {
+        sourceLabel,
+        promise: queryUnifiedUsage(config.baseUrl, effectiveKey)
+      };
     });
 
     const results = await Promise.allSettled(requests.map(item => item.promise));
@@ -712,11 +594,7 @@ async function usageCommand(args = []) {
         });
       } else {
         if (!outputJson) {
-          if (service.name === 'Codex') {
-            displayCodexUsageStats(result.stats, result.origin, sourceLabel);
-          } else {
-            displayUsageStats(result.stats, result.origin, sourceLabel);
-          }
+          displayUnifiedUsageStats(result.stats, result.origin, sourceLabel);
         }
         allResults[service.name].push({
           source: sourceLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aihezu",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "description": "AI 开发环境配置工具 - 支持 Claude Code, Codex, Google Gemini 的本地化配置、代理设置与缓存清理",
   "main": "bin/aihezu.js",
   "bin": {