@ganglion/xacpx-relay 0.9.18 → 0.10.1

package/dist/cli.d.ts

@@ -14,6 +14,13 @@ export declare function defaultDbPath(): string;
  * mis-resolve. The `cliJsPath` param exists only for tests.
  */
 export declare function resolveBundledWebRoot(cliJsPath?: string): string | undefined;
+/**
+ * Parses an invite TTL like "30m", "12h", "7d" into milliseconds.
+ * Returns null for malformed input; undefined input yields the 7-day default.
+ * Capped at 10 years — beyond that Date arithmetic overflows the ECMAScript
+ * time range and toISOString() throws instead of printing usage.
+ */
+export declare function parseTtlMs(raw: string | undefined): number | null;
 export interface StartOptions {
     dbPath: string;
     httpPort: number;

package/dist/cli.js

@@ -86,6 +86,15 @@ function initSchema(db) {
       expires_at TEXT NOT NULL,
       used_at TEXT
     );
+    CREATE TABLE IF NOT EXISTS invite_codes (
+      id TEXT PRIMARY KEY,
+      code_hash TEXT NOT NULL UNIQUE,
+      label TEXT,
+      created_at TEXT NOT NULL,
+      expires_at TEXT NOT NULL,
+      used_at TEXT,
+      used_account_id TEXT REFERENCES accounts(id)
+    );
     CREATE TABLE IF NOT EXISTS instances (
       id TEXT PRIMARY KEY,
       account_id TEXT NOT NULL REFERENCES accounts(id),
@@ -276,6 +285,71 @@ class AccountStore {
     this.db.run("DELETE FROM web_sessions WHERE expires_at <= ?", [iso]);
     return ws?.n ?? 0;
   }
+  issueInviteCode(label, ttlMs) {
+    const id = randomUUID();
+    const code = generateToken();
+    const nowMs = this.now().getTime();
+    const expiresAt = new Date(nowMs + ttlMs).toISOString();
+    this.db.run("INSERT INTO invite_codes (id, code_hash, label, created_at, expires_at) VALUES (?, ?, ?, ?, ?)", [id, hashToken(code), label ?? null, new Date(nowMs).toISOString(), expiresAt]);
+    return { id, code, expiresAt };
+  }
+  redeemInviteCode(code) {
+    const codeHash = hashToken(code);
+    const row = this.db.get("SELECT id, label, expires_at, used_at FROM invite_codes WHERE code_hash = ?", [codeHash]);
+    if (!row || row.used_at !== null || new Date(row.expires_at).getTime() <= this.now().getTime()) {
+      return null;
+    }
+    const nowIso = this.now().toISOString();
+    const accountId = randomUUID();
+    const username = `u-${randomUUID()}`;
+    const loginTokenId = randomUUID();
+    const token = generateToken();
+    this.db.exec("BEGIN");
+    try {
+      this.db.run("UPDATE invite_codes SET used_at = ?, used_account_id = ? WHERE code_hash = ? AND used_at IS NULL", [nowIso, accountId, codeHash]);
+      this.db.run("INSERT INTO accounts (id, username, created_at) VALUES (?, ?, ?)", [accountId, username, nowIso]);
+      this.db.run("INSERT INTO login_tokens (id, token_hash, account_id, label, created_at, last_used_at) VALUES (?, ?, ?, ?, ?, NULL)", [loginTokenId, hashToken(token), accountId, row.label, nowIso]);
+      this.db.exec("COMMIT");
+    } catch (e) {
+      this.db.exec("ROLLBACK");
+      throw e;
+    }
+    return { token, username, accountId, loginTokenId };
+  }
+  listInviteCodes() {
+    return this.db.all("SELECT id, label, created_at, expires_at, used_at FROM invite_codes ORDER BY created_at").map((row) => ({
+      id: row.id,
+      label: row.label,
+      createdAt: row.created_at,
+      expiresAt: row.expires_at,
+      usedAt: row.used_at
+    }));
+  }
+  inviteIdFor(valueOrId) {
+    const byValue = this.db.get("SELECT id FROM invite_codes WHERE code_hash = ?", [hashToken(valueOrId)]);
+    if (byValue)
+      return byValue.id;
+    const byId = this.db.get("SELECT id FROM invite_codes WHERE id = ?", [valueOrId]);
+    if (byId)
+      return byId.id;
+    const byPrefix = this.db.all("SELECT id FROM invite_codes WHERE id LIKE ? || '%'", [valueOrId]);
+    if (byPrefix.length === 1)
+      return byPrefix[0].id;
+    return null;
+  }
+  removeInviteCode(id) {
+    const existing = this.db.get("SELECT id FROM invite_codes WHERE id = ?", [id]);
+    if (!existing)
+      return false;
+    this.db.run("DELETE FROM invite_codes WHERE id = ?", [id]);
+    return true;
+  }
+  pruneInviteCodes(now) {
+    const iso = now.toISOString();
+    const row = this.db.get("SELECT COUNT(*) AS n FROM invite_codes WHERE expires_at <= ? OR used_at IS NOT NULL", [iso]);
+    this.db.run("DELETE FROM invite_codes WHERE expires_at <= ? OR used_at IS NOT NULL", [iso]);
+    return row?.n ?? 0;
+  }
 }
 
 // packages/relay/src/stores/instances.ts
@@ -1009,13 +1083,16 @@ var MAX_ATTACHMENT_FIELD_LEN = 256;
 function boundField(v) {
   return typeof v === "string" ? v.slice(0, MAX_ATTACHMENT_FIELD_LEN) : v;
 }
-function rpcSessionAlias(type, payload) {
+function rpcSessionLocks(type, payload) {
   const value = payload;
   if (type === MSG3.prompt || type === MSG3.commandExecute) {
-    return typeof value.sessionAlias === "string" && value.sessionAlias ? value.sessionAlias : undefined;
+    return typeof value.sessionAlias === "string" && value.sessionAlias ? { alias: value.sessionAlias, lifecycle: false, turn: true } : undefined;
+  }
+  if (type === MSG3.sessionsRename) {
+    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: false } : undefined;
   }
-  if (type === MSG3.sessionsCreate || type === MSG3.sessionsRemove || type === MSG3.sessionsArchive || type === MSG3.sessionsUnarchive || type === MSG3.sessionsRename) {
-    return typeof value.alias === "string" && value.alias ? value.alias : undefined;
+  if (type === MSG3.sessionsCreate || type === MSG3.sessionsRemove || type === MSG3.sessionsArchive || type === MSG3.sessionsUnarchive) {
+    return typeof value.alias === "string" && value.alias ? { alias: value.alias, lifecycle: true, turn: true } : undefined;
   }
   return;
 }
@@ -1046,7 +1123,8 @@ function createApp(deps) {
   const pairingTtlMs = deps.pairingTtlMs ?? 10 * 60 * 1000;
   const trustProxy = deps.trustProxy ?? false;
   const now = deps.now ?? (() => new Date);
-  const acquireSessionRpcLock = createKeyedRpcLock();
+  const acquireSessionLifecycleRpcLock = createKeyedRpcLock();
+  const acquireSessionTurnRpcLock = createKeyedRpcLock();
   const loginFailures = new Map;
   let globalFailures = { count: 0, windowStart: 0 };
   function sweepPerIpLoginFailures(nowMs) {
@@ -1111,8 +1189,28 @@ function createApp(deps) {
   });
   app.post("/api/register", (c) => c.json({ error: "not-found" }, 404));
   app.post("/api/invites", (c) => c.json({ error: "not-found" }, 404));
+  app.post("/api/invites/redeem", async (c) => {
+    if (!requireJson(c.req.header("content-type")))
+      return c.json({ error: "unsupported-media-type" }, 415);
+    const body = await c.req.json().catch(() => ({}));
+    const nowMs = now().getTime();
+    sweepPerIpLoginFailures(nowMs);
+    const ip = clientIp(c, trustProxy);
+    if (isRateLimited(ip, nowMs)) {
+      deps.logger?.info("relay.invite.rejected", "invite redeem rejected", { reason: "rate-limited", ip });
+      return c.json({ error: "too-many-attempts" }, 429);
+    }
+    const r = deps.accounts.redeemInviteCode(typeof body.code === "string" ? body.code : "");
+    if (!r) {
+      recordFailure(ip, nowMs);
+      deps.logger?.info("relay.invite.rejected", "invite redeem rejected", { reason: "invalid-code", ip });
+      return c.json({ error: "invalid-code" }, 401);
+    }
+    deps.logger?.info("relay.invite.redeemed", "invite redeemed", { accountId: r.accountId });
+    return c.json({ token: r.token, username: r.username });
+  });
   app.use("/api/*", async (c, next) => {
-    if (c.req.path === "/api/login")
+    if (c.req.path === "/api/login" || c.req.path === "/api/invites/redeem")
       return next();
     const token = getCookie(c, SESSION_COOKIE);
     const account = token ? deps.accounts.getSessionAccount(token) : null;
@@ -1229,7 +1327,7 @@ function createApp(deps) {
         isOwner: true
       };
     }
-    let releaseSessionRpcLock;
+    const releaseSessionRpcLocks = [];
     let persistedPromptId;
     try {
       if (body.type === MSG3.prompt && !parseControlPayload(MSG3.prompt, payload)) {
@@ -1251,9 +1349,15 @@ function createApp(deps) {
         if (approxBytes > 10 * 1024 * 1024)
           return c.json({ error: "file-too-large" }, 413);
       }
-      const sessionAlias = rpcSessionAlias(body.type, payload);
-      if (sessionAlias) {
-        releaseSessionRpcLock = await acquireSessionRpcLock(`${instance.id}\x00${sessionAlias}`);
+      const sessionLocks = rpcSessionLocks(body.type, payload);
+      if (sessionLocks) {
+        const key = `${instance.id}\x00${sessionLocks.alias}`;
+        if (sessionLocks.lifecycle) {
+          releaseSessionRpcLocks.push(await acquireSessionLifecycleRpcLock(key));
+        }
+        if (sessionLocks.turn) {
+          releaseSessionRpcLocks.push(await acquireSessionTurnRpcLock(key));
+        }
       }
       if (body.type === MSG3.prompt || body.type === MSG3.commandExecute) {
         const p = payload;
@@ -1299,7 +1403,9 @@ function createApp(deps) {
         return c.json({ error: message }, 504);
       return c.json({ error: message }, 500);
     } finally {
-      releaseSessionRpcLock?.();
+      for (let i = releaseSessionRpcLocks.length - 1;i >= 0; i--) {
+        releaseSessionRpcLocks[i]?.();
+      }
     }
   });
   if (deps.webRoot) {
@@ -1329,7 +1435,8 @@ function runMaintenance(stores, opts) {
   });
   const sessionsDeleted = stores.accounts.pruneExpired(now);
   const pairingTokensDeleted = stores.instances.prunePairingTokens(now);
-  return { messagesDeleted, sessionsDeleted, pairingTokensDeleted };
+  const inviteCodesDeleted = stores.accounts.pruneInviteCodes(now);
+  return { messagesDeleted, sessionsDeleted, pairingTokensDeleted, inviteCodesDeleted };
 }
 function startMaintenanceLoop(stores, opts, intervalMs, onError) {
   const tick = () => {
@@ -1721,8 +1828,10 @@ var USAGE = [
   "  start      [--db <path>] [--web-root <dir>] [--host 0.0.0.0] [--http-port 8787] [--ws-port <n>] [--history-retention-days 30] [--request-timeout-ms 120000] [--trust-proxy]",
   "             (--ws-port omitted = gateway merged onto the HTTP port; pass it only for a dedicated gateway port)",
   "  add token  [--label <note>] [--db <path>]",
+  "  add invite [--label <note>] [--ttl <n>{m|h|d}] [--url <base>] [--db <path>]",
   "  ls         [--db <path>]",
   "  rm token <value-or-id> [--db <path>]",
+  "  rm invite <code-or-id> [--db <path>]",
   "  update     [--check]   (self-update @ganglion/xacpx-relay; --check only reports)",
   "",
   "  Defaults: --db ~/.xacpx-relay/relay.db   --web-root auto-detects the bundled dashboard"
@@ -1736,6 +1845,20 @@ function flag(args, name) {
 function hasFlag(args, name) {
   return args.includes(name);
 }
+function parseTtlMs(raw) {
+  if (raw === undefined)
+    return 7 * 24 * 60 * 60 * 1000;
+  const match = /^(\d+)([mhd])$/.exec(raw);
+  if (!match)
+    return null;
+  const n = Number(match[1]);
+  if (n <= 0)
+    return null;
+  const unit = match[2] === "m" ? 60000 : match[2] === "h" ? 3600000 : 86400000;
+  const ms = n * unit;
+  const maxMs = 10 * 365 * 86400000;
+  return ms > maxMs ? null : ms;
+}
 function parseStartOptions(args) {
   const dbPath = flag(args, "--db") ?? defaultDbPath();
   const retentionRaw = flag(args, "--history-retention-days");
@@ -1793,21 +1916,64 @@ async function runRelayCli(args, io) {
       runtime.close();
     }
   }
+  if (args[0] === "add" && args[1] === "invite") {
+    const label = flag(args, "--label");
+    const ttlRaw = flag(args, "--ttl");
+    if (hasFlag(args, "--ttl") && ttlRaw === undefined) {
+      io.print(USAGE);
+      return 1;
+    }
+    const ttlMs = parseTtlMs(ttlRaw);
+    if (ttlMs === null) {
+      io.print(USAGE);
+      return 1;
+    }
+    const runtime = await createRelayRuntime(dbPath);
+    try {
+      const { code, expiresAt } = runtime.accounts.issueInviteCode(label, ttlMs);
+      io.print(`invite code: ${code}`);
+      const baseUrl = flag(args, "--url");
+      if (baseUrl) {
+        io.print(`redeem link: ${baseUrl.replace(/\/+$/, "")}/invite/${code}`);
+      } else {
+        io.print(`redeem path: /invite/${code}   (append to your hub URL)`);
+      }
+      io.print(`(share it now — single-use, not shown again; expires ${expiresAt.slice(0, 16).replace("T", " ")} UTC)`);
+      return 0;
+    } finally {
+      runtime.close();
+    }
+  }
   if (args[0] === "ls") {
     const runtime = await createRelayRuntime(dbPath);
     try {
       const tokens = runtime.accounts.listTokens();
       if (tokens.length === 0) {
         io.print("(no tokens)");
-        return 0;
+      } else {
+        io.print("id        label                 created               #instances");
+        io.print("--------  --------------------  --------------------  ----------");
+        for (const t of tokens) {
+          const shortId = t.id.slice(0, 8);
+          const label = (t.label ?? "").slice(0, 20).padEnd(20);
+          const created = t.createdAt.slice(0, 19).replace("T", " ");
+          io.print(`${shortId}  ${label}  ${created}  ${String(t.instanceCount).padStart(10)}`);
+        }
       }
-      io.print("id        label                 created               #instances");
-      io.print("--------  --------------------  --------------------  ----------");
-      for (const t of tokens) {
-        const shortId = t.id.slice(0, 8);
-        const label = (t.label ?? "").slice(0, 20).padEnd(20);
-        const created = t.createdAt.slice(0, 19).replace("T", " ");
-        io.print(`${shortId}  ${label}  ${created}  ${String(t.instanceCount).padStart(10)}`);
+      const invites = runtime.accounts.listInviteCodes();
+      if (invites.length > 0) {
+        const nowMs = Date.now();
+        io.print("");
+        io.print("invites");
+        io.print("id        label                 expires (UTC)         status");
+        io.print("--------  --------------------  --------------------  -------");
+        for (const inv of invites) {
+          const shortId = inv.id.slice(0, 8);
+          const label = (inv.label ?? "").slice(0, 20).padEnd(20);
+          const expires = inv.expiresAt.slice(0, 19).replace("T", " ");
+          const status = inv.usedAt !== null ? "used" : new Date(inv.expiresAt).getTime() <= nowMs ? "expired" : "unused";
+          io.print(`${shortId}  ${label}  ${expires}  ${status}`);
+        }
       }
       return 0;
     } finally {
@@ -1834,6 +2000,26 @@ async function runRelayCli(args, io) {
       runtime.close();
     }
   }
+  if (args[0] === "rm" && args[1] === "invite") {
+    const valueOrId = args[2];
+    if (!valueOrId || valueOrId.startsWith("--")) {
+      io.print(USAGE);
+      return 1;
+    }
+    const runtime = await createRelayRuntime(dbPath);
+    try {
+      const inviteId = runtime.accounts.inviteIdFor(valueOrId);
+      if (!inviteId) {
+        io.print(`invite not found: ${valueOrId}`);
+        return 1;
+      }
+      runtime.accounts.removeInviteCode(inviteId);
+      io.print("removed");
+      return 0;
+    } finally {
+      runtime.close();
+    }
+  }
   if (args[0] === "update") {
     return await handleRelayUpdate(args.slice(1), { print: io.print });
   }
@@ -1849,6 +2035,7 @@ if (__require.main == __require.module) {
 export {
   runRelayCli,
   resolveBundledWebRoot,
+  parseTtlMs,
   parseStartOptions,
   defaultDbPath
 };

package/dist/maintenance.d.ts

@@ -15,8 +15,9 @@ export interface MaintenanceSummary {
     messagesDeleted: number;
     sessionsDeleted: number;
     pairingTokensDeleted: number;
+    inviteCodesDeleted: number;
 }
-/** Runs one maintenance pass: prune old/excess messages, GC expired sessions/pairing tokens. */
+/** Runs one maintenance pass: prune old/excess messages, GC expired sessions/pairing tokens/invite codes. */
 export declare function runMaintenance(stores: MaintenanceStores, opts: MaintenanceOptions): MaintenanceSummary;
 /** Starts a periodic maintenance loop. Returns a stop function. */
 export declare function startMaintenanceLoop(stores: MaintenanceStores, opts: MaintenanceOptions, intervalMs: number, onError?: (err: unknown) => void): () => void;