@powersync/common 1.31.0 → 1.32.0

package/lib/client/AbstractPowerSyncDatabase.d.ts

@@ -5,6 +5,7 @@ import { SyncStatus } from '../db/crud/SyncStatus.js';
 import { UploadQueueStats } from '../db/crud/UploadQueueStatus.js';
 import { Schema } from '../db/schema/Schema.js';
 import { BaseObserver } from '../utils/BaseObserver.js';
+import { ConnectionManager } from './ConnectionManager.js';
 import { SQLOpenFactory, SQLOpenOptions } from './SQLOpenFactory.js';
 import { PowerSyncBackendConnector } from './connection/PowerSyncBackendConnector.js';
 import { BucketStorageAdapter } from './sync/bucket/BucketStorageAdapter.js';
@@ -114,13 +115,14 @@ export declare abstract class AbstractPowerSyncDatabase extends BaseObserver<Pow
      * Current connection status.
      */
     currentStatus: SyncStatus;
-    syncStreamImplementation?: StreamingSyncImplementation;
     sdkVersion: string;
     protected bucketStorageAdapter: BucketStorageAdapter;
-    private syncStatusListenerDisposer?;
     protected _isReadyPromise: Promise<void>;
+    protected connectionManager: ConnectionManager;
+    get syncStreamImplementation(): StreamingSyncImplementation | null;
     protected _schema: Schema;
     private _database;
+    protected runExclusiveMutex: Mutex;
     constructor(options: PowerSyncDatabaseOptionsWithDBAdapter);
     constructor(options: PowerSyncDatabaseOptionsWithOpenFactory);
     constructor(options: PowerSyncDatabaseOptionsWithSettings);
@@ -190,6 +192,11 @@ export declare abstract class AbstractPowerSyncDatabase extends BaseObserver<Pow
      */
     init(): Promise<void>;
     resolvedConnectionOptions(options?: PowerSyncConnectionOptions): RequiredAdditionalConnectionOptions;
+    /**
+     * Locking mechanism for exclusively running critical portions of connect/disconnect operations.
+     * Locking here is mostly only important on web for multiple tab scenarios.
+     */
+    protected runExclusive<T>(callback: () => Promise<T>): Promise<T>;
     /**
      * Connects to stream of events from the PowerSync instance.
      */

package/lib/client/AbstractPowerSyncDatabase.js

@@ -2,12 +2,14 @@ import { Mutex } from 'async-mutex';
 import { EventIterator } from 'event-iterator';
 import Logger from 'js-logger';
 import { isBatchedUpdateNotification } from '../db/DBAdapter.js';
+import { FULL_SYNC_PRIORITY } from '../db/crud/SyncProgress.js';
 import { SyncStatus } from '../db/crud/SyncStatus.js';
 import { UploadQueueStats } from '../db/crud/UploadQueueStatus.js';
 import { BaseObserver } from '../utils/BaseObserver.js';
 import { ControlledExecutor } from '../utils/ControlledExecutor.js';
-import { mutexRunExclusive } from '../utils/mutex.js';
 import { throttleTrailing } from '../utils/async.js';
+import { mutexRunExclusive } from '../utils/mutex.js';
+import { ConnectionManager } from './ConnectionManager.js';
 import { isDBAdapter, isSQLOpenFactory, isSQLOpenOptions } from './SQLOpenFactory.js';
 import { runOnSchemaChange } from './runOnSchemaChange.js';
 import { PSInternalTable } from './sync/bucket/BucketStorageAdapter.js';
@@ -15,7 +17,6 @@ import { CrudBatch } from './sync/bucket/CrudBatch.js';
 import { CrudEntry } from './sync/bucket/CrudEntry.js';
 import { CrudTransaction } from './sync/bucket/CrudTransaction.js';
 import { DEFAULT_CRUD_UPLOAD_THROTTLE_MS, DEFAULT_RETRY_DELAY_MS } from './sync/stream/AbstractStreamingSyncImplementation.js';
