Merge branch 'main' into profiling-logs

Author: rkistner

.changeset/wicked-wolves-greet.md

@@ -0,0 +1,5 @@
+---
+'@powersync/node': patch
+---
+
+Throw when database is used after being closed.

.github/workflows/build-packages.yaml

@@ -43,3 +43,6 @@ jobs:
 
       - name: Build
         run: pnpm build:packages
+
+      - name: Build (prod)
+        run: pnpm build:packages:prod

packages/node/package.json

@@ -70,7 +70,7 @@
     "async-mutex": "^0.5.0",
     "comlink": "^4.4.2",
     "undici": "^7.11.0",
-      "bson": "^6.10.4"
+    "bson": "^6.10.4"
   },
   "devDependencies": {
     "@powersync/drizzle-driver": "workspace:*",

packages/node/src/db/RemoteConnection.ts

@@ -11,49 +11,73 @@ export class RemoteConnection implements LockContext {
 
   private readonly worker: Worker;
   private readonly comlink: Remote<AsyncDatabaseOpener>;
-  readonly database: Remote<AsyncDatabase>;
+  private readonly database: Remote<AsyncDatabase>;
+
+  private readonly notifyWorkerClosed = new AbortController();
 
   constructor(worker: Worker, comlink: Remote<AsyncDatabaseOpener>, database: Remote<AsyncDatabase>) {
     this.worker = worker;
     this.comlink = comlink;
     this.database = database;
+
+    this.worker.once('exit', (_) => {
+      this.notifyWorkerClosed.abort();
+    });
   }
 
   /**
    * Runs the inner function, but appends the stack trace where this function was called. This is useful for workers
    * because stack traces from worker errors are otherwise unrelated to the application issue that has caused them.
    */
-  private async recoverTrace<T>(inner: () => Promise<T>): Promise<T> {
+  private withRemote<T>(inner: () => Promise<T>): Promise<T> {
     const trace = {};
     Error.captureStackTrace(trace);
+    const controller = this.notifyWorkerClosed;
 
-    try {
-      return await inner();
-    } catch (e) {
-      if (e instanceof Error && e.stack) {
-        e.stack += (trace as any).stack;
+    return new Promise((resolve, reject) => {
+      if (controller.signal.aborted) {
+        reject(new Error('Called operation on closed remote'));
       }
 
-      throw e;
-    }
+      function handleAbort() {
+        reject(new Error('Remote peer closed with request in flight'));
+      }
+
+      function completePromise(action: () => void) {
+        controller!.signal.removeEventListener('abort', handleAbort);
+        action();
+      }
+
+      controller.signal.addEventListener('abort', handleAbort);
+
+      inner()
+        .then((data) => completePromise(() => resolve(data)))
+        .catch((e) => {
+          if (e instanceof Error && e.stack) {
+            e.stack += (trace as any).stack;
+          }
+
+          return completePromise(() => reject(e));
+        });
+    });
   }
 
   executeBatch(query: string, params: any[][] = []): Promise<QueryResult> {
-    return this.recoverTrace(async () => {
+    return this.withRemote(async () => {
       const result = await this.database.executeBatch(query, params ?? []);
       return RemoteConnection.wrapQueryResult(result);
     });
   }
 
   execute(query: string, params?: any[] | undefined): Promise<QueryResult> {
-    return this.recoverTrace(async () => {
+    return this.withRemote(async () => {
       const result = await this.database.execute(query, params ?? []);
       return RemoteConnection.wrapQueryResult(result);
     });
   }
 
   executeRaw(query: string, params?: any[] | undefined): Promise<any[][]> {
-    return this.recoverTrace(async () => {
+    return this.withRemote(async () => {
       return await this.database.executeRaw(query, params ?? []);
     });
   }

packages/node/src/db/WorkerConnectionPool.ts

@@ -213,10 +213,7 @@ export class WorkerConnectionPool extends BaseObserver<DBAdapterListener> implem
         try {
           return await fn(this.writeConnection);
         } finally {
-          const serializedUpdates = await this.writeConnection.database.executeRaw(
-            "SELECT powersync_update_hooks('get');",
-            []
-          );
+          const serializedUpdates = await this.writeConnection.executeRaw("SELECT powersync_update_hooks('get');", []);
           const updates = JSON.parse(serializedUpdates[0][0] as string) as string[];
 
           if (updates.length > 0) {