From 1b612d7dd378712eea098dd2fad252395f592429 Mon Sep 17 00:00:00 2001
From: Steven Ontong <steven@journeyapps.com>
Date: Mon, 13 Nov 2023 09:24:32 +0200
Subject: [PATCH] fix upload crud delay

---
 .changeset/smart-suns-divide.md               |  5 +++
 .../AbstractStreamingSyncImplementation.ts    |  7 +++-
 yarn.lock                                     | 36 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/smart-suns-divide.md

diff --git a/.changeset/smart-suns-divide.md b/.changeset/smart-suns-divide.md
new file mode 100644
index 00000000..6b9066cb
--- /dev/null
+++ b/.changeset/smart-suns-divide.md
@@ -0,0 +1,5 @@
+---
+'@journeyapps/powersync-sdk-common': patch
+---
+
+Fixed streaming sync implementation not delaying CRUD upload retries.
diff --git a/packages/powersync-sdk-common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts b/packages/powersync-sdk-common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts
index 93abcd5f..d0ec1672 100644
--- a/packages/powersync-sdk-common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts
+++ b/packages/powersync-sdk-common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts
@@ -99,6 +99,7 @@ export abstract class AbstractStreamingSyncImplementation extends BaseObserver<S
         }
       } catch (ex) {
         this.updateSyncStatus(false);
+        await this.delayRetry();
         this.isUploadingCrud = false;
         break;
       }
@@ -133,7 +134,7 @@ export abstract class AbstractStreamingSyncImplementation extends BaseObserver<S
         this.logger.error(ex);
         this.updateSyncStatus(false);
         // On error, wait a little before retrying
-        await new Promise((resolve) => setTimeout(resolve, this.options.retryDelayMs));
+        await this.delayRetry();
       }
     }
   }
@@ -309,4 +310,8 @@ export abstract class AbstractStreamingSyncImplementation extends BaseObserver<S
       this.iterateListeners((cb) => cb.statusChanged?.(new SyncStatus(this.isConnected, this.lastSyncedAt)));
     }
   }
+
+  private async delayRetry() {
+    return new Promise((resolve) => setTimeout(resolve, this.options.retryDelayMs));
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index f8c1e147..7b2ba6d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2066,6 +2066,42 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@journeyapps/powersync-attachments@0.0.3":
+  version "0.0.3"
+  resolved "https://registry.npmjs.org/@journeyapps/powersync-attachments/-/powersync-attachments-0.0.3.tgz#9c33da5140edafeb5b054ced6a7365869e14633e"
+  integrity sha512-Aq0O7nFRfvxTddxzY4hJ7mWKl2oz/Ube8URZ+EbPo5rjLm3sTV+UKOZ54eS3bBqYjqAgeVUwCSphkWzs00BClQ==
+  dependencies:
+    "@journeyapps/powersync-sdk-common" "0.1.2"
+
+"@journeyapps/powersync-react@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/@journeyapps/powersync-react/-/powersync-react-0.1.1.tgz#60d12b425a3d16d0f556f89998fb706bc0ba51bf"
+  integrity sha512-bAJDSsyXjE8dbLqGVaKp7UOD09T3piKS1/uYl1j0i/nZjLb1PV5IfBDrO7nzMUj9v38TpT3gW8FitcnnMMCkxw==
+  dependencies:
+    "@journeyapps/powersync-sdk-common" "0.1.2"
+
+"@journeyapps/powersync-sdk-common@0.1.2":
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/@journeyapps/powersync-sdk-common/-/powersync-sdk-common-0.1.2.tgz#309bdb049d2939f05a06d20ab526de39a8539895"
+  integrity sha512-lQExqszNY7bK8HYlNDDsO2mtK2yb3mRAQPVOSMsgo1ssQmxMP9RGdII+HvPkEIprcEkmNogS8AhY6QN/U7wq8w==
+  dependencies:
+    async-mutex "^0.4.0"
+    can-ndjson-stream "^1.0.2"
+    event-iterator "^2.0.0"
+    js-logger "^1.6.1"
+    lodash "^4.17.21"
+    object-hash "^3.0.0"
+    uuid "^3.0.0"
+
+"@journeyapps/powersync-sdk-react-native@0.1.2":
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/@journeyapps/powersync-sdk-react-native/-/powersync-sdk-react-native-0.1.2.tgz#8f44e37e9bf5397228c0ca8c09770c6919795ea8"
+  integrity sha512-SA3qdRQOizcYyOzeGPaH838Kr+jSmEU+GcOo8Ze9u6gsY6zazwQyyCUJGqOgyMqnOTXGoX7HGNXXacVenLbLkA==
+  dependencies:
+    "@journeyapps/powersync-react" "0.1.1"
+    "@journeyapps/powersync-sdk-common" "0.1.2"
+    async-lock "^1.4.0"
+
 "@journeyapps/react-native-quick-sqlite@0.1.1":
   version "0.1.1"
   resolved "https://registry.npmjs.org/@journeyapps/react-native-quick-sqlite/-/react-native-quick-sqlite-0.1.1.tgz#94145dba13b177f6aa42552754e56ecc3b2e7f17"