@powersync/web 1.36.0 → 1.37.1

package/dist/index.umd.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("@powersync/common"), require("async-mutex"), require("comlink"), require("@journeyapps/wa-sqlite"), require("@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"), require("@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"), require("@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"));
+		module.exports = factory(require("@powersync/common"), require("comlink"), require("@journeyapps/wa-sqlite"), require("@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"), require("@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"), require("@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"));
 	else if(typeof define === 'function' && define.amd)
-		define(["@powersync/common", "async-mutex", "comlink", "@journeyapps/wa-sqlite", "@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js", "@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js", "@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"], factory);
+		define(["@powersync/common", "comlink", "@journeyapps/wa-sqlite", "@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js", "@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js", "@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"], factory);
 	else if(typeof exports === 'object')
-		exports["sdk_web"] = factory(require("@powersync/common"), require("async-mutex"), require("comlink"), require("@journeyapps/wa-sqlite"), require("@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"), require("@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"), require("@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"));
+		exports["sdk_web"] = factory(require("@powersync/common"), require("comlink"), require("@journeyapps/wa-sqlite"), require("@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"), require("@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"), require("@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"));
 	else
-		root["sdk_web"] = factory(root["@powersync/common"], root["async-mutex"], root["comlink"], root["@journeyapps/wa-sqlite"], root["@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"], root["@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"], root["@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"]);
-})(self, (__WEBPACK_EXTERNAL_MODULE__powersync_common__, __WEBPACK_EXTERNAL_MODULE_async_mutex__, __WEBPACK_EXTERNAL_MODULE_comlink__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_OPFSCoopSyncVFS_js__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_AccessHandlePoolVFS_js__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_IDBBatchAtomicVFS_js__) => {
+		root["sdk_web"] = factory(root["@powersync/common"], root["comlink"], root["@journeyapps/wa-sqlite"], root["@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"], root["@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js"], root["@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js"]);
+})(self, (__WEBPACK_EXTERNAL_MODULE__powersync_common__, __WEBPACK_EXTERNAL_MODULE_comlink__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_OPFSCoopSyncVFS_js__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_AccessHandlePoolVFS_js__, __WEBPACK_EXTERNAL_MODULE__journeyapps_wa_sqlite_src_examples_IDBBatchAtomicVFS_js__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -102,16 +102,6 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__powersync_common__;
 
 /***/ },
 
-/***/ "async-mutex"
-/*!******************************!*\
-  !*** external "async-mutex" ***!
-  \******************************/
-(module) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_async_mutex__;
-
-/***/ },
-
 /***/ "comlink"
 /*!**************************!*\
   !*** external "comlink" ***!
@@ -4993,17 +4983,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   resolveWebPowerSyncFlags: () => (/* binding */ resolveWebPowerSyncFlags)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! async-mutex */ "async-mutex");
-/* harmony import */ var _shared_navigator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/navigator.js */ "./lib/src/shared/navigator.js");
-/* harmony import */ var _NavigatorTriggerClaimManager_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./NavigatorTriggerClaimManager.js */ "./lib/src/db/NavigatorTriggerClaimManager.js");
-/* harmony import */ var _adapters_LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./adapters/LockedAsyncDatabaseAdapter.js */ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js");
-/* harmony import */ var _adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./adapters/wa-sqlite/WASQLiteOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteOpenFactory.js");
-/* harmony import */ var _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-/* harmony import */ var _sync_SSRWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./sync/SSRWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SSRWebStreamingSyncImplementation.js");
-/* harmony import */ var _sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./sync/SharedWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SharedWebStreamingSyncImplementation.js");
-/* harmony import */ var _sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
-/* harmony import */ var _sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
-
+/* harmony import */ var _shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/navigator.js */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _NavigatorTriggerClaimManager_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./NavigatorTriggerClaimManager.js */ "./lib/src/db/NavigatorTriggerClaimManager.js");
+/* harmony import */ var _adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./adapters/wa-sqlite/WASQLiteOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteOpenFactory.js");
+/* harmony import */ var _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
+/* harmony import */ var _sync_SSRWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./sync/SSRWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SSRWebStreamingSyncImplementation.js");
+/* harmony import */ var _sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./sync/SharedWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SharedWebStreamingSyncImplementation.js");
+/* harmony import */ var _sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
+/* harmony import */ var _sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _adapters_AsyncWebAdapter_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./adapters/AsyncWebAdapter.js */ "./lib/src/db/adapters/AsyncWebAdapter.js");
 
 
 
@@ -5015,14 +5003,14 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const DEFAULT_POWERSYNC_FLAGS = {
-    ..._adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.DEFAULT_WEB_SQL_FLAGS,
+    ..._adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.DEFAULT_WEB_SQL_FLAGS,
     externallyUnload: false
 };
 const resolveWebPowerSyncFlags = (flags) => {
     return {
         ...DEFAULT_POWERSYNC_FLAGS,
         ...flags,
-        ...(0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.resolveWebSQLFlags)(flags)
+        ...(0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.resolveWebSQLFlags)(flags)
     };
 };
 /**
@@ -5052,7 +5040,7 @@ function assertValidDatabaseOptions(options) {
  */
 class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbstractPowerSyncDatabase {
     options;
-    static SHARED_MUTEX = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
+    static SHARED_MUTEX = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
     unloadListener;
     resolvedFlags;
     constructor(options) {
@@ -5066,7 +5054,7 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
         }
     }
     async _initialize() {
-        if (this.database instanceof _adapters_LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_4__.LockedAsyncDatabaseAdapter) {
+        if (this.database instanceof _adapters_AsyncWebAdapter_js__WEBPACK_IMPORTED_MODULE_9__.AsyncDbAdapter) {
             /**
              * While init is done automatically,
              * LockedAsyncDatabaseAdapter only exposes config after init.
@@ -5087,11 +5075,11 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
     generateTriggerManagerConfig() {
         return {
             // We need to share hold information between tabs for web
-            claimManager: _NavigatorTriggerClaimManager_js__WEBPACK_IMPORTED_MODULE_3__.NAVIGATOR_TRIGGER_CLAIM_MANAGER
+            claimManager: _NavigatorTriggerClaimManager_js__WEBPACK_IMPORTED_MODULE_2__.NAVIGATOR_TRIGGER_CLAIM_MANAGER
         };
     }
     openDBAdapter(options) {
-        const defaultFactory = new _adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__.WASQLiteOpenFactory({
+        const defaultFactory = new _adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_3__.WASQLiteOpenFactory({
             ...options.database,
             flags: resolveWebPowerSyncFlags(options.flags),
             encryptionKey: options.encryptionKey
@@ -5113,13 +5101,13 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
         });
     }
     async loadVersion() {
-        if ((0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.isServerSide)()) {
+        if ((0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.isServerSide)()) {
             return;
         }
         return super.loadVersion();
     }
     async resolveOfflineSyncStatus() {
-        if ((0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.isServerSide)()) {
+        if ((0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.isServerSide)()) {
             return;
         }
         return super.resolveOfflineSyncStatus();
@@ -5131,10 +5119,10 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
         if (this.resolvedFlags.ssrMode) {
             return PowerSyncDatabase.SHARED_MUTEX.runExclusive(cb);
         }
-        return (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_2__.getNavigatorLocks)().request(`lock-${this.database.name}`, cb);
+        return (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(`lock-${this.database.name}`, cb);
     }
     generateSyncStreamImplementation(connector, options) {
-        const remote = new _sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_9__.WebRemote(connector, this.logger);
+        const remote = new _sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_7__.WebRemote(connector, this.logger);
         const syncOptions = {
             ...this.options,
             ...options,
@@ -5150,7 +5138,7 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
         };
         switch (true) {
             case this.resolvedFlags.ssrMode:
-                return new _sync_SSRWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_7__.SSRStreamingSyncImplementation(syncOptions);
+                return new _sync_SSRWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_5__.SSRStreamingSyncImplementation(syncOptions);
             case this.resolvedFlags.enableMultiTabs:
                 if (!this.resolvedFlags.broadcastLogs) {
                     const warning = `
@@ -5160,12 +5148,12 @@ class PowerSyncDatabase extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.A
                     const logger = this.options.logger;
                     logger ? logger.warn(warning) : console.warn(warning);
                 }
-                return new _sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__.SharedWebStreamingSyncImplementation({
+                return new _sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_6__.SharedWebStreamingSyncImplementation({
                     ...syncOptions,
                     db: this.database // This should always be the case
                 });
             default:
-                return new _sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_10__.WebStreamingSyncImplementation(syncOptions);
+                return new _sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__.WebStreamingSyncImplementation(syncOptions);
         }
     }
 }
@@ -5215,485 +5203,85 @@ class AbstractWebPowerSyncDatabaseOpenFactory extends _powersync_common__WEBPACK
 
 /***/ },
 
-/***/ "./lib/src/db/adapters/AbstractWebSQLOpenFactory.js"
-/*!**********************************************************!*\
-  !*** ./lib/src/db/adapters/AbstractWebSQLOpenFactory.js ***!
-  \**********************************************************/
-(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   AbstractWebSQLOpenFactory: () => (/* binding */ AbstractWebSQLOpenFactory)
-/* harmony export */ });
-/* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var _SSRDBAdapter_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SSRDBAdapter.js */ "./lib/src/db/adapters/SSRDBAdapter.js");
-/* harmony import */ var _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-
-
-
-class AbstractWebSQLOpenFactory {
-    options;
-    resolvedFlags;
-    logger;
-    constructor(options) {
-        this.options = options;
-        this.resolvedFlags = (0,_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__.resolveWebSQLFlags)(options.flags);
-        this.logger = options.logger ?? (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.createLogger)(`AbstractWebSQLOpenFactory - ${this.options.dbFilename}`);
-    }
-    /**
-     * Opens a {@link DBAdapter} using resolved flags.
-     * A SSR implementation is loaded if SSR mode is detected.
-     */
-    openDB() {
-        const { resolvedFlags: { disableSSRWarning, enableMultiTabs, ssrMode = (0,_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__.isServerSide)() } } = this;
-        if (ssrMode && !disableSSRWarning) {
-            this.logger.warn(`
-  Running PowerSync in SSR mode.
-  Only empty query results will be returned.
-  Disable this warning by setting 'disableSSRWarning: true' in options.`);
-        }
-        if (!enableMultiTabs) {
-            this.logger.warn('Multiple tab support is not enabled. Using this site across multiple tabs may not function correctly.');
-        }
-        if (ssrMode) {
-            return new _SSRDBAdapter_js__WEBPACK_IMPORTED_MODULE_1__.SSRDBAdapter();
-        }
-        return this.openAdapter();
-    }
-}
-
-
-/***/ },
-
-/***/ "./lib/src/db/adapters/AsyncDatabaseConnection.js"
-/*!********************************************************!*\
-  !*** ./lib/src/db/adapters/AsyncDatabaseConnection.js ***!
-  \********************************************************/
-(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-
-
-
-/***/ },
-
-/***/ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js"
-/*!***********************************************************!*\
-  !*** ./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js ***!
-  \***********************************************************/
+/***/ "./lib/src/db/adapters/AsyncWebAdapter.js"
+/*!************************************************!*\
+  !*** ./lib/src/db/adapters/AsyncWebAdapter.js ***!
+  \************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   LockedAsyncDatabaseAdapter: () => (/* binding */ LockedAsyncDatabaseAdapter)
+/* harmony export */   AsyncDbAdapter: () => (/* binding */ AsyncDbAdapter)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var _shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/navigator.js */ "./lib/src/shared/navigator.js");
-/* harmony import */ var _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./WorkerWrappedAsyncDatabaseConnection.js */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
-/* harmony import */ var _wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./wa-sqlite/WASQLiteConnection.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
-
-
-
 
 /**
- * @internal
- * Wraps a {@link AsyncDatabaseConnection} and provides exclusive locking functions in
- * order to implement {@link DBAdapter}.
+ * A connection pool implementation delegating to another pool opened asynchronnously.
  */
