Merge pull request #36 from powersync-ja/upstream-changes

Pull upstream changes

Author: simolus3

.changeset/proud-moose-report.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/wa-sqlite': patch
+---
+
+Fix issue where OPFS VFS could freeze in infinite loop

Makefile

@@ -84,6 +84,7 @@ EMFLAGS_COMMON = \
 	-s INVOKE_RUN \
 	-s ENVIRONMENT="web,worker" \
 	-s STACK_SIZE=512KB \
+	-s WASM_BIGINT=0 \
 	$(EMFLAGS_EXTRA)
 
 EMFLAGS_DEBUG = \

demo/demo.js

@@ -77,6 +77,7 @@ window.addEventListener('DOMContentLoaded', async function() {
     let time = performance.now();
     worker.postMessage(queries);
     worker.addEventListener('message', async function(event) {
+      timestamp.textContent += ` ${(performance.now() - time).toFixed(1)} milliseconds`;
       if (event.data.results) {
         // Format the results as tables.
         event.data.results
@@ -85,7 +86,6 @@ window.addEventListener('DOMContentLoaded', async function() {
       } else {
         output.innerHTML = `<pre>${event.data.error.message}</pre>`;
       }
-      timestamp.textContent += ` ${Math.trunc(performance.now() - time) / 1000} seconds`;
       button.disabled = false;
     }, { once: true });
   });

demo/file/index.js

@@ -1,5 +1,6 @@
 import * as VFS from "../../src/VFS.js";
-import { IDBBatchAtomicVFS } from "../../src/examples/IDBBatchAtomicVFS.js";
+import { IDBBatchAtomicVFS as MyVFS } from "../../src/examples/IDBBatchAtomicVFS.js";
+// import { IDBMirrorVFS as MyVFS } from "../../src/examples/IDBMirrorVFS.js";
 
 const SEARCH_PARAMS = new URLSearchParams(location.search);
 const IDB_NAME = SEARCH_PARAMS.get('idb') ?? 'sqlite-vfs';
@@ -43,7 +44,7 @@ document.getElementById('file-fetch').addEventListener('click', async () => {
   let vfs;
   try {
     log(`Importing to IndexedDB ${IDB_NAME}, path ${DB_NAME}`);
-    vfs = await IDBBatchAtomicVFS.create(IDB_NAME, null);
+    vfs = await MyVFS.create(IDB_NAME, null);
 
     // @ts-ignore
     const importURL = document.getElementById('file-url').value;
@@ -69,7 +70,7 @@ document.getElementById('file-import').addEventListener('change', async event =>
   let vfs;
   try {
     log(`Importing to IndexedDB ${IDB_NAME}, path ${DB_NAME}`);
-    vfs = await IDBBatchAtomicVFS.create(IDB_NAME, null);
+    vfs = await MyVFS.create(IDB_NAME, null);
     // @ts-ignore
     await importDatabase(vfs, DB_NAME, event.target.files[0].stream());
     log('Import complete');
@@ -87,7 +88,7 @@ document.getElementById('file-import').addEventListener('change', async event =>
 });
 
 /**
- * @param {IDBBatchAtomicVFS} vfs 
+ * @param {MyVFS} vfs 
  * @param {string} path 
  * @param {ReadableStream} stream 
  */

demo/file/service-worker.js

@@ -1,5 +1,6 @@
 import * as VFS from "../../src/VFS.js";
-import { IDBBatchAtomicVFS } from "../../src/examples/IDBBatchAtomicVFS.js";
+import { IDBBatchAtomicVFS as MyVFS } from "../../src/examples/IDBBatchAtomicVFS.js";
+// import { IDBMirrorVFS as MyVFS } from "../../src/examples/IDBMirrorVFS.js";
 
 // Install the service worker as soon as possible.
 globalThis.addEventListener('install', (/** @type {ExtendableEvent} */ event) => {
@@ -26,7 +27,7 @@ globalThis.addEventListener('fetch', async (/** @type {FetchEvent} */ event) =>
 
   return event.respondWith((async () => {
     // Create the VFS and streaming source using the request parameters.
-    const vfs = await IDBBatchAtomicVFS.create(url.searchParams.get('idb'), null);
+    const vfs = await MyVFS.create(url.searchParams.get('idb'), null);
     const path = url.searchParams.get('db');
     const source = new DatabaseSource(vfs, path);
 

demo/file/verifier.js

@@ -1,6 +1,7 @@
 import SQLiteESMFactory from '../../dist/wa-sqlite-async.mjs';
 import * as SQLite from '../../src/sqlite-api.js';
-import { IDBBatchAtomicVFS } from '../../src/examples/IDBBatchAtomicVFS.js';
+import { IDBBatchAtomicVFS as MyVFS } from "../../src/examples/IDBBatchAtomicVFS.js";
+// import { IDBMirrorVFS as MyVFS } from "../../src/examples/IDBMirrorVFS.js";
 
 const SEARCH_PARAMS = new URLSearchParams(location.search);
 const IDB_NAME = SEARCH_PARAMS.get('idb') ?? 'sqlite-vfs';
@@ -10,7 +11,7 @@ const DB_NAME = SEARCH_PARAMS.get('db') ?? 'sqlite.db';
   const module = await SQLiteESMFactory();
   const sqlite3 = SQLite.Factory(module);
 
-  const vfs = await IDBBatchAtomicVFS.create(IDB_NAME, module);
+  const vfs = await MyVFS.create(IDB_NAME, module);
   // @ts-ignore
   sqlite3.vfs_register(vfs, true);