@instantdb/core 1.0.2 → 1.0.3-branch-idb-fix.24363841776.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -391,3 +391,35 @@ test('PersistedObject garbage collects when we exceed max age', async () => {
391
391
 
392
392
  expect(snapshot3).toStrictEqual({});
393
393
  });
394
+
395
+ test('IndexedDBStorage recovers when the database connection closes', async () => {
396
+ const idb = new IndexedDBStorage(randomUUID(), 'kv');
397
+
398
+ await idb.setItem('key1', 'value1');
399
+ expect(await idb.getItem('key1')).toBe('value1');
400
+
401
+ // Simulate the browser closing the connection unexpectedly.
402
+ // Remove the onclose handler so recovery relies entirely on _withRetry
403
+ // catching the InvalidStateError (the same codepath as the original bug).
404
+ const db = await idb._dbPromise;
405
+ db.onclose = null;
406
+ db.close();
407
+
408
+ // All operations should recover transparently
409
+ await idb.setItem('key2', 'value2');
410
+ expect(await idb.getItem('key1')).toBe('value1');
411
+ expect(await idb.getItem('key2')).toBe('value2');
412
+
413
+ await idb.multiSet([
414
+ ['key3', 'value3'],
415
+ ['key4', 'value4'],
416
+ ]);
417
+ expect(await idb.getItem('key3')).toBe('value3');
418
+ expect(await idb.getItem('key4')).toBe('value4');
419
+
420
+ const keys = await idb.getAllKeys();
421
+ expect(keys.sort()).toStrictEqual(['key1', 'key2', 'key3', 'key4']);
422
+
423
+ await idb.removeItem('key4');
424
+ expect(await idb.getItem('key4')).toBe(null);
425
+ });
@@ -8,6 +8,7 @@ export default class IndexedDBStorage extends StoreInterface {
8
8
  constructor(appId: string, storeName: StoreInterfaceStoreName);
9
9
  _init(): Promise<IDBDatabase>;
10
10
  _upgradeStore(event: IDBVersionChangeEvent): void;
11
+ _withRetry<T>(fn: (db: IDBDatabase) => Promise<T>): Promise<T>;
11
12
  getItem(k: string): Promise<any>;
12
13
  setItem(k: string, v: any): Promise<void>;
13
14
  multiSet(keyValuePairs: Array<[string, any]>): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"IndexedDBStorage.d.ts","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAmLpC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBAErB,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB;IAQ7D,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAmC7B,aAAa,CAAC,KAAK,EAAE,qBAAqB;IAUpC,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAmBhC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5D,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CActC"}
