@powersync/web 0.0.0-dev-20250711131120 → 0.0.0-dev-20250714151300

package/lib/src/db/PowerSyncDatabase.js

@@ -82,7 +82,7 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
         });
     }
     generateBucketStorageAdapter() {
-        return new SqliteBucketStorage(this.database, AbstractPowerSyncDatabase.transactionMutex);
+        return new SqliteBucketStorage(this.database);
     }
     async runExclusive(cb) {
         if (this.resolvedFlags.ssrMode) {
@@ -91,7 +91,7 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
         return getNavigatorLocks().request(`lock-${this.database.name}`, cb);
     }
     generateSyncStreamImplementation(connector, options) {
-        const remote = new WebRemote(connector, this.logger);
+        const remote = new WebRemote(connector);
         const syncOptions = {
             ...this.options,
             retryDelayMs: options.retryDelayMs,
@@ -103,8 +103,7 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
                 await this.waitForReady();
                 await connector.uploadData(this);
             },
-            identifier: this.database.name,
-            logger: this.logger
+            identifier: this.database.name
         };
         switch (true) {
             case this.resolvedFlags.ssrMode:

package/lib/src/db/adapters/LockedAsyncDatabaseAdapter.d.ts

@@ -29,6 +29,9 @@ export declare class LockedAsyncDatabaseAdapter extends BaseObserver<LockedAsync
     private _db;
     protected _disposeTableChangeListener: (() => void) | null;
     private _config;
+    protected pendingAbortControllers: Set<AbortController>;
+    closing: boolean;
+    closed: boolean;
     constructor(options: LockedAsyncDatabaseAdapterOptions);
     protected get baseDB(): AsyncDatabaseConnection<ResolvedWebSQLOpenOptions>;
     get name(): string;
@@ -63,7 +66,9 @@ export declare class LockedAsyncDatabaseAdapter extends BaseObserver<LockedAsync
     get<T>(sql: string, parameters?: any[] | undefined): Promise<T>;
     readLock<T>(fn: (tx: LockContext) => Promise<T>, options?: DBLockOptions | undefined): Promise<T>;
     writeLock<T>(fn: (tx: LockContext) => Promise<T>, options?: DBLockOptions | undefined): Promise<T>;
-    protected acquireLock(callback: () => Promise<any>): Promise<any>;
+    protected acquireLock(callback: () => Promise<any>, options?: {
+        timeoutMs?: number;
+    }): Promise<any>;
     readTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions | undefined): Promise<T>;
     writeTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions | undefined): Promise<T>;
     private generateDBHelpers;

package/lib/src/db/adapters/LockedAsyncDatabaseAdapter.js

@@ -16,11 +16,17 @@ export class LockedAsyncDatabaseAdapter extends BaseObserver {
     _db = null;
     _disposeTableChangeListener = null;
     _config = null;
+    pendingAbortControllers;
+    closing;
+    closed;
     constructor(options) {
         super();
         this.options = options;
         this._dbIdentifier = options.name;
         this.logger = options.logger ?? createLogger(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
+        this.pendingAbortControllers = new Set();
+        this.closed = false;
+        this.closing = false;
         // Set the name if provided. We can query for the name if not available yet
         this.debugMode = options.debugMode ?? false;
         if (this.debugMode) {
@@ -110,8 +116,11 @@ export class LockedAsyncDatabaseAdapter extends BaseObserver {
      * tabs are still using it.
      */
     async close() {
+        this.closing = true;
         this._disposeTableChangeListener?.();
+        this.pendingAbortControllers.forEach((controller) => controller.abort('Closed'));
         await this.baseDB?.close?.();
+        this.closed = true;
     }
     async getAll(sql, parameters) {
         await this.waitForInitialized();
@@ -127,14 +136,37 @@ export class LockedAsyncDatabaseAdapter extends BaseObserver {
     }
     async readLock(fn, options) {
         await this.waitForInitialized();
-        return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })));
+        return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })), {
+            timeoutMs: options?.timeoutMs
+        });
     }
     async writeLock(fn, options) {
         await this.waitForInitialized();
-        return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })));
+        return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })), {
+            timeoutMs: options?.timeoutMs
+        });
     }
-    acquireLock(callback) {
-        return getNavigatorLocks().request(`db-lock-${this._dbIdentifier}`, callback);
+    async acquireLock(callback, options) {
+        await this.waitForInitialized();
+        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 timoutId = timeoutMs
+            ? setTimeout(() => {
+                abortController.abort(`Timeout after ${timeoutMs}ms`);
+                this.pendingAbortControllers.delete(abortController);
+            }, timeoutMs)
+            : null;
+        return getNavigatorLocks().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, () => {
+            this.pendingAbortControllers.delete(abortController);
+            if (timoutId) {
+                clearTimeout(timoutId);
+            }
+            return callback();
+        });
     }
     async readTransaction(fn, options) {
         return this.readLock(this.wrapTransaction(fn));

package/lib/src/db/sync/SharedWebStreamingSyncImplementation.js

@@ -168,6 +168,7 @@ export class SharedWebStreamingSyncImplementation extends WebStreamingSyncImplem
     }
     async dispose() {
         await this.waitForReady();
+        await super.dispose();
         await new Promise((resolve) => {
             // Listen for the close acknowledgment from the worker
             this.messagePort.addEventListener('message', (event) => {

package/lib/src/worker/sync/SharedSyncImplementation.js

@@ -256,7 +256,7 @@ export class SharedSyncImplementation extends BaseObserver {
         const syncParams = this.syncParams;
         // Create a new StreamingSyncImplementation for each connect call. This is usually done is all SDKs.
         return new WebStreamingSyncImplementation({
-            adapter: new SqliteBucketStorage(this.dbAdapter, new Mutex(), this.logger),
+            adapter: new SqliteBucketStorage(this.dbAdapter, this.logger),
             remote: new WebRemote({
                 invalidateCredentials: async () => {
                     const lastPort = this.ports[this.ports.length - 1];
@@ -354,8 +354,7 @@ export class SharedSyncImplementation extends BaseObserver {
      */
     async _testUpdateAllStatuses(status) {
         if (!this.connectionManager.syncStreamImplementation) {
-            // This is just for testing purposes
-            this.connectionManager.syncStreamImplementation = this.generateStreamingImplementation();
+            throw new Error('Cannot update status without a sync stream implementation');
         }
         // Only assigning, don't call listeners for this test
         this.connectionManager.syncStreamImplementation.syncStatus = new SyncStatus(status);