@powersync/web 0.0.0-dev-20260708104358 → 0.0.0-dev-20260917074240

package/lib/db/adapters/memory-pool/vfs.js

@@ -0,0 +1,247 @@
+// @ts-ignore
+import { FacadeVFS } from '@journeyapps/wa-sqlite/src/FacadeVFS.js';
+import * as VFS from '@journeyapps/wa-sqlite/src/VFS.js';
+import { emptyWalState } from './shared.js';
+const mainDbSentinel = Symbol();
+export class InMemoryWriteAheadLog extends FacadeVFS {
+    buffers;
+    // The main /database file is the only file for which we create a write-ahead log. All other files (including the
+    // journal) are local-only.
+    #openedFiles = new Map();
+    #files = new Map();
+    #tx = undefined;
+    #newOverlayPagesToSendToMainTab = new Map();
+    writeAheadState = emptyWalState();
+    constructor(module, buffers) {
+        super('InMemoryWriteAheadLog', module);
+        this.buffers = buffers;
+        this.#files.set('/database', mainDbSentinel);
+    }
+    takeChanges() {
+        const added = [];
+        this.#newOverlayPagesToSendToMainTab.forEach((v, k) => {
+            added.push(k);
+            added.push(v);
+        });
+        this.#newOverlayPagesToSendToMainTab.clear();
+        return {
+            cleared: false,
+            walEnd: this.writeAheadState.walEnd,
+            fileSize: this.writeAheadState.fileSize,
+            added
+        };
+    }
+    jAccess(zName, _pFlags, pResOut) {
+        const file = this.#files.get(zName);
+        pResOut.setInt32(0, file != null ? 1 : 0, true);
+        return VFS.SQLITE_OK;
+    }
+    jOpen(zName, fileId, flags, pOutFlags) {
+        if (flags & VFS.SQLITE_OPEN_MAIN_DB) {
+            this.#openedFiles.set(fileId, mainDbSentinel);
+        }
+        else {
+            // Treat all other files, including the mostly unused journal as temporary.
+            zName ??= `tmp-${crypto.randomUUID()}`;
+            const existing = this.#files.get(zName);
+            if (existing != null) {
+                this.#openedFiles.set(fileId, existing);
+            }
+            else {
+                if (!(flags & VFS.SQLITE_OPEN_CREATE)) {
+                    return VFS.SQLITE_IOERR;
+                }
+                const newFile = new LocalFile(zName);
+                newFile.deleteOnClose = (flags & VFS.SQLITE_OPEN_DELETEONCLOSE) != 0;
+                this.#openedFiles.set(fileId, newFile);
+                this.#files.set(zName, newFile);
+            }
+        }
+        pOutFlags.setInt32(0, flags, true);
+        return VFS.SQLITE_OK;
+    }
+    jClose(fileid) {
+        const file = this.#openedFiles.get(fileid);
+        this.#openedFiles.delete(fileid);
+        if (file != mainDbSentinel && file.deleteOnClose) {
+            this.#files.delete(file.name);
+        }
+        return VFS.SQLITE_OK;
+    }
+    jRead(fileId, data, offset) {
+        const file = this.#openedFiles.get(fileId);
+        let endOffset;
+        let readableBytes;
+        if (file == mainDbSentinel) {
+            const { fileSize, overlay } = this.writeAheadState;
+            const startOffset = Math.min(offset, fileSize);
+            endOffset = Math.min(fileSize, offset + data.byteLength);
+            readableBytes = endOffset - startOffset;
+            // Try reading from the write-ahead overlay first. A read on the database file is always a complete page, except
+            // when reading from the 100-byte header.
+            const page = overlay.get(offset < 100 ? 0 : offset);
+            if (page != null) {
+                const pageOffset = page.logOffset;
+                const source = new Uint8Array(this.buffers.writeAheadLog, offset < 100 ? pageOffset + offset : pageOffset, readableBytes);
+                data.set(source);
+            }
+            else {
+                // Page is not in WAL overlay, read directly from underlying in-memory buffer.
+                data.set(new Uint8Array(this.buffers.database, startOffset, readableBytes));
+            }
+        }
+        else {
+            const fileSize = file.size;
+            const startOffset = Math.min(offset, fileSize);
+            endOffset = Math.min(fileSize, offset + data.byteLength);
+            readableBytes = endOffset - startOffset;
+            if (readableBytes > 0) {
+                data.set(new Uint8Array(file.buffer, startOffset, readableBytes));
+            }
+        }
+        if (readableBytes < data.byteLength) {
+            data.fill(0, readableBytes); // Fill rest with zeroes.
+            return VFS.SQLITE_IOERR_SHORT_READ;
+        }
+        return VFS.SQLITE_OK;
+    }
+    jWrite(fileId, data, offset) {
+        const file = this.#openedFiles.get(fileId);
+        // wa-sqlite passes a proxy instead of a real Uint8Array.
+        const actualBuffer = data.subarray();
+        if (file === mainDbSentinel) {
+            // Write to the write-ahead overlay.
+            let didWrite = false;
+            if (this.#tx != null) {
+                didWrite = this.#tx.appendPage(offset, actualBuffer);
+            }
+            else {
+                const tx = new WriteAheadTransaction(this.writeAheadState.walEnd, this.writeAheadState.fileSize, this.buffers);
+                didWrite = tx.appendPage(offset, actualBuffer);
+                this.#commit(tx);
+            }
+            return didWrite ? VFS.SQLITE_OK : VFS.SQLITE_FULL;
+        }
+        else {
+            const writeLength = data.length;
+            const endOffset = offset + writeLength;
+            if (endOffset > file.buffer.byteLength) {
+                const didGrow = file.growBuffer(endOffset);
+                if (!didGrow) {
+                    return VFS.SQLITE_FULL;
+                }
+            }
+            new Uint8Array(file.buffer, offset, writeLength).set(actualBuffer);
+            file.size = Math.max(file.size, endOffset);
+            return VFS.SQLITE_OK;
+        }
+    }
+    jTruncate(fileid, size) {
+        const file = this.#openedFiles.get(fileid);
+        if (file === mainDbSentinel) {
+            this.writeAheadState.fileSize = Math.min(this.writeAheadState.fileSize, size);
+        }
+        else {
+            file.size = Math.min(size, file.size);
+        }
+        return VFS.SQLITE_OK;
+    }
+    jFileSize(fileid, pSize64) {
+        const file = this.#openedFiles.get(fileid);
+        if (file === mainDbSentinel) {
+            pSize64.setBigInt64(0, BigInt(this.writeAheadState.fileSize), true);
+        }
+        else {
+            pSize64.setBigInt64(0, BigInt(file.size), true);
+        }
+        return VFS.SQLITE_OK;
+    }
+    jDelete(name) {
+        if (name === '/database') {
+            return VFS.SQLITE_IOERR_DELETE;
+        }
+        this.#files.delete(name);
+        return VFS.SQLITE_OK;
+    }
+    jDeviceCharacteristics() {
+        return VFS.SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | VFS.SQLITE_IOCAP_BATCH_ATOMIC;
+    }
+    jFileControl(fileid, op) {
+        const file = this.#openedFiles.get(fileid);
+        if (file !== mainDbSentinel)
+            return VFS.SQLITE_NOTFOUND;
+        switch (op) {
+            case VFS.SQLITE_FCNTL_BEGIN_ATOMIC_WRITE:
+                this.#tx = new WriteAheadTransaction(this.writeAheadState.walEnd, this.writeAheadState.fileSize, this.buffers);
+                break;
+            case VFS.SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE:
+                this.#tx = undefined;
+                break;
+            case VFS.SQLITE_FCNTL_COMMIT_ATOMIC_WRITE:
+                this.#commit(this.#tx);
+                this.#tx = undefined;
+                break;
+            default:
+                return VFS.SQLITE_NOTFOUND;
+        }
+        return VFS.SQLITE_OK;
+    }
+    #commit(tx) {
+        this.writeAheadState.walEnd = tx.walEndOffset;
+        this.writeAheadState.fileSize = tx.fileSize;
+        tx.changedPages.forEach((walEntry, databaseOffset) => {
+            this.#newOverlayPagesToSendToMainTab.set(databaseOffset, walEntry);
+            this.writeAheadState.overlay.set(databaseOffset, walEntry);
+        });
+    }
+}
+class WriteAheadTransaction {
+    buffers;
+    walEndOffset;
+    fileSize;
+    changedPages = new Map();
+    constructor(endOffset, fileSize, buffers) {
+        this.buffers = buffers;
+        this.walEndOffset = endOffset;
+        this.fileSize = fileSize;
+    }
+    appendPage(offset, data) {
+        const currentEnd = this.walEndOffset;
+        const newEnd = currentEnd + data.length;
+        const wal = this.buffers.writeAheadLog;
+        if (newEnd > wal.byteLength) {
+            if (!this.#growWal(wal, newEnd))
+                return false;
+        }
+        this.fileSize = Math.max(this.fileSize, offset + data.length);
+        new Uint8Array(wal, currentEnd, data.length).set(data);
+        this.walEndOffset = newEnd;
+        this.changedPages.set(offset, { logOffset: currentEnd, size: data.length });
+        return true;
+    }
+    #growWal(buffer, minSize) {
+        const newSize = Math.max(minSize, Math.min(2 * buffer.byteLength, buffer.maxByteLength));
+        if (newSize > buffer.maxByteLength) {
+            return false;
+        }
+        buffer.grow(newSize);
+        return true;
+    }
+}
+class LocalFile {
+    deleteOnClose = false;
+    name;
+    buffer = new ArrayBuffer(1024);
+    size = 0;
+    constructor(name) {
+        this.name = name;
+    }
+    growBuffer(minSize) {
+        const newSize = Math.max(minSize, 2 * this.buffer.byteLength);
+        const newBuffer = new ArrayBuffer(newSize);
+        new Uint8Array(newBuffer).set(new Uint8Array(this.buffer));
+        this.buffer = newBuffer;
+        return true;
+    }
+}
+//# sourceMappingURL=vfs.js.map