-class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
-    options;
-    logger;
-    dbGetHelpers;
-    debugMode;
-    _dbIdentifier;
-    initPromise;
-    _db = null;
-    _disposeTableChangeListener = null;
-    _config = null;
-    pendingAbortControllers;
-    requiresHolds;
-    databaseOpenPromise = null;
-    closing;
-    closed;
-    constructor(options) {
-        super();
-        this.options = options;
-        this._dbIdentifier = options.name;
-        this.logger = options.logger ?? (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.createLogger)(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
-        this.pendingAbortControllers = new Set();
-        this.closed = false;
-        this.closing = false;
-        this.requiresHolds = null;
-        // Set the name if provided. We can query for the name if not available yet
-        this.debugMode = options.debugMode ?? false;
-        if (this.debugMode) {
-            const originalExecute = this._execute.bind(this);
-            this._execute = async (sql, bindings) => {
-                const start = performance.now();
-                try {
-                    const r = await originalExecute(sql, bindings);
-                    performance.measure(`[SQL] ${sql}`, { start });
-                    return r;
-                }
-                catch (e) {
-                    performance.measure(`[SQL] [ERROR: ${e.message}] ${sql}`, { start });
-                    throw e;
-                }
-            };
-        }
-        this.dbGetHelpers = this.generateDBHelpers({
-            execute: (query, params) => this.acquireLock(() => this._execute(query, params)),
-            executeRaw: (query, params) => this.acquireLock(() => this._executeRaw(query, params)),
-            executeBatch: (query, params) => this.acquireLock(() => this._executeBatch(query, params))
+class AsyncConnectionPool {
+    name;
+    inner;
+    resolvedClient;
+    pendingListeners = new Set();
+    constructor(inner, name) {
+        this.name = name;
+        this.inner = inner.then((client) => {
+            for (const pending of this.pendingListeners) {
+                pending.closeAfterRegisteredOnResolvedPool = client.registerListener(pending.listener);
+            }
+            this.pendingListeners.clear();
+            this.resolvedClient = client;
+            return client;
         });
-        this.initPromise = this._init();
-    }
-    get baseDB() {
-        if (!this._db) {
-            throw new Error(`Initialization has not completed yet. Cannot access base db`);
-        }
-        return this._db;
-    }
-    get name() {
-        return this._dbIdentifier;
     }
-    /**
-     * Init is automatic, this helps catch errors or explicitly await initialization
-     */
     async init() {
-        return this.initPromise;
-    }
-    async openInternalDB() {
-        /**
-         * Execute opening of the db in a lock in order not to interfere with other operations.
-         */
-        return this._acquireLock(async () => {
-            // Dispose any previous table change listener.
-            this._disposeTableChangeListener?.();
-            this._disposeTableChangeListener = null;
-            this._db?.close().catch((ex) => this.logger.warn(`Error closing database before opening new instance`, ex));
-            const isReOpen = !!this._db;
-            this._db = null;
-            this._db = await this.options.openConnection();
-            await this._db.init();
-            this._config = await this._db.getConfig();
-            await this.registerOnChangeListener(this._db);
-            if (isReOpen) {
-                this.iterateListeners((cb) => cb.databaseReOpened?.());
-            }
-            /**
-             * This is only required for the long-lived shared IndexedDB connections.
-             */
-            this.requiresHolds = this._config.vfs == _wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_3__.WASQLiteVFS.IDBBatchAtomicVFS;
-        });
-    }
-    _reOpen() {
-        this.databaseOpenPromise = this.openInternalDB().finally(() => {
-            this.databaseOpenPromise = null;
-        });
-        return this.databaseOpenPromise;
-    }
-    /**
-     * Re-opens the underlying database.
-     * Returns a pending operation if one is already in progress.
-     */
-    async reOpenInternalDB() {
-        if (this.closing || !this.options.reOpenOnConnectionClosed) {
-            // No-op
-            return;
-        }
-        else if (this.databaseOpenPromise) {
-            // Already busy opening
-            return this.databaseOpenPromise;
-        }
-        else {
-            return this._reOpen();
-        }
-    }
-    async _init() {
-        /**
-         * For OPFS, we can see this open call sometimes fail due to NoModificationAllowedError.
-         * We should be able to recover from this by re-opening the database.
-         */
-        const maxAttempts = 3;
-        for (let count = 0; count < maxAttempts; count++) {
-            try {
-                await this.openInternalDB();
-                break;
-            }
-            catch (ex) {
-                if (count == maxAttempts - 1) {
-                    throw ex;
-                }
-                this.logger.warn(`Attempt ${count + 1} of ${maxAttempts} to open database failed, retrying in 1 second...`, ex);
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-        }
-        this.iterateListeners((cb) => cb.initialized?.());
-    }
-    getConfiguration() {
-        if (!this._config) {
-            throw new Error(`Cannot get config before initialization is completed`);
-        }
-        return {
-            ...this._config,
-            // This can be overridden by the adapter later
-            requiresPersistentTriggers: false
-        };
-    }
-    async waitForInitialized() {
-        // Awaiting this will expose errors on function calls like .execute etc
-        await this.initPromise;
-    }
-    async shareConnection() {
-        if (false == this._db instanceof _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_2__.WorkerWrappedAsyncDatabaseConnection) {
-            throw new Error(`Only worker connections can be shared`);
-        }
-        return this._db.shareConnection();
-    }
-    /**
-     * Registers a table change notification callback with the base database.
-     * This can be extended by custom implementations in order to handle proxy events.
-     */
-    async registerOnChangeListener(db) {
-        this._disposeTableChangeListener = await db.registerOnTableChange((event) => {
-            this.iterateListeners((cb) => cb.tablesUpdated?.(event));
-        });
-    }
-    /**
-     * This is currently a no-op on web
-     */
-    async refreshSchema() { }
-    async execute(query, params) {
-        return this.writeLock((ctx) => ctx.execute(query, params));
-    }
-    async executeRaw(query, params) {
-        return this.writeLock((ctx) => ctx.executeRaw(query, params));
+        await this.inner;
     }
-    async executeBatch(query, params) {
-        return this.writeLock((ctx) => this._executeBatch(query, params));
-    }
-    /**
-     * Attempts to close the connection.
-     * Shared workers might not actually close the connection if other
-     * tabs are still using it.
-     */
     async close() {
-        this.closing = true;
-        /**
-         * Note that we obtain a reference to the callback to avoid calling the callback with `this` as the context.
-         * This is to avoid Comlink attempting to clone `this` when calling the method.
-         */
-        const dispose = this._disposeTableChangeListener;
-        if (dispose) {
-            dispose();
-        }
-        this.pendingAbortControllers.forEach((controller) => controller.abort('Closed'));
-        await this.baseDB?.close?.();
-        this.closed = true;
-    }
-    async getAll(sql, parameters) {
-        await this.waitForInitialized();
-        return this.dbGetHelpers.getAll(sql, parameters);
-    }
-    async getOptional(sql, parameters) {
-        await this.waitForInitialized();
-        return this.dbGetHelpers.getOptional(sql, parameters);
-    }
-    async get(sql, parameters) {
-        await this.waitForInitialized();
-        return this.dbGetHelpers.get(sql, parameters);
+        const inner = await this.inner;
+        return await inner.close();
     }
     async readLock(fn, options) {
-        // Read and write locks are the same because we only have one underlying connection.
-        return this.writeLock(fn, options);
+        const inner = await this.inner;
+        return await inner.readLock(fn, options);
     }
     async writeLock(fn, options) {
-        await this.waitForInitialized();
-        return this.acquireLock(async () => fn(this.generateDBHelpers({
-            execute: this._execute,
-            executeRaw: this._executeRaw,
-            executeBatch: this._executeBatch
-        })), {
-            timeoutMs: options?.timeoutMs ?? this.options.defaultLockTimeoutMs
-        });
+        const inner = await this.inner;
+        return await inner.writeLock(fn, options);
     }
-    async _acquireLock(callback, options) {
-        if (this.closing) {
-            throw new Error(`Cannot acquire lock, the database is closing`);
-        }
-        const abortController = new AbortController();
-        this.pendingAbortControllers.add(abortController);
-        const { timeoutMs } = options ?? {};
-        const timeoutId = timeoutMs
-            ? setTimeout(() => {
-                abortController.abort(`Timeout after ${timeoutMs}ms`);
-                this.pendingAbortControllers.delete(abortController);
-            }, timeoutMs)
-            : null;
-        return (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, async () => {
-            this.pendingAbortControllers.delete(abortController);
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-            }
-            return await callback();
-        });
+    async refreshSchema() {
+        await (await this.inner).refreshSchema();
     }
-    async acquireLock(callback, options) {
-        await this.waitForInitialized();
-        // The database is being (re)opened in the background. Wait for it here.
-        if (this.databaseOpenPromise) {
-            await this.databaseOpenPromise;
-        }
-        else if (!this._db) {
-            /**
-             * The database is not open anymore, we might need to re-open it.
-             * Typically, _db, can be `null` if we tried to reOpen the database, but failed to succeed in re-opening.
-             * This can happen when disconnecting the client.
-             * Note: It is safe to re-enter this method multiple times.
-             */
-            await this.reOpenInternalDB();
+    registerListener(listener) {
+        if (this.resolvedClient) {
+            return this.resolvedClient.registerListener(listener);
         }
-        return this._acquireLock(async () => {
-            let holdId = null;
-            try {
-                /**
-                 * We can't await this since it uses the same lock as we're in now.
-                 * If there is a pending open, this call will throw.
-                 * If there is no pending open, but there is also no database - the open
-                 * might have failed. We need to re-open the database.
-                 */
-                if (this.databaseOpenPromise || !this._db) {
-                    throw new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Connection is busy re-opening');
-                }
-                holdId = this.requiresHolds ? await this.baseDB.markHold() : null;
-                return await callback();
-            }
-            catch (ex) {
-                if (_powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError.MATCHES(ex)) {
-                    // Immediately re-open the database. We need to miss as little table updates as possible.
-                    // Note, don't await this since it uses the same lock as we're in now.
-                    this.reOpenInternalDB();
+        else {
+            const pending = { listener };
+            this.pendingListeners.add(pending);
+            return () => {
+                if (pending.closeAfterRegisteredOnResolvedPool) {
+                    return pending.closeAfterRegisteredOnResolvedPool();
                 }
-                throw ex;
-            }
-            finally {
-                if (holdId) {
-                    await this.baseDB.releaseHold(holdId);
+                else {
+                    // Has not been registered yet, we can just remove the pending listener.
+                    this.pendingListeners.delete(pending);
                 }
-            }
-        }, options);
-    }
-    async readTransaction(fn, options) {
-        return this.readLock(this.wrapTransaction(fn));
-    }
-    writeTransaction(fn, options) {
-        return this.writeLock(this.wrapTransaction(fn, true));
+            };
+        }
     }
-    generateDBHelpers(tx) {
-        return {
-            ...tx,
-            /**
-             *  Execute a read-only query and return results
-             */
-            async getAll(sql, parameters) {
-                const res = await tx.execute(sql, parameters);
-                return res.rows?._array ?? [];
-            },
-            /**
-             * Execute a read-only query and return the first result, or null if the ResultSet is empty.
-             */
-            async getOptional(sql, parameters) {
-                const res = await tx.execute(sql, parameters);
-                return res.rows?.item(0) ?? null;
-            },
-            /**
-             * Execute a read-only query and return the first result, error if the ResultSet is empty.
-             */
-            async get(sql, parameters) {
-                const res = await tx.execute(sql, parameters);
-                const first = res.rows?.item(0);
-                if (!first) {
-                    throw new Error('Result set is empty');
-                }
-                return first;
-            }
-        };
+}
+class AsyncDbAdapter extends (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.DBAdapterDefaultMixin)(AsyncConnectionPool) {
+    async shareConnection() {
+        const inner = await this.inner;
+        return inner.shareConnection();
     }
-    /**
-     * Wraps a lock context into a transaction context
-     */
-    wrapTransaction(cb, write = false) {
-        return async (tx) => {
-            await this._execute(write ? 'BEGIN EXCLUSIVE' : 'BEGIN');
-            let finalized = false;
-            const commit = async () => {
-                if (finalized) {
-                    return { rowsAffected: 0 };
-                }
-                finalized = true;
-                return this._execute('COMMIT');
-            };
-            const rollback = () => {
-                finalized = true;
-                return this._execute('ROLLBACK');
-            };
-            try {
-                const result = await cb({
-                    ...tx,
-                    commit,
-                    rollback
-                });
-                if (!finalized) {
-                    await commit();
-                }
-                return result;
-            }
-            catch (ex) {
-                this.logger.debug('Caught ex in transaction', ex);
-                try {
-                    await rollback();
-                }
-                catch (ex2) {
-                    // In rare cases, a rollback may fail.
-                    // Safe to ignore.
-                }
-                throw ex;
-            }
-        };
+    getConfiguration() {
+        if (this.resolvedClient) {
+            return this.resolvedClient.getConfiguration();
+        }
+        throw new Error('AsyncDbAdapter.getConfiguration() can only be called after initializing it.');
     }
-    /**
-     * Wraps the worker execute function, awaiting for it to be available
-     */
-    _execute = async (sql, bindings) => {
-        await this.waitForInitialized();
-        const result = await this.baseDB.execute(sql, bindings);
-        return {
-            ...result,
-            rows: {
-                ...result.rows,
-                item: (idx) => result.rows._array[idx]
-            }
-        };
-    };
-    /**
-     * Wraps the worker executeRaw function, awaiting for it to be available
-     */
-    _executeRaw = async (sql, bindings) => {
-        await this.waitForInitialized();
-        return await this.baseDB.executeRaw(sql, bindings);
-    };
-    /**
-     * Wraps the worker executeBatch function, awaiting for it to be available
-     */
-    _executeBatch = async (query, params) => {
-        await this.waitForInitialized();
-        const result = await this.baseDB.executeBatch(query, params);
-        return {
-            ...result,
-            rows: undefined
-        };
-    };
 }
 
 
@@ -5710,8 +5298,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   SSRDBAdapter: () => (/* binding */ SSRDBAdapter)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! async-mutex */ "async-mutex");
-
 
 const MOCK_QUERY_RESPONSE = {
     rowsAffected: 0
@@ -5728,21 +5314,21 @@ class SSRDBAdapter extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseOb
     constructor() {
         super();
         this.name = 'SSR DB';
-        this.readMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
-        this.writeMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
+        this.readMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
+        this.writeMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
     }
     close() { }
     async readLock(fn, options) {
-        return this.readMutex.runExclusive(() => fn(this));
+        return this.readMutex.runExclusive(() => fn(this), (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.timeoutSignal)(options?.timeoutMs));
     }
     async readTransaction(fn, options) {
-        return this.readLock(() => fn(this.generateMockTransactionContext()));
+        return this.readLock(() => fn(this.generateMockTransactionContext()), options);
     }
     async writeLock(fn, options) {
-        return this.writeMutex.runExclusive(() => fn(this));
+        return this.writeMutex.runExclusive(() => fn(this), (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.timeoutSignal)(options?.timeoutMs));
     }
     async writeTransaction(fn, options) {
-        return this.writeLock(() => fn(this.generateMockTransactionContext()));
+        return this.writeLock(() => fn(this.generateMockTransactionContext()), options);
     }
     async execute(query, params) {
         return this.writeMutex.runExclusive(async () => MOCK_QUERY_RESPONSE);
@@ -5796,116 +5382,256 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ },
 
-/***/ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js"
-/*!*********************************************************************!*\
-  !*** ./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js ***!
-  \*********************************************************************/
+/***/ "./lib/src/db/adapters/wa-sqlite/ConcurrentConnection.js"
+/*!***************************************************************!*\
+  !*** ./lib/src/db/adapters/wa-sqlite/ConcurrentConnection.js ***!
+  \***************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   WorkerWrappedAsyncDatabaseConnection: () => (/* binding */ WorkerWrappedAsyncDatabaseConnection)
+/* harmony export */   ConcurrentSqliteConnection: () => (/* binding */ ConcurrentSqliteConnection),
+/* harmony export */   ConnectionLeaseToken: () => (/* binding */ ConnectionLeaseToken)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "comlink");
-
 
 /**
- * Wraps a provided instance of {@link AsyncDatabaseConnection}, providing necessary proxy
- * functions for worker listeners.
+ * A wrapper around a {@link RawSqliteConnection} allowing multiple tabs to access it.
+ *
+ * To allow potentially concurrent accesses from different clients, this requires a local mutex implementation here.
+ *
+ * Note that instances of this class are not safe to proxy across context boundaries with comlink! We need to be able to
+ * rely on mutexes being returned reliably, so additional checks to detect say a client tab closing are required to
+ * avoid deadlocks.
  */
-class WorkerWrappedAsyncDatabaseConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
-    options;
-    lockAbortController = new AbortController();
-    notifyRemoteClosed;
-    constructor(options) {
-        super();
-        this.options = options;
-        if (options.remoteCanCloseUnexpectedly) {
-            this.notifyRemoteClosed = new AbortController();
-        }
-    }
-    get baseConnection() {
-        return this.options.baseConnection;
-    }
-    init() {
-        return this.baseConnection.init();
-    }
+class ConcurrentSqliteConnection {
+    inner;
     /**
-     * Marks the remote as closed.
+     * An outer mutex ensuring at most one {@link ConnectionLeaseToken} can exist for this connection at a time.
      *
-     * This can sometimes happen outside of our control, e.g. when a shared worker requests a connection from a tab. When
-     * it happens, all methods on the {@link baseConnection} would never resolve. To avoid livelocks in this scenario, we
-     * throw on all outstanding promises and forbid new calls.
+     * If null, we'll use navigator locks instead.
      */
-    markRemoteClosed() {
-        // Can non-null assert here because this function is only supposed to be called when remoteCanCloseUnexpectedly was
-        // set.
-        this.notifyRemoteClosed.abort();
+    leaseMutex;
+    /**
+     * @param needsNavigatorLocks Whether access to the database needs an additional navigator lock guard.
+     *
+     * While {@link ConcurrentSqliteConnection} prevents concurrent access to a database _connection_, it's possible we
+     * might have multiple connections to the same physical database (e.g. if multiple tabs use dedicated workers).
+     * In those setups, we use navigator locks instead of an internal mutex to guard access..
+     */
+    constructor(inner, needsNavigatorLocks) {
+        this.inner = inner;
+        this.leaseMutex = needsNavigatorLocks ? null : new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
+    }
+    get options() {
+        return this.inner.options;
     }
-    markHold() {
-        return this.withRemote(() => this.baseConnection.markHold());
+    acquireMutex(abort) {
+        if (this.leaseMutex) {
+            return this.leaseMutex.acquire(abort);
+        }
+        return new Promise((resolve, reject) => {
+            const options = { signal: abort };
+            navigator.locks
+                .request(`db-lock-${this.options.dbFilename}`, options, (_) => {
+                return new Promise((returnLock) => {
+                    return resolve(() => {
+                        returnLock();
+                    });
+                });
+            })
+                .catch(reject);
+        });
     }
-    releaseHold(holdId) {
-        return this.withRemote(() => this.baseConnection.releaseHold(holdId));
+    // Unsafe, unguarded access to the SQLite connection.
+    unsafeUseInner() {
+        return this.inner;
     }
-    isAutoCommit() {
-        return this.withRemote(() => this.baseConnection.isAutoCommit());
-    }
-    withRemote(workerPromise, fireActionOnAbort = false) {
-        const controller = this.notifyRemoteClosed;
-        if (controller) {
-            return new Promise((resolve, reject) => {
-                if (controller.signal.aborted) {
-                    reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Called operation on closed remote'));
-                    if (!fireActionOnAbort) {
-                        // Don't run the operation if we're going to reject
-                        // We might want to fire-and-forget the operation in some cases (like a close operation)
-                        return;
-                    }
-                }
-                function handleAbort() {
-                    reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Remote peer closed with request in flight'));
-                }
-                function completePromise(action) {
-                    controller.signal.removeEventListener('abort', handleAbort);
-                    action();
-                }
-                controller.signal.addEventListener('abort', handleAbort);
-                workerPromise()
-                    .then((data) => completePromise(() => resolve(data)))
-                    .catch((e) => completePromise(() => reject(e)));
-            });
+    /**
+     * @returns A {@link ConnectionLeaseToken}. Until that token is returned, no other client can use the database.
+     */
+    async acquireConnection(abort) {
+        const returnMutex = await this.acquireMutex(abort);
+        const token = new ConnectionLeaseToken(returnMutex, this.inner);
+        try {
+            // Assert that the inner connection is initialized at this point, fail early if it's not.
+            this.inner.requireSqlite();
+            // If a previous client was interrupted in the middle of a transaction AND this is a shared worker, it's possible
+            // for the connection to still be in a transaction. To avoid inconsistent state, we roll back connection leases
+            // that haven't been comitted.
+            if (!this.inner.isAutoCommit()) {
+                await this.inner.executeRaw('ROLLBACK');
+            }
         }
-        else {
-            // Can't close, so just return the inner worker promise unguarded.
-            return workerPromise();
+        catch (e) {
+            returnMutex();
+            throw e;
+        }
+        return token;
+    }
+    async close() {
+        const returnMutex = await this.acquireMutex();
+        try {
+            await this.inner.close();
+        }
+        finally {
+            returnMutex();
         }
     }
+}
+/**
+ * An instance representing temporary exclusive access to a {@link ConcurrentSqliteConnection}.
+ */
+class ConnectionLeaseToken {
+    returnMutex;
+    connection;
+    /** Ensures that the client with access to this token can't run statements concurrently. */
+    useMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
+    closed = false;
+    constructor(returnMutex, connection) {
+        this.returnMutex = returnMutex;
+        this.connection = connection;
+    }
     /**
-     * Get a MessagePort which can be used to share the internals of this connection.
+     * Returns this lease, allowing another client to use the database connection.
      */
-    async shareConnection() {
-        const { identifier, remote } = this.options;
-        /**
-         * Hold a navigator lock in order to avoid features such as Chrome's frozen tabs,
-         * or Edge's sleeping tabs from pausing the thread for this connection.
-         * This promise resolves once a lock is obtained.
+    async returnLease() {
+        await this.useMutex.runExclusive(async () => {
+            if (!this.closed) {
+                this.closed = true;
+                this.returnMutex();
+            }
+        });
+    }
+    /**
+     * This should only be used internally, since the callback must not use the raw connection after resolving.
+     */
+    async use(callback) {
+        return await this.useMutex.runExclusive(async () => {
+            if (this.closed) {
+                throw new Error('lease token has already been closed');
+            }
+            return await callback(this.connection);
+        });
+    }
+}
+
+
+/***/ },
+
+/***/ "./lib/src/db/adapters/wa-sqlite/DatabaseClient.js"
+/*!*********************************************************!*\
+  !*** ./lib/src/db/adapters/wa-sqlite/DatabaseClient.js ***!
+  \*********************************************************/
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   DatabaseClient: () => (/* binding */ DatabaseClient)
+/* harmony export */ });
+/* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "comlink");
+
+
+/**
+ * A single-connection {@link ConnectionPool} implementation based on a worker connection.
+ */
+class DatabaseClient extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
+    options;
+    config;
+    #connection;
+    #shareConnectionAbortController = new AbortController();
+    #receiveTableUpdates;
+    constructor(options, config) {
+        super();
+        this.options = options;
+        this.config = config;
+        this.#connection = {
+            connection: options.connection,
+            notifyRemoteClosed: options.remoteCanCloseUnexpectedly ? new AbortController() : undefined,
+            traceQueries: config.debugMode === true
+        };
+        const { port1, port2 } = new MessageChannel();
+        options.connection.setUpdateListener(comlink__WEBPACK_IMPORTED_MODULE_1__.transfer(port1, [port1]));
+        this.#receiveTableUpdates = port2;
+        port2.onmessage = (event) => {
+            const tables = event.data;
+            const notification = {
+                tables,
+                groupedUpdates: {},
+                rawUpdates: []
+            };
+            this.iterateListeners((l) => {
+                l.tablesUpdated && l.tablesUpdated(notification);
+            });
+        };
+    }
+    get name() {
+        return this.config.dbFilename;
+    }
+    /**
+     * Marks the remote as closed.
+     *
+     * This can sometimes happen outside of our control, e.g. when a shared worker requests a connection from a tab. When
+     * it happens, all outstanding requests on this pool would never resolve. To avoid livelocks in this scenario, we
+     * throw on all outstanding promises and forbid new calls.
+     */
+    markRemoteClosed() {
+        // Can non-null assert here because this function is only supposed to be called when remoteCanCloseUnexpectedly was
+        // set.
+        this.#connection.notifyRemoteClosed.abort();
+    }
+    async close() {
+        // This connection is no longer shared, so we can close locks held for shareConnection calls.
+        this.#shareConnectionAbortController.abort();
+        this.#receiveTableUpdates.close();
+        await useConnectionState(this.#connection, (c) => c.close(), true);
+        this.options.onClose?.();
+        this.options.source?.[comlink__WEBPACK_IMPORTED_MODULE_1__.releaseProxy]();
+    }
+    readLock(fn, options) {
+        return this.#lock(false, fn, options);
+    }
+    writeLock(fn, options) {
+        return this.#lock(true, fn, options);
+    }
+    async #lock(write, fn, options) {
+        const token = await useConnectionState(this.#connection, (c) => c.requestAccess(write, options?.timeoutMs));
+        try {
+            return await fn(new ClientLockContext(this.#connection, token));
+        }
+        finally {
+            await useConnectionState(this.#connection, (c) => c.completeAccess(token));
+        }
+    }
+    async refreshSchema() {
+        // Currently a no-op on the web.
+    }
+    async shareConnection() {
+        /**
+         * Hold a navigator lock in order to avoid features such as Chrome's frozen tabs,
+         * or Edge's sleeping tabs from pausing the thread for this connection.
+         * This promise resolves once a lock is obtained.
          * This lock will be held as long as this connection is open.
          * The `shareConnection` method should not be called on multiple tabs concurrently.
          */
+        const abort = this.#shareConnectionAbortController;
+        const source = this.options.source;
+        if (source == null) {
+            throw new Error(`shareConnection() is only available for connections based by workers.`);
+        }
         await new Promise((resolve, reject) => navigator.locks
-            .request(`shared-connection-${this.options.identifier}-${Date.now()}-${Math.round(Math.random() * 10000)}`, {
-            signal: this.lockAbortController.signal
+            .request(`shared-connection-${this.name}-${Date.now()}-${Math.round(Math.random() * 10000)}`, {
+            signal: abort.signal
         }, async () => {
             resolve();
             // Free the lock when the connection is already closed.
-            if (this.lockAbortController.signal.aborted) {
+            if (abort.signal.aborted) {
                 return;
             }
             // Hold the lock while the shared connection is in use.
             await new Promise((releaseLock) => {
-                this.lockAbortController.signal.addEventListener('abort', () => {
+                abort.signal.addEventListener('abort', () => {
                     releaseLock();
                 });
             });
@@ -5919,280 +5645,335 @@ class WorkerWrappedAsyncDatabaseConnection extends _powersync_common__WEBPACK_IM
                 reject(ex);
             }
         }));
-        const newPort = await remote[comlink__WEBPACK_IMPORTED_MODULE_1__.createEndpoint]();
-        return { port: newPort, identifier };
+        const newPort = await source[comlink__WEBPACK_IMPORTED_MODULE_1__.createEndpoint]();
+        return { port: newPort, identifier: this.name };
+    }
+    getConfiguration() {
+        return this.config;
+    }
+}
+/**
+ * A {@link SqlExecutor} implemented by sending commands to a worker.
+ *
+ * While an instance is active, it has exclusive access to the underlying database connection (as represented by its
+ * token).
+ */
+class ClientSqlExecutor {
+    #connection;
+    #token;
+    constructor(connection, token) {
+        this.#connection = connection;
+        this.#token = token;
     }
     /**
-     * Registers a table change notification callback with the base database.
-     * This can be extended by custom implementations in order to handle proxy events.
+     * Requests an operation from the worker, potentially tracing it if that option has been enabled.
      */
-    async registerOnTableChange(callback) {
-        return this.baseConnection.registerOnTableChange(comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(callback));
-    }
-    async close() {
-        // Abort any pending lock requests.
-        this.lockAbortController.abort();
-        try {
-            // fire and forget the close operation
-            await this.withRemote(() => this.baseConnection.close(), true);
+    async maybeTrace(fn, describeForTrace) {
+        if (this.#connection.traceQueries) {
+            const start = performance.now();
+            const description = describeForTrace();
+            try {
+                const r = await useConnectionState(this.#connection, fn);
+                performance.measure(`[SQL] ${description}`, { start });
+                return r;
+            }
+            catch (e) {
+                performance.measure(`[SQL] [ERROR: ${e.message}] ${description}`, { start });
+                throw e;
+            }
         }
-        finally {
-            this.options.remote[comlink__WEBPACK_IMPORTED_MODULE_1__.releaseProxy]();
-            this.options.onClose?.();
-            this.iterateListeners((l) => l.closing?.());
+        else {
+            return useConnectionState(this.#connection, fn);
+        }
+    }
+    async execute(query, params) {
+        const rs = await this.#executeOnWorker(query, params);
+        let rows;
+        if (rs.resultSet) {
+            const resultSet = rs.resultSet;
+            function rowToJavaScriptObject(row) {
+                const obj = {};
+                resultSet.columns.forEach((key, idx) => (obj[key] = row[idx]));
+                return obj;
+            }
+            const mapped = resultSet.rows.map(rowToJavaScriptObject);
+            rows = {
+                _array: mapped,
+                length: mapped.length,
+                item: (idx) => mapped[idx]
+            };
         }
+        return {
+            rowsAffected: rs.changes,
+            insertId: rs.lastInsertRowId,
+            rows
+        };
     }
-    execute(sql, params) {
-        return this.withRemote(() => this.baseConnection.execute(sql, params));
+    async executeRaw(query, params) {
+        const rs = await this.#executeOnWorker(query, params);
+        return rs.resultSet?.rows ?? [];
     }
-    executeRaw(sql, params) {
-        return this.withRemote(() => this.baseConnection.executeRaw(sql, params));
+    async #executeOnWorker(query, params) {
+        return this.maybeTrace((c) => c.execute(this.#token, query, params), () => query);
     }
-    executeBatch(sql, params) {
-        return this.withRemote(() => this.baseConnection.executeBatch(sql, params));
+    async executeBatch(query, params = []) {
+        const results = await this.maybeTrace((c) => c.executeBatch(this.#token, query, params), () => `${query} (batch of ${params.length})`);
+        const result = { insertId: undefined, rowsAffected: 0 };
+        for (const source of results) {
+            result.insertId = source.lastInsertRowId;
+            result.rowsAffected += source.changes;
+        }
+        return result;
+    }
+}
+class ClientLockContext extends (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.DBGetUtilsDefaultMixin)(ClientSqlExecutor) {
+}
+async function useConnectionState(state, workerPromise, fireActionOnAbort = false) {
+    const controller = state.notifyRemoteClosed;
+    if (controller) {
+        return new Promise((resolve, reject) => {
+            if (controller.signal.aborted) {
+                reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Called operation on closed remote'));
+                if (!fireActionOnAbort) {
+                    // Don't run the operation if we're going to reject
+                    // We might want to fire-and-forget the operation in some cases (like a close operation)
+                    return;
+                }
+            }
+            function handleAbort() {
+                reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Remote peer closed with request in flight'));
+            }
+            function completePromise(action) {
+                controller.signal.removeEventListener('abort', handleAbort);
+                action();
+            }
+            controller.signal.addEventListener('abort', handleAbort);
+            workerPromise(state.connection)
+                .then((data) => completePromise(() => resolve(data)))
+                .catch((e) => completePromise(() => reject(e)));
+        });
     }
-    getConfig() {
-        return this.withRemote(() => this.baseConnection.getConfig());
+    else {
+        // Can't close, so just return the inner worker promise unguarded.
+        return workerPromise(state.connection);
     }
 }
 
 
 /***/ },
 
-/***/ "./lib/src/db/adapters/wa-sqlite/InternalWASQLiteDBAdapter.js"
-/*!********************************************************************!*\
-  !*** ./lib/src/db/adapters/wa-sqlite/InternalWASQLiteDBAdapter.js ***!
-  \********************************************************************/
+/***/ "./lib/src/db/adapters/wa-sqlite/DatabaseServer.js"
+/*!*********************************************************!*\
+  !*** ./lib/src/db/adapters/wa-sqlite/DatabaseServer.js ***!
+  \*********************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   InternalWASQLiteDBAdapter: () => (/* binding */ InternalWASQLiteDBAdapter)
+/* harmony export */   DatabaseServer: () => (/* binding */ DatabaseServer)
 /* harmony export */ });
-/* harmony import */ var _LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../LockedAsyncDatabaseAdapter.js */ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js");
-/* harmony import */ var _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./WASQLiteConnection.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
-
-
 /**
- * @internal
- * An intermediary implementation of WASQLiteDBAdapter, which takes the same
- * constructor arguments as {@link LockedAsyncDatabaseAdapter}, but provides some
- * basic WA-SQLite specific functionality.
- * This base class is used to avoid requiring overloading the constructor of {@link WASQLiteDBAdapter}
+ * Access to a WA-sqlite connection that can be shared with multiple clients sending queries over an RPC protocol built
+ * with the Comlink package.
  */
-class InternalWASQLiteDBAdapter extends _LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_0__.LockedAsyncDatabaseAdapter {
-    getConfiguration() {
-        // This is valid since we only handle WASQLite connections
-        const baseConfig = super.getConfiguration();
+class DatabaseServer {
+    #options;
+    #nextClientId = 0;
+    #activeClients = new Set();
+    // TODO: Don't use a broadcast channel for connections managed by a shared worker.
+    #updateBroadcastChannel;
+    #clientTableListeners = new Set();
+    constructor(options) {
+        this.#options = options;
+        const inner = options.inner;
+        this.#updateBroadcastChannel = new BroadcastChannel(`${inner.options.dbFilename}-table-updates`);
+        this.#updateBroadcastChannel.onmessage = ({ data }) => {
+            this.#pushTableUpdateToClients(data);
+        };
+    }
+    #pushTableUpdateToClients(changedTables) {
+        for (const listener of this.#clientTableListeners) {
+            listener.postMessage(changedTables);
+        }
+    }
+    get #inner() {
+        return this.#options.inner;
+    }
+    get #logger() {
+        return this.#options.logger;
+    }
+    /**
+     * Called by clients when they wish to connect to this database.
+     *
+     * @param lockName A lock that is currently held by the client. When the lock is returned, we know the client is gone
+     * and that we need to clean up resources.
+     */
+    async connect(lockName) {
+        let isOpen = true;
+        const clientId = this.#nextClientId++;
+        this.#activeClients.add(clientId);
+        let connectionLeases = new Map();
+        let currentTableListener;
+        function requireOpen() {
+            if (!isOpen) {
+                throw new Error('Client has already been closed');
+            }
+        }
+        function requireOpenAndLease(lease) {
+            requireOpen();
+            const token = connectionLeases.get(lease);
+            if (!token) {
+                throw new Error('Attempted to use a connection lease that has already been returned.');
+            }
+            return token;
+        }
+        const close = async () => {
+            if (isOpen) {
+                isOpen = false;
+                if (currentTableListener) {
+                    this.#clientTableListeners.delete(currentTableListener);
+                }
+                // If the client holds a connection lease it hasn't returned, return that now.
+                for (const { lease } of connectionLeases.values()) {
+                    this.#logger.debug(`Closing connection lease that hasn't been returned.`);
+                    await lease.returnLease();
+                }
+                this.#activeClients.delete(clientId);
+                if (this.#activeClients.size == 0) {
+                    await this.forceClose();
+                }
+                else {
+                    this.#logger.debug('Keeping underlying connection active since its used by other clients.');
+                }
+            }
+        };
+        if (lockName) {
+            navigator.locks.request(lockName, {}, () => {
+                close();
+            });
+        }
         return {
-            ...super.getConfiguration(),
-            requiresPersistentTriggers: baseConfig.vfs == _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.OPFSCoopSyncVFS || baseConfig.vfs == _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.AccessHandlePoolVFS
+            close,
+            debugIsAutoCommit: async () => {
+                return this.#inner.unsafeUseInner().isAutoCommit();
+            },
+            requestAccess: async (write, timeoutMs) => {
+                requireOpen();
+                // TODO: Support timeouts, they don't seem to be supported by the async-mutex package.
+                const lease = await this.#inner.acquireConnection();
+                if (!isOpen) {
+                    // Race between requestAccess and close(), the connection was closed while we tried to acquire a lease.
+                    await lease.returnLease();
+                    return requireOpen();
+                }
+                const token = crypto.randomUUID();
+                connectionLeases.set(token, { lease, write });
+                return token;
+            },
+            completeAccess: async (token) => {
+                const lease = requireOpenAndLease(token);
+                connectionLeases.delete(token);
+                try {
+                    if (lease.write) {
+                        // Collect update hooks invoked while the client had the write connection.
+                        const { resultSet } = await lease.lease.use((conn) => conn.execute(`SELECT powersync_update_hooks('get')`));
+                        if (resultSet) {
+                            const updatedTables = JSON.parse(resultSet.rows[0][0]);
+                            if (updatedTables.length) {
+                                this.#updateBroadcastChannel.postMessage(updatedTables);
+                                this.#pushTableUpdateToClients(updatedTables);
+                            }
+                        }
+                    }
+                }
+                finally {
+                    await lease.lease.returnLease();
+                }
+            },
+            execute: async (token, sql, params) => {
+                const { lease } = requireOpenAndLease(token);
+                return await lease.use((db) => db.execute(sql, params));
+            },
+            executeBatch: async (token, sql, params) => {
+                const { lease } = requireOpenAndLease(token);
+                return await lease.use((db) => db.executeBatch(sql, params));
+            },
+            setUpdateListener: async (listener) => {
+                requireOpen();
+                if (currentTableListener) {
+                    this.#clientTableListeners.delete(currentTableListener);
+                }
+                currentTableListener = listener;
+                if (listener) {
+                    this.#clientTableListeners.add(listener);
+                }
+            }
         };
     }
+    async forceClose() {
+        this.#logger.debug(`Closing connection to ${this.#inner.options}.`);
+        const connection = this.#inner;
+        this.#options.onClose();
+        this.#updateBroadcastChannel.close();
+        await connection.close();
+    }
 }
 
 
 /***/ },
 
-/***/ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js"
-/*!*************************************************************!*\
-  !*** ./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js ***!
-  \*************************************************************/
+/***/ "./lib/src/db/adapters/wa-sqlite/RawSqliteConnection.js"
+/*!**************************************************************!*\
+  !*** ./lib/src/db/adapters/wa-sqlite/RawSqliteConnection.js ***!
+  \**************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   AsyncWASQLiteModuleFactory: () => (/* binding */ AsyncWASQLiteModuleFactory),
-/* harmony export */   DEFAULT_MODULE_FACTORIES: () => (/* binding */ DEFAULT_MODULE_FACTORIES),
-/* harmony export */   MultiCipherAsyncWASQLiteModuleFactory: () => (/* binding */ MultiCipherAsyncWASQLiteModuleFactory),
-/* harmony export */   MultiCipherSyncWASQLiteModuleFactory: () => (/* binding */ MultiCipherSyncWASQLiteModuleFactory),
-/* harmony export */   SyncWASQLiteModuleFactory: () => (/* binding */ SyncWASQLiteModuleFactory),
-/* harmony export */   WASQLiteVFS: () => (/* binding */ WASQLiteVFS),
-/* harmony export */   WASqliteConnection: () => (/* binding */ WASqliteConnection)
+/* harmony export */   RawSqliteConnection: () => (/* binding */ RawSqliteConnection)
 /* harmony export */ });
 /* harmony import */ var _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @journeyapps/wa-sqlite */ "@journeyapps/wa-sqlite");
-/* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! async-mutex */ "async-mutex");
-
+/* harmony import */ var _vfs_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vfs.js */ "./lib/src/db/adapters/wa-sqlite/vfs.js");
 
 
 /**
- * List of currently tested virtual filesystems
- */
-var WASQLiteVFS;
-(function (WASQLiteVFS) {
-    WASQLiteVFS["IDBBatchAtomicVFS"] = "IDBBatchAtomicVFS";
-    WASQLiteVFS["OPFSCoopSyncVFS"] = "OPFSCoopSyncVFS";
-    WASQLiteVFS["AccessHandlePoolVFS"] = "AccessHandlePoolVFS";
-})(WASQLiteVFS || (WASQLiteVFS = {}));
-/**
- * @internal
- */
-const AsyncWASQLiteModuleFactory = async () => {
-    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs"));
-    return factory();
-};
-/**
- * @internal
- */
-const MultiCipherAsyncWASQLiteModuleFactory = async () => {
-    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/mc-wa-sqlite-async.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/mc-wa-sqlite-async.mjs"));
-    return factory();
-};
-/**
- * @internal
- */
-const SyncWASQLiteModuleFactory = async () => {
-    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/wa-sqlite.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/wa-sqlite.mjs"));
-    return factory();
-};
-/**
- * @internal
- */
-const MultiCipherSyncWASQLiteModuleFactory = async () => {
-    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/mc-wa-sqlite.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/mc-wa-sqlite.mjs"));
-    return factory();
-};
-/**
- * @internal
- */
-const DEFAULT_MODULE_FACTORIES = {
-    [WASQLiteVFS.IDBBatchAtomicVFS]: async (options) => {
-        let module;
-        if (options.encryptionKey) {
-            module = await MultiCipherAsyncWASQLiteModuleFactory();
-        }
-        else {
-            module = await AsyncWASQLiteModuleFactory();
-        }
-        const { IDBBatchAtomicVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js */ "@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js", 19));
-        return {
-            module,
-            // @ts-expect-error The types for this static method are missing upstream
-            vfs: await IDBBatchAtomicVFS.create(options.dbFileName, module, { lockPolicy: 'exclusive' })
-        };
-    },
-    [WASQLiteVFS.AccessHandlePoolVFS]: async (options) => {
-        let module;
-        if (options.encryptionKey) {
-            module = await MultiCipherSyncWASQLiteModuleFactory();
-        }
-        else {
-            module = await SyncWASQLiteModuleFactory();
-        }
-        // @ts-expect-error The types for this static method are missing upstream
-        const { AccessHandlePoolVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js */ "@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js", 19));
-        return {
-            module,
-            vfs: await AccessHandlePoolVFS.create(options.dbFileName, module)
-        };
-    },
-    [WASQLiteVFS.OPFSCoopSyncVFS]: async (options) => {
-        let module;
-        if (options.encryptionKey) {
-            module = await MultiCipherSyncWASQLiteModuleFactory();
-        }
-        else {
-            module = await SyncWASQLiteModuleFactory();
-        }
-        // @ts-expect-error The types for this static method are missing upstream
-        const { OPFSCoopSyncVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js */ "@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js", 19));
-        const vfs = await OPFSCoopSyncVFS.create(options.dbFileName, module);
-        return {
-            module,
-            vfs
-        };
-    }
-};
-/**
- * @internal
- * WA-SQLite connection which directly interfaces with WA-SQLite.
- * This is usually instantiated inside a worker.
+ * A small wrapper around WA-sqlite to help with opening databases and running statements by preparing them internally.
+ *
+ * This is an internal class, and it must never be used directly. Wrappers are required to ensure raw connections aren't
+ * used concurrently across tabs.
  */
-class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.BaseObserver {
+class RawSqliteConnection {
     options;
     _sqliteAPI = null;
-    _dbP = null;
-    _moduleFactory;
-    updatedTables;
-    updateTimer;
-    statementMutex;
-    broadcastChannel;
     /**
-     * Unique id for this specific connection. This is used to prevent broadcast table change
-     * notification loops.
+     * The `sqlite3*` connection pointer.
      */
-    connectionId;
-    _holdCounter;
-    _holdId;
+    db = 0;
+    _moduleFactory;
     constructor(options) {
-        super();
         this.options = options;
-        this.updatedTables = new Set();
-        this.updateTimer = null;
-        this.broadcastChannel = null;
-        this.connectionId = new Date().valueOf() + Math.random();
-        this.statementMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_2__.Mutex();
-        this._moduleFactory = DEFAULT_MODULE_FACTORIES[this.options.vfs];
-        this._holdCounter = 0;
-        this._holdId = null;
+        this._moduleFactory = _vfs_js__WEBPACK_IMPORTED_MODULE_1__.DEFAULT_MODULE_FACTORIES[this.options.vfs];
     }
-    /**
-     * Gets the id for the current hold.
-     * This can be used to check for invalid states.
-     */
-    get currentHoldId() {
-        return this._holdId;
+    get isOpen() {
+        return this.db != 0;
     }
-    get sqliteAPI() {
-        if (!this._sqliteAPI) {
-            throw new Error(`Initialization has not completed`);
-        }
-        return this._sqliteAPI;
-    }
-    get dbP() {
-        if (!this._dbP) {
-            throw new Error(`Initialization has not completed`);
-        }
-        return this._dbP;
-    }
-    /**
-     * Checks if the database connection is in autocommit mode.
-     * @returns true if in autocommit mode, false if in a transaction
-     */
-    async isAutoCommit() {
-        return this.sqliteAPI.get_autocommit(this.dbP) != 0;
-    }
-    async markHold() {
-        const previousHoldId = this._holdId;
-        this._holdId = `${++this._holdCounter}`;
-        if (previousHoldId) {
-            await this.iterateAsyncListeners(async (cb) => cb.holdOverwritten?.(previousHoldId));
-        }
-        return this._holdId;
-    }
-    async releaseHold(holdId) {
-        if (holdId != this._holdId) {
-            throw new Error(`Invalid hold state, expected ${this._holdId} but got ${holdId}`);
-        }
-        this._holdId = null;
-    }
-    async openDB() {
-        this._dbP = await this.sqliteAPI.open_v2(this.options.dbFilename);
-        return this._dbP;
-    }
-    async executeEncryptionPragma() {
+    async init() {
+        const api = (this._sqliteAPI = await this.openSQLiteAPI());
+        this.db = await api.open_v2(this.options.dbFilename);
+        await this.executeRaw(`PRAGMA temp_store = ${this.options.temporaryStorage};`);
         if (this.options.encryptionKey) {
-            await this.executeSingleStatement(`PRAGMA key = "${this.options.encryptionKey}"`);
+            const escapedKey = this.options.encryptionKey.replace("'", "''");
+            await this.executeRaw(`PRAGMA key = '${escapedKey}'`);
         }
-        return;
+        await this.executeRaw(`PRAGMA cache_size = -${this.options.cacheSizeKb};`);
+        await this.executeRaw(`SELECT powersync_update_hooks('install');`);
     }
     async openSQLiteAPI() {
         const { module, vfs } = await this._moduleFactory({
             dbFileName: this.options.dbFilename,
             encryptionKey: this.options.encryptionKey
         });
-        const sqlite3 = _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__.Factory(module);
+        const sqlite3 = (0,_journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__.Factory)(module);
         sqlite3.vfs_register(vfs, true);
         /**
          * Register the PowerSync core SQLite extension
@@ -6209,278 +5990,95 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
         }
         return sqlite3;
     }
-    registerBroadcastListeners() {
-        this.broadcastChannel = new BroadcastChannel(`${this.options.dbFilename}-table-updates`);
-        this.broadcastChannel.addEventListener('message', (event) => {
-            const data = event.data;
-            if (this.connectionId == data.connectionId) {
-                // Ignore messages from the same connection
-                return;
-            }
-            // Ensuring that we don't rebroadcast the same message
-            this.queueTableUpdate(data.changedTables, false);
-        });
-    }
-    queueTableUpdate(tableNames, shouldBroadcast = true) {
-        tableNames.forEach((tableName) => this.updatedTables.add(tableName));
-        if (this.updateTimer == null) {
-            this.updateTimer = setTimeout(() => this.fireUpdates(shouldBroadcast), 0);
-        }
-    }
-    async init() {
-        this._sqliteAPI = await this.openSQLiteAPI();
-        await this.openDB();
-        this.registerBroadcastListeners();
-        await this.executeSingleStatement(`PRAGMA temp_store = ${this.options.temporaryStorage};`);
-        await this.executeEncryptionPragma();
-        await this.executeSingleStatement(`PRAGMA cache_size = -${this.options.cacheSizeKb};`);
-        this.sqliteAPI.update_hook(this.dbP, (updateType, dbName, tableName) => {
-            if (!tableName) {
-                return;
-            }
-            const changedTables = new Set([tableName]);
-            this.queueTableUpdate(changedTables);
-        });
-    }
-    async getConfig() {
-        return this.options;
-    }
-    fireUpdates(shouldBroadcast = true) {
-        this.updateTimer = null;
-        const event = { tables: [...this.updatedTables], groupedUpdates: {}, rawUpdates: [] };
-        // Share to other connections
-        if (shouldBroadcast) {
-            this.broadcastChannel.postMessage({
-                changedTables: this.updatedTables,
-                connectionId: this.connectionId
-            });
+    requireSqlite() {
+        if (!this._sqliteAPI) {
+            throw new Error(`Initialization has not completed`);
         }
-        this.updatedTables.clear();
-        this.iterateListeners((cb) => cb.tablesUpdated?.(event));
+        return this._sqliteAPI;
     }
     /**
-     * This executes SQL statements in a batch.
+     * Checks if the database connection is in autocommit mode.
+     * @returns true if in autocommit mode, false if in a transaction
      */
-    async executeBatch(sql, bindings) {
-        return this.acquireExecuteLock(async () => {
-            let affectedRows = 0;
-            try {
-                await this.executeSingleStatement('BEGIN TRANSACTION');
-                const wrappedBindings = bindings ? bindings : [];
-                for await (const stmt of this.sqliteAPI.statements(this.dbP, sql)) {
-                    if (stmt === null) {
-                        return {
-                            rowsAffected: 0,
-                            rows: { _array: [], length: 0 }
-                        };
-                    }
-                    //Prepare statement once
-                    for (const binding of wrappedBindings) {
-                        // TODO not sure why this is needed currently, but booleans break
-                        for (let i = 0; i < binding.length; i++) {
-                            const b = binding[i];
-                            if (typeof b == 'boolean') {
-                                binding[i] = b ? 1 : 0;
-                            }
-                        }
-                        if (bindings) {
-                            this.sqliteAPI.bind_collection(stmt, binding);
-                        }
-                        const result = await this.sqliteAPI.step(stmt);
-                        if (result === _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__.SQLITE_DONE) {
-                            //The value returned by sqlite3_changes() immediately after an INSERT, UPDATE or DELETE statement run on a view is always zero.
-                            affectedRows += this.sqliteAPI.changes(this.dbP);
-                        }
-                        this.sqliteAPI.reset(stmt);
-                    }
-                }
-                await this.executeSingleStatement('COMMIT');
-            }
-            catch (err) {
-                await this.executeSingleStatement('ROLLBACK');
-                return {
-                    rowsAffected: 0,
-                    rows: { _array: [], length: 0 }
-                };
-            }
-            const result = {
-                rowsAffected: affectedRows,
-                rows: { _array: [], length: 0 }
-            };
-            return result;
-        });
+    isAutoCommit() {
+        return this.requireSqlite().get_autocommit(this.db) != 0;
     }
-    /**
-     * This executes single SQL statements inside a requested lock.
-     */
     async execute(sql, bindings) {
-        // Running multiple statements on the same connection concurrently should not be allowed
-        return this.acquireExecuteLock(async () => {
-            return this.executeSingleStatement(sql, bindings);
-        });
-    }
-    async executeRaw(sql, bindings) {
-        return this.acquireExecuteLock(async () => {
-            return this.executeSingleStatementRaw(sql, bindings);
-        });
-    }
-    async close() {
-        this.broadcastChannel?.close();
-        await this.acquireExecuteLock(async () => {
-            /**
-             * Running the close operation inside the same execute mutex prevents errors like:
-             * ```
-             * unable to close due to unfinalized statements or unfinished backups
-             * ```
-             */
-            await this.sqliteAPI.close(this.dbP);
-        });
-    }
-    async registerOnTableChange(callback) {
-        return this.registerListener({
-            tablesUpdated: (event) => callback(event)
-        });
+        const resultSet = await this.executeSingleStatementRaw(sql, bindings);
+        return this.wrapQueryResults(this.requireSqlite(), resultSet);
     }
-    /**
-     * This requests a lock for executing statements.
-     * Should only be used internally.
-     */
-    acquireExecuteLock = (callback) => {
-        return this.statementMutex.runExclusive(callback);
-    };
-    /**
-     * This executes a single statement using SQLite3.
-     */
-    async executeSingleStatement(sql, bindings) {
-        const results = await this._execute(sql, bindings);
-        const rows = [];
-        for (const resultSet of results) {
-            for (const row of resultSet.rows) {
-                const outRow = {};
-                resultSet.columns.forEach((key, index) => {
-                    outRow[key] = row[index];
-                });
-                rows.push(outRow);
+    async executeBatch(sql, bindings) {
+        const results = [];
+        const api = this.requireSqlite();
+        for await (const stmt of api.statements(this.db, sql)) {
+            let columns;
+            for (const parameterSet of bindings) {
+                const rs = await this.stepThroughStatement(api, stmt, parameterSet, columns, false);
+                results.push(this.wrapQueryResults(api, rs));
             }
+            // executeBatch can only use a single statement
+            break;
         }
-        const result = {
-            insertId: this.sqliteAPI.last_insert_id(this.dbP),
-            rowsAffected: this.sqliteAPI.changes(this.dbP),
-            rows: {
-                _array: rows,
-                length: rows.length
-            }
+        return results;
+    }
+    wrapQueryResults(api, rs) {
+        return {
+            changes: api.changes(this.db),
+            lastInsertRowId: api.last_insert_id(this.db),
+            autocommit: api.get_autocommit(this.db) != 0,
+            resultSet: rs
         };
-        return result;
     }
     /**
-     * This executes a single statement using SQLite3 and returns the results as an array of arrays.
+     * This executes a single statement using SQLite3 and returns the results as a {@link RawResultSet}.
      */
     async executeSingleStatementRaw(sql, bindings) {
-        const results = await this._execute(sql, bindings);
-        return results.flatMap((resultset) => resultset.rows.map((row) => resultset.columns.map((_, index) => row[index])));
+        const results = await this.executeRaw(sql, bindings);
+        return results.length ? results[0] : undefined;
     }
-    async _execute(sql, bindings) {
+    async executeRaw(sql, bindings) {
         const results = [];
-        for await (const stmt of this.sqliteAPI.statements(this.dbP, sql)) {
+        const api = this.requireSqlite();
+        for await (const stmt of api.statements(this.db, sql)) {
             let columns;
-            const wrappedBindings = bindings ? [bindings] : [[]];
-            for (const binding of wrappedBindings) {
-                // TODO not sure why this is needed currently, but booleans break
-                binding.forEach((b, index, arr) => {
-                    if (typeof b == 'boolean') {
-                        arr[index] = b ? 1 : 0;
-                    }
-                });
-                this.sqliteAPI.reset(stmt);
-                if (bindings) {
-                    this.sqliteAPI.bind_collection(stmt, binding);
-                }
-                const rows = [];
-                while ((await this.sqliteAPI.step(stmt)) === _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__.SQLITE_ROW) {
-                    const row = this.sqliteAPI.row(stmt);
-                    rows.push(row);
-                }
-                columns = columns ?? this.sqliteAPI.column_names(stmt);
-                if (columns.length) {
-                    results.push({ columns, rows });
-                }
+            const rs = await this.stepThroughStatement(api, stmt, bindings ?? [], columns);
+            columns = rs.columns;
+            if (columns.length) {
+                results.push(rs);
             }
             // When binding parameters, only a single statement is executed.
             if (bindings) {
                 break;
-            }
-        }
-        return results;
-    }
-}
-
-
-/***/ },
-
-/***/ "./lib/src/db/adapters/wa-sqlite/WASQLiteDBAdapter.js"
-/*!************************************************************!*\
-  !*** ./lib/src/db/adapters/wa-sqlite/WASQLiteDBAdapter.js ***!
-  \************************************************************/
-(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   WASQLiteDBAdapter: () => (/* binding */ WASQLiteDBAdapter)
-/* harmony export */ });
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "comlink");
-/* harmony import */ var _PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../PowerSyncDatabase.js */ "./lib/src/db/PowerSyncDatabase.js");
-/* harmony import */ var _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-/* harmony import */ var _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../WorkerWrappedAsyncDatabaseConnection.js */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
-/* harmony import */ var _InternalWASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./InternalWASQLiteDBAdapter.js */ "./lib/src/db/adapters/wa-sqlite/InternalWASQLiteDBAdapter.js");
-/* harmony import */ var _WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./WASQLiteOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteOpenFactory.js");
-
-
-
-
-
-
-/**
- * Adapter for WA-SQLite SQLite connections.
- */
-class WASQLiteDBAdapter extends _InternalWASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_4__.InternalWASQLiteDBAdapter {
-    constructor(options) {
-        super({
-            name: options.dbFilename,
-            openConnection: async () => {
-                const { workerPort, temporaryStorage, cacheSizeKb } = options;
-                if (workerPort) {
-                    const remote = comlink__WEBPACK_IMPORTED_MODULE_0__.wrap(workerPort);
-                    return new _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_3__.WorkerWrappedAsyncDatabaseConnection({
-                        remote,
-                        remoteCanCloseUnexpectedly: false,
-                        identifier: options.dbFilename,
-                        baseConnection: await remote({
-                            ...options,
-                            temporaryStorage: temporaryStorage ?? _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__.TemporaryStorageOption.MEMORY,
-                            cacheSizeKb: cacheSizeKb ?? _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_2__.DEFAULT_CACHE_SIZE_KB,
-                            flags: (0,_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_1__.resolveWebPowerSyncFlags)(options.flags),
-                            encryptionKey: options.encryptionKey
-                        })
-                    });
-                }
-                const openFactory = new _WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__.WASQLiteOpenFactory({
-                    dbFilename: options.dbFilename,
-                    dbLocation: options.dbLocation,
-                    debugMode: options.debugMode,
-                    flags: options.flags,
-                    temporaryStorage,
-                    cacheSizeKb,
-                    logger: options.logger,
-                    vfs: options.vfs,
-                    encryptionKey: options.encryptionKey,
-                    worker: options.worker
-                });
-                return openFactory.openConnection();
-            },
-            debugMode: options.debugMode,
-            logger: options.logger
+            }
+        }
+        return results;
+    }
+    async stepThroughStatement(api, stmt, bindings, knownColumns, includeResults = true) {
+        // TODO not sure why this is needed currently, but booleans break
+        bindings.forEach((b, index, arr) => {
+            if (typeof b == 'boolean') {
+                arr[index] = b ? 1 : 0;
+            }
         });
+        api.reset(stmt);
+        if (bindings) {
+            api.bind_collection(stmt, bindings);
+        }
+        const rows = [];
+        while ((await api.step(stmt)) === _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__.SQLITE_ROW) {
+            if (includeResults) {
+                const row = api.row(stmt);
+                rows.push(row);
+            }
+        }
+        knownColumns ??= api.column_names(stmt);
+        return { columns: knownColumns, rows };
+    }
+    async close() {
+        if (this.isOpen) {
+            await this.requireSqlite().close(this.db);
+            this.db = 0;
+        }
     }
 }
 
@@ -6497,13 +6095,19 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   WASQLiteOpenFactory: () => (/* binding */ WASQLiteOpenFactory)
 /* harmony export */ });
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "comlink");
-/* harmony import */ var _worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../worker/db/open-worker-database.js */ "./lib/src/worker/db/open-worker-database.js");
-/* harmony import */ var _AbstractWebSQLOpenFactory_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../AbstractWebSQLOpenFactory.js */ "./lib/src/db/adapters/AbstractWebSQLOpenFactory.js");
-/* harmony import */ var _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../WorkerWrappedAsyncDatabaseConnection.js */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
-/* harmony import */ var _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-/* harmony import */ var _InternalWASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./InternalWASQLiteDBAdapter.js */ "./lib/src/db/adapters/wa-sqlite/InternalWASQLiteDBAdapter.js");
-/* harmony import */ var _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./WASQLiteConnection.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
+/* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "comlink");
+/* harmony import */ var _worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../worker/db/open-worker-database.js */ "./lib/src/worker/db/open-worker-database.js");
+/* harmony import */ var _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
+/* harmony import */ var _SSRDBAdapter_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../SSRDBAdapter.js */ "./lib/src/db/adapters/SSRDBAdapter.js");
+/* harmony import */ var _vfs_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./vfs.js */ "./lib/src/db/adapters/wa-sqlite/vfs.js");
+/* harmony import */ var _worker_db_MultiDatabaseServer_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../../worker/db/MultiDatabaseServer.js */ "./lib/src/worker/db/MultiDatabaseServer.js");
+/* harmony import */ var _DatabaseClient_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./DatabaseClient.js */ "./lib/src/db/adapters/wa-sqlite/DatabaseClient.js");
+/* harmony import */ var _shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../shared/tab_close_signal.js */ "./lib/src/shared/tab_close_signal.js");
+/* harmony import */ var _AsyncWebAdapter_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../AsyncWebAdapter.js */ "./lib/src/db/adapters/AsyncWebAdapter.js");
+
+
+
 
 
 
@@ -6514,56 +6118,82 @@ __webpack_require__.r(__webpack_exports__);
 /**
  * Opens a SQLite connection using WA-SQLite.
  */
-class WASQLiteOpenFactory extends _AbstractWebSQLOpenFactory_js__WEBPACK_IMPORTED_MODULE_2__.AbstractWebSQLOpenFactory {
+class WASQLiteOpenFactory {
+    options;
+    resolvedFlags;
+    logger;
     constructor(options) {
-        super(options);
+        this.options = options;
         assertValidWASQLiteOpenFactoryOptions(options);
+        this.resolvedFlags = (0,_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.resolveWebSQLFlags)(options.flags);
+        this.logger = options.logger ?? (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.createLogger)(`WASQLiteOpenFactory - ${this.options.dbFilename}`);
     }
     get waOptions() {
         // Cast to extended type
         return this.options;
     }
     openAdapter() {
-        return new _InternalWASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_5__.InternalWASQLiteDBAdapter({
-            name: this.options.dbFilename,
-            openConnection: () => this.openConnection(),
-            debugMode: this.options.debugMode,
-            logger: this.logger
-        });
+        return new _AsyncWebAdapter_js__WEBPACK_IMPORTED_MODULE_9__.AsyncDbAdapter(this.openConnection(), this.options.dbFilename);
+    }
+    openDB() {
+        const { resolvedFlags: { disableSSRWarning, enableMultiTabs, ssrMode = (0,_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.isServerSide)() } } = this;
+        if (ssrMode) {
+            if (!disableSSRWarning) {
+                this.logger.warn(`
+      Running PowerSync in SSR mode.
+      Only empty query results will be returned.
+      Disable this warning by setting 'disableSSRWarning: true' in options.`);
+            }
+            return new _SSRDBAdapter_js__WEBPACK_IMPORTED_MODULE_4__.SSRDBAdapter();
+        }
+        if (!enableMultiTabs) {
+            this.logger.warn('Multiple tab support is not enabled. Using this site across multiple tabs may not function correctly.');
+        }
+        return this.openAdapter();
     }
     async openConnection() {
         const { enableMultiTabs, useWebWorker } = this.resolvedFlags;
-        const { vfs = _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_6__.WASQLiteVFS.IDBBatchAtomicVFS, temporaryStorage = _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.TemporaryStorageOption.MEMORY, cacheSizeKb = _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.DEFAULT_CACHE_SIZE_KB, encryptionKey } = this.waOptions;
+        const { vfs = _vfs_js__WEBPACK_IMPORTED_MODULE_5__.WASQLiteVFS.IDBBatchAtomicVFS, temporaryStorage = _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.TemporaryStorageOption.MEMORY, cacheSizeKb = _web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.DEFAULT_CACHE_SIZE_KB, encryptionKey } = this.waOptions;
         if (!enableMultiTabs) {
             this.logger.warn('Multiple tabs are not enabled in this browser');
         }
+        const resolvedOptions = {
+            dbFilename: this.options.dbFilename,
+            dbLocation: this.options.dbLocation,
+            debugMode: this.options.debugMode,
+            vfs,
+            temporaryStorage,
+            cacheSizeKb,
+            flags: this.resolvedFlags,
+            encryptionKey: encryptionKey
+        };
+        let clientOptions;
+        let requiresPersistentTriggers = (0,_vfs_js__WEBPACK_IMPORTED_MODULE_5__.vfsRequiresDedicatedWorkers)(vfs);
         if (useWebWorker) {
             const optionsDbWorker = this.options.worker;
             const workerPort = typeof optionsDbWorker == 'function'
-                ? (0,_worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_1__.resolveWorkerDatabasePortFactory)(() => optionsDbWorker({
+                ? (0,_worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_2__.resolveWorkerDatabasePortFactory)(() => optionsDbWorker({
                     ...this.options,
                     temporaryStorage,
                     cacheSizeKb,
                     flags: this.resolvedFlags,
                     encryptionKey
                 }))
-                : (0,_worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_1__.openWorkerDatabasePort)(this.options.dbFilename, enableMultiTabs, optionsDbWorker, this.waOptions.vfs);
-            const workerDBOpener = comlink__WEBPACK_IMPORTED_MODULE_0__.wrap(workerPort);
-            return new _WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_3__.WorkerWrappedAsyncDatabaseConnection({
-                remote: workerDBOpener,
+                : (0,_worker_db_open_worker_database_js__WEBPACK_IMPORTED_MODULE_2__.openWorkerDatabasePort)(this.options.dbFilename, enableMultiTabs, optionsDbWorker, this.waOptions.vfs);
+            const source = comlink__WEBPACK_IMPORTED_MODULE_1__.wrap(workerPort);
+            const closeSignal = new AbortController();
+            const connection = await source.connect({
+                ...resolvedOptions,
+                logLevel: this.logger.getLevel(),
+                lockName: await (0,_shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_8__.generateTabCloseSignal)(closeSignal.signal)
+            });
+            clientOptions = {
+                connection,
+                source,
                 // This tab owns the worker, so we're guaranteed to outlive it.
                 remoteCanCloseUnexpectedly: false,
-                baseConnection: await workerDBOpener({
-                    dbFilename: this.options.dbFilename,
-                    vfs,
-                    temporaryStorage,
-                    cacheSizeKb,
-                    flags: this.resolvedFlags,
-                    encryptionKey: encryptionKey,
-                    logLevel: this.logger.getLevel()
-                }),
-                identifier: this.options.dbFilename,
                 onClose: () => {
+                    closeSignal.abort();
                     if (workerPort instanceof Worker) {
                         workerPort.terminate();
                     }
@@ -6571,21 +6201,19 @@ class WASQLiteOpenFactory extends _AbstractWebSQLOpenFactory_js__WEBPACK_IMPORTE
                         workerPort.close();
                     }
                 }
-            });
+            };
         }
         else {
-            // Don't use a web worker
-            return new _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_6__.WASqliteConnection({
-                dbFilename: this.options.dbFilename,
-                dbLocation: this.options.dbLocation,
-                debugMode: this.options.debugMode,
-                vfs,
-                temporaryStorage,
-                cacheSizeKb,
-                flags: this.resolvedFlags,
-                encryptionKey: encryptionKey
-            });
-        }
+            // Don't use a web worker. Instead, open the MultiDatabaseServer a worker would use locally.
+            const localServer = new _worker_db_MultiDatabaseServer_js__WEBPACK_IMPORTED_MODULE_6__.MultiDatabaseServer(this.logger);
+            requiresPersistentTriggers = true;
+            const connection = await localServer.openConnectionLocally(resolvedOptions);
+            clientOptions = { connection, source: null, remoteCanCloseUnexpectedly: false };
+        }
+        return new _DatabaseClient_js__WEBPACK_IMPORTED_MODULE_7__.DatabaseClient(clientOptions, {
+            ...resolvedOptions,
+            requiresPersistentTriggers
+        });
     }
 }
 /**
@@ -6595,7 +6223,7 @@ function assertValidWASQLiteOpenFactoryOptions(options) {
     // The OPFS VFS only works in dedicated web workers.
     if ('vfs' in options && 'flags' in options) {
         const { vfs, flags = {} } = options;
-        if (vfs !== _WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_6__.WASQLiteVFS.IDBBatchAtomicVFS && 'useWebWorker' in flags && !flags.useWebWorker) {
+        if (vfs && (0,_vfs_js__WEBPACK_IMPORTED_MODULE_5__.vfsRequiresDedicatedWorkers)(vfs) && 'useWebWorker' in flags && !flags.useWebWorker) {
             throw new Error(`Invalid configuration: The 'useWebWorker' flag must be true when using an OPFS-based VFS (${vfs}).`);
         }
     }
@@ -6640,6 +6268,117 @@ class WASQLitePowerSyncDatabaseOpenFactory extends _AbstractWebPowerSyncDatabase
 }
 
 
+/***/ },
+
+/***/ "./lib/src/db/adapters/wa-sqlite/vfs.js"
+/*!**********************************************!*\
+  !*** ./lib/src/db/adapters/wa-sqlite/vfs.js ***!
+  \**********************************************/
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   AsyncWASQLiteModuleFactory: () => (/* binding */ AsyncWASQLiteModuleFactory),
+/* harmony export */   DEFAULT_MODULE_FACTORIES: () => (/* binding */ DEFAULT_MODULE_FACTORIES),
+/* harmony export */   MultiCipherAsyncWASQLiteModuleFactory: () => (/* binding */ MultiCipherAsyncWASQLiteModuleFactory),
+/* harmony export */   MultiCipherSyncWASQLiteModuleFactory: () => (/* binding */ MultiCipherSyncWASQLiteModuleFactory),
+/* harmony export */   SyncWASQLiteModuleFactory: () => (/* binding */ SyncWASQLiteModuleFactory),
+/* harmony export */   WASQLiteVFS: () => (/* binding */ WASQLiteVFS),
+/* harmony export */   vfsRequiresDedicatedWorkers: () => (/* binding */ vfsRequiresDedicatedWorkers)
+/* harmony export */ });
+/**
+ * List of currently tested virtual filesystems
+ */
+var WASQLiteVFS;
+(function (WASQLiteVFS) {
+    WASQLiteVFS["IDBBatchAtomicVFS"] = "IDBBatchAtomicVFS";
+    WASQLiteVFS["OPFSCoopSyncVFS"] = "OPFSCoopSyncVFS";
+    WASQLiteVFS["AccessHandlePoolVFS"] = "AccessHandlePoolVFS";
+})(WASQLiteVFS || (WASQLiteVFS = {}));
+function vfsRequiresDedicatedWorkers(vfs) {
+    return vfs != WASQLiteVFS.IDBBatchAtomicVFS;
+}
+/**
+ * @internal
+ */
+const AsyncWASQLiteModuleFactory = async () => {
+    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs"));
+    return factory();
+};
+/**
+ * @internal
+ */
+const MultiCipherAsyncWASQLiteModuleFactory = async () => {
+    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/mc-wa-sqlite-async.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/mc-wa-sqlite-async.mjs"));
+    return factory();
+};
+/**
+ * @internal
+ */
+const SyncWASQLiteModuleFactory = async () => {
+    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/wa-sqlite.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/wa-sqlite.mjs"));
+    return factory();
+};
+/**
+ * @internal
+ */
+const MultiCipherSyncWASQLiteModuleFactory = async () => {
+    const { default: factory } = await Promise.resolve(/*! import() */).then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/dist/mc-wa-sqlite.mjs */ "../../node_modules/.pnpm/@journeyapps+wa-sqlite@1.5.0/node_modules/@journeyapps/wa-sqlite/dist/mc-wa-sqlite.mjs"));
+    return factory();
+};
+/**
+ * @internal
+ */
+const DEFAULT_MODULE_FACTORIES = {
+    [WASQLiteVFS.IDBBatchAtomicVFS]: async (options) => {
+        let module;
+        if (options.encryptionKey) {
+            module = await MultiCipherAsyncWASQLiteModuleFactory();
+        }
+        else {
+            module = await AsyncWASQLiteModuleFactory();
+        }
+        const { IDBBatchAtomicVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js */ "@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js", 19));
+        return {
+            module,
+            // @ts-expect-error The types for this static method are missing upstream
+            vfs: await IDBBatchAtomicVFS.create(options.dbFileName, module, { lockPolicy: 'exclusive' })
+        };
+    },
+    [WASQLiteVFS.AccessHandlePoolVFS]: async (options) => {
+        let module;
+        if (options.encryptionKey) {
+            module = await MultiCipherSyncWASQLiteModuleFactory();
+        }
+        else {
+            module = await SyncWASQLiteModuleFactory();
+        }
+        // @ts-expect-error The types for this static method are missing upstream
+        const { AccessHandlePoolVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js */ "@journeyapps/wa-sqlite/src/examples/AccessHandlePoolVFS.js", 19));
+        return {
+            module,
+            vfs: await AccessHandlePoolVFS.create(options.dbFileName, module)
+        };
+    },
+    [WASQLiteVFS.OPFSCoopSyncVFS]: async (options) => {
+        let module;
+        if (options.encryptionKey) {
+            module = await MultiCipherSyncWASQLiteModuleFactory();
+        }
+        else {
+            module = await SyncWASQLiteModuleFactory();
+        }
+        // @ts-expect-error The types for this static method are missing upstream
+        const { OPFSCoopSyncVFS } = await Promise.resolve(/*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js */ "@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js", 19));
+        const vfs = await OPFSCoopSyncVFS.create(options.dbFileName, module);
+        return {
+            module,
+            vfs
+        };
+    }
+};
+
+
 /***/ },
 
 /***/ "./lib/src/db/adapters/web-sql-flags.js"
@@ -6707,8 +6446,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   SSRStreamingSyncImplementation: () => (/* binding */ SSRStreamingSyncImplementation)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! async-mutex */ "async-mutex");
-
 
 class SSRStreamingSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
     syncMutex;
@@ -6718,14 +6455,14 @@ class SSRStreamingSyncImplementation extends _powersync_common__WEBPACK_IMPORTED
     syncStatus;
     constructor(options) {
         super();
-        this.syncMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
-        this.crudMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
+        this.syncMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
+        this.crudMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
         this.syncStatus = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SyncStatus({});
         this.isConnected = false;
     }
     obtainLock(lockOptions) {
         const mutex = lockOptions.type == _powersync_common__WEBPACK_IMPORTED_MODULE_0__.LockType.CRUD ? this.crudMutex : this.syncMutex;
-        return mutex.runExclusive(lockOptions.callback);
+        return mutex.runExclusive(lockOptions.callback, lockOptions.signal);
     }
     /**
      * This is a no-op in SSR mode
@@ -6788,11 +6525,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   SharedWebStreamingSyncImplementation: () => (/* binding */ SharedWebStreamingSyncImplementation)
 /* harmony export */ });
 /* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "comlink");
-/* harmony import */ var _shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/navigator.js */ "./lib/src/shared/navigator.js");
-/* harmony import */ var _worker_sync_AbstractSharedSyncClientProvider_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../worker/sync/AbstractSharedSyncClientProvider.js */ "./lib/src/worker/sync/AbstractSharedSyncClientProvider.js");
-/* harmony import */ var _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../worker/sync/SharedSyncImplementation.js */ "./lib/src/worker/sync/SharedSyncImplementation.js");
-/* harmony import */ var _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-/* harmony import */ var _WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _worker_sync_AbstractSharedSyncClientProvider_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../worker/sync/AbstractSharedSyncClientProvider.js */ "./lib/src/worker/sync/AbstractSharedSyncClientProvider.js");
+/* harmony import */ var _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../worker/sync/SharedSyncImplementation.js */ "./lib/src/worker/sync/SharedSyncImplementation.js");
+/* harmony import */ var _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
+/* harmony import */ var _WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../shared/tab_close_signal.js */ "./lib/src/shared/tab_close_signal.js");
 
 
 
