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

package/__tests__/src/utils/PersistedObject.test.ts

@@ -391,3 +391,35 @@ test('PersistedObject garbage collects when we exceed max age', async () => {
 
   expect(snapshot3).toStrictEqual({});
 });
+
+test('IndexedDBStorage recovers when the database connection closes', async () => {
+  const idb = new IndexedDBStorage(randomUUID(), 'kv');
+
+  await idb.setItem('key1', 'value1');
+  expect(await idb.getItem('key1')).toBe('value1');
+
+  // Simulate the browser closing the connection unexpectedly.
+  // Remove the onclose handler so recovery relies entirely on _withRetry
+  // catching the InvalidStateError (the same codepath as the original bug).
+  const db = await idb._dbPromise;
+  db.onclose = null;
+  db.close();
+
+  // All operations should recover transparently
+  await idb.setItem('key2', 'value2');
+  expect(await idb.getItem('key1')).toBe('value1');
+  expect(await idb.getItem('key2')).toBe('value2');
+
+  await idb.multiSet([
+    ['key3', 'value3'],
+    ['key4', 'value4'],
+  ]);
+  expect(await idb.getItem('key3')).toBe('value3');
+  expect(await idb.getItem('key4')).toBe('value4');
+
+  const keys = await idb.getAllKeys();
+  expect(keys.sort()).toStrictEqual(['key1', 'key2', 'key3', 'key4']);
+
+  await idb.removeItem('key4');
+  expect(await idb.getItem('key4')).toBe(null);
+});

package/dist/commonjs/IndexedDBStorage.d.ts

