@tonconnect/sdk 3.4.0-beta.4 → 3.4.0-beta.5

package/lib/cjs/index.cjs

@@ -919,180 +919,6 @@ function isExpiredPendingConnectionHttpRaw(connection) {
     return Date.now() - ((_a = connection.createdAt) !== null && _a !== void 0 ? _a : 0) > CONNECTION_HTTP_EXPIRATION_TIME;
 }
 
-class BridgeConnectionStorage {
-    constructor(storage) {
-        this.storage = storage;
-        this.storeKey = 'ton-connect-storage_bridge-connection';
-    }
-    storeConnection(connection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (connection.type === 'injected' || connection.type === 'wallet-connect') {
-                return this.storage.setItem(this.storeKey, JSON.stringify(connection));
-            }
-            if (!isPendingConnectionHttp(connection)) {
-                const rawSession = {
-                    sessionKeyPair: connection.session.sessionCrypto.stringifyKeypair(),
-                    walletPublicKey: connection.session.walletPublicKey,
-                    bridgeUrl: connection.session.bridgeUrl
-                };
-                const rawConnection = {
-                    type: 'http',
-                    connectEvent: connection.connectEvent,
-                    session: rawSession,
-                    lastWalletEventId: connection.lastWalletEventId,
-                    nextRpcRequestId: connection.nextRpcRequestId
-                };
-                return this.storage.setItem(this.storeKey, JSON.stringify(rawConnection));
-            }
-            const rawConnection = {
-                type: 'http',
-                connectionSource: connection.connectionSource,
-                sessionCrypto: connection.sessionCrypto.stringifyKeypair(),
-                createdAt: Date.now()
-            };
-            return this.storage.setItem(this.storeKey, JSON.stringify(rawConnection));
-        });
-    }
-    removeConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.storage.removeItem(this.storeKey);
-        });
-    }
-    getConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stored = yield this.storage.getItem(this.storeKey);
-            if (!stored) {
-                return null;
-            }
-            const connection = JSON.parse(stored);
-            if (connection.type === 'injected' || connection.type === 'wallet-connect') {
-                return connection;
-            }
-            if (!isPendingConnectionHttpRaw(connection)) {
-                const sessionCrypto = new protocol.SessionCrypto(connection.session.sessionKeyPair);
-                return {
-                    type: 'http',
-                    connectEvent: connection.connectEvent,
-                    lastWalletEventId: connection.lastWalletEventId,
-                    nextRpcRequestId: connection.nextRpcRequestId,
-                    session: {
-                        sessionCrypto,
-                        bridgeUrl: connection.session.bridgeUrl,
-                        walletPublicKey: connection.session.walletPublicKey
-                    }
-                };
-            }
-            if (isExpiredPendingConnectionHttpRaw(connection)) {
-                yield this.removeConnection();
-                return null;
-            }
-            return {
-                type: 'http',
-                sessionCrypto: new protocol.SessionCrypto(connection.sessionCrypto),
-                connectionSource: connection.connectionSource
-            };
-        });
-    }
-    getHttpConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (!connection) {
-                throw new TonConnectError('Trying to read HTTP connection source while nothing is stored');
-            }
-            if (connection.type !== 'http') {
-                throw new TonConnectError(`Trying to read HTTP connection source while ${connection.type} connection is stored`);
-            }
-            return connection;
-        });
-    }
-    getHttpPendingConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (!connection) {
-                throw new TonConnectError('Trying to read HTTP connection source while nothing is stored');
-            }
-            if (connection.type !== 'http') {
-                throw new TonConnectError(`Trying to read HTTP connection source while ${connection.type} connection is stored`);
-            }
-            if (!isPendingConnectionHttp(connection)) {
-                throw new TonConnectError('Trying to read HTTP-pending connection while http connection is stored');
-            }
-            return connection;
-        });
-    }
-    getInjectedConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (!connection) {
-                throw new TonConnectError('Trying to read Injected bridge connection source while nothing is stored');
-            }
-            if ((connection === null || connection === void 0 ? void 0 : connection.type) !== 'injected') {
-                throw new TonConnectError(`Trying to read Injected bridge connection source while ${connection.type} connection is stored`);
-            }
-            return connection;
-        });
-    }
-    getWalletConnectConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (!connection) {
-                throw new TonConnectError('Trying to read wallet connect bridge connection source while nothing is stored');
-            }
-            if ((connection === null || connection === void 0 ? void 0 : connection.type) !== 'wallet-connect') {
-                throw new TonConnectError(`Trying to read wallet connect bridge connection source while ${connection.type} connection is stored`);
-            }
-            return connection;
-        });
-    }
-    storedConnectionType() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stored = yield this.storage.getItem(this.storeKey);
-            if (!stored) {
-                return null;
-            }
-            const connection = JSON.parse(stored);
-            return connection.type;
-        });
-    }
-    storeLastWalletEventId(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (connection && connection.type === 'http' && !isPendingConnectionHttp(connection)) {
-                connection.lastWalletEventId = id;
-                return this.storeConnection(connection);
-            }
-        });
-    }
-    getLastWalletEventId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (connection && 'lastWalletEventId' in connection) {
-                return connection.lastWalletEventId;
-            }
-            return undefined;
-        });
-    }
-    increaseNextRpcRequestId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (connection && 'nextRpcRequestId' in connection) {
-                const lastId = connection.nextRpcRequestId || 0;
-                connection.nextRpcRequestId = lastId + 1;
-                return this.storeConnection(connection);
-            }
-        });
-    }
-    getNextRpcRequestId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnection();
-            if (connection && 'nextRpcRequestId' in connection) {
-                return connection.nextRpcRequestId || 0;
-            }
-            return 0;
-        });
-    }
-}
-
 const PROTOCOL_VERSION = 2;
 
 /**
@@ -1262,20 +1088,45 @@ function v7Bytes(rnds, msecs, seq, buf, offset = 0) {
     return buf;
 }
 
+function waitForSome(promises, count) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (count <= 0)
+            return [];
+        if (count > promises.length) {
+            throw new RangeError('count cannot be greater than the number of promises');
+        }
+        const results = new Array(promises.length);
+        let settledCount = 0;
+        return new Promise(resolve => {
+            promises.forEach((p, index) => {
+                Promise.resolve(p)
+                    .then(value => ({ status: 'fulfilled', value }))
+                    .catch(reason => ({ status: 'rejected', reason }))
+                    .then(result => {
+                    results[index] = result;
+                    settledCount++;
+                    if (settledCount === count) {
+                        resolve(results);
+                    }
+                });
+            });
+        });
+    });
+}
+
 class BridgeProvider {
     static fromStorage(storage, analyticsManager) {
         return __awaiter(this, void 0, void 0, function* () {
-            const bridgeConnectionStorage = new BridgeConnectionStorage(storage);
-            const connection = yield bridgeConnectionStorage.getHttpConnection();
+            const connection = yield storage.getHttpConnection();
             if (isPendingConnectionHttp(connection)) {
                 return new BridgeProvider(storage, connection.connectionSource, analyticsManager);
             }
             return new BridgeProvider(storage, { bridgeUrl: connection.session.bridgeUrl }, analyticsManager);
         });
     }
-    constructor(storage, walletConnectionSource, analyticsManager) {
+    constructor(connectionStorage, walletConnectionSource, analyticsManager) {
         var _a;
-        this.storage = storage;
+        this.connectionStorage = connectionStorage;
         this.walletConnectionSource = walletConnectionSource;
         this.analyticsManager = analyticsManager;
         this.type = 'http';
@@ -1287,7 +1138,7 @@ class BridgeProvider {
         this.listeners = [];
         this.defaultOpeningDeadlineMS = 12000;
         this.defaultRetryTimeoutMS = 2000;
-        this.connectionStorage = new BridgeConnectionStorage(storage);
+        this.optionalOpenGateways = 3;
         this.analytics = (_a = this.analyticsManager) === null || _a === void 0 ? void 0 : _a.scoped();
     }
     connect(message, options) {
@@ -1373,7 +1224,7 @@ class BridgeProvider {
                 logDebug('Gateway is already opened, closing previous gateway');
                 yield this.gateway.close();
             }
-            this.gateway = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, storedConnection.session.sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this), this.analyticsManager);
+            this.gateway = new BridgeGateway(this.connectionStorage.storage, this.walletConnectionSource.bridgeUrl, storedConnection.session.sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this), this.analyticsManager);
             if (abortController.signal.aborted) {
                 return;
             }
@@ -1653,11 +1504,13 @@ class BridgeProvider {
                 this.pendingGateways.map(bridge => bridge.close().catch());
                 // open new gateways
                 this.pendingGateways = this.walletConnectionSource.map(source => {
-                    const gateway = new BridgeGateway(this.storage, source.bridgeUrl, sessionCrypto.sessionId, () => { }, () => { }, this.analyticsManager);
+                    const gateway = new BridgeGateway(this.connectionStorage.storage, source.bridgeUrl, sessionCrypto.sessionId, () => { }, () => { }, this.analyticsManager);
                     gateway.setListener(message => this.pendingGatewaysListener(gateway, source.bridgeUrl, message));
                     return gateway;
                 });
-                yield Promise.allSettled(this.pendingGateways.map(bridge => callForSuccess((_options) => {
+                // Wait until the specified optional gateways are opened, not necessarily all gateways
+                const gatewaysToWaitFor = Math.max(this.pendingGateways.length - this.optionalOpenGateways, 1);
+                yield waitForSome(this.pendingGateways.map(bridge => callForSuccess((_options) => {
                     var _a;
                     if (!this.pendingGateways.some(item => item === bridge)) {
                         return bridge.close();
@@ -1671,7 +1524,7 @@ class BridgeProvider {
                     attempts: Number.MAX_SAFE_INTEGER,
                     delayMs: this.defaultRetryTimeoutMS,
                     signal: options === null || options === void 0 ? void 0 : options.signal
-                })));
+                })), gatewaysToWaitFor);
                 return;
             }
             else {
@@ -1679,7 +1532,7 @@ class BridgeProvider {
                     logDebug(`Gateway is already opened, closing previous gateway`);
                     yield this.gateway.close();
                 }
-                this.gateway = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this), this.analyticsManager);
+                this.gateway = new BridgeGateway(this.connectionStorage.storage, this.walletConnectionSource.bridgeUrl, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this), this.analyticsManager);
                 return yield this.gateway.registerSession({
                     openingDeadlineMS: options === null || options === void 0 ? void 0 : options.openingDeadlineMS,
                     signal: options === null || options === void 0 ? void 0 : options.signal,
@@ -1866,8 +1719,7 @@ function getWindowEntries() {
 class InjectedProvider {
     static fromStorage(storage, analyticsManager) {
         return __awaiter(this, void 0, void 0, function* () {
-            const bridgeConnectionStorage = new BridgeConnectionStorage(storage);
-            const connection = yield bridgeConnectionStorage.getInjectedConnection();
+            const connection = yield storage.getInjectedConnection();
             return new InjectedProvider(storage, connection.jsBridgeKey, analyticsManager);
         });
     }
@@ -1905,7 +1757,8 @@ class InjectedProvider {
             typeof window[injectedWalletKey] === 'object' &&
             'tonconnect' in window[injectedWalletKey]);
     }
-    constructor(storage, injectedWalletKey, analyticsManager) {
+    constructor(connectionStorage, injectedWalletKey, analyticsManager) {
+        this.connectionStorage = connectionStorage;
         this.injectedWalletKey = injectedWalletKey;
         this.type = 'injected';
         this.unsubscribeCallback = null;
@@ -1915,7 +1768,6 @@ class InjectedProvider {
         if (!InjectedProvider.isWindowContainsWallet(window, injectedWalletKey)) {
             throw new WalletNotInjectedError();
         }
-        this.connectionStorage = new BridgeConnectionStorage(storage);
         this.injectedWallet = window[injectedWalletKey].tonconnect;
         if (analyticsManager) {
             this.analytics = analyticsManager.scoped({
@@ -2131,6 +1983,205 @@ class InjectedProvider {
 }
 InjectedProvider.window = getWindow();
 
+class BridgeConnectionStorage {
+    constructor(storage, walletsListManager) {
+        this.storage = storage;
+        this.walletsListManager = walletsListManager;
+        this.storeKey = 'ton-connect-storage_bridge-connection';
+    }
+    storeConnection(connection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (connection.type === 'injected' || connection.type === 'wallet-connect') {
+                return this.storage.setItem(this.storeKey, JSON.stringify(connection));
+            }
+            if (!isPendingConnectionHttp(connection)) {
+                const rawSession = {
+                    sessionKeyPair: connection.session.sessionCrypto.stringifyKeypair(),
+                    walletPublicKey: connection.session.walletPublicKey,
+                    bridgeUrl: connection.session.bridgeUrl
+                };
+                const rawConnection = {
+                    type: 'http',
+                    connectEvent: connection.connectEvent,
+                    session: rawSession,
+                    lastWalletEventId: connection.lastWalletEventId,
+                    nextRpcRequestId: connection.nextRpcRequestId
+                };
+                return this.storage.setItem(this.storeKey, JSON.stringify(rawConnection));
+            }
+            const rawConnection = {
+                type: 'http',
+                connectionSource: connection.connectionSource,
+                sessionCrypto: connection.sessionCrypto.stringifyKeypair(),
+                createdAt: Date.now()
+            };
+            return this.storage.setItem(this.storeKey, JSON.stringify(rawConnection));
+        });
+    }
+    removeConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.storage.removeItem(this.storeKey);
+        });
+    }
+    getConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const stored = yield this.storage.getItem(this.storeKey);
+                if (!stored) {
+                    return null;
+                }
+                const connection = JSON.parse(stored);
+                if (connection.type === 'injected' || connection.type === 'wallet-connect') {
+                    return connection;
+                }
+                if (!isPendingConnectionHttpRaw(connection)) {
+                    const sessionCrypto = new protocol.SessionCrypto(connection.session.sessionKeyPair);
+                    return yield this.actualizeBridgeConnection({
+                        type: 'http',
+                        connectEvent: connection.connectEvent,
+                        lastWalletEventId: connection.lastWalletEventId,
+                        nextRpcRequestId: connection.nextRpcRequestId,
+                        session: {
+                            sessionCrypto,
+                            bridgeUrl: connection.session.bridgeUrl,
+                            walletPublicKey: connection.session.walletPublicKey
+                        }
+                    });
+                }
+                if (isExpiredPendingConnectionHttpRaw(connection)) {
+                    yield this.removeConnection();
+                    return null;
+                }
+                return {
+                    type: 'http',
+                    sessionCrypto: new protocol.SessionCrypto(connection.sessionCrypto),
+                    connectionSource: connection.connectionSource
+                };
+            }
+            catch (err) {
+                logDebug('Error retrieving connection', err);
+                return null;
+            }
+        });
+    }
+    getHttpConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (!connection) {
+                throw new TonConnectError('Trying to read HTTP connection source while nothing is stored');
+            }
+            if (connection.type !== 'http') {
+                throw new TonConnectError(`Trying to read HTTP connection source while ${connection.type} connection is stored`);
+            }
+            return connection;
+        });
+    }
+    getHttpPendingConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (!connection) {
+                throw new TonConnectError('Trying to read HTTP connection source while nothing is stored');
+            }
+            if (connection.type !== 'http') {
+                throw new TonConnectError(`Trying to read HTTP connection source while ${connection.type} connection is stored`);
+            }
+            if (!isPendingConnectionHttp(connection)) {
+                throw new TonConnectError('Trying to read HTTP-pending connection while http connection is stored');
+            }
+            return connection;
+        });
+    }
+    getInjectedConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (!connection) {
+                throw new TonConnectError('Trying to read Injected bridge connection source while nothing is stored');
+            }
+            if ((connection === null || connection === void 0 ? void 0 : connection.type) !== 'injected') {
+                throw new TonConnectError(`Trying to read Injected bridge connection source while ${connection.type} connection is stored`);
+            }
+            return connection;
+        });
+    }
+    getWalletConnectConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (!connection) {
+                throw new TonConnectError('Trying to read wallet connect bridge connection source while nothing is stored');
+            }
+            if ((connection === null || connection === void 0 ? void 0 : connection.type) !== 'wallet-connect') {
+                throw new TonConnectError(`Trying to read wallet connect bridge connection source while ${connection.type} connection is stored`);
+            }
+            return connection;
+        });
+    }
+    storedConnectionType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stored = yield this.storage.getItem(this.storeKey);
+            if (!stored) {
+                return null;
+            }
+            const connection = JSON.parse(stored);
+            return connection.type;
+        });
+    }
+    storeLastWalletEventId(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (connection && connection.type === 'http' && !isPendingConnectionHttp(connection)) {
+                connection.lastWalletEventId = id;
+                return this.storeConnection(connection);
+            }
+        });
+    }
+    getLastWalletEventId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (connection && 'lastWalletEventId' in connection) {
+                return connection.lastWalletEventId;
+            }
+            return undefined;
+        });
+    }
+    increaseNextRpcRequestId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (connection && 'nextRpcRequestId' in connection) {
+                const lastId = connection.nextRpcRequestId || 0;
+                connection.nextRpcRequestId = lastId + 1;
+                return this.storeConnection(connection);
+            }
+        });
+    }
+    getNextRpcRequestId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.getConnection();
+            if (connection && 'nextRpcRequestId' in connection) {
+                return connection.nextRpcRequestId || 0;
+            }
+            return 0;
+        });
+    }
+    actualizeBridgeConnection(connection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appName = connection.connectEvent.payload.device.appName;
+                const wallet = yield this.walletsListManager.getRemoteWallet(appName);
+                if (wallet.bridgeUrl === connection.session.bridgeUrl) {
+                    return connection;
+                }
+                const actualizedConnection = Object.assign(Object.assign({}, connection), { session: Object.assign(Object.assign({}, connection.session), { bridgeUrl: wallet.bridgeUrl }) });
+                yield this.storeConnection(actualizedConnection);
+                return actualizedConnection;
+            }
+            catch (error) {
+                logDebug('Failed to actualize bridge connection', error);
+                return connection;
+            }
+        });
+    }
+}
+
 /**
  * Default storage to save protocol data, uses `localStorage` if it is available. In Safari's private mode, it uses `InMemoryStorage`. In Node.js, it throws an error.
  */
@@ -3081,6 +3132,7 @@ class WalletsListManager {
                 (_a = options === null || options === void 0 ? void 0 : options.walletsListSource) !== null && _a !== void 0 ? _a : 'https://config.ton.org/wallets-v2.json';
         }
         this.cacheTTLMs = options === null || options === void 0 ? void 0 : options.cacheTTLMs;
+        this.onDownloadDurationMeasured = options === null || options === void 0 ? void 0 : options.onDownloadDurationMeasured;
     }
     getWallets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -3119,9 +3171,24 @@ class WalletsListManager {
             return this.walletsListDTOCache;
         });
     }
+    getRemoteWallet(appName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletsList = yield this.getWallets();
+            const wallet = walletsList.find(wallet => wallet.appName === appName);
+            if (!wallet) {
+                throw new TonConnectError(`Wallet info not found for appName: "${appName}"`);
+            }
+            if (!isWalletInfoRemote(wallet)) {
+                throw new TonConnectError(`Wallet "${appName}" is not remote`);
+            }
+            return wallet;
+        });
+    }
     fetchWalletsListFromSource() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             let walletsList = [];
+            const startTime = performance.now();
             try {
                 const walletsResponse = yield fetch(this.walletsListSource);
                 walletsList = yield walletsResponse.json();
@@ -3135,10 +3202,14 @@ class WalletsListManager {
                         .join(', ')} config format is wrong. They were removed from the wallets list.`);
                     walletsList = walletsList.filter(wallet => this.isCorrectWalletConfigDTO(wallet));
                 }
+                const endTime = performance.now();
+                const duration = Math.round(endTime - startTime);
+                (_a = this.onDownloadDurationMeasured) === null || _a === void 0 ? void 0 : _a.call(this, duration);
             }
             catch (e) {
                 logError(e);
                 walletsList = FALLBACK_WALLETS_LIST;
+                (_b = this.onDownloadDurationMeasured) === null || _b === void 0 ? void 0 : _b.call(this, undefined);
             }
             return walletsList;
         });
@@ -3809,7 +3880,7 @@ class TonConnectTracker {
     }
 }
 
-const tonConnectSdkVersion = "3.4.0-beta.2";
+const tonConnectSdkVersion = "3.4.0-beta.5";
 
 const bounceableTag = 0x11;
 const noBounceableTag = 0x51;
@@ -4248,10 +4319,6 @@ function validateTonProofItemReply(data) {
         if (!isValidObject(proof)) {
             return "Invalid 'proof' object";
         }
-        const allowedProofKeys = ['timestamp', 'domain', 'payload', 'signature'];
-        if (hasExtraProperties(proof, allowedProofKeys)) {
-            return 'ton_proof item contains extra properties';
-        }
         if (!isValidNumber(proof.timestamp)) {
             return "Invalid 'proof.timestamp'";
         }
@@ -4324,10 +4391,61 @@ function normalizeBase64(data) {
 function pascalToKebab(value) {
     return value.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase();
 }
+/**
+ * Collects static connection metrics from the browser's Performance API.
+ * TTFB is measured once at page load and doesn't change.
+ * @returns An object containing static connection metrics (TTFB) or empty object if not available.
+ */
+function getStaticConnectionMetrics() {
+    const metrics = {};
+    // Get TTFB from Navigation Timing API (static, measured once at page load)
+    try {
+        const navEntries = performance.getEntriesByType('navigation');
+        if (navEntries.length > 0) {
+            const nav = navEntries[0];
+            if (nav.responseStart && nav.requestStart) {
+                metrics.conn_ttfb = Math.round(nav.responseStart - nav.requestStart);
+            }
+        }
+    }
+    catch (e) {
+        // Performance API not available or error occurred
+    }
+    return metrics;
+}
+/**
+ * Collects dynamic connection metrics from the browser's Network Information API.
+ * @returns An object containing dynamic connection metrics (RTT, network type) or empty object if not available.
+ */
+function getDynamicConnectionMetrics() {
+    const metrics = {};
+    // Get RTT and network type from Network Information API (dynamic, can change)
+    try {
+        const navigatorWithConnection = navigator;
+        const connection = navigatorWithConnection.connection ||
+            navigatorWithConnection.mozConnection ||
+            navigatorWithConnection.webkitConnection;
+        if (connection) {
+            if (connection.rtt !== undefined) {
+                metrics.conn_rtt = connection.rtt;
+            }
+            if (connection.effectiveType) {
+                metrics.conn_network_type = connection.effectiveType;
+            }
+            else if (connection.type) {
+                metrics.conn_network_type = connection.type;
+            }
+        }
+    }
+    catch (e) {
+        // Network Information API not available or error occurred
+    }
+    return metrics;
+}
 
 class AnalyticsManager {
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         this.events = [];
         this.timeoutId = null;
         this.isProcessing = false;
@@ -4338,11 +4456,7 @@ class AnalyticsManager {
         this.maxBatchSize = (_b = options.maxBatchSize) !== null && _b !== void 0 ? _b : 100;
         this.analyticsUrl = (_c = options.analyticsUrl) !== null && _c !== void 0 ? _c : 'https://analytics.ton.org/events';
         this.enabled = (_d = options.enabled) !== null && _d !== void 0 ? _d : true;
-        this.baseEvent = {
-            subsystem: 'dapp-sdk',
-            version: tonConnectSdkVersion,
-            client_environment: (_e = options.environment) === null || _e === void 0 ? void 0 : _e.getClientEnvironment()
-        };
+        this.baseEvent = Object.assign({ subsystem: 'dapp-sdk', version: tonConnectSdkVersion, client_environment: (_f = (_e = options.environment) === null || _e === void 0 ? void 0 : _e.getClientEnvironment) === null || _f === void 0 ? void 0 : _f.call(_e) }, getStaticConnectionMetrics());
         this.addWindowFocusAndBlurSubscriptions();
     }
     scoped(sharedData) {
@@ -4371,7 +4485,8 @@ class AnalyticsManager {
             return;
         }
         const traceId = (_a = event.trace_id) !== null && _a !== void 0 ? _a : UUIDv7();
-        const enhancedEvent = Object.assign(Object.assign(Object.assign({}, this.baseEvent), event), { event_id: UUIDv7(), client_timestamp: Math.floor(Date.now() / 1000), trace_id: traceId });
+        const dynamicMetrics = getDynamicConnectionMetrics();
+        const enhancedEvent = Object.assign(Object.assign(Object.assign(Object.assign({}, this.baseEvent), dynamicMetrics), event), { event_id: UUIDv7(), client_timestamp: Math.floor(Date.now() / 1000), trace_id: traceId });
         if (isQaModeEnabled()) {
             logDebug(enhancedEvent);
         }
@@ -4526,6 +4641,9 @@ class AnalyticsManager {
     getPendingEventsCount() {
         return this.events.length;
     }
+    setWalletListDownloadDuration(duration) {
+        this.baseEvent = Object.assign(Object.assign({}, this.baseEvent), { wallet_list_download_duration: duration });
+    }
 }
 AnalyticsManager.HTTP_STATUS = {
     TOO_MANY_REQUESTS: 429,
@@ -4761,11 +4879,11 @@ function getWalletConnectOptions() {
 const DEFAULT_REQUEST_ID = '0';
 const DEFAULT_EVENT_ID = 0;
 class WalletConnectProvider {
-    constructor(storage) {
+    constructor(connectionStorage) {
+        this.connectionStorage = connectionStorage;
         this.type = 'injected';
         this.listeners = [];
         this.connector = undefined;
-        this.connectionStorage = new BridgeConnectionStorage(storage);
         const { projectId, metadata } = getWalletConnectOptions();
         this.config = {
             networks: [
@@ -5252,7 +5370,6 @@ class TonConnect {
     }
     constructor(options) {
         var _a, _b;
-        this.walletsList = new WalletsListManager();
         this._wallet = null;
         this.provider = null;
         this.statusChangeSubscriptions = [];
@@ -5263,18 +5380,22 @@ class TonConnect {
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new DefaultStorage()
         };
         this.walletsRequiredFeatures = options === null || options === void 0 ? void 0 : options.walletsRequiredFeatures;
+        this.environment = (_a = options === null || options === void 0 ? void 0 : options.environment) !== null && _a !== void 0 ? _a : new DefaultEnvironment();
+        // TODO: in production ready make flag to enable them?
+        this.analytics = new AnalyticsManager({ environment: this.environment });
         this.walletsList = new WalletsListManager({
             walletsListSource: options === null || options === void 0 ? void 0 : options.walletsListSource,
-            cacheTTLMs: options === null || options === void 0 ? void 0 : options.walletsListCacheTTLMs
+            cacheTTLMs: options === null || options === void 0 ? void 0 : options.walletsListCacheTTLMs,
+            onDownloadDurationMeasured: (duration) => {
+                var _a;
+                (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.setWalletListDownloadDuration(duration);
+            }
         });
-        const eventDispatcher = (_a = options === null || options === void 0 ? void 0 : options.eventDispatcher) !== null && _a !== void 0 ? _a : new BrowserEventDispatcher();
+        const eventDispatcher = (_b = options === null || options === void 0 ? void 0 : options.eventDispatcher) !== null && _b !== void 0 ? _b : new BrowserEventDispatcher();
         this.tracker = new TonConnectTracker({
             eventDispatcher,
             tonConnectSdkVersion: tonConnectSdkVersion
         });
-        this.environment = (_b = options === null || options === void 0 ? void 0 : options.environment) !== null && _b !== void 0 ? _b : new DefaultEnvironment();
-        // TODO: in production ready make flag to enable them?
-        this.analytics = new AnalyticsManager({ environment: this.environment });
         const telegramUser = this.environment.getTelegramUser();
         bindEventsTo(eventDispatcher, this.analytics.scoped({
             locale: this.environment.getLocale(),
@@ -5288,7 +5409,7 @@ class TonConnect {
         if (!this.dappSettings.manifestUrl) {
             throw new DappMetadataError('Dapp tonconnect-manifest.json must be specified if window.location.origin is undefined. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest');
         }
-        this.bridgeConnectionStorage = new BridgeConnectionStorage(this.dappSettings.storage);
+        this.bridgeConnectionStorage = new BridgeConnectionStorage(this.dappSettings.storage, this.walletsList);
         if (!(options === null || options === void 0 ? void 0 : options.disableAutoPauseConnection)) {
             this.addWindowFocusAndBlurSubscriptions();
         }
@@ -5400,13 +5521,13 @@ class TonConnect {
             try {
                 switch (bridgeConnectionType) {
                     case 'http':
-                        provider = yield BridgeProvider.fromStorage(this.dappSettings.storage, this.analytics);
+                        provider = yield BridgeProvider.fromStorage(this.bridgeConnectionStorage, this.analytics);
                         break;
                     case 'injected':
-                        provider = yield InjectedProvider.fromStorage(this.dappSettings.storage, this.analytics);
+                        provider = yield InjectedProvider.fromStorage(this.bridgeConnectionStorage, this.analytics);
                         break;
                     case 'wallet-connect':
-                        provider = yield WalletConnectProvider.fromStorage(this.dappSettings.storage);
+                        provider = yield WalletConnectProvider.fromStorage(this.bridgeConnectionStorage);
                         break;
                     default:
                         if (embeddedWallet) {
@@ -5719,13 +5840,13 @@ class TonConnect {
     createProvider(wallet) {
         let provider;
         if (!Array.isArray(wallet) && isWalletConnectionSourceJS(wallet)) {
-            provider = new InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey, this.analytics);
+            provider = new InjectedProvider(this.bridgeConnectionStorage, wallet.jsBridgeKey, this.analytics);
         }
         else if (!Array.isArray(wallet) && isWalletConnectionSourceWalletConnect(wallet)) {
-            provider = new WalletConnectProvider(this.dappSettings.storage);
+            provider = new WalletConnectProvider(this.bridgeConnectionStorage);
         }
         else {
-            provider = new BridgeProvider(this.dappSettings.storage, wallet, this.analytics);
+            provider = new BridgeProvider(this.bridgeConnectionStorage, wallet, this.analytics);
         }
         provider.listen(this.walletEventsListener.bind(this));
         return provider;