@@ -6803,7 +6540,7 @@ __webpack_require__.r(__webpack_exports__);
  * The shared worker will trigger methods on this side of the message port
  * via this client provider.
  */
-class SharedSyncClientProvider extends _worker_sync_AbstractSharedSyncClientProvider_js__WEBPACK_IMPORTED_MODULE_2__.AbstractSharedSyncClientProvider {
+class SharedSyncClientProvider extends _worker_sync_AbstractSharedSyncClientProvider_js__WEBPACK_IMPORTED_MODULE_1__.AbstractSharedSyncClientProvider {
     options;
     statusChanged;
     webDB;
@@ -6874,7 +6611,7 @@ class SharedSyncClientProvider extends _worker_sync_AbstractSharedSyncClientProv
 /**
  * The local part of the sync implementation on the web, which talks to a sync implementation hosted in a shared worker.
  */
-class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_5__.WebStreamingSyncImplementation {
+class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_4__.WebStreamingSyncImplementation {
     syncManager;
     clientProvider;
     messagePort;
@@ -6890,10 +6627,10 @@ class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementati
          */
         const resolvedWorkerOptions = {
             dbFilename: this.options.identifier,
-            temporaryStorage: _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.TemporaryStorageOption.MEMORY,
-            cacheSizeKb: _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.DEFAULT_CACHE_SIZE_KB,
+            temporaryStorage: _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.TemporaryStorageOption.MEMORY,
+            cacheSizeKb: _adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.DEFAULT_CACHE_SIZE_KB,
             ...options,
-            flags: (0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_4__.resolveWebSQLFlags)(options.flags)
+            flags: (0,_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_3__.resolveWebSQLFlags)(options.flags)
         };
         const syncWorker = options.sync?.worker;
         if (syncWorker) {
@@ -6908,7 +6645,7 @@ class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementati
             }
         }
         else {
-            this.messagePort = new SharedWorker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("_journeyapps_wa-sqlite-_journeyapps_wa-sqlite_src_examples_AccessHandlePoolVFS_js-_journeyapp-89f0ba"), __webpack_require__.b), {
+            this.messagePort = new SharedWorker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("lib_src_worker_sync_SharedSyncImplementation_worker_js"), __webpack_require__.b), {
                 /* @vite-ignore */
                 name: `shared-sync-${this.webOptions.identifier}`,
                 type: undefined
@@ -6951,24 +6688,9 @@ class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementati
          *    - We resolve the top-level promise after the lock has been registered with the shared worker.
          * - The client sends the params to the shared worker after locks have been registered.
          */
-        await new Promise((resolve) => {
-            // Request a random lock until this client is disposed. The name of the lock is sent to the shared worker, which
-            // will also attempt to acquire it. Since the lock is returned when the tab is closed, this allows the share worker
-            // to free resources associated with this tab.
-            // We take hold of this lock as soon-as-possible in order to cater for potentially closed tabs.
-            (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(`tab-close-signal-${crypto.randomUUID()}`, async (lock) => {
-                if (this.abortOnClose.signal.aborted) {
-                    return;
-                }
-                // Awaiting here ensures the worker is waiting for the lock
-                await this.syncManager.addLockBasedCloseSignal(lock.name);
-                // The lock has been registered, we can continue with the initialization
-                resolve();
-                await new Promise((r) => {
-                    this.abortOnClose.signal.onabort = () => r();
-                });
-            });
-        });
+        const closeSignal = await (0,_shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_5__.generateTabCloseSignal)(this.abortOnClose.signal);
+        // Awaiting here ensures the worker is waiting for the lock
+        await this.syncManager.addLockBasedCloseSignal(closeSignal);
         const { crudUploadThrottleMs, identifier, retryDelayMs } = this.options;
         const flags = { ...this.webOptions.flags, workers: undefined };
         await this.syncManager.setParams({
@@ -7006,13 +6728,13 @@ class SharedWebStreamingSyncImplementation extends _WebStreamingSyncImplementati
             // Listen for the close acknowledgment from the worker
             this.messagePort.addEventListener('message', (event) => {
                 const payload = event.data;
-                if (payload?.event === _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_3__.SharedSyncClientEvent.CLOSE_ACK) {
+                if (payload?.event === _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_2__.SharedSyncClientEvent.CLOSE_ACK) {
                     resolve();
                 }
             });
             // Signal the shared worker that this client is closing its connection to the worker
             const closeMessagePayload = {
-                event: _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_3__.SharedSyncClientEvent.CLOSE_CLIENT,
+                event: _worker_sync_SharedSyncImplementation_js__WEBPACK_IMPORTED_MODULE_2__.SharedSyncClientEvent.CLOSE_CLIENT,
                 data: {}
             };
             this.messagePort.postMessage(closeMessagePayload);
@@ -7224,6 +6946,153 @@ const getNavigatorLocks = () => {
 };
 
 
+/***/ },
+
+/***/ "./lib/src/shared/tab_close_signal.js"
+/*!********************************************!*\
+  !*** ./lib/src/shared/tab_close_signal.js ***!
+  \********************************************/
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   generateTabCloseSignal: () => (/* binding */ generateTabCloseSignal)
+/* harmony export */ });
+/* harmony import */ var _navigator_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./navigator.js */ "./lib/src/shared/navigator.js");
+
+/**
+ * Requests a random lock that will be released once the optional signal is aborted (or, if no signal is given, when the
+ * tab is closed).
+ *
+ * This allows sending the name of the lock to another context (e.g. a shared worker), which will also attempt to
+ * acquire it. Since the lock is returned when the tab is closed, this allows the shared worker to free resources
+ * assocatiated with this tab.
+ *
+ *  We take hold of this lock as soon-as-possible in order to cater for potentially closed tabs.
+ */
+function generateTabCloseSignal(abort) {
+    return new Promise((resolve, reject) => {
+        const options = { signal: abort };
+        (0,_navigator_js__WEBPACK_IMPORTED_MODULE_0__.getNavigatorLocks)()
+            .request(`tab-close-signal-${crypto.randomUUID()}`, options, (lock) => {
+            resolve(lock.name);
+            return new Promise((resolve) => {
+                if (abort) {
+                    abort.addEventListener('abort', () => resolve());
+                }
+            });
+        })
+            .catch(reject);
+    });
+}
+
+
+/***/ },
+
+/***/ "./lib/src/worker/db/MultiDatabaseServer.js"
+/*!**************************************************!*\
+  !*** ./lib/src/worker/db/MultiDatabaseServer.js ***!
+  \**************************************************/
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   MultiDatabaseServer: () => (/* binding */ MultiDatabaseServer),
+/* harmony export */   isSharedWorker: () => (/* binding */ isSharedWorker)
+/* harmony export */ });
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "comlink");
+/* harmony import */ var _db_adapters_wa_sqlite_DatabaseServer_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/DatabaseServer.js */ "./lib/src/db/adapters/wa-sqlite/DatabaseServer.js");
+/* harmony import */ var _shared_navigator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/navigator.js */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _db_adapters_wa_sqlite_RawSqliteConnection_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/RawSqliteConnection.js */ "./lib/src/db/adapters/wa-sqlite/RawSqliteConnection.js");
+/* harmony import */ var _db_adapters_wa_sqlite_ConcurrentConnection_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/ConcurrentConnection.js */ "./lib/src/db/adapters/wa-sqlite/ConcurrentConnection.js");
+
+
+
+
+
+const OPEN_DB_LOCK = 'open-wasqlite-db';
+/**
+ * Shared state to manage multiple database connections hosted by a worker.
+ */
+class MultiDatabaseServer {
+    logger;
+    activeDatabases = new Map();
+    constructor(logger) {
+        this.logger = logger;
+    }
+    async handleConnection(options) {
+        this.logger.setLevel(options.logLevel);
+        return comlink__WEBPACK_IMPORTED_MODULE_0__.proxy(await this.openConnectionLocally(options, options.lockName));
+    }
+    async connectToExisting(name, lockName) {
+        return (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_2__.getNavigatorLocks)().request(OPEN_DB_LOCK, async () => {
+            const server = this.activeDatabases.get(name);
+            if (server == null) {
+                throw new Error(`connectToExisting(${name}) failed because the worker doesn't own a database with that name.`);
+            }
+            return comlink__WEBPACK_IMPORTED_MODULE_0__.proxy(await server.connect(lockName));
+        });
+    }
+    async openConnectionLocally(options, lockName) {
+        // Especially on Firefox, we're sometimes seeing "NoModificationAllowedError"s when opening OPFS databases we can
+        // work around by retrying.
+        const maxAttempts = 3;
+        let server;
+        for (let count = 0; count < maxAttempts - 1; count++) {
+            try {
+                server = await this.databaseOpenAttempt(options);
+            }
+            catch (ex) {
+                this.logger.warn(`Attempt ${count + 1} of ${maxAttempts} to open database failed, retrying in 1 second...`, ex);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+        }
+        // Final attempt if we haven't been able to open the server - rethrow errors if we still can't open.
+        server ??= await this.databaseOpenAttempt(options);
+        return server.connect(lockName);
+    }
+    async databaseOpenAttempt(options) {
+        return (0,_shared_navigator_js__WEBPACK_IMPORTED_MODULE_2__.getNavigatorLocks)().request(OPEN_DB_LOCK, async () => {
+            const { dbFilename } = options;
+            let server = this.activeDatabases.get(dbFilename);
+            if (server == null) {
+                const needsNavigatorLocks = !isSharedWorker;
+                const connection = new _db_adapters_wa_sqlite_RawSqliteConnection_js__WEBPACK_IMPORTED_MODULE_3__.RawSqliteConnection(options);
+                const withSafeConcurrency = new _db_adapters_wa_sqlite_ConcurrentConnection_js__WEBPACK_IMPORTED_MODULE_4__.ConcurrentSqliteConnection(connection, needsNavigatorLocks);
+                // Initializing the RawSqliteConnection will run some pragmas that might write to the database file, so we want
+                // to do that in an exclusive lock. Note that OPEN_DB_LOCK is not enough for that, as another tab might have
+                // already created a connection (and is thus outside of OPEN_DB_LOCK) while currently writing to it.
+                const returnLease = await withSafeConcurrency.acquireMutex();
+                try {
+                    await connection.init();
+                }
+                catch (e) {
+                    returnLease();
+                    await connection.close();
+                    throw e;
+                }
+                returnLease();
+                const onClose = () => this.activeDatabases.delete(dbFilename);
+                server = new _db_adapters_wa_sqlite_DatabaseServer_js__WEBPACK_IMPORTED_MODULE_1__.DatabaseServer({
+                    inner: withSafeConcurrency,
+                    logger: this.logger,
+                    onClose
+                });
+                this.activeDatabases.set(dbFilename, server);
+            }
+            return server;
+        });
+    }
+    closeAll() {
+        const existingDatabases = [...this.activeDatabases.values()];
+        return Promise.all(existingDatabases.map((db) => {
+            db.forceClose();
+        }));
+    }
+}
+const isSharedWorker = 'SharedWorkerGlobalScope' in globalThis;
+
+
 /***/ },
 
 /***/ "./lib/src/worker/db/open-worker-database.js"
