@hasna/connectors 1.1.12 → 1.1.13

package/bin/serve.js

@@ -19,7 +19,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __require = import.meta.require;
 
 // src/server/serve.ts
-import { existsSync as existsSync4, readdirSync as readdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync5, readdirSync as readdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync5 } from "fs";
 
 // src/db/database.ts
 import { Database } from "bun:sqlite";
@@ -118,9 +118,9 @@ function deleteAgent(id, db) {
 }
 
 // src/server/serve.ts
-import { join as join5, dirname as dirname3, extname, basename } from "path";
+import { join as join6, dirname as dirname3, extname, basename } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { homedir as homedir4 } from "os";
+import { homedir as homedir5 } from "os";
 
 // src/lib/registry.ts
 import { existsSync, readFileSync } from "fs";
@@ -6212,10 +6212,80 @@ function removeConnector(name, targetDir = process.cwd()) {
 }
 
 // src/server/auth.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3, readdirSync as readdirSync2, rmSync as rmSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync4, readdirSync as readdirSync2, rmSync as rmSync2, statSync as statSync2 } from "fs";
 import { randomBytes } from "crypto";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
+import { join as join5 } from "path";
+
+// src/lib/lock.ts
+import { openSync, closeSync, unlinkSync, existsSync as existsSync3 } from "fs";
 import { join as join4 } from "path";
+import { homedir as homedir3 } from "os";
+import { mkdirSync as mkdirSync3 } from "fs";
+var LOCK_TIMEOUT_MS = 5000;
+var LOCK_RETRY_MS = 100;
+var STALE_LOCK_MS = 30000;
+
+class LockTimeoutError extends Error {
+  connector;
+  constructor(connector) {
+    super(`Could not acquire write lock for connector "${connector}" within ${LOCK_TIMEOUT_MS}ms. Another agent may be writing. Try again shortly.`);
+    this.connector = connector;
+    this.name = "LockTimeoutError";
+  }
+}
+function lockPath(connector) {
+  const dir = join4(homedir3(), ".connectors", `connect-${connector}`);
+  mkdirSync3(dir, { recursive: true });
+  return join4(dir, ".write.lock");
+}
+function isStale(path) {
+  try {
+    const { statSync: statSync2 } = __require("fs");
+    const stat = statSync2(path);
+    return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
+  } catch {
+    return false;
+  }
+}
+function tryAcquire(path) {
+  if (existsSync3(path) && isStale(path)) {
+    try {
+      unlinkSync(path);
+    } catch {}
+  }
+  try {
+    const fd = openSync(path, "wx");
+    closeSync(fd);
+    return true;
+  } catch (e) {
+    if (e.code === "EEXIST")
+      return false;
+    throw e;
+  }
+}
+function release(path) {
+  try {
+    unlinkSync(path);
+  } catch {}
+}
+async function withWriteLock(connector, fn) {
+  const path = lockPath(connector);
+  const deadline = Date.now() + LOCK_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (tryAcquire(path)) {
+      try {
+        return await fn();
+      } finally {
+        release(path);
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_MS));
+  }
+  throw new LockTimeoutError(connector);
+}
+
+// src/server/auth.ts
 var FETCH_TIMEOUT = 1e4;
 var oauthStateStore = new Map;
 var GOOGLE_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