package/lib/db/adapters/memory-pool/vfs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vfs.js","sourceRoot":"","sources":["../../../../src/db/adapters/memory-pool/vfs.ts"],"names":[],"mappings":"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"}

package/lib/db/adapters/memory-pool/worker.js

@@ -0,0 +1,45 @@
+import * as Comlink from 'comlink';
+import { applyWalChanges } from './shared.js';
+import { InMemoryWriteAheadLog } from './vfs.js';
+import { RawSqliteConnection } from '../wa-sqlite/RawSqliteConnection.js';
+import { WASQLiteVFS } from '../wa-sqlite/vfs.js';
+import { TemporaryStorageOption } from '../options.js';
+class MemoryDatabaseServer {
+    #vfs;
+    #connection;
+    async open(buffers, options) {
+        const { default: factory } = await import('@journeyapps/wa-sqlite/dist/wa-sqlite.mjs');
+        const module = await factory();
+        const vfs = (this.#vfs = new InMemoryWriteAheadLog(module, buffers));
+        const connection = new RawSqliteConnection({
+            encryptionKey: undefined,
+            vfs: WASQLiteVFS.InMemoryVfs,
+            // Unused, since we register our own VFS. Only needed to satisfy the type.
+            temporaryStorage: TemporaryStorageOption.MEMORY,
+            cacheSizeKb: 50 * 1024,
+            preparedStatementsCache: 0,
+            ...options,
+            // The rest of these options is not overridable: The VFS handles /database reads and writes in a special way and
+            // there can only be one database per buffers instance.
+            filename: '/database',
+            readonly: false
+        });
+        await connection.initWithModule(module, vfs);
+        this.#connection = connection;
+    }
+    async updateWalState(overlay) {
+        const currentState = this.#vfs.writeAheadState;
+        applyWalChanges(currentState, overlay);
+    }
+    async executeRaw(query, params) {
+        return await this.#connection.execute(query, params);
+    }
+    async executeBatch(query, params) {
+        return await this.#connection.executeBatch(query, params);
+    }
+    async takeWalChanges() {
+        return this.#vfs.takeChanges();
+    }
+}
+Comlink.expose(new MemoryDatabaseServer());
+//# sourceMappingURL=worker.js.map

package/lib/db/adapters/memory-pool/worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../../src/db/adapters/memory-pool/worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,eAAe,EAAqD,MAAM,aAAa,CAAC;AAEjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAA4C,MAAM,qCAAqC,CAAC;AACpH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,oBAAoB;IACxB,IAAI,CAAyB;IAC7B,WAAW,CAAuB;IAElC,KAAK,CAAC,IAAI,CAAC,OAA0B,EAAE,OAA4C;QACjF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,2CAA2C,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAErE,MAAM,UAAU,GAAG,IAAI,mBAAmB,CAAC;YACzC,aAAa,EAAE,SAAS;YACxB,GAAG,EAAE,WAAW,CAAC,WAAW;YAC5B,0EAA0E;YAC1E,gBAAgB,EAAE,sBAAsB,CAAC,MAAM;YAC/C,WAAW,EAAE,EAAE,GAAG,IAAI;YACtB,uBAAuB,EAAE,CAAC;YAC1B,GAAG,OAAO;YACV,gHAAgH;YAChH,uDAAuD;YACvD,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,MAAM,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAuB;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;QAC/C,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,MAA0B;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,MAAe;QAC/C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;CACF;AAED,OAAO,CAAC,MAAM,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC"}

package/lib/db/adapters/options.d.ts

@@ -0,0 +1,94 @@
+import { SQLOpenOptions } from '@powersync/common';
+import { WASQLiteVFS } from './wa-sqlite/vfs.js';
+export interface WebSpecificOpenOptions {
+    /**
+     * SQLite operations are currently not supported in SSR mode.
+     * A warning will be logged if attempting to use SQLite in SSR.
+     * Setting this to `true` will disabled the warning above.
+     */
+    disableSSRWarning: boolean;
+    /**
+     * Enables multi tab support.
+     *
+     * Enabling multi-tab support will transparently make PowerSync manage the sync process in a shared worker collecting
+     * Sync Streams across tabs. Additionally, it enables a shared worker for IndexedDB databases.
+     *
+     * It is still valid to open multiple tabs when this option is disabled, but the experience may be degrated as only
+     * one tab can sync at the time.
+     *
+     * This is enabled by default on Desktop browsers if shared workers are enabled, except for Safari.
+     */
+    enableMultiTabs: boolean;
+    /**
+     * The SQLite connection is often executed through a web worker in order to offload computation and because some file
+     * system implementations (notably those based on web filesystem APIs like OPFS) are only available in workers.
+     *
+     * Manually disabling the use of web workers is not recommended, but can be useful for testing or for environments
+     * or toolchains where web workers are not supported.
+     */
+    useWebWorker: boolean;
+    /**
+     * Open in SSR placeholder mode. DB operations and Sync operations will be a No-op
+     */
+    ssrMode: boolean;
+    /**
+     * The log level for database workers.
+     *
+     * Defaults to {@link LogLevels.info}.
+     */
+    databaseWorkerLogLevel: number;
+    /**
+     * Where to store SQLite temporary files. Defaults to 'MEMORY'.
+     * Setting this to `FILESYSTEM` can cause issues with larger queries or datasets.
+     */
+    temporaryStorage: TemporaryStorageOption;
+    /**
+     * Maximum SQLite cache size. Defaults to 50MB.
+     *
+     * For details, see: https://www.sqlite.org/pragma.html#pragma_cache_size
+     */
+    cacheSizeKb: number;
+    /**
+     * Encryption key for the database.
+     * If set, the database will be encrypted using ChaCha20.
+     */
+    encryptionKey: string | undefined;
+    vfs: WASQLiteVFS;
+    /**
+     * If the {@link vfs} supports it, an additional amount of read-only connections to open. Using additional read
+     * connections can speed up queries by dispatching them to multiple workers running them concurrently.
+     *
+     * {@link WASQLiteVFS.OPFSWriteAheadVFS} is the only VFS with support for multiple connections, so this option is
+     * ignored for other VFS implementations.
+     *
+     * Defaults to 1.
+     */
+    additionalReaders: number;
+    /**
+     * Allows you to override the default wasqlite db worker.
+     *
+     * You can either provide a path to the worker script
+     * or a factory method that returns a worker.
+     */
+    worker?: string | URL | ((options: ResolvedWebSQLOpenOptions) => Worker | SharedWorker);
+    /**
+     * Use an existing port to an initialized worker.
+     * A worker will be initialized if none is provided
+     */
+    workerPort?: MessagePort | undefined;
+    /**
+     * If set to a value greater than zero, the worker will cache prepared statements to avoid preparing them every time
+     * a query runs.
+     *
+     * Defaults to 0 (disabling the cache).
+     */
+    preparedStatementsCache?: number;
+}
+export interface ResolvedWebSQLOpenOptions extends SQLOpenOptions, WebSpecificOpenOptions {
+}
+export interface WebSQLOpenOptions extends SQLOpenOptions, Partial<WebSpecificOpenOptions> {
+}
+export declare enum TemporaryStorageOption {
+    MEMORY = "memory",
+    FILESYSTEM = "file"
+}

package/lib/db/adapters/options.js

@@ -0,0 +1,6 @@
+export var TemporaryStorageOption;
+(function (TemporaryStorageOption) {
+    TemporaryStorageOption["MEMORY"] = "memory";
+    TemporaryStorageOption["FILESYSTEM"] = "file";
+})(TemporaryStorageOption || (TemporaryStorageOption = {}));
+//# sourceMappingURL=options.js.map

package/lib/db/adapters/options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/db/adapters/options.ts"],"names":[],"mappings":"AAwGA,MAAM,CAAN,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,2CAAiB,CAAA;IACjB,6CAAmB,CAAA;AACrB,CAAC,EAHW,sBAAsB,KAAtB,sBAAsB,QAGjC"}

package/lib/db/adapters/resolveAndValidateOptions.d.ts

@@ -0,0 +1,13 @@
+import { WebSpecificOpenOptions } from './options.js';
+/**
+ * The maximum length of a db filename we support.
+ *
+ * We configure the same on WA-SQLite (which otherwise defaults to a maximum length of 64). We don't want to support
+ * very long path names as Safari maps OPFS files directly to OS files, and APFS has a 255-byte filename limit. Since
+ * some VFS append additional characters for pooled file access handles, we want to stay well below that.
+ */
+export declare const maxPathNameLength = 128;
+/**
+ * @internal
+ */
+export declare function resolveAndValidateOptions<And = {}>(options: Partial<WebSpecificOpenOptions> & And): WebSpecificOpenOptions & And;

package/lib/db/adapters/resolveAndValidateOptions.js

@@ -0,0 +1,41 @@
+import { LogLevels } from '@powersync/common';
+import { TemporaryStorageOption } from './options.js';
+import { vfsRequiresDedicatedWorkers, WASQLiteVFS } from './wa-sqlite/vfs.js';
+/**
+ * The maximum length of a db filename we support.
+ *
+ * We configure the same on WA-SQLite (which otherwise defaults to a maximum length of 64). We don't want to support
+ * very long path names as Safari maps OPFS files directly to OS files, and APFS has a 255-byte filename limit. Since
+ * some VFS append additional characters for pooled file access handles, we want to stay well below that.
+ */
+export const maxPathNameLength = 128;
+/**
+ * @internal
+ */
+export function resolveAndValidateOptions(options) {
+    const defaults = {
+        disableSSRWarning: false,
+        ssrMode: !('window' in globalThis),
+        /**
+         * Multiple tabs are by default not supported on Android, iOS and Safari.
+         * Other platforms will have multiple tabs enabled by default.
+         */
+        enableMultiTabs: typeof globalThis.navigator !== 'undefined' && // For SSR purposes
+            typeof SharedWorker !== 'undefined' &&
+            !navigator.userAgent.match(/(Android|iPhone|iPod|iPad)/i) &&
+            !window.safari,
+        useWebWorker: true,
+        databaseWorkerLogLevel: LogLevels.info,
+        temporaryStorage: TemporaryStorageOption.MEMORY,
+        cacheSizeKb: 50 * 1024,
+        encryptionKey: undefined,
+        vfs: WASQLiteVFS.IDBBatchAtomicVFS,
+        additionalReaders: 1
+    };
+    const resolved = Object.assign(defaults, options);
+    if (vfsRequiresDedicatedWorkers(resolved.vfs) && !resolved.useWebWorker) {
+        throw new Error(`Invalid configuration: The 'useWebWorker' flag must be true when using an OPFS-based VFS (${resolved.vfs}).`);
+    }
+    return resolved;
+}
+//# sourceMappingURL=resolveAndValidateOptions.js.map

package/lib/db/adapters/resolveAndValidateOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveAndValidateOptions.js","sourceRoot":"","sources":["../../../src/db/adapters/resolveAndValidateOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAA0B,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAErC;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA8C;IAE9C,MAAM,QAAQ,GAA2B;QACvC,iBAAiB,EAAE,KAAK;QACxB,OAAO,EAAE,CAAC,CAAC,QAAQ,IAAI,UAAU,CAAC;QAClC;;;WAGG;QACH,eAAe,EACb,OAAO,UAAU,CAAC,SAAS,KAAK,WAAW,IAAI,mBAAmB;YAClE,OAAO,YAAY,KAAK,WAAW;YACnC,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,6BAA6B,CAAC;YACzD,CAAE,MAAc,CAAC,MAAM;QACzB,YAAY,EAAE,IAAI;QAClB,sBAAsB,EAAE,SAAS,CAAC,IAAI;QACtC,gBAAgB,EAAE,sBAAsB,CAAC,MAAM;QAC/C,WAAW,EAAE,EAAE,GAAG,IAAI;QACtB,aAAa,EAAE,SAAS;QACxB,GAAG,EAAE,WAAW,CAAC,iBAAiB;QAClC,iBAAiB,EAAE,CAAC;KACrB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,2BAA2B,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QACxE,MAAM,IAAI,KAAK,CACb,6FAA6F,QAAQ,CAAC,GAAG,IAAI,CAC9G,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/lib/{src/db → db}/adapters/wa-sqlite/ConcurrentConnection.d.ts

@@ -1,6 +1,5 @@
-import { UnlockFn } from '@powersync/common';
-import { RawSqliteConnection } from './RawSqliteConnection.js';
-import { ResolvedWASQLiteOpenFactoryOptions } from './WASQLiteOpenFactory.js';
+import { UnlockFn } from '@powersync/shared-internals';
+import { RawSqliteConnection, RawWaSqliteDatabaseOptions } from './RawSqliteConnection.js';
 /**
  * A wrapper around a {@link RawSqliteConnection} allowing multiple tabs to access it.
  *
@@ -26,7 +25,7 @@ export declare class ConcurrentSqliteConnection {
      * In those setups, we use navigator locks instead of an internal mutex to guard access..
      */
     constructor(inner: RawSqliteConnection, needsNavigatorLocks: boolean);
-    get options(): ResolvedWASQLiteOpenFactoryOptions;
+    get options(): RawWaSqliteDatabaseOptions;
     acquireMutex(abort?: AbortSignal): Promise<UnlockFn>;
     unsafeUseInner(): RawSqliteConnection;
     /**

package/lib/{src/db → db}/adapters/wa-sqlite/ConcurrentConnection.js

@@ -1,4 +1,4 @@
-import { Mutex } from '@powersync/common';
+import { Mutex } from '@powersync/shared-internals';
 /**
  * A wrapper around a {@link RawSqliteConnection} allowing multiple tabs to access it.
  *
@@ -37,7 +37,7 @@ export class ConcurrentSqliteConnection {
         return new Promise((resolve, reject) => {
             const options = { signal: abort };
             navigator.locks
-                .request(`db-lock-${this.options.dbFilename}`, options, (_) => {
+                .request(`db-lock-${this.options.filename}`, options, (_) => {
                 return new Promise((returnLock) => {
                     return resolve(() => {
                         returnLock();

package/lib/db/adapters/wa-sqlite/ConcurrentConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConcurrentConnection.js","sourceRoot":"","sources":["../../../../src/db/adapters/wa-sqlite/ConcurrentConnection.ts"],"names":[],"mappings":"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"}

package/lib/{src/db → db}/adapters/wa-sqlite/DatabaseClient.d.ts

@@ -1,10 +1,10 @@
-import { LockContext, DBLockOptions, DBAdapterListener, ConnectionPool, BaseObserver, SQLOpenOptions } from '@powersync/common';
+import { LockContext, DBLockOptions, SQLOpenOptions, DBAdapter } from '@powersync/common';
 import { SharedConnectionWorker, WebDBAdapterConfiguration } from '../WebDBAdapter.js';
 import { ClientConnectionView } from './DatabaseServer.js';
 import * as Comlink from 'comlink';
-import { WorkerDBOpenerOptions } from './WASQLiteOpenFactory.js';
+import type { ConnectToMultiDatabaseServerOptions } from '../../../worker/db/MultiDatabaseServer.js';
 export interface OpenWorkerConnection {
-    connect(config: WorkerDBOpenerOptions): Promise<ClientConnectionView>;
+    connect(config: ConnectToMultiDatabaseServerOptions): Promise<ClientConnectionView>;
     connectToExisting(options: {
         identifier: string;
         lockName: string;
@@ -31,7 +31,7 @@ export interface ClientOptions {
 /**
  * A single-connection {@link ConnectionPool} implementation based on a worker connection.
  */
-export declare class DatabaseClient<Config extends SQLOpenOptions = WebDBAdapterConfiguration> extends BaseObserver<DBAdapterListener> implements ConnectionPool {
+export declare class DatabaseClient<Config extends SQLOpenOptions = WebDBAdapterConfiguration> extends DBAdapter {
     #private;
     private readonly options;
     private readonly config;

package/lib/{src/db → db}/adapters/wa-sqlite/DatabaseClient.js

@@ -1,9 +1,10 @@
-import { DBGetUtilsDefaultMixin, BaseObserver, ConnectionClosedError } from '@powersync/common';
+import { LockContext, DBAdapter, queryResultWithoutRows } from '@powersync/common';
 import * as Comlink from 'comlink';
+import { ConnectionClosedError } from '@powersync/shared-internals';
 /**
  * A single-connection {@link ConnectionPool} implementation based on a worker connection.
  */
-export class DatabaseClient extends BaseObserver {
+export class DatabaseClient extends DBAdapter {
     options;
     config;
     #connection;
@@ -24,9 +25,7 @@ export class DatabaseClient extends BaseObserver {
         port2.onmessage = (event) => {
             const tables = event.data;
             const notification = {
-                tables,
-                groupedUpdates: {},
-                rawUpdates: []
+                tables
             };
             this.iterateListeners((l) => {
                 l.tablesUpdated && l.tablesUpdated(notification);
@@ -120,15 +119,16 @@ export class DatabaseClient extends BaseObserver {
     }
 }
 /**
- * A {@link SqlExecutor} implemented by sending commands to a worker.
+ * A {@link LockContext} 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 {
+class ClientLockContext extends LockContext {
     #connection;
     #token;
     constructor(connection, token) {
+        super();
         this.#connection = connection;
         this.#token = token;
     }
@@ -153,32 +153,8 @@ class ClientSqlExecutor {
             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
-        };
-    }
     async executeRaw(query, params) {
-        const rs = await this.#executeOnWorker(query, params);
-        return rs.resultSet?.rows ?? [];
+        return await this.#executeOnWorker(query, params);
     }
     async #executeOnWorker(query, params) {
         return this.maybeTrace((c) => c.execute(this.#token, query, params), () => query);
@@ -187,14 +163,12 @@ class ClientSqlExecutor {
         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;
+            result.insertId = source.insertId;
+            result.rowsAffected = (result.rowsAffected ?? 0) + source.rowsAffected;
         }
-        return result;
+        return queryResultWithoutRows(result);
     }
 }
-class ClientLockContext extends DBGetUtilsDefaultMixin(ClientSqlExecutor) {
-}
 async function useConnectionState(state, workerPromise, fireActionOnAbort = false) {
     const controller = state.notifyRemoteClosed;
     if (controller) {