@powersync/common 1.10.0 → 1.11.1

package/lib/client/sync/stream/AbstractRemote.d.ts

@@ -16,6 +16,16 @@ export type SyncStreamOptions = {
     abortSignal?: AbortSignal;
     fetchOptions?: Request;
 };
+export type FetchImplementation = typeof fetch;
+/**
+ * Class wrapper for providing a fetch implementation.
+ * The class wrapper is used to distinguish the fetchImplementation
+ * option in [AbstractRemoteOptions] from the general fetch method
+ * which is typeof "function"
+ */
+export declare class FetchImplementationProvider {
+    getFetch(): FetchImplementation;
+}
 export type AbstractRemoteOptions = {
     /**
      * Transforms the PowerSync base URL which might contain
@@ -28,7 +38,7 @@ export type AbstractRemoteOptions = {
      * Note that this usually needs to be bound to the global scope.
      * Binding should be done before passing here.
      */
-    fetchImplementation: typeof fetch;
+    fetchImplementation: FetchImplementation | FetchImplementationProvider;
 };
 export declare const DEFAULT_REMOTE_OPTIONS: AbstractRemoteOptions;
 export declare abstract class AbstractRemote {
@@ -37,7 +47,11 @@ export declare abstract class AbstractRemote {
     protected credentials: PowerSyncCredentials | null;
     protected options: AbstractRemoteOptions;
     constructor(connector: RemoteConnector, logger?: ILogger, options?: Partial<AbstractRemoteOptions>);
-    get fetch(): typeof globalThis.fetch;
+    /**
+     * @returns a fetch implementation (function)
+     * which can be called to perform fetch requests
+     */
+    get fetch(): FetchImplementation;
     getCredentials(): Promise<PowerSyncCredentials | null>;
     protected buildRequest(path: string): Promise<{
         url: string;

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

@@ -15,11 +15,22 @@ const KEEP_ALIVE_MS = 20_000;
 // The ACK must be received in this period
 const KEEP_ALIVE_LIFETIME_MS = 30_000;
 export const DEFAULT_REMOTE_LOGGER = Logger.get('PowerSyncRemote');
+/**
+ * Class wrapper for providing a fetch implementation.
+ * The class wrapper is used to distinguish the fetchImplementation
+ * option in [AbstractRemoteOptions] from the general fetch method
+ * which is typeof "function"
+ */
+export class FetchImplementationProvider {
+    getFetch() {
+        return fetch.bind(globalThis);
+    }
+}
 export const DEFAULT_REMOTE_OPTIONS = {
     socketUrlTransformer: (url) => url.replace(/^https?:\/\//, function (match) {
         return match === 'https://' ? 'wss://' : 'ws://';
     }),
-    fetchImplementation: fetch.bind(globalThis)
+    fetchImplementation: new FetchImplementationProvider()
 };
 export class AbstractRemote {
     connector;
@@ -34,8 +45,15 @@ export class AbstractRemote {
             ...(options ?? {})
         };
     }
+    /**
+     * @returns a fetch implementation (function)
+     * which can be called to perform fetch requests
+     */
     get fetch() {
-        return this.options.fetchImplementation;
+        const { fetchImplementation } = this.options;
+        return fetchImplementation instanceof FetchImplementationProvider
+            ? fetchImplementation.getFetch()
+            : fetchImplementation;
     }
     async getCredentials() {
         const { expiresAt } = this.credentials ?? {};

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

@@ -116,13 +116,16 @@ export class AbstractStreamingSyncImplementation extends BaseObserver {
                     }
                     catch (ex) {
                         this.updateSyncStatus({
-                            connected: false,
                             dataFlow: {
                                 uploading: false
                             }
                         });
                         await this.delayRetry();
-                        break;
+                        if (!this.isConnected) {
+                            // Exit the upload loop if the sync stream is no longer connected
+                            break;
+                        }
+                        this.logger.debug(`Caught exception when uploading. Upload will retry after a delay. Exception: ${ex.message}`);
                     }
                     finally {
                         this.updateSyncStatus({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"