@telecrypt-io/storage 0.2.5 → 0.2.8

package/dist/TeleCryptIOStorage.js

@@ -158,6 +158,18 @@ export class TeleCryptIOStorage {
      */
     async keysSetupRecovery() {
         const crypto = this.requireCrypto();
+        // If this account already has secret storage configured (e.g. from a
+        // previous setup on another device), we cannot unlock it here: the SDK
+        // has no `getSecretStorageKey` callback wired yet and the old recovery
+        // key is not available, so `bootstrapCrossSigning` would try to read the
+        // existing 4S and fail with "No getSecretStorageKey callback supplied".
+        // Reset the account's 4S + key backup so we can bootstrap a fresh,
+        // self-consistent recovery state (new cross-signing keys, new 4S key,
+        // new backup) and hand the user a working recovery key.
+        const status = await crypto.getSecretStorageStatus();
+        if (status.defaultKeyId) {
+            await crypto.disableKeyStorage();
+        }
         await crypto.bootstrapCrossSigning({
             // No existing verified device to interactively re-authenticate against
             // for this account, so there is nothing to feed into `makeRequest`;
@@ -351,13 +363,20 @@ export class TeleCryptIOStorage {
         return event_id;
     }
     async downloadFile(branch) {
-        const { info } = await branch.getFileInfo();
-        // If the underlying room event couldn't be decrypted (e.g. this device
-        // never received/recovered the megolm session for it), matrix-js-sdk
-        // hands back a placeholder with no usable `info` rather than throwing —
-        // so without this check, callers would hit an opaque
-        // "Cannot read properties of undefined" a few lines down instead of a
-        // clear, actionable error.
+        let info;
+        try {
+            ({ info } = await branch.getFileInfo());
+        }
+        catch {
+            // matrix-js-sdk's MSC3089Branch.getFileInfo() reads `file["url"]` off
+            // the raw event content; when the event is undecryptable on this
+            // device it hands back a placeholder with no `file` block, so that
+            // read throws an opaque "Cannot read properties of undefined" instead
+            // of a useful error. Surface the real cause.
+            throw new Error(`downloadFile: could not read file info from the event — it is likely undecryptable on this device (missing megolm session; try restoring from a Recovery Key)`);
+        }
+        // Belt-and-braces: if a future matrix-js-sdk version returns a
+        // placeholder without throwing, still fail with the clear message.
         if (!info || typeof info.url !== "string") {
             throw new Error("downloadFile: could not read file info from the event — it is likely undecryptable on this device (missing megolm session; try restoring from a Recovery Key)");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telecrypt-io/storage",
-  "version": "0.2.5",
+  "version": "0.2.8",
   "license": "BUSL-1.1",
   "type": "module",
   "main": "dist/index.js",