@tonconnect/sdk 3.0.1-beta.0 → 3.0.1-beta.2

package/lib/cjs/index.cjs

@@ -346,54 +346,6 @@ function encodeTelegramUrlParameters(parameters) {
         .replaceAll('%', '--');
 }
 
-/**
- * Creates an AbortController instance with an optional AbortSignal.
- *
- * @param {AbortSignal} [signal] - An optional AbortSignal to use for aborting the controller.
- * @returns {AbortController} - An instance of AbortController.
- */
-function createAbortController(signal) {
-    const abortController = new AbortController();
-    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-        abortController.abort();
-    }
-    else {
-        signal === null || signal === void 0 ? void 0 : signal.addEventListener('abort', () => abortController.abort(), { once: true });
-    }
-    return abortController;
-}
-/**
- * Executes a function and provides deferred behavior, allowing for a timeout and abort functionality.
- *
- * @param {Deferrable<T>} fn - The function to execute. It should return a promise that resolves with the desired result.
- * @param {DeferOptions} options - Optional configuration options for the defer behavior.
- * @returns {Promise<T>} - A promise that resolves with the result of the executed function, or rejects with an error if it times out or is aborted.
- */
-function defer(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) => {
-        if (abortController.signal.aborted) {
-            reject(new TonConnectError('Operation aborted'));
-            return;
-        }
-        let timeoutId;
-        if (typeof timeout !== 'undefined') {
-            timeoutId = setTimeout(() => {
-                reject(new TonConnectError(`Timeout after ${timeout}ms`));
-                abortController.abort();
-            }, timeout);
-        }
-        abortController.signal.addEventListener('abort', () => {
-            clearTimeout(timeoutId);
-            reject(new TonConnectError('Operation aborted'));
-        }, { once: true });
-        const deferOptions = { timeout, abort: abortController.signal };
-        fn(resolve, reject, deferOptions).finally(() => clearTimeout(timeoutId));
-    });
-}
-
 /**
  * Delays the execution of code for a specified number of milliseconds.
  * @param {number} timeout - The number of milliseconds to delay the execution.
@@ -402,21 +354,38 @@ function defer(fn, options) {
  */
 function delay(timeout, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield defer((resolve, reject, options) => __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
             var _a, _b;
-            if ((_a = options.signal) === null || _a === void 0 ? void 0 : _a.aborted) {
+            if ((_a = options === null || options === void 0 ? void 0 : options.signal) === null || _a === void 0 ? void 0 : _a.aborted) {
                 reject(new TonConnectError('Delay aborted'));
                 return;
             }
             const timeoutId = setTimeout(() => resolve(), timeout);
-            (_b = options.signal) === null || _b === void 0 ? void 0 : _b.addEventListener('abort', () => {
+            (_b = options === null || options === void 0 ? void 0 : options.signal) === null || _b === void 0 ? void 0 : _b.addEventListener('abort', () => {
                 clearTimeout(timeoutId);
                 reject(new TonConnectError('Delay aborted'));
             });
-        }), { signal: options === null || options === void 0 ? void 0 : options.signal });
+        });
     });
 }
 
