@token-dashboard/codex-usage-uploader 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@token-dashboard/codex-usage-uploader",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Codex 用量上报 CLI",
   "type": "module",
   "bin": {
@@ -12,15 +12,15 @@
     "README.md"
   ],
   "scripts": {
-    "init": "node bin/codex-usage-uploader.js init --backend-url http://localhost:8086",
-    "start": "node bin/codex-usage-uploader.js start",
-    "stop": "node bin/codex-usage-uploader.js stop",
-    "restart": "node bin/codex-usage-uploader.js restart",
-    "status": "node bin/codex-usage-uploader.js status",
-    "usage": "node bin/codex-usage-uploader.js usage",
-    "logs": "node bin/codex-usage-uploader.js logs",
-    "clear": "node bin/codex-usage-uploader.js clear",
-    "uninstall": "node bin/codex-usage-uploader.js uninstall"
+    "init": "node ./bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json init --backend-url http://localhost:8086",
+    "start": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json start",
+    "stop": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json stop",
+    "restart": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json restart",
+    "status": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json status",
+    "usage": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json usage",
+    "logs": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json logs",
+    "clear": "node ./bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json clear",
+    "uninstall": "node bin/codex-usage-uploader.js --config-file $HOME/.codex-usage-uploader-dev/config.json uninstall"
   },
   "engines": {
     "node": ">=22.13.0"

package/src/collector.js

@@ -516,7 +516,7 @@ export class CodexUsageUploader {
     let lastError = null;
     const collectorBody = this.collectorRequestBody();
 
-    const rows = this.stateDb.iterDuePendingBatches();
+    const rows = this.stateDb.iterPendingBatches();
 
     const uploadOne = async (row) => {
       const payload = this.sanitizeUploadPayload(JSON.parse(row.payload_json));

package/src/runtime-config.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import {
   CLI_NAME,
@@ -23,11 +24,21 @@ import {
 } from './constants.js';
 import { stableStringify } from './utils.js';
 
+const DEFAULT_INSTALL_ROOT_BASE = path.basename(DEFAULT_INSTALL_ROOT);
+
+export function deriveEnvSuffix(installRoot) {
+  const base = path.basename(installRoot);
+  if (!base.startsWith(`${DEFAULT_INSTALL_ROOT_BASE}-`)) return '';
+  const envName = base.slice(DEFAULT_INSTALL_ROOT_BASE.length + 1);
+  return envName ? `-${envName}` : '';
+}
+
 export function defaultRuntimeConfig(configFile = DEFAULT_CONFIG_FILE) {
   const installRoot = path.dirname(configFile);
+  const envSuffix = deriveEnvSuffix(installRoot);
   const appRoot = path.join(installRoot, 'app');
   const currentAppDir = path.join(appRoot, 'current');
-  const launchdLabel = DEFAULT_LAUNCHD_LABEL;
+  const launchdLabel = `${DEFAULT_LAUNCHD_LABEL}${envSuffix}`;
   return {
     configFile,
     installRoot,
@@ -43,7 +54,7 @@ export function defaultRuntimeConfig(configFile = DEFAULT_CONFIG_FILE) {
     packageSpec: '',
     localBinDir: path.join(installRoot, 'bin'),
     localBinPath: path.join(installRoot, 'bin', CLI_NAME),
-    homeBinLink: DEFAULT_HOME_BIN_LINK,
+    homeBinLink: path.join(os.homedir(), 'bin', `${CLI_NAME}${envSuffix}`),
     stdoutLogPath: path.join(installRoot, 'logs', path.basename(DEFAULT_STDOUT_LOG_PATH)),
     stderrLogPath: path.join(installRoot, 'logs', path.basename(DEFAULT_STDERR_LOG_PATH)),
     launchdLabel,
@@ -69,10 +80,11 @@ export function loadRuntimeConfig(configFile = DEFAULT_CONFIG_FILE) {
 
 export function normalizeRuntimeConfig(runtime) {
   const installRoot = runtime.installRoot || DEFAULT_INSTALL_ROOT;
+  const envSuffix = deriveEnvSuffix(installRoot);
   const appRoot = runtime.appRoot || path.join(installRoot, 'app');
   const currentAppDir = runtime.currentAppDir || path.join(appRoot, 'current');
-  const localBinDir = runtime.localBinDir || DEFAULT_LOCAL_BIN_DIR;
-  const launchdLabel = runtime.launchdLabel || DEFAULT_LAUNCHD_LABEL;
+  const localBinDir = runtime.localBinDir || path.join(installRoot, 'bin');
+  const launchdLabel = runtime.launchdLabel || `${DEFAULT_LAUNCHD_LABEL}${envSuffix}`;
   const defaultPlistPath = path.join(installRoot, 'launchd', `${launchdLabel}.plist`);
   const defaultLaunchAgentPath = path.join(
     path.dirname(DEFAULT_LAUNCH_AGENT_PATH),
@@ -99,7 +111,7 @@ export function normalizeRuntimeConfig(runtime) {
     packageSpec: runtime.packageSpec || '',
     localBinDir,
     localBinPath: runtime.localBinPath || path.join(localBinDir, CLI_NAME),
-    homeBinLink: runtime.homeBinLink || DEFAULT_HOME_BIN_LINK,
+    homeBinLink: runtime.homeBinLink || path.join(os.homedir(), 'bin', `${CLI_NAME}${envSuffix}`),
     stdoutLogPath: runtime.stdoutLogPath || path.join(installRoot, 'logs', 'stdout.log'),
     stderrLogPath: runtime.stderrLogPath || path.join(installRoot, 'logs', 'stderr.log'),
     launchdLabel,

package/src/state-db.js

@@ -207,8 +207,8 @@ export class StateDb {
       this.db.prepare(`
         INSERT INTO pending_batches(
           batch_key, status, payload_json, payload_bytes, session_count, turn_count, event_count,
-          attempt_count, next_retry_at, created_at, updated_at
-        ) VALUES (?, 'buffering', ?, ?, ?, ?, ?, 0, NULL, ?, ?)
+          attempt_count, created_at, updated_at
+        ) VALUES (?, 'buffering', ?, ?, ?, ?, ?, 0, ?, ?)
       `).run(randomBatchKey(), payloadJson, payloadBytes, sessionCount, turnCount, eventCount, ts, ts);
     }
     return this.getBufferingBatch();
@@ -224,12 +224,12 @@ export class StateDb {
     const ts = nowTs();
     const updateStmt = this.db.prepare(`
       UPDATE pending_batches
-      SET status = 'pending', next_retry_at = ?, updated_at = ?
+      SET status = 'pending', updated_at = ?
       WHERE id = ?
     `);
     for (const row of rows) {
       if (force || ts - Number(row.created_at) >= MAX_BUFFER_AGE_SECONDS) {
-        updateStmt.run(ts, ts, row.id);
+        updateStmt.run(ts, row.id);
         sealed += 1;
       }
     }
@@ -247,29 +247,21 @@ export class StateDb {
       const ts = nowTs();
       this.db.prepare(`
         UPDATE pending_batches
-        SET status = 'pending', next_retry_at = ?, updated_at = ?
+        SET status = 'pending', updated_at = ?
         WHERE id = ?
-      `).run(ts, ts, row.id);
+      `).run(ts, row.id);
     }
     return shouldSeal;
   }
 
-  iterDuePendingBatches() {
+  iterPendingBatches() {
     const stmt = this.db.prepare(`
       SELECT * FROM pending_batches
-      WHERE status = 'pending' AND (next_retry_at IS NULL OR next_retry_at <= ?)
+      WHERE status = 'pending'
       ORDER BY created_at ASC, id ASC
     `);
     stmt.setReadBigInts(true);
-    return stmt.all(nowTs());
-  }
-
-  markAllPendingDue() {
-    this.db.prepare(`
-      UPDATE pending_batches
-      SET next_retry_at = 0, updated_at = ?
-      WHERE status = 'pending'
-    `).run(nowTs());
+    return stmt.all();
   }
 
   markBatchUploaded(batchId) {
@@ -277,12 +269,11 @@ export class StateDb {
   }
 
   markBatchFailed(batchId, attemptCount, errorMessage) {
-    const nextRetryAt = nowTs() + Math.min(300, 2 ** Math.min(attemptCount, 8));
     this.db.prepare(`
       UPDATE pending_batches
-      SET attempt_count = ?, next_retry_at = ?, last_error = ?, updated_at = ?
+      SET attempt_count = ?, last_error = ?, updated_at = ?
       WHERE id = ?
-    `).run(attemptCount, nextRetryAt, String(errorMessage).slice(0, 1000), nowTs(), batchId);
+    `).run(attemptCount, String(errorMessage).slice(0, 1000), nowTs(), batchId);
   }
 
   resetBackfillState() {