-import { FULL_SYNC_PRIORITY } from '../db/crud/SyncProgress.js';
 const POWERSYNC_TABLE_MATCH = /(^ps_data__|^ps_data_local__)/;
 const DEFAULT_DISCONNECT_CLEAR_OPTIONS = {
     clearLocal: true
@@ -59,13 +60,16 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
      * Current connection status.
      */
     currentStatus;
-    syncStreamImplementation;
     sdkVersion;
     bucketStorageAdapter;
-    syncStatusListenerDisposer;
     _isReadyPromise;
+    connectionManager;
+    get syncStreamImplementation() {
+        return this.connectionManager.syncStreamImplementation;
+    }
     _schema;
     _database;
+    runExclusiveMutex;
     constructor(options) {
         super();
         this.options = options;
@@ -92,7 +96,31 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         this._schema = schema;
         this.ready = false;
         this.sdkVersion = '';
+        this.runExclusiveMutex = new Mutex();
         // Start async init
+        this.connectionManager = new ConnectionManager({
+            createSyncImplementation: async (connector, options) => {
+                await this.waitForReady();
+                return this.runExclusive(async () => {
+                    const sync = this.generateSyncStreamImplementation(connector, this.resolvedConnectionOptions(options));
+                    const onDispose = sync.registerListener({
+                        statusChanged: (status) => {
+                            this.currentStatus = new SyncStatus({
+                                ...status.toJSON(),
+                                hasSynced: this.currentStatus?.hasSynced || !!status.lastSyncedAt
+                            });
+                            this.iterateListeners((cb) => cb.statusChanged?.(this.currentStatus));
+                        }
+                    });
+                    await sync.waitForReady();
+                    return {
+                        sync,
+                        onDispose
+                    };
+                });
+            },
+            logger: this.logger
+        });
         this._isReadyPromise = this.initialize();
     }
     /**
@@ -265,30 +293,18 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
             crudUploadThrottleMs: options?.crudUploadThrottleMs ?? this.options.crudUploadThrottleMs ?? DEFAULT_CRUD_UPLOAD_THROTTLE_MS
         };
     }
+    /**
+     * Locking mechanism for exclusively running critical portions of connect/disconnect operations.
+     * Locking here is mostly only important on web for multiple tab scenarios.
+     */
+    runExclusive(callback) {
+        return this.runExclusiveMutex.runExclusive(callback);
+    }
     /**
      * Connects to stream of events from the PowerSync instance.
      */
     async connect(connector, options) {
-        await this.waitForReady();
-        // close connection if one is open
-        await this.disconnect();
-        if (this.closed) {
-            throw new Error('Cannot connect using a closed client');
-        }
-        const resolvedConnectOptions = this.resolvedConnectionOptions(options);
-        this.syncStreamImplementation = this.generateSyncStreamImplementation(connector, resolvedConnectOptions);
-        this.syncStatusListenerDisposer = this.syncStreamImplementation.registerListener({
-            statusChanged: (status) => {
-                this.currentStatus = new SyncStatus({
-                    ...status.toJSON(),
-                    hasSynced: this.currentStatus?.hasSynced || !!status.lastSyncedAt
-                });
-                this.iterateListeners((cb) => cb.statusChanged?.(this.currentStatus));
-            }
-        });
-        await this.syncStreamImplementation.waitForReady();
-        this.syncStreamImplementation.triggerCrudUpload();
-        await this.syncStreamImplementation.connect(options);
+        return this.connectionManager.connect(connector, options);
     }
     /**
      * Close the sync connection.
@@ -296,11 +312,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
      * Use {@link connect} to connect again.
      */
     async disconnect() {
-        await this.waitForReady();
-        await this.syncStreamImplementation?.disconnect();
-        this.syncStatusListenerDisposer?.();
-        await this.syncStreamImplementation?.dispose();
-        this.syncStreamImplementation = undefined;
+        return this.connectionManager.disconnect();
     }
     /**
      *  Disconnect and clear the database.
@@ -339,7 +351,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         if (disconnect) {
             await this.disconnect();
         }
-        await this.syncStreamImplementation?.dispose();
+        await this.connectionManager.close();
         await this.database.close();
         this.closed = true;
     }

package/lib/client/ConnectionManager.d.ts

@@ -0,0 +1,80 @@
+import { ILogger } from 'js-logger';
+import { BaseListener, BaseObserver } from '../utils/BaseObserver.js';
+import { PowerSyncBackendConnector } from './connection/PowerSyncBackendConnector.js';
+import { PowerSyncConnectionOptions, StreamingSyncImplementation } from './sync/stream/AbstractStreamingSyncImplementation.js';
+/**
+ * @internal
+ */
+export interface ConnectionManagerSyncImplementationResult {
+    sync: StreamingSyncImplementation;
+    /**
+     * Additional cleanup function which is called after the sync stream implementation
+     * is disposed.
+     */
+    onDispose: () => Promise<void> | void;
+}
+/**
+ * @internal
+ */
+export interface ConnectionManagerOptions {
+    createSyncImplementation(connector: PowerSyncBackendConnector, options: PowerSyncConnectionOptions): Promise<ConnectionManagerSyncImplementationResult>;
+    logger: ILogger;
+}
+type StoredConnectionOptions = {
+    connector: PowerSyncBackendConnector;
+    options: PowerSyncConnectionOptions;
+};
+/**
+ * @internal
+ */
+export interface ConnectionManagerListener extends BaseListener {
+    syncStreamCreated: (sync: StreamingSyncImplementation) => void;
+}
+/**
+ * @internal
+ */
+export declare class ConnectionManager extends BaseObserver<ConnectionManagerListener> {
+    protected options: ConnectionManagerOptions;
+    /**
+     * Tracks active connection attempts
+     */
+    protected connectingPromise: Promise<void> | null;
+    /**
+     * Tracks actively instantiating a streaming sync implementation.
+     */
+    protected syncStreamInitPromise: Promise<void> | null;
+    /**
+     * Active disconnect operation. Calling disconnect multiple times
+     * will resolve to the same operation.
+     */
+    protected disconnectingPromise: Promise<void> | null;
+    /**
+     * Tracks the last parameters supplied to `connect` calls.
+     * Calling `connect` multiple times in succession will result in:
+     * - 1 pending connection operation which will be aborted.
+     * - updating the last set of parameters while waiting for the pending
+     *   attempt to be aborted
+     * - internally connecting with the last set of parameters
+     */
+    protected pendingConnectionOptions: StoredConnectionOptions | null;
+    syncStreamImplementation: StreamingSyncImplementation | null;
+    /**
+     * Additional cleanup function which is called after the sync stream implementation
+     * is disposed.
+     */
+    protected syncDisposer: (() => Promise<void> | void) | null;
+    constructor(options: ConnectionManagerOptions);
+    get logger(): ILogger;
+    close(): Promise<void>;
+    connect(connector: PowerSyncBackendConnector, options?: PowerSyncConnectionOptions): Promise<void>;
+    protected connectInternal(): Promise<void>;
+    /**
+     * Close the sync connection.
+     *
+     * Use {@link connect} to connect again.
+     */
+    disconnect(): Promise<void>;
+    protected disconnectInternal(): Promise<void>;
+    protected performDisconnect(): Promise<void>;
+}
+export {};

package/lib/client/ConnectionManager.js

@@ -0,0 +1,175 @@
+import { BaseObserver } from '../utils/BaseObserver.js';
+/**
+ * @internal
+ */
+export class ConnectionManager extends BaseObserver {
+    options;
+    /**
+     * Tracks active connection attempts
+     */
+    connectingPromise;
+    /**
+     * Tracks actively instantiating a streaming sync implementation.
+     */
+    syncStreamInitPromise;
+    /**
+     * Active disconnect operation. Calling disconnect multiple times
+     * will resolve to the same operation.
+     */
+    disconnectingPromise;
+    /**
+     * Tracks the last parameters supplied to `connect` calls.
+     * Calling `connect` multiple times in succession will result in:
+     * - 1 pending connection operation which will be aborted.
+     * - updating the last set of parameters while waiting for the pending
+     *   attempt to be aborted
+     * - internally connecting with the last set of parameters
+     */
+    pendingConnectionOptions;
+    syncStreamImplementation;
+    /**
+     * Additional cleanup function which is called after the sync stream implementation
+     * is disposed.
+     */
+    syncDisposer;
+    constructor(options) {
+        super();
+        this.options = options;
+        this.connectingPromise = null;
+        this.syncStreamInitPromise = null;
+        this.disconnectingPromise = null;
+        this.pendingConnectionOptions = null;
+        this.syncStreamImplementation = null;
+        this.syncDisposer = null;
+    }
+    get logger() {
+        return this.options.logger;
+    }
+    async close() {
+        await this.syncStreamImplementation?.dispose();
+        await this.syncDisposer?.();
+    }
+    async connect(connector, options) {
+        // Keep track if there were pending operations before this call
+        const hadPendingOptions = !!this.pendingConnectionOptions;
+        // Update pending options to the latest values
+        this.pendingConnectionOptions = {
+            connector,
+            options: options ?? {}
+        };
+        // Disconnecting here provides aborting in progress connection attempts.
+        // The connectInternal method will clear pending options once it starts connecting (with the options).
+        // We only need to trigger a disconnect here if we have already reached the point of connecting.
+        // If we do already have pending options, a disconnect has already been performed.
+        // The connectInternal method also does a sanity disconnect to prevent straggler connections.
+        // We should also disconnect if we have already completed a connection attempt.
+        if (!hadPendingOptions || this.syncStreamImplementation) {
+            await this.disconnectInternal();
+        }
+        // Triggers a connect which checks if pending options are available after the connect completes.
+        // The completion can be for a successful, unsuccessful or aborted connection attempt.
+        // If pending options are available another connection will be triggered.
+        const checkConnection = async () => {
+            if (this.pendingConnectionOptions) {
+                // Pending options have been placed while connecting.
+                // Need to reconnect.
+                this.connectingPromise = this.connectInternal()
+                    .catch(() => { })
+                    .finally(checkConnection);
+                return this.connectingPromise;
+            }
+            else {
+                // Clear the connecting promise, done.
+                this.connectingPromise = null;
+                return;
+            }
+        };
+        this.connectingPromise ??= this.connectInternal()
+            .catch(() => { })
+            .finally(checkConnection);
+        return this.connectingPromise;
+    }
+    async connectInternal() {
+        let appliedOptions = null;
+        // This method ensures a disconnect before any connection attempt
+        await this.disconnectInternal();
+        /**
+         * This portion creates a sync implementation which can be racy when disconnecting or
+         * if multiple tabs on web are in use.
+         * This is protected in an exclusive lock.
+         * The promise tracks the creation which is used to synchronize disconnect attempts.
+         */
+        this.syncStreamInitPromise = new Promise(async (resolve, reject) => {
+            try {
+                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;
+                appliedOptions = options;
+                this.pendingConnectionOptions = null;
+                const { sync, onDispose } = await this.options.createSyncImplementation(connector, options);
+                this.iterateListeners((l) => l.syncStreamCreated?.(sync));
+                this.syncStreamImplementation = sync;
+                this.syncDisposer = onDispose;
+                await this.syncStreamImplementation.waitForReady();
+                resolve();
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+        await this.syncStreamInitPromise;
+        this.syncStreamInitPromise = null;
+        if (!appliedOptions) {
+            // A disconnect could have cleared the options which did not create a syncStreamImplementation
+            return;
+        }
+        // It might be possible that a disconnect triggered between the last check
+        // and this point. Awaiting here allows the sync stream to be cleared if disconnected.
+        await this.disconnectingPromise;
+        this.logger.debug('Attempting to connect to PowerSync instance');
+        await this.syncStreamImplementation?.connect(appliedOptions);
+        this.syncStreamImplementation?.triggerCrudUpload();
+    }
+    /**
+     * Close the sync connection.
+     *
+     * Use {@link connect} to connect again.
+     */
+    async disconnect() {
+        // This will help abort pending connects
+        this.pendingConnectionOptions = null;
+        await this.disconnectInternal();
+    }
+    async disconnectInternal() {
+        if (this.disconnectingPromise) {
+            // A disconnect is already in progress
+            return this.disconnectingPromise;
+        }
+        this.disconnectingPromise = this.performDisconnect();
+        await this.disconnectingPromise;
+        this.disconnectingPromise = null;
+    }
+    async performDisconnect() {
+        // Wait if a sync stream implementation is being created before closing it
+        // (syncStreamImplementation must be assigned before we can properly dispose it)
+        await this.syncStreamInitPromise;
+        // Keep reference to the sync stream implementation and disposer
+        // The class members will be cleared before we trigger the disconnect
+        // to prevent any further calls to the sync stream implementation.
+        const sync = this.syncStreamImplementation;
+        this.syncStreamImplementation = null;
+        const disposer = this.syncDisposer;
+        this.syncDisposer = null;
+        await sync?.disconnect();
+        await sync?.dispose();
+        await disposer?.();
+    }
+}

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

@@ -2,10 +2,10 @@ import { Buffer } from 'buffer';
 import ndjsonStream from 'can-ndjson-stream';
 import Logger from 'js-logger';
 import { RSocketConnector } from 'rsocket-core';
-import { WebsocketClientTransport } from 'rsocket-websocket-client';
 import PACKAGE from '../../../../package.json' with { type: 'json' };
 import { AbortOperation } from '../../../utils/AbortOperation.js';
 import { DataStream } from '../../../utils/DataStream.js';
+import { WebsocketClientTransport } from './WebsocketClientTransport.js';
 const POWERSYNC_TRAILING_SLASH_MATCH = /\/+$/;
 const POWERSYNC_JS_VERSION = PACKAGE.version;
 const SYNC_QUEUE_REQUEST_LOW_WATER = 5;
@@ -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

@@ -196,11 +196,12 @@ The next upload iteration will be delayed.`);
         if (this.abortController) {
             await this.disconnect();
         }
-        this.abortController = new AbortController();
+        const controller = new AbortController();
+        this.abortController = controller;
         this.streamingSyncPromise = this.streamingSync(this.abortController.signal, options);
         // Return a promise that resolves when the connection status is updated
         return new Promise((resolve) => {
-            const l = this.registerListener({
+            const disposer = this.registerListener({
                 statusUpdated: (update) => {
                     // This is triggered as soon as a connection is read from
                     if (typeof update.connected == 'undefined') {
@@ -209,12 +210,14 @@ The next upload iteration will be delayed.`);
                     }
                     if (update.connected == false) {
                         /**
-                         * This function does not reject if initial connect attempt failed
+                         * This function does not reject if initial connect attempt failed.
+                         * Connected can be false if the connection attempt was aborted or if the initial connection
+                         * attempt failed.
                          */
                         this.logger.warn('Initial connect attempt did not successfully connect to server');
                     }
+                    disposer();
                     resolve();
-                    l();
                 }
             });
         });