1
+ {"version":3,"file":"IndexedDBStorage.d.ts","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAmLpC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBAErB,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB;IAQ7D,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IA4C7B,aAAa,CAAC,KAAK,EAAE,qBAAqB;IAcpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAc9D,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAoBhC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAczC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB5D,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAetC"}
@@ -173,6 +173,15 @@ class IndexedDBStorage extends PersistedObject_ts_1.StoreInterface {
173
173
  request.onsuccess = (event) => {
174
174
  const target = event.target;
175
175
  const db = target.result;
176
+ // Browsers can close IndexedDB connections unexpectedly
177
+ // (e.g. backgrounded tabs, memory pressure, version changes from
178
+ // other tabs). Re-init so the next operation gets a fresh connection.
179
+ db.onclose = () => {
180
+ this._dbPromise = this._init();
181
+ };
182
+ db.onversionchange = () => {
183
+ db.close();
184
+ };
176
185
  if (!requiresUpgrade) {
177
186
  const p = upgradePromises.get(this.dbName);
178
187
  if (!p) {
@@ -205,91 +214,95 @@ class IndexedDBStorage extends PersistedObject_ts_1.StoreInterface {
205
214
  }
206
215
  }
207
216
  }
217
+ // Browsers can close IndexedDB connections unexpectedly (backgrounded tabs,
218
+ // memory pressure, cross-tab version changes, etc.), causing
219
+ // `db.transaction()` to throw InvalidStateError. This helper catches that
220
+ // error and retries once with a fresh connection.
221
+ async _withRetry(fn) {
222
+ try {
223
+ const db = await this._dbPromise;
224
+ return await fn(db);
225
+ }
226
+ catch (e) {
227
+ if (e instanceof DOMException && e.name === 'InvalidStateError') {
228
+ this._dbPromise = this._init();
229
+ const db = await this._dbPromise;
230
+ return await fn(db);
231
+ }
232
+ throw e;
233
+ }
234
+ }
208
235
  async getItem(k) {
209
- const db = await this._dbPromise;
210
- return new Promise((resolve, reject) => {
211
- const transaction = db.transaction([this._storeName], 'readonly');
212
- const objectStore = transaction.objectStore(this._storeName);
213
- const request = objectStore.get(k);
214
- request.onerror = (event) => {
215
- reject(event);
216
- };
217
- request.onsuccess = (_event) => {
218
- if (request.result) {
219
- resolve(request.result);
220
- }
221
- else {
222
- resolve(null);
223
- }
224
- };
236
+ return this._withRetry((db) => {
237
+ return new Promise((resolve, reject) => {
238
+ const transaction = db.transaction([this._storeName], 'readonly');
239
+ const objectStore = transaction.objectStore(this._storeName);
240
+ const request = objectStore.get(k);
241
+ request.onerror = () => {
242
+ reject(request.error);
243
+ };
244
+ request.onsuccess = () => {
245
+ if (request.result) {
246
+ resolve(request.result);
247
+ }
248
+ else {
249
+ resolve(null);
250
+ }
251
+ };
252
+ });
225
253
  });
226
254
  }
227
255
  async setItem(k, v) {
228
- const db = await this._dbPromise;
229
- return new Promise((resolve, reject) => {
230
- const transaction = db.transaction([this._storeName], 'readwrite');
231
- const objectStore = transaction.objectStore(this._storeName);
232
- const request = objectStore.put(v, k);
233
- request.onerror = (event) => {
234
- reject(event);
235
- };
236
- request.onsuccess = (_event) => {
237
- resolve();
238
- };
256
+ return this._withRetry((db) => {
257
+ return new Promise((resolve, reject) => {
258
+ const transaction = db.transaction([this._storeName], 'readwrite');
259
+ const objectStore = transaction.objectStore(this._storeName);
260
+ objectStore.put(v, k);
261
+ transaction.oncomplete = () => resolve();
262
+ transaction.onerror = () => reject(transaction.error);
263
+ transaction.onabort = () => reject(transaction.error);
264
+ });
239
265
  });
240
266
  }
241
- // Performs all writes in a transaction so that all succeed or none succeed.
242
267
  async multiSet(keyValuePairs) {
243
- const db = await this._dbPromise;
244
- return new Promise((resolve, reject) => {
245
- const transaction = db.transaction([this._storeName], 'readwrite');
246
- const objectStore = transaction.objectStore(this._storeName);
247
- const requests = new Set();
248
- for (const [k, v] of keyValuePairs) {
249
- const request = objectStore.put(v, k);
250
- requests.add(request);
251
- }
252
- for (const request of requests) {
253
- request.onerror = (event) => {
254
- transaction.abort();
255
- reject(event);
256
- };
257
- request.onsuccess = (_event) => {
258
- requests.delete(request);
259
- // Last request to finish resolves the transaction
260
- if (requests.size === 0) {
261
- resolve();
262
- }
263
- };
264
- }
268
+ return this._withRetry((db) => {
269
+ return new Promise((resolve, reject) => {
270
+ const transaction = db.transaction([this._storeName], 'readwrite');
271
+ const objectStore = transaction.objectStore(this._storeName);
272
+ for (const [k, v] of keyValuePairs) {
273
+ objectStore.put(v, k);
274
+ }
275
+ transaction.oncomplete = () => resolve();
276
+ transaction.onerror = () => reject(transaction.error);
277
+ transaction.onabort = () => reject(transaction.error);
278
+ });
265
279
  });
266
280
  }
267
281
  async removeItem(k) {
268
- const db = await this._dbPromise;
269
- return new Promise((resolve, reject) => {
270
- const transaction = db.transaction([this._storeName], 'readwrite');
271
- const objectStore = transaction.objectStore(this._storeName);
272
- const request = objectStore.delete(k);
273
- request.onerror = (event) => {
274
- reject(event);
275
- };
276
- request.onsuccess = (_event) => {
277
- resolve();
278
- };
282
+ return this._withRetry((db) => {
283
+ return new Promise((resolve, reject) => {
284
+ const transaction = db.transaction([this._storeName], 'readwrite');
285
+ const objectStore = transaction.objectStore(this._storeName);
286
+ objectStore.delete(k);
287
+ transaction.oncomplete = () => resolve();
288
+ transaction.onerror = () => reject(transaction.error);
289
+ transaction.onabort = () => reject(transaction.error);
290
+ });
279
291
  });
280
292
  }
281
293
  async getAllKeys() {
282
- const db = await this._dbPromise;
283
- return new Promise((resolve, reject) => {
284
- const transaction = db.transaction([this._storeName], 'readonly');
285
- const objectStore = transaction.objectStore(this._storeName);
286
- const request = objectStore.getAllKeys();
287
- request.onerror = (event) => {
288
- reject(event);
289
- };
290
- request.onsuccess = (_event) => {
291
- resolve(request.result.filter((x) => typeof x === 'string'));
292
- };
294
+ return this._withRetry((db) => {
295
+ return new Promise((resolve, reject) => {
296
+ const transaction = db.transaction([this._storeName], 'readonly');
297
+ const objectStore = transaction.objectStore(this._storeName);
298
+ const request = objectStore.getAllKeys();
299
+ request.onerror = () => {
300
+ reject(request.error);
301
+ };
302
+ request.onsuccess = () => {
303
+ resolve(request.result.filter((x) => typeof x === 'string'));
304
+ };
305
+ });
293
306
  });
294
307
  }
295
308
  }
@@ -1 +1 @@
1
- {"version":3,"file":"IndexedDBStorage.js","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":";;AAAA,mEAMoC;AAEpC,yEAAyE;AACzE,+BAA+B;AAC/B,yDAAyD;AACzD,wCAAwC;AACxC,yDAAyD;AACzD,+DAA+D;AAC/D,iEAAiE;AACjE,YAAY;AACZ,MAAM,OAAO,GAAG,CAAC,CAAC;AAElB,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAU,CAAC;AAO5D,MAAM,gBAAgB,GAAU,IAAyB,CAAC;AAE1D,SAAS,UAAU,CAAC,MAAc;IAChC,OAAO,SAAS,QAAQ,CAAC,KAAK;QAC5B,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErC,OAAO,CAAC,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE;YAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC;QAEF,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAA0B,CAAC;YAChD,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;YACzB,OAAO,CAAC,EAAE,CAAC,CAAC;QACd,CAAC,CAAC;QAEF,OAAO,CAAC,eAAe,GAAG,CAAC,KAAK,EAAE,EAAE;YAClC,MAAM,MAAM,GAAG,KAAK,CAAC,MAA0B,CAAC;YAChD,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,IAAY,EACZ,KAAU,EACV,aAA6B;IAE7B,MAAM,IAAI;IACR,sFAAsF;IACtF,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACxD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAiC,IAAI,GAAG,EAAE,CAAC;IACxD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,UAAU,GAAe;oBAC7B,SAAS,EAAE,KAAK,CAAC,YAAY;oBAC7B,SAAS,EAAE,KAAK,CAAC,YAAY;oBAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;iBAChD,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;YAC7B,CAAC;YACD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC9C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QACD,MAAM,IAAI,GAAiB,EAAE,OAAO,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,6BAAQ,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,CAAC,CAAC,SAAS,GAAG,GAAG,EAAE;gBACjB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;YACF,CAAC,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBACpB,UAAU,CAAC,QAAQ,IAAI,4BAA4B,CAAC,CAAC;gBACrD,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,CAAS,EACT,KAAU,EACV,OAAuB;IAEvB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QACpC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,KAAa,EAAE,IAAiB;IACzD,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAyB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;QAC3C,SAAS,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,IAAI,GAAyB,EAAE,CAAC;QACtC,SAAS,CAAC,SAAS,GAAG,GAAG,EAAE;YACzB,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;YAChC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,GAAG,MAAM,CAAC,GAAa,CAAC;gBACjC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;gBACxB,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;QACF,SAAS,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;IAEhE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,MAAM,MAAM,GAAiB,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAChC,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,CAAC,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;gBAC1D,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,MAAM;YACR,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,CAAC,GAAG,eAAe,CAAC,GAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACzD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,MAAM,UAAU,GAAe;oBAC7B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;oBACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;oBACrB,IAAI,EAAE,CAAC;iBACR,CAAC;gBACF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;gBACjC,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,CAAC,GAAG,eAAe,CAAC,6BAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kEAAkE;AAClE,yEAAyE;AACzE,qEAAqE;AACrE,oBAAoB;AACpB,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;AAElC,MAAqB,gBAAiB,SAAQ,mCAAc;IAC1D,MAAM,CAAS;IACf,UAAU,CAA0B;IACpC,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,UAAU,CAAuB;IAEjC,YAAY,KAAa,EAAE,SAAkC;QAC3D,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,WAAW,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,eAAe,GAAG,KAAK,CAAC;YAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAE/C,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;YAEF,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAA0B,CAAC;gBAChD,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;gBACzB,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3C,IAAI,CAAC,CAAC,EAAE,CAAC;wBACP,OAAO,CAAC,EAAE,CAAC,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;wBACjD,UAAU,CAAC,4CAA4C,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9D,CAAC,CAAC,CAAC;oBACH,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBACpC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrD,CAAC;YACH,CAAC,CAAC;YAEF,OAAO,CAAC,eAAe,GAAG,CAAC,KAAK,EAAE,EAAE;gBAClC,eAAe,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,KAA4B;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAA0B,CAAC;QAChD,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;QACzB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7C,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,CAAS;QACrB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;YACF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;gBAC7B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBACnB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,CAAS,EAAE,CAAM;QAC7B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAEtC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;YAEF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;gBAC7B,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,QAAQ,CAAC,aAAmC;QAChD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAiC,IAAI,GAAG,EAAE,CAAC;YACzD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,aAAa,EAAE,CAAC;gBACnC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;oBAC1B,WAAW,CAAC,KAAK,EAAE,CAAC;oBACpB,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC;gBACF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;oBAC7B,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBACzB,kDAAkD;oBAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;wBACxB,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,CAAS;QACxB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;YAEF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;gBAC7B,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;YACzC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC;YACF,OAAO,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE;gBAC7B,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC/D,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1JD,mCA0JC","sourcesContent":["import {\n Meta,\n META_KEY,\n ObjectMeta,\n StoreInterface,\n StoreInterfaceStoreName,\n} from './utils/PersistedObject.ts';\n\n// Any time these are updates to the data format or new stores are added,\n// the version must be updated.\n// onupgradeneeded will be called, which is where you can\n// move objects from one idb to another.\n// We create a new IDB for each version change instead of\n// using their built-in versioning because they have no ability\n// to roll back and if multiple tabs are active, then you'll just\n// be stuck.\nconst version = 6;\n\nconst storeNames = ['kv', 'querySubs', 'syncSubs'] as const;\n\n// Check that we're not missing a store name in storeNames\ntype MissingStoreNames = Exclude<\n StoreInterfaceStoreName,\n (typeof storeNames)[number]\n>;\nconst _exhaustiveCheck: never = null as MissingStoreNames;\n\nfunction logErrorCb(source: string) {\n return function logError(event) {\n console.error('Error in IndexedDB event', { source, event });\n };\n}\n\nasync function existingDb(name: string): Promise<IDBDatabase | null> {\n return new Promise((resolve) => {\n const request = indexedDB.open(name);\n\n request.onerror = (_event) => {\n resolve(null);\n };\n\n request.onsuccess = (event) => {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n resolve(db);\n };\n\n request.onupgradeneeded = (event) => {\n const target = event.target as IDBOpenDBRequest;\n target.transaction?.abort();\n resolve(null);\n };\n });\n}\n\nasync function upgradeQuerySubs5To6(\n hash: string,\n value: any,\n querySubStore: IDBObjectStore,\n): Promise<void> {\n const subs =\n // Backwards compatibility for older versions where we JSON.stringified before storing\n typeof value === 'string' ? JSON.parse(value) : value;\n if (!subs) {\n return;\n }\n const putReqs: Set<IDBRequest<IDBValidKey>> = new Set();\n return new Promise((resolve, reject) => {\n const objects = {};\n for (const [hash, v] of Object.entries(subs)) {\n const value = typeof v === 'string' ? JSON.parse(v) : v;\n if (value.lastAccessed) {\n const objectMeta: ObjectMeta = {\n createdAt: value.lastAccessed,\n updatedAt: value.lastAccessed,\n size: value.result?.store?.triples?.length ?? 0,\n };\n objects[hash] = objectMeta;\n }\n const putReq = querySubStore.put(value, hash);\n putReqs.add(putReq);\n }\n const meta: Meta<string> = { objects };\n const metaPutReq = querySubStore.put(meta, META_KEY);\n putReqs.add(metaPutReq);\n for (const r of putReqs) {\n r.onsuccess = () => {\n putReqs.delete(r);\n if (putReqs.size === 0) {\n resolve();\n }\n };\n r.onerror = (event) => {\n logErrorCb(`Move ${hash} to querySubs store failed`);\n reject(event);\n };\n }\n });\n}\n\nasync function moveKvEntry5To6(\n k: string,\n value: any,\n kvStore: IDBObjectStore,\n): Promise<void> {\n const request = kvStore.put(value, k);\n return new Promise((resolve, reject) => {\n request.onsuccess = () => resolve();\n request.onerror = (event) => reject(event);\n });\n}\n\nasync function upgrade5To6(appId: string, v6Db: IDBDatabase): Promise<void> {\n const v5db = await existingDb(`instant_${appId}_5`);\n if (!v5db) {\n return;\n }\n\n const data: Array<[string, any]> = await new Promise((resolve, reject) => {\n const v5Tx = v5db.transaction(['kv'], 'readonly');\n const objectStore = v5Tx.objectStore('kv');\n const cursorReq = objectStore.openCursor();\n cursorReq.onerror = (event) => {\n reject(event);\n };\n const data: Array<[string, any]> = [];\n cursorReq.onsuccess = () => {\n const cursor = cursorReq.result;\n if (cursor) {\n const key = cursor.key as string;\n const value = cursor.value;\n data.push([key, value]);\n cursor.continue();\n } else {\n resolve(data);\n }\n };\n cursorReq.onerror = (event) => {\n reject(event);\n };\n });\n\n const v6Tx = v6Db.transaction(['kv', 'querySubs'], 'readwrite');\n\n const kvStore = v6Tx.objectStore('kv');\n const querySubStore = v6Tx.objectStore('querySubs');\n\n const promises: Promise<any>[] = [];\n const kvMeta: Meta<string> = { objects: {} };\n for (const [key, value] of data) {\n switch (key) {\n case 'querySubs': {\n const p = upgradeQuerySubs5To6(key, value, querySubStore);\n promises.push(p);\n break;\n }\n default: {\n const p = moveKvEntry5To6(key as string, value, kvStore);\n promises.push(p);\n const objectMeta: ObjectMeta = {\n createdAt: Date.now(),\n updatedAt: Date.now(),\n size: 0,\n };\n kvMeta.objects[key] = objectMeta;\n break;\n }\n }\n }\n const p = moveKvEntry5To6(META_KEY, kvMeta, kvStore);\n promises.push(p);\n await Promise.all(promises);\n await new Promise((resolve, reject) => {\n v6Tx.oncomplete = (e) => resolve(e);\n v6Tx.onerror = (e) => reject(e);\n v6Tx.onabort = (e) => reject(e);\n });\n}\n\n// We create many IndexedDBStorage instances that talk to the same\n// underlying db, but we only get one `onupgradeneeded` event. This holds\n// the upgrade promises so that we wait until upgrade finishes before\n// we start writing.\nconst upgradePromises = new Map();\n\nexport default class IndexedDBStorage extends StoreInterface {\n dbName: string;\n _storeName: StoreInterfaceStoreName;\n _appId: string;\n _prefix: string;\n _dbPromise: Promise<IDBDatabase>;\n\n constructor(appId: string, storeName: StoreInterfaceStoreName) {\n super(appId, storeName);\n this.dbName = `instant_${appId}_${version}`;\n this._storeName = storeName;\n this._appId = appId;\n this._dbPromise = this._init();\n }\n\n _init(): Promise<IDBDatabase> {\n return new Promise((resolve, reject) => {\n let requiresUpgrade = false;\n const request = indexedDB.open(this.dbName, 1);\n\n request.onerror = (event) => {\n reject(event);\n };\n\n request.onsuccess = (event) => {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n if (!requiresUpgrade) {\n const p = upgradePromises.get(this.dbName);\n if (!p) {\n resolve(db);\n } else {\n p.then(() => resolve(db)).catch(() => resolve(db));\n }\n } else {\n const p = upgrade5To6(this._appId, db).catch((e) => {\n logErrorCb('Error upgrading store from version 5 to 6.')(e);\n });\n upgradePromises.set(this.dbName, p);\n p.then(() => resolve(db)).catch(() => resolve(db));\n }\n };\n\n request.onupgradeneeded = (event) => {\n requiresUpgrade = true;\n this._upgradeStore(event);\n };\n });\n }\n\n _upgradeStore(event: IDBVersionChangeEvent) {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n for (const storeName of storeNames) {\n if (!db.objectStoreNames.contains(storeName)) {\n db.createObjectStore(storeName);\n }\n }\n }\n\n async getItem(k: string): Promise<any> {\n const db = await this._dbPromise;\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readonly');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.get(k);\n request.onerror = (event) => {\n reject(event);\n };\n request.onsuccess = (_event) => {\n if (request.result) {\n resolve(request.result);\n } else {\n resolve(null);\n }\n };\n });\n }\n\n async setItem(k: string, v: any): Promise<void> {\n const db = await this._dbPromise;\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.put(v, k);\n\n request.onerror = (event) => {\n reject(event);\n };\n\n request.onsuccess = (_event) => {\n resolve();\n };\n });\n }\n\n // Performs all writes in a transaction so that all succeed or none succeed.\n async multiSet(keyValuePairs: Array<[string, any]>): Promise<void> {\n const db = await this._dbPromise;\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n const requests: Set<IDBRequest<IDBValidKey>> = new Set();\n for (const [k, v] of keyValuePairs) {\n const request = objectStore.put(v, k);\n requests.add(request);\n }\n\n for (const request of requests) {\n request.onerror = (event) => {\n transaction.abort();\n reject(event);\n };\n request.onsuccess = (_event) => {\n requests.delete(request);\n // Last request to finish resolves the transaction\n if (requests.size === 0) {\n resolve();\n }\n };\n }\n });\n }\n\n async removeItem(k: string): Promise<void> {\n const db = await this._dbPromise;\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.delete(k);\n request.onerror = (event) => {\n reject(event);\n };\n\n request.onsuccess = (_event) => {\n resolve();\n };\n });\n }\n\n async getAllKeys(): Promise<string[]> {\n const db = await this._dbPromise;\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readonly');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.getAllKeys();\n request.onerror = (event) => {\n reject(event);\n };\n request.onsuccess = (_event) => {\n resolve(request.result.filter((x) => typeof x === 'string'));\n };\n });\n }\n}\n"]}
1
+ {"version":3,"file":"IndexedDBStorage.js","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n Meta,\n META_KEY,\n ObjectMeta,\n StoreInterface,\n StoreInterfaceStoreName,\n} from './utils/PersistedObject.ts';\n\n// Any time these are updates to the data format or new stores are added,\n// the version must be updated.\n// onupgradeneeded will be called, which is where you can\n// move objects from one idb to another.\n// We create a new IDB for each version change instead of\n// using their built-in versioning because they have no ability\n// to roll back and if multiple tabs are active, then you'll just\n// be stuck.\nconst version = 6;\n\nconst storeNames = ['kv', 'querySubs', 'syncSubs'] as const;\n\n// Check that we're not missing a store name in storeNames\ntype MissingStoreNames = Exclude<\n StoreInterfaceStoreName,\n (typeof storeNames)[number]\n>;\nconst _exhaustiveCheck: never = null as MissingStoreNames;\n\nfunction logErrorCb(source: string) {\n return function logError(event) {\n console.error('Error in IndexedDB event', { source, event });\n };\n}\n\nasync function existingDb(name: string): Promise<IDBDatabase | null> {\n return new Promise((resolve) => {\n const request = indexedDB.open(name);\n\n request.onerror = (_event) => {\n resolve(null);\n };\n\n request.onsuccess = (event) => {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n resolve(db);\n };\n\n request.onupgradeneeded = (event) => {\n const target = event.target as IDBOpenDBRequest;\n target.transaction?.abort();\n resolve(null);\n };\n });\n}\n\nasync function upgradeQuerySubs5To6(\n hash: string,\n value: any,\n querySubStore: IDBObjectStore,\n): Promise<void> {\n const subs =\n // Backwards compatibility for older versions where we JSON.stringified before storing\n typeof value === 'string' ? JSON.parse(value) : value;\n if (!subs) {\n return;\n }\n const putReqs: Set<IDBRequest<IDBValidKey>> = new Set();\n return new Promise((resolve, reject) => {\n const objects = {};\n for (const [hash, v] of Object.entries(subs)) {\n const value = typeof v === 'string' ? JSON.parse(v) : v;\n if (value.lastAccessed) {\n const objectMeta: ObjectMeta = {\n createdAt: value.lastAccessed,\n updatedAt: value.lastAccessed,\n size: value.result?.store?.triples?.length ?? 0,\n };\n objects[hash] = objectMeta;\n }\n const putReq = querySubStore.put(value, hash);\n putReqs.add(putReq);\n }\n const meta: Meta<string> = { objects };\n const metaPutReq = querySubStore.put(meta, META_KEY);\n putReqs.add(metaPutReq);\n for (const r of putReqs) {\n r.onsuccess = () => {\n putReqs.delete(r);\n if (putReqs.size === 0) {\n resolve();\n }\n };\n r.onerror = (event) => {\n logErrorCb(`Move ${hash} to querySubs store failed`);\n reject(event);\n };\n }\n });\n}\n\nasync function moveKvEntry5To6(\n k: string,\n value: any,\n kvStore: IDBObjectStore,\n): Promise<void> {\n const request = kvStore.put(value, k);\n return new Promise((resolve, reject) => {\n request.onsuccess = () => resolve();\n request.onerror = (event) => reject(event);\n });\n}\n\nasync function upgrade5To6(appId: string, v6Db: IDBDatabase): Promise<void> {\n const v5db = await existingDb(`instant_${appId}_5`);\n if (!v5db) {\n return;\n }\n\n const data: Array<[string, any]> = await new Promise((resolve, reject) => {\n const v5Tx = v5db.transaction(['kv'], 'readonly');\n const objectStore = v5Tx.objectStore('kv');\n const cursorReq = objectStore.openCursor();\n cursorReq.onerror = (event) => {\n reject(event);\n };\n const data: Array<[string, any]> = [];\n cursorReq.onsuccess = () => {\n const cursor = cursorReq.result;\n if (cursor) {\n const key = cursor.key as string;\n const value = cursor.value;\n data.push([key, value]);\n cursor.continue();\n } else {\n resolve(data);\n }\n };\n cursorReq.onerror = (event) => {\n reject(event);\n };\n });\n\n const v6Tx = v6Db.transaction(['kv', 'querySubs'], 'readwrite');\n\n const kvStore = v6Tx.objectStore('kv');\n const querySubStore = v6Tx.objectStore('querySubs');\n\n const promises: Promise<any>[] = [];\n const kvMeta: Meta<string> = { objects: {} };\n for (const [key, value] of data) {\n switch (key) {\n case 'querySubs': {\n const p = upgradeQuerySubs5To6(key, value, querySubStore);\n promises.push(p);\n break;\n }\n default: {\n const p = moveKvEntry5To6(key as string, value, kvStore);\n promises.push(p);\n const objectMeta: ObjectMeta = {\n createdAt: Date.now(),\n updatedAt: Date.now(),\n size: 0,\n };\n kvMeta.objects[key] = objectMeta;\n break;\n }\n }\n }\n const p = moveKvEntry5To6(META_KEY, kvMeta, kvStore);\n promises.push(p);\n await Promise.all(promises);\n await new Promise((resolve, reject) => {\n v6Tx.oncomplete = (e) => resolve(e);\n v6Tx.onerror = (e) => reject(e);\n v6Tx.onabort = (e) => reject(e);\n });\n}\n\n// We create many IndexedDBStorage instances that talk to the same\n// underlying db, but we only get one `onupgradeneeded` event. This holds\n// the upgrade promises so that we wait until upgrade finishes before\n// we start writing.\nconst upgradePromises = new Map();\n\nexport default class IndexedDBStorage extends StoreInterface {\n dbName: string;\n _storeName: StoreInterfaceStoreName;\n _appId: string;\n _prefix: string;\n _dbPromise: Promise<IDBDatabase>;\n\n constructor(appId: string, storeName: StoreInterfaceStoreName) {\n super(appId, storeName);\n this.dbName = `instant_${appId}_${version}`;\n this._storeName = storeName;\n this._appId = appId;\n this._dbPromise = this._init();\n }\n\n _init(): Promise<IDBDatabase> {\n return new Promise((resolve, reject) => {\n let requiresUpgrade = false;\n const request = indexedDB.open(this.dbName, 1);\n\n request.onerror = (event) => {\n reject(event);\n };\n\n request.onsuccess = (event) => {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n // Browsers can close IndexedDB connections unexpectedly\n // (e.g. backgrounded tabs, memory pressure, version changes from\n // other tabs). Re-init so the next operation gets a fresh connection.\n db.onclose = () => {\n this._dbPromise = this._init();\n };\n db.onversionchange = () => {\n db.close();\n };\n if (!requiresUpgrade) {\n const p = upgradePromises.get(this.dbName);\n if (!p) {\n resolve(db);\n } else {\n p.then(() => resolve(db)).catch(() => resolve(db));\n }\n } else {\n const p = upgrade5To6(this._appId, db).catch((e) => {\n logErrorCb('Error upgrading store from version 5 to 6.')(e);\n });\n upgradePromises.set(this.dbName, p);\n p.then(() => resolve(db)).catch(() => resolve(db));\n }\n };\n\n request.onupgradeneeded = (event) => {\n requiresUpgrade = true;\n this._upgradeStore(event);\n };\n });\n }\n\n _upgradeStore(event: IDBVersionChangeEvent) {\n const target = event.target as IDBOpenDBRequest;\n const db = target.result;\n for (const storeName of storeNames) {\n if (!db.objectStoreNames.contains(storeName)) {\n db.createObjectStore(storeName);\n }\n }\n }\n\n // Browsers can close IndexedDB connections unexpectedly (backgrounded tabs,\n // memory pressure, cross-tab version changes, etc.), causing\n // `db.transaction()` to throw InvalidStateError. This helper catches that\n // error and retries once with a fresh connection.\n async _withRetry<T>(fn: (db: IDBDatabase) => Promise<T>): Promise<T> {\n try {\n const db = await this._dbPromise;\n return await fn(db);\n } catch (e) {\n if (e instanceof DOMException && e.name === 'InvalidStateError') {\n this._dbPromise = this._init();\n const db = await this._dbPromise;\n return await fn(db);\n }\n throw e;\n }\n }\n\n async getItem(k: string): Promise<any> {\n return this._withRetry((db) => {\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readonly');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.get(k);\n request.onerror = () => {\n reject(request.error);\n };\n request.onsuccess = () => {\n if (request.result) {\n resolve(request.result);\n } else {\n resolve(null);\n }\n };\n });\n });\n }\n\n async setItem(k: string, v: any): Promise<void> {\n return this._withRetry((db) => {\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n objectStore.put(v, k);\n\n transaction.oncomplete = () => resolve();\n transaction.onerror = () => reject(transaction.error);\n transaction.onabort = () => reject(transaction.error);\n });\n });\n }\n\n async multiSet(keyValuePairs: Array<[string, any]>): Promise<void> {\n return this._withRetry((db) => {\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n for (const [k, v] of keyValuePairs) {\n objectStore.put(v, k);\n }\n\n transaction.oncomplete = () => resolve();\n transaction.onerror = () => reject(transaction.error);\n transaction.onabort = () => reject(transaction.error);\n });\n });\n }\n\n async removeItem(k: string): Promise<void> {\n return this._withRetry((db) => {\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readwrite');\n const objectStore = transaction.objectStore(this._storeName);\n objectStore.delete(k);\n\n transaction.oncomplete = () => resolve();\n transaction.onerror = () => reject(transaction.error);\n transaction.onabort = () => reject(transaction.error);\n });\n });\n }\n\n async getAllKeys(): Promise<string[]> {\n return this._withRetry((db) => {\n return new Promise((resolve, reject) => {\n const transaction = db.transaction([this._storeName], 'readonly');\n const objectStore = transaction.objectStore(this._storeName);\n const request = objectStore.getAllKeys();\n request.onerror = () => {\n reject(request.error);\n };\n request.onsuccess = () => {\n resolve(request.result.filter((x) => typeof x === 'string'));\n };\n });\n });\n }\n}\n"]}
@@ -8,6 +8,7 @@ export default class IndexedDBStorage extends StoreInterface {
8
8
  constructor(appId: string, storeName: StoreInterfaceStoreName);
9
9
  _init(): Promise<IDBDatabase>;
10
10
  _upgradeStore(event: IDBVersionChangeEvent): void;
11
+ _withRetry<T>(fn: (db: IDBDatabase) => Promise<T>): Promise<T>;
11
12
  getItem(k: string): Promise<any>;
12
13
  setItem(k: string, v: any): Promise<void>;
13
14
  multiSet(keyValuePairs: Array<[string, any]>): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"IndexedDBStorage.d.ts","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAmLpC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBAErB,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB;IAQ7D,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAmC7B,aAAa,CAAC,KAAK,EAAE,qBAAqB;IAUpC,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAmBhC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5D,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CActC"}
1
+ {"version":3,"file":"IndexedDBStorage.d.ts","sourceRoot":"","sources":["../../src/IndexedDBStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAmLpC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBAErB,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB;IAQ7D,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IA4C7B,aAAa,CAAC,KAAK,EAAE,qBAAqB;IAcpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAc9D,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAoBhC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAczC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB5D,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAetC"}
@@ -171,6 +171,15 @@ export default class IndexedDBStorage extends StoreInterface {
171
171
  request.onsuccess = (event) => {
172
172
  const target = event.target;
173
173
  const db = target.result;
174
+ // Browsers can close IndexedDB connections unexpectedly
175
+ // (e.g. backgrounded tabs, memory pressure, version changes from
176
+ // other tabs). Re-init so the next operation gets a fresh connection.
177
+ db.onclose = () => {
178
+ this._dbPromise = this._init();
179
+ };
180
+ db.onversionchange = () => {
181
+ db.close();
182
+ };
174
183
  if (!requiresUpgrade) {
175
184
  const p = upgradePromises.get(this.dbName);
176
185
  if (!p) {
@@ -203,91 +212,95 @@ export default class IndexedDBStorage extends StoreInterface {
203
212
  }
204
213
  }
205
214
  }
215
+ // Browsers can close IndexedDB connections unexpectedly (backgrounded tabs,
216
+ // memory pressure, cross-tab version changes, etc.), causing
217
+ // `db.transaction()` to throw InvalidStateError. This helper catches that
218
+ // error and retries once with a fresh connection.
219
+ async _withRetry(fn) {
220
+ try {
221
+ const db = await this._dbPromise;
222
+ return await fn(db);
223
+ }
224
+ catch (e) {
225
+ if (e instanceof DOMException && e.name === 'InvalidStateError') {
226
+ this._dbPromise = this._init();
227
+ const db = await this._dbPromise;
228
+ return await fn(db);
229
+ }
230
+ throw e;
231
+ }
232
+ }
206
233
  async getItem(k) {
207
- const db = await this._dbPromise;
208
- return new Promise((resolve, reject) => {
209
- const transaction = db.transaction([this._storeName], 'readonly');
210
- const objectStore = transaction.objectStore(this._storeName);
211
- const request = objectStore.get(k);
212
- request.onerror = (event) => {
213
- reject(event);
214
- };
215
- request.onsuccess = (_event) => {
216
- if (request.result) {
217
- resolve(request.result);
218
- }
219
- else {
220
- resolve(null);
221
- }
222
- };
234
+ return this._withRetry((db) => {
235
+ return new Promise((resolve, reject) => {
236
+ const transaction = db.transaction([this._storeName], 'readonly');
237
+ const objectStore = transaction.objectStore(this._storeName);
238
+ const request = objectStore.get(k);
239
+ request.onerror = () => {
240
+ reject(request.error);
241
+ };
242
+ request.onsuccess = () => {
243
+ if (request.result) {
244
+ resolve(request.result);
245
+ }
246
+ else {
247
+ resolve(null);
248
+ }
249
+ };
250
+ });
223
251
  });
224
252
  }
225
253
  async setItem(k, v) {
226
- const db = await this._dbPromise;
227
- return new Promise((resolve, reject) => {
228
- const transaction = db.transaction([this._storeName], 'readwrite');
229
- const objectStore = transaction.objectStore(this._storeName);
230
- const request = objectStore.put(v, k);
231
- request.onerror = (event) => {
232
- reject(event);
233
- };
234
- request.onsuccess = (_event) => {
235
- resolve();
236
- };
254
+ return this._withRetry((db) => {
255
+ return new Promise((resolve, reject) => {
256
+ const transaction = db.transaction([this._storeName], 'readwrite');
257
+ const objectStore = transaction.objectStore(this._storeName);
258
+ objectStore.put(v, k);
259
+ transaction.oncomplete = () => resolve();
260
+ transaction.onerror = () => reject(transaction.error);
261
+ transaction.onabort = () => reject(transaction.error);
262
+ });
237
263
  });
238
264
  }
239
- // Performs all writes in a transaction so that all succeed or none succeed.
240
265
  async multiSet(keyValuePairs) {
241
- const db = await this._dbPromise;
242
- return new Promise((resolve, reject) => {
243
- const transaction = db.transaction([this._storeName], 'readwrite');
244
- const objectStore = transaction.objectStore(this._storeName);
245
- const requests = new Set();
246
- for (const [k, v] of keyValuePairs) {
247
- const request = objectStore.put(v, k);
248
- requests.add(request);
249
- }
250
- for (const request of requests) {
251
- request.onerror = (event) => {
252
- transaction.abort();
253
- reject(event);
254
- };
255
- request.onsuccess = (_event) => {
256
- requests.delete(request);
257
- // Last request to finish resolves the transaction
258
- if (requests.size === 0) {
259
- resolve();
260
- }
261
- };
262
- }
266
+ return this._withRetry((db) => {
267
+ return new Promise((resolve, reject) => {
268
+ const transaction = db.transaction([this._storeName], 'readwrite');
269
+ const objectStore = transaction.objectStore(this._storeName);
270
+ for (const [k, v] of keyValuePairs) {
271
+ objectStore.put(v, k);
272
+ }
273
+ transaction.oncomplete = () => resolve();
274
+ transaction.onerror = () => reject(transaction.error);
275
+ transaction.onabort = () => reject(transaction.error);
276
+ });
263
277
  });
264
278
  }
265
279
  async removeItem(k) {
266
- const db = await this._dbPromise;
267
- return new Promise((resolve, reject) => {
268
- const transaction = db.transaction([this._storeName], 'readwrite');
269
- const objectStore = transaction.objectStore(this._storeName);
270
- const request = objectStore.delete(k);
271
- request.onerror = (event) => {
272
- reject(event);
273
- };
274
- request.onsuccess = (_event) => {
275
- resolve();
276
- };
280
+ return this._withRetry((db) => {
281
+ return new Promise((resolve, reject) => {
282
+ const transaction = db.transaction([this._storeName], 'readwrite');
283
+ const objectStore = transaction.objectStore(this._storeName);
284
+ objectStore.delete(k);
285
+ transaction.oncomplete = () => resolve();
286
+ transaction.onerror = () => reject(transaction.error);
287
+ transaction.onabort = () => reject(transaction.error);
288
+ });
277
289
  });
278
290
  }
279
291
  async getAllKeys() {
280
- const db = await this._dbPromise;
281
- return new Promise((resolve, reject) => {
282
- const transaction = db.transaction([this._storeName], 'readonly');
283
- const objectStore = transaction.objectStore(this._storeName);
284
- const request = objectStore.getAllKeys();
285
- request.onerror = (event) => {
286
- reject(event);
287
- };
288
- request.onsuccess = (_event) => {
289
- resolve(request.result.filter((x) => typeof x === 'string'));
290
- };
292
+ return this._withRetry((db) => {
293
+ return new Promise((resolve, reject) => {
294
+ const transaction = db.transaction([this._storeName], 'readonly');
295
+ const objectStore = transaction.objectStore(this._storeName);
296
+ const request = objectStore.getAllKeys();
297
+ request.onerror = () => {
298
+ reject(request.error);
299
+ };
300
+ request.onsuccess = () => {
301
+ resolve(request.result.filter((x) => typeof x === 'string'));
302
+ };
303
+ });
291
304
  });
292
305
  }
293
306
  }