@peerbit/indexer-sqlite3 1.0.6 → 1.0.7-a3e5123

package/dist/peerbit/sqlite3-bundler-friendly.mjs

@@ -26,9 +26,9 @@
 /*
  ** This code was built from sqlite3 version...
  **
- ** SQLITE_VERSION "3.46.0"
- ** SQLITE_VERSION_NUMBER 3046000
- ** SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
+ ** SQLITE_VERSION "3.46.1"
+ ** SQLITE_VERSION_NUMBER 3046001
+ ** SQLITE_SOURCE_ID "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
  **
  ** Using the Emscripten SDK version 3.1.30.
  */
@@ -10685,11 +10685,11 @@ var sqlite3InitModule = (() => {
 
       globalThis.sqlite3ApiBootstrap.initializers.push(function (sqlite3) {
         sqlite3.version = {
-          libVersion: '3.46.0',
-          libVersionNumber: 3046000,
+          libVersion: '3.46.1',
+          libVersionNumber: 3046001,
           sourceId:
-            '2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e',
-          downloadVersion: 3460000,
+            '2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33',
+          downloadVersion: 3460100,
         };
       });
 
@@ -12642,6 +12642,7 @@ var sqlite3InitModule = (() => {
               'SQLITE_ACCESS_EXISTS',
               'SQLITE_ACCESS_READWRITE',
               'SQLITE_BUSY',
+              'SQLITE_CANTOPEN',
               'SQLITE_ERROR',
               'SQLITE_IOERR',
               'SQLITE_IOERR_ACCESS',
@@ -12686,7 +12687,11 @@ var sqlite3InitModule = (() => {
               Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
               Atomics.notify(state.sabOPView, state.opIds.whichOp);
               const t = performance.now();
-              Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+              while (
+                'not-equal' !==
+                Atomics.wait(state.sabOPView, state.opIds.rc, -1)
+              ) {}
+
               const rc = Atomics.load(state.sabOPView, state.opIds.rc);
               metrics[op].wait += performance.now() - t;
               if (rc && state.asyncS11nExceptions) {
@@ -12868,8 +12873,12 @@ var sqlite3InitModule = (() => {
 
             const ioSyncWrappers = {
               xCheckReservedLock: function (pFile, pOut) {
-                const f = __openFiles[pFile];
-                wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                if (1) {
+                  wasm.poke(pOut, 0, 'i32');
+                } else {
+                  const f = __openFiles[pFile];
+                  wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                }
                 return 0;
               },
               xClose: function (pFile) {

package/dist/peerbit/sqlite3-node.mjs

@@ -26,9 +26,9 @@
 /*
  ** This code was built from sqlite3 version...
  **
- ** SQLITE_VERSION "3.46.0"
- ** SQLITE_VERSION_NUMBER 3046000
- ** SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
+ ** SQLITE_VERSION "3.46.1"
+ ** SQLITE_VERSION_NUMBER 3046001
+ ** SQLITE_SOURCE_ID "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
  **
  ** Using the Emscripten SDK version 3.1.30.
  */
@@ -10730,11 +10730,11 @@ var sqlite3InitModule = (() => {
 
       globalThis.sqlite3ApiBootstrap.initializers.push(function (sqlite3) {
         sqlite3.version = {
-          libVersion: '3.46.0',
-          libVersionNumber: 3046000,
+          libVersion: '3.46.1',
+          libVersionNumber: 3046001,
           sourceId:
-            '2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e',
-          downloadVersion: 3460000,
+            '2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33',
+          downloadVersion: 3460100,
         };
       });
 

package/dist/peerbit/sqlite3-opfs-async-proxy.js

@@ -79,48 +79,6 @@ const installAsyncProxy = function () {
   const log = (...args) => logImpl(2, ...args);
   const warn = (...args) => logImpl(1, ...args);
   const error = (...args) => logImpl(0, ...args);
-  const metrics = Object.create(null);
-  metrics.reset = () => {
-    let k;
-    const r = (m) => (m.count = m.time = m.wait = 0);
-    for (k in state.opIds) {
-      r((metrics[k] = Object.create(null)));
-    }
-    let s = (metrics.s11n = Object.create(null));
-    s = s.serialize = Object.create(null);
-    s.count = s.time = 0;
-    s = metrics.s11n.deserialize = Object.create(null);
-    s.count = s.time = 0;
-  };
-  metrics.dump = () => {
-    let k,
-      n = 0,
-      t = 0,
-      w = 0;
-    for (k in state.opIds) {
-      const m = metrics[k];
-      n += m.count;
-      t += m.time;
-      w += m.wait;
-      m.avgTime = m.count && m.time ? m.time / m.count : 0;
-    }
-    console.log(
-      globalThis?.location?.href,
-      'metrics for',
-      globalThis?.location?.href,
-      ':\n',
-      metrics,
-      '\nTotal of',
-      n,
-      'op(s) for',
-      t,
-      'ms',
-      'approx',
-      w,
-      'ms spent waiting on OPFS APIs.',
-    );
-    console.log('Serialization metrics:', metrics.s11n);
-  };
 
   const __openFiles = Object.create(null);
 
@@ -189,17 +147,22 @@ const installAsyncProxy = function () {
       this.name = 'GetSyncHandleError';
     }
   }
+
   GetSyncHandleError.convertRc = (e, rc) => {
-    if (1) {
-      return e instanceof GetSyncHandleError &&
-        (e.cause.name === 'NoModificationAllowedError' ||
-          (e.cause.name === 'DOMException' &&
-            0 === e.cause.message.indexOf('Access Handles cannot')))
-        ? state.sq3Codes.SQLITE_BUSY
-        : rc;
-    } else {
-      return rc;
+    if (e instanceof GetSyncHandleError) {
+      if (
+        e.cause.name === 'NoModificationAllowedError' ||
+        (e.cause.name === 'DOMException' &&
+          0 === e.cause.message.indexOf('Access Handles cannot'))
+      ) {
+        return state.sq3Codes.SQLITE_BUSY;
+      } else if ('NotFoundError' === e.cause.name) {
+        return state.sq3Codes.SQLITE_CANTOPEN;
+      }
+    } else if ('NotFoundError' === e?.name) {
+      return state.sq3Codes.SQLITE_CANTOPEN;
     }
+    return rc;
   };
 
   const getSyncHandle = async (fh, opName) => {
@@ -267,79 +230,39 @@ const installAsyncProxy = function () {
     if (fh.readOnly) toss(opName + '(): File is read-only: ' + fh.filenameAbs);
   };
 
-  const __mTimer = Object.create(null);
-  __mTimer.op = undefined;
-  __mTimer.start = undefined;
-  const mTimeStart = (op) => {
-    __mTimer.start = performance.now();
-    __mTimer.op = op;
-
-    ++metrics[op].count;
-  };
-  const mTimeEnd = () =>
-    (metrics[__mTimer.op].time += performance.now() - __mTimer.start);
-  const __wTimer = Object.create(null);
-  __wTimer.op = undefined;
-  __wTimer.start = undefined;
-  const wTimeStart = (op) => {
-    __wTimer.start = performance.now();
-    __wTimer.op = op;
-  };
-  const wTimeEnd = () =>
-    (metrics[__wTimer.op].wait += performance.now() - __wTimer.start);
-
   let flagAsyncShutdown = false;
 
   const vfsAsyncImpls = {
-    'opfs-async-metrics': async () => {
-      mTimeStart('opfs-async-metrics');
-      metrics.dump();
-      storeAndNotify('opfs-async-metrics', 0);
-      mTimeEnd();
-    },
     'opfs-async-shutdown': async () => {
       flagAsyncShutdown = true;
       storeAndNotify('opfs-async-shutdown', 0);
     },
     mkdir: async (dirname) => {
-      mTimeStart('mkdir');
       let rc = 0;
-      wTimeStart('mkdir');
       try {
         await getDirForFilename(dirname + '/filepart', true);
       } catch (e) {
         state.s11n.storeException(2, e);
         rc = state.sq3Codes.SQLITE_IOERR;
-      } finally {
-        wTimeEnd();
       }
       storeAndNotify('mkdir', rc);
-      mTimeEnd();
     },
     xAccess: async (filename) => {
-      mTimeStart('xAccess');
-
       let rc = 0;
-      wTimeStart('xAccess');
       try {
         const [dh, fn] = await getDirForFilename(filename);
         await dh.getFileHandle(fn);
       } catch (e) {
         state.s11n.storeException(2, e);
         rc = state.sq3Codes.SQLITE_IOERR;
-      } finally {
-        wTimeEnd();
       }
       storeAndNotify('xAccess', rc);
-      mTimeEnd();
     },
     xClose: async function (fid) {
       const opName = 'xClose';
-      mTimeStart(opName);
       __implicitLocks.delete(fid);
       const fh = __openFiles[fid];
       let rc = 0;
-      wTimeStart(opName);
       if (fh) {
         delete __openFiles[fid];
         await closeSyncHandle(fh);
@@ -354,19 +277,14 @@ const installAsyncProxy = function () {
         state.s11n.serialize();
         rc = state.sq3Codes.SQLITE_NOTFOUND;
       }
-      wTimeEnd();
       storeAndNotify(opName, rc);
-      mTimeEnd();
     },
     xDelete: async function (...args) {
-      mTimeStart('xDelete');
       const rc = await vfsAsyncImpls.xDeleteNoWait(...args);
       storeAndNotify('xDelete', rc);
-      mTimeEnd();
     },
     xDeleteNoWait: async function (filename, syncDir = 0, recursive = false) {
       let rc = 0;
-      wTimeStart('xDelete');
       try {
         while (filename) {
           const [hDir, filenamePart] = await getDirForFilename(filename, false);
@@ -382,14 +300,11 @@ const installAsyncProxy = function () {
         state.s11n.storeException(2, e);
         rc = state.sq3Codes.SQLITE_IOERR_DELETE;
       }
-      wTimeEnd();
       return rc;
     },
     xFileSize: async function (fid) {
-      mTimeStart('xFileSize');
       const fh = __openFiles[fid];
       let rc = 0;
-      wTimeStart('xFileSize');
       try {
         const sz = await (await getSyncHandle(fh, 'xFileSize')).getSize();
         state.s11n.serialize(Number(sz));
@@ -398,18 +313,14 @@ const installAsyncProxy = function () {
         rc = GetSyncHandleError.convertRc(e, state.sq3Codes.SQLITE_IOERR);
       }
       await releaseImplicitLock(fh);
-      wTimeEnd();
       storeAndNotify('xFileSize', rc);
-      mTimeEnd();
     },
     xLock: async function (fid, lockType) {
-      mTimeStart('xLock');
       const fh = __openFiles[fid];
       let rc = 0;
       const oldLockType = fh.xLock;
       fh.xLock = lockType;
       if (!fh.syncHandle) {
-        wTimeStart('xLock');
         try {
           await getSyncHandle(fh, 'xLock');
           __implicitLocks.delete(fid);
@@ -421,16 +332,12 @@ const installAsyncProxy = function () {
           );
           fh.xLock = oldLockType;
         }
-        wTimeEnd();
       }
       storeAndNotify('xLock', rc);
-      mTimeEnd();
     },
     xOpen: async function (fid, filename, flags, opfsFlags) {
       const opName = 'xOpen';
-      mTimeStart(opName);
       const create = state.sq3Codes.SQLITE_OPEN_CREATE & flags;
-      wTimeStart('xOpen');
       try {
         let hDir, filenamePart;
         try {
@@ -438,8 +345,6 @@ const installAsyncProxy = function () {
         } catch (e) {
           state.s11n.storeException(1, e);
           storeAndNotify(opName, state.sq3Codes.SQLITE_NOTFOUND);
-          mTimeEnd();
-          wTimeEnd();
           return;
         }
         if (state.opfsFlags.OPFS_UNLINK_BEFORE_OPEN & opfsFlags) {
@@ -448,7 +353,6 @@ const installAsyncProxy = function () {
           } catch (e) {}
         }
         const hFile = await hDir.getFileHandle(filenamePart, { create });
-        wTimeEnd();
         const fh = Object.assign(Object.create(null), {
           fid: fid,
           filenameAbs: filename,
@@ -464,68 +368,51 @@ const installAsyncProxy = function () {
         fh.releaseImplicitLocks =
           opfsFlags & state.opfsFlags.OPFS_UNLOCK_ASAP ||
           state.opfsFlags.defaultUnlockAsap;
-        if (0 && 0 === (flags & state.sq3Codes.SQLITE_OPEN_MAIN_DB)) {
-          fh.xLock = 'xOpen';
-          await getSyncHandle(fh, 'xOpen');
-        }
         __openFiles[fid] = fh;
         storeAndNotify(opName, 0);
       } catch (e) {
-        wTimeEnd();
         error(opName, e);
         state.s11n.storeException(1, e);
         storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR);
       }
-      mTimeEnd();
     },
     xRead: async function (fid, n, offset64) {
-      mTimeStart('xRead');
       let rc = 0,
         nRead;
       const fh = __openFiles[fid];
       try {
-        wTimeStart('xRead');
         nRead = (await getSyncHandle(fh, 'xRead')).read(
           fh.sabView.subarray(0, n),
           { at: Number(offset64) },
         );
-        wTimeEnd();
         if (nRead < n) {
           fh.sabView.fill(0, nRead, n);
           rc = state.sq3Codes.SQLITE_IOERR_SHORT_READ;
         }
       } catch (e) {
-        if (undefined === nRead) wTimeEnd();
         error('xRead() failed', e, fh);
         state.s11n.storeException(1, e);
         rc = GetSyncHandleError.convertRc(e, state.sq3Codes.SQLITE_IOERR_READ);
       }
       await releaseImplicitLock(fh);
       storeAndNotify('xRead', rc);
-      mTimeEnd();
     },
     xSync: async function (fid, flags) {
-      mTimeStart('xSync');
       const fh = __openFiles[fid];
       let rc = 0;
       if (!fh.readOnly && fh.syncHandle) {
         try {
-          wTimeStart('xSync');
           await fh.syncHandle.flush();
         } catch (e) {
           state.s11n.storeException(2, e);
           rc = state.sq3Codes.SQLITE_IOERR_FSYNC;
         }
-        wTimeEnd();
       }
       storeAndNotify('xSync', rc);
-      mTimeEnd();
     },
     xTruncate: async function (fid, size) {
-      mTimeStart('xTruncate');
       let rc = 0;
       const fh = __openFiles[fid];
-      wTimeStart('xTruncate');
       try {
         affirmNotRO('xTruncate', fh);
         await (await getSyncHandle(fh, 'xTruncate')).truncate(size);
@@ -538,32 +425,24 @@ const installAsyncProxy = function () {
         );
       }
       await releaseImplicitLock(fh);
-      wTimeEnd();
       storeAndNotify('xTruncate', rc);
-      mTimeEnd();
     },
     xUnlock: async function (fid, lockType) {
-      mTimeStart('xUnlock');
       let rc = 0;
       const fh = __openFiles[fid];
       if (state.sq3Codes.SQLITE_LOCK_NONE === lockType && fh.syncHandle) {
-        wTimeStart('xUnlock');
         try {
           await closeSyncHandle(fh);
         } catch (e) {
           state.s11n.storeException(1, e);
           rc = state.sq3Codes.SQLITE_IOERR_UNLOCK;
         }
-        wTimeEnd();
       }
       storeAndNotify('xUnlock', rc);
-      mTimeEnd();
     },
     xWrite: async function (fid, n, offset64) {
-      mTimeStart('xWrite');
       let rc;
       const fh = __openFiles[fid];
-      wTimeStart('xWrite');
       try {
         affirmNotRO('xWrite', fh);
         rc =
@@ -579,9 +458,7 @@ const installAsyncProxy = function () {
         rc = GetSyncHandleError.convertRc(e, state.sq3Codes.SQLITE_IOERR_WRITE);
       }
       await releaseImplicitLock(fh);
-      wTimeEnd();
       storeAndNotify('xWrite', rc);
-      mTimeEnd();
     },
   };
 
@@ -638,8 +515,6 @@ const installAsyncProxy = function () {
       }
     };
     state.s11n.deserialize = function (clear = false) {
-      ++metrics.s11n.deserialize.count;
-      const t = performance.now();
       const argc = viewU8[0];
       const rc = argc ? [] : null;
       if (argc) {
@@ -667,12 +542,9 @@ const installAsyncProxy = function () {
       }
       if (clear) viewU8[0] = 0;
 
-      metrics.s11n.deserialize.time += performance.now() - t;
       return rc;
     };
     state.s11n.serialize = function (...args) {
-      const t = performance.now();
-      ++metrics.s11n.serialize.count;
       if (args.length) {
         const typeIds = [];
         let i = 0,
@@ -698,7 +570,6 @@ const installAsyncProxy = function () {
       } else {
         viewU8[0] = 0;
       }
-      metrics.s11n.serialize.time += performance.now() - t;
     };
 
     state.s11n.storeException = state.asyncS11nExceptions
@@ -777,7 +648,6 @@ const installAsyncProxy = function () {
               }
             });
             initS11n();
-            metrics.reset();
             log('init state', state);
             wPost('opfs-async-inited');
             waitLoop();
@@ -792,9 +662,6 @@ const installAsyncProxy = function () {
               waitLoop();
             }
             break;
-          case 'opfs-async-metrics':
-            metrics.dump();
-            break;
         }
       };
       wPost('opfs-async-loaded');

package/dist/peerbit/sqlite3.js

@@ -26,9 +26,9 @@
 /*
  ** This code was built from sqlite3 version...
  **
- ** SQLITE_VERSION "3.46.0"
- ** SQLITE_VERSION_NUMBER 3046000
- ** SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
+ ** SQLITE_VERSION "3.46.1"
+ ** SQLITE_VERSION_NUMBER 3046001
+ ** SQLITE_SOURCE_ID "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
  **
  ** Using the Emscripten SDK version 3.1.30.
  */
@@ -10713,11 +10713,11 @@ var sqlite3InitModule = (() => {
 
       globalThis.sqlite3ApiBootstrap.initializers.push(function (sqlite3) {
         sqlite3.version = {
-          libVersion: '3.46.0',
-          libVersionNumber: 3046000,
+          libVersion: '3.46.1',
+          libVersionNumber: 3046001,
           sourceId:
-            '2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e',
-          downloadVersion: 3460000,
+            '2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33',
+          downloadVersion: 3460100,
         };
       });
 
@@ -12668,6 +12668,7 @@ var sqlite3InitModule = (() => {
               'SQLITE_ACCESS_EXISTS',
               'SQLITE_ACCESS_READWRITE',
               'SQLITE_BUSY',
+              'SQLITE_CANTOPEN',
               'SQLITE_ERROR',
               'SQLITE_IOERR',
               'SQLITE_IOERR_ACCESS',
@@ -12712,7 +12713,11 @@ var sqlite3InitModule = (() => {
               Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
               Atomics.notify(state.sabOPView, state.opIds.whichOp);
               const t = performance.now();
-              Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+              while (
+                'not-equal' !==
+                Atomics.wait(state.sabOPView, state.opIds.rc, -1)
+              ) {}
+
               const rc = Atomics.load(state.sabOPView, state.opIds.rc);
               metrics[op].wait += performance.now() - t;
               if (rc && state.asyncS11nExceptions) {
@@ -12894,8 +12899,12 @@ var sqlite3InitModule = (() => {
 
             const ioSyncWrappers = {
               xCheckReservedLock: function (pFile, pOut) {
-                const f = __openFiles[pFile];
-                wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                if (1) {
+                  wasm.poke(pOut, 0, 'i32');
+                } else {
+                  const f = __openFiles[pFile];
+                  wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                }
                 return 0;
               },
               xClose: function (pFile) {