@@ -283,6 +286,7 @@ The next upload iteration will be delayed.`);
          */
         while (true) {
             this.updateSyncStatus({ connecting: true });
+            let shouldDelayRetry = true;
             try {
                 if (signal?.aborted) {
                     break;
@@ -295,12 +299,15 @@ The next upload iteration will be delayed.`);
                  * Either:
                  *  - A network request failed with a failed connection or not OKAY response code.
                  *  - There was a sync processing error.
-                 * This loop will retry.
+                 *  - The connection was aborted.
+                 * This loop will retry after a delay if the connection was not aborted.
                  * 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.
                  */
                 if (ex instanceof AbortOperation) {
                     this.logger.warn(ex);
+                    shouldDelayRetry = false;
+                    // A disconnect was requested, we should not delay since there is no explicit retry
                 }
                 else {
                     this.logger.error(ex);
@@ -310,8 +317,6 @@ The next upload iteration will be delayed.`);
                         downloadError: ex
                     }
                 });
-                // On error, wait a little before retrying
-                await this.delayRetry();
             }
             finally {
                 if (!signal.aborted) {
@@ -322,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
@@ -356,6 +365,9 @@ The next upload iteration will be delayed.`);
                 let validatedCheckpoint = null;
                 let appliedCheckpoint = null;
                 const clientId = await this.options.adapter.getClientId();
+                if (signal.aborted) {
+                    return;
+                }
                 this.logger.debug('Requesting stream from server');
                 const syncOptions = {
                     path: '/sync/stream',
@@ -497,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)
                                 };
                             }
                         }
@@ -562,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: {
@@ -639,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.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Adapted from rsocket-websocket-client
+ * https://github.com/rsocket/rsocket-js/blob/e224cf379e747c4f1ddc4f2fa111854626cc8575/packages/rsocket-websocket-client/src/WebsocketClientTransport.ts#L17
+ * This adds additional error handling for React Native iOS.
+ * This particularly adds a close listener to handle cases where the WebSocket
+ * connection closes immediately after opening without emitting an error.
+ */
+import { ClientTransport, Closeable, Demultiplexer, DuplexConnection, FrameHandler, Multiplexer, Outbound } from 'rsocket-core';
+import { ClientOptions } from 'rsocket-websocket-client';
+export declare class WebsocketClientTransport implements ClientTransport {
+    private readonly url;
+    private readonly factory;
+    constructor(options: ClientOptions);
+    connect(multiplexerDemultiplexerFactory: (outbound: Outbound & Closeable) => Multiplexer & Demultiplexer & FrameHandler): Promise<DuplexConnection>;
+}