@@ -7240,14 +7109,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   resolveWorkerDatabasePortFactory: () => (/* binding */ resolveWorkerDatabasePortFactory)
 /* harmony export */ });
 /* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "comlink");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/WASQLiteConnection.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
+/* harmony import */ var _db_adapters_wa_sqlite_vfs_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/vfs.js */ "./lib/src/db/adapters/wa-sqlite/vfs.js");
 
 
 /**
  * Opens a shared or dedicated worker which exposes opening of database connections
  */
 function openWorkerDatabasePort(workerIdentifier, multipleTabs = true, worker = '', vfs) {
-    const needsDedicated = vfs == _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.AccessHandlePoolVFS || vfs == _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.OPFSCoopSyncVFS;
+    const needsDedicated = vfs == _db_adapters_wa_sqlite_vfs_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.AccessHandlePoolVFS || vfs == _db_adapters_wa_sqlite_vfs_js__WEBPACK_IMPORTED_MODULE_1__.WASQLiteVFS.OPFSCoopSyncVFS;
     if (worker) {
         return !needsDedicated && multipleTabs
             ? new SharedWorker(`${worker}`, {
@@ -7267,12 +7136,12 @@ function openWorkerDatabasePort(workerIdentifier, multipleTabs = true, worker =
          *  (in the case of Android)
          */
         return !needsDedicated && multipleTabs
-            ? new SharedWorker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("_journeyapps_wa-sqlite_src_examples_AccessHandlePoolVFS_js-_journeyapps_wa-sqlite_src_example-97ebe9"), __webpack_require__.b), {
+            ? new SharedWorker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("lib_src_worker_db_WASQLiteDB_worker_js"), __webpack_require__.b), {
                 /* @vite-ignore */
                 name: `shared-DB-worker-${workerIdentifier}`,
                 type: undefined
             }).port
-            : new Worker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("_journeyapps_wa-sqlite_src_examples_AccessHandlePoolVFS_js-_journeyapps_wa-sqlite_src_example-97ebe9"), __webpack_require__.b), {
+            : new Worker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u("lib_src_worker_db_WASQLiteDB_worker_js"), __webpack_require__.b), {
                 /* @vite-ignore */
                 name: `DB-worker-${workerIdentifier}`,
                 type: undefined
@@ -7471,14 +7340,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   SharedSyncImplementation: () => (/* binding */ SharedSyncImplementation)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
-/* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! async-mutex */ "async-mutex");
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! comlink */ "comlink");
-/* harmony import */ var _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../db/sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
-/* harmony import */ var _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../db/sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
-/* harmony import */ var _db_adapters_LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../db/adapters/LockedAsyncDatabaseAdapter.js */ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js");
-/* harmony import */ var _db_adapters_WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../db/adapters/WorkerWrappedAsyncDatabaseConnection.js */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
-/* harmony import */ var _BroadcastLogger_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./BroadcastLogger.js */ "./lib/src/worker/sync/BroadcastLogger.js");
-
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "comlink");
+/* harmony import */ var _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../db/sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
+/* harmony import */ var _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../db/sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _BroadcastLogger_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./BroadcastLogger.js */ "./lib/src/worker/sync/BroadcastLogger.js");
+/* harmony import */ var _db_adapters_wa_sqlite_DatabaseClient_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/DatabaseClient.js */ "./lib/src/db/adapters/wa-sqlite/DatabaseClient.js");
+/* harmony import */ var _shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../shared/tab_close_signal.js */ "./lib/src/shared/tab_close_signal.js");
 
 
 
