@tonconnect/sdk 3.0.3 → 3.0.4-beta.1

package/lib/esm/index.mjs

@@ -534,7 +534,7 @@ function timeout(fn, options) {
     const timeout = options === null || options === void 0 ? void 0 : options.timeout;
     const signal = options === null || options === void 0 ? void 0 : options.signal;
     const abortController = createAbortController(signal);
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
         if (abortController.signal.aborted) {
             reject(new TonConnectError('Operation aborted'));
             return;
@@ -551,8 +551,14 @@ function timeout(fn, options) {
             reject(new TonConnectError('Operation aborted'));
         }, { once: true });
         const deferOptions = { timeout, abort: abortController.signal };
-        fn(resolve, reject, deferOptions).finally(() => clearTimeout(timeoutId));
-    });
+        yield fn((...args) => {
+            clearTimeout(timeoutId);
+            resolve(...args);
+        }, () => {
+            clearTimeout(timeoutId);
+            reject();
+        }, deferOptions);
+    }));
 }
 
 class BridgeGateway {
@@ -565,7 +571,8 @@ class BridgeGateway {
         this.postPath = 'message';
         this.heartbeatMessage = 'heartbeat';
         this.defaultTtl = 300;
-        this.defaultReconnectDelay = 5000;
+        this.defaultReconnectDelay = 2000;
+        this.defaultResendDelay = 5000;
         this.eventSource = createResource((signal, openingDeadlineMS) => __awaiter(this, void 0, void 0, function* () {
             const eventSourceConfig = {
                 bridgeUrl: this.bridgeUrl,
@@ -626,7 +633,7 @@ class BridgeGateway {
                 }
             }), {
                 attempts: (_a = options === null || options === void 0 ? void 0 : options.attempts) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER,
-                delayMs: 5000,
+                delayMs: this.defaultResendDelay,
                 signal: options === null || options === void 0 ? void 0 : options.signal
             });
         });
@@ -664,11 +671,11 @@ class BridgeGateway {
             return response;
         });
     }