+/**
+ * Creates an AbortController instance with an optional AbortSignal.
+ *
+ * @param {AbortSignal} [signal] - An optional AbortSignal to use for aborting the controller.
+ * @returns {AbortController} - An instance of AbortController.
+ */
+function createAbortController(signal) {
+    const abortController = new AbortController();
+    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+        abortController.abort();
+    }
+    else {
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener('abort', () => abortController.abort(), { once: true });
+    }
+    return abortController;
+}
+
 /**
  * Function to call ton api until we get response.
  * Because ton network is pretty unstable we need to make sure response is final.
@@ -444,7 +413,9 @@ function callForSuccess(fn, options) {
             catch (err) {
                 lastError = err;
                 i++;
-                yield delay(delayMs);
+                if (i < attempts) {
+                    yield delay(delayMs);
+                }
             }
         }
         throw lastError;
@@ -489,16 +460,21 @@ function createResource(createFn, disposeFn) {
     let currentResource = null;
     let currentArgs = null;
     let currentPromise = null;
+    let currentSignal = null;
     let abortController = null;
     // create a new resource
-    const create = (...args) => __awaiter(this, void 0, void 0, function* () {
+    const create = (signal, ...args) => __awaiter(this, void 0, void 0, function* () {
+        currentSignal = signal !== null && signal !== void 0 ? signal : null;
         abortController === null || abortController === void 0 ? void 0 : abortController.abort();
-        abortController = createAbortController();
-        currentArgs = args;
-        const promise = createFn(abortController.signal, ...args);
+        abortController = createAbortController(signal);
+        if (abortController.signal.aborted) {
+            throw new TonConnectError('Resource creation was aborted');
+        }
+        currentArgs = args !== null && args !== void 0 ? args : null;
+        const promise = createFn(signal, ...args);
         currentPromise = promise;
         const resource = yield promise;
-        if (currentPromise !== promise) {
+        if (currentPromise !== promise && resource !== currentResource) {
             yield disposeFn(resource);
             throw new TonConnectError('Resource creation was aborted by a new resource creation');
         }
@@ -511,20 +487,35 @@ function createResource(createFn, disposeFn) {
     };
     // dispose the current resource
     const dispose = () => __awaiter(this, void 0, void 0, function* () {
-        const resource = currentResource;
-        currentResource = null;
-        const promise = currentPromise;
-        currentPromise = null;
-        abortController === null || abortController === void 0 ? void 0 : abortController.abort();
-        yield Promise.allSettled([
-            resource ? disposeFn(resource) : Promise.resolve(),
-            promise ? disposeFn(yield promise) : Promise.resolve()
-        ]);
+        try {
+            const resource = currentResource;
+            currentResource = null;
+            const promise = currentPromise;
+            currentPromise = null;
+            abortController === null || abortController === void 0 ? void 0 : abortController.abort();
+            yield Promise.allSettled([
+                resource ? disposeFn(resource) : Promise.resolve(),
+                promise ? disposeFn(yield promise) : Promise.resolve()
+            ]);
+        }
+        catch (e) {
+            logError('Failed to dispose the resource', e);
+        }
     });
     // recreate the current resource
-    const recreate = () => __awaiter(this, void 0, void 0, function* () {
-        yield dispose();
-        return create(...(currentArgs !== null && currentArgs !== void 0 ? currentArgs : []));
+    const recreate = (delayMs) => __awaiter(this, void 0, void 0, function* () {
+        const resource = currentResource;
+        const promise = currentPromise;
+        const args = currentArgs;
+        const signal = currentSignal;
+        yield delay(delayMs);
+        if (resource === currentResource &&
+            promise === currentPromise &&
+            args === currentArgs &&
+            signal === currentSignal) {
+            return create(currentSignal, ...(args !== null && args !== void 0 ? args : []));
+        }
+        throw new TonConnectError('Resource recreation was aborted by a new resource creation');
     });
     return {
         create,
@@ -534,6 +525,38 @@ function createResource(createFn, disposeFn) {
     };
 }
 
+/**
+ * Executes a function and provides deferred behavior, allowing for a timeout and abort functionality.
+ *
+ * @param {Deferrable<T>} fn - The function to execute. It should return a promise that resolves with the desired result.
+ * @param {DeferOptions} options - Optional configuration options for the defer behavior.
+ * @returns {Promise<T>} - A promise that resolves with the result of the executed function, or rejects with an error if it times out or is aborted.
+ */
+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) => {
+        if (abortController.signal.aborted) {
+            reject(new TonConnectError('Operation aborted'));
+            return;
+        }
+        let timeoutId;
+        if (typeof timeout !== 'undefined') {
+            timeoutId = setTimeout(() => {
+                abortController.abort();
+                reject(new TonConnectError(`Timeout after ${timeout}ms`));
+            }, timeout);
+        }
+        abortController.signal.addEventListener('abort', () => {
+            clearTimeout(timeoutId);
+            reject(new TonConnectError('Operation aborted'));
+        }, { once: true });
+        const deferOptions = { timeout, abort: abortController.signal };
+        fn(resolve, reject, deferOptions).finally(() => clearTimeout(timeoutId));
+    });
+}
+
 class BridgeGateway {
     constructor(storage, bridgeUrl, sessionId, listener, errorsListener) {
         this.bridgeUrl = bridgeUrl;
@@ -544,7 +567,8 @@ class BridgeGateway {
         this.postPath = 'message';
         this.heartbeatMessage = 'heartbeat';
         this.defaultTtl = 300;
-        this.eventSource = createResource((signal, options) => __awaiter(this, void 0, void 0, function* () {
+        this.defaultReconnectDelay = 5000;
+        this.eventSource = createResource((signal, openingDeadlineMS) => __awaiter(this, void 0, void 0, function* () {
             const eventSourceConfig = {
                 bridgeUrl: this.bridgeUrl,
                 ssePath: this.ssePath,
@@ -552,9 +576,10 @@ class BridgeGateway {
                 bridgeGatewayStorage: this.bridgeGatewayStorage,
                 errorHandler: this.errorsHandler.bind(this),
                 messageHandler: this.messagesHandler.bind(this),
-                signal: signal
+                signal: signal,
+                openingDeadlineMS: openingDeadlineMS
             };
-            return yield createEventSource(eventSourceConfig, options);
+            return yield createEventSource(eventSourceConfig);
         }), (resource) => __awaiter(this, void 0, void 0, function* () {
             resource.close();
         }));
@@ -574,10 +599,11 @@ class BridgeGateway {
     }
     registerSession(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventSource.create(options);
+            yield this.eventSource.create(options === null || options === void 0 ? void 0 : options.signal, options === null || options === void 0 ? void 0 : options.openingDeadlineMS);
         });
     }
     send(message, receiver, topic, ttlOrOptions) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // TODO: remove deprecated method
             const options = {};
@@ -587,6 +613,7 @@ class BridgeGateway {
             else {
                 options.ttl = ttlOrOptions === null || ttlOrOptions === void 0 ? void 0 : ttlOrOptions.ttl;
                 options.signal = ttlOrOptions === null || ttlOrOptions === void 0 ? void 0 : ttlOrOptions.signal;
+                options.attempts = ttlOrOptions === null || ttlOrOptions === void 0 ? void 0 : ttlOrOptions.attempts;
             }
             const url = new URL(addPathToUrl(this.bridgeUrl, this.postPath));
             url.searchParams.append('client_id', this.sessionId);
@@ -599,21 +626,25 @@ class BridgeGateway {
                 if (!response.ok) {
                     throw new TonConnectError(`Bridge send failed, status ${response.status}`);
                 }
-            }), { attempts: Number.MAX_SAFE_INTEGER, delayMs: 5000, signal: options === null || options === void 0 ? void 0 : options.signal });
+            }), {
+                attempts: (_a = options === null || options === void 0 ? void 0 : options.attempts) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER,
+                delayMs: 5000,
+                signal: options === null || options === void 0 ? void 0 : options.signal
+            });
         });
     }
     pause() {
-        var _a;
-        (_a = this.eventSource) === null || _a === void 0 ? void 0 : _a.dispose();
+        this.eventSource.dispose().catch(e => logError(`Bridge pause failed, ${e}`));
     }
     unPause() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventSource.recreate();
