@pikoloo/codex-proxy 1.0.7 → 1.2.2

package/src/server-settings.js

@@ -3,11 +3,9 @@ import { join } from 'path';
 import { CONFIG_DIR } from './account-manager.js';
 
 const SETTINGS_FILE = join(CONFIG_DIR, 'settings.json');
-const MULTI_ACCOUNT_ROTATION_ENV = 'CODEX_CLAUDE_PROXY_ENABLE_MULTI_ACCOUNT_ROTATION';
 
 const DEFAULT_SETTINGS = {
     haikuKiloModel: 'minimax/minimax-m2.5:free',
-    accountStrategy: 'sticky',
     configureClaudeOnStartup: false,
     modelMappings: {
         opus: 'gpt-5.5',
@@ -21,6 +19,30 @@ const DEFAULT_SETTINGS = {
     }
 };
 
+export function normalizeSettings(data = {}) {
+    const modelMappings = data?.modelMappings && typeof data.modelMappings === 'object' && !Array.isArray(data.modelMappings)
+        ? data.modelMappings
+        : {};
+    const reasoningMappings = data?.reasoningMappings && typeof data.reasoningMappings === 'object' && !Array.isArray(data.reasoningMappings)
+        ? data.reasoningMappings
+        : {};
+
+    return {
+        haikuKiloModel: typeof data.haikuKiloModel === 'string'
+            ? data.haikuKiloModel
+            : DEFAULT_SETTINGS.haikuKiloModel,
+        configureClaudeOnStartup: data.configureClaudeOnStartup === true,
+        modelMappings: {
+            ...DEFAULT_SETTINGS.modelMappings,
+            ...modelMappings
+        },
+        reasoningMappings: {
+            ...DEFAULT_SETTINGS.reasoningMappings,
+            ...reasoningMappings
+        }
+    };
+}
+
 function ensureConfigDir() {
     if (!existsSync(CONFIG_DIR)) {
         mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
@@ -31,62 +53,32 @@ export function getServerSettings() {
     ensureConfigDir();
 
     if (!existsSync(SETTINGS_FILE)) {
-        return {
-            ...DEFAULT_SETTINGS,
-            modelMappings: { ...DEFAULT_SETTINGS.modelMappings },
-            reasoningMappings: { ...DEFAULT_SETTINGS.reasoningMappings }
-        };
+        return normalizeSettings();
     }
 
     try {
         const data = JSON.parse(readFileSync(SETTINGS_FILE, 'utf8'));
-        const modelMappings = data?.modelMappings && typeof data.modelMappings === 'object' && !Array.isArray(data.modelMappings)
-            ? data.modelMappings
-            : {};
-        const reasoningMappings = data?.reasoningMappings && typeof data.reasoningMappings === 'object' && !Array.isArray(data.reasoningMappings)
-            ? data.reasoningMappings
-            : {};
-        return {
-            ...DEFAULT_SETTINGS,
-            ...data,
-            modelMappings: {
-                ...DEFAULT_SETTINGS.modelMappings,
-                ...modelMappings
-            },
-            reasoningMappings: {
-                ...DEFAULT_SETTINGS.reasoningMappings,
-                ...reasoningMappings
-            }
-        };
+        return normalizeSettings(data);
     } catch (error) {
         console.error('[ServerSettings] Failed to read settings:', error.message);
-        return {
-            ...DEFAULT_SETTINGS,
-            modelMappings: { ...DEFAULT_SETTINGS.modelMappings },
-            reasoningMappings: { ...DEFAULT_SETTINGS.reasoningMappings }
-        };
+        return normalizeSettings();
     }
 }
 
 export function setServerSettings(patch = {}) {
     const current = getServerSettings();
-    const next = { ...current, ...patch };
+    const next = normalizeSettings({ ...current, ...patch });
 
     ensureConfigDir();
     writeFileSync(SETTINGS_FILE, JSON.stringify(next, null, 2), { mode: 0o600 });
     return next;
 }
 
-export function isMultiAccountRotationEnabled(env = process.env) {
-    return env[MULTI_ACCOUNT_ROTATION_ENV] === 'true';
-}
-
-export { SETTINGS_FILE, MULTI_ACCOUNT_ROTATION_ENV };
+export { SETTINGS_FILE };
 
 export default {
     getServerSettings,
     setServerSettings,
-    isMultiAccountRotationEnabled,
-    MULTI_ACCOUNT_ROTATION_ENV,
+    normalizeSettings,
     SETTINGS_FILE
 };

package/src/utils/logger.js

@@ -140,8 +140,21 @@ class Logger extends EventEmitter {
 
     response(status, details = {}) {
         const parts = [`status=${status}`];
+        const usage = details.usage || {};
+        const inputTokens = usage.input_tokens ?? usage.prompt_tokens;
+        const outputTokens = usage.output_tokens ?? usage.completion_tokens;
+        const cacheTokens = usage.cache_read_input_tokens ?? usage.prompt_tokens_details?.cached_tokens;
+        const totalTokens = details.tokens ?? usage.total_tokens ?? (
+            Number.isFinite(inputTokens) && Number.isFinite(outputTokens)
+                ? inputTokens + outputTokens
+                : undefined
+        );
+
         if (details.model) parts.push(`model=${details.model}`);
-        if (details.tokens) parts.push(`tokens=${details.tokens}`);
+        if (Number.isFinite(totalTokens)) parts.push(`tokens=${totalTokens}`);
+        if (Number.isFinite(inputTokens)) parts.push(`input=${inputTokens}`);
+        if (Number.isFinite(outputTokens)) parts.push(`output=${outputTokens}`);
+        if (Number.isFinite(cacheTokens)) parts.push(`cache=${cacheTokens}`);
         if (details.duration) parts.push(`${details.duration}ms`);
         if (details.error) parts.push(`error=${details.error}`);
         

package/docs/ACCOUNTS.md

@@ -1,202 +0,0 @@
-# Account Management
-
-## Storage Structure
-
-### Main Registry
-
-**Location:** `~/.codex-claude-proxy/accounts.json`
-
-```json
-{
-  "accounts": [
-    {
-      "email": "user@gmail.com",
-      "accountId": "d41e9636-16d8-42be-91da-7ea8773bfb7e",
-      "planType": "plus",
-      "accessToken": "eyJhbGciOiJSUzI1NiIs...",
-      "refreshToken": "rt_WpTMn1...",
-      "idToken": "eyJhbGciOiJSUzI1NiIs...",
-      "expiresAt": 1770886178000,
-      "addedAt": "2026-02-13T04:00:00.000Z",
-      "lastUsed": "2026-02-13T04:30:00.000Z",
-      "quota": {
-        "usage": {...},
-        "account": {...},
-        "lastChecked": "2026-02-14T10:00:00.000Z"
-      }
-    }
-  ],
-  "activeAccount": "user@gmail.com",
-  "version": 1
-}
-```
-
-### Per-Account Tokens
-
-**Location:** `~/.codex-claude-proxy/accounts/<email>/auth.json`
-
-```json
-{
-  "auth_mode": "chatgpt",
-  "OPENAI_API_KEY": null,
-  "tokens": {
-    "id_token": "...",
-    "access_token": "...",
-    "refresh_token": "...",
-    "account_id": "..."
-  },
-  "last_refresh": "2026-02-14T10:00:00.000Z"
-}
-```
-
-## Operations
-
-### Add Account (OAuth)
-
-```bash
-curl -X POST http://localhost:8081/accounts/add
-
-# Returns OAuth URL to open in browser
-```
-
-### Import from Codex App
-
-```bash
-curl -X POST http://localhost:8081/accounts/import
-
-# Imports from ~/.codex/auth.json
-```
-
-### List Accounts
-
-```bash
-curl http://localhost:8081/accounts
-
-# Response
-{
-  "accounts": [
-    {
-      "email": "user@gmail.com",
-      "accountId": "...",
-      "planType": "plus",
-      "addedAt": "...",
-      "lastUsed": "...",
-      "isActive": true,
-      "tokenExpired": false,
-      "quota": {...}
-    }
-  ],
-  "activeAccount": "user@gmail.com",
-  "total": 1
-}
-```
-
-### Switch Active Account
-
-```bash
-curl -X POST http://localhost:8081/accounts/switch \
-  -H "Content-Type: application/json" \
-  -d '{"email":"other@gmail.com"}'
-```
-
-Switching:
-1. Updates `activeAccount` in `accounts.json`
-2. Updates auth file for the account
-3. Next API calls use new account's credentials
-
-### Remove Account
-
-```bash
-curl -X DELETE http://localhost:8081/accounts/user@gmail.com
-```
-
-Removes:
-- Account from registry
-- Per-account token directory
-
-### Refresh Tokens
-
-```bash
-# Active account
-curl -X POST http://localhost:8081/accounts/refresh
-
-# Specific account
-curl -X POST http://localhost:8081/accounts/user@gmail.com/refresh
-
-# All accounts
-curl -X POST http://localhost:8081/accounts/refresh/all
-```
-
-## Token Lifecycle
-
-### Expiration
-
-- Access tokens expire in ~1 hour (3600 seconds)
-- Refresh tokens are long-lived (weeks/months)
-
-### Auto-Refresh
-
-- Background refresh every **55 minutes**
-- Startup refresh 2 seconds after server start
-- Proactive refresh 5 minutes before expiry
-
-### Token Validation
-
-Before each API call:
-1. Check if token is expired or expiring within 5 minutes
-2. If yes, refresh using refresh token
-3. Use new access token for the call
-
-## Quota Tracking
-
-### Fetch Quota
-
-```bash
-curl http://localhost:8081/accounts/quota
-
-# Response
-{
-  "success": true,
-  "email": "user@gmail.com",
-  "quota": {
-    "usage": {
-      "totalTokenUsage": 15,
-      "limit": 100,
-      "remaining": 85,
-      "percentage": 15,
-      "resetAt": "..."
-    },
-    "account": {...}
-  },
-  "cached": false
-}
-```
-
-### Web UI Quota Display Rules
-
-- The Accounts table displays **remaining quota** as a percentage.
-- Remaining percentage is normalized to `0-100` to avoid broken UI values.
-- If `limitReached=true` or `allowed=false`, UI shows quota as exhausted even when percentage data is missing.
-- If usage data is unavailable, UI shows `-` instead of rendering a broken bar.
-- Reset window is shown using `usage.resetAt` (with fallback to `usage.raw.rate_limit.primary_window.reset_at`).
-- UI also shows a relative countdown (e.g. `Resets in 6d 13h`) when reset data is available.
-
-### Refresh All Quotas
-
-```bash
-curl http://localhost:8081/accounts/quota/all
-```
-
-## Account Persistence
-
-On server startup:
-1. `ensureAccountsPersist()` loads accounts
-2. Restores active account's auth
-3. Starts auto-refresh timer
-
-## Security
-
-- Tokens stored locally in `~/.codex-claude-proxy/`
-- Directory permissions: user read/write only
-- Never logged or exposed in API responses
-- Per-account isolation via separate directories

package/src/account-rotation/index.js

@@ -1,93 +0,0 @@
-import {
-    markRateLimited,
-    markInvalid,
-    clearInvalid,
-    isAllRateLimited,
-    getMinWaitTimeMs,
-    clearExpiredLimits
-} from './rate-limits.js';
-
-import { createStrategy, STRATEGIES } from './strategies/index.js';
-
-export class AccountRotator {
-    constructor(accountManager, strategyName = 'sticky') {
-        this.accountManager = accountManager;
-        this.strategy = createStrategy(strategyName);
-    }
-
-    selectAccount(modelId, options = {}) {
-        const { accounts } = this.accountManager.listAccounts();
-        return this.strategy.selectAccount(accounts, modelId, options);
-    }
-
-    markRateLimited(email, resetMs, modelId) {
-        const { accounts } = this.accountManager.listAccounts();
-        markRateLimited(accounts, email, resetMs, modelId);
-        this.accountManager.save();
-    }
-
-    markInvalid(email, reason) {
-        const { accounts } = this.accountManager.listAccounts();
-        markInvalid(accounts, email, reason);
-        this.accountManager.save();
-    }
-
-    clearInvalid(email) {
-        const { accounts } = this.accountManager.listAccounts();
-        clearInvalid(accounts, email);
-        this.accountManager.save();
-    }
-
-    isAllRateLimited(modelId) {
-        const { accounts } = this.accountManager.listAccounts();
-        return isAllRateLimited(accounts, modelId);
-    }
-
-    getMinWaitTimeMs(modelId) {
-        const { accounts } = this.accountManager.listAccounts();
-        return getMinWaitTimeMs(accounts, modelId);
-    }
-
-    notifySuccess(account, modelId) {
-        if (this.strategy.notifySuccess) {
-            this.strategy.notifySuccess(account, modelId);
-        }
-    }
-
-    notifyRateLimit(account, modelId) {
-        if (this.strategy.notifyRateLimit) {
-            this.strategy.notifyRateLimit(account, modelId);
-        }
-    }
-
-    notifyFailure(account, modelId) {
-        if (this.strategy.notifyFailure) {
-            this.strategy.notifyFailure(account, modelId);
-        }
-    }
-
-    clearExpiredLimits() {
-        const { accounts } = this.accountManager.listAccounts();
-        clearExpiredLimits(accounts);
-        this.accountManager.save();
-    }
-
-    getStrategyName() {
-        return this.strategy.name;
-    }
-
-    getStrategyLabel() {
-        return this.strategy.label;
-    }
-}
-
-export {
-    createStrategy,
-    STRATEGIES,
-    markRateLimited,
-    markInvalid,
-    clearInvalid,
-    isAllRateLimited,
-    getMinWaitTimeMs,
-    clearExpiredLimits
-};