@sendmux/cli 1.4.1 → 1.6.0

package/dist/profiles.d.ts

@@ -1,12 +1,70 @@
-export interface CliProfile {
+export interface ApiKeyCliProfile {
     apiKey: string;
     baseUrl?: string;
+    type?: "api_key";
 }
+interface AgentProfileBase {
+    appApiBaseUrl: string;
+    authBaseUrl: string;
+    clientName?: string;
+    idempotencyKey: string;
+    mailboxLocalPart?: string;
+    sendingApiBaseUrl: string;
+    type: "agent";
+}
+export interface RegisteringAgentCliProfile extends AgentProfileBase {
+    state: "registering";
+}
+export interface ActiveAgentCliProfile extends AgentProfileBase {
+    accessToken: string;
+    mailboxEmail: string;
+    ownerInvite?: {
+        email: string;
+        idempotencyKey: string;
+        status: "dispatching" | "pending";
+    };
+    registrationId: string;
+    sendingToken?: {
+        accessToken: string;
+        expiresAt: string;
+    };
+    state: "active";
+}
+export type AgentCliProfile = ActiveAgentCliProfile | RegisteringAgentCliProfile;
+export interface AuthorizingOAuthCliProfile {
+    type: "oauth";
+    state: "authorizing";
+    sessionId: string;
+    issuer: string;
+}
+export interface ActiveOAuthCliProfile {
+    type: "oauth";
+    state: "active" | "refreshing" | "revoking" | "reauthorize";
+    sessionId: string;
+    issuer: string;
+    clientId: string;
+    tokenEndpoint: string;
+    revocationEndpoint: string;
+    accessToken: string;
+    refreshToken: string;
+    expiresAt: number;
+    scopes: string[];
+    refreshStartedAt?: number;
+}
+export type OAuthCliProfile = AuthorizingOAuthCliProfile | ActiveOAuthCliProfile;
+export type CliProfile = AgentCliProfile | ApiKeyCliProfile | OAuthCliProfile;
 export interface CliConfig {
     defaultProfile?: string;
     profiles: Record<string, CliProfile>;
 }
 export declare function readCliConfig(configDir: string): Promise<CliConfig>;
-export declare function writeCliConfig(configDir: string, config: CliConfig): Promise<void>;
+export declare function updateCliConfig<T>(configDir: string, update: (config: CliConfig) => T): Promise<T>;
+export declare function reserveAgentRegistrationIntent(configDir: string, profileName: string, candidate: RegisteringAgentCliProfile): Promise<RegisteringAgentCliProfile>;
+export declare function clearAgentRegistrationIntent(configDir: string, profileName: string): Promise<void>;
 export declare function configPath(configDir: string): string;
+export declare function isAgentProfile(profile: CliProfile): profile is AgentCliProfile;
+export declare function isApiKeyProfile(profile: CliProfile): profile is ApiKeyCliProfile;
+export declare function isOAuthProfile(profile: CliProfile): profile is OAuthCliProfile;
+export declare function isActiveAgentProfile(profile: CliProfile): profile is ActiveAgentCliProfile;
+export {};
 //# sourceMappingURL=profiles.d.ts.map

package/dist/profiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../src/profiles.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACtC;AAID,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAiBzE;AAED,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQxF;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEpD"}
+{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../src/profiles.ts"],"names":[],"mappings":"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"}

package/dist/profiles.js

@@ -1,6 +1,10 @@
-import { chmod, mkdir, readFile, rename, writeFile, } from "node:fs/promises";
+import { chmod, mkdir, open, readFile, rename, stat, unlink, writeFile, } from "node:fs/promises";
+import { createHash } from "node:crypto";
 import { join } from "node:path";
 const CONFIG_FILE = "config.json";
+const CONFIG_LOCK_RETRY_MS = 25;
+const CONFIG_LOCK_STALE_MS = 5_000;
+const CONFIG_LOCK_TIMEOUT_MS = 10_000;
 export async function readCliConfig(configDir) {
     const path = configPath(configDir);
     try {
@@ -18,8 +22,71 @@ export async function readCliConfig(configDir) {
         throw error;
     }
 }
-export async function writeCliConfig(configDir, config) {
+export async function updateCliConfig(configDir, update) {
     await mkdir(configDir, { mode: 0o700, recursive: true });
+    const releaseLock = await acquireConfigWriteLock(configDir);
+    try {
+        const config = await readCliConfig(configDir);
+        const result = update(config);
+        await writeCliConfigFile(configDir, config);
+        return result;
+    }
+    finally {
+        await releaseLock();
+    }
+}
+export async function reserveAgentRegistrationIntent(configDir, profileName, candidate) {
+    await mkdir(configDir, { mode: 0o700, recursive: true });
+    const path = registrationIntentPath(configDir, profileName);
+    const releaseLock = await acquireFileLock(`${path}.lock`, "Timed out waiting for another Sendmux process to reserve the agent registration.");
+    try {
+        while (true) {
+            try {
+                const existing = JSON.parse(await readFile(path, "utf8"));
+                if (isRegisteringAgentProfile(existing)) {
+                    return existing;
+                }
+                await unlink(path);
+            }
+            catch (error) {
+                if (error instanceof SyntaxError) {
+                    await unlink(path).catch((unlinkError) => {
+                        if (!isNodeError(unlinkError) || unlinkError.code !== "ENOENT")
+                            throw unlinkError;
+                    });
+                }
+                else if (!isNodeError(error) || error.code !== "ENOENT") {
+                    throw error;
+                }
+            }
+            try {
+                await writeFile(path, `${JSON.stringify(candidate, null, 2)}\n`, { flag: "wx", mode: 0o600 });
+                await chmod(path, 0o600);
+                return candidate;
+            }
+            catch (error) {
+                if (!isNodeError(error) || error.code !== "EEXIST")
+                    throw error;
+            }
+        }
+    }
+    finally {
+        await releaseLock();
+    }
+}
+export async function clearAgentRegistrationIntent(configDir, profileName) {
+    try {
+        await unlink(registrationIntentPath(configDir, profileName));
+    }
+    catch (error) {
+        if (!isNodeError(error) || error.code !== "ENOENT")
+            throw error;
+    }
+}
+export function configPath(configDir) {
+    return join(configDir, CONFIG_FILE);
+}
+async function writeCliConfigFile(configDir, config) {
     const path = configPath(configDir);
     const tempPath = `${path}.${process.pid}.tmp`;
     await writeFile(tempPath, `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 });
@@ -27,8 +94,87 @@ export async function writeCliConfig(configDir, config) {
     await rename(tempPath, path);
     await chmod(path, 0o600);
 }
-export function configPath(configDir) {
-    return join(configDir, CONFIG_FILE);
+async function acquireConfigWriteLock(configDir) {
+    return acquireFileLock(`${configPath(configDir)}.lock`, "Timed out waiting for another Sendmux process to finish updating the profile config.");
+}
+async function acquireFileLock(lockPath, timeoutMessage) {
+    const deadline = Date.now() + CONFIG_LOCK_TIMEOUT_MS;
+    while (true) {
+        try {
+            const handle = await open(lockPath, "wx", 0o600);
+            return async () => {
+                try {
+                    await handle.close();
+                }
+                finally {
+                    try {
+                        await unlink(lockPath);
+                    }
+                    catch (error) {
+                        if (!isNodeError(error) || error.code !== "ENOENT")
+                            throw error;
+                    }
+                }
+            };
+        }
+        catch (error) {
+            if (!isNodeError(error) || error.code !== "EEXIST")
+                throw error;
+        }
+        try {
+            const lock = await stat(lockPath);
+            if (Date.now() - lock.mtimeMs >= CONFIG_LOCK_STALE_MS) {
+                try {
+                    await unlink(lockPath);
+                    continue;
+                }
+                catch (error) {
+                    if (isNodeError(error) && error.code === "ENOENT")
+                        continue;
+                    if (!isNodeError(error) || (error.code !== "EACCES" && error.code !== "EPERM"))
+                        throw error;
+                }
+            }
+        }
+        catch (error) {
+            if (isNodeError(error) && error.code === "ENOENT")
+                continue;
+            throw error;
+        }
+        if (Date.now() >= deadline) {
+            throw new Error(timeoutMessage);
+        }
+        await new Promise((resolve) => setTimeout(resolve, CONFIG_LOCK_RETRY_MS));
+    }
+}
+function registrationIntentPath(configDir, profileName) {
+    const profileHash = createHash("sha256").update(profileName, "utf8").digest("hex");
+    return join(configDir, `agent-registration-${profileHash}.json`);
+}
+function isRegisteringAgentProfile(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const profile = value;
+    return (profile.type === "agent" &&
+        profile.state === "registering" &&
+        typeof profile.appApiBaseUrl === "string" &&
+        typeof profile.authBaseUrl === "string" &&
+        typeof profile.idempotencyKey === "string" &&
+        typeof profile.sendingApiBaseUrl === "string" &&
+        (profile.clientName === undefined || typeof profile.clientName === "string") &&
+        (profile.mailboxLocalPart === undefined || typeof profile.mailboxLocalPart === "string"));
+}
+export function isAgentProfile(profile) {
+    return profile.type === "agent";
+}
+export function isApiKeyProfile(profile) {
+    return profile.type === undefined || profile.type === "api_key";
+}
+export function isOAuthProfile(profile) {
+    return profile.type === "oauth";
+}
+export function isActiveAgentProfile(profile) {
+    return isAgentProfile(profile) && profile.state === "active";
 }
 function isNodeError(error) {
     return Boolean(error && typeof error === "object" && "code" in error);