-    errorsHandler(eventSource, e) {
+    errorsHandler(eventSource, e, connectionEstablished) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isConnecting) {
-                logError('Bridge error', JSON.stringify(e));
-                return;
+                eventSource.close();
+                throw new TonConnectError('Bridge error, failed to connect');
             }
             if (this.isReady) {
                 try {
@@ -677,11 +684,15 @@ class BridgeGateway {
                 catch (e) { }
                 return;
             }
-            if (this.isClosed) {
+            if (this.isClosed && connectionEstablished) {
                 eventSource.close();
                 logDebug(`Bridge reconnecting, ${this.defaultReconnectDelay}ms delay`);
                 return yield 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');
         });
     }
@@ -729,6 +740,7 @@ function createEventSource(config) {
                 reject(new TonConnectError('Bridge connection aborted'));
                 return;
             }
+            let connectionEstablished = false;
             const eventSource = new EventSource(url.toString());
             eventSource.onerror = (reason) => __awaiter(this, void 0, void 0, function* () {
                 if (signal.aborted) {
@@ -737,7 +749,7 @@ function createEventSource(config) {
                     return;
                 }
                 try {
-                    const newInstance = yield config.errorHandler(eventSource, reason);
+                    const newInstance = yield config.errorHandler(eventSource, reason, connectionEstablished);
                     if (newInstance !== eventSource) {
                         eventSource.close();
                     }
@@ -751,6 +763,7 @@ function createEventSource(config) {
                 }
             });
             eventSource.onopen = () => {
+                connectionEstablished = true;
                 if (signal.aborted) {
                     eventSource.close();
                     reject(new TonConnectError('Bridge connection aborted'));
@@ -948,7 +961,8 @@ class BridgeProvider {
         this.gateway = null;
         this.pendingGateways = [];
         this.listeners = [];
-        this.defaultOpeningDeadlineMS = 5000;
+        this.defaultOpeningDeadlineMS = 12000;
+        this.defaultRetryTimeoutMS = 2000;
         this.connectionStorage = new BridgeConnectionStorage(storage);
     }
     static fromStorage(storage) {
@@ -984,12 +998,15 @@ class BridgeProvider {
             if (abortController.signal.aborted) {
                 return;
             }
-            yield callForSuccess(_options => this.openGateways(sessionCrypto, {
-                openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
-                signal: _options === null || _options === void 0 ? void 0 : _options.signal
-            }), {
+            yield callForSuccess(_options => {
+                var _a;
+                return this.openGateways(sessionCrypto, {
+                    openingDeadlineMS: (_a = options === null || options === void 0 ? void 0 : options.openingDeadlineMS) !== null && _a !== void 0 ? _a : this.defaultOpeningDeadlineMS,
+                    signal: _options === null || _options === void 0 ? void 0 : _options.signal
+                });
+            }, {
                 attempts: Number.MAX_SAFE_INTEGER,
-                delayMs: 5000,
+                delayMs: this.defaultRetryTimeoutMS,
                 signal: abortController.signal
             });
         }));
@@ -1050,7 +1067,7 @@ class BridgeProvider {
                     signal: options.signal
                 }), {
                     attempts: Number.MAX_SAFE_INTEGER,
-                    delayMs: 5000,
+                    delayMs: this.defaultRetryTimeoutMS,
                     signal: abortController.signal
                 });
             }
@@ -1116,7 +1133,7 @@ class BridgeProvider {
                     yield this.sendRequest({ method: 'disconnect', params: [] }, {
                         onRequestSent: onRequestSent,
                         signal: abortController.signal,
-                        attempts: 1,
+                        attempts: 1
                     });
                 }
                 catch (e) {
@@ -1276,16 +1293,17 @@ class BridgeProvider {
                     return gateway;
                 });
                 yield Promise.allSettled(this.pendingGateways.map(bridge => callForSuccess((_options) => {
+                    var _a;
                     if (!this.pendingGateways.some(item => item === bridge)) {
                         return bridge.close();
                     }
                     return bridge.registerSession({
-                        openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
+                        openingDeadlineMS: (_a = options === null || options === void 0 ? void 0 : options.openingDeadlineMS) !== null && _a !== void 0 ? _a : this.defaultOpeningDeadlineMS,
                         signal: _options.signal
                     });
                 }, {
                     attempts: Number.MAX_SAFE_INTEGER,
-                    delayMs: 5000,
+                    delayMs: this.defaultRetryTimeoutMS,
                     signal: options === null || options === void 0 ? void 0 : options.signal
                 })));
                 return;
@@ -2420,7 +2438,7 @@ class TonConnectTracker {
     }
 }
 
-const tonConnectSdkVersion = "3.0.3";
+const tonConnectSdkVersion = "3.0.4-beta.1";
 
 class TonConnect {
     constructor(options) {
@@ -2606,7 +2624,7 @@ class TonConnect {
                 provider = null;
             };
             abortController.signal.addEventListener('abort', onAbortRestore);
-            return yield callForSuccess((_options) => __awaiter(this, void 0, void 0, function* () {
+            const restoreConnectionTask = callForSuccess((_options) => __awaiter(this, void 0, void 0, function* () {
                 yield (provider === null || provider === void 0 ? void 0 : provider.restoreConnection({
                     openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
                     signal: _options.signal
@@ -2620,9 +2638,12 @@ class TonConnect {
                 }
             }), {
                 attempts: Number.MAX_SAFE_INTEGER,
-                delayMs: 5000,
+                delayMs: 2000,
                 signal: options === null || options === void 0 ? void 0 : options.signal
             });
+            const restoreConnectionTimeout = new Promise(resolve => setTimeout(() => resolve(), 12000) // connection deadline
+            );
+            return Promise.race([restoreConnectionTask, restoreConnectionTimeout]);
         });
     }
     sendTransaction(transaction, optionsOrOnRequestSent) {