cleanup

Author: stevensJourney

packages/common/src/client/AbstractPowerSyncDatabase.ts

@@ -204,6 +204,8 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
    */
   protected pendingConnectionOptions: StoredConnectionOptions | null;
 
+  protected connectionMutex: Mutex;
+
   constructor(options: PowerSyncDatabaseOptionsWithDBAdapter);
   constructor(options: PowerSyncDatabaseOptionsWithOpenFactory);
   constructor(options: PowerSyncDatabaseOptionsWithSettings);
@@ -237,6 +239,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
     this.connectingPromise = null;
     this.syncStreamInitPromise = null;
     this.pendingConnectionOptions = null;
+    this.connectionMutex = new Mutex();
     // Start async init
     this._isReadyPromise = this.initialize();
   }
@@ -460,7 +463,9 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
    * Locking mechanism for exclusively running critical portions of connect/disconnect operations.
    * Locking here is mostly only important on web for multiple tab scenarios.
    */
-  protected abstract runExclusive<T>(callback: () => Promise<T>): Promise<T>;
+  protected runExclusive<T>(callback: () => Promise<T>): Promise<T> {
+    return this.connectionMutex.runExclusive(callback);
+  }
 
   protected async connectInternal() {
     let appliedOptions: PowerSyncConnectionOptions | null = null;

packages/node/src/db/PowerSyncDatabase.ts

@@ -16,7 +16,6 @@ import {
 import { NodeRemote } from '../sync/stream/NodeRemote.js';
 import { NodeStreamingSyncImplementation } from '../sync/stream/NodeStreamingSyncImplementation.js';
 
-import Lock from 'async-lock';
 import { Dispatcher } from 'undici';
 import { BetterSQLite3DBAdapter } from './BetterSQLite3DBAdapter.js';
 import { NodeSQLOpenOptions } from './options.js';
@@ -56,11 +55,8 @@ export type NodePowerSyncConnectionOptions = PowerSyncConnectionOptions & NodeAd
  * ```
  */
 export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
-  protected lock: Lock;
-
   constructor(options: NodePowerSyncDatabaseOptions) {
     super(options);
-    this.lock = new Lock();
   }
 
   async _initialize(): Promise<void> {
@@ -85,10 +81,6 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
     return super.connect(connector, options);
   }
 
-  protected async runExclusive<T>(callback: () => Promise<T>): Promise<T> {
-    return await this.lock.acquire(`lock-${this.database.name}`, callback);
-  }
-
   protected generateSyncStreamImplementation(
     connector: PowerSyncBackendConnector,
     options: NodeAdditionalConnectionOptions

packages/react-native/src/db/PowerSyncDatabase.ts

@@ -8,7 +8,6 @@ import {
   type RequiredAdditionalConnectionOptions,
   SqliteBucketStorage
 } from '@powersync/common';
-import Lock from 'async-lock';
 import { ReactNativeRemote } from '../sync/stream/ReactNativeRemote';
 import { ReactNativeStreamingSyncImplementation } from '../sync/stream/ReactNativeStreamingSyncImplementation';
 import { ReactNativeQuickSqliteOpenFactory } from './adapters/react-native-quick-sqlite/ReactNativeQuickSQLiteOpenFactory';
@@ -28,8 +27,6 @@ import { ReactNativeQuickSqliteOpenFactory } from './adapters/react-native-quick
  * ```
  */
 export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
-  protected lock = new Lock();
-
   async _initialize(): Promise<void> {}
 
   /**
@@ -45,10 +42,6 @@ export class PowerSyncDatabase extends AbstractPowerSyncDatabase {
     return new SqliteBucketStorage(this.database, AbstractPowerSyncDatabase.transactionMutex);
   }
 
-  protected async runExclusive<T>(callback: () => Promise<T>): Promise<T> {
-    return await this.lock.acquire(`lock-${this.database.name}`, callback);
-  }
-
   protected generateSyncStreamImplementation(
     connector: PowerSyncBackendConnector,
     options: RequiredAdditionalConnectionOptions