@tonconnect/sdk 3.0.8-beta.0 → 3.1.1-beta.0

package/lib/cjs/index.cjs

@@ -810,9 +810,17 @@ function createEventSource(config) {
     });
 }
 
+const CONNECTION_HTTP_EXPIRATION_TIME = 5 * 60 * 1000;
 function isPendingConnectionHttp(connection) {
     return !('connectEvent' in connection);
 }
+function isPendingConnectionHttpRaw(connection) {
+    return !('connectEvent' in connection);
+}
+function isExpiredPendingConnectionHttpRaw(connection) {
+    var _a;
+    return Date.now() - ((_a = connection.createdAt) !== null && _a !== void 0 ? _a : 0) > CONNECTION_HTTP_EXPIRATION_TIME;
+}
 
 class BridgeConnectionStorage {
     constructor(storage) {
@@ -842,7 +850,8 @@ class BridgeConnectionStorage {
             const rawConnection = {
                 type: 'http',
                 connectionSource: connection.connectionSource,
-                sessionCrypto: connection.sessionCrypto.stringifyKeypair()
+                sessionCrypto: connection.sessionCrypto.stringifyKeypair(),
+                createdAt: Date.now()
             };
             return this.storage.setItem(this.storeKey, JSON.stringify(rawConnection));
         });
@@ -862,7 +871,7 @@ class BridgeConnectionStorage {
             if (connection.type === 'injected') {
                 return connection;
             }
-            if ('connectEvent' in connection) {
+            if (!isPendingConnectionHttpRaw(connection)) {
                 const sessionCrypto = new protocol.SessionCrypto(connection.session.sessionKeyPair);
                 return {
                     type: 'http',
@@ -876,6 +885,10 @@ class BridgeConnectionStorage {
                     }
                 };
             }
+            if (isExpiredPendingConnectionHttpRaw(connection)) {
+                yield this.removeConnection();
+                return null;
+            }
             return {
                 type: 'http',
                 sessionCrypto: new protocol.SessionCrypto(connection.sessionCrypto),
@@ -2045,50 +2058,6 @@ const FALLBACK_WALLETS_LIST = [
     }
 ];
 
-function checkSendTransactionSupport(features, options) {
-    const supportsDeprecatedSendTransactionFeature = features.includes('SendTransaction');
-    const sendTransactionFeature = features.find(feature => feature && typeof feature === 'object' && feature.name === 'SendTransaction');
-    if (!supportsDeprecatedSendTransactionFeature && !sendTransactionFeature) {
-        throw new WalletNotSupportFeatureError("Wallet doesn't support SendTransaction feature.");
-    }
-    if (options.requireExtraCurrencies) {
-        if (!sendTransactionFeature || !sendTransactionFeature.extraCurrencySupported) {
-            throw new WalletNotSupportFeatureError(`Wallet is not able to handle such SendTransaction request. Extra currencies support is required.`);
-        }
-    }
-    if (sendTransactionFeature && sendTransactionFeature.maxMessages !== undefined) {
-        if (sendTransactionFeature.maxMessages < options.requiredMessagesNumber) {
-            throw new WalletNotSupportFeatureError(`Wallet is not able to handle such SendTransaction request. Max support messages number is ${sendTransactionFeature.maxMessages}, but ${options.requiredMessagesNumber} is required.`);
-        }
-        return;
-    }
-    logWarning("Connected wallet didn't provide information about max allowed messages in the SendTransaction request. Request may be rejected by the wallet.");
-}
-function checkRequiredWalletFeatures(features, walletsRequiredFeatures) {
-    if (typeof walletsRequiredFeatures === 'function') {
-        return walletsRequiredFeatures(features);
-    }
-    const res = walletsRequiredFeatures.every(requiredFeature => {
-        const feature = features.find(f => typeof f === 'object' && f.name === requiredFeature.name);
-        if (!feature) {
-            return false;
-        }
-        switch (requiredFeature.name) {
-            case 'SendTransaction': {
-                const sendTransactionFeature = feature;
-                const correctMessagesNumber = requiredFeature.minMessages === undefined ||
-                    requiredFeature.minMessages <= sendTransactionFeature.maxMessages;
-                const correctExtraCurrency = !requiredFeature.extraCurrencyRequired ||
-                    sendTransactionFeature.extraCurrencySupported;
-                return correctMessagesNumber && correctExtraCurrency;
-            }
-            default:
-                return false;
-        }
-    });
-    return res;
-}
-
 class WalletsListManager {
     constructor(options) {
         var _a;
@@ -2097,9 +2066,6 @@ class WalletsListManager {
         this.walletsListSource =
             (_a = options === null || options === void 0 ? void 0 : options.walletsListSource) !== null && _a !== void 0 ? _a : 'https://raw.githubusercontent.com/ton-blockchain/wallets-list/main/wallets-v2.json';
         this.cacheTTLMs = options === null || options === void 0 ? void 0 : options.cacheTTLMs;
-        this.checkRequiredFeatures = (options === null || options === void 0 ? void 0 : options.walletsRequiredFeatures)
-            ? features => checkRequiredWalletFeatures(features !== null && features !== void 0 ? features : [], options.walletsRequiredFeatures)
-            : () => true;
     }
     getWallets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -2249,6 +2215,51 @@ class WalletsListManager {
     }
 }
 
+function checkSendTransactionSupport(features, options) {
+    const supportsDeprecatedSendTransactionFeature = features.includes('SendTransaction');
+    const sendTransactionFeature = findFeature(features, 'SendTransaction');
+    if (!supportsDeprecatedSendTransactionFeature && !sendTransactionFeature) {
+        throw new WalletNotSupportFeatureError("Wallet doesn't support SendTransaction feature.");
+    }
+    if (options.requireExtraCurrencies) {
+        if (!sendTransactionFeature || !sendTransactionFeature.extraCurrencySupported) {
+            throw new WalletNotSupportFeatureError(`Wallet is not able to handle such SendTransaction request. Extra currencies support is required.`);
+        }
+    }
+    if (sendTransactionFeature && sendTransactionFeature.maxMessages !== undefined) {
+        if (sendTransactionFeature.maxMessages < options.requiredMessagesNumber) {
+            throw new WalletNotSupportFeatureError(`Wallet is not able to handle such SendTransaction request. Max support messages number is ${sendTransactionFeature.maxMessages}, but ${options.requiredMessagesNumber} is required.`);
+        }
+        return;
+    }
+    logWarning("Connected wallet didn't provide information about max allowed messages in the SendTransaction request. Request may be rejected by the wallet.");
+}
+function checkRequiredWalletFeatures(features, walletsRequiredFeatures) {
+    if (typeof walletsRequiredFeatures !== 'object') {
+        return true;
+    }
+    const { sendTransaction } = walletsRequiredFeatures;
+    if (sendTransaction) {
+        const feature = findFeature(features, 'SendTransaction');
+        if (!feature) {
+            return false;
+        }
+        if (!checkSendTransaction(feature, sendTransaction)) {
+            return false;
+        }
+    }
+    return true;
+}
+function findFeature(features, requiredFeatureName) {
+    return features.find(f => f && typeof f === 'object' && f.name === requiredFeatureName);
+}
+function checkSendTransaction(feature, requiredFeature) {
+    const correctMessagesNumber = requiredFeature.minMessages === undefined ||
+        requiredFeature.minMessages <= feature.maxMessages;
+    const correctExtraCurrency = !requiredFeature.extraCurrencyRequired || feature.extraCurrencySupported;
+    return !!(correctMessagesNumber && correctExtraCurrency);
+}
+
 /**
  * Create a request version event.
  */
@@ -2665,7 +2676,7 @@ class TonConnectTracker {
     }
 }
 
-const tonConnectSdkVersion = "3.0.8-beta.0";
+const tonConnectSdkVersion = "3.1.1-beta.0";
 
 class TonConnect {
     constructor(options) {
@@ -2681,8 +2692,7 @@ class TonConnect {
         this.walletsRequiredFeatures = options === null || options === void 0 ? void 0 : options.walletsRequiredFeatures;
         this.walletsList = new WalletsListManager({
             walletsListSource: options === null || options === void 0 ? void 0 : options.walletsListSource,
-            cacheTTLMs: options === null || options === void 0 ? void 0 : options.walletsListCacheTTLMs,
-            walletsRequiredFeatures: options === null || options === void 0 ? void 0 : options.walletsRequiredFeatures
+            cacheTTLMs: options === null || options === void 0 ? void 0 : options.walletsListCacheTTLMs
         });
         this.tracker = new TonConnectTracker({
             eventDispatcher: options === null || options === void 0 ? void 0 : options.eventDispatcher,
@@ -3003,15 +3013,15 @@ class TonConnect {
         }
     }
     onWalletConnected(connectEvent) {
-        var _a, _b;
+        var _a;
         const tonAccountItem = connectEvent.items.find(item => item.name === 'ton_addr');
         const tonProofItem = connectEvent.items.find(item => item.name === 'ton_proof');
         if (!tonAccountItem) {
             throw new TonConnectError('ton_addr connection item was not found');
         }
-        const hasRequiredFeatures = checkRequiredWalletFeatures(connectEvent.device.features, (_a = this.walletsRequiredFeatures) !== null && _a !== void 0 ? _a : []);
+        const hasRequiredFeatures = checkRequiredWalletFeatures(connectEvent.device.features, this.walletsRequiredFeatures);
         if (!hasRequiredFeatures) {
-            (_b = this.provider) === null || _b === void 0 ? void 0 : _b.disconnect();
+            (_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect();
             this.onWalletConnectError(new WalletMissingRequiredFeaturesError('Wallet does not support required features', { cause: { connectEvent } }));
             return;
         }