@profullstack/qryptchat 0.4.1 → 0.4.3

package/dist/{chunk-7ane8p3w.js → chunk-8m3j5hfk.js}

@@ -964,25 +964,48 @@ class QcClient {
       await this.refresh();
     return this.session.access_token;
   }
-  async request(path, { method = "GET", body, signal, retry = true } = {}) {
+  async reauth(usedToken) {
+    if (this.session.access_token === usedToken)
+      await this.refresh();
+  }
+  async request(path, { method = "GET", body, signal, retry = true, throttled = 0 } = {}) {
+    const used = await this.token();
     const res = await this.fetch(`${this.base}${path}`, {
       method,
       signal,
       headers: {
-        Authorization: `Bearer ${await this.token()}`,
+        Authorization: `Bearer ${used}`,
         ...body !== undefined ? { "Content-Type": "application/json" } : {}
       },
       body: body !== undefined ? JSON.stringify(body) : undefined
     });
     if (res.status === 401 && retry) {
-      await this.refresh();
-      return this.request(path, { method, body, signal, retry: false });
+      await this.reauth(used);
+      return this.request(path, { method, body, signal, retry: false, throttled });
+    }
+    if (res.status === 429 && throttled < 3) {
+      await sleep(retryAfterMs(res, throttled), signal);
+      return this.request(path, { method, body, signal, retry, throttled: throttled + 1 });
     }
     const data = await res.json().catch(() => ({}));
     if (!res.ok)
       throw new QcError(data.error_description || data.error || `HTTP ${res.status}`, res.status);
     return data;
   }
+  async keyCheck() {
+    try {
+      const me = this.me?.id;
+      const mine = this.session.keys?.keys1024?.publicKey;
+      if (!me || !mine)
+        return "unknown";
+      const { public_keys: keys = {} } = await this.request("/api/crypto/public-keys", { method: "POST", body: { user_ids: [me] } });
+      if (!keys[me])
+        return "unknown";
+      return keys[me] === mine ? "ok" : "mismatch";
+    } catch {
+      return "unknown";
+    }
+  }
   async conversations() {
     const { conversations = [] } = await this.request("/api/conversations/load", { method: "POST", body: {} });
     return conversations.map((c) => ({ ...c, title: conversationTitle(c, this.me) }));
@@ -1047,21 +1070,31 @@ class QcClient {
   }
   async events(onEvent, { signal, onStatus = () => {} } = {}) {
     let delay = 1000;
+    let reauthed = false;
     while (!signal?.aborted) {
       onStatus("connecting");
       try {
+        const used = await this.token();
         const res = await this.fetch(`${this.base}/api/events`, {
-          headers: { Authorization: `Bearer ${await this.token()}`, Accept: "text/event-stream" },
+          headers: { Authorization: `Bearer ${used}`, Accept: "text/event-stream" },
           signal
         });
         if (res.status === 401) {
-          await this.refresh();
+          if (reauthed)
+            throw new QcError("The server refused this session. Run qc login.", 401);
+          reauthed = true;
+          await this.reauth(used);
+          continue;
+        }
+        if (res.status === 429) {
+          await sleep(retryAfterMs(res, 2), signal);
           continue;
         }
         if (!res.ok || !res.body)
           throw new Error(`HTTP ${res.status}`);
         onStatus("live");
         delay = 1000;
+        reauthed = false;
         await readSse(res.body, onEvent);
       } catch (err) {
         if (signal?.aborted)
@@ -1111,6 +1144,10 @@ async function readSse(body, onEvent) {
     }
   }
 }
+function retryAfterMs(res, attempt = 0) {
+  const s = Number(res.headers?.get?.("retry-after"));
+  return Number.isFinite(s) && s > 0 ? Math.min(s, 60) * 1000 : 2000 * 2 ** attempt;
+}
 function sleep(ms, signal) {
   return new Promise((resolve) => {
     const t = setTimeout(resolve, ms);
@@ -1417,7 +1454,11 @@ async function main2(argv, { version = "0.0.0" } = {}) {
     }
     case "login": {
       const { session } = await login({ oob: !!flags.oob });
-      return out(`Signed in as @${session.user?.username ?? "unknown"} on ${session.base}. Keys sealed (ChaCha20-Poly1305) in ${sessionPath()}.`);
+      out(`Signed in as @${session.user?.username ?? "unknown"} on ${session.base}. Keys sealed (ChaCha20-Poly1305) in ${sessionPath()}.`);
+      if (await new QcClient(session).keyCheck() === "mismatch") {
+        out("Warning: the browser handed over keys that are not your account's current keys, so messages will not decrypt here. Restore your keys in that browser (Settings > Keys) or approve from the device you chat on, then run qc login again.");
+      }
+      return;
     }
     case "logout":
       clearSession();

package/dist/commands.js

@@ -3,7 +3,7 @@ import {
   parseArgs2,
   findChat2,
   main2
-} from "./chunk-7ane8p3w.js";
+} from "./chunk-8m3j5hfk.js";
 import"./chunk-vfahhydf.js";
 export {
   HELP2 as HELP,

package/dist/mcp.js

@@ -1,7 +1,7 @@
 import"./chunk-vfahhydf.js";
 import {
   findChat2
-} from "./chunk-7ane8p3w.js";
+} from "./chunk-8m3j5hfk.js";
 
 // src/cli/mcp.js
 import { createInterface } from "node:readline";

package/dist/tui.js

@@ -203,16 +203,17 @@ function saveRecent(list) {
     writeFileSync(recentFile(), JSON.stringify(list), { mode: 384 });
   } catch {}
 }
+var KEY_MISMATCH = "Keys don't match your account, so messages can't decrypt. Run qc login and approve from a browser that can read your chats.";
 async function runTui(client, { initialChat } = {}) {
   const state = initialState(client.me);
   state.recent = loadRecent();
   const abort = new AbortController;
   const app = await createApp({ quitKeys: ["ctrl+c"], focusNavigation: false });
   const redraw = () => app.invalidate();
-  const note = (msg) => {
+  const note = (msg, { sticky = false } = {}) => {
     state.notice = msg;
     redraw();
-    if (msg)
+    if (msg && !sticky)
       setTimeout(() => {
         if (state.notice === msg) {
           state.notice = "";
@@ -231,6 +232,7 @@ async function runTui(client, { initialChat } = {}) {
       note(`Could not load messages: ${err.message}`);
     }
   }
+  let keysChecked = false;
   async function loadConversations() {
     try {
       const before = state.activeId;
@@ -243,9 +245,10 @@ async function runTui(client, { initialChat } = {}) {
         state.selected = Math.max(0, state.conversations.findIndex((c) => c.id === before));
       }
       redraw();
-      for (const c of state.conversations.slice(0, 40)) {
-        if (c.id !== state.activeId && !state.messages[c.id])
-          await loadMessages(c.id);
+      if (!keysChecked) {
+        keysChecked = true;
+        if (await client.keyCheck() === "mismatch")
+          note(KEY_MISMATCH, { sticky: true });
       }
     } catch (err) {
       state.loading = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profullstack/qryptchat",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "qc: qrypt.chat in your terminal. A full-screen end-to-end encrypted chat client (ML-KEM-1024), plus a scriptable CLI and an MCP server.",
   "type": "module",
   "bin": {