+            const RECREATE_WITHOUT_DELAY = 0;
+            yield this.eventSource.recreate(RECREATE_WITHOUT_DELAY);
         });
     }
     close() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventSource.dispose();
+            yield this.eventSource.dispose().catch(e => logError(`Bridge close failed, ${e}`));
         });
     }
     setListener(listener) {
@@ -635,22 +666,25 @@ class BridgeGateway {
             return response;
         });
     }
-    errorsHandler(e) {
+    errorsHandler(eventSource, e) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isConnecting) {
                 logError('Bridge error', JSON.stringify(e));
                 return;
             }
             if (this.isReady) {
-                this.errorsListener(e);
+                try {
+                    this.errorsListener(e);
+                }
+                catch (e) { }
                 return;
             }
             if (this.isClosed) {
-                logDebug('Bridge reconnecting, 200ms delay');
-                yield delay(200);
-                yield this.eventSource.recreate();
-                return;
+                eventSource.close();
+                logDebug(`Bridge reconnecting, ${this.defaultReconnectDelay}ms delay`);
+                return yield this.eventSource.recreate(this.defaultReconnectDelay);
             }
+            throw new TonConnectError('Bridge error, unknown state');
         });
     }
     messagesHandler(e) {
@@ -673,9 +707,13 @@ class BridgeGateway {
         });
     }
 }
