@tezos-x/octez.connect-dapp 0.9.0 → 1.0.0

package/dist/cjs/dapp-client/DAppClient.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DAppClient = void 0;
-const axios_1 = require("axios");
-const bs58check_1 = require("bs58check");
+const axios_1 = __importDefault(require("axios"));
+const bs58check_1 = __importDefault(require("bs58check"));
 const events_1 = require("../events");
 const octez_connect_types_1 = require("@tezos-x/octez.connect-types");
 const octez_connect_core_1 = require("@tezos-x/octez.connect-core");
@@ -58,7 +61,6 @@ class DAppClient extends octez_connect_core_1.Client {
         this.beaconIDB = new octez_connect_core_1.IndexedDBStorage('beacon', ['bug_report', 'metrics']);
         this.debounceSetActiveAccount = false;
         this.multiTabChannel = new octez_connect_core_1.MultiTabChannel('octez.connect-sdk-channel', this.onBCMessageHandler.bind(this), this.onElectedLeaderhandler.bind(this));
-        this.blockchains = new Map();
         this.description = config.description;
         this.wcProjectId = ((_a = config.walletConnectOptions) === null || _a === void 0 ? void 0 : _a.projectId) || '24469fd0a06df227b6e5f7dc7de0ff4f';
         this.wcRelayUrl = (_b = config.walletConnectOptions) === null || _b === void 0 ? void 0 : _b.relayUrl;
@@ -67,7 +69,8 @@ class DAppClient extends octez_connect_core_1.Client {
         this.blockExplorer = (_d = config.blockExplorer) !== null && _d !== void 0 ? _d : new tzkt_blockexplorer_1.TzktBlockExplorer();
         this.network = (_e = config.network) !== null && _e !== void 0 ? _e : { type: (_f = config.preferredNetwork) !== null && _f !== void 0 ? _f : octez_connect_types_1.NetworkType.MAINNET };
         (0, octez_connect_ui_1.setColorMode)((_g = config.colorMode) !== null && _g !== void 0 ? _g : octez_connect_types_1.ColorMode.LIGHT);
-        this.disclaimerText = config.disclaimerText;
+        this.termsAndConditionsUrl = config.termsAndConditionsUrl;
+        this.privacyPolicyUrl = config.privacyPolicyUrl;
         this.errorMessages = (_h = config.errorMessages) !== null && _h !== void 0 ? _h : {};
         this.appMetadataManager = new octez_connect_core_1.AppMetadataManager(this.storage);
         this.storageValidator = new octez_connect_core_1.StorageValidator(this.storage);
@@ -125,13 +128,13 @@ class DAppClient extends octez_connect_core_1.Client {
         }));
         this.handleResponse = (message, connectionInfo) => __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const typedMessage = message.version === '3'
+            const typedMessage = (0, octez_connect_core_1.usesWrappedMessages)(message.version)
                 ? message.message
                 : message;
-            let appMetadata = message.version === '3'
+            let appMetadata = (0, octez_connect_core_1.usesWrappedMessages)(message.version)
                 ? (_a = typedMessage.blockchainData) === null || _a === void 0 ? void 0 : _a.appMetadata
                 : typedMessage.appMetadata;
