@powersync/common 0.0.0-dev-20250529141956 → 0.0.0-dev-20250609122429

package/lib/client/ConnectionManager.js

@@ -73,7 +73,9 @@ export class ConnectionManager extends BaseObserver {
             if (this.pendingConnectionOptions) {
                 // Pending options have been placed while connecting.
                 // Need to reconnect.
-                this.connectingPromise = this.connectInternal().finally(checkConnection);
+                this.connectingPromise = this.connectInternal()
+                    .catch(() => { })
+                    .finally(checkConnection);
                 return this.connectingPromise;
             }
             else {
@@ -82,7 +84,9 @@ export class ConnectionManager extends BaseObserver {
                 return;
             }
         };
-        this.connectingPromise ??= this.connectInternal().finally(checkConnection);
+        this.connectingPromise ??= this.connectInternal()
+            .catch(() => { })
+            .finally(checkConnection);
         return this.connectingPromise;
     }
     async connectInternal() {
@@ -100,9 +104,11 @@ export class ConnectionManager extends BaseObserver {
                 if (!this.pendingConnectionOptions) {
                     this.logger.debug('No pending connection options found, not creating sync stream implementation');
                     // A disconnect could have cleared this.
+                    resolve();
                     return;
                 }
                 if (this.disconnectingPromise) {
+                    resolve();
                     return;
                 }
                 const { connector, options } = this.pendingConnectionOptions;

package/lib/client/sync/stream/AbstractRemote.js

@@ -211,17 +211,12 @@ export class AbstractRemote {
         // headers with websockets on web. The browser userAgent is however added
         // automatically as a header.
         const userAgent = this.getUserAgent();
-        let socketCreationError;
+        const url = this.options.socketUrlTransformer(request.url);
         const connector = new RSocketConnector({
             transport: new WebsocketClientTransport({
-                url: this.options.socketUrlTransformer(request.url),
+                url,
                 wsCreator: (url) => {
-                    const s = this.createSocket(url);
-                    s.addEventListener('error', (e) => {
-                        socketCreationError = new Error('Failed to create connection to websocket: ', e.target.url ?? '');
-                        this.logger.warn('Socket error', e);
-                    });
-                    return s;
+                    return this.createSocket(url);
                 }
             }),
             setup: {
@@ -243,11 +238,8 @@ export class AbstractRemote {
             rsocket = await connector.connect();
         }
         catch (ex) {
-            /**
-             * On React native the connection exception can be `undefined` this causes issues
-             * with detecting the exception inside async-mutex
-             */
-            throw new Error(`Could not connect to PowerSync instance: ${JSON.stringify(ex ?? socketCreationError)}`);
+            this.logger.error(`Failed to connect WebSocket`, ex);
+            throw ex;
         }
         const stream = new DataStream({
             logger: this.logger,

package/lib/client/sync/stream/AbstractStreamingSyncImplementation.js

@@ -286,6 +286,7 @@ The next upload iteration will be delayed.`);
          */
         while (true) {
             this.updateSyncStatus({ connecting: true });
+            let shouldDelayRetry = true;
             try {
                 if (signal?.aborted) {
                     break;
@@ -303,10 +304,9 @@ The next upload iteration will be delayed.`);
                  * The nested abort controller will cleanup any open network requests and streams.
                  * The WebRemote should only abort pending fetch requests or close active Readable streams.
                  */
-                let delay = true;
                 if (ex instanceof AbortOperation) {
                     this.logger.warn(ex);
-                    delay = false;
+                    shouldDelayRetry = false;
                     // A disconnect was requested, we should not delay since there is no explicit retry
                 }
                 else {
@@ -317,10 +317,6 @@ The next upload iteration will be delayed.`);
                         downloadError: ex
                     }
                 });
-                // On error, wait a little before retrying
-                if (delay) {
-                    await this.delayRetry();
-                }
             }
             finally {
                 if (!signal.aborted) {
@@ -331,6 +327,10 @@ The next upload iteration will be delayed.`);
                     connected: false,
                     connecting: true // May be unnecessary
                 });
+                // On error, wait a little before retrying
+                if (shouldDelayRetry) {
+                    await this.delayRetry(nestedAbortController.signal);
+                }
             }
         }
         // Mark as disconnected if here
@@ -509,7 +509,7 @@ The next upload iteration will be delayed.`);
                             if (progressForBucket) {
                                 updatedProgress[data.bucket] = {
                                     ...progressForBucket,
-                                    sinceLast: progressForBucket.sinceLast + data.data.length
+                                    sinceLast: Math.min(progressForBucket.sinceLast + data.data.length, progressForBucket.targetCount - progressForBucket.atLast)
                                 };
                             }
                         }
@@ -574,16 +574,32 @@ The next upload iteration will be delayed.`);
     async updateSyncStatusForStartingCheckpoint(checkpoint) {
         const localProgress = await this.options.adapter.getBucketOperationProgress();
         const progress = {};
+        let invalidated = false;
         for (const bucket of checkpoint.buckets) {
             const savedProgress = localProgress[bucket.bucket];
+            const atLast = savedProgress?.atLast ?? 0;
+            const sinceLast = savedProgress?.sinceLast ?? 0;
             progress[bucket.bucket] = {
                 // The fallback priority doesn't matter here, but 3 is the one newer versions of the sync service
                 // will use by default.
                 priority: bucket.priority ?? 3,
-                atLast: savedProgress?.atLast ?? 0,
-                sinceLast: savedProgress?.sinceLast ?? 0,
+                atLast: atLast,
+                sinceLast: sinceLast,
                 targetCount: bucket.count ?? 0
             };
+            if (bucket.count != null && bucket.count < atLast + sinceLast) {
+                // Either due to a defrag / sync rule deploy or a compaction operation, the size
+                // of the bucket shrank so much that the local ops exceed the ops in the updated
+                // bucket. We can't prossibly report progress in this case (it would overshoot 100%).
+                invalidated = true;
+            }
+        }
+        if (invalidated) {
+            for (const bucket in progress) {
+                const bucketProgress = progress[bucket];
+                bucketProgress.atLast = 0;
+                bucketProgress.sinceLast = 0;
+            }
         }
         this.updateSyncStatus({
             dataFlow: {
@@ -651,7 +667,25 @@ The next upload iteration will be delayed.`);
         // trigger this for all updates
         this.iterateListeners((cb) => cb.statusUpdated?.(options));
     }
-    async delayRetry() {
-        return new Promise((resolve) => setTimeout(resolve, this.options.retryDelayMs));
+    async delayRetry(signal) {
+        return new Promise((resolve) => {
+            if (signal?.aborted) {
+                // If the signal is already aborted, resolve immediately
+                resolve();
+                return;
+            }
+            const { retryDelayMs } = this.options;
+            let timeoutId;
+            const endDelay = () => {
+                resolve();
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                    timeoutId = undefined;
+                }
+                signal?.removeEventListener('abort', endDelay);
+            };
+            signal?.addEventListener('abort', endDelay, { once: true });
+            timeoutId = setTimeout(endDelay, retryDelayMs);
+        });
     }
 }

package/lib/client/sync/stream/WebsocketClientTransport.js

@@ -25,7 +25,19 @@ export class WebsocketClientTransport {
             };
             const errorListener = (ev) => {
                 removeListeners();
-                reject(ev.error);
+                // We add a default error in that case.
+                if (ev.error != null) {
+                    // undici typically provides an error object
+                    reject(ev.error);
+                }
+                else if (ev.message != null) {
+                    // React Native typically does not provide an error object, but does provide a message
+                    reject(new Error(`Failed to create websocket connection: ${ev.message}`));
+                }
+                else {
+                    // Browsers often provide no details at all
+                    reject(new Error(`Failed to create websocket connection to ${this.url}`));
+                }
             };
             /**
              * In some cases, such as React Native iOS, the WebSocket connection may close immediately after opening

package/lib/db/crud/SyncStatus.js

@@ -123,7 +123,21 @@ export class SyncStatus {
      * @returns {boolean} True if the instances are considered equal, false otherwise
      */
     isEqual(status) {
-        return JSON.stringify(this.options) == JSON.stringify(status.options);
+        /**
+         * By default Error object are serialized to an empty object.
+         * This replaces Errors with more useful information before serialization.
+         */
+        const replacer = (_, value) => {
+            if (value instanceof Error) {
+                return {
+                    name: value.name,
+                    message: value.message,
+                    stack: value.stack
+                };
+            }
+            return value;
+        };
+        return JSON.stringify(this.options, replacer) == JSON.stringify(status.options, replacer);
     }
     /**
      * Creates a human-readable string representation of the current sync status.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "0.0.0-dev-20250529141956",
+  "version": "0.0.0-dev-20250609122429",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"