More migrations

Author: simolus3

packages/attachments/rollup.config.js

@@ -5,18 +5,13 @@ import { dts } from 'rollup-plugin-dts';
 
 /** @type {import('rollup').RollupOptions} */
 export default (commandLineArgs) => {
-  const sourceMap = (commandLineArgs.sourceMap || 'true') == 'true';
-
-  // Clears rollup CLI warning https://github.com/rollup/rollup/issues/2694
-  delete commandLineArgs.sourceMap;
-
   return [
     {
       input: 'src/index.ts',
       output: {
         format: 'cjs',
         file: 'dist/index.cjs',
-        sourcemap: sourceMap,
+        sourcemap: true,
         exports: 'named'
       },
       plugins: [
@@ -25,7 +20,7 @@ export default (commandLineArgs) => {
         typescript({
           tsconfig: './tsconfig.json',
           outDir: 'dist',
-          sourceMap
+          sourceMap: true
         })
       ],
       external: ['@powersync/common']

packages/node/package.json

@@ -66,13 +66,13 @@
   },
   "dependencies": {
     "@powersync/common": "workspace:*",
+    "async-mutex": "^0.5.0",
     "comlink": "^4.4.2",
     "undici": "^7.11.0",
       "bson": "^6.10.4"
   },
   "devDependencies": {
     "@powersync/drizzle-driver": "workspace:*",
-    "@types/async-lock": "^1.4.0",
     "@types/node": "^24.2.0",
     "better-sqlite3": "^12.2.0",
     "drizzle-orm": "^0.35.2",

packages/node/src/sync/stream/NodeStreamingSyncImplementation.ts

@@ -4,18 +4,18 @@ import {
   LockOptions,
   LockType
 } from '@powersync/common';
-import Lock from 'async-lock';
+import { Mutex } from 'async-mutex';
 
 /**
  * Global locks which prevent multiple instances from syncing
  * concurrently.
  */
-const LOCKS = new Map<string, Lock>();
+const LOCKS = new Map<string, Map<LockType, Mutex>>();
 
 const lockTypes = new Set(Object.values(LockType));
 
 export class NodeStreamingSyncImplementation extends AbstractStreamingSyncImplementation {
-  locks: Lock;
+  locks: Map<LockType, Mutex>;
 
   constructor(options: AbstractStreamingSyncImplementationOptions) {
     super(options);
@@ -32,18 +32,21 @@ export class NodeStreamingSyncImplementation extends AbstractStreamingSyncImplem
       return;
     }
 
-    this.locks = new Lock();
+    this.locks = new Map<LockType, Mutex>();
+    this.locks.set(LockType.CRUD, new Mutex());
+    this.locks.set(LockType.SYNC, new Mutex());
 
     if (identifier) {
       LOCKS.set(identifier, this.locks);
     }
   }
 
   obtainLock<T>(lockOptions: LockOptions<T>): Promise<T> {
-    if (!lockTypes.has(lockOptions.type)) {
+    const lock = this.locks.get(lockOptions.type);
+    if (!lock) {
       throw new Error(`Lock type ${lockOptions.type} not found`);
     }
-    return this.locks.acquire(lockOptions.type, async () => {
+    return lock.runExclusive(async () => {
       if (lockOptions.signal?.aborted) {
         throw new Error('Aborted');
       }