From ff6a918a97a69afb606ea9cd88bdc0c699b08a0c Mon Sep 17 00:00:00 2001
From: Steven Ontong <steven@journeyapps.com>
Date: Mon, 15 Jan 2024 11:05:18 +0200
Subject: [PATCH] improve crud watching

---
 .../src/client/AbstractPowerSyncDatabase.ts          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts b/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts
index 35f9df11..e46e0232 100644
--- a/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts
+++ b/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts
@@ -150,7 +150,6 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
     this.sdkVersion = version.rows?.item(0)['powersync_rs_version()'] ?? '';
     this.ready = true;
     this.iterateListeners((cb) => cb.initialized?.());
-    this.watchCrudUploads();
   }
 
   /**
@@ -159,11 +158,10 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
   protected async watchCrudUploads() {
     for await (const event of this.onChange({
       tables: [PSInternalTable.CRUD],
-      rawTableNames: true
+      rawTableNames: true,
+      signal: this.abortController?.signal
     })) {
-      if (this.connected) {
-        this.syncStreamImplementation?.triggerCrudUpload();
-      }
+      this.syncStreamImplementation?.triggerCrudUpload();
     }
   }
 
@@ -195,6 +193,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
     // Begin network stream
     this.syncStreamImplementation.triggerCrudUpload();
     this.syncStreamImplementation.streamingSync(this.abortController.signal);
+    this.watchCrudUploads();
   }
 
   async disconnect() {
@@ -381,8 +380,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
    */
   async execute(sql: string, parameters?: any[]) {
     await this.waitForReady();
-    const result = await this.database.execute(sql, parameters);
-    return result;
+    return this.database.execute(sql, parameters);
   }
 
   /**