@ztimson/utils 0.26.19 → 0.26.21

package/dist/index.mjs

@@ -423,8 +423,9 @@ class Cache {
     __publicField(this, "store", {});
     /** Whether cache is complete */
     __publicField(this, "complete", false);
+    __publicField(this, "_loading");
     /** Await initial loading */
-    __publicField(this, "loading");
+    __publicField(this, "loading", new Promise((r) => this._loading = r));
     /**
      * Get all cached items
      * @return {T[]} Array of items
@@ -433,8 +434,6 @@ class Cache {
     var _a, _b, _c, _d;
     this.key = key;
     this.options = options;
-    let done;
-    this.loading = new Promise((r) => done = r);
     if (this.options.persistentStorage != null) {
       if (typeof this.options.persistentStorage == "string")
         this.options.persistentStorage = { storage: localStorage, key: this.options.persistentStorage };
@@ -444,7 +443,7 @@ class Cache {
           const table = await persists.storage.createTable({ name: persists.key, key: this.key });
           const rows = await table.getAll();
           Object.assign(this.store, rows.reduce((acc, row) => ({ ...acc, [this.getKey(row)]: row }), {}));
-          done();
+          this._loading();
         })();
       } else if (((_d = (_c = this.options.persistentStorage) == null ? void 0 : _c.storage) == null ? void 0 : _d.getItem) != void 0) {
         const stored = this.options.persistentStorage.storage.getItem(this.options.persistentStorage.key);
@@ -452,8 +451,10 @@ class Cache {
           Object.assign(this.store, JSON.parse(stored));
         } catch {
         }
-        done();
+        this._loading();
       }
+    } else {
+      this._loading();
     }
     return new Proxy(this, {
       get: (target, prop) => {
@@ -1032,20 +1033,36 @@ class Database {
     this.database = database;
     this.version = version;
     this.connection = new Promise((resolve, reject) => {
-      const req = indexedDB.open(this.database, this.version);
+      let req;
+      try {
+        req = indexedDB.open(this.database, this.version);
+      } catch (err) {
+        return reject(err);
+      }
       this.tables = !tables ? [] : tables.map((t) => {
         t = typeof t == "object" ? t : { name: t };
         return { ...t, name: t.name.toString() };
       });
       req.onerror = () => reject(req.error);
       req.onsuccess = () => {
-        const db = req.result;
+        let db;
+        try {
+          db = req.result;
+        } catch (err) {
+          return reject(err);
+        }
         const existing = Array.from(db.objectStoreNames);
-        if (!tables) this.tables = existing.map((t) => {
-          const tx = db.transaction(t, "readonly");
-          const store = tx.objectStore(t);
-          return { name: t, key: store.keyPath };
-        });
+        if (!tables) {
+          this.tables = existing.map((t) => {
+            try {
+              const tx = db.transaction(t, "readonly");
+              const store = tx.objectStore(t);
+              return { name: t, key: store.keyPath };
+            } catch {
+              return { name: t };
+            }
+          });
+        }
         const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
         if (tables && desired.symmetricDifference(new ASet(existing)).length) {
           db.close();
@@ -1059,18 +1076,26 @@ class Database {
       };
       req.onupgradeneeded = () => {
         this.upgrading = true;
-        const db = req.result;
-        const existingTables = new ASet(Array.from(db.objectStoreNames));
-        if (tables) {
-          const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
-          existingTables.difference(desired).forEach((name) => db.deleteObjectStore(name));
-          desired.difference(existingTables).forEach((name) => {
-            const t = this.tables.find(findByProp("name", name));
-            db.createObjectStore(name, {
-              keyPath: t == null ? void 0 : t.key,
-              autoIncrement: (t == null ? void 0 : t.autoIncrement) || !(t == null ? void 0 : t.key)
+        let db;
+        try {
+          db = req.result;
+        } catch {
+          return;
+        }
+        try {
+          const existingTables = new ASet(Array.from(db.objectStoreNames));
+          if (tables) {
+            const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
+            existingTables.difference(desired).forEach((name) => db.deleteObjectStore(name));
+            desired.difference(existingTables).forEach((name) => {
+              const t = this.tables.find(findByProp("name", name));
+              db.createObjectStore(name, {
+                keyPath: t == null ? void 0 : t.key,
+                autoIncrement: (t == null ? void 0 : t.autoIncrement) || !(t == null ? void 0 : t.key)
+              });
             });
-          });
+          }
+        } catch {
         }
       };
     });
@@ -1085,6 +1110,7 @@ class Database {
       if (!this.includes(table.name)) {
         const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
         conn.close();
+        await newDb.connection;
         Object.assign(this, newDb);
         await this.connection;
       }
@@ -1098,6 +1124,7 @@ class Database {
       const conn = await this.connection;
       const newDb = new Database(this.database, this.tables.filter((t) => t.name != table.name), (this.version ?? 0) + 1);
       conn.close();
+      await newDb.connection;
       Object.assign(this, newDb);
       await this.connection;
     });
@@ -1126,9 +1153,8 @@ class Table {
     await this.database.waitForUpgrade();
     const db = await this.database.connection;
     const tx = db.transaction(table, readonly ? "readonly" : "readwrite");
-    const store = tx.objectStore(table);
     return new Promise((resolve, reject) => {
-      const request = fn2(store);
+      const request = fn2(tx.objectStore(table));
       request.onsuccess = () => resolve(request.result);
       request.onerror = () => reject(request.error);
     });