@ractive-ch/tab-mcp 0.4.0 → 0.5.0

package/main.js

@@ -603,7 +603,7 @@ function installCrashLogging(logger, exit = (code) => process.exit(code)) {
   };
 }
 // package.json
-var version = "0.4.0";
+var version = "0.5.0";
 
 // src/address.ts
 var BASE32_ALPHABET = "abcdefghijklmnopqrstuvwxyz234567";
@@ -1384,7 +1384,8 @@ var CloseCode = {
   heartbeatLost: 4003,
   shuttingDown: 4004,
   replaced: 4005,
-  rateLimited: 4008
+  rateLimited: 4008,
+  addressMismatch: 4009
 };
 var MAX_TITLE = 300;
 var MAX_NAME = 200;
@@ -1446,6 +1447,10 @@ function parseTabMessage(text) {
       if (app !== undefined && (!isObject(app) || !isAppName(app["name"]))) {
         return bad(`hello.app.name must be 1-${MAX_APP_NAME} characters`);
       }
+      const revokeAll = v["revokeAll"];
+      if (revokeAll !== undefined && typeof revokeAll !== "boolean") {
+        return bad("hello.revokeAll must be a boolean");
+      }
       const hello = {
         type,
         library: { name: library["name"], version: library["version"] },
@@ -1455,6 +1460,8 @@ function parseTabMessage(text) {
       if (isObject(app) && isAppName(app["name"])) {
         hello.app = { name: app["name"] };
       }
+      if (revokeAll === true)
+        hello.revokeAll = true;
       return { ok: true, message: hello };
     }
     case "pong": {
@@ -2308,7 +2315,7 @@ class OidcPairing {
         reason: "rate_limited"
       };
     }
-    const state = random2(24);
+    const state = `${context.addressId}.${random2(24)}`;
     const nonce = random2(24);
     const verifier = random2(32);
     this.#flowOf.set(context.requestId, state);
@@ -3098,7 +3105,8 @@ ${intro}
     const admit = () => this.#guessesPerAddressIp.take(`${pending.addressId}|${ip}`) && this.#guessesPerAddress.take(pending.addressId);
     const result = await method.check(session, form, admit, {
       requestId: pending.id,
-      browserId: browser.id
+      browserId: browser.id,
+      addressId: pending.addressId
     });
     if (result.ok === "redirect") {
       this.#host.logger.info("oauth.pairing_redirect", {
@@ -3127,7 +3135,7 @@ ${intro}
   }
   #paired(pending, kind, result) {
     this.#dropPending(pending);
-    const code = random3(32);
+    const code = `${pending.addressId}.${random3(32)}`;
     if (this.#codes.size >= MAX_CODES)
       this.#sweepCodes(true);
     const { id: _id, expiresAt: _expires, ip: _ip, ...request } = pending;
@@ -3247,7 +3255,7 @@ ${intro}
 ${errorHtml}
 <p>${clientLabel} wants to use the tools of a web page, but that page is not open right now.</p>
 <p>Open the page, click \u201CConnect your AI app\u201D, then try again here.</p>
-<form method="post" action="/authorize">
+<form method="post" action="/authorize?a=${pending.addressId}">
 ${hidden}
 <div class="actions">
 <button type="submit" class="primary" name="action" value="retry">Try again</button>
@@ -3268,7 +3276,7 @@ ${cancel}
 <p>You're connecting ${clientLabel} to ${target}.</p>
 <p>${escapeHtml(client.name)} can then use this page's tools while the page is open. You can disconnect it in the page at any time.</p>
 ${errorHtml}
-<form method="post" action="/authorize">
+<form method="post" action="/authorize?a=${pending.addressId}">
 ${hidden}
 ${method.render(session)}
 <div class="actions">
@@ -3610,6 +3618,7 @@ class TabSession {
   origin;
   site;
   openedAt = Date.now();
+  expectedAddress;
   addressId;
   appName;
   codes;
@@ -3628,12 +3637,13 @@ class TabSession {
   #helloTimer;
   #heartbeatTimer;
   #lifetimeTimer;
-  constructor(ws, ip, origin, site, host) {
+  constructor(ws, ip, origin, site, host, expectedAddress) {
     this.#ws = ws;
     this.ip = ip;
     this.origin = origin;
     this.site = site;
     this.#host = host;
+    this.expectedAddress = expectedAddress;
     this.codes = new PairingCodes((code, expiresAt) => {
       this.send({
         type: "pairing.code",
@@ -3722,7 +3732,7 @@ class TabSession {
         this.#protocolError("bad_message", "hello expected");
         return;
       }
-      await this.#hello(msg.secret, msg.library, msg.app?.name);
+      await this.#hello(msg.secret, msg.library, msg.app?.name, msg.revokeAll === true);
       return;
     }
     if (this.#state === "hello")
@@ -3789,19 +3799,38 @@ class TabSession {
       }
     }
   }
-  async#hello(secret, library, appName) {
+  async#hello(secret, library, appName, revokeAll = false) {
     if (!isWellFormedSecret(secret)) {
       this.#protocolError("bad_message", "secret must be 43 base64url characters");
       return;
     }
+    const addressId = addressIdFromSecret(secret);
+    if (this.expectedAddress !== undefined && this.expectedAddress !== addressId) {
+      this.#host.logger.warn("tab.refused", { reason: "address_mismatch" });
+      this.#sendError("address_mismatch", "the address id in the URL is not the one of the secret");
+      this.end(CloseCode.addressMismatch, "address mismatch");
+      return;
+    }
     clearTimeout(this.#helloTimer);
     this.#state = "hello";
-    this.addressId = addressIdFromSecret(secret);
+    this.addressId = addressId;
     this.appName = this.site.name ?? appName;
     const replaced = this.#host.claimAddress(this);
     if (replaced !== undefined) {
       replaced.end(CloseCode.replaced, "replaced by a newer session", "replaced");
     }
+    if (revokeAll) {
+      try {
+        await this.#host.revokeAll(this);
+      } catch (error) {
+        this.#host.logger.error("store.error", {
+          op: "revokeAll",
+          error: errorName(error)
+        });
+        this.end(CloseCode.policyViolation, "could not revoke the grants");
+        return;
+      }
+    }
     let grants = [];
     try {
       const list = await this.#host.store.listGrants(this.addressId, Date.now());
@@ -4235,6 +4264,33 @@ var FORWARDED_HEADERS = new Set([
   "traceparent",
   "tracestate"
 ]);
+var HEALTH_STORE_TIMEOUT_MS = 1000;
+var HEALTH_REUSE_MS = 1000;
+var HEALTH_HUNG_RETRY_MS = 30000;
+var HEALTH_PROBE_HASH = hashToken("tab-mcp /healthz probe");
+function rawAddressParam(search) {
+  let found;
+  for (const pair of search.replace(/^\?/, "").split("&")) {
+    if (pair === "")
+      continue;
+    const eq = pair.indexOf("=");
+    const rawName = eq < 0 ? pair : pair.slice(0, eq);
+    let name;
+    try {
+      name = decodeURIComponent(rawName.replaceAll("+", " "));
+    } catch {
+      continue;
+    }
+    if (name !== "a")
+      continue;
+    const value = eq < 0 ? "" : pair.slice(eq + 1);
+    if (rawName !== "a" || found !== undefined || !isAddressId(value)) {
+      return false;
+    }
+    found = value;
+  }
+  return found;
+}
 function json(status, value, headers) {
   const h = new Headers(headers);
   h.set("content-type", "application/json");
@@ -4590,6 +4646,11 @@ function startRelay(options, hooks) {
         supported: [SUBPROTOCOL]
       });
     }
+    const address = rawAddressParam(new URL(req.url).search);
+    if (address === false) {
+      logger.info("tab.refused", { reason: "bad_address" });
+      return json(400, { error: "bad_address" });
+    }
     const realIp = clientIp(req, server);
     const ip = ipPrefixKey(realIp);
     if (allSessions.size >= config.maxSessions) {
@@ -4606,7 +4667,12 @@ function startRelay(options, hooks) {
     }
     perIp.set(ip, count + 1);
     const ok = server.upgrade(req, {
-      data: { ip, origin: origin ?? "", site },
+      data: {
+        ip,
+        origin: origin ?? "",
+        site,
+        ...address === undefined ? {} : { address }
+      },
       headers: { "Sec-WebSocket-Protocol": SUBPROTOCOL }
     });
     if (ok)
@@ -4898,6 +4964,56 @@ function startRelay(options, hooks) {
     headers: { ...corsHeaders, allow: "POST" }
   });
   const postOnly = () => new Response(null, { status: 405, headers: { allow: "POST, OPTIONS" } });
+  const healthRetryMs = hooks?.healthRetryMs ?? HEALTH_HUNG_RETRY_MS;
+  let probe;
+  let probed;
+  let hungReads = 0;
+  let lastHungAt = 0;
+  async function runProbe() {
+    let timer;
+    const deadline = new Promise((resolve) => {
+      timer = setTimeout(() => resolve("store_timeout"), HEALTH_STORE_TIMEOUT_MS);
+    });
+    const read = Promise.resolve().then(() => store.get(HEALTH_PROBE_HASH)).then(() => "ok");
+    read.catch(() => {});
+    try {
+      const result = await Promise.race([read, deadline]);
+      if (result === "store_timeout") {
+        logger.warn("health.store", { error: "timeout" });
+        hungReads++;
+        lastHungAt = Date.now();
+        const settled = () => {
+          hungReads--;
+        };
+        read.then(settled, settled);
+      }
+      return result;
+    } catch (error) {
+      logger.warn("health.store", { error: errorName(error) });
+      return "store_unavailable";
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  function storeHealth() {
+    if (probe !== undefined)
+      return probe;
+    const now = Date.now();
+    if (probed !== undefined && now - probed.at < HEALTH_REUSE_MS) {
+      return Promise.resolve(probed.result);
+    }
+    if (hungReads > 0 && now - lastHungAt < healthRetryMs) {
+      return Promise.resolve("store_timeout");
+    }
+    const current = runProbe().catch(() => "store_unavailable");
+    probe = current;
+    current.then((result) => {
+      probed = { at: Date.now(), result };
+      if (probe === current)
+        probe = undefined;
+    });
+    return current;
+  }
   const largest = largestMessageBytes(config);
   const ipOf = (req, srv) => ipPrefixKey(clientIp(req, srv));
   const server = Bun.serve({
@@ -4908,11 +5024,17 @@ function startRelay(options, hooks) {
     idleTimeout: config.httpIdleTimeoutS,
     routes: {
       "/healthz": {
-        GET: () => json(200, {
-          status: "ok",
-          version: VERSION,
-          counters: { claudeHeaderWorkaround: claudeWorkarounds }
-        }, { "cache-control": "no-store" })
+        GET: async () => {
+          const store = await storeHealth();
+          if (store !== "ok") {
+            return json(503, { status: "unhealthy", reason: store, version: VERSION }, { "cache-control": "no-store" });
+          }
+          return json(200, {
+            status: "ok",
+            version: VERSION,
+            counters: { claudeHeaderWorkaround: claudeWorkarounds }
+          }, { "cache-control": "no-store" });
+        }
       },
       "/": {
         GET: () => new Response(INDEX_HTML, {
@@ -4975,7 +5097,7 @@ function startRelay(options, hooks) {
       sendPings: true,
       perMessageDeflate: false,
       open(ws) {
-        const session = new TabSession(ws, ws.data.ip, ws.data.origin, ws.data.site, host);
+        const session = new TabSession(ws, ws.data.ip, ws.data.origin, ws.data.site, host, ws.data.address);
         ws.data.session = session;
         allSessions.add(session);
       },
@@ -5140,5 +5262,5 @@ var shutdown = () => {
 process.on("SIGTERM", shutdown);
 process.on("SIGINT", shutdown);
 
-//# debugId=07B48995F9433DFC64756E2164756E21
+//# debugId=ED4BD668E1904D7C64756E2164756E21
 //# sourceMappingURL=main.js.map