fix(sdk): fine-tune timeouts and enhance error handling for bridge re…

…connection
ton-connect · Jul 31, 2024 · 6538103 · 6538103
1 parent 84ce3df
commit 6538103
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/packages/sdk/src/provider/bridge/bridge-gateway.ts b/packages/sdk/src/provider/bridge/bridge-gateway.ts
@@ -166,11 +166,14 @@ export class BridgeGateway {
         return response;
     }
 
-    private async errorsHandler(eventSource: EventSource, e: Event): Promise<EventSource | void> {
+    private async errorsHandler(
+        eventSource: EventSource,
+        e: Event,
+        connectionEstablished: boolean
+    ): Promise<EventSource | void> {
         if (this.isConnecting) {
             eventSource.close();
-            logDebug(`Bridge reconnecting, ${this.defaultReconnectDelay}ms delay`);
-            return await this.eventSource.recreate(this.defaultReconnectDelay);
+            throw new TonConnectError('Bridge error, failed to connect');
         }
 
         if (this.isReady) {
@@ -180,12 +183,17 @@ export class BridgeGateway {
             return;
         }
 
-        if (this.isClosed) {
+        if (this.isClosed && connectionEstablished) {
             eventSource.close();
             logDebug(`Bridge reconnecting, ${this.defaultReconnectDelay}ms delay`);
             return await this.eventSource.recreate(this.defaultReconnectDelay);
         }
 
+        if (this.isClosed && !connectionEstablished) {
+            eventSource.close();
+            throw new TonConnectError('Bridge error, failed to connect');
+        }
+
         throw new TonConnectError('Bridge error, unknown state');
     }
 
@@ -248,7 +256,11 @@ export type CreateEventSourceConfig = {
     /**
      * Error handler for the event source.
      */
-    errorHandler: (eventSource: EventSource, e: Event) => Promise<EventSource | void>;
+    errorHandler: (
+        eventSource: EventSource,
+        e: Event,
+        connectionEstablished: boolean
+    ) => Promise<EventSource | void>;
     /**
      * Message handler for the event source.
      */
@@ -291,6 +303,8 @@ async function createEventSource(config: CreateEventSourceConfig): Promise<Event
                 return;
             }
 
+            let connectionEstablished = false;
+
             const eventSource = new EventSource(url.toString());
 
             eventSource.onerror = async (reason: Event): Promise<void> => {
@@ -301,7 +315,11 @@ async function createEventSource(config: CreateEventSourceConfig): Promise<Event
                 }
 
                 try {
-                    const newInstance = await config.errorHandler(eventSource, reason);
+                    const newInstance = await config.errorHandler(
+                        eventSource,
+                        reason,
+                        connectionEstablished
+                    );
                     if (newInstance !== eventSource) {
                         eventSource.close();
                     }
@@ -315,6 +333,7 @@ async function createEventSource(config: CreateEventSourceConfig): Promise<Event
                 }
             };
             eventSource.onopen = (): void => {
+                connectionEstablished = true;
                 if (signal.aborted) {
                     eventSource.close();
                     reject(new TonConnectError('Bridge connection aborted'));

diff --git a/packages/sdk/src/provider/bridge/bridge-provider.ts b/packages/sdk/src/provider/bridge/bridge-provider.ts
@@ -546,7 +546,8 @@ export class BridgeProvider implements HTTPProvider {
                             }
 
                             return bridge.registerSession({
-                                openingDeadlineMS: options?.openingDeadlineMS,
+                                openingDeadlineMS:
+                                    options?.openingDeadlineMS ?? this.defaultOpeningDeadlineMS,
                                 signal: _options.signal
                             });
                         },

diff --git a/packages/sdk/src/ton-connect.ts b/packages/sdk/src/ton-connect.ts
@@ -344,7 +344,7 @@ export class TonConnect implements ITonConnect {
         };
         abortController.signal.addEventListener('abort', onAbortRestore);
 
-        return await callForSuccess(
+        const restoreConnectionTask = callForSuccess(
             async _options => {
                 await provider?.restoreConnection({
                     openingDeadlineMS: options?.openingDeadlineMS,
@@ -360,10 +360,14 @@ export class TonConnect implements ITonConnect {
             },
             {
                 attempts: Number.MAX_SAFE_INTEGER,
-                delayMs: 5_000,
+                delayMs: 2_000,
                 signal: options?.signal
             }
         );
+        const restoreConnectionTimeout = new Promise<void>(
+            resolve => setTimeout(() => resolve(), 12_000) // connection deadline
+        );
+        return Promise.race([restoreConnectionTask, restoreConnectionTimeout]);
     }
 
     /**

diff --git a/packages/sdk/src/utils/timeout.ts b/packages/sdk/src/utils/timeout.ts
@@ -42,7 +42,7 @@ export function timeout<T>(fn: Deferrable<T>, options?: DeferOptions): Promise<T
 
     const abortController = createAbortController(signal);
 
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
         if (abortController.signal.aborted) {
             reject(new TonConnectError('Operation aborted'));
             return;
@@ -66,6 +66,16 @@ export function timeout<T>(fn: Deferrable<T>, options?: DeferOptions): Promise<T
         );
 
         const deferOptions = { timeout, abort: abortController.signal };
-        fn(resolve, reject, deferOptions).finally(() => clearTimeout(timeoutId));
+        await fn(
+            (...args) => {
+                clearTimeout(timeoutId);
+                resolve(...args);
+            },
+            () => {
+                clearTimeout(timeoutId);
+                reject();
+            },
+            deferOptions
+        );
     });
 }