@livestore/wa-sqlite 1.0.1-dev.15 → 1.0.1-dev.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/wa-sqlite",
-  "version": "1.0.1-dev.15",
+  "version": "1.0.1-dev.17",
   "type": "module",
   "main": "src/sqlite-api.js",
   "types": "src/types/index.d.ts",

package/src/sqlite-api.js

@@ -527,6 +527,28 @@ export function Factory(Module) {
   })();
 
   sqlite3.open_v2 = (function() {
+    const fname = 'sqlite3_open_v2';
+    const f = Module.cwrap(fname, ...decl('snnn:n'), { async });
+    return async function(zFilename, flags, zVfs) {
+      flags = flags || SQLite.SQLITE_OPEN_CREATE | SQLite.SQLITE_OPEN_READWRITE;
+      zVfs = createUTF8(zVfs);
+      try {
+        // Allow retry operations.
+        const rc = await retry(() => f(zFilename, tmpPtr[0], flags, zVfs));
+
+        const db = Module.getValue(tmpPtr[0], '*');
+        databases.add(db);
+
+        Module.ccall('RegisterExtensionFunctions', 'void', ['number'], [db]);
+        check(fname, rc);
+        return db;
+      } finally {
+        Module._sqlite3_free(zVfs);
+      }
+    };
+  })();
+
+  sqlite3.open_v2Sync = (function() {
     const fname = 'sqlite3_open_v2';
     const f = Module.cwrap(fname, ...decl('snnn:n'), { async });
     return function(zFilename, flags, zVfs) {
@@ -549,6 +571,7 @@ export function Factory(Module) {
     };
   })();
 
+
   sqlite3.progress_handler = function(db, nProgressOps, handler, userData) {
     verifyDatabase(db);
     Module.progress_handler(db, nProgressOps, handler, userData);
@@ -901,22 +924,22 @@ export function Factory(Module) {
   // This function is used to automatically retry failed calls that
   // have pending retry operations that should allow the retry to
   // succeed.
-  // async function retry(f) {
-  //   let rc;
-  //   do {
-  //     // Wait for all pending retry operations to complete. This is
-  //     // normally empty on the first loop iteration.
-  //     if (Module.retryOps.length) {
-  //       await Promise.all(Module.retryOps);
-  //       Module.retryOps = [];
-  //     }
+  async function retry(f) {
+    let rc;
+    do {
+      // Wait for all pending retry operations to complete. This is
+      // normally empty on the first loop iteration.
+      if (Module.retryOps.length) {
+        await Promise.all(Module.retryOps);
+        Module.retryOps = [];
+      }
       
-  //     rc = await f();
+      rc = await f();
 
-  //     // Retry on failure with new pending retry operations.
-  //   } while (rc && Module.retryOps.length);
-  //   return rc;
-  // }
+      // Retry on failure with new pending retry operations.
+    } while (rc && Module.retryOps.length);
+    return rc;
+  }
 
   return sqlite3;
 }

package/src/types/index.d.ts

@@ -610,6 +610,12 @@ interface SQLiteAPI {
     zFilename: string,
     iFlags?: number,
     zVfs?: string    
+  ): Promise<number>;
+
+  open_v2Sync(
+    zFilename: string,
+    iFlags?: number,
+    zVfs?: string    
   ): number;
 
   /**
@@ -1249,6 +1255,7 @@ declare module '@livestore/wa-sqlite/src/examples/AccessHandlePoolVFS.js' {
   import * as VFS from "@livestore/wa-sqlite/src/VFS.js";
   export class AccessHandlePoolVFS extends VFS.Base {
     constructor(name: string, module: any)
+    static create(name: string, module: any): Promise<AccessHandlePoolVFS>;
   }
 }