@@ -8,6 +8,7 @@ export default class IndexedDBStorage extends StoreInterface {
     constructor(appId: string, storeName: StoreInterfaceStoreName);
     _init(): Promise<IDBDatabase>;
     _upgradeStore(event: IDBVersionChangeEvent): void;
+    _withRetry<T>(fn: (db: IDBDatabase) => Promise<T>): Promise<T>;
     getItem(k: string): Promise<any>;
     setItem(k: string, v: any): Promise<void>;
     multiSet(keyValuePairs: Array<[string, any]>): Promise<void>;

package/dist/commonjs/IndexedDBStorage.d.ts.map

@@ -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"}
+{"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"}

package/dist/commonjs/IndexedDBStorage.js

@@ -173,6 +173,15 @@ class IndexedDBStorage extends PersistedObject_ts_1.StoreInterface {
             request.onsuccess = (event) => {
                 const target = event.target;
                 const db = target.result;
+                // Browsers can close IndexedDB connections unexpectedly
+                // (e.g. backgrounded tabs, memory pressure, version changes from
+                // other tabs). Re-init so the next operation gets a fresh connection.
+                db.onclose = () => {
+                    this._dbPromise = this._init();
+                };
+                db.onversionchange = () => {
+                    db.close();
+                };
                 if (!requiresUpgrade) {
                     const p = upgradePromises.get(this.dbName);
                     if (!p) {
@@ -205,91 +214,95 @@ class IndexedDBStorage extends PersistedObject_ts_1.StoreInterface {
             }
         }
     }
+    // Browsers can close IndexedDB connections unexpectedly (backgrounded tabs,
+    // memory pressure, cross-tab version changes, etc.), causing
+    // `db.transaction()` to throw InvalidStateError. This helper catches that
+    // error and retries once with a fresh connection.
+    async _withRetry(fn) {
+        try {
+            const db = await this._dbPromise;
+            return await fn(db);
+        }
+        catch (e) {
+            if (e instanceof DOMException && e.name === 'InvalidStateError') {
+                this._dbPromise = this._init();
+                const db = await this._dbPromise;
+                return await fn(db);
+            }
+            throw e;
+        }
+    }
     async getItem(k) {
-        const db = await this._dbPromise;
-        return new Promise((resolve, reject) => {
-            const transaction = db.transaction([this._storeName], 'readonly');
-            const objectStore = transaction.objectStore(this._storeName);
-            const request = objectStore.get(k);
-            request.onerror = (event) => {
-                reject(event);
-            };
-            request.onsuccess = (_event) => {
-                if (request.result) {
-                    resolve(request.result);
-                }
-                else {
-                    resolve(null);
-                }
-            };
+        return this._withRetry((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction([this._storeName], 'readonly');
+                const objectStore = transaction.objectStore(this._storeName);
+                const request = objectStore.get(k);
+                request.onerror = () => {
+                    reject(request.error);
+                };
+                request.onsuccess = () => {
+                    if (request.result) {
+                        resolve(request.result);
+                    }
+                    else {
+                        resolve(null);
+                    }
+                };
+            });
         });
     }
     async setItem(k, v) {
-        const db = await this._dbPromise;
-        return new Promise((resolve, reject) => {
-            const transaction = db.transaction([this._storeName], 'readwrite');
-            const objectStore = transaction.objectStore(this._storeName);
-            const request = objectStore.put(v, k);
-            request.onerror = (event) => {
-                reject(event);
-            };
-            request.onsuccess = (_event) => {
-                resolve();
-            };
+        return this._withRetry((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction([this._storeName], 'readwrite');
+                const objectStore = transaction.objectStore(this._storeName);
+                objectStore.put(v, k);
+                transaction.oncomplete = () => resolve();
+                transaction.onerror = () => reject(transaction.error);
+                transaction.onabort = () => reject(transaction.error);
+            });
         });
     }
-    // Performs all writes in a transaction so that all succeed or none succeed.
     async multiSet(keyValuePairs) {
-        const db = await this._dbPromise;
-        return new Promise((resolve, reject) => {
-            const transaction = db.transaction([this._storeName], 'readwrite');
-            const objectStore = transaction.objectStore(this._storeName);
-            const requests = new Set();
-            for (const [k, v] of keyValuePairs) {
-                const request = objectStore.put(v, k);
-                requests.add(request);
-            }
-            for (const request of requests) {
-                request.onerror = (event) => {
-                    transaction.abort();
-                    reject(event);
-                };
-                request.onsuccess = (_event) => {
-                    requests.delete(request);
-                    // Last request to finish resolves the transaction
-                    if (requests.size === 0) {
-                        resolve();
-                    }
-                };
-            }
+        return this._withRetry((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction([this._storeName], 'readwrite');
+                const objectStore = transaction.objectStore(this._storeName);
+                for (const [k, v] of keyValuePairs) {
+                    objectStore.put(v, k);
+                }
+                transaction.oncomplete = () => resolve();
+                transaction.onerror = () => reject(transaction.error);
+                transaction.onabort = () => reject(transaction.error);
+            });
         });
     }
     async removeItem(k) {
-        const db = await this._dbPromise;
-        return new Promise((resolve, reject) => {
-            const transaction = db.transaction([this._storeName], 'readwrite');
-            const objectStore = transaction.objectStore(this._storeName);
-            const request = objectStore.delete(k);
-            request.onerror = (event) => {
-                reject(event);
-            };
-            request.onsuccess = (_event) => {
-                resolve();
-            };
+        return this._withRetry((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction([this._storeName], 'readwrite');
+                const objectStore = transaction.objectStore(this._storeName);
+                objectStore.delete(k);
+                transaction.oncomplete = () => resolve();
+                transaction.onerror = () => reject(transaction.error);
+                transaction.onabort = () => reject(transaction.error);
+            });
         });
     }
     async getAllKeys() {
-        const db = await this._dbPromise;
-        return new Promise((resolve, reject) => {
-            const transaction = db.transaction([this._storeName], 'readonly');
-            const objectStore = transaction.objectStore(this._storeName);
-            const request = objectStore.getAllKeys();
-            request.onerror = (event) => {
-                reject(event);
-            };
-            request.onsuccess = (_event) => {
-                resolve(request.result.filter((x) => typeof x === 'string'));
-            };
+        return this._withRetry((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction([this._storeName], 'readonly');
+                const objectStore = transaction.objectStore(this._storeName);
+                const request = objectStore.getAllKeys();
+                request.onerror = () => {
+                    reject(request.error);
+                };
+                request.onsuccess = () => {
+                    resolve(request.result.filter((x) => typeof x === 'string'));
+                };
+            });
         });
     }
 }

package/dist/commonjs/IndexedDBStorage.js.map

@@ -1 +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        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"]}
+{"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"]}

package/dist/commonjs/Reactor.d.ts

@@ -131,7 +131,7 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     _handleReceive(connId: any, msg: any): void;
     _sessionId: any;
     createWriteStream(opts: any): import("./Stream.ts").InstantWritableStream<string>;
-    createReadStream(opts: any): import("./Stream.ts").InstantReadableStream<string>;
+    createReadStream(opts: any): ReadableStream<string>;
     _pendingMutations(): any;
     _updatePendingMutations(f: any): void;
     /**

package/dist/commonjs/Reactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Reactor.d.ts","sourceRoot":"","sources":["../../src/Reactor.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reactor.d.ts","sourceRoot":"","sources":["../../src/Reactor.js"],"names":[],"mappings":"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"}

package/dist/commonjs/Stream.d.ts

@@ -9,9 +9,6 @@ export type ReadableStreamCtor = {
 export interface InstantWritableStream<T> extends WritableStream<T> {
     streamId: () => Promise<string>;
 }
-export interface InstantReadableStream<T> extends ReadableStream<T> {
-    streamId: () => Promise<string>;
-}
 type StartStreamMsg = {
     op: 'start-stream';
     'client-id': string;
@@ -103,7 +100,7 @@ export declare class InstantStream {
         streamId?: string | null | undefined;
         byteOffset?: number | null | undefined;
         ruleParams?: RuleParams | null | undefined;
-    }): InstantReadableStream<string>;
+    }): ReadableStream<string>;
     private startWriteStream;
     private registerWriteStream;
     private appendStream;

package/dist/commonjs/Stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stream.d.ts","sourceRoot":"","sources":["../../src/Stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Stream.d.ts","sourceRoot":"","sources":["../../src/Stream.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/Stream.js

@@ -357,14 +357,10 @@ function createReadStream({ RStream, opts, startStream, cancelStream, }) {
     let eventId;
     let closed = false;
     const closeCbs = [];
-    const streamIdCbs = [];
-    // Resolved stream id from the server
-    let streamId_ = null;
-    let error_ = null;
-    function markClosed(error) {
+    function markClosed() {
         closed = true;
         for (const cb of closeCbs) {
-            cb(error);
+            cb();
         }
     }
     function addCloseCb(cb) {
@@ -376,22 +372,9 @@ function createReadStream({ RStream, opts, startStream, cancelStream, }) {
             }
         };
     }
-    function addStreamIdCb(cb) {
-        streamIdCbs.push(cb);
-        if (streamId_) {
-            cb(streamId_);
-        }
-        return () => {
-            const i = streamIdCbs.indexOf(cb);
-            if (i !== -1) {
-                streamIdCbs.splice(i, 1);
-            }
-        };
-    }
     function error(controller, e) {
-        error_ = e;
         controller.error(e);
-        markClosed(e);
+        markClosed();
     }
     let fetchFailures = 0;
     async function runStartStream(opts, controller) {
@@ -413,10 +396,6 @@ function createReadStream({ RStream, opts, startStream, cancelStream, }) {
                 canceled = true;
                 return;
             }
-            streamId_ = item.streamId;
-            for (const cb of streamIdCbs) {
-                cb(streamId_);
-            }
             let discardLen = seenOffset - item.offset;
             if (item.files && item.files.length) {
                 const fetchAbort = new AbortController();
@@ -530,38 +509,7 @@ function createReadStream({ RStream, opts, startStream, cancelStream, }) {
             markClosed();
         }
     }
-    class RStreamEnhanced extends RStream {
-        constructor(source, strategy) {
-            super(source, strategy);
-        }
-        async streamId() {
-            if (streamId_) {
-                return streamId_;
-            }
-            if (error_) {
-                throw error_;
-            }
-            return new Promise((resolve, reject) => {
-                const cleanupFns = [];
-                const cleanup = () => {
-                    for (const f of cleanupFns) {
-                        f();
-                    }
-                };
-                const resolveCb = (streamId) => {
-                    resolve(streamId);
-                    cleanup();
-                };
-                const rejectCb = (e) => {
-                    reject(e || new InstantError_ts_1.InstantError('Stream is closed.'));
-                    cleanup();
-                };
-                cleanupFns.push(addStreamIdCb(resolveCb));
-                cleanupFns.push(addCloseCb(rejectCb));
-            });
-        }
-    }
-    const stream = new RStreamEnhanced({
+    const stream = new RStream({
         start(controller) {
             start(controller);
         },
@@ -735,13 +683,14 @@ class InstantStream {
             delete this.readStreamIterators[eventId];
             return;
         }
-        iterator.push({
-            type: 'append',
-            offset: msg.offset,
-            files: msg.files,
-            content: msg.content,
-            streamId: msg['stream-id'],
-        });
+        if (msg.files?.length || msg.content) {
+            iterator.push({
+                type: 'append',
+                offset: msg.offset,
+                files: msg.files,
+                content: msg.content,
+            });
+        }
         if (msg.done) {
             iterator.close();
             delete this.readStreamIterators[eventId];