@@ -6271,12 +6341,12 @@ function getAuthType(name) {
 }
 function getConnectorConfigDir(name) {
   const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
-  return join4(homedir3(), ".connectors", connectorName);
+  return join5(homedir4(), ".connectors", connectorName);
 }
 function getCurrentProfile(name) {
   const configDir = getConnectorConfigDir(name);
-  const currentProfileFile = join4(configDir, "current_profile");
-  if (existsSync3(currentProfileFile)) {
+  const currentProfileFile = join5(configDir, "current_profile");
+  if (existsSync4(currentProfileFile)) {
     try {
       return readFileSync3(currentProfileFile, "utf-8").trim() || "default";
     } catch {
@@ -6290,14 +6360,14 @@ function loadProfileConfig(name) {
   const profile = getCurrentProfile(name);
   let flatConfig = {};
   let dirConfig = {};
-  const profileFile = join4(configDir, "profiles", `${profile}.json`);
-  if (existsSync3(profileFile)) {
+  const profileFile = join5(configDir, "profiles", `${profile}.json`);
+  if (existsSync4(profileFile)) {
     try {
       flatConfig = JSON.parse(readFileSync3(profileFile, "utf-8"));
     } catch {}
   }
-  const profileDirConfig = join4(configDir, "profiles", profile, "config.json");
-  if (existsSync3(profileDirConfig)) {
+  const profileDirConfig = join5(configDir, "profiles", profile, "config.json");
+  if (existsSync4(profileDirConfig)) {
     try {
       dirConfig = JSON.parse(readFileSync3(profileDirConfig, "utf-8"));
     } catch {}
@@ -6310,8 +6380,8 @@ function loadProfileConfig(name) {
 function loadTokens(name) {
   const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile(name);
-  const tokensFile = join4(configDir, "profiles", profile, "tokens.json");
-  if (existsSync3(tokensFile)) {
+  const tokensFile = join5(configDir, "profiles", profile, "tokens.json");
+  if (existsSync4(tokensFile)) {
     try {
       return JSON.parse(readFileSync3(tokensFile, "utf-8"));
     } catch {
@@ -6358,15 +6428,18 @@ function getAuthStatus(name) {
     envVarTotalCount
   };
 }
-function saveApiKey(name, key, field) {
+async function saveApiKey(name, key, field) {
+  return withWriteLock(name, () => _saveApiKey(name, key, field));
+}
+function _saveApiKey(name, key, field) {
   const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile(name);
   const keyField = field || guessKeyField(name);
   if (keyField === "clientId" || keyField === "clientSecret") {
-    const credentialsFile = join4(configDir, "credentials.json");
-    mkdirSync3(configDir, { recursive: true });
+    const credentialsFile = join5(configDir, "credentials.json");
+    mkdirSync4(configDir, { recursive: true });
     let creds = {};
-    if (existsSync3(credentialsFile)) {
+    if (existsSync4(credentialsFile)) {
       try {
         creds = JSON.parse(readFileSync3(credentialsFile, "utf-8"));
       } catch {}
@@ -6375,9 +6448,9 @@ function saveApiKey(name, key, field) {
     writeFileSync2(credentialsFile, JSON.stringify(creds, null, 2));
     return;
   }
-  const profileFile = join4(configDir, "profiles", `${profile}.json`);
-  const profileDir = join4(configDir, "profiles", profile);
-  if (existsSync3(profileFile)) {
+  const profileFile = join5(configDir, "profiles", `${profile}.json`);
+  const profileDir = join5(configDir, "profiles", profile);
+  if (existsSync4(profileFile)) {
     let config = {};
     try {
       config = JSON.parse(readFileSync3(profileFile, "utf-8"));
@@ -6386,10 +6459,10 @@ function saveApiKey(name, key, field) {
     writeFileSync2(profileFile, JSON.stringify(config, null, 2));
     return;
   }
-  if (existsSync3(profileDir)) {
-    const configFile = join4(profileDir, "config.json");
+  if (existsSync4(profileDir)) {
+    const configFile = join5(profileDir, "config.json");
     let config = {};
-    if (existsSync3(configFile)) {
+    if (existsSync4(configFile)) {
       try {
         config = JSON.parse(readFileSync3(configFile, "utf-8"));
       } catch {}
@@ -6398,8 +6471,8 @@ function saveApiKey(name, key, field) {
     writeFileSync2(configFile, JSON.stringify(config, null, 2));
     return;
   }
-  mkdirSync3(profileDir, { recursive: true });
-  writeFileSync2(join4(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
+  mkdirSync4(profileDir, { recursive: true });
+  writeFileSync2(join5(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
 function guessKeyField(name) {
   const docs = getConnectorDocs(name);
@@ -6417,8 +6490,8 @@ function guessKeyField(name) {
 }
 function getOAuthConfig(name) {
   const configDir = getConnectorConfigDir(name);
-  const credentialsFile = join4(configDir, "credentials.json");
-  if (existsSync3(credentialsFile)) {
+  const credentialsFile = join5(configDir, "credentials.json");
+  if (existsSync4(credentialsFile)) {
     try {
       const creds = JSON.parse(readFileSync3(credentialsFile, "utf-8"));
       return { clientId: creds.clientId, clientSecret: creds.clientSecret };
@@ -6499,12 +6572,15 @@ async function exchangeOAuthCode(name, code, redirectUri) {
 function saveOAuthTokens(name, tokens) {
   const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile(name);
-  const profileDir = join4(configDir, "profiles", profile);
-  mkdirSync3(profileDir, { recursive: true });
-  const tokensFile = join4(profileDir, "tokens.json");
+  const profileDir = join5(configDir, "profiles", profile);
+  mkdirSync4(profileDir, { recursive: true });
+  const tokensFile = join5(profileDir, "tokens.json");
   writeFileSync2(tokensFile, JSON.stringify(tokens, null, 2), { mode: 384 });
 }
 async function refreshOAuthToken(name) {
+  return withWriteLock(name, () => _refreshOAuthToken(name));
+}
+async function _refreshOAuthToken(name) {
   const oauthConfig = getOAuthConfig(name);
   const currentTokens = loadTokens(name);
   if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
@@ -6541,14 +6617,14 @@ async function refreshOAuthToken(name) {
 }
 function listProfiles(name) {
   const configDir = getConnectorConfigDir(name);
-  const profilesDir = join4(configDir, "profiles");
-  if (!existsSync3(profilesDir))
+  const profilesDir = join5(configDir, "profiles");
+  if (!existsSync4(profilesDir))
     return ["default"];
   const seen = new Set;
   try {
     const entries = readdirSync2(profilesDir);
     for (const entry of entries) {
-      const fullPath = join4(profilesDir, entry);
+      const fullPath = join5(profilesDir, entry);
       const stat = statSync2(fullPath);
       if (stat.isDirectory()) {
         seen.add(entry);
@@ -6562,24 +6638,24 @@ function listProfiles(name) {
 }
 function switchProfile(name, profile) {
   const configDir = getConnectorConfigDir(name);
-  mkdirSync3(configDir, { recursive: true });
-  writeFileSync2(join4(configDir, "current_profile"), profile);
+  mkdirSync4(configDir, { recursive: true });
+  writeFileSync2(join5(configDir, "current_profile"), profile);
 }
 function deleteProfile(name, profile) {
   if (profile === "default")
     return false;
   const configDir = getConnectorConfigDir(name);
-  const profilesDir = join4(configDir, "profiles");
-  const profileFile = join4(profilesDir, `${profile}.json`);
-  if (existsSync3(profileFile)) {
+  const profilesDir = join5(configDir, "profiles");
+  const profileFile = join5(profilesDir, `${profile}.json`);
+  if (existsSync4(profileFile)) {
     rmSync2(profileFile);
     if (getCurrentProfile(name) === profile) {
       switchProfile(name, "default");
     }
     return true;
   }
-  const profileDir = join4(profilesDir, profile);
-  if (existsSync3(profileDir)) {
+  const profileDir = join5(profilesDir, profile);
+  if (existsSync4(profileDir)) {
     rmSync2(profileDir, { recursive: true });
     if (getCurrentProfile(name) === profile) {
       switchProfile(name, "default");
@@ -6602,20 +6678,20 @@ function resolveDashboardDir() {
   const candidates = [];
   try {
     const scriptDir = dirname3(fileURLToPath3(import.meta.url));
-    candidates.push(join5(scriptDir, "..", "dashboard", "dist"));
-    candidates.push(join5(scriptDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join6(scriptDir, "..", "dashboard", "dist"));
+    candidates.push(join6(scriptDir, "..", "..", "dashboard", "dist"));
   } catch {}
   if (process.argv[1]) {
     const mainDir = dirname3(process.argv[1]);
-    candidates.push(join5(mainDir, "..", "dashboard", "dist"));
-    candidates.push(join5(mainDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join6(mainDir, "..", "dashboard", "dist"));
+    candidates.push(join6(mainDir, "..", "..", "dashboard", "dist"));
   }
-  candidates.push(join5(process.cwd(), "dashboard", "dist"));
+  candidates.push(join6(process.cwd(), "dashboard", "dist"));
   for (const candidate of candidates) {
-    if (existsSync4(candidate))
+    if (existsSync5(candidate))
       return candidate;
   }
-  return join5(process.cwd(), "dashboard", "dist");
+  return join6(process.cwd(), "dashboard", "dist");
 }
 var MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
@@ -6705,7 +6781,7 @@ function oauthPage(type, title, message, hint, extra) {
   </body></html>`;
 }
 function serveStaticFile(filePath) {
-  if (!existsSync4(filePath))
+  if (!existsSync5(filePath))
     return null;
   const ext = extname(filePath);
   const contentType = MIME_TYPES[ext] || "application/octet-stream";
@@ -6729,7 +6805,7 @@ async function startServer(requestedPort, options) {
   const shouldOpen = options?.open ?? true;
   loadConnectorVersions();
   const dashboardDir = resolveDashboardDir();
-  const dashboardExists = existsSync4(dashboardDir);
+  const dashboardExists = existsSync5(dashboardDir);
   if (!dashboardExists) {
     console.error(`
 Dashboard not found at: ${dashboardDir}`);
@@ -6804,7 +6880,7 @@ Dashboard not found at: ${dashboardDir}`);
           const body = await req.json();
           if (!body.key)
             return json({ error: "Missing 'key' in request body" }, 400, port);
-          saveApiKey(name, body.key, body.field);
+          await saveApiKey(name, body.key, body.field);
           logActivity("key_saved", name, body.field ? `Field: ${body.field}` : undefined);
           return json({ success: true }, 200, port);
         } catch (e) {
@@ -6910,10 +6986,10 @@ Dashboard not found at: ${dashboardDir}`);
           return json({ error: "Invalid connector name" }, 400, port);
         try {
           const profiles = listProfiles(name);
-          const configDir = join5(homedir4(), ".connectors", name.startsWith("connect-") ? name : `connect-${name}`);
-          const currentProfileFile = join5(configDir, "current_profile");
+          const configDir = join6(homedir5(), ".connectors", name.startsWith("connect-") ? name : `connect-${name}`);
+          const currentProfileFile = join6(configDir, "current_profile");
           let current = "default";
-          if (existsSync4(currentProfileFile)) {
+          if (existsSync5(currentProfileFile)) {
             try {
               current = readFileSync4(currentProfileFile, "utf-8").trim() || "default";
             } catch {}
@@ -6962,16 +7038,16 @@ Dashboard not found at: ${dashboardDir}`);
       }
       if (path === "/api/export" && method === "GET") {
         try {
-          const connectDir = join5(homedir4(), ".connectors");
+          const connectDir = join6(homedir5(), ".connectors");
           const result = {};
-          if (existsSync4(connectDir)) {
+          if (existsSync5(connectDir)) {
             const entries = readdirSync3(connectDir, { withFileTypes: true });
             for (const entry of entries) {
               if (!entry.isDirectory() || !entry.name.startsWith("connect-"))
                 continue;
               const connectorName = entry.name.replace(/^connect-/, "");
-              const profilesDir = join5(connectDir, entry.name, "profiles");
-              if (!existsSync4(profilesDir))
+              const profilesDir = join6(connectDir, entry.name, "profiles");
+              if (!existsSync5(profilesDir))
                 continue;
               const profiles = {};
               const profileEntries = readdirSync3(profilesDir, { withFileTypes: true });
@@ -6979,13 +7055,13 @@ Dashboard not found at: ${dashboardDir}`);
                 if (pEntry.isFile() && pEntry.name.endsWith(".json")) {
                   const profileName = basename(pEntry.name, ".json");
                   try {
-                    const config = JSON.parse(readFileSync4(join5(profilesDir, pEntry.name), "utf-8"));
+                    const config = JSON.parse(readFileSync4(join6(profilesDir, pEntry.name), "utf-8"));
                     profiles[profileName] = config;
                   } catch {}
                 }
                 if (pEntry.isDirectory()) {
-                  const configPath = join5(profilesDir, pEntry.name, "config.json");
-                  if (existsSync4(configPath)) {
+                  const configPath = join6(profilesDir, pEntry.name, "config.json");
+                  if (existsSync5(configPath)) {
                     try {
                       const config = JSON.parse(readFileSync4(configPath, "utf-8"));
                       profiles[pEntry.name] = config;
@@ -7022,19 +7098,19 @@ Dashboard not found at: ${dashboardDir}`);
             return json({ error: "Invalid import format: missing 'connectors' object" }, 400, port);
           }
           let imported = 0;
-          const connectDir = join5(homedir4(), ".connectors");
+          const connectDir = join6(homedir5(), ".connectors");
           for (const [connectorName, data] of Object.entries(body.connectors)) {
             if (!isValidConnectorName(connectorName))
               continue;
             if (!data.profiles || typeof data.profiles !== "object")
               continue;
-            const connectorDir = join5(connectDir, `connect-${connectorName}`);
-            const profilesDir = join5(connectorDir, "profiles");
+            const connectorDir = join6(connectDir, `connect-${connectorName}`);
+            const profilesDir = join6(connectorDir, "profiles");
             for (const [profileName, config] of Object.entries(data.profiles)) {
               if (!config || typeof config !== "object")
                 continue;
-              mkdirSync4(profilesDir, { recursive: true });
-              const profileFile = join5(profilesDir, `${profileName}.json`);
+              mkdirSync5(profilesDir, { recursive: true });
+              const profileFile = join6(profilesDir, `${profileName}.json`);
               writeFileSync3(profileFile, JSON.stringify(config, null, 2));
               imported++;
             }
@@ -7090,12 +7166,12 @@ Dashboard not found at: ${dashboardDir}`);
       }
       if (dashboardExists && (method === "GET" || method === "HEAD")) {
         if (path !== "/") {
-          const filePath = join5(dashboardDir, path);
+          const filePath = join6(dashboardDir, path);
           const res2 = serveStaticFile(filePath);
           if (res2)
             return res2;
         }
-        const indexPath = join5(dashboardDir, "index.html");
+        const indexPath = join6(dashboardDir, "index.html");
         const res = serveStaticFile(indexPath);
         if (res)
           return res;

package/dist/lib/lock.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Advisory file-based write lock for per-connector operations.
+ *
+ * Prevents concurrent agents from racing on token refresh and config writes.
+ * Reads remain unaffected — only write operations (saveApiKey, refreshOAuthToken,
+ * switchProfile) acquire the lock.
+ *
+ * Strategy: atomic O_EXCL file creation as the lock primitive (works on all
+ * platforms including macOS). Lock files live at:
+ *   ~/.connectors/connect-{name}/.write.lock
+ *
+ * Callers that cannot acquire the lock within the timeout receive a LockTimeoutError.
+ */
+export declare class LockTimeoutError extends Error {
+    readonly connector: string;
+    constructor(connector: string);
+}
+/**
+ * Acquire a write lock for a connector, run the callback, then release.
+ * Throws LockTimeoutError if the lock cannot be acquired within LOCK_TIMEOUT_MS.
+ */
+export declare function withWriteLock<T>(connector: string, fn: () => T | Promise<T>): Promise<T>;

package/dist/lib/lock.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/auth.d.ts

@@ -42,7 +42,7 @@ export declare function getEnvVars(name: string): {
 /**
  * Save an API key to a connector's profile
  */
-export declare function saveApiKey(name: string, key: string, field?: string): void;
+export declare function saveApiKey(name: string, key: string, field?: string): Promise<void>;
 /**
  * Get OAuth client credentials for a connector
  */
@@ -63,7 +63,9 @@ export declare function validateOAuthState(state: string | null, expectedConnect
  */
 export declare function exchangeOAuthCode(name: string, code: string, redirectUri: string): Promise<OAuthTokens>;
 /**
- * Refresh an OAuth token using the stored refresh token
+ * Refresh an OAuth token using the stored refresh token.
+ * Serialized with a per-connector write lock to prevent concurrent agents
+ * from racing on token refresh (double-refresh race condition).
  */
 export declare function refreshOAuthToken(name: string): Promise<OAuthTokens>;
 /**

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@hasna/connectors",
-
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "Open source connector library - Install API connectors with a single command",
   "type": "module",
   "bin": {