-function createEventSource(config, options) {
+/**
+ * Creates an event source.
+ * @param {CreateEventSourceConfig} config - Configuration for creating an event source.
+ */
+function createEventSource(config) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield defer((resolve, reject, deferOptions) => __awaiter(this, void 0, void 0, function* () {
+        return yield timeout((resolve, reject, deferOptions) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const abortController = createAbortController(deferOptions.signal);
             const signal = abortController.signal;
@@ -694,15 +732,25 @@ function createEventSource(config, options) {
                 return;
             }
             const eventSource = new EventSource(url.toString());
-            eventSource.onerror = (reason) => {
+            eventSource.onerror = (reason) => __awaiter(this, void 0, void 0, function* () {
                 if (signal.aborted) {
+                    eventSource.close();
                     reject(new TonConnectError('Bridge connection aborted'));
                     return;
                 }
-                config.errorHandler(reason);
-            };
+                try {
+                    const newInstance = yield config.errorHandler(eventSource, reason);
+                    if (newInstance && newInstance !== eventSource) {
+                        resolve(newInstance);
+                    }
+                }
+                catch (e) {
+                    reject(e);
+                }
+            });
             eventSource.onopen = () => {
                 if (signal.aborted) {
+                    eventSource.close();
                     reject(new TonConnectError('Bridge connection aborted'));
                     return;
                 }
@@ -711,12 +759,11 @@ function createEventSource(config, options) {
             eventSource.onmessage = (event) => {
                 config.messageHandler(event);
             };
-            (_a = config === null || config === void 0 ? void 0 : config.signal) === null || _a === void 0 ? void 0 : _a.addEventListener('abort', () => {
-                logError('Bridge connection aborted');
+            (_a = config.signal) === null || _a === void 0 ? void 0 : _a.addEventListener('abort', () => {
                 eventSource.close();
                 reject(new TonConnectError('Bridge connection aborted'));
             });
-        }), { timeout: options === null || options === void 0 ? void 0 : options.openingDeadlineMS, signal: config === null || config === void 0 ? void 0 : config.signal });
+        }), { timeout: config.openingDeadlineMS, signal: config.signal });
     });
 }
 
@@ -908,6 +955,10 @@ class BridgeProvider {
         });
     }
     connect(message, options) {
+        var _a;
+        const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
+        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+        this.abortController = abortController;
         this.closeGateways();
         const sessionCrypto = new protocol.SessionCrypto();
         this.session = {
@@ -923,13 +974,16 @@ class BridgeProvider {
             sessionCrypto
         })
             .then(() => __awaiter(this, void 0, void 0, function* () {
+            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
             }), {
                 attempts: Number.MAX_SAFE_INTEGER,
                 delayMs: 5000,
-                signal: options === null || options === void 0 ? void 0 : options.signal
+                signal: abortController.signal
             });
         }));
         const universalLink = 'universalLink' in this.walletConnectionSource &&
@@ -1008,6 +1062,7 @@ class BridgeProvider {
         else {
             options.onRequestSent = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.onRequestSent;
             options.signal = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.signal;
+            options.attempts = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.attempts;
         }
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -1019,7 +1074,7 @@ class BridgeProvider {
             logDebug('Send http-bridge request:', Object.assign(Object.assign({}, request), { id }));
             const encodedRequest = this.session.sessionCrypto.encrypt(JSON.stringify(Object.assign(Object.assign({}, request), { id })), protocol.hexToByteArray(this.session.walletPublicKey));
             try {
-                yield this.gateway.send(encodedRequest, this.session.walletPublicKey, request.method, { signal: options === null || options === void 0 ? void 0 : options.signal });
+                yield this.gateway.send(encodedRequest, this.session.walletPublicKey, request.method, { attempts: options === null || options === void 0 ? void 0 : options.attempts, signal: options === null || options === void 0 ? void 0 : options.signal });
                 (_a = options === null || options === void 0 ? void 0 : options.onRequestSent) === null || _a === void 0 ? void 0 : _a.call(options);
                 this.pendingRequests.set(id.toString(), resolve);
             }
@@ -1038,15 +1093,23 @@ class BridgeProvider {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 let called = false;
+                let timeoutId = null;
                 const onRequestSent = () => {
-                    called = true;
-                    this.removeBridgeAndSession().then(resolve);
+                    if (!called) {
+                        called = true;
+                        this.removeBridgeAndSession().then(resolve);
+                    }
                 };
                 try {
                     this.closeGateways();
+                    const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
+                    timeoutId = setTimeout(() => {
+                        abortController.abort();
+                    }, this.defaultOpeningDeadlineMS);
                     yield this.sendRequest({ method: 'disconnect', params: [] }, {
                         onRequestSent: onRequestSent,
-                        signal: options === null || options === void 0 ? void 0 : options.signal
+                        signal: abortController.signal,
+                        attempts: 1,
                     });
                 }
                 catch (e) {
@@ -1055,6 +1118,12 @@ class BridgeProvider {
                         this.removeBridgeAndSession().then(resolve);
                     }
                 }
+                finally {
+                    if (timeoutId) {
+                        clearTimeout(timeoutId);
+                    }
+                    onRequestSent();
+                }
             }));
         });
     }