-            if (!appMetadata && message.version === '3') {
+            if (!appMetadata && (0, octez_connect_core_1.usesWrappedMessages)(message.version)) {
                 const storedMetadata = yield Promise.all([
                     this.storage.get(octez_connect_types_1.StorageKey.TRANSPORT_P2P_PEERS_DAPP),
                     this.storage.get(octez_connect_types_1.StorageKey.TRANSPORT_WALLETCONNECT_PEERS_DAPP),
@@ -187,6 +190,12 @@ class DAppClient extends octez_connect_core_1.Client {
                 }
                 yield this.removeAccountsForPeerIds([message.senderId]);
                 yield this.events.emit(events_1.BeaconEvent.CHANNEL_CLOSED);
+                // Reset transport state so next requestPermissions() shows pairing modal
+                this.postMessageTransport = undefined;
+                this.p2pTransport = undefined;
+                this.walletConnectTransport = undefined;
+                yield this.setTransport(undefined);
+                yield this.setActivePeer(undefined);
             });
             if (openRequest && typedMessage.type === octez_connect_types_1.BeaconMessageType.Acknowledge) {
                 this.analytics.track('event', 'DAppClient', 'Acknowledge received from Wallet');
@@ -200,16 +209,34 @@ class DAppClient extends octez_connect_core_1.Client {
                     .catch(console.error);
             }
             else if (openRequest) {
-                if (typedMessage.type === octez_connect_types_1.BeaconMessageType.PermissionResponse && appMetadata) {
-                    yield this.appMetadataManager.addAppMetadata(appMetadata);
-                }
-                if (typedMessage.type === octez_connect_types_1.BeaconMessageType.Error) {
-                    openRequest.reject(typedMessage);
+                // Define valid response types that should resolve a request
+                const validResponseTypes = [
+                    octez_connect_types_1.BeaconMessageType.PermissionResponse,
+                    octez_connect_types_1.BeaconMessageType.OperationResponse,
+                    octez_connect_types_1.BeaconMessageType.SignPayloadResponse,
+                    octez_connect_types_1.BeaconMessageType.BroadcastResponse,
+                    octez_connect_types_1.BeaconMessageType.ProofOfEventChallengeResponse,
+                    octez_connect_types_1.BeaconMessageType.SimulatedProofOfEventChallengeResponse,
+                    octez_connect_types_1.BeaconMessageType.BlockchainResponse,
+                    octez_connect_types_1.BeaconMessageType.Error
+                ];
+                // Only process if it's a valid response type
+                if (validResponseTypes.includes(typedMessage.type)) {
+                    if (typedMessage.type === octez_connect_types_1.BeaconMessageType.PermissionResponse && appMetadata) {
+                        yield this.appMetadataManager.addAppMetadata(appMetadata);
+                    }
+                    if (typedMessage.type === octez_connect_types_1.BeaconMessageType.Error) {
+                        openRequest.reject(typedMessage);
+                    }
+                    else {
+                        openRequest.resolve({ message, connectionInfo });
+                    }
+                    this.openRequests.delete(typedMessage.id);
                 }
                 else {
-                    openRequest.resolve({ message, connectionInfo });
+                    // Log unexpected message types but don't resolve the request
+                    logger.warn('handleResponse', `Received unexpected message type "${typedMessage.type}" for request ${message.id}. Expected a response type, not a request type.`);
                 }
-                this.openRequests.delete(typedMessage.id);
             }
             else {
                 if (typedMessage.type === octez_connect_types_1.BeaconMessageType.Disconnect) {
@@ -407,7 +434,8 @@ class DAppClient extends octez_connect_core_1.Client {
     onRelayerError() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.resetInvalidState(false);
-            this.events.emit(events_1.BeaconEvent.RELAYER_ERROR);
+            const error = new octez_connect_core_1.UnknownBeaconError();
+            yield this.emitEventWithErrorContext(events_1.BeaconEvent.RELAYER_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () { return errorContext; }));
         });
     }
     wcToastHandler(status) {
@@ -429,10 +457,14 @@ class DAppClient extends octez_connect_core_1.Client {
                 });
             }
             else {
-                this.events.emit(events_1.BeaconEvent.PERMISSION_REQUEST_ERROR, {
-                    errorResponse: { errorType: octez_connect_types_1.BeaconErrorType.ABORTED_ERROR },
-                    walletInfo
-                });
+                const error = (0, octez_connect_core_1.getError)(octez_connect_types_1.BeaconErrorType.ABORTED_ERROR, undefined);
+                yield this.emitEventWithErrorContext(events_1.BeaconEvent.PERMISSION_REQUEST_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                    return ({
+                        errorResponse: { errorType: octez_connect_types_1.BeaconErrorType.ABORTED_ERROR },
+                        walletInfo,
+                        errorContext
+                    });
+                }));
             }
         });
     }