@@ -7523,14 +7390,14 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     connectionManager;
     syncStatus;
     broadCastLogger;
-    distributedDB;
+    database = this.generateReconnectableDatabase();
     constructor() {
         super();
         this.ports = [];
         this.syncParams = null;
         this.logger = (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.createLogger)('shared-sync');
         this.lastConnectOptions = undefined;
-        this.portMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_1__.Mutex();
+        this.portMutex = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.Mutex();
         this.isInitialized = new Promise((resolve) => {
             const callback = this.registerListener({
                 initialized: () => {
@@ -7539,10 +7406,8 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 }
             });
         });
-        // Should be configured once we get params
-        this.distributedDB = null;
         this.syncStatus = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SyncStatus({});
-        this.broadCastLogger = new _BroadcastLogger_js__WEBPACK_IMPORTED_MODULE_7__.BroadcastLogger(this.ports);
+        this.broadCastLogger = new _BroadcastLogger_js__WEBPACK_IMPORTED_MODULE_4__.BroadcastLogger(this.ports);
         this.connectionManager = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionManager({
             createSyncImplementation: async () => {
                 await this.waitForReady();
@@ -7640,38 +7505,8 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         if (params.streamOptions?.flags?.broadcastLogs) {
             this.logger = this.broadCastLogger;
         }
-        const lockedAdapter = new _db_adapters_LockedAsyncDatabaseAdapter_js__WEBPACK_IMPORTED_MODULE_5__.LockedAsyncDatabaseAdapter({
-            name: params.dbParams.dbFilename,
-            openConnection: async () => {
-                // Gets a connection from the clients when a new connection is requested.
-                const db = await this.openInternalDB();
-                db.registerListener({
-                    closing: () => {
-                        lockedAdapter.reOpenInternalDB();
-                    }
-                });
-                return db;
-            },
-            logger: this.logger,
-            reOpenOnConnectionClosed: true
-        });
-        this.distributedDB = lockedAdapter;
-        await lockedAdapter.init();
-        lockedAdapter.registerListener({
-            databaseReOpened: () => {
-                // We may have missed some table updates while the database was closed.
-                // We can poke the crud in case we missed any updates.
-                this.connectionManager.syncStreamImplementation?.triggerCrudUpload();
-                /**
-                 * FIXME or IMPROVE ME
-                 * The Rust client implementation stores sync state on the connection level.
-                 * Reopening the database causes a state machine error which should cause the
-                 * StreamingSyncImplementation to reconnect. It would be nicer if we could trigger
-                 * this reconnect earlier.
-                 * This reconnect is not required for IndexedDB.
-                 */
-            }
-        });
+        // Ensure we have a usable database connection, the reconnectable database will connect lazily on first use.
+        await this.database.readLock(async () => { });
         self.onerror = (event) => {
             // Share any uncaught events on the broadcast logger
             this.logger.error('Uncaught exception in PowerSync shared sync worker', event);
@@ -7703,7 +7538,7 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         return await this.portMutex.runExclusive(() => {
             const portProvider = {
                 port,
-                clientProvider: comlink__WEBPACK_IMPORTED_MODULE_2__.wrap(port),
+                clientProvider: comlink__WEBPACK_IMPORTED_MODULE_1__.wrap(port),
                 currentSubscriptions: [],
                 closeListeners: [],
                 isClosing: false
@@ -7750,7 +7585,7 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 await closeListener();
             }
             this.collectActiveSubscriptions();
-            return () => trackedPort.clientProvider[comlink__WEBPACK_IMPORTED_MODULE_2__.releaseProxy]();
+            return () => trackedPort.clientProvider[comlink__WEBPACK_IMPORTED_MODULE_1__.releaseProxy]();
         });
     }
     triggerCrudUpload() {
@@ -7787,9 +7622,9 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         // This should only be called after initialization has completed
         const syncParams = this.syncParams;
         // Create a new StreamingSyncImplementation for each connect call. This is usually done is all SDKs.
-        return new _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_4__.WebStreamingSyncImplementation({
-            adapter: new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SqliteBucketStorage(this.distributedDB, this.logger),
-            remote: new _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_3__.WebRemote({
+        return new _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_3__.WebStreamingSyncImplementation({
+            adapter: new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SqliteBucketStorage(this.database, this.logger),
+            remote: new _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_2__.WebRemote({
                 invalidateCredentials: async () => {
                     const lastPort = await this.getLastWrappedPort();
                     if (!lastPort) {
@@ -7859,9 +7694,9 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         });
     }
     /**
-     * Opens a worker wrapped database connection. Using the last connected client port.
+     * Requests a random client to share its database connection with us.
      */
-    async openInternalDB() {
+    async openInternalDB(handleClosed) {
         const client = await this.getRandomWrappedPort();
         if (!client) {
             // Should not really happen in practice
@@ -7895,8 +7730,9 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
             removeCloseListener();
             throw ex;
         });
-        const remote = comlink__WEBPACK_IMPORTED_MODULE_2__.wrap(workerPort);
+        const remote = comlink__WEBPACK_IMPORTED_MODULE_1__.wrap(workerPort);
         const identifier = this.syncParams.dbParams.dbFilename;
+        const clientLockName = await (0,_shared_tab_close_signal_js__WEBPACK_IMPORTED_MODULE_6__.generateTabCloseSignal)();
         /**
          * The open could fail if the tab is closed while we're busy opening the database.
          * This operation is typically executed inside an exclusive portMutex lock.
@@ -7904,7 +7740,16 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
          * We can't rely on the closeListeners to abort the operation if the tab is closed.
          */
         const db = await withAbort({
-            action: () => remote(this.syncParams.dbParams),
+            action: async () => {
+                const clientView = await remote.connectToExisting({ identifier, lockName: clientLockName });
+                return new _db_adapters_wa_sqlite_DatabaseClient_js__WEBPACK_IMPORTED_MODULE_5__.DatabaseClient({
+                    connection: clientView,
+                    source: remote,
+                    // It's possible for this worker to outlive the client hosting the database for us. We need to be prepared for
+                    // that and ensure pending requests are aborted when the tab is closed.
+                    remoteCanCloseUnexpectedly: true
+                }, this.syncParams.dbParams);
+            },
             signal: abortController.signal,
             cleanupOnAbort: (db) => {
                 db.close();
@@ -7914,25 +7759,86 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
             removeCloseListener();
         });
         clearTimeout(timeout);
-        const wrapped = new _db_adapters_WorkerWrappedAsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_6__.WorkerWrappedAsyncDatabaseConnection({
-            remote,
-            baseConnection: db,
-            identifier,
-            // It's possible for this worker to outlive the client hosting the database for us. We need to be prepared for
-            // that and ensure pending requests are aborted when the tab is closed.
-            remoteCanCloseUnexpectedly: true
-        });
         client.closeListeners.push(async () => {
             this.logger.info('Aborting open connection because associated tab closed.');
+            handleClosed(db);
             /**
              * Don't await this close operation. It might never resolve if the tab is closed.
              * We mark the remote as closed first, this will reject any pending requests.
              * We then call close. The close operation is configured to fire-and-forget, the main promise will reject immediately.
              */
-            wrapped.markRemoteClosed();
-            wrapped.close().catch((ex) => this.logger.warn('error closing database connection', ex));
+            db.markRemoteClosed();
+            db.close().catch((ex) => this.logger.warn('error closing database connection', ex));
         });
-        return wrapped;
+        return db;
+    }
+    generateReconnectableDatabase() {
+        const syncParams = this.syncParams;
+        const sharedSync = this;
+        class ReconnectPool extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
+            connectionState = null;
+            get name() {
+                return syncParams?.dbParams.dbFilename;
+            }
+            async connect() {
+                if (this.connectionState == null) {
+                    const handleClosed = this.handleClientClosed.bind(this);
+                    this.connectionState = (async () => {
+                        try {
+                            const db = await sharedSync.openInternalDB(handleClosed);
+                            db.registerListener({
+                                tablesUpdated: (notification) => {
+                                    this.iterateListeners((l) => l.tablesUpdated?.(notification));
+                                }
+                            });
+                            this.connectionState = db;
+                            return db;
+                        }
+                        catch (e) {
+                            // Allow reconnecting when the database is used again.
+                            this.connectionState = null;
+                            throw e;
+                        }
+                    })();
+                }
+                return await this.connectionState;
+            }
+            async close() {
+                if (this.connectionState != null) {
+                    await (await this.connectionState).close();
+                }
+            }
+            handleClientClosed(client) {
+                if (client === this.connectionState) {
+                    this.connectionState = null;
+                    // We may have missed some table updates while the database was closed.
+                    // We can poke the crud in case we missed any updates.
+                    const impl = sharedSync.connectionManager.syncStreamImplementation;
+                    impl?.triggerCrudUpload();
+                    /**
+                     * FIXME or IMPROVE ME
+                     * The Rust client implementation stores sync state on the connection level.
+                     * Reopening the database causes a state machine error which should cause the
+                     * StreamingSyncImplementation to reconnect. It would be nicer if we could trigger
+                     * this reconnect earlier.
+                     * This reconnect is not required for IndexedDB.
+                     */
+                }
+            }
+            async readLock(fn, options) {
+                const db = await this.connect();
+                return db.readLock(fn, options);
+            }
+            async writeLock(fn, options) {
+                const db = await this.connect();
+                return db.writeLock(fn, options);
+            }
+            async refreshSchema() {
+                // Not used by sync client.
+            }
+        }
+        const Adapter = (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.DBAdapterDefaultMixin)(ReconnectPool);
+        return new Adapter();
     }
     /**
      * A method to update the all shared statuses for each
@@ -8151,51 +8057,37 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   AbstractWebPowerSyncDatabaseOpenFactory: () => (/* reexport safe */ _db_adapters_AbstractWebPowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_2__.AbstractWebPowerSyncDatabaseOpenFactory),
-/* harmony export */   AbstractWebSQLOpenFactory: () => (/* reexport safe */ _db_adapters_AbstractWebSQLOpenFactory_js__WEBPACK_IMPORTED_MODULE_3__.AbstractWebSQLOpenFactory),
-/* harmony export */   AsyncWASQLiteModuleFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.AsyncWASQLiteModuleFactory),
-/* harmony export */   DEFAULT_CACHE_SIZE_KB: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__.DEFAULT_CACHE_SIZE_KB),
-/* harmony export */   DEFAULT_MODULE_FACTORIES: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.DEFAULT_MODULE_FACTORIES),
-/* harmony export */   DEFAULT_POWERSYNC_FLAGS: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_10__.DEFAULT_POWERSYNC_FLAGS),
-/* harmony export */   DEFAULT_WEB_SQL_FLAGS: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__.DEFAULT_WEB_SQL_FLAGS),
+/* harmony export */   DEFAULT_CACHE_SIZE_KB: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.DEFAULT_CACHE_SIZE_KB),
+/* harmony export */   DEFAULT_POWERSYNC_FLAGS: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_7__.DEFAULT_POWERSYNC_FLAGS),
+/* harmony export */   DEFAULT_WEB_SQL_FLAGS: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.DEFAULT_WEB_SQL_FLAGS),
 /* harmony export */   IndexDBFileSystemStorageAdapter: () => (/* reexport safe */ _attachments_IndexDBFileSystemAdapter_js__WEBPACK_IMPORTED_MODULE_1__.IndexDBFileSystemStorageAdapter),
-/* harmony export */   MultiCipherAsyncWASQLiteModuleFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.MultiCipherAsyncWASQLiteModuleFactory),
-/* harmony export */   MultiCipherSyncWASQLiteModuleFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.MultiCipherSyncWASQLiteModuleFactory),
-/* harmony export */   PowerSyncDatabase: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_10__.PowerSyncDatabase),
-/* harmony export */   SharedWebStreamingSyncImplementation: () => (/* reexport safe */ _db_sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_11__.SharedWebStreamingSyncImplementation),
-/* harmony export */   SyncWASQLiteModuleFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.SyncWASQLiteModuleFactory),
-/* harmony export */   TemporaryStorageOption: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__.TemporaryStorageOption),
-/* harmony export */   WASQLiteDBAdapter: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_6__.WASQLiteDBAdapter),
-/* harmony export */   WASQLiteOpenFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_7__.WASQLiteOpenFactory),
-/* harmony export */   WASQLitePowerSyncDatabaseOpenFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLitePowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_8__.WASQLitePowerSyncDatabaseOpenFactory),
-/* harmony export */   WASQLiteVFS: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.WASQLiteVFS),
-/* harmony export */   WASqliteConnection: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__.WASqliteConnection),
-/* harmony export */   WebRemote: () => (/* reexport safe */ _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_12__.WebRemote),
-/* harmony export */   WebStreamingSyncImplementation: () => (/* reexport safe */ _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_13__.WebStreamingSyncImplementation),
-/* harmony export */   isServerSide: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__.isServerSide),
-/* harmony export */   resolveWebPowerSyncFlags: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_10__.resolveWebPowerSyncFlags),
-/* harmony export */   resolveWebSQLFlags: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__.resolveWebSQLFlags)
+/* harmony export */   PowerSyncDatabase: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_7__.PowerSyncDatabase),
+/* harmony export */   SharedWebStreamingSyncImplementation: () => (/* reexport safe */ _db_sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__.SharedWebStreamingSyncImplementation),
+/* harmony export */   TemporaryStorageOption: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.TemporaryStorageOption),
+/* harmony export */   WASQLiteOpenFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_4__.WASQLiteOpenFactory),
+/* harmony export */   WASQLitePowerSyncDatabaseOpenFactory: () => (/* reexport safe */ _db_adapters_wa_sqlite_WASQLitePowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__.WASQLitePowerSyncDatabaseOpenFactory),
+/* harmony export */   WASQLiteVFS: () => (/* reexport safe */ _db_adapters_wa_sqlite_vfs_js__WEBPACK_IMPORTED_MODULE_3__.WASQLiteVFS),
+/* harmony export */   WebRemote: () => (/* reexport safe */ _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_9__.WebRemote),
+/* harmony export */   WebStreamingSyncImplementation: () => (/* reexport safe */ _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_10__.WebStreamingSyncImplementation),
+/* harmony export */   isServerSide: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.isServerSide),
+/* harmony export */   resolveWebPowerSyncFlags: () => (/* reexport safe */ _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_7__.resolveWebPowerSyncFlags),
+/* harmony export */   resolveWebSQLFlags: () => (/* reexport safe */ _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__.resolveWebSQLFlags)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "@powersync/common");
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
-/* harmony reexport (unknown) */ for(const __WEBPACK_IMPORT_KEY__ in _powersync_common__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = () => _powersync_common__WEBPACK_IMPORTED_MODULE_0__[__WEBPACK_IMPORT_KEY__]
+/* harmony reexport (unknown) */ for(const __WEBPACK_IMPORT_KEY__ in _powersync_common__WEBPACK_IMPORTED_MODULE_0__) if(["default","WASQLiteVFS"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = () => _powersync_common__WEBPACK_IMPORTED_MODULE_0__[__WEBPACK_IMPORT_KEY__]
 /* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 /* harmony import */ var _attachments_IndexDBFileSystemAdapter_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./attachments/IndexDBFileSystemAdapter.js */ "./lib/src/attachments/IndexDBFileSystemAdapter.js");
 /* harmony import */ var _db_adapters_AbstractWebPowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./db/adapters/AbstractWebPowerSyncDatabaseOpenFactory.js */ "./lib/src/db/adapters/AbstractWebPowerSyncDatabaseOpenFactory.js");
-/* harmony import */ var _db_adapters_AbstractWebSQLOpenFactory_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./db/adapters/AbstractWebSQLOpenFactory.js */ "./lib/src/db/adapters/AbstractWebSQLOpenFactory.js");
-/* harmony import */ var _db_adapters_AsyncDatabaseConnection_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./db/adapters/AsyncDatabaseConnection.js */ "./lib/src/db/adapters/AsyncDatabaseConnection.js");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteConnection_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLiteConnection.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteDBAdapter_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLiteDBAdapter.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteDBAdapter.js");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLiteOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteOpenFactory.js");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLitePowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLitePowerSyncDatabaseOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLitePowerSyncDatabaseOpenFactory.js");
-/* harmony import */ var _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./db/adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
-/* harmony import */ var _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./db/PowerSyncDatabase.js */ "./lib/src/db/PowerSyncDatabase.js");
-/* harmony import */ var _db_sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./db/sync/SharedWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SharedWebStreamingSyncImplementation.js");
-/* harmony import */ var _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./db/sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
-/* harmony import */ var _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./db/sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
-/* harmony import */ var _db_adapters_WebDBAdapter_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./db/adapters/WebDBAdapter.js */ "./lib/src/db/adapters/WebDBAdapter.js");
-
-
-
+/* harmony import */ var _db_adapters_wa_sqlite_vfs_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/vfs.js */ "./lib/src/db/adapters/wa-sqlite/vfs.js");
+/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteOpenFactory_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLiteOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLiteOpenFactory.js");
+/* harmony import */ var _db_adapters_wa_sqlite_WASQLitePowerSyncDatabaseOpenFactory_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./db/adapters/wa-sqlite/WASQLitePowerSyncDatabaseOpenFactory.js */ "./lib/src/db/adapters/wa-sqlite/WASQLitePowerSyncDatabaseOpenFactory.js");
+/* harmony import */ var _db_adapters_web_sql_flags_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./db/adapters/web-sql-flags.js */ "./lib/src/db/adapters/web-sql-flags.js");
+/* harmony import */ var _db_PowerSyncDatabase_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./db/PowerSyncDatabase.js */ "./lib/src/db/PowerSyncDatabase.js");
+/* harmony import */ var _db_sync_SharedWebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./db/sync/SharedWebStreamingSyncImplementation.js */ "./lib/src/db/sync/SharedWebStreamingSyncImplementation.js");
+/* harmony import */ var _db_sync_WebRemote_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./db/sync/WebRemote.js */ "./lib/src/db/sync/WebRemote.js");
+/* harmony import */ var _db_sync_WebStreamingSyncImplementation_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./db/sync/WebStreamingSyncImplementation.js */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _db_adapters_WebDBAdapter_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./db/adapters/WebDBAdapter.js */ "./lib/src/db/adapters/WebDBAdapter.js");