@@ -1189,11 +1258,7 @@ class BridgeProvider {
         return url.toString();
     }
     openGateways(sessionCrypto, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
-            (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
-            this.abortController = abortController;
             if (Array.isArray(this.walletConnectionSource)) {
                 // close all gateways before opening new ones
                 this.pendingGateways.map(bridge => bridge.close().catch(e => console.error(e)));
@@ -1206,6 +1271,9 @@ class BridgeProvider {
                     return gateway;
                 });
                 yield Promise.allSettled(this.pendingGateways.map(bridge => callForSuccess((_options) => {
+                    if (!this.pendingGateways.some(item => item === bridge)) {
+                        return bridge.close();
+                    }
                     return bridge.registerSession({
                         openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
                         signal: _options.signal
@@ -1213,7 +1281,7 @@ class BridgeProvider {
                 }, {
                     attempts: Number.MAX_SAFE_INTEGER,
                     delayMs: 5000,
-                    signal: abortController.signal
+                    signal: options === null || options === void 0 ? void 0 : options.signal
                 })));
                 return;
             }
@@ -1225,7 +1293,7 @@ class BridgeProvider {
                 this.gateway = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this));
                 return yield this.gateway.registerSession({
                     openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
-                    signal: abortController.signal
+                    signal: options === null || options === void 0 ? void 0 : options.signal
                 });
             }
         });
@@ -2033,6 +2101,11 @@ class TonConnect {
         }
         (_b = this.provider) === null || _b === void 0 ? void 0 : _b.closeConnection();
         this.provider = this.createProvider(wallet);
+        abortController.signal.addEventListener('abort', () => {
+            var _a;
+            (_a = this.provider) === null || _a === void 0 ? void 0 : _a.closeConnection();
+            this.provider = null;
+        });
         return this.provider.connect(this.createConnectRequest(options === null || options === void 0 ? void 0 : options.request), {
             openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
             signal: abortController.signal
@@ -2093,6 +2166,10 @@ class TonConnect {
             (_b = this.provider) === null || _b === void 0 ? void 0 : _b.closeConnection();
             this.provider = provider;
             provider.listen(this.walletEventsListener.bind(this));
+            abortController.signal.addEventListener('abort', () => {
+                provider === null || provider === void 0 ? void 0 : provider.closeConnection();
+                provider = null;
+            });
             return yield callForSuccess((_options) => __awaiter(this, void 0, void 0, function* () {
                 return provider === null || provider === void 0 ? void 0 : provider.restoreConnection({
                     openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
@@ -2139,21 +2216,22 @@ class TonConnect {
      * Disconnect form thw connected wallet and drop current session.
      */
     disconnect(options) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.connected) {
                 throw new WalletNotConnectedError();
             }
             const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
-            (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+            const prevAbortController = this.abortController;
             this.abortController = abortController;
             if (abortController.signal.aborted) {
                 throw new TonConnectError('Disconnect was aborted');
             }
             this.onWalletDisconnected();
-            yield ((_b = this.provider) === null || _b === void 0 ? void 0 : _b.disconnect({
+            yield ((_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect({
                 signal: abortController.signal
             }));
+            prevAbortController === null || prevAbortController === void 0 ? void 0 : prevAbortController.abort();
         });
     }
     /**
@@ -2188,12 +2266,12 @@ class TonConnect {
                     this.pauseConnection();
                 }
                 else {
-                    this.unPauseConnection();
+                    this.unPauseConnection().catch(e => logError('Cannot unpause connection', e));
                 }
             });
         }
         catch (e) {
-            console.error('Cannot subscribe to the document.visibilitychange: ', e);
+            logError('Cannot subscribe to the document.visibilitychange: ', e);
         }
     }
     createProvider(wallet) {