@@ -477,7 +509,8 @@ class DAppClient extends octez_connect_core_1.Client {
             catch (_a) {
                 //
             }
-            this._initPromise = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+            this._initPromise = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                this._initPromiseReject = reject;
                 if (transport) {
                     yield this.addListener(transport);
                     resolve(yield _super.init.call(this, transport));
@@ -572,6 +605,7 @@ class DAppClient extends octez_connect_core_1.Client {
                         }))
                             .catch((error) => {
                             this._initPromise = undefined;
+                            this._initPromiseReject = undefined;
                             console.error(error);
                         });
                         const abortHandler = () => __awaiter(this, void 0, void 0, function* () {
@@ -584,7 +618,12 @@ class DAppClient extends octez_connect_core_1.Client {
                             ]);
                             this.postMessageTransport = this.walletConnectTransport = this.p2pTransport = undefined;
                             this._activeAccount.isResolved() && this.clearActiveAccount();
+                            this.events.emit(events_1.BeaconEvent.PAIR_ABORTED).catch((emitError) => console.warn(emitError));
+                            if (this._initPromiseReject) {
+                                this._initPromiseReject(new octez_connect_core_1.AbortedBeaconError());
+                            }
                             this._initPromise = undefined;
+                            this._initPromiseReject = undefined;
                         });
                         const serializer = new octez_connect_core_1.Serializer();
                         const p2pPeerInfo = new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
@@ -594,7 +633,15 @@ class DAppClient extends octez_connect_core_1.Client {
                             catch (err) {
                                 logger.error(err);
                                 yield this.hideUI(['alert']); // hide pairing alert
-                                setTimeout(() => this.events.emit(events_1.BeaconEvent.GENERIC_ERROR, err.message), 1000);
+                                const error = new octez_connect_core_1.UnknownBeaconError();
+                                setTimeout(() => {
+                                    this.emitEventWithErrorContext(events_1.BeaconEvent.GENERIC_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                                        return ({
+                                            message: err.message,
+                                            errorContext
+                                        });
+                                    })).catch((emitError) => console.warn(emitError));
+                                }, 1000);
                                 abortHandler();
                                 resolve('');
                                 return;
@@ -614,9 +661,10 @@ class DAppClient extends octez_connect_core_1.Client {
                             walletConnectPeerInfo,
                             networkType: this.network.type,
                             abortedHandler: abortHandler.bind(this),
-                            disclaimerText: this.disclaimerText,
                             analytics: this.analytics,
                             featuredWallets: this.featuredWallets,
+                            termsAndConditionsUrl: this.termsAndConditionsUrl,
+                            privacyPolicyUrl: this.privacyPolicyUrl,
                             substratePairing
                         })
                             .catch((emitError) => console.warn(emitError));
@@ -669,7 +717,8 @@ class DAppClient extends octez_connect_core_1.Client {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             if (!this.isGetActiveAccountHandled) {
-                console.warn(`An active account has been received, but no active subscription was found for BeaconEvent.ACTIVE_ACCOUNT_SET.`);
+                console.warn(`An active account has been received, but no active subscription was found for BeaconEvent.ACTIVE_ACCOUNT_SET.
+        For more information, visit: https://octez-connect.tezos.com/guides/migration-guide`);
             }
             if (account && this._activeAccount.isSettled() && (yield this.isInvalidState(account))) {
                 const tranport = yield this.transport;
@@ -1023,7 +1072,7 @@ class DAppClient extends octez_connect_core_1.Client {
         });
     }
     addBlockchain(chain) {
-        this.blockchains.set(chain.identifier, chain);
+        super.addBlockchain(chain);
         chain.getWalletLists().then((walletLists) => {
             (0, octez_connect_ui_1.setDesktopList)(walletLists.desktopList);
             (0, octez_connect_ui_1.setExtensionList)(walletLists.extensionList);
@@ -1031,9 +1080,6 @@ class DAppClient extends octez_connect_core_1.Client {
             (0, octez_connect_ui_1.setiOSList)(walletLists.iOSList);
         });
     }
-    removeBlockchain(chainIdentifier) {
-        this.blockchains.delete(chainIdentifier);
-    }
     permissionRequest(input) {
         return __awaiter(this, void 0, void 0, function* () {
             logger.log('permissionRequest', input);
@@ -1046,13 +1092,7 @@ class DAppClient extends octez_connect_core_1.Client {
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('connect', 'start'));
             const logId = `makeRequestV3 ${Date.now()}`;
             logger.time(true, logId);
-            const { message: response, connectionInfo } = yield this.makeRequestV3(request).catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
+            const { message: response, connectionInfo } = yield this.requireResponse(this.makeRequestV3(request), request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('connect', 'start'));
             logger.log('RESPONSE V3', response, connectionInfo);
@@ -1114,14 +1154,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequestV3(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message: response, connectionInfo } = (yield res);
+            const { message: response, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'success'));
             yield blockchain.handleResponse({
@@ -1165,14 +1198,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest()) || !(yield this.getActiveAccount())
                 ? this.makeRequest(request, undefined, undefined)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('connect', 'success'));
             logger.log('requestPermissions', '######## MESSAGE #######');
@@ -1222,14 +1248,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequest(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'success'));
             this.analytics.track('event', 'DAppClient', `Proof of event challenge ${message.isAccepted ? 'accepted' : 'refused'}`, { address: activeAccount.address });
@@ -1266,14 +1285,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequest(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.analytics.track('event', 'DAppClient', `Simulated proof of event challenge ${!message.errorMessage ? 'accepted' : 'refused'}`, { address: activeAccount.address });
             yield this.notifySuccess(request, {
@@ -1335,14 +1347,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequest(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'success'));
             yield this.notifySuccess(request, {
@@ -1432,14 +1437,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequest(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'success'));
             yield this.notifySuccess(request, {
@@ -1482,14 +1480,7 @@ class DAppClient extends octez_connect_core_1.Client {
             const res = (yield this.checkMakeRequest())
                 ? this.makeRequest(request)
                 : this.makeRequestBC(request);
-            res.catch((requestError) => __awaiter(this, void 0, void 0, function* () {
-                requestError.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
-                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
-                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
-                logger.time(false, logId);
-                throw yield this.handleRequestError(request, requestError);
-            }));
-            const { message, connectionInfo } = (yield res);
+            const { message, connectionInfo } = yield this.requireResponse(res, request, logId);
             logger.time(false, logId);
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'success'));
             yield this.notifySuccess(request, {
@@ -1552,10 +1543,24 @@ class DAppClient extends octez_connect_core_1.Client {
      */
     sendInternalError(errorMessage) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.events.emit(events_1.BeaconEvent.INTERNAL_ERROR, { text: errorMessage });
+            const error = new octez_connect_core_1.UnknownBeaconError();
+            yield this.emitEventWithErrorContext(events_1.BeaconEvent.INTERNAL_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                return ({
+                    text: errorMessage,
+                    errorContext
+                });
+            }));
             throw new Error(errorMessage);
         });
     }
+    emitEventWithErrorContext(event, error, buildPayload, ...additionalArgs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const transport = this._transport.isResolved() ? yield this.transport : undefined;
+            const errorContext = yield (0, octez_connect_core_1.buildErrorContext)(error, this.storage, transport === null || transport === void 0 ? void 0 : transport.type);
+            const payload = yield buildPayload(errorContext);
+            yield this.events.emit(event, payload, ...additionalArgs);
+        });
+    }
     /**
      * This method will remove all accounts associated with a specific peer.
      *
@@ -1583,6 +1588,27 @@ class DAppClient extends octez_connect_core_1.Client {
             }
         });
     }
+    requireResponse(responsePromise, request, logId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return (yield responsePromise);
+            }
+            catch (requestError) {
+                const error = requestError;
+                if (error instanceof octez_connect_core_1.AbortedBeaconError) {
+                    this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'));
+                    logger.time(false, logId);
+                    throw error;
+                }
+                const errorResponse = error;
+                errorResponse.errorType === octez_connect_types_1.BeaconErrorType.ABORTED_ERROR
+                    ? this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'abort'))
+                    : this.sendMetrics('performance-metrics/save', yield this.buildPayload('message', 'error'));
+                logger.time(false, logId);
+                throw yield this.handleRequestError(request, errorResponse);
+            }
+        });
+    }
     /**
      * This message handles errors that we receive from the wallet.
      *
@@ -1622,13 +1648,15 @@ class DAppClient extends octez_connect_core_1.Client {
                     yield this.setTransport();
                     yield this.setActivePeer();
                 }
-                this.events
-                    .emit(beacon_message_events_1.messageEvents[request.type].error, {
-                    errorResponse: beaconError,
-                    walletInfo: yield this.getWalletInfo(peer, activeAccount),
-                    errorMessages: this.errorMessages
-                }, buttons)
-                    .catch((emitError) => logger.error('handleRequestError', emitError));
+                const error = (0, octez_connect_core_1.getError)(beaconError.errorType, beaconError.errorData);
+                yield this.emitEventWithErrorContext(beacon_message_events_1.messageEvents[request.type].error, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                    return ({
+                        errorResponse: beaconError,
+                        walletInfo: yield this.getWalletInfo(peer, activeAccount),
+                        errorMessages: this.errorMessages,
+                        errorContext
+                    });
+                }), buttons).catch((emitError) => logger.error('handleRequestError', emitError));
                 throw (0, octez_connect_core_1.getError)(beaconError.errorType, beaconError.errorData);
             }
             throw beaconError;
@@ -1765,9 +1793,13 @@ class DAppClient extends octez_connect_core_1.Client {
     }
     makeRequest(requestInput, skipResponse, otherTabMessageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const messageId = otherTabMessageId !== null && otherTabMessageId !== void 0 ? otherTabMessageId : (yield (0, octez_connect_utils_1.generateGUID)());
             if (this._initPromise && this.isInitPending) {
+                if (this._initPromiseReject) {
+                    this._initPromiseReject(new octez_connect_core_1.AbortedBeaconError());
+                    this._initPromiseReject = undefined;
+                }
                 yield Promise.all([
                     (_a = this.postMessageTransport) === null || _a === void 0 ? void 0 : _a.disconnect(),
                     (_b = this.walletConnectTransport) === null || _b === void 0 ? void 0 : _b.disconnect()
@@ -1799,12 +1831,16 @@ class DAppClient extends octez_connect_core_1.Client {
                 exposed = new octez_connect_utils_1.ExposedPromise();
                 this.addOpenRequest(request.id, exposed);
             }
-            const payload = yield new octez_connect_core_1.Serializer().serialize(request);
             const account = yield this.getActiveAccount();
             const peer = yield this.getPeer(account);
+            const payload = yield new octez_connect_core_1.Serializer(this.getPeerProtocolVersion(peer)).serialize(request);
             const walletInfo = yield this.getWalletInfo(peer, account);
             logger.log('makeRequest', 'sending message', request);
             try {
+                // Hook for performance measurement
+                if ((_c = window.__beaconPerf) === null || _c === void 0 ? void 0 : _c.onBeforeSend) {
+                    window.__beaconPerf.onBeforeSend();
+                }
                 ;
                 (yield this.transport).send(payload, peer);
                 if (request.type !== octez_connect_types_1.BeaconMessageType.PermissionRequest ||
@@ -1813,24 +1849,28 @@ class DAppClient extends octez_connect_core_1.Client {
                 }
             }
             catch (sendError) {
-                this.events.emit(events_1.BeaconEvent.INTERNAL_ERROR, {
-                    text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
-                    buttons: [
-                        {
-                            text: 'Reset Connection',
-                            actionCallback: () => __awaiter(this, void 0, void 0, function* () {
-                                (0, octez_connect_ui_1.closeToast)();
-                                this.disconnect();
-                            })
-                        }
-                    ]
-                });
+                const error = new octez_connect_core_1.UnknownBeaconError();
+                yield this.emitEventWithErrorContext(events_1.BeaconEvent.INTERNAL_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                    return ({
+                        text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
+                        errorContext,
+                        buttons: [
+                            {
+                                text: 'Reset Connection',
+                                actionCallback: () => __awaiter(this, void 0, void 0, function* () {
+                                    (0, octez_connect_ui_1.closeToast)();
+                                    this.disconnect();
+                                })
+                            }
+                        ]
+                    });
+                }));
                 throw sendError;
             }
             if (!otherTabMessageId) {
                 this.events
                     .emit(beacon_message_events_1.messageEvents[requestInput.type].sent, {
-                    walletInfo: Object.assign(Object.assign({}, walletInfo), { name: (_c = walletInfo.name) !== null && _c !== void 0 ? _c : 'Wallet' }),
+                    walletInfo: Object.assign(Object.assign({}, walletInfo), { name: (_d = walletInfo.name) !== null && _d !== void 0 ? _d : 'Wallet' }),
                     extraInfo: {
                         resetCallback: () => __awaiter(this, void 0, void 0, function* () {
                             this.disconnect();
@@ -1853,8 +1893,12 @@ class DAppClient extends octez_connect_core_1.Client {
      */
     makeRequestV3(requestInput, otherTabMessageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (this._initPromise && this.isInitPending) {
+                if (this._initPromiseReject) {
+                    this._initPromiseReject(new octez_connect_core_1.AbortedBeaconError());
+                    this._initPromiseReject = undefined;
+                }
                 yield Promise.all([
                     (_a = this.postMessageTransport) === null || _a === void 0 ? void 0 : _a.disconnect(),
                     (_b = this.walletConnectTransport) === null || _b === void 0 ? void 0 : _b.disconnect()
@@ -1885,12 +1929,16 @@ class DAppClient extends octez_connect_core_1.Client {
             };
             const exposed = new octez_connect_utils_1.ExposedPromise();
             this.addOpenRequest(request.id, exposed);
-            const payload = yield new octez_connect_core_1.Serializer().serialize(request);
             const account = yield this.getActiveAccount();
             const peer = yield this.getPeer(account);
+            const payload = yield new octez_connect_core_1.Serializer(this.getPeerProtocolVersion(peer)).serialize(request);
             const walletInfo = yield this.getWalletInfo(peer, account);
             logger.log('makeRequest', 'sending message', request);
             try {
+                // Hook for performance measurement
+                if ((_c = window.__beaconPerf) === null || _c === void 0 ? void 0 : _c.onBeforeSend) {
+                    window.__beaconPerf.onBeforeSend();
+                }
                 ;
                 (yield this.transport).send(payload, peer);
                 if (request.message.type !== octez_connect_types_1.BeaconMessageType.PermissionRequest ||
@@ -1899,24 +1947,28 @@ class DAppClient extends octez_connect_core_1.Client {
                 }
             }
             catch (sendError) {
-                this.events.emit(events_1.BeaconEvent.INTERNAL_ERROR, {
-                    text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
-                    buttons: [
-                        {
-                            text: 'Reset Connection',
-                            actionCallback: () => __awaiter(this, void 0, void 0, function* () {
-                                (0, octez_connect_ui_1.closeToast)();
-                                this.disconnect();
-                            })
-                        }
-                    ]
-                });
+                const error = new octez_connect_core_1.UnknownBeaconError();
+                yield this.emitEventWithErrorContext(events_1.BeaconEvent.INTERNAL_ERROR, error, (errorContext) => __awaiter(this, void 0, void 0, function* () {
+                    return ({
+                        text: 'Unable to send message. If this problem persists, please reset the connection and pair your wallet again.',
+                        errorContext,
+                        buttons: [
+                            {
+                                text: 'Reset Connection',
+                                actionCallback: () => __awaiter(this, void 0, void 0, function* () {
+                                    (0, octez_connect_ui_1.closeToast)();
+                                    this.disconnect();
+                                })
+                            }
+                        ]
+                    });
+                }));
                 throw sendError;
             }
             const index = requestInput.type;
             this.events
                 .emit(beacon_message_events_1.messageEvents[index].sent, {
-                walletInfo: Object.assign(Object.assign({}, walletInfo), { name: (_c = walletInfo.name) !== null && _c !== void 0 ? _c : 'Wallet' }),
+                walletInfo: Object.assign(Object.assign({}, walletInfo), { name: (_d = walletInfo.name) !== null && _d !== void 0 ? _d : 'Wallet' }),
                 extraInfo: {
                     resetCallback: () => __awaiter(this, void 0, void 0, function* () {
                         this.disconnect();
@@ -1977,13 +2029,33 @@ class DAppClient extends octez_connect_core_1.Client {
             }
             yield this.createStateSnapshot();
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('disconnect', 'start'));
+            const peers = yield transport.getPeers();
+            if (peers.length > 0) {
+                const shouldNotifyPeers = !(transport instanceof octez_connect_transport_walletconnect_1.WalletConnectTransport);
+                yield this.removeAllPeers(shouldNotifyPeers);
+            }
             yield this.clearActiveAccount();
             if (!(transport instanceof octez_connect_transport_walletconnect_1.WalletConnectTransport)) {
-                yield transport.disconnect();
+                try {
+                    yield transport.disconnect();
+                }
+                catch (disconnectError) {
+                    const message = disconnectError instanceof Error ? disconnectError.message : String(disconnectError);
+                    if (typeof message === 'string' && message.includes('Syncing stopped manually')) {
+                        logger.log('disconnect', 'Matrix sync stopped manually');
+                    }
+                    else {
+                        throw disconnectError;
+                    }
+                }
             }
             this.postMessageTransport = undefined;
             this.p2pTransport = undefined;
             this.walletConnectTransport = undefined;
+            yield this.setTransport();
+            this._initPromise = undefined;
+            this._initPromiseReject = undefined;
+            this.isInitPending = false;
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('disconnect', 'success'));
         });
     }