khala-cli 0.4.9 → 0.4.10

package/dist/{chunk-PAJ4JJPV.mjs → chunk-3E5DH3Y6.mjs}

@@ -1,15 +1,18 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  retryUnexpired
+} from "./chunk-C2WEDMAF.mjs";
 import {
   StateError,
   ensureStateDir,
   writeJsonAtomic
-} from "./chunk-NPSQNCOY.mjs";
+} from "./chunk-PN25BUQ4.mjs";
 import {
   __commonJS,
   __export,
   __toESM,
   init_define_KHALA_BUNDLE
-} from "./chunk-7R3EIDGR.mjs";
+} from "./chunk-EVT2DWNZ.mjs";
 
 // ../../node_modules/.pnpm/immediate@3.3.0/node_modules/immediate/lib/nextTick.js
 var require_nextTick = __commonJS({
@@ -9623,7 +9626,8 @@ async function readIdentity(file) {
     const stat = await handle.stat();
     if (!stat.isFile() || process.platform !== "win32" && (stat.mode & 63) !== 0 || typeof process.getuid === "function" && stat.uid !== process.getuid()) throw new StateError("unsafe_state_dir");
     const value = JSON.parse(await handle.readFile("utf8"));
-    if (!value || typeof value.homeserver !== "string" || typeof value.userId !== "string" || typeof value.deviceId !== "string" || value.accessToken !== void 0 && typeof value.accessToken !== "string" || value.joinedAt !== void 0 && !Number.isFinite(value.joinedAt)) throw new CryptoStoreCorruptError();
+    if (!value || typeof value.homeserver !== "string" || typeof value.userId !== "string" || typeof value.deviceId !== "string" || value.accessToken !== void 0 && typeof value.accessToken !== "string" || value.joinedAt !== void 0 && !Number.isFinite(value.joinedAt) || value.undecryptableEventIds !== void 0 && (!Array.isArray(value.undecryptableEventIds) || value.undecryptableEventIds.length > 100 || value.undecryptableEventIds.some((entry) => typeof entry !== "string" && (!entry || typeof entry !== "object" || typeof entry.id !== "string" || typeof entry.firstSeen !== "number" || !Number.isFinite(entry.firstSeen) || entry.firstSeen < 0 || entry.firstSeen > Number.MAX_SAFE_INTEGER)))) throw new CryptoStoreCorruptError();
+    if (value.undecryptableEventIds) value.undecryptableEventIds = value.undecryptableEventIds.filter((entry) => typeof entry !== "string" && retryUnexpired(entry));
     return value;
   } catch (error) {
     if (error instanceof StateError) throw error;
@@ -9735,18 +9739,32 @@ async function openCryptoStore(dir, root, creds) {
     if (!restored) {
       await deleteStores(prefix, dir);
     }
-    await writeJsonAtomic(identityFile, { ...identity, ...restored && previous?.joinedAt !== void 0 ? { joinedAt: previous?.joinedAt } : {} });
+    const saved = { ...identity, ...restored && previous?.joinedAt !== void 0 ? { joinedAt: previous.joinedAt } : {}, ...restored && previous?.undecryptableEventIds ? { undecryptableEventIds: previous.undecryptableEventIds } : {} };
+    await writeJsonAtomic(identityFile, saved);
     const sync = new DurableSyncStore({ indexedDB: globalThis.indexedDB, dbName: prefix });
     let closed;
+    let identitySave = Promise.resolve();
+    const saveIdentity = () => {
+      const saving = identitySave.then(() => writeJsonAtomic(identityFile, saved));
+      identitySave = saving.catch(() => {
+      });
+      return saving;
+    };
     return {
       prefix,
       sync,
       restored,
       ...recovered ? { recovered } : {},
       ...restored && previous?.joinedAt !== void 0 ? { joinedAt: previous?.joinedAt } : {},
+      undecryptableEventIds: saved.undecryptableEventIds ?? [],
+      async rememberUndecryptable(ids) {
+        saved.undecryptableEventIds = ids.filter((entry) => retryUnexpired(entry)).slice(-100);
+        await saveIdentity();
+      },
       async rememberJoin(ts) {
         if (this.joinedAt === void 0) {
-          await writeJsonAtomic(identityFile, { ...identity, joinedAt: ts });
+          saved.joinedAt = ts;
+          await saveIdentity();
           this.joinedAt = ts;
         }
       },
@@ -9767,7 +9785,7 @@ async function openCryptoStore(dir, root, creds) {
     throw error;
   }
 }
-async function wipeCryptoStore(dir, root) {
+async function wipeCryptoStore(dir, root, fetcher = fetch) {
   try {
     const names = await fs3.readdir(dir);
     if (!["crypto.json", "crypto.sqlite", "sync.sqlite"].some((name) => names.includes(name))) return;
@@ -9784,6 +9802,25 @@ async function wipeCryptoStore(dir, root) {
     retries: { retries: 12, minTimeout: 1e3, maxTimeout: 1e3 }
   });
   try {
+    let identity;
+    try {
+      identity = await readIdentity(path.join(dir, "crypto.json"));
+    } catch {
+      identity = null;
+    }
+    if (identity?.accessToken) {
+      try {
+        const response = await fetcher(`${identity.homeserver}/_matrix/client/v3/logout`, {
+          method: "POST",
+          headers: { authorization: `Bearer ${identity.accessToken}`, "content-type": "application/json" },
+          body: "{}",
+          signal: AbortSignal.timeout(5e3)
+        });
+        if (!response.ok && response.status !== 401) console.error("khala: discarded_device_logout_failed");
+      } catch {
+        console.error("khala: discarded_device_logout_failed");
+      }
+    }
     await unlink2(path.join(dir, "crypto.json"));
     await deleteStores(prefix, dir);
   } finally {

package/dist/{chunk-NGSYOVQ4.mjs → chunk-4BP7V3OP.mjs}

@@ -5,10 +5,10 @@ import {
   object,
   readMatrixUserId,
   version
-} from "./chunk-NPSQNCOY.mjs";
+} from "./chunk-PN25BUQ4.mjs";
 import {
   init_define_KHALA_BUNDLE
-} from "./chunk-7R3EIDGR.mjs";
+} from "./chunk-EVT2DWNZ.mjs";
 
 // ../contracts/src/m1/listening-mode.ts
 init_define_KHALA_BUNDLE();

package/dist/{chunk-TEFOQXBK.mjs → chunk-4BZQ4GVW.mjs}

@@ -1,17 +1,17 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   listChannels
-} from "./chunk-TANCKTDK.mjs";
+} from "./chunk-OEV5DFLW.mjs";
 import {
   TERMINAL_SESSION_DETAILS,
   cachedProcessReader,
   readStateFile,
   readStatus,
   validAgentRejoinSecret
-} from "./chunk-NPSQNCOY.mjs";
+} from "./chunk-PN25BUQ4.mjs";
 import {
   init_define_KHALA_BUNDLE
-} from "./chunk-7R3EIDGR.mjs";
+} from "./chunk-EVT2DWNZ.mjs";
 
 // src/session-start-wake.ts
 init_define_KHALA_BUNDLE();