@tonconnect/sdk 3.3.1 → 3.4.0-beta.0

package/lib/esm/index.mjs

@@ -392,6 +392,12 @@ function isTelegramUrl(link) {
     const url = new URL(link);
     return url.protocol === 'tg:' || url.hostname === 't.me';
 }
+function isConnectUrl(link) {
+    if (!link) {
+        return false;
+    }
+    return link.includes('ton_addr') || link.includes('ton--5Faddr');
+}
 function encodeTelegramUrlParameters(parameters) {
     return parameters
         .replaceAll('.', '%2E')
@@ -401,6 +407,15 @@ function encodeTelegramUrlParameters(parameters) {
         .replaceAll('=', '__')
         .replaceAll('%', '--');
 }
+function decodeTelegramUrlParameters(parameters) {
+    return parameters
+        .replaceAll('--', '%')
+        .replaceAll('__', '=')
+        .replaceAll('-', '&')
+        .replaceAll('%5F', '_')
+        .replaceAll('%2D', '-')
+        .replaceAll('%2E', '.');
+}
 
 /**
  * Delays the execution of code for a specified number of milliseconds.
@@ -635,7 +650,7 @@ class BridgeGateway {
         const eventSource = this.eventSource.current();
         return (eventSource === null || eventSource === void 0 ? void 0 : eventSource.readyState) === EventSource.CONNECTING;
     }
-    constructor(storage, bridgeUrl, sessionId, listener, errorsListener) {
+    constructor(storage, bridgeUrl, sessionId, listener, errorsListener, analyticsManager) {
         this.bridgeUrl = bridgeUrl;
         this.sessionId = sessionId;
         this.listener = listener;
@@ -646,7 +661,7 @@ class BridgeGateway {
         this.defaultTtl = 300;
         this.defaultReconnectDelay = 2000;
         this.defaultResendDelay = 5000;
-        this.eventSource = createResource((signal, openingDeadlineMS) => __awaiter(this, void 0, void 0, function* () {
+        this.eventSource = createResource((signal, openingDeadlineMS, traceId) => __awaiter(this, void 0, void 0, function* () {
             const eventSourceConfig = {
                 bridgeUrl: this.bridgeUrl,
                 ssePath: this.ssePath,
@@ -655,17 +670,41 @@ class BridgeGateway {
                 errorHandler: this.errorsHandler.bind(this),
                 messageHandler: this.messagesHandler.bind(this),
                 signal: signal,
-                openingDeadlineMS: openingDeadlineMS
+                openingDeadlineMS: openingDeadlineMS,
+                traceId
             };
             return yield createEventSource(eventSourceConfig);
         }), (resource) => __awaiter(this, void 0, void 0, function* () {
             resource.close();
         }));
         this.bridgeGatewayStorage = new HttpBridgeGatewayStorage(storage, bridgeUrl);
+        this.analytics = analyticsManager === null || analyticsManager === void 0 ? void 0 : analyticsManager.scoped({
+            bridge_url: bridgeUrl,
+            client_id: sessionId
+        });
     }
     registerSession(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventSource.create(options === null || options === void 0 ? void 0 : options.signal, options === null || options === void 0 ? void 0 : options.openingDeadlineMS);
+            var _a, _b, _c;
+            try {
+                (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.emitBridgeClientConnectStarted({
+                    trace_id: options === null || options === void 0 ? void 0 : options.traceId
+                });
+                const connectionStarted = Date.now();
+                yield this.eventSource.create(options === null || options === void 0 ? void 0 : options.signal, options === null || options === void 0 ? void 0 : options.openingDeadlineMS, options === null || options === void 0 ? void 0 : options.traceId);
+                const bridgeConnectDuration = Date.now() - connectionStarted;
+                (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitBridgeClientConnectEstablished({
+                    bridge_connect_duration: bridgeConnectDuration,
+                    trace_id: options === null || options === void 0 ? void 0 : options.traceId
+                });
+            }
+            catch (error) {
+                (_c = this.analytics) === null || _c === void 0 ? void 0 : _c.emitBridgeClientConnectError({
+                    trace_id: options === null || options === void 0 ? void 0 : options.traceId,
+                    error_message: String(error)
+                });
+                throw error;
+            }
         });
     }
     send(message, receiver, topic, ttlOrOptions) {
@@ -680,12 +719,16 @@ class BridgeGateway {
                 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;
+                options.traceId = ttlOrOptions === null || ttlOrOptions === void 0 ? void 0 : ttlOrOptions.traceId;
             }
             const url = new URL(addPathToUrl(this.bridgeUrl, this.postPath));
             url.searchParams.append('client_id', this.sessionId);
             url.searchParams.append('to', receiver);
             url.searchParams.append('ttl', ((options === null || options === void 0 ? void 0 : options.ttl) || this.defaultTtl).toString());
             url.searchParams.append('topic', topic);
+            if (options === null || options === void 0 ? void 0 : options.traceId) {
+                url.searchParams.append('trace_id', options.traceId);
+            }
             const body = Base64.encode(message);
             yield callForSuccess((options) => __awaiter(this, void 0, void 0, function* () {
                 const response = yield this.post(url, body, options.signal);
@@ -764,7 +807,12 @@ class BridgeGateway {
             }
             let bridgeIncomingMessage;
             try {
-                bridgeIncomingMessage = JSON.parse(e.data);
+                const bridgeIncomingMessageRaw = JSON.parse(e.data);
+                bridgeIncomingMessage = {
+                    message: bridgeIncomingMessageRaw.message,
+                    from: bridgeIncomingMessageRaw.from,
+                    traceId: bridgeIncomingMessageRaw.trace_id
+                };
             }
             catch (_) {
                 throw new TonConnectError(`Bridge message parse failed, message ${e.data}`);
@@ -793,6 +841,9 @@ function createEventSource(config) {
             if (lastEventId) {
                 url.searchParams.append('last_event_id', lastEventId);
             }
+            if (config.traceId) {
+                url.searchParams.append('trace_id', config.traceId);
+            }
             if (signal.aborted) {
                 reject(new TonConnectError('Bridge connection aborted'));
                 return;
@@ -1018,20 +1069,189 @@ class BridgeConnectionStorage {
 
 const PROTOCOL_VERSION = 2;
 
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2010-2020 Robert Kieffer and other contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+// Unique ID creation requires a high quality random # generator. In the browser we therefore
+// require the crypto API and do not support built-in fallback to lower quality random number
+// generators (like Math.random()).
+let getRandomValues;
+const rnds8 = new Uint8Array(16);
+function rng() {
+    // lazy load so that environments that need to polyfill have a chance to do so
+    if (!getRandomValues) {
+        if (typeof crypto === 'undefined' || !crypto.getRandomValues) {
+            throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+        }
+        getRandomValues = crypto.getRandomValues.bind(crypto);
+    }
+    return getRandomValues(rnds8);
+}
+
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2010-2020 Robert Kieffer and other contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+const byteToHex = [];
+for (let i = 0; i < 256; ++i) {
+    byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+    // Note: Be careful editing this code!  It's been tuned for performance
+    // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+    //
+    // Note to future-self: No, you can't remove the `toLowerCase()` call.
+    // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
+    return (byteToHex[arr[offset + 0]] +
+        byteToHex[arr[offset + 1]] +
+        byteToHex[arr[offset + 2]] +
+        byteToHex[arr[offset + 3]] +
+        '-' +
+        byteToHex[arr[offset + 4]] +
+        byteToHex[arr[offset + 5]] +
+        '-' +
+        byteToHex[arr[offset + 6]] +
+        byteToHex[arr[offset + 7]] +
+        '-' +
+        byteToHex[arr[offset + 8]] +
+        byteToHex[arr[offset + 9]] +
+        '-' +
+        byteToHex[arr[offset + 10]] +
+        byteToHex[arr[offset + 11]] +
+        byteToHex[arr[offset + 12]] +
+        byteToHex[arr[offset + 13]] +
+        byteToHex[arr[offset + 14]] +
+        byteToHex[arr[offset + 15]]).toLowerCase();
+}
+
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2010-2020 Robert Kieffer and other contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+const _state = {};
+function UUIDv7(options, buf, offset) {
+    var _a, _b, _c;
+    let bytes;
+    if (options) {
+        // With options: Make UUID independent of internal state
+        bytes = v7Bytes((_c = (_a = options.random) !== null && _a !== void 0 ? _a : (_b = options.rng) === null || _b === void 0 ? void 0 : _b.call(options)) !== null && _c !== void 0 ? _c : rng(), options.msecs, options.seq, buf, offset);
+    }
+    else {
+        // No options: Use internal state
+        const now = Date.now();
+        const rnds = rng();
+        updateV7State(_state, now, rnds);
+        bytes = v7Bytes(rnds, _state.msecs, _state.seq, buf, offset);
+    }
+    return buf !== null && buf !== void 0 ? buf : unsafeStringify(bytes);
+}
+// (Private!)  Do not use.  This method is only exported for testing purposes
+// and may change without notice.
+function updateV7State(state, now, rnds) {
+    var _a, _b;
+    (_a = state.msecs) !== null && _a !== void 0 ? _a : (state.msecs = -Infinity);
+    (_b = state.seq) !== null && _b !== void 0 ? _b : (state.seq = 0);
+    if (now > state.msecs) {
+        // Time has moved on! Pick a new random sequence number
+        state.seq = (rnds[6] << 23) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9];
+        state.msecs = now;
+    }
+    else {
+        // Bump sequence counter w/ 32-bit rollover
+        state.seq = (state.seq + 1) | 0;
+        // In case of rollover, bump timestamp to preserve monotonicity. This is
+        // allowed by the RFC and should self-correct as the system clock catches
+        // up. See https://www.rfc-editor.org/rfc/rfc9562.html#section-6.2-9.4
+        if (state.seq === 0) {
+            state.msecs++;
+        }
+    }
+    return state;
+}
+function v7Bytes(rnds, msecs, seq, buf, offset = 0) {
+    if (rnds.length < 16) {
+        throw new Error('Random bytes length must be >= 16');
+    }
+    if (!buf) {
+        buf = new Uint8Array(16);
+        offset = 0;
+    }
+    else {
+        if (offset < 0 || offset + 16 > buf.length) {
+            throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`);
+        }
+    }
+    // Defaults
+    msecs !== null && msecs !== void 0 ? msecs : (msecs = Date.now());
+    seq !== null && seq !== void 0 ? seq : (seq = ((rnds[6] * 0x7f) << 24) | (rnds[7] << 16) | (rnds[8] << 8) | rnds[9]);
+    // byte 0-5: timestamp (48 bits)
+    buf[offset++] = (msecs / 0x10000000000) & 0xff;
+    buf[offset++] = (msecs / 0x100000000) & 0xff;
+    buf[offset++] = (msecs / 0x1000000) & 0xff;
+    buf[offset++] = (msecs / 0x10000) & 0xff;
+    buf[offset++] = (msecs / 0x100) & 0xff;
+    buf[offset++] = msecs & 0xff;
+    // byte 6: `version` (4 bits) | sequence bits 28-31 (4 bits)
+    buf[offset++] = 0x70 | ((seq >>> 28) & 0x0f);
+    // byte 7: sequence bits 20-27 (8 bits)
+    buf[offset++] = (seq >>> 20) & 0xff;
+    // byte 8: `variant` (2 bits) | sequence bits 14-19 (6 bits)
+    buf[offset++] = 0x80 | ((seq >>> 14) & 0x3f);
+    // byte 9: sequence bits 6-13 (8 bits)
+    buf[offset++] = (seq >>> 6) & 0xff;
+    // byte 10: sequence bits 0-5 (6 bits) | random (2 bits)
+    buf[offset++] = ((seq << 2) & 0xff) | (rnds[10] & 0x03);
+    // bytes 11-15: random (40 bits)
+    buf[offset++] = rnds[11];
+    buf[offset++] = rnds[12];
+    buf[offset++] = rnds[13];
+    buf[offset++] = rnds[14];
+    buf[offset++] = rnds[15];
+    return buf;
+}
+
 class BridgeProvider {
-    static fromStorage(storage) {
+    static fromStorage(storage, analyticsManager) {
         return __awaiter(this, void 0, void 0, function* () {
             const bridgeConnectionStorage = new BridgeConnectionStorage(storage);
             const connection = yield bridgeConnectionStorage.getHttpConnection();
             if (isPendingConnectionHttp(connection)) {
-                return new BridgeProvider(storage, connection.connectionSource);
+                return new BridgeProvider(storage, connection.connectionSource, analyticsManager);
             }
-            return new BridgeProvider(storage, { bridgeUrl: connection.session.bridgeUrl });
+            return new BridgeProvider(storage, { bridgeUrl: connection.session.bridgeUrl }, analyticsManager);
         });
     }
-    constructor(storage, walletConnectionSource) {
+    constructor(storage, walletConnectionSource, analyticsManager) {
+        var _a;
         this.storage = storage;
         this.walletConnectionSource = walletConnectionSource;
+        this.analyticsManager = analyticsManager;
         this.type = 'http';
         this.standardUniversalLink = 'tc://';
         this.pendingRequests = new Map();
@@ -1042,11 +1262,13 @@ class BridgeProvider {
         this.defaultOpeningDeadlineMS = 12000;
         this.defaultRetryTimeoutMS = 2000;
         this.connectionStorage = new BridgeConnectionStorage(storage);
+        this.analytics = (_a = this.analyticsManager) === null || _a === void 0 ? void 0 : _a.scoped();
     }
     connect(message, options) {
-        var _a;
+        var _a, _b;
+        const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
         const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
-        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+        (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.abort();
         this.abortController = abortController;
         this.closeGateways();
         const sessionCrypto = new SessionCrypto();
@@ -1070,7 +1292,8 @@ class BridgeProvider {
                 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
+                    signal: _options === null || _options === void 0 ? void 0 : _options.signal,
+                    traceId
                 });
             }, {
                 attempts: Number.MAX_SAFE_INTEGER,
@@ -1082,13 +1305,14 @@ class BridgeProvider {
             this.walletConnectionSource.universalLink
             ? this.walletConnectionSource.universalLink
             : this.standardUniversalLink;
-        return this.generateUniversalLink(universalLink, message);
+        return this.generateUniversalLink(universalLink, message, { traceId });
     }
     restoreConnection(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
-            (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+            (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.abort();
             this.abortController = abortController;
             if (abortController.signal.aborted) {
                 return;
@@ -1101,7 +1325,7 @@ class BridgeProvider {
             if (abortController.signal.aborted) {
                 return;
             }
-            const openingDeadlineMS = (_b = options === null || options === void 0 ? void 0 : options.openingDeadlineMS) !== null && _b !== void 0 ? _b : this.defaultOpeningDeadlineMS;
+            const openingDeadlineMS = (_c = options === null || options === void 0 ? void 0 : options.openingDeadlineMS) !== null && _c !== void 0 ? _c : this.defaultOpeningDeadlineMS;
             if (isPendingConnectionHttp(storedConnection)) {
                 this.session = {
                     sessionCrypto: storedConnection.sessionCrypto,
@@ -1111,7 +1335,8 @@ class BridgeProvider {
                 };
                 return yield this.openGateways(storedConnection.sessionCrypto, {
                     openingDeadlineMS: openingDeadlineMS,
-                    signal: abortController === null || abortController === void 0 ? void 0 : abortController.signal
+                    signal: abortController === null || abortController === void 0 ? void 0 : abortController.signal,
+                    traceId: options === null || options === void 0 ? void 0 : options.traceId
                 });
             }
             if (Array.isArray(this.walletConnectionSource)) {
@@ -1122,17 +1347,18 @@ 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.gateway = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, storedConnection.session.sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this), this.analyticsManager);
             if (abortController.signal.aborted) {
                 return;
             }
             // notify listeners about stored connection
-            this.listeners.forEach(listener => listener(storedConnection.connectEvent));
+            this.listeners.forEach(listener => listener(Object.assign(Object.assign({}, storedConnection.connectEvent), { traceId })));
             // wait for the connection to be opened
             try {
                 yield callForSuccess(options => this.gateway.registerSession({
                     openingDeadlineMS: openingDeadlineMS,
-                    signal: options.signal
+                    signal: options.signal,
+                    traceId
                 }), {
                     attempts: Number.MAX_SAFE_INTEGER,
                     delayMs: this.defaultRetryTimeoutMS,
@@ -1140,12 +1366,13 @@ class BridgeProvider {
                 });
             }
             catch (e) {
-                yield this.disconnect({ signal: abortController.signal });
+                yield this.disconnect({ signal: abortController.signal, traceId });
                 return;
             }
         });
     }
     sendRequest(request, optionsOrOnRequestSent) {
+        var _a;
         // TODO: remove deprecated method
         const options = {};
         if (typeof optionsOrOnRequestSent === 'function') {
@@ -1155,9 +1382,11 @@ class BridgeProvider {
             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;
+            options.traceId = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.traceId;
         }
+        (_a = options.traceId) !== null && _a !== void 0 ? _a : (options.traceId = UUIDv7());
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             if (!this.gateway || !this.session || !('walletPublicKey' in this.session)) {
                 throw new TonConnectError('Trying to send bridge request without session');
             }
@@ -1166,8 +1395,20 @@ 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 })), hexToByteArray(this.session.walletPublicKey));
             try {
-                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);
+                (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.emitBridgeClientMessageSent({
+                    bridge_url: this.gateway.bridgeUrl,
+                    client_id: this.session.sessionCrypto.sessionId,
+                    wallet_id: this.session.walletPublicKey,
+                    message_id: id,
+                    request_type: request.method,
+                    trace_id: options.traceId
+                });
+                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,
+                    traceId: options.traceId
+                });
+                (_b = options === null || options === void 0 ? void 0 : options.onRequestSent) === null || _b === void 0 ? void 0 : _b.call(options);
                 this.pendingRequests.set(id.toString(), resolve);
             }
             catch (e) {
@@ -1183,6 +1424,8 @@ class BridgeProvider {
     }
     disconnect(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 let called = false;
                 let timeoutId = null;
@@ -1201,7 +1444,8 @@ class BridgeProvider {
                     yield this.sendRequest({ method: 'disconnect', params: [] }, {
                         onRequestSent: onRequestSent,
                         signal: abortController.signal,
-                        attempts: 1
+                        attempts: 1,
+                        traceId
                     });
                 }
                 catch (e) {
@@ -1257,8 +1501,32 @@ class BridgeProvider {
     }
     gatewayListener(bridgeIncomingMessage) {
         return __awaiter(this, void 0, void 0, function* () {
-            const walletMessage = JSON.parse(this.session.sessionCrypto.decrypt(Base64.decode(bridgeIncomingMessage.message).toUint8Array(), hexToByteArray(bridgeIncomingMessage.from)));
+            var _a, _b, _c;
+            const traceId = (_a = bridgeIncomingMessage.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+            let walletMessage;
+            try {
+                walletMessage = JSON.parse(this.session.sessionCrypto.decrypt(Base64.decode(bridgeIncomingMessage.message).toUint8Array(), hexToByteArray(bridgeIncomingMessage.from)));
+            }
+            catch (err) {
+                (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitBridgeClientMessageDecodeError({
+                    bridge_url: this.session.bridgeUrl,
+                    client_id: this.session.sessionCrypto.sessionId,
+                    wallet_id: bridgeIncomingMessage.from,
+                    error_message: String(err),
+                    trace_id: bridgeIncomingMessage === null || bridgeIncomingMessage === void 0 ? void 0 : bridgeIncomingMessage.traceId
+                });
+                throw err;
+            }
             logDebug('Wallet message received:', walletMessage);
+            const requestType = 'event' in walletMessage ? walletMessage.event : '';
+            (_c = this.analytics) === null || _c === void 0 ? void 0 : _c.emitBridgeClientMessageReceived({
+                bridge_url: this.session.bridgeUrl,
+                client_id: this.session.sessionCrypto.sessionId,
+                wallet_id: bridgeIncomingMessage.from,
+                message_id: String(walletMessage.id),
+                request_type: requestType,
+                trace_id: bridgeIncomingMessage === null || bridgeIncomingMessage === void 0 ? void 0 : bridgeIncomingMessage.traceId
+            });
             if (!('event' in walletMessage)) {
                 const id = walletMessage.id.toString();
                 const resolve = this.pendingRequests.get(id);
@@ -1266,7 +1534,7 @@ class BridgeProvider {
                     logDebug(`Response id ${id} doesn't match any request's id`);
                     return;
                 }
-                resolve(walletMessage);
+                resolve(Object.assign(Object.assign({}, walletMessage), { traceId }));
                 this.pendingRequests.delete(id);
                 return;
             }
@@ -1289,7 +1557,7 @@ class BridgeProvider {
                 logDebug(`Removing bridge and session: received disconnect event`);
                 yield this.removeBridgeAndSession();
             }
-            listeners.forEach(listener => listener(walletMessage));
+            listeners.forEach(listener => listener(Object.assign(Object.assign({}, walletMessage), { traceId })));
         });
     }
     gatewayErrorsListener(e) {
@@ -1317,21 +1585,22 @@ class BridgeProvider {
             yield this.connectionStorage.removeConnection();
         });
     }
-    generateUniversalLink(universalLink, message) {
+    generateUniversalLink(universalLink, message, options) {
         if (isTelegramUrl(universalLink)) {
-            return this.generateTGUniversalLink(universalLink, message);
+            return this.generateTGUniversalLink(universalLink, message, options);
         }
-        return this.generateRegularUniversalLink(universalLink, message);
+        return this.generateRegularUniversalLink(universalLink, message, options);
     }
-    generateRegularUniversalLink(universalLink, message) {
+    generateRegularUniversalLink(universalLink, message, options) {
         const url = new URL(universalLink);
         url.searchParams.append('v', PROTOCOL_VERSION.toString());
         url.searchParams.append('id', this.session.sessionCrypto.sessionId);
+        url.searchParams.append('trace_id', options.traceId);
         url.searchParams.append('r', JSON.stringify(message));
         return url.toString();
     }
-    generateTGUniversalLink(universalLink, message) {
-        const urlToWrap = this.generateRegularUniversalLink('about:blank', message);
+    generateTGUniversalLink(universalLink, message, options) {
+        const urlToWrap = this.generateRegularUniversalLink('about:blank', message, options);
         const linkParams = urlToWrap.split('?')[1];
         const startapp = 'tonconnect-' + encodeTelegramUrlParameters(linkParams);
         // TODO: Remove this line after all dApps and the wallets-list.json have been updated
@@ -1351,12 +1620,14 @@ class BridgeProvider {
     }
     openGateways(sessionCrypto, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             if (Array.isArray(this.walletConnectionSource)) {
                 // close all gateways before opening new ones
                 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, () => { }, () => { });
+                    const gateway = new BridgeGateway(this.storage, source.bridgeUrl, sessionCrypto.sessionId, () => { }, () => { }, this.analyticsManager);
                     gateway.setListener(message => this.pendingGatewaysListener(gateway, source.bridgeUrl, message));
                     return gateway;
                 });
@@ -1367,7 +1638,8 @@ class BridgeProvider {
                     }
                     return bridge.registerSession({
                         openingDeadlineMS: (_a = options === null || options === void 0 ? void 0 : options.openingDeadlineMS) !== null && _a !== void 0 ? _a : this.defaultOpeningDeadlineMS,
-                        signal: _options.signal
+                        signal: _options.signal,
+                        traceId
                     });
                 }, {
                     attempts: Number.MAX_SAFE_INTEGER,
@@ -1381,10 +1653,11 @@ 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.gateway = new BridgeGateway(this.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
+                    signal: options === null || options === void 0 ? void 0 : options.signal,
+                    traceId
                 });
             }
         });
@@ -1487,6 +1760,15 @@ function getWebPageManifest() {
     }
     return '';
 }
+function getOriginWithPath() {
+    var _a, _b, _c, _d;
+    const origin = (_b = (_a = getWindow()) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.origin;
+    const path = (_d = (_c = getWindow()) === null || _c === void 0 ? void 0 : _c.location) === null || _d === void 0 ? void 0 : _d.pathname;
+    if (origin && path) {
+        return origin + path;
+    }
+    return '';
+}
 /**
  * Returns `localStorage` if it is available. In Safari's private mode, it returns `InMemoryStorage`. In Node.js, it throws an error.
  */
@@ -1556,11 +1838,11 @@ function getWindowEntries() {
 }
 
 class InjectedProvider {
-    static fromStorage(storage) {
+    static fromStorage(storage, analyticsManager) {
         return __awaiter(this, void 0, void 0, function* () {
             const bridgeConnectionStorage = new BridgeConnectionStorage(storage);
             const connection = yield bridgeConnectionStorage.getInjectedConnection();
-            return new InjectedProvider(storage, connection.jsBridgeKey);
+            return new InjectedProvider(storage, connection.jsBridgeKey, analyticsManager);
         });
     }
     static isWalletInjected(injectedWalletKey) {
@@ -1597,7 +1879,7 @@ class InjectedProvider {
             typeof window[injectedWalletKey] === 'object' &&
             'tonconnect' in window[injectedWalletKey]);
     }
-    constructor(storage, injectedWalletKey) {
+    constructor(storage, injectedWalletKey, analyticsManager) {
         this.injectedWalletKey = injectedWalletKey;
         this.type = 'injected';
         this.unsubscribeCallback = null;
@@ -1609,25 +1891,49 @@ class InjectedProvider {
         }
         this.connectionStorage = new BridgeConnectionStorage(storage);
         this.injectedWallet = window[injectedWalletKey].tonconnect;
+        if (analyticsManager) {
+            this.analytics = analyticsManager.scoped({
+                bridge_key: injectedWalletKey,
+                wallet_app_name: this.injectedWallet.deviceInfo.appName,
+                wallet_app_version: this.injectedWallet.deviceInfo.appVersion
+            });
+        }
     }
-    connect(message) {
-        this._connect(PROTOCOL_VERSION, message);
+    connect(message, options) {
+        this._connect(PROTOCOL_VERSION, message, options);
     }
-    restoreConnection() {
+    restoreConnection(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             try {
                 logDebug(`Injected Provider restoring connection...`);
-                const connectEvent = yield this.injectedWallet.restoreConnection();
+                (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitJsBridgeCall({
+                    js_bridge_method: 'restoreConnection',
+                    trace_id: traceId
+                });
+                const connectEvent = yield this.injectedWallet.restoreConnection({
+                    traceId
+                });
+                (_c = this.analytics) === null || _c === void 0 ? void 0 : _c.emitJsBridgeResponse({
+                    js_bridge_method: 'restoreConnection',
+                    trace_id: traceId
+                });
                 logDebug('Injected Provider restoring connection response', connectEvent);
                 if (connectEvent.event === 'connect') {
-                    this.makeSubscriptions();
-                    this.listeners.forEach(listener => listener(connectEvent));
+                    this.makeSubscriptions({ traceId });
+                    this.listeners.forEach(listener => listener(Object.assign(Object.assign({}, connectEvent), { traceId })));
                 }
                 else {
                     yield this.connectionStorage.removeConnection();
                 }
             }
             catch (e) {
+                (_d = this.analytics) === null || _d === void 0 ? void 0 : _d.emitJsBridgeError({
+                    js_bridge_method: 'restoreConnection',
+                    error_message: String(e),
+                    trace_id: traceId
+                });
                 yield this.connectionStorage.removeConnection();
                 console.error(e);
             }
@@ -1639,8 +1945,10 @@ class InjectedProvider {
         }
         this.closeAllListeners();
     }
-    disconnect() {
+    disconnect(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             return new Promise(resolve => {
                 const onRequestSent = () => {
                     this.closeAllListeners();
@@ -1655,7 +1963,7 @@ class InjectedProvider {
                     this.sendRequest({
                         method: 'disconnect',
                         params: []
-                    }, onRequestSent);
+                    }, { onRequestSent, traceId });
                 }
             });
         });
@@ -1672,38 +1980,76 @@ class InjectedProvider {
     }
     sendRequest(request, optionsOrOnRequestSent) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             // TODO: remove deprecated method
             const options = {};
             if (typeof optionsOrOnRequestSent === 'function') {
                 options.onRequestSent = optionsOrOnRequestSent;
+                options.traceId = UUIDv7();
             }
             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;
+                options.traceId = (_a = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             }
             const id = (yield this.connectionStorage.getNextRpcRequestId()).toString();
             yield this.connectionStorage.increaseNextRpcRequestId();
             logDebug('Send injected-bridge request:', Object.assign(Object.assign({}, request), { id }));
-            const result = this.injectedWallet.send(Object.assign(Object.assign({}, request), { id }));
-            result.then(response => logDebug('Wallet message received:', response));
-            (_a = options === null || options === void 0 ? void 0 : options.onRequestSent) === null || _a === void 0 ? void 0 : _a.call(options);
+            (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitJsBridgeCall({
+                js_bridge_method: 'send'
+            });
+            const result = this.injectedWallet.send(Object.assign(Object.assign({}, request), { id }), {
+                traceId: options.traceId
+            });
+            result
+                .then(response => {
+                var _a;
+                (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.emitJsBridgeResponse({
+                    js_bridge_method: 'send'
+                });
+                logDebug('Wallet message received:', response);
+            })
+                .catch(error => {
+                var _a;
+                (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.emitJsBridgeError({
+                    js_bridge_method: 'send',
+                    error_message: String(error)
+                });
+            });
+            (_c = options === null || options === void 0 ? void 0 : options.onRequestSent) === null || _c === void 0 ? void 0 : _c.call(options);
             return result;
         });
     }
-    _connect(protocolVersion, message) {
+    _connect(protocolVersion, message, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
             try {
                 logDebug(`Injected Provider connect request: protocolVersion: ${protocolVersion}, message:`, message);
-                const connectEvent = yield this.injectedWallet.connect(protocolVersion, message);
+                (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitJsBridgeCall({
+                    js_bridge_method: 'connect',
+                    trace_id: traceId
+                });
+                const connectEvent = yield this.injectedWallet.connect(protocolVersion, message, {
+                    traceId
+                });
+                (_c = this.analytics) === null || _c === void 0 ? void 0 : _c.emitJsBridgeResponse({
+                    js_bridge_method: 'connect'
+                });
                 logDebug('Injected Provider connect response:', connectEvent);
                 if (connectEvent.event === 'connect') {
                     yield this.updateSession();
-                    this.makeSubscriptions();
+                    this.makeSubscriptions({ traceId });
                 }
-                this.listeners.forEach(listener => listener(connectEvent));
+                this.listeners.forEach(listener => listener(Object.assign(Object.assign({}, connectEvent), { traceId })));
             }
             catch (e) {
+                (_d = this.analytics) === null || _d === void 0 ? void 0 : _d.emitJsBridgeError({
+                    js_bridge_method: 'connect',
+                    error_message: String(e),
+                    trace_id: traceId
+                });
                 logDebug('Injected Provider connect error:', e);
                 const connectEventError = {
                     event: 'connect_error',
@@ -1712,21 +2058,42 @@ class InjectedProvider {
                         message: e === null || e === void 0 ? void 0 : e.toString()
                     }
                 };
-                this.listeners.forEach(listener => listener(connectEventError));
+                this.listeners.forEach(listener => listener(Object.assign(Object.assign({}, connectEventError), { traceId })));
             }
         });
     }
-    makeSubscriptions() {
+    makeSubscriptions(options) {
+        var _a, _b, _c;
         this.listenSubscriptions = true;
-        this.unsubscribeCallback = this.injectedWallet.listen(e => {
-            logDebug('Wallet message received:', e);
-            if (this.listenSubscriptions) {
-                this.listeners.forEach(listener => listener(e));
-            }
-            if (e.event === 'disconnect') {
-                this.disconnect();
-            }
+        (_a = this.analytics) === null || _a === void 0 ? void 0 : _a.emitJsBridgeCall({
+            js_bridge_method: 'listen',
+            trace_id: options.traceId
         });
+        try {
+            this.unsubscribeCallback = this.injectedWallet.listen(e => {
+                var _a;
+                const traceId = (_a = e.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+                logDebug('Wallet message received:', e);
+                if (this.listenSubscriptions) {
+                    this.listeners.forEach(listener => listener(Object.assign(Object.assign({}, e), { traceId })));
+                }
+                if (e.event === 'disconnect') {
+                    this.disconnect({ traceId });
+                }
+            });
+            (_b = this.analytics) === null || _b === void 0 ? void 0 : _b.emitJsBridgeResponse({
+                js_bridge_method: 'listen',
+                trace_id: options.traceId
+            });
+        }
+        catch (err) {
+            (_c = this.analytics) === null || _c === void 0 ? void 0 : _c.emitJsBridgeError({
+                js_bridge_method: 'listen',
+                error_message: String(err),
+                trace_id: options.traceId
+            });
+            throw err;
+        }
     }
     updateSession() {
         return this.connectionStorage.storeConnection({
@@ -2971,77 +3338,91 @@ function createVersionInfo(version) {
         ton_connect_ui_lib: version.ton_connect_ui_lib
     };
 }
-function createConnectionInfo(version, wallet) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+// eslint-disable-next-line complexity
+function createConnectionInfo(version, wallet, sessionInfo) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const isTonProof = ((_a = wallet === null || wallet === void 0 ? void 0 : wallet.connectItems) === null || _a === void 0 ? void 0 : _a.tonProof) && 'proof' in wallet.connectItems.tonProof;
     const authType = isTonProof ? 'ton_proof' : 'ton_addr';
     return {
         wallet_address: (_c = (_b = wallet === null || wallet === void 0 ? void 0 : wallet.account) === null || _b === void 0 ? void 0 : _b.address) !== null && _c !== void 0 ? _c : null,
-        wallet_type: (_d = wallet === null || wallet === void 0 ? void 0 : wallet.device.appName) !== null && _d !== void 0 ? _d : null,
-        wallet_version: (_e = wallet === null || wallet === void 0 ? void 0 : wallet.device.appVersion) !== null && _e !== void 0 ? _e : null,
+        wallet_state_init: (_d = wallet === null || wallet === void 0 ? void 0 : wallet.account.walletStateInit) !== null && _d !== void 0 ? _d : null,
+        wallet_type: (_e = wallet === null || wallet === void 0 ? void 0 : wallet.device.appName) !== null && _e !== void 0 ? _e : null,
+        wallet_version: (_f = wallet === null || wallet === void 0 ? void 0 : wallet.device.appVersion) !== null && _f !== void 0 ? _f : null,
         auth_type: authType,
-        custom_data: Object.assign({ chain_id: (_g = (_f = wallet === null || wallet === void 0 ? void 0 : wallet.account) === null || _f === void 0 ? void 0 : _f.chain) !== null && _g !== void 0 ? _g : null, provider: (_h = wallet === null || wallet === void 0 ? void 0 : wallet.provider) !== null && _h !== void 0 ? _h : null }, createVersionInfo(version))
+        custom_data: Object.assign({ client_id: (_g = sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.clientId) !== null && _g !== void 0 ? _g : null, wallet_id: (_h = sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.walletId) !== null && _h !== void 0 ? _h : null, chain_id: (_k = (_j = wallet === null || wallet === void 0 ? void 0 : wallet.account) === null || _j === void 0 ? void 0 : _j.chain) !== null && _k !== void 0 ? _k : null, provider: (_l = wallet === null || wallet === void 0 ? void 0 : wallet.provider) !== null && _l !== void 0 ? _l : null }, createVersionInfo(version))
     };
 }
 /**
  * Create a connection init event.
  */
-function createConnectionStartedEvent(version) {
+function createConnectionStartedEvent(version, traceId) {
     return {
         type: 'connection-started',
-        custom_data: createVersionInfo(version)
+        custom_data: createVersionInfo(version),
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null
     };
 }
 /**
  * Create a connection completed event.
  * @param version
  * @param wallet
+ * @param sessionInfo
+ * @param traceId
  */
-function createConnectionCompletedEvent(version, wallet) {
-    return Object.assign({ type: 'connection-completed', is_success: true }, createConnectionInfo(version, wallet));
+function createConnectionCompletedEvent(version, wallet, sessionInfo, traceId) {
+    return Object.assign({ type: 'connection-completed', is_success: true, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
 /**
  * Create a connection error event.
  * @param version
  * @param error_message
  * @param errorCode
+ * @param sessionInfo
+ * @param traceId
  */
-function createConnectionErrorEvent(version, error_message, errorCode) {
+function createConnectionErrorEvent(version, error_message, errorCode, sessionInfo, traceId) {
+    var _a, _b;
     return {
         type: 'connection-error',
         is_success: false,
         error_message: error_message,
         error_code: errorCode !== null && errorCode !== void 0 ? errorCode : null,
-        custom_data: createVersionInfo(version)
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null,
+        custom_data: Object.assign({ client_id: (_a = sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.clientId) !== null && _a !== void 0 ? _a : null, wallet_id: (_b = sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.walletId) !== null && _b !== void 0 ? _b : null }, createVersionInfo(version))
     };
 }
 /**
  * Create a connection restoring started event.
  */
-function createConnectionRestoringStartedEvent(version) {
+function createConnectionRestoringStartedEvent(version, traceId) {
     return {
         type: 'connection-restoring-started',
-        custom_data: createVersionInfo(version)
+        custom_data: createVersionInfo(version),
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null
     };
 }
 /**
  * Create a connection restoring completed event.
  * @param version
  * @param wallet
+ * @param sessionInfo
+ * @param traceId
  */
-function createConnectionRestoringCompletedEvent(version, wallet) {
-    return Object.assign({ type: 'connection-restoring-completed', is_success: true }, createConnectionInfo(version, wallet));
+function createConnectionRestoringCompletedEvent(version, wallet, sessionInfo, traceId) {
+    return Object.assign({ type: 'connection-restoring-completed', is_success: true, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
 /**
  * Create a connection restoring error event.
  * @param version
  * @param errorMessage
+ * @param traceId
  */
-function createConnectionRestoringErrorEvent(version, errorMessage) {
+function createConnectionRestoringErrorEvent(version, errorMessage, traceId) {
     return {
         type: 'connection-restoring-error',
         is_success: false,
         error_message: errorMessage,
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null,
         custom_data: createVersionInfo(version)
     };
 }
@@ -3059,14 +3440,32 @@ function createTransactionInfo(wallet, transaction) {
         })
     };
 }
+function createTransactionFullInfo(wallet, transaction) {
+    var _a, _b, _c, _d;
+    return {
+        valid_until: (_a = String(transaction.validUntil)) !== null && _a !== void 0 ? _a : null,
+        from: (_d = (_b = transaction.from) !== null && _b !== void 0 ? _b : (_c = wallet === null || wallet === void 0 ? void 0 : wallet.account) === null || _c === void 0 ? void 0 : _c.address) !== null && _d !== void 0 ? _d : null,
+        messages: transaction.messages.map(message => {
+            var _a, _b, _c, _d;
+            return ({
+                address: (_a = message.address) !== null && _a !== void 0 ? _a : null,
+                amount: (_b = message.amount) !== null && _b !== void 0 ? _b : null,
+                payload: (_c = message.payload) !== null && _c !== void 0 ? _c : null,
+                state_init: (_d = message.stateInit) !== null && _d !== void 0 ? _d : null
+            });
+        })
+    };
+}
 /**
  * Create a transaction init event.
  * @param version
  * @param wallet
  * @param transaction
+ * @param sessionInfo
+ * @param traceId
  */
-function createTransactionSentForSignatureEvent(version, wallet, transaction) {
-    return Object.assign(Object.assign({ type: 'transaction-sent-for-signature' }, createConnectionInfo(version, wallet)), createTransactionInfo(wallet, transaction));
+function createTransactionSentForSignatureEvent(version, wallet, transaction, sessionInfo, traceId) {
+    return Object.assign(Object.assign({ type: 'transaction-sent-for-signature', trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo)), createTransactionInfo(wallet, transaction));
 }
 /**
  * Create a transaction signed event.
@@ -3074,9 +3473,11 @@ function createTransactionSentForSignatureEvent(version, wallet, transaction) {
  * @param wallet
  * @param transaction
  * @param signedTransaction
+ * @param sessionInfo
+ * @param traceId
  */
-function createTransactionSignedEvent(version, wallet, transaction, signedTransaction) {
-    return Object.assign(Object.assign({ type: 'transaction-signed', is_success: true, signed_transaction: signedTransaction.boc }, createConnectionInfo(version, wallet)), createTransactionInfo(wallet, transaction));
+function createTransactionSignedEvent(version, wallet, transaction, signedTransaction, sessionInfo, traceId) {
+    return Object.assign(Object.assign({ type: 'transaction-signed', is_success: true, signed_transaction: signedTransaction.boc, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo)), createTransactionInfo(wallet, transaction));
 }
 /**
  * Create a transaction error event.
@@ -3085,71 +3486,50 @@ function createTransactionSignedEvent(version, wallet, transaction, signedTransa
  * @param transaction
  * @param errorMessage
  * @param errorCode
+ * @param sessionInfo
+ * @param traceId
  */
-function createTransactionSigningFailedEvent(version, wallet, transaction, errorMessage, errorCode) {
-    return Object.assign(Object.assign({ type: 'transaction-signing-failed', is_success: false, error_message: errorMessage, error_code: errorCode !== null && errorCode !== void 0 ? errorCode : null }, createConnectionInfo(version, wallet)), createTransactionInfo(wallet, transaction));
+function createTransactionSigningFailedEvent(version, wallet, transaction, errorMessage, errorCode, sessionInfo, traceId) {
+    return Object.assign(Object.assign({ type: 'transaction-signing-failed', is_success: false, error_message: errorMessage, error_code: errorCode !== null && errorCode !== void 0 ? errorCode : null, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo)), createTransactionFullInfo(wallet, transaction));
 }
-function createDataSentForSignatureEvent(version, wallet, data) {
-    return Object.assign({ type: 'sign-data-request-initiated', data }, createConnectionInfo(version, wallet));
+function createDataSentForSignatureEvent(version, wallet, data, sessionInfo, traceId) {
+    return Object.assign({ type: 'sign-data-request-initiated', data, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
-function createDataSignedEvent(version, wallet, data, signedData) {
-    return Object.assign({ type: 'sign-data-request-completed', is_success: true, data, signed_data: signedData }, createConnectionInfo(version, wallet));
+function createDataSignedEvent(version, wallet, data, signedData, sessionInfo, traceId) {
+    return Object.assign({ type: 'sign-data-request-completed', is_success: true, data, signed_data: signedData, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
-function createDataSigningFailedEvent(version, wallet, data, errorMessage, errorCode) {
-    return Object.assign({ type: 'sign-data-request-failed', is_success: false, data, error_message: errorMessage, error_code: errorCode !== null && errorCode !== void 0 ? errorCode : null }, createConnectionInfo(version, wallet));
+function createDataSigningFailedEvent(version, wallet, data, errorMessage, errorCode, sessionInfo, traceId) {
+    return Object.assign({ type: 'sign-data-request-failed', is_success: false, data, error_message: errorMessage, error_code: errorCode !== null && errorCode !== void 0 ? errorCode : null, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
-/**
- * Create a disconnect event.
- * @param version
- * @param wallet
- * @param scope
- * @returns
- */
-function createDisconnectionEvent(version, wallet, scope) {
-    return Object.assign({ type: 'disconnection', scope: scope }, createConnectionInfo(version, wallet));
+function createDisconnectionEvent(version, wallet, scope, sessionInfo, traceId) {
+    return Object.assign({ type: 'disconnection', scope: scope, trace_id: traceId !== null && traceId !== void 0 ? traceId : null }, createConnectionInfo(version, wallet, sessionInfo));
 }
-
-/**
- * A concrete implementation of EventDispatcher that dispatches events to the browser window.
- */
-class BrowserEventDispatcher {
-    constructor() {
-        /**
-         * The window object, possibly undefined in a server environment.
-         * @private
-         */
-        this.window = getWindow();
-    }
-    /**
-     * Dispatches an event with the given name and details to the browser window.
-     * @param eventName - The name of the event to dispatch.
-     * @param eventDetails - The details of the event to dispatch.
-     * @returns A promise that resolves when the event has been dispatched.
-     */
-    dispatchEvent(eventName, eventDetails) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const event = new CustomEvent(eventName, { detail: eventDetails });
-            (_a = this.window) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
-        });
-    }
-    /**
-     * Adds an event listener to the browser window.
-     * @param eventName - The name of the event to listen for.
-     * @param listener - The listener to add.
-     * @param options - The options for the listener.
-     * @returns A function that removes the listener.
-     */
-    addEventListener(eventName, listener, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            (_a = this.window) === null || _a === void 0 ? void 0 : _a.addEventListener(eventName, listener, options);
-            return () => {
-                var _a;
-                return (_a = this.window) === null || _a === void 0 ? void 0 : _a.removeEventListener(eventName, listener);
-            };
-        });
+function createWalletModalOpenedEvent(version, visibleWallets, clientId, traceId) {
+    return {
+        type: 'wallet-modal-opened',
+        visible_wallets: visibleWallets,
+        client_id: clientId !== null && clientId !== void 0 ? clientId : null,
+        custom_data: version,
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null
+    };
+}
+function createSelectedWalletEvent(version, visibleWallets, lastSelectedWallet, walletsMenu, redirectLink, redirectLinkType, clientId, traceId) {
+    var _a;
+    let walletRedirectMethod = redirectLinkType;
+    if (!walletRedirectMethod && redirectLink) {
+        walletRedirectMethod = isTelegramUrl(redirectLink) ? 'tg_link' : 'external_link';
     }
+    return {
+        type: 'selected-wallet',
+        wallets_menu: walletsMenu,
+        visible_wallets: visibleWallets,
+        client_id: clientId !== null && clientId !== void 0 ? clientId : null,
+        custom_data: version,
+        trace_id: traceId !== null && traceId !== void 0 ? traceId : null,
+        wallet_redirect_method: walletRedirectMethod,
+        wallet_redirect_link: redirectLink || undefined,
+        wallet_type: (_a = lastSelectedWallet === null || lastSelectedWallet === void 0 ? void 0 : lastSelectedWallet.appName) !== null && _a !== void 0 ? _a : null
+    };
 }
 
 /**
@@ -3190,7 +3570,6 @@ class TonConnectTracker {
         });
     }
     constructor(options) {
-        var _a;
         /**
          * Event prefix for user actions.
          * @private
@@ -3200,7 +3579,7 @@ class TonConnectTracker {
          * TonConnect UI version.
          */
         this.tonConnectUiVersion = null;
-        this.eventDispatcher = (_a = options === null || options === void 0 ? void 0 : options.eventDispatcher) !== null && _a !== void 0 ? _a : new BrowserEventDispatcher();
+        this.eventDispatcher = options === null || options === void 0 ? void 0 : options.eventDispatcher;
         this.tonConnectSdkVersion = options.tonConnectSdkVersion;
         this.init().catch();
     }
@@ -3404,7 +3783,7 @@ class TonConnectTracker {
     }
 }
 
-const tonConnectSdkVersion = "3.3.1";
+const tonConnectSdkVersion = "3.4.0-beta.0";
 
 const bounceableTag = 0x11;
 const noBounceableTag = 0x51;
@@ -3903,6 +4282,403 @@ function normalizeBase64(data) {
     return data.replace(/-/g, '+').replace(/_/g, '/').padEnd(paddedLength, '=');
 }
 
+/**
+ * Converts a PascalCase (or camelCase) string to kebab-case.
+ *
+ * For example:
+ * - "PascalCase" → "pascal-case"
+ * - "camelCaseExample" → "camel-case-example"
+ *
+ * @param value - The input string in PascalCase or camelCase format.
+ * @returns The converted kebab-case string.
+ */
+function pascalToKebab(value) {
+    return value.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase();
+}
+
+class AnalyticsManager {
+    constructor(options = {}) {
+        var _a, _b, _c, _d, _e;
+        this.events = [];
+        this.timeoutId = null;
+        this.isProcessing = false;
+        this.backoff = 1;
+        this.shouldSend = true;
+        this.batchTimeoutMs = (_a = options.batchTimeoutMs) !== null && _a !== void 0 ? _a : 2000;
+        this.currentBatchTimeoutMs = this.batchTimeoutMs;
+        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.addWindowFocusAndBlurSubscriptions();
+    }
+    scoped(sharedData) {
+        return new Proxy(this, {
+            get(target, prop) {
+                const propName = prop.toString();
+                if (propName.startsWith('emit')) {
+                    const eventNamePascal = propName.replace('emit', '');
+                    const eventNameKebab = pascalToKebab(eventNamePascal);
+                    return function (event) {
+                        const executedData = Object.fromEntries(Object.entries(sharedData !== null && sharedData !== void 0 ? sharedData : {}).map(([key, value]) => [
+                            key,
+                            typeof value === 'function' ? value() : value
+                        ]));
+                        return target.emit(Object.assign(Object.assign({ event_name: eventNameKebab }, executedData), event));
+                    };
+                }
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                return target[prop];
+            }
+        });
+    }
+    emit(event) {
+        var _a;
+        if (!this.enabled) {
+            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 });
+        if (isQaModeEnabled()) {
+            logDebug(enhancedEvent);
+        }
+        this.events.push(enhancedEvent);
+        if (this.events.length >= this.maxBatchSize) {
+            void this.flush();
+            return;
+        }
+        this.startTimeout();
+    }
+    startTimeout() {
+        if (this.timeoutId || this.isProcessing) {
+            return;
+        }
+        this.timeoutId = setTimeout(() => {
+            void this.flush();
+        }, this.currentBatchTimeoutMs);
+    }
+    flush() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isProcessing || this.events.length === 0 || !this.shouldSend) {
+                return;
+            }
+            this.clearTimeout();
+            this.isProcessing = true;
+            const eventsToSend = this.extractEventsToSend();
+            try {
+                yield this.processEventsBatch(eventsToSend);
+                logDebug('Analytics events sent successfully');
+            }
+            catch (error) {
+                this.restoreEvents(eventsToSend);
+                logError('Failed to send analytics events:', error);
+            }
+            finally {
+                this.isProcessing = false;
+                this.scheduleNextFlushIfNeeded();
+            }
+        });
+    }
+    clearTimeout() {
+        if (this.timeoutId) {
+            clearTimeout(this.timeoutId);
+            this.timeoutId = null;
+        }
+    }
+    extractEventsToSend() {
+        const eventsToSend = this.events.slice(0, this.maxBatchSize);
+        this.events = this.events.slice(this.maxBatchSize);
+        return eventsToSend;
+    }
+    processEventsBatch(eventsToSend) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logDebug('Sending analytics events...', eventsToSend.length);
+            try {
+                const response = yield this.sendEvents(eventsToSend);
+                this.handleResponse(response);
+            }
+            catch (err) {
+                this.handleUnknownError(err);
+            }
+        });
+    }
+    handleResponse(response) {
+        const { status, statusText } = response;
+        if (this.isTooManyRequests(status)) {
+            this.handleTooManyRequests(status, statusText);
+        }
+        else if (this.isClientError(status)) {
+            this.handleClientError(status, statusText);
+        }
+        else if (this.isServerError(status)) {
+            this.handleUnknownError({ status, statusText });
+        }
+    }
+    restoreEvents(eventsToSend) {
+        this.events.unshift(...eventsToSend);
+    }
+    scheduleNextFlushIfNeeded() {
+        if (this.events.length > 0) {
+            this.startTimeout();
+        }
+    }
+    sendEvents(events) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield fetch(this.analyticsUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-Client-Timestamp': Math.floor(Date.now() / 1000).toString()
+                },
+                body: JSON.stringify(events)
+            });
+        });
+    }
+    isClientError(status) {
+        return (status >= AnalyticsManager.HTTP_STATUS.CLIENT_ERROR_START &&
+            status < AnalyticsManager.HTTP_STATUS.SERVER_ERROR_START);
+    }
+    isServerError(status) {
+        return status >= AnalyticsManager.HTTP_STATUS.SERVER_ERROR_START;
+    }
+    isTooManyRequests(status) {
+        return status === AnalyticsManager.HTTP_STATUS.TOO_MANY_REQUESTS;
+    }
+    handleClientError(status, statusText) {
+        // Don't retry
+        logError('Failed to send analytics events:', new TonConnectError(`Analytics API error: ${status} ${statusText}`));
+    }
+    handleUnknownError(error) {
+        if (this.backoff < AnalyticsManager.MAX_BACKOFF_ATTEMPTS) {
+            this.backoff++;
+            this.currentBatchTimeoutMs *= AnalyticsManager.BACKOFF_MULTIPLIER;
+            throw new TonConnectError(`Unknown analytics API error: ${error}`);
+        }
+        else {
+            this.currentBatchTimeoutMs = this.batchTimeoutMs;
+            this.backoff = 1;
+            return; // Don't retry
+        }
+    }
+    handleTooManyRequests(status, statusText) {
+        throw new TonConnectError(`Analytics API error: ${status} ${statusText}`);
+    }
+    addWindowFocusAndBlurSubscriptions() {
+        const document = getDocument();
+        if (!document) {
+            return;
+        }
+        try {
+            document.addEventListener('visibilitychange', () => {
+                if (document.hidden) {
+                    this.clearTimeout();
+                    this.shouldSend = false;
+                }
+                else {
+                    this.shouldSend = true;
+                    this.scheduleNextFlushIfNeeded();
+                }
+            });
+        }
+        catch (e) {
+            logError('Cannot subscribe to the document.visibilitychange: ', e);
+        }
+    }
+    setEnabled(enabled) {
+        this.enabled = enabled;
+    }
+    isEnabled() {
+        return this.enabled;
+    }
+    getPendingEventsCount() {
+        return this.events.length;
+    }
+}
+AnalyticsManager.HTTP_STATUS = {
+    TOO_MANY_REQUESTS: 429,
+    CLIENT_ERROR_START: 400,
+    SERVER_ERROR_START: 500
+};
+AnalyticsManager.MAX_BACKOFF_ATTEMPTS = 5;
+AnalyticsManager.BACKOFF_MULTIPLIER = 2;
+
+/**
+ * A concrete implementation of EventDispatcher that dispatches events to the browser window.
+ */
+class BrowserEventDispatcher {
+    constructor() {
+        /**
+         * The window object, possibly undefined in a server environment.
+         * @private
+         */
+        this.window = getWindow();
+    }
+    /**
+     * Dispatches an event with the given name and details to the browser window.
+     * @param eventName - The name of the event to dispatch.
+     * @param eventDetails - The details of the event to dispatch.
+     * @returns A promise that resolves when the event has been dispatched.
+     */
+    dispatchEvent(eventName, eventDetails) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const event = new CustomEvent(eventName, { detail: eventDetails });
+            (_a = this.window) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
+        });
+    }
+    /**
+     * Adds an event listener to the browser window.
+     * @param eventName - The name of the event to listen for.
+     * @param listener - The listener to add.
+     * @param options - The options for the listener.
+     * @returns A function that removes the listener.
+     */
+    addEventListener(eventName, listener, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            (_a = this.window) === null || _a === void 0 ? void 0 : _a.addEventListener(eventName, listener, options);
+            return () => {
+                var _a;
+                return (_a = this.window) === null || _a === void 0 ? void 0 : _a.removeEventListener(eventName, listener);
+            };
+        });
+    }
+}
+
+function buildVersionInfo(version) {
+    return {
+        '@tonconnect/sdk': version.ton_connect_sdk_lib || '',
+        '@tonconnect/ui': version.ton_connect_ui_lib || ''
+    };
+}
+function buildTonConnectEvent(detail) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return {
+        versions: buildVersionInfo(detail.custom_data),
+        network_id: (_a = detail.custom_data.chain_id) !== null && _a !== void 0 ? _a : '',
+        client_id: (_b = detail.custom_data.client_id) !== null && _b !== void 0 ? _b : '',
+        wallet_id: (_c = detail.custom_data.wallet_id) !== null && _c !== void 0 ? _c : '',
+        wallet_address: (_d = detail.wallet_address) !== null && _d !== void 0 ? _d : '',
+        wallet_app_name: (_e = detail.wallet_type) !== null && _e !== void 0 ? _e : '',
+        wallet_app_version: (_f = detail.wallet_version) !== null && _f !== void 0 ? _f : '',
+        wallet_state_init: (_g = detail.wallet_state_init) !== null && _g !== void 0 ? _g : '',
+        trace_id: (_h = detail.trace_id) !== null && _h !== void 0 ? _h : undefined
+    };
+}
+function bindEventsTo(eventDispatcher, analytics) {
+    eventDispatcher.addEventListener('ton-connect-ui-wallet-modal-opened', event => {
+        var _a;
+        const { detail } = event;
+        analytics.emitConnectionStarted({
+            client_id: detail.client_id || '',
+            versions: buildVersionInfo(detail.custom_data),
+            main_screen: detail.visible_wallets,
+            trace_id: (_a = detail.trace_id) !== null && _a !== void 0 ? _a : undefined
+        });
+    });
+    eventDispatcher.addEventListener('ton-connect-ui-selected-wallet', event => {
+        var _a, _b;
+        const { detail } = event;
+        analytics.emitConnectionSelectedWallet({
+            client_id: detail.client_id || '',
+            versions: buildVersionInfo(detail.custom_data),
+            main_screen: detail.visible_wallets,
+            wallets_menu: detail.wallets_menu,
+            trace_id: (_a = detail.trace_id) !== null && _a !== void 0 ? _a : undefined,
+            wallet_app_name: (_b = detail.wallet_type) !== null && _b !== void 0 ? _b : '',
+            wallet_redirect_method: detail.wallet_redirect_method,
+            wallet_redirect_link: detail.wallet_redirect_link
+        });
+    });
+    eventDispatcher.addEventListener('ton-connect-connection-completed', event => {
+        const { detail } = event;
+        analytics.emitConnectionCompleted(buildTonConnectEvent(detail));
+    });
+    eventDispatcher.addEventListener('ton-connect-connection-error', event => {
+        var _a, _b;
+        const { detail } = event;
+        analytics.emitConnectionError({
+            client_id: detail.custom_data.client_id || '',
+            wallet_id: detail.custom_data.wallet_id || '',
+            error_code: (_a = detail.error_code) !== null && _a !== void 0 ? _a : 0,
+            error_message: detail.error_message,
+            trace_id: (_b = detail.trace_id) !== null && _b !== void 0 ? _b : undefined
+        });
+    });
+    eventDispatcher.addEventListener('ton-connect-disconnection', event => {
+        const { detail } = event;
+        analytics.emitDisconnection(buildTonConnectEvent(detail));
+    });
+    eventDispatcher.addEventListener('ton-connect-transaction-sent-for-signature', event => {
+        const { detail } = event;
+        analytics.emitTransactionSent(buildTonConnectEvent(detail));
+    });
+    eventDispatcher.addEventListener('ton-connect-transaction-signed', event => {
+        const { detail } = event;
+        analytics.emitTransactionSigned(Object.assign(Object.assign({}, buildTonConnectEvent(detail)), { signed_boc: event.detail.signed_transaction }));
+    });
+    eventDispatcher.addEventListener('ton-connect-transaction-signing-failed', event => {
+        var _a;
+        const { detail } = event;
+        analytics.emitTransactionSigningFailed(Object.assign(Object.assign({}, buildTonConnectEvent(detail)), { valid_until: Number(detail.valid_until), messages: detail.messages.map(message => {
+                var _a, _b, _c, _d;
+                return ({
+                    address: (_a = message.address) !== null && _a !== void 0 ? _a : '',
+                    amount: (_b = message.amount) !== null && _b !== void 0 ? _b : '',
+                    payload: (_c = message.payload) !== null && _c !== void 0 ? _c : '',
+                    state_init: (_d = message.state_init) !== null && _d !== void 0 ? _d : ''
+                });
+            }), error_message: detail.error_message, error_code: (_a = detail.error_code) !== null && _a !== void 0 ? _a : 0 }));
+    });
+    eventDispatcher.addEventListener('ton-connect-sign-data-request-initiated', event => {
+        const { detail } = event;
+        analytics === null || analytics === void 0 ? void 0 : analytics.emitSignDataRequestInitiated(buildTonConnectEvent(detail));
+    });
+    eventDispatcher.addEventListener('ton-connect-sign-data-request-completed', event => {
+        const { detail } = event;
+        analytics === null || analytics === void 0 ? void 0 : analytics.emitSignDataRequestCompleted(buildTonConnectEvent(detail));
+    });
+    eventDispatcher.addEventListener('ton-connect-sign-data-request-failed', event => {
+        var _a;
+        const { detail } = event;
+        let signDataValue = '';
+        let signDataSchema = undefined;
+        if (detail.data.type === 'text') {
+            signDataValue = detail.data.text;
+        }
+        if (detail.data.type === 'cell') {
+            signDataValue = detail.data.cell;
+            signDataSchema = detail.data.schema;
+        }
+        if (detail.data.type === 'binary') {
+            signDataValue = detail.data.bytes;
+        }
+        analytics === null || analytics === void 0 ? void 0 : analytics.emitSignDataRequestFailed(Object.assign(Object.assign({}, buildTonConnectEvent(detail)), { sign_data_type: detail.data.type, sign_data_value: signDataValue, sign_data_schema: signDataSchema, error_code: (_a = detail.error_code) !== null && _a !== void 0 ? _a : 0, error_message: detail.error_message }));
+    });
+}
+
+class DefaultEnvironment {
+    getClientEnvironment() {
+        return '';
+    }
+    getBrowser() {
+        return '';
+    }
+    getLocale() {
+        return '';
+    }
+    getPlatform() {
+        return '';
+    }
+    getTelegramUser() {
+        return undefined;
+    }
+}
+
 class TonConnect {
     /**
      * Returns available wallets list.
@@ -3934,13 +4710,15 @@ class TonConnect {
         this.statusChangeSubscriptions.forEach(callback => callback(this._wallet));
     }
     constructor(options) {
+        var _a, _b;
         this.walletsList = new WalletsListManager();
         this._wallet = null;
         this.provider = null;
         this.statusChangeSubscriptions = [];
         this.statusChangeErrorSubscriptions = [];
+        const manifestUrl = (options === null || options === void 0 ? void 0 : options.manifestUrl) || getWebPageManifest();
         this.dappSettings = {
-            manifestUrl: (options === null || options === void 0 ? void 0 : options.manifestUrl) || getWebPageManifest(),
+            manifestUrl,
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new DefaultStorage()
         };
         this.walletsRequiredFeatures = options === null || options === void 0 ? void 0 : options.walletsRequiredFeatures;
@@ -3948,10 +4726,24 @@ class TonConnect {
             walletsListSource: options === null || options === void 0 ? void 0 : options.walletsListSource,
             cacheTTLMs: options === null || options === void 0 ? void 0 : options.walletsListCacheTTLMs
         });
+        const eventDispatcher = (_a = options === null || options === void 0 ? void 0 : options.eventDispatcher) !== null && _a !== void 0 ? _a : new BrowserEventDispatcher();
         this.tracker = new TonConnectTracker({
-            eventDispatcher: options === null || options === void 0 ? void 0 : options.eventDispatcher,
+            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(),
+            browser: this.environment.getBrowser(),
+            platform: this.environment.getPlatform(),
+            tg_id: telegramUser === null || telegramUser === void 0 ? void 0 : telegramUser.id,
+            tma_is_premium: telegramUser === null || telegramUser === void 0 ? void 0 : telegramUser.isPremium,
+            manifest_json_url: manifestUrl,
+            origin_url: getOriginWithPath
+        }));
         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');
         }
@@ -3984,17 +4776,19 @@ class TonConnect {
             }
         };
     }
-    connect(wallet, requestOrOptions) {
-        var _a, _b;
+    // eslint-disable-next-line complexity
+    connect(wallet, requestOrOptions, additionalOptions) {
+        var _a, _b, _c;
         // TODO: remove deprecated method
-        const options = {};
+        const options = Object.assign({}, additionalOptions);
         if (typeof requestOrOptions === 'object' && 'tonProof' in requestOrOptions) {
             options.request = requestOrOptions;
         }
         if (typeof requestOrOptions === 'object' &&
             ('openingDeadlineMS' in requestOrOptions ||
                 'signal' in requestOrOptions ||
-                'request' in requestOrOptions)) {
+                'request' in requestOrOptions ||
+                'traceId' in requestOrOptions)) {
             options.request = requestOrOptions === null || requestOrOptions === void 0 ? void 0 : requestOrOptions.request;
             options.openingDeadlineMS = requestOrOptions === null || requestOrOptions === void 0 ? void 0 : requestOrOptions.openingDeadlineMS;
             options.signal = requestOrOptions === null || requestOrOptions === void 0 ? void 0 : requestOrOptions.signal;
@@ -4026,10 +4820,12 @@ class TonConnect {
             (_a = this.provider) === null || _a === void 0 ? void 0 : _a.closeConnection();
             this.provider = null;
         });
-        this.tracker.trackConnectionStarted();
+        const traceId = (_c = options === null || options === void 0 ? void 0 : options.traceId) !== null && _c !== void 0 ? _c : UUIDv7();
+        this.tracker.trackConnectionStarted(traceId);
         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
+            signal: abortController.signal,
+            traceId
         });
     }
     /**
@@ -4037,13 +4833,14 @@ class TonConnect {
      */
     restoreConnection(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            this.tracker.trackConnectionRestoringStarted();
+            var _a, _b, _c;
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+            this.tracker.trackConnectionRestoringStarted(traceId);
             const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
-            (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+            (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.abort();
             this.abortController = abortController;
             if (abortController.signal.aborted) {
-                this.tracker.trackConnectionRestoringError('Connection restoring was aborted');
+                this.tracker.trackConnectionRestoringError('Connection restoring was aborted', traceId);
                 return;
             }
             // TODO: potentially race condition here
@@ -4052,17 +4849,17 @@ class TonConnect {
                 this.walletsList.getEmbeddedWallet()
             ]);
             if (abortController.signal.aborted) {
-                this.tracker.trackConnectionRestoringError('Connection restoring was aborted');
+                this.tracker.trackConnectionRestoringError('Connection restoring was aborted', traceId);
                 return;
             }
             let provider = null;
             try {
                 switch (bridgeConnectionType) {
                     case 'http':
-                        provider = yield BridgeProvider.fromStorage(this.dappSettings.storage);
+                        provider = yield BridgeProvider.fromStorage(this.dappSettings.storage, this.analytics);
                         break;
                     case 'injected':
-                        provider = yield InjectedProvider.fromStorage(this.dappSettings.storage);
+                        provider = yield InjectedProvider.fromStorage(this.dappSettings.storage, this.analytics);
                         break;
                     default:
                         if (embeddedWallet) {
@@ -4073,8 +4870,8 @@ class TonConnect {
                         }
                 }
             }
-            catch (_c) {
-                this.tracker.trackConnectionRestoringError('Provider is not restored');
+            catch (_d) {
+                this.tracker.trackConnectionRestoringError('Provider is not restored', traceId);
                 yield this.bridgeConnectionStorage.removeConnection();
                 provider === null || provider === void 0 ? void 0 : provider.closeConnection();
                 provider = null;
@@ -4082,19 +4879,19 @@ class TonConnect {
             }
             if (abortController.signal.aborted) {
                 provider === null || provider === void 0 ? void 0 : provider.closeConnection();
-                this.tracker.trackConnectionRestoringError('Connection restoring was aborted');
+                this.tracker.trackConnectionRestoringError('Connection restoring was aborted', traceId);
                 return;
             }
             if (!provider) {
                 logError('Provider is not restored');
-                this.tracker.trackConnectionRestoringError('Provider is not restored');
+                this.tracker.trackConnectionRestoringError('Provider is not restored', traceId);
                 return;
             }
-            (_b = this.provider) === null || _b === void 0 ? void 0 : _b.closeConnection();
+            (_c = this.provider) === null || _c === void 0 ? void 0 : _c.closeConnection();
             this.provider = provider;
             provider.listen(this.walletEventsListener.bind(this));
             const onAbortRestore = () => {
-                this.tracker.trackConnectionRestoringError('Connection restoring was aborted');
+                this.tracker.trackConnectionRestoringError('Connection restoring was aborted', traceId);
                 provider === null || provider === void 0 ? void 0 : provider.closeConnection();
                 provider = null;
             };
@@ -4102,14 +4899,16 @@ class TonConnect {
             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
+                    signal: _options.signal,
+                    traceId
                 }));
                 abortController.signal.removeEventListener('abort', onAbortRestore);
                 if (this.connected) {
-                    this.tracker.trackConnectionRestoringCompleted(this.wallet);
+                    const sessionInfo = this.getSessionInfo();
+                    this.tracker.trackConnectionRestoringCompleted(this.wallet, sessionInfo, traceId);
                 }
                 else {
-                    this.tracker.trackConnectionRestoringError('Connection restoring failed');
+                    this.tracker.trackConnectionRestoringError('Connection restoring failed', traceId);
                 }
             }), {
                 attempts: Number.MAX_SAFE_INTEGER,
@@ -4123,6 +4922,7 @@ class TonConnect {
     }
     sendTransaction(transaction, optionsOrOnRequestSent) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             // TODO: remove deprecated method
             const options = {};
             if (typeof optionsOrOnRequestSent === 'function') {
@@ -4131,6 +4931,7 @@ class TonConnect {
             else {
                 options.onRequestSent = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.onRequestSent;
                 options.signal = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.signal;
+                options.traceId = optionsOrOnRequestSent === null || optionsOrOnRequestSent === void 0 ? void 0 : optionsOrOnRequestSent.traceId;
             }
             // Validate transaction
             const validationError = validateSendTransactionRequest(transaction);
@@ -4153,7 +4954,9 @@ class TonConnect {
                 requiredMessagesNumber,
                 requireExtraCurrencies
             });
-            this.tracker.trackTransactionSentForSignature(this.wallet, transaction);
+            const sessionInfo = this.getSessionInfo();
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+            this.tracker.trackTransactionSentForSignature(this.wallet, transaction, sessionInfo, traceId);
             const { validUntil, messages } = transaction, tx = __rest(transaction, ["validUntil", "messages"]);
             const from = transaction.from || this.account.address;
             const network = transaction.network || this.account.chain;
@@ -4161,18 +4964,23 @@ class TonConnect {
                 network, valid_until: validUntil, messages: messages.map((_a) => {
                     var { extraCurrency, payload, stateInit } = _a, msg = __rest(_a, ["extraCurrency", "payload", "stateInit"]);
                     return (Object.assign(Object.assign({}, msg), { payload: normalizeBase64(payload), stateInit: normalizeBase64(stateInit), extra_currency: extraCurrency }));
-                }) })), { onRequestSent: options.onRequestSent, signal: abortController.signal });
+                }) })), {
+                onRequestSent: options.onRequestSent,
+                signal: abortController.signal,
+                traceId
+            });
             if (sendTransactionParser.isError(response)) {
-                this.tracker.trackTransactionSigningFailed(this.wallet, transaction, response.error.message, response.error.code);
+                this.tracker.trackTransactionSigningFailed(this.wallet, transaction, response.error.message, response.error.code, sessionInfo, traceId);
                 return sendTransactionParser.parseAndThrowError(response);
             }
             const result = sendTransactionParser.convertFromRpcResponse(response);
-            this.tracker.trackTransactionSigned(this.wallet, transaction, result);
-            return result;
+            this.tracker.trackTransactionSigned(this.wallet, transaction, result, sessionInfo, traceId);
+            return Object.assign(Object.assign({}, result), { traceId: response.traceId });
         });
     }
     signData(data, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
             if (abortController.signal.aborted) {
                 throw new TonConnectError('data sending was aborted');
@@ -4189,18 +4997,20 @@ class TonConnect {
             }
             this.checkConnection();
             checkSignDataSupport(this.wallet.device.features, { requiredTypes: [data.type] });
-            this.tracker.trackDataSentForSignature(this.wallet, data);
+            const sessionInfo = this.getSessionInfo();
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+            this.tracker.trackDataSentForSignature(this.wallet, data, sessionInfo, traceId);
             const from = data.from || this.account.address;
             const network = data.network || this.account.chain;
             const response = yield this.provider.sendRequest(signDataParser.convertToRpcRequest(Object.assign(Object.assign(Object.assign({}, data), (data.type === 'cell' ? { cell: normalizeBase64(data.cell) } : {})), { from,
-                network })), { onRequestSent: options === null || options === void 0 ? void 0 : options.onRequestSent, signal: abortController.signal });
+                network })), { onRequestSent: options === null || options === void 0 ? void 0 : options.onRequestSent, signal: abortController.signal, traceId });
             if (signDataParser.isError(response)) {
-                this.tracker.trackDataSigningFailed(this.wallet, data, response.error.message, response.error.code);
+                this.tracker.trackDataSigningFailed(this.wallet, data, response.error.message, response.error.code, sessionInfo, traceId);
                 return signDataParser.parseAndThrowError(response);
             }
             const result = signDataParser.convertFromRpcResponse(response);
-            this.tracker.trackDataSigned(this.wallet, data, result);
-            return result;
+            this.tracker.trackDataSigned(this.wallet, data, result, sessionInfo, traceId);
+            return Object.assign(Object.assign({}, result), { traceId });
         });
     }
     /**
@@ -4208,7 +5018,7 @@ class TonConnect {
      */
     disconnect(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             if (!this.connected) {
                 throw new WalletNotConnectedError();
             }
@@ -4218,9 +5028,11 @@ class TonConnect {
             if (abortController.signal.aborted) {
                 throw new TonConnectError('Disconnect was aborted');
             }
-            this.onWalletDisconnected('dapp');
-            yield ((_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect({
-                signal: abortController.signal
+            const traceId = (_a = options === null || options === void 0 ? void 0 : options.traceId) !== null && _a !== void 0 ? _a : UUIDv7();
+            this.onWalletDisconnected('dapp', { traceId });
+            yield ((_b = this.provider) === null || _b === void 0 ? void 0 : _b.disconnect({
+                signal: abortController.signal,
+                traceId
             }));
             prevAbortController === null || prevAbortController === void 0 ? void 0 : prevAbortController.abort();
         });
@@ -4231,7 +5043,7 @@ class TonConnect {
      */
     getSessionId() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.provider || !this.connected) {
+            if (!this.provider) {
                 return null;
             }
             try {
@@ -4253,6 +5065,30 @@ class TonConnect {
             }
         });
     }
+    getSessionInfo() {
+        var _a;
+        if (((_a = this.provider) === null || _a === void 0 ? void 0 : _a.type) !== 'http') {
+            return null;
+        }
+        if (!('session' in this.provider)) {
+            return null;
+        }
+        try {
+            const session = this.provider.session;
+            if (!session) {
+                return null;
+            }
+            const clientId = session.sessionCrypto.sessionId;
+            let walletId = null;
+            if ('walletPublicKey' in session) {
+                walletId = session.walletPublicKey;
+            }
+            return { clientId, walletId };
+        }
+        catch (_b) {
+            return null;
+        }
+    }
     /**
      * Pause bridge HTTP connection. Might be helpful, if you want to pause connections while browser tab is unfocused,
      * or if you use SDK with NodeJS and want to save server resources.
@@ -4296,10 +5132,10 @@ class TonConnect {
     createProvider(wallet) {
         let provider;
         if (!Array.isArray(wallet) && isWalletConnectionSourceJS(wallet)) {
-            provider = new InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey);
+            provider = new InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey, this.analytics);
         }
         else {
-            provider = new BridgeProvider(this.dappSettings.storage, wallet);
+            provider = new BridgeProvider(this.dappSettings.storage, wallet, this.analytics);
         }
         provider.listen(this.walletEventsListener.bind(this));
         return provider;
@@ -4307,18 +5143,18 @@ class TonConnect {
     walletEventsListener(e) {
         switch (e.event) {
             case 'connect':
-                this.onWalletConnected(e.payload);
+                this.onWalletConnected(e.payload, { traceId: e.traceId });
                 break;
             case 'connect_error':
-                this.tracker.trackConnectionError(e.payload.message, e.payload.code);
+                this.tracker.trackConnectionError(e.payload.message, e.payload.code, this.getSessionInfo(), e.traceId);
                 const walletError = connectErrorsParser.parseError(e.payload);
                 this.onWalletConnectError(walletError);
                 break;
             case 'disconnect':
-                this.onWalletDisconnected('wallet');
+                this.onWalletDisconnected('wallet', { traceId: e.traceId });
         }
     }
-    onWalletConnected(connectEvent) {
+    onWalletConnected(connectEvent, options) {
         var _a;
         const tonAccountItem = connectEvent.items.find(item => item.name === 'ton_addr');
         const tonProofItem = connectEvent.items.find(item => item.name === 'ton_proof');
@@ -4398,7 +5234,8 @@ class TonConnect {
             wallet.connectItems = { tonProof };
         }
         this.wallet = wallet;
-        this.tracker.trackConnectionCompleted(wallet);
+        const sessionInfo = this.getSessionInfo();
+        this.tracker.trackConnectionCompleted(wallet, sessionInfo, options === null || options === void 0 ? void 0 : options.traceId);
     }
     onWalletConnectError(error) {
         this.statusChangeErrorSubscriptions.forEach(errorsHandler => errorsHandler(error));
@@ -4408,8 +5245,9 @@ class TonConnect {
             throw error;
         }
     }
-    onWalletDisconnected(scope) {
-        this.tracker.trackDisconnection(this.wallet, scope);
+    onWalletDisconnected(scope, options) {
+        const sessionInfo = this.getSessionInfo();
+        this.tracker.trackDisconnection(this.wallet, scope, sessionInfo, options === null || options === void 0 ? void 0 : options.traceId);
         this.wallet = null;
     }
     checkConnection() {
@@ -4447,5 +5285,5 @@ TonConnect.isWalletInjected = (walletJSKey) => InjectedProvider.isWalletInjected
  */
 TonConnect.isInsideWalletBrowser = (walletJSKey) => InjectedProvider.isInsideWalletBrowser(walletJSKey);
 
-export { BadRequestError, BrowserEventDispatcher, FetchWalletsError, LocalstorageNotFoundError, ParseHexError, TonConnect, TonConnectError, UnknownAppError, UnknownError, UserRejectsError, WalletAlreadyConnectedError, WalletMissingRequiredFeaturesError, WalletNotConnectedError, WalletNotInjectedError, WalletNotSupportFeatureError, WalletsListManager, WrongAddressError, checkRequiredWalletFeatures, createConnectionCompletedEvent, createConnectionErrorEvent, createConnectionRestoringCompletedEvent, createConnectionRestoringErrorEvent, createConnectionRestoringStartedEvent, createConnectionStartedEvent, createDataSentForSignatureEvent, createDataSignedEvent, createDataSigningFailedEvent, createDisconnectionEvent, createRequestVersionEvent, createResponseVersionEvent, createTransactionSentForSignatureEvent, createTransactionSignedEvent, createTransactionSigningFailedEvent, createVersionInfo, TonConnect as default, enableQaMode, encodeTelegramUrlParameters, isQaModeEnabled, isTelegramUrl, isWalletInfoCurrentlyEmbedded, isWalletInfoCurrentlyInjected, isWalletInfoInjectable, isWalletInfoInjected, isWalletInfoRemote, toUserFriendlyAddress };
+export { BadRequestError, BrowserEventDispatcher, FetchWalletsError, LocalstorageNotFoundError, ParseHexError, TonConnect, TonConnectError, UUIDv7, UnknownAppError, UnknownError, UserRejectsError, WalletAlreadyConnectedError, WalletMissingRequiredFeaturesError, WalletNotConnectedError, WalletNotInjectedError, WalletNotSupportFeatureError, WalletsListManager, WrongAddressError, checkRequiredWalletFeatures, createConnectionCompletedEvent, createConnectionErrorEvent, createConnectionRestoringCompletedEvent, createConnectionRestoringErrorEvent, createConnectionRestoringStartedEvent, createConnectionStartedEvent, createDataSentForSignatureEvent, createDataSignedEvent, createDataSigningFailedEvent, createDisconnectionEvent, createRequestVersionEvent, createResponseVersionEvent, createSelectedWalletEvent, createTransactionSentForSignatureEvent, createTransactionSignedEvent, createTransactionSigningFailedEvent, createVersionInfo, createWalletModalOpenedEvent, decodeTelegramUrlParameters, TonConnect as default, enableQaMode, encodeTelegramUrlParameters, isConnectUrl, isQaModeEnabled, isTelegramUrl, isWalletInfoCurrentlyEmbedded, isWalletInfoCurrentlyInjected, isWalletInfoInjectable, isWalletInfoInjected, isWalletInfoRemote, toUserFriendlyAddress };
 //# sourceMappingURL=index.mjs.map