opencode-multi-account-core 0.3.3 → 0.3.5

package/dist/index.js

@@ -1177,7 +1177,7 @@ function readRoutingUsageTiers(usage) {
 // src/account-store.ts
 import { promises as fs5 } from "fs";
 import { createHash, randomBytes as randomBytes3 } from "crypto";
-import { dirname as dirname5, join as join5 } from "path";
+import { dirname as dirname5, join as join6 } from "path";
 import * as v4 from "valibot";
 
 // src/storage.ts
@@ -1274,24 +1274,41 @@ async function loadAccounts(storagePath) {
 
 // src/file-lock.ts
 import { promises as fs4 } from "fs";
-import { dirname as dirname4 } from "path";
+import { randomUUID as randomUUID2 } from "crypto";
+import { dirname as dirname4, join as join5 } from "path";
 var DEFAULT_STALE_MS = 1e4;
 var DEFAULT_RETRY_DELAY_MS = 50;
 var DEFAULT_MAX_RETRIES = 10;
+var OWNER_PREFIX = "owner-";
 function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function ownerPath(lockPath, ownerToken) {
+  return join5(lockPath, `${OWNER_PREFIX}${ownerToken}`);
+}
 async function removeIfStale(lockPath, staleMs) {
   try {
-    const stat = await fs4.stat(lockPath);
+    const entries = await fs4.readdir(lockPath);
+    const leasePath = entries.length === 1 && entries[0]?.startsWith(OWNER_PREFIX) ? join5(lockPath, entries[0]) : lockPath;
+    const stat = await fs4.stat(leasePath);
     if (Date.now() - stat.mtimeMs > staleMs) {
-      await fs4.rm(lockPath, { recursive: true, force: true });
+      if (leasePath !== lockPath) await fs4.unlink(leasePath);
+      await fs4.rmdir(lockPath);
     }
   } catch {
   }
 }
+async function releaseIfOwner(lockPath, ownerToken) {
+  try {
+    await fs4.unlink(ownerPath(lockPath, ownerToken));
+    await fs4.rmdir(lockPath);
+  } catch {
+  }
+}
 async function withDirectoryLock(targetPath, fn, options) {
   const lockPath = `${targetPath}.lock`;
+  const ownerToken = randomUUID2();
+  const leasePath = ownerPath(lockPath, ownerToken);
   const staleMs = options?.staleMs ?? DEFAULT_STALE_MS;
   const retryDelayMs = options?.retryDelayMs ?? DEFAULT_RETRY_DELAY_MS;
   const retries = options?.retries ?? DEFAULT_MAX_RETRIES;
@@ -1299,6 +1316,18 @@ async function withDirectoryLock(targetPath, fn, options) {
   for (let attempt = 0; ; attempt += 1) {
     try {
       await fs4.mkdir(lockPath, { mode: 448 });
+      try {
+        await fs4.writeFile(leasePath, ownerToken, { flag: "wx", mode: 384 });
+      } catch (error) {
+        await fs4.rmdir(lockPath).catch(() => {
+        });
+        if (error?.code === "ENOENT") {
+          if (attempt >= retries) throw new Error(`Failed to acquire lock for ${targetPath}`);
+          await sleep3(retryDelayMs * (attempt + 1));
+          continue;
+        }
+        throw error;
+      }
       break;
     } catch (error) {
       const code = error?.code;
@@ -1312,11 +1341,17 @@ async function withDirectoryLock(targetPath, fn, options) {
       await sleep3(retryDelayMs * (attempt + 1));
     }
   }
+  const renewal = setInterval(() => {
+    const now = /* @__PURE__ */ new Date();
+    void fs4.utimes(leasePath, now, now).catch(() => {
+    });
+  }, Math.max(1, Math.floor(staleMs / 3)));
+  renewal.unref();
   try {
     return await fn();
   } finally {
-    await fs4.rm(lockPath, { recursive: true, force: true }).catch(() => {
-    });
+    clearInterval(renewal);
+    await releaseIfOwner(lockPath, ownerToken);
   }
 }
 
@@ -1326,7 +1361,7 @@ var REFRESH_LOCK_STALE_MS = 45e3;
 var REFRESH_LOCK_RETRY_DELAY_MS = 100;
 var REFRESH_LOCK_RETRIES = 31;
 function resolveStoragePath(filename) {
-  return join5(getConfigDir2(), filename);
+  return join6(getConfigDir2(), filename);
 }
 function createEmptyStorage() {
   return { version: 1, accounts: [] };
@@ -2077,7 +2112,7 @@ function createRateLimitHandlers(dependencies) {
 
 // src/auth-migration.ts
 import { promises as fs6 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 var AUTH_JSON_FILENAME = "auth.json";
 function isValidOAuthCredential(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -2085,7 +2120,7 @@ function isValidOAuthCredential(value) {
   return candidate.type === "oauth" && typeof candidate.refresh === "string" && candidate.refresh.length > 0;
 }
 function resolveAuthJsonPath() {
-  return join6(getConfigDir2(), AUTH_JSON_FILENAME);
+  return join7(getConfigDir2(), AUTH_JSON_FILENAME);
 }
 async function readAuthJson() {
   const authPath = resolveAuthJsonPath();
@@ -2692,7 +2727,7 @@ var PoolChainConfigSchema = v5.object({
 // src/pool-config-store.ts
 import { promises as fs7 } from "fs";
 import { randomBytes as randomBytes4 } from "crypto";
-import { dirname as dirname6, join as join7 } from "path";
+import { dirname as dirname6, join as join8 } from "path";
 import * as v6 from "valibot";
 var POOL_CONFIG_FILENAME = "multiauth-pools.json";
 var FILE_MODE2 = 384;
@@ -2700,13 +2735,13 @@ function createEmptyConfig() {
   return { pools: [], chains: [] };
 }
 function getGlobalConfigPath() {
-  return join7(getConfigDir2(), POOL_CONFIG_FILENAME);
+  return join8(getConfigDir2(), POOL_CONFIG_FILENAME);
 }
 function buildTempPath2(targetPath) {
   return `${targetPath}.${randomBytes4(8).toString("hex")}.tmp`;
 }
 async function resolveConfigPath() {
-  const projectPath = join7(process.cwd(), ".opencode", POOL_CONFIG_FILENAME);
+  const projectPath = join8(process.cwd(), ".opencode", POOL_CONFIG_FILENAME);
   try {
     await fs7.access(projectPath);
     return projectPath;
@@ -3237,7 +3272,7 @@ function createOpenCodeNativeAuthLoader(options) {
 
 // src/native-plugin-bootstrap-auth.ts
 import { promises as fs8 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var AUTH_JSON_FILENAME2 = "auth.json";
 function hasCompleteOAuthCredential(account) {
   return typeof account.refreshToken === "string" && account.refreshToken.length > 0 && typeof account.accessToken === "string" && account.accessToken.length > 0 && typeof account.expiresAt === "number" && Number.isFinite(account.expiresAt);
@@ -3257,7 +3292,7 @@ function selectBootstrapAccount(accounts, activeAccountUuid) {
   return firstUsableAccount ?? completeAccounts[0];
 }
 async function readCurrentAuth(providerId) {
-  const authPath = join8(getConfigDir2(), AUTH_JSON_FILENAME2);
+  const authPath = join9(getConfigDir2(), AUTH_JSON_FILENAME2);
   let raw;
   try {
     raw = await fs8.readFile(authPath, "utf-8");