matrix-js-sdk 41.8.0 → 41.9.0

package/lib/crypto/store/indexeddb-crypto-store-backend.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -19,7 +18,7 @@ limitations under the License.
 import { logger } from "../../logger.js";
 import { MigrationState, SESSION_BATCH_SIZE, ACCOUNT_OBJECT_KEY_MIGRATION_STATE } from "./base.js";
 import { IndexedDBCryptoStore } from "./indexeddb-crypto-store.js";
-var PROFILE_TRANSACTIONS = false;
+const PROFILE_TRANSACTIONS = false;
 
 /**
  * Implementation of a CryptoStore which is backed by an existing
@@ -32,33 +31,26 @@ export class Backend {
   /**
    */
   constructor(db) {
-    this.db = db;
     _defineProperty(this, "nextTxnId", 0);
+    this.db = db;
     // make sure we close the db on `onversionchange` - otherwise
     // attempts to delete the database will block (and subsequent
     // attempts to re-create it will also block).
     db.onversionchange = () => {
-      logger.log("versionchange for indexeddb ".concat(this.db.name, ": closing"));
+      logger.log(`versionchange for indexeddb ${this.db.name}: closing`);
       db.close();
     };
   }
-  containsData() {
-    return _asyncToGenerator(function* () {
-      throw Error("Not implemented for Backend");
-    })();
+  async containsData() {
+    throw Error("Not implemented for Backend");
   }
-  startup() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      // No work to do, as the startup is done by the caller (e.g IndexedDBCryptoStore)
-      // by passing us a ready IDBDatabase instance
-      return _this;
-    })();
+  async startup() {
+    // No work to do, as the startup is done by the caller (e.g IndexedDBCryptoStore)
+    // by passing us a ready IDBDatabase instance
+    return this;
   }
-  deleteAllData() {
-    return _asyncToGenerator(function* () {
-      throw Error("This is not implemented, call IDBFactory::deleteDatabase(dbName) instead.");
-    })();
+  async deleteAllData() {
+    throw Error("This is not implemented, call IDBFactory::deleteDatabase(dbName) instead.");
   }
 
   /**
@@ -66,20 +58,16 @@ export class Backend {
    *
    * Implementation of {@link CryptoStore.getMigrationState}.
    */
-  getMigrationState() {
-    var _this2 = this;
-    return _asyncToGenerator(function* () {
-      var migrationState = MigrationState.NOT_STARTED;
-      yield _this2.doTxn("readonly", [IndexedDBCryptoStore.STORE_ACCOUNT], txn => {
-        var objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_ACCOUNT);
-        var getReq = objectStore.get(ACCOUNT_OBJECT_KEY_MIGRATION_STATE);
-        getReq.onsuccess = () => {
-          var _getReq$result;
-          migrationState = (_getReq$result = getReq.result) !== null && _getReq$result !== void 0 ? _getReq$result : MigrationState.NOT_STARTED;
-        };
-      });
-      return migrationState;
-    })();
+  async getMigrationState() {
+    let migrationState = MigrationState.NOT_STARTED;
+    await this.doTxn("readonly", [IndexedDBCryptoStore.STORE_ACCOUNT], txn => {
+      const objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_ACCOUNT);
+      const getReq = objectStore.get(ACCOUNT_OBJECT_KEY_MIGRATION_STATE);
+      getReq.onsuccess = () => {
+        migrationState = getReq.result ?? MigrationState.NOT_STARTED;
+      };
+    });
+    return migrationState;
   }
 
   /**
@@ -87,21 +75,18 @@ export class Backend {
    *
    * Implementation of {@link CryptoStore.setMigrationState}.
    */
-  setMigrationState(migrationState) {
-    var _this3 = this;
-    return _asyncToGenerator(function* () {
-      yield _this3.doTxn("readwrite", [IndexedDBCryptoStore.STORE_ACCOUNT], txn => {
-        var objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_ACCOUNT);
-        objectStore.put(migrationState, ACCOUNT_OBJECT_KEY_MIGRATION_STATE);
-      });
-    })();
+  async setMigrationState(migrationState) {
+    await this.doTxn("readwrite", [IndexedDBCryptoStore.STORE_ACCOUNT], txn => {
+      const objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_ACCOUNT);
+      objectStore.put(migrationState, ACCOUNT_OBJECT_KEY_MIGRATION_STATE);
+    });
   }
 
   // Olm Account
 
   getAccount(txn, func) {
-    var objectStore = txn.objectStore("account");
-    var getReq = objectStore.get("-");
+    const objectStore = txn.objectStore("account");
+    const getReq = objectStore.get("-");
     getReq.onsuccess = function () {
       try {
         func(getReq.result || null);
@@ -111,12 +96,12 @@ export class Backend {
     };
   }
   storeAccount(txn, accountPickle) {
-    var objectStore = txn.objectStore("account");
+    const objectStore = txn.objectStore("account");
     objectStore.put(accountPickle, "-");
   }
   getCrossSigningKeys(txn, func) {
-    var objectStore = txn.objectStore("account");
-    var getReq = objectStore.get("crossSigningKeys");
+    const objectStore = txn.objectStore("account");
+    const getReq = objectStore.get("crossSigningKeys");
     getReq.onsuccess = function () {
       try {
         func(getReq.result || null);
@@ -126,8 +111,8 @@ export class Backend {
     };
   }
   getSecretStorePrivateKey(txn, func, type) {
-    var objectStore = txn.objectStore("account");
-    var getReq = objectStore.get("ssss_cache:".concat(type));
+    const objectStore = txn.objectStore("account");
+    const getReq = objectStore.get(`ssss_cache:${type}`);
     getReq.onsuccess = function () {
       try {
         func(getReq.result || null);
@@ -137,15 +122,15 @@ export class Backend {
     };
   }
   storeSecretStorePrivateKey(txn, type, key) {
-    var objectStore = txn.objectStore("account");
-    objectStore.put(key, "ssss_cache:".concat(type));
+    const objectStore = txn.objectStore("account");
+    objectStore.put(key, `ssss_cache:${type}`);
   }
 
   // Olm Sessions
 
   countEndToEndSessions(txn, func) {
-    var objectStore = txn.objectStore("sessions");
-    var countReq = objectStore.count();
+    const objectStore = txn.objectStore("sessions");
+    const countReq = objectStore.count();
     countReq.onsuccess = function () {
       try {
         func(countReq.result);
@@ -155,12 +140,12 @@ export class Backend {
     };
   }
   getEndToEndSessions(deviceKey, txn, func) {
-    var objectStore = txn.objectStore("sessions");
-    var idx = objectStore.index("deviceKey");
-    var getReq = idx.openCursor(deviceKey);
-    var results = {};
+    const objectStore = txn.objectStore("sessions");
+    const idx = objectStore.index("deviceKey");
+    const getReq = idx.openCursor(deviceKey);
+    const results = {};
     getReq.onsuccess = function () {
-      var cursor = getReq.result;
+      const cursor = getReq.result;
       if (cursor) {
         results[cursor.value.sessionId] = {
           session: cursor.value.session,
@@ -177,8 +162,8 @@ export class Backend {
     };
   }
   getEndToEndSession(deviceKey, sessionId, txn, func) {
-    var objectStore = txn.objectStore("sessions");
-    var getReq = objectStore.get([deviceKey, sessionId]);
+    const objectStore = txn.objectStore("sessions");
+    const getReq = objectStore.get([deviceKey, sessionId]);
     getReq.onsuccess = function () {
       try {
         if (getReq.result) {
@@ -195,7 +180,7 @@ export class Backend {
     };
   }
   storeEndToEndSession(deviceKey, sessionId, sessionInfo, txn) {
-    var objectStore = txn.objectStore("sessions");
+    const objectStore = txn.objectStore("sessions");
     objectStore.put({
       deviceKey,
       sessionId,
@@ -209,33 +194,30 @@ export class Backend {
    *
    * Implementation of {@link CryptoStore.getEndToEndSessionsBatch}.
    */
-  getEndToEndSessionsBatch() {
-    var _this4 = this;
-    return _asyncToGenerator(function* () {
-      var result = [];
-      yield _this4.doTxn("readonly", [IndexedDBCryptoStore.STORE_SESSIONS], txn => {
-        var objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_SESSIONS);
-        var getReq = objectStore.openCursor();
-        getReq.onsuccess = function () {
-          try {
-            var cursor = getReq.result;
-            if (cursor) {
-              result.push(cursor.value);
-              if (result.length < SESSION_BATCH_SIZE) {
-                cursor.continue();
-              }
+  async getEndToEndSessionsBatch() {
+    const result = [];
+    await this.doTxn("readonly", [IndexedDBCryptoStore.STORE_SESSIONS], txn => {
+      const objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_SESSIONS);
+      const getReq = objectStore.openCursor();
+      getReq.onsuccess = function () {
+        try {
+          const cursor = getReq.result;
+          if (cursor) {
+            result.push(cursor.value);
+            if (result.length < SESSION_BATCH_SIZE) {
+              cursor.continue();
             }
-          } catch (e) {
-            abortWithException(txn, e);
           }
-        };
-      });
-      if (result.length === 0) {
-        // No sessions left.
-        return null;
-      }
-      return result;
-    })();
+        } catch (e) {
+          abortWithException(txn, e);
+        }
+      };
+    });
+    if (result.length === 0) {
+      // No sessions left.
+      return null;
+    }
+    return result;
   }
 
   /**
@@ -245,42 +227,32 @@ export class Backend {
    *
    * @internal
    */
-  deleteEndToEndSessionsBatch(sessions) {
-    var _this5 = this;
-    return _asyncToGenerator(function* () {
-      yield _this5.doTxn("readwrite", [IndexedDBCryptoStore.STORE_SESSIONS], /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator(function* (txn) {
-          try {
-            var objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_SESSIONS);
-            var _loop = function* _loop() {
-              var deviceKey = _ref3.deviceKey;
-              var sessionId = _ref3.sessionId;
-              var req = objectStore.delete([deviceKey, sessionId]);
-              yield new Promise(resolve => {
-                req.onsuccess = resolve;
-              });
-            };
-            for (var _ref3 of sessions) {
-              yield* _loop();
-            }
-          } catch (e) {
-            abortWithException(txn, e);
-          }
-        });
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-    })();
+  async deleteEndToEndSessionsBatch(sessions) {
+    await this.doTxn("readwrite", [IndexedDBCryptoStore.STORE_SESSIONS], async txn => {
+      try {
+        const objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_SESSIONS);
+        for (const {
+          deviceKey,
+          sessionId
+        } of sessions) {
+          const req = objectStore.delete([deviceKey, sessionId]);
+          await new Promise(resolve => {
+            req.onsuccess = resolve;
+          });
+        }
+      } catch (e) {
+        abortWithException(txn, e);
+      }
+    });
   }
 
   // Inbound group sessions
 
   getEndToEndInboundGroupSession(senderCurve25519Key, sessionId, txn, func) {
-    var session = false;
-    var withheld = false;
-    var objectStore = txn.objectStore("inbound_group_sessions");
-    var getReq = objectStore.get([senderCurve25519Key, sessionId]);
+    let session = false;
+    let withheld = false;
+    const objectStore = txn.objectStore("inbound_group_sessions");
+    const getReq = objectStore.get([senderCurve25519Key, sessionId]);
     getReq.onsuccess = function () {
       try {
         if (getReq.result) {
@@ -295,8 +267,8 @@ export class Backend {
         abortWithException(txn, e);
       }
     };
-    var withheldObjectStore = txn.objectStore("inbound_group_sessions_withheld");
-    var withheldGetReq = withheldObjectStore.get([senderCurve25519Key, sessionId]);
+    const withheldObjectStore = txn.objectStore("inbound_group_sessions_withheld");
+    const withheldGetReq = withheldObjectStore.get([senderCurve25519Key, sessionId]);
     withheldGetReq.onsuccess = function () {
       try {
         if (withheldGetReq.result) {
@@ -313,7 +285,7 @@ export class Backend {
     };
   }
   storeEndToEndInboundGroupSession(senderCurve25519Key, sessionId, sessionData, txn) {
-    var objectStore = txn.objectStore("inbound_group_sessions");
+    const objectStore = txn.objectStore("inbound_group_sessions");
     objectStore.put({
       senderCurve25519Key,
       sessionId,
@@ -328,19 +300,16 @@ export class Backend {
    *
    * @internal
    */
-  countEndToEndInboundGroupSessions() {
-    var _this6 = this;
-    return _asyncToGenerator(function* () {
-      var result = 0;
-      yield _this6.doTxn("readonly", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS], txn => {
-        var sessionStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
-        var countReq = sessionStore.count();
-        countReq.onsuccess = () => {
-          result = countReq.result;
-        };
-      });
-      return result;
-    })();
+  async countEndToEndInboundGroupSessions() {
+    let result = 0;
+    await this.doTxn("readonly", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS], txn => {
+      const sessionStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
+      const countReq = sessionStore.count();
+      countReq.onsuccess = () => {
+        result = countReq.result;
+      };
+    });
+    return result;
   }
 
   /**
@@ -348,42 +317,39 @@ export class Backend {
    *
    * Implementation of {@link CryptoStore.getEndToEndInboundGroupSessionsBatch}.
    */
-  getEndToEndInboundGroupSessionsBatch() {
-    var _this7 = this;
-    return _asyncToGenerator(function* () {
-      var result = [];
-      yield _this7.doTxn("readonly", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS, IndexedDBCryptoStore.STORE_BACKUP], txn => {
-        var sessionStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
-        var backupStore = txn.objectStore(IndexedDBCryptoStore.STORE_BACKUP);
-        var getReq = sessionStore.openCursor();
-        getReq.onsuccess = function () {
-          try {
-            var cursor = getReq.result;
-            if (cursor) {
-              var backupGetReq = backupStore.get(cursor.key);
-              backupGetReq.onsuccess = () => {
-                result.push({
-                  senderKey: cursor.value.senderCurve25519Key,
-                  sessionId: cursor.value.sessionId,
-                  sessionData: cursor.value.session,
-                  needsBackup: backupGetReq.result !== undefined
-                });
-                if (result.length < SESSION_BATCH_SIZE) {
-                  cursor.continue();
-                }
-              };
-            }
-          } catch (e) {
-            abortWithException(txn, e);
+  async getEndToEndInboundGroupSessionsBatch() {
+    const result = [];
+    await this.doTxn("readonly", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS, IndexedDBCryptoStore.STORE_BACKUP], txn => {
+      const sessionStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
+      const backupStore = txn.objectStore(IndexedDBCryptoStore.STORE_BACKUP);
+      const getReq = sessionStore.openCursor();
+      getReq.onsuccess = function () {
+        try {
+          const cursor = getReq.result;
+          if (cursor) {
+            const backupGetReq = backupStore.get(cursor.key);
+            backupGetReq.onsuccess = () => {
+              result.push({
+                senderKey: cursor.value.senderCurve25519Key,
+                sessionId: cursor.value.sessionId,
+                sessionData: cursor.value.session,
+                needsBackup: backupGetReq.result !== undefined
+              });
+              if (result.length < SESSION_BATCH_SIZE) {
+                cursor.continue();
+              }
+            };
           }
-        };
-      });
-      if (result.length === 0) {
-        // No sessions left.
-        return null;
-      }
-      return result;
-    })();
+        } catch (e) {
+          abortWithException(txn, e);
+        }
+      };
+    });
+    if (result.length === 0) {
+      // No sessions left.
+      return null;
+    }
+    return result;
   }
 
   /**
@@ -393,37 +359,27 @@ export class Backend {
    *
    * @internal
    */
-  deleteEndToEndInboundGroupSessionsBatch(sessions) {
-    var _this8 = this;
-    return _asyncToGenerator(function* () {
-      yield _this8.doTxn("readwrite", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS], /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator(function* (txn) {
-          try {
-            var objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
-            var _loop2 = function* _loop2() {
-              var senderKey = _ref6.senderKey;
-              var sessionId = _ref6.sessionId;
-              var req = objectStore.delete([senderKey, sessionId]);
-              yield new Promise(resolve => {
-                req.onsuccess = resolve;
-              });
-            };
-            for (var _ref6 of sessions) {
-              yield* _loop2();
-            }
-          } catch (e) {
-            abortWithException(txn, e);
-          }
-        });
-        return function (_x2) {
-          return _ref4.apply(this, arguments);
-        };
-      }());
-    })();
+  async deleteEndToEndInboundGroupSessionsBatch(sessions) {
+    await this.doTxn("readwrite", [IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS], async txn => {
+      try {
+        const objectStore = txn.objectStore(IndexedDBCryptoStore.STORE_INBOUND_GROUP_SESSIONS);
+        for (const {
+          senderKey,
+          sessionId
+        } of sessions) {
+          const req = objectStore.delete([senderKey, sessionId]);
+          await new Promise(resolve => {
+            req.onsuccess = resolve;
+          });
+        }
+      } catch (e) {
+        abortWithException(txn, e);
+      }
+    });
   }
   getEndToEndDeviceData(txn, func) {
-    var objectStore = txn.objectStore("device_data");
-    var getReq = objectStore.get("-");
+    const objectStore = txn.objectStore("device_data");
+    const getReq = objectStore.get("-");
     getReq.onsuccess = function () {
       try {
         func(getReq.result || null);
@@ -433,11 +389,11 @@ export class Backend {
     };
   }
   getEndToEndRooms(txn, func) {
-    var rooms = {};
-    var objectStore = txn.objectStore("rooms");
-    var getReq = objectStore.openCursor();
+    const rooms = {};
+    const objectStore = txn.objectStore("rooms");
+    const getReq = objectStore.openCursor();
     getReq.onsuccess = function () {
-      var cursor = getReq.result;
+      const cursor = getReq.result;
       if (cursor) {
         rooms[cursor.key] = cursor.value;
         cursor.continue();
@@ -450,45 +406,41 @@ export class Backend {
       }
     };
   }
-  markSessionsNeedingBackup(sessions, txn) {
-    var _this9 = this;
-    return _asyncToGenerator(function* () {
-      if (!txn) {
-        txn = _this9.db.transaction("sessions_needing_backup", "readwrite");
-      }
-      var objectStore = txn.objectStore("sessions_needing_backup");
-      yield Promise.all(sessions.map(session => {
-        return new Promise((resolve, reject) => {
-          var req = objectStore.put({
-            senderCurve25519Key: session.senderKey,
-            sessionId: session.sessionId
-          });
-          req.onsuccess = resolve;
-          req.onerror = reject;
+  async markSessionsNeedingBackup(sessions, txn) {
+    if (!txn) {
+      txn = this.db.transaction("sessions_needing_backup", "readwrite");
+    }
+    const objectStore = txn.objectStore("sessions_needing_backup");
+    await Promise.all(sessions.map(session => {
+      return new Promise((resolve, reject) => {
+        const req = objectStore.put({
+          senderCurve25519Key: session.senderKey,
+          sessionId: session.sessionId
         });
-      }));
-    })();
+        req.onsuccess = resolve;
+        req.onerror = reject;
+      });
+    }));
   }
-  doTxn(mode, stores, func) {
-    var log = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : logger;
-    var startTime;
-    var description;
+  doTxn(mode, stores, func, log = logger) {
+    let startTime;
+    let description;
     if (PROFILE_TRANSACTIONS) {
-      var txnId = this.nextTxnId++;
+      const txnId = this.nextTxnId++;
       startTime = Date.now();
-      description = "".concat(mode, " crypto store transaction ").concat(txnId, " in ").concat(stores);
-      log.debug("Starting ".concat(description));
+      description = `${mode} crypto store transaction ${txnId} in ${stores}`;
+      log.debug(`Starting ${description}`);
     }
-    var txn = this.db.transaction(stores, mode);
-    var promise = promiseifyTxn(txn);
-    var result = func(txn);
+    const txn = this.db.transaction(stores, mode);
+    const promise = promiseifyTxn(txn);
+    const result = func(txn);
     if (PROFILE_TRANSACTIONS) {
       promise.then(() => {
-        var elapsedTime = Date.now() - startTime;
-        log.debug("Finished ".concat(description, ", took ").concat(elapsedTime, " ms"));
+        const elapsedTime = Date.now() - startTime;
+        log.debug(`Finished ${description}, took ${elapsedTime} ms`);
       }, () => {
-        var elapsedTime = Date.now() - startTime;
-        log.error("Failed ".concat(description, ", took ").concat(elapsedTime, " ms"));
+        const elapsedTime = Date.now() - startTime;
+        log.error(`Failed ${description}, took ${elapsedTime} ms`);
       });
     }
     return promise.then(() => {
@@ -496,12 +448,12 @@ export class Backend {
     });
   }
 }
-var DB_MIGRATIONS = [db => {
+const DB_MIGRATIONS = [db => {
   createDatabase(db);
 }, db => {
   db.createObjectStore("account");
 }, db => {
-  var sessionsStore = db.createObjectStore("sessions", {
+  const sessionsStore = db.createObjectStore("sessions", {
     keyPath: ["deviceKey", "sessionId"]
   });
   sessionsStore.createIndex("deviceKey", "deviceKey");
@@ -522,7 +474,7 @@ var DB_MIGRATIONS = [db => {
     keyPath: ["senderCurve25519Key", "sessionId"]
   });
 }, db => {
-  var problemsStore = db.createObjectStore("session_problems", {
+  const problemsStore = db.createObjectStore("session_problems", {
     keyPath: ["deviceKey", "time"]
   });
   problemsStore.createIndex("deviceKey", "deviceKey");
@@ -540,15 +492,15 @@ var DB_MIGRATIONS = [db => {
 }
 // Expand as needed.
 ];
-export var VERSION = DB_MIGRATIONS.length;
+export const VERSION = DB_MIGRATIONS.length;
 export function upgradeDatabase(db, oldVersion) {
-  logger.log("Upgrading IndexedDBCryptoStore from version ".concat(oldVersion) + " to ".concat(VERSION));
+  logger.log(`Upgrading IndexedDBCryptoStore from version ${oldVersion}` + ` to ${VERSION}`);
   DB_MIGRATIONS.forEach((migration, index) => {
     if (oldVersion <= index) migration(db);
   });
 }
 function createDatabase(db) {
-  var outgoingRoomKeyRequestsStore = db.createObjectStore("outgoingRoomKeyRequests", {
+  const outgoingRoomKeyRequestsStore = db.createObjectStore("outgoingRoomKeyRequests", {
     keyPath: "requestId"
   });
 
@@ -568,7 +520,7 @@ function abortWithException(txn, e) {
   txn._mx_abortexception = e;
   try {
     txn.abort();
-  } catch (_unused) {
+  } catch {
     // sometimes we won't be able to abort the transaction
     // (ie. if it's aborted or completed)
   }