oc-auth-switcher 0.7.0 → 0.7.1

package/dist/cli.js

@@ -4,6 +4,7 @@
 // src/accounts.ts
 import fs from "fs";
 import path2 from "path";
+import { randomUUID } from "crypto";
 
 // src/constants.ts
 import path from "path";
@@ -69,18 +70,52 @@ function safeReadJSON(filePath, fallback) {
   }
   return fallback;
 }
-function safeWriteJSON(filePath, data) {
+var writeQueues = new Map;
+var MAX_RENAME_ATTEMPTS = 3;
+var RENAME_RETRY_CODES = new Set(["ENOENT", "EEXIST", "EPERM"]);
+function errorCode(error) {
+  return error && typeof error === "object" && "code" in error ? String(error.code) : undefined;
+}
+async function writeJSON(filePath, data, options) {
   ensureDir(filePath);
   const content = JSON.stringify(data, null, 2);
-  const tmpPath = filePath + ".tmp";
   const bakPath = filePath + ".bak";
+  const rename = options.rename ?? fs.promises.rename;
+  const retryDelayMs = options.retryDelayMs ?? 5;
   if (fs.existsSync(filePath)) {
     try {
-      fs.copyFileSync(filePath, bakPath);
+      await fs.promises.copyFile(filePath, bakPath);
     } catch {}
   }
-  fs.writeFileSync(tmpPath, content, { mode: 384 });
-  fs.renameSync(tmpPath, filePath);
+  let lastError;
+  for (let attempt = 1;attempt <= MAX_RENAME_ATTEMPTS; attempt++) {
+    const tmpPath = `${filePath}.${process.pid}-${randomUUID()}.tmp`;
+    try {
+      await fs.promises.writeFile(tmpPath, content, { mode: 384 });
+      await rename(tmpPath, filePath);
+      return;
+    } catch (error) {
+      lastError = error;
+      await fs.promises.rm(tmpPath, { force: true }).catch(() => {});
+      if (!RENAME_RETRY_CODES.has(errorCode(error) ?? "") || attempt === MAX_RENAME_ATTEMPTS) {
+        break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, retryDelayMs * attempt));
+    }
+  }
+  throw lastError;
+}
+function safeWriteJSON(filePath, data, options = {}) {
+  const previous = writeQueues.get(filePath) ?? Promise.resolve();
+  const current = previous.catch(() => {}).then(() => writeJSON(filePath, data, options)).catch((error) => {
+    console.warn(`[oc-auth-switcher] Could not safely write ${path2.basename(filePath)}:`, error instanceof Error ? error.message : String(error));
+  });
+  writeQueues.set(filePath, current);
+  current.finally(() => {
+    if (writeQueues.get(filePath) === current)
+      writeQueues.delete(filePath);
+  });
+  return current;
 }
 function loadAccounts() {
   const raw = safeReadJSON(ACCOUNTS_FILE, {
@@ -90,9 +125,9 @@ function loadAccounts() {
   return { accounts };
 }
 function saveAccounts(data) {
-  safeWriteJSON(ACCOUNTS_FILE, data);
+  return safeWriteJSON(ACCOUNTS_FILE, data);
 }
-function addAccount(account) {
+async function addAccount(account) {
   const data = loadAccounts();
   const idx = data.accounts.findIndex((a) => a.name === account.name);
   if (idx >= 0) {
@@ -100,23 +135,23 @@ function addAccount(account) {
   } else {
     data.accounts.push(account);
   }
-  saveAccounts(data);
+  await saveAccounts(data);
   return data;
 }
-function removeAccount(name) {
+async function removeAccount(name) {
   const data = loadAccounts();
   data.accounts = data.accounts.filter((a) => a.name !== name);
-  saveAccounts(data);
+  await saveAccounts(data);
   return data;
 }
-function updateAccountTokens(name, access, refresh, expires) {
+async function updateAccountTokens(name, access, refresh, expires) {
   const data = loadAccounts();
   const account = data.accounts.find((a) => a.name === name);
   if (account) {
     account.access = access;
     account.refresh = refresh;
     account.expires = expires;
-    saveAccounts(data);
+    await saveAccounts(data);
   }
 }
 async function refreshAccountToken(refreshTokenValue) {
@@ -207,7 +242,7 @@ function loadState() {
   return normalizeState(safeReadJSON(STATE_FILE, {}));
 }
 function saveState(state) {
-  safeWriteJSON(STATE_FILE, state);
+  return safeWriteJSON(STATE_FILE, state);
 }
 function getThresholds(config) {
   if (typeof config.threshold === "number") {
@@ -720,7 +755,7 @@ ${BOLD}Starting OAuth flow for account: ${CYAN}${name}${RESET}
 ${RED}Authentication failed${RESET}`);
     process.exit(1);
   }
-  addAccount({
+  await addAccount({
     name,
     access: exchangeResult.access,
     refresh: exchangeResult.refresh,
@@ -733,7 +768,7 @@ ${GREEN}Account "${name}" added successfully.${RESET}`);
   if (data.accounts.length === 1) {
     const state = loadState();
     state.currentAccount = name;
-    saveState(state);
+    await saveState(state);
     console.log(`
 ${YELLOW}This is the only account \u2014 set as active.${RESET}`);
   }
@@ -782,10 +817,10 @@ ${RED}Re-authentication failed${RESET}`);
   account.access = exchangeResult.access;
   account.refresh = exchangeResult.refresh;
   account.expires = exchangeResult.expires;
-  saveAccounts(data);
+  await saveAccounts(data);
   const state = loadState();
   clearAuthFailure(state, name);
-  saveState(state);
+  await saveState(state);
   console.log(`
 ${GREEN}Account "${name}" re-authenticated successfully.${RESET}`);
 }
@@ -798,7 +833,7 @@ async function refreshExpiredAccounts(data, state) {
       account.access = result.access;
       account.refresh = result.refresh;
       account.expires = result.expires;
-      updateAccountTokens(account.name, result.access, result.refresh, result.expires);
+      await updateAccountTokens(account.name, result.access, result.refresh, result.expires);
       clearAuthFailure(state, account.name);
     }
   }
@@ -809,7 +844,7 @@ async function cmdUsage(args) {
     const data = loadAccounts();
     const state = loadState();
     await refreshExpiredAccounts(data, state);
-    saveState(state);
+    await saveState(state);
     resolveStaleMetrics(state);
     ensureAccountsInState(state, data.accounts.map((a) => a.name));
     const thresholds = getThresholds(state.config);
@@ -871,7 +906,7 @@ ${BOLD}${CYAN}=== Auth Switcher Usage Dashboard ===${RESET}
     new Promise(() => {});
   }
 }
-function cmdConfig(args) {
+async function cmdConfig(args) {
   const state = loadState();
   if (args.length === 0) {
     const thresholds = getThresholds(state.config);
@@ -921,9 +956,9 @@ ${BOLD}${CYAN}=== Auth Switcher Configuration ===${RESET}
       console.log(`${GREEN}Reset to default threshold: ${(DEFAULT_THRESHOLD * 100).toFixed(0)}%${RESET}`);
     }
   }
-  saveState(state);
+  await saveState(state);
 }
-function cmdSwitch(args) {
+async function cmdSwitch(args) {
   const data = loadAccounts();
   if (data.accounts.length === 0) {
     console.error(`${RED}No accounts configured.${RESET}`);
@@ -950,7 +985,7 @@ ${RED}Usage: oc-auth-switcher switch <account-name>${RESET}`);
   console.log(`${CYAN}Switching to account: ${name}...${RESET}`);
   const state = loadState();
   state.currentAccount = name;
-  saveState(state);
+  await saveState(state);
   console.log(`${GREEN}Switched to "${name}". Will take effect on the next API request.${RESET}`);
 }
 function healthLabel(health) {
@@ -1044,7 +1079,7 @@ ${BOLD}${CYAN}=== Auth Switcher Status ===${RESET}
   console.log(`  ${DIM}State file:    ${STATE_FILE}${RESET}`);
   console.log();
 }
-function cmdRemove(args) {
+async function cmdRemove(args) {
   const name = args[0];
   if (!name) {
     console.error(`${RED}Usage: oc-auth-switcher remove <account-name>${RESET}`);
@@ -1056,12 +1091,12 @@ function cmdRemove(args) {
     console.error(`${RED}Account "${name}" not found${RESET}`);
     process.exit(1);
   }
-  removeAccount(name);
+  await removeAccount(name);
   console.log(`${GREEN}Account "${name}" removed.${RESET}`);
   const state = loadState();
   if (state.currentAccount === name) {
     state.currentAccount = null;
-    saveState(state);
+    await saveState(state);
     console.log(`${YELLOW}This was the active account. Rotation will pick a new one automatically.${RESET}`);
   }
 }
@@ -1112,18 +1147,18 @@ async function main() {
       break;
     case "config":
     case "c":
-      cmdConfig(commandArgs);
+      await cmdConfig(commandArgs);
       break;
     case "switch":
     case "s":
-      cmdSwitch(commandArgs);
+      await cmdSwitch(commandArgs);
       break;
     case "status":
       cmdStatus();
       break;
     case "remove":
     case "rm":
-      cmdRemove(commandArgs);
+      await cmdRemove(commandArgs);
       break;
     case "help":
     case "--help":

package/dist/index.js

@@ -406,6 +406,7 @@ async function exchange(input, verifier, redirectUri, expectedState) {
 // src/accounts.ts
 import fs from "node:fs";
 import path2 from "node:path";
+import { randomUUID } from "node:crypto";
 
 // src/constants.ts
 import path from "node:path";
@@ -454,18 +455,52 @@ function safeReadJSON(filePath, fallback) {
   }
   return fallback;
 }
-function safeWriteJSON(filePath, data) {
+var writeQueues = new Map;
+var MAX_RENAME_ATTEMPTS = 3;
+var RENAME_RETRY_CODES = new Set(["ENOENT", "EEXIST", "EPERM"]);
+function errorCode(error) {
+  return error && typeof error === "object" && "code" in error ? String(error.code) : undefined;
+}
+async function writeJSON(filePath, data, options) {
   ensureDir(filePath);
   const content = JSON.stringify(data, null, 2);
-  const tmpPath = filePath + ".tmp";
   const bakPath = filePath + ".bak";
+  const rename = options.rename ?? fs.promises.rename;
+  const retryDelayMs = options.retryDelayMs ?? 5;
   if (fs.existsSync(filePath)) {
     try {
-      fs.copyFileSync(filePath, bakPath);
+      await fs.promises.copyFile(filePath, bakPath);
     } catch {}
   }
-  fs.writeFileSync(tmpPath, content, { mode: 384 });
-  fs.renameSync(tmpPath, filePath);
+  let lastError;
+  for (let attempt = 1;attempt <= MAX_RENAME_ATTEMPTS; attempt++) {
+    const tmpPath = `${filePath}.${process.pid}-${randomUUID()}.tmp`;
+    try {
+      await fs.promises.writeFile(tmpPath, content, { mode: 384 });
+      await rename(tmpPath, filePath);
+      return;
+    } catch (error) {
+      lastError = error;
+      await fs.promises.rm(tmpPath, { force: true }).catch(() => {});
+      if (!RENAME_RETRY_CODES.has(errorCode(error) ?? "") || attempt === MAX_RENAME_ATTEMPTS) {
+        break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, retryDelayMs * attempt));
+    }
+  }
+  throw lastError;
+}
+function safeWriteJSON(filePath, data, options = {}) {
+  const previous = writeQueues.get(filePath) ?? Promise.resolve();
+  const current = previous.catch(() => {}).then(() => writeJSON(filePath, data, options)).catch((error) => {
+    console.warn(`[oc-auth-switcher] Could not safely write ${path2.basename(filePath)}:`, error instanceof Error ? error.message : String(error));
+  });
+  writeQueues.set(filePath, current);
+  current.finally(() => {
+    if (writeQueues.get(filePath) === current)
+      writeQueues.delete(filePath);
+  });
+  return current;
 }
 function loadAccounts() {
   const raw = safeReadJSON(ACCOUNTS_FILE, {
@@ -475,16 +510,16 @@ function loadAccounts() {
   return { accounts };
 }
 function saveAccounts(data) {
-  safeWriteJSON(ACCOUNTS_FILE, data);
+  return safeWriteJSON(ACCOUNTS_FILE, data);
 }
-function updateAccountTokens(name, access, refresh, expires) {
+async function updateAccountTokens(name, access, refresh, expires) {
   const data = loadAccounts();
   const account = data.accounts.find((a) => a.name === name);
   if (account) {
     account.access = access;
     account.refresh = refresh;
     account.expires = expires;
-    saveAccounts(data);
+    await saveAccounts(data);
   }
 }
 async function refreshAccountToken(refreshTokenValue) {
@@ -575,7 +610,7 @@ function loadState() {
   return normalizeState(safeReadJSON(STATE_FILE, {}));
 }
 function saveState(state) {
-  safeWriteJSON(STATE_FILE, state);
+  return safeWriteJSON(STATE_FILE, state);
 }
 function getThresholds(config) {
   if (typeof config.threshold === "number") {
@@ -865,13 +900,13 @@ function selectionSnapshot(state) {
     currentAccount: state.currentAccount
   };
 }
-function saveRequestState(state, initiallyLoaded) {
+async function saveRequestState(state, initiallyLoaded) {
   const onDisk = loadState();
   const selectionChangedSinceLoad = onDisk.currentAccount !== initiallyLoaded.currentAccount;
   if (selectionChangedSinceLoad) {
     state.currentAccount = onDisk.currentAccount;
   }
-  saveState(state);
+  await saveState(state);
 }
 function getRequestModel(body) {
   if (typeof body !== "string")
@@ -973,13 +1008,13 @@ var AuthSwitcherPlugin = async ({ client }) => {
                   account.access = result.access;
                   account.refresh = result.refresh;
                   account.expires = result.expires;
-                  updateAccountTokens(account.name, result.access, result.refresh, result.expires);
+                  await updateAccountTokens(account.name, result.access, result.refresh, result.expires);
                 } else {
                   markAuthFailure(state, account.name);
                   const available = accounts.filter((candidate) => !attemptedAccounts.has(candidate.name) && (!state.authFailures[candidate.name] || state.authFailures[candidate.name] <= Date.now()));
                   const next = available.length > 0 ? selectAccount(available, state, model).account : undefined;
                   if (!next) {
-                    saveRequestState(state, initiallyLoadedSelection);
+                    await saveRequestState(state, initiallyLoadedSelection);
                     throw new Error(`[oc-auth-switcher] All accounts failed token refresh`);
                   }
                   account = next;
@@ -1021,7 +1056,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
                       next.access = result.access;
                       next.refresh = result.refresh;
                       next.expires = result.expires;
-                      updateAccountTokens(next.name, result.access, result.refresh, result.expires);
+                      await updateAccountTokens(next.name, result.access, result.refresh, result.expires);
                     }
                   }
                   const retryHeaders = mergeHeaders(input, init);
@@ -1036,7 +1071,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
                   });
                   updateUsageFromHeaders(state, next.name, retryResponse.headers);
                   clearAuthFailure(state, next.name);
-                  saveRequestState(state, initiallyLoadedSelection);
+                  await saveRequestState(state, initiallyLoadedSelection);
                   return createStrippedStream(retryResponse);
                 }
               }
@@ -1044,7 +1079,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
             updateUsageFromHeaders(state, account.name, response.headers);
             clearAuthFailure(state, account.name);
             state.requestCount = (state.requestCount || 0) + 1;
-            saveRequestState(state, initiallyLoadedSelection);
+            await saveRequestState(state, initiallyLoadedSelection);
             return createStrippedStream(response);
           }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-auth-switcher",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "OpenCode auth plugin for multi-account Anthropic Claude Max rotation with automatic failover.",
   "type": "module",
   "main": "dist/index.js",