@metamask/connect-multichain 0.15.0 → 1.1.0

package/dist/src/multichain/transports/multichainApiClientWrapper/index.js

@@ -10,31 +10,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MultichainApiClientWrapperTransport_instances, _MultichainApiClientWrapperTransport_notificationCallbacks, _MultichainApiClientWrapperTransport_walletCreateSession, _MultichainApiClientWrapperTransport_walletGetSession, _MultichainApiClientWrapperTransport_walletRevokeSession, _MultichainApiClientWrapperTransport_walletInvokeMethod;
+var _MultichainApiClientWrapperTransport_instances, _MultichainApiClientWrapperTransport_notificationCallbacks, _MultichainApiClientWrapperTransport_getTransport, _MultichainApiClientWrapperTransport_walletCreateSession, _MultichainApiClientWrapperTransport_walletGetSession, _MultichainApiClientWrapperTransport_walletRevokeSession, _MultichainApiClientWrapperTransport_walletInvokeMethod;
 import { providerErrors } from '@metamask/rpc-errors';
 import { getUniqueRequestId } from '../../utils';
 export class MultichainApiClientWrapperTransport {
-    constructor(metamaskConnectMultichain) {
+    constructor(metamaskConnectMultichain, getTransport) {
         _MultichainApiClientWrapperTransport_instances.add(this);
         this.metamaskConnectMultichain = metamaskConnectMultichain;
         _MultichainApiClientWrapperTransport_notificationCallbacks.set(this, new Set());
+        _MultichainApiClientWrapperTransport_getTransport.set(this, void 0);
+        __classPrivateFieldSet(this, _MultichainApiClientWrapperTransport_getTransport, getTransport, "f");
     }
     isTransportDefined() {
-        try {
-            return Boolean(this.metamaskConnectMultichain.transport);
-        }
-        catch (_error) {
-            return false;
-        }
+        return __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_getTransport, "f").call(this) !== undefined;
     }
     isTransportConnected() {
-        return (this.isTransportDefined() &&
-            this.metamaskConnectMultichain.transport.isConnected());
+        var _a, _b;
+        return (_b = (_a = __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_getTransport, "f").call(this)) === null || _a === void 0 ? void 0 : _a.isConnected()) !== null && _b !== void 0 ? _b : false;
     }
     clearNotificationCallbacks() {
         __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_notificationCallbacks, "f").clear();
@@ -50,11 +53,11 @@ export class MultichainApiClientWrapperTransport {
         this.notificationListener = undefined;
     }
     setupTransportNotificationListener() {
-        if (!this.isTransportDefined() || this.notificationListener) {
+        const transport = __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_getTransport, "f").call(this);
+        if (!transport || this.notificationListener) {
             return;
         }
-        this.notificationListener =
-            this.metamaskConnectMultichain.transport.onNotification(this.notifyCallbacks.bind(this));
+        this.notificationListener = transport.onNotification(this.notifyCallbacks.bind(this));
     }
     // Purposely noop, resolves successfully. Actual connection is handled by the underlying client/transport.
     connect() {
@@ -98,7 +101,7 @@ export class MultichainApiClientWrapperTransport {
         };
     }
 }
-_MultichainApiClientWrapperTransport_notificationCallbacks = new WeakMap(), _MultichainApiClientWrapperTransport_instances = new WeakSet(), _MultichainApiClientWrapperTransport_walletCreateSession = function _MultichainApiClientWrapperTransport_walletCreateSession(request) {
+_MultichainApiClientWrapperTransport_notificationCallbacks = new WeakMap(), _MultichainApiClientWrapperTransport_getTransport = new WeakMap(), _MultichainApiClientWrapperTransport_instances = new WeakSet(), _MultichainApiClientWrapperTransport_walletCreateSession = function _MultichainApiClientWrapperTransport_walletCreateSession(request) {
     return __awaiter(this, void 0, void 0, function* () {
         const createSessionParams = request.params;
         const scopes = Object.keys(Object.assign(Object.assign({}, createSessionParams.optionalScopes), createSessionParams.requiredScopes));
@@ -116,13 +119,18 @@ _MultichainApiClientWrapperTransport_notificationCallbacks = new WeakMap(), _Mul
         });
         const accounts = [...new Set(scopeAccounts)];
         yield this.metamaskConnectMultichain.connect(scopes, accounts, createSessionParams.sessionProperties);
-        return this.metamaskConnectMultichain.transport.request({
+        const transport = __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_getTransport, "f").call(this);
+        if (!transport) {
+            throw new Error('Transport not initialized after connect');
+        }
+        return transport.request({
             method: 'wallet_getSession',
         });
     });
 }, _MultichainApiClientWrapperTransport_walletGetSession = function _MultichainApiClientWrapperTransport_walletGetSession(request) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!this.isTransportConnected()) {
+        const transport = __classPrivateFieldGet(this, _MultichainApiClientWrapperTransport_getTransport, "f").call(this);
+        if (!(transport === null || transport === void 0 ? void 0 : transport.isConnected())) {
             return {
                 jsonrpc: '2.0',
                 id: request.id,
@@ -131,7 +139,7 @@ _MultichainApiClientWrapperTransport_notificationCallbacks = new WeakMap(), _Mul
                 },
             };
         }
-        return this.metamaskConnectMultichain.transport.request({
+        return transport.request({
             method: 'wallet_getSession',
         });
     });

package/dist/src/multichain/transports/multichainApiClientWrapper/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/multichain/transports/multichainApiClientWrapper/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/multichain/transports/multichainApiClientWrapper/index.ts"],"names":[],"mappings":"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"}

package/dist/src/multichain/transports/mwp/index.d.ts

@@ -18,6 +18,7 @@ type PendingRequests = {
  * Bridges the MWP DappClient with the multichain API client Transport interface
  */
 export declare class MWPTransport implements ExtendedTransport {
+    #private;
     private dappClient;
     private kvstore;
     private options;
@@ -49,8 +50,9 @@ export declare class MWPTransport implements ExtendedTransport {
     private notifyCallbacks;
     private rejectRequest;
     private parseWalletError;
+    private getResponseError;
+    private isErrorPayload;
     private handleMessage;
-    private onResumeSuccess;
     init(): Promise<void>;
     sendEip1193Message<TRequest extends TransportRequest, TResponse extends TransportResponse>(payload: TRequest, options?: {
         timeout?: number;

package/dist/src/multichain/transports/mwp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/multichain/transports/mwp/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/multichain/transports/mwp/index.ts"],"names":[],"mappings":"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"}

package/dist/src/multichain/transports/mwp/index.js

@@ -7,8 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _MWPTransport_instances, _MWPTransport_onResumeHandler, _MWPTransport_resumeSession, _MWPTransport_startSession;
 import { TransportTimeoutError, } from '@metamask/multichain-api-client';
 import { JsonRpcError, providerErrors, rpcErrors } from '@metamask/rpc-errors';
+import { createDeferredPromise, isValidJson } from '@metamask/utils';
 import { createLogger, getPlatformType, PlatformType, } from '../../../domain';
 import { addValidAccounts, getOptionalScopes, getUniqueRequestId, getValidAccounts, isSameScopesAndAccounts, } from '../../utils';
 import { MULTICHAIN_PROVIDER_STREAM_NAME } from '../constants';
@@ -49,6 +56,7 @@ export class MWPTransport {
         connectionTimeout: DEFAULT_CONNECTION_TIMEOUT,
         resumeTimeout: DEFAULT_RESUME_TIMEOUT,
     }) {
+        _MWPTransport_instances.add(this);
         this.dappClient = dappClient;
         this.kvstore = kvstore;
         this.options = options;
@@ -125,16 +133,44 @@ export class MWPTransport {
         if (typeof errorData.code === 'number' &&
             typeof errorData.message === 'string') {
             const { code, message } = errorData;
+            // Preserve the wallet's JSON-RPC error `data` (e.g. revert reason bytes /
+            // custom-error payloads) so it survives to the RequestRouter and can
+            // reach dapps via `error.data`. Without this, the data is dropped here
+            // and the normalized `RPCInvokeMethodErr.rpcData` is always unset.
+            const rawData = errorData.data;
+            const data = isValidJson(rawData) ? rawData : undefined;
             if (code >= 1000 && code <= 4999) {
-                return providerErrors.custom({ code, message });
+                return providerErrors.custom({ code, message, data });
             }
-            return new JsonRpcError(code, message);
+            return new JsonRpcError(code, message, data);
         }
         const message = errorPayload instanceof Error
             ? errorPayload.message
             : JSON.stringify(errorPayload);
         return rpcErrors.internal({ message });
     }
+    getResponseError(messagePayload) {
+        if ('error' in messagePayload && messagePayload.error) {
+            return messagePayload.error;
+        }
+        const { result } = messagePayload;
+        if (typeof result === 'object' &&
+            result !== null &&
+            'error' in result &&
+            result.error &&
+            this.isErrorPayload(result.error)) {
+            return result.error;
+        }
+        return undefined;
+    }
+    isErrorPayload(errorPayload) {
+        if (errorPayload instanceof Error) {
+            return true;
+        }
+        const errorData = errorPayload;
+        return (typeof (errorData === null || errorData === void 0 ? void 0 : errorData.code) === 'number' &&
+            typeof (errorData === null || errorData === void 0 ? void 0 : errorData.message) === 'string');
+    }
     handleMessage(message) {
         if (typeof message === 'object' && message !== null) {
             if ('data' in message) {
@@ -143,10 +179,10 @@ export class MWPTransport {
                     const request = this.pendingRequests.get(messagePayload.id);
                     if (request) {
                         clearTimeout(request.timeout);
-                        // Check if the message contains an error (e.g., user rejected)
-                        if ('error' in messagePayload && messagePayload.error) {
+                        const responseError = this.getResponseError(messagePayload);
+                        if (responseError) {
                             this.pendingRequests.delete(messagePayload.id);
-                            request.reject(this.parseWalletError(messagePayload.error));
+                            request.reject(this.parseWalletError(responseError));
                             return;
                         }
                         // Success case - resolve the promise
@@ -187,67 +223,6 @@ export class MWPTransport {
             }
         }
     }
-    onResumeSuccess(resumeResolve, resumeReject, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
-            try {
-                yield this.waitForWalletSessionIfNotCached();
-                const sessionRequest = yield this.request({
-                    method: 'wallet_getSession',
-                });
-                // TODO: verify if this branching logic can ever be hit
-                if (sessionRequest.error) {
-                    return resumeReject(new Error(sessionRequest.error.message));
-                }
-                let walletSession = sessionRequest.result;
-                if (walletSession && options) {
-                    const currentScopes = Object.keys((_a = walletSession === null || walletSession === void 0 ? void 0 : walletSession.sessionScopes) !== null && _a !== void 0 ? _a : {});
-                    const proposedScopes = (_b = options === null || options === void 0 ? void 0 : options.scopes) !== null && _b !== void 0 ? _b : [];
-                    const proposedCaipAccountIds = (_c = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _c !== void 0 ? _c : [];
-                    const hasSameScopesAndAccounts = isSameScopesAndAccounts(currentScopes, proposedScopes, walletSession, proposedCaipAccountIds);
-                    if (options.forceRequest || !hasSameScopesAndAccounts) {
-                        const optionalScopes = addValidAccounts(getOptionalScopes((_d = options === null || options === void 0 ? void 0 : options.scopes) !== null && _d !== void 0 ? _d : []), getValidAccounts((_e = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _e !== void 0 ? _e : []));
-                        const sessionRequest = {
-                            optionalScopes,
-                        };
-                        const response = yield this.request({
-                            method: 'wallet_createSession',
-                            params: sessionRequest,
-                        });
-                        if (response.error) {
-                            return resumeReject(new Error(response.error.message));
-                        }
-                        // TODO: Maybe find a better way to revoke sessions on wallet without triggering an empty notification
-                        // Issue of this is it will send a session update event with an empty session and right after we may get the session recovered
-                        // await this.request({ method: 'wallet_revokeSession', params: walletSession });
-                        walletSession = response.result;
-                    }
-                }
-                else if (!walletSession) {
-                    // TODO: verify if this branching logic can ever be hit
-                    const optionalScopes = addValidAccounts(getOptionalScopes((_f = options === null || options === void 0 ? void 0 : options.scopes) !== null && _f !== void 0 ? _f : []), getValidAccounts((_g = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _g !== void 0 ? _g : []));
-                    const sessionRequest = { optionalScopes };
-                    const response = yield this.request({
-                        method: 'wallet_createSession',
-                        params: sessionRequest,
-                    });
-                    if (response.error) {
-                        return resumeReject(new Error(response.error.message));
-                    }
-                    walletSession = response.result;
-                }
-                yield this.removeStoredPendingSessionRequest();
-                this.notifyCallbacks({
-                    method: 'wallet_sessionChanged',
-                    params: walletSession,
-                });
-                return resumeResolve();
-            }
-            catch (err) {
-                return resumeReject(err);
-            }
-        });
-    }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             // no-op for MWP — passive init is only relevant for DefaultTransport
@@ -288,7 +263,6 @@ export class MWPTransport {
     }
     connect(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { dappClient } = this;
             const session = yield this.getActiveSession();
             if (session) {
                 logger('active session found', {
@@ -297,103 +271,10 @@ export class MWPTransport {
                     expiresAt: session.expiresAt,
                 });
             }
-            const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
-            let timeout;
-            let initialConnectionMessageHandler;
-            const connectionPromise = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                let connection;
-                if (session) {
-                    connection = new Promise((resumeResolve, resumeReject) => {
-                        var _a;
-                        if (this.dappClient.state === 'CONNECTED') {
-                            this.onResumeSuccess(resumeResolve, resumeReject, options);
-                        }
-                        else {
-                            this.dappClient.once('connected', () => __awaiter(this, void 0, void 0, function* () {
-                                this.onResumeSuccess(resumeResolve, resumeReject, options);
-                            }));
-                            dappClient.resume((_a = session === null || session === void 0 ? void 0 : session.id) !== null && _a !== void 0 ? _a : '');
-                        }
-                    });
-                }
-                else {
-                    connection = new Promise((resolveConnection, rejectConnection) => {
-                        var _a, _b;
-                        const optionalScopes = addValidAccounts(getOptionalScopes((_a = options === null || options === void 0 ? void 0 : options.scopes) !== null && _a !== void 0 ? _a : []), getValidAccounts((_b = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _b !== void 0 ? _b : []));
-                        const sessionRequest = {
-                            optionalScopes,
-                            sessionProperties: options === null || options === void 0 ? void 0 : options.sessionProperties,
-                        };
-                        const request = {
-                            jsonrpc: '2.0',
-                            id: String(getUniqueRequestId()),
-                            method: 'wallet_createSession',
-                            params: sessionRequest,
-                        };
-                        // Handler for initial connection messages - checks for error responses
-                        // and properly rejects the connection promise with EIP-1193 error codes
-                        initialConnectionMessageHandler = (message) => __awaiter(this, void 0, void 0, function* () {
-                            if (typeof message !== 'object' || message === null) {
-                                return;
-                            }
-                            if (!('data' in message)) {
-                                return;
-                            }
-                            const messagePayload = message.data;
-                            // Match by ID (preferred) or by method (backward compatibility for notifications without ID)
-                            const isMatchingId = messagePayload.id === request.id;
-                            const isMatchingMethod = messagePayload.method === 'wallet_createSession' ||
-                                messagePayload.method === 'wallet_sessionChanged';
-                            if (!isMatchingId && !isMatchingMethod) {
-                                return;
-                            }
-                            // Handle error response (e.g., user rejected the connection)
-                            if (messagePayload.error) {
-                                return rejectConnection(this.parseWalletError(messagePayload.error));
-                            }
-                            // Success case - store session, notify, and resolve
-                            yield this.storeWalletSession(request, messagePayload);
-                            yield this.removeStoredPendingSessionRequest();
-                            this.notifyCallbacks(messagePayload);
-                            return resolveConnection();
-                        });
-                        this.dappClient.on('message', initialConnectionMessageHandler);
-                        const platformType = getPlatformType();
-                        const isQRCodeFlow = [
-                            PlatformType.DesktopWeb,
-                            PlatformType.NonBrowser,
-                        ].includes(platformType);
-                        const initialPayload = {
-                            name: MULTICHAIN_PROVIDER_STREAM_NAME,
-                            data: request,
-                        };
-                        dappClient
-                            .connect({
-                            mode: 'trusted',
-                            initialPayload: isQRCodeFlow ? undefined : initialPayload,
-                        })
-                            .then(() => __awaiter(this, void 0, void 0, function* () {
-                            if (isQRCodeFlow) {
-                                return dappClient.sendRequest(initialPayload);
-                            }
-                            return undefined;
-                        }))
-                            .catch((error) => {
-                            if (initialConnectionMessageHandler) {
-                                this.dappClient.off('message', initialConnectionMessageHandler);
-                            }
-                            rejectConnection(error);
-                        });
-                    });
-                }
-                timeout = setTimeout(() => {
-                    reject(new TransportTimeoutError());
-                }, storedSessionRequestBeforeConnectionAttempt
-                    ? this.options.resumeTimeout
-                    : this.options.connectionTimeout);
-                connection.then(resolve).catch(reject);
-            }));
-            return connectionPromise
+            const connection = session
+                ? __classPrivateFieldGet(this, _MWPTransport_instances, "m", _MWPTransport_resumeSession).call(this, session, options)
+                : __classPrivateFieldGet(this, _MWPTransport_instances, "m", _MWPTransport_startSession).call(this, options);
+            return connection
                 .catch((error) => __awaiter(this, void 0, void 0, function* () {
                 // Clean up the MWP session from the KVStore so stale sessions
                 // don't cause subsequent connect attempts to enter the resume path
@@ -401,13 +282,6 @@ export class MWPTransport {
                 throw error;
             }))
                 .finally(() => {
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
-                if (initialConnectionMessageHandler) {
-                    this.dappClient.off('message', initialConnectionMessageHandler);
-                    initialConnectionMessageHandler = undefined;
-                }
                 this.removeStoredPendingSessionRequest();
             });
         });
@@ -475,7 +349,6 @@ export class MWPTransport {
      * @returns True if transport is connected, false otherwise
      */
     isConnected() {
-        // biome-ignore lint/suspicious/noExplicitAny:  required if state is not made public in dappClient
         return this.dappClient.state === 'CONNECTED';
     }
     /**
@@ -668,4 +541,194 @@ export class MWPTransport {
         });
     }
 }
+_MWPTransport_instances = new WeakSet(), _MWPTransport_onResumeHandler = function _MWPTransport_onResumeHandler(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g;
+        yield this.waitForWalletSessionIfNotCached();
+        const sessionResponse = yield this.request({ method: 'wallet_getSession' });
+        if (sessionResponse.error) {
+            throw new Error(sessionResponse.error.message);
+        }
+        let walletSession = sessionResponse.result;
+        if (walletSession && options) {
+            const currentScopes = Object.keys((_a = walletSession === null || walletSession === void 0 ? void 0 : walletSession.sessionScopes) !== null && _a !== void 0 ? _a : {});
+            const proposedScopes = (_b = options === null || options === void 0 ? void 0 : options.scopes) !== null && _b !== void 0 ? _b : [];
+            const proposedCaipAccountIds = (_c = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _c !== void 0 ? _c : [];
+            const hasSameScopesAndAccounts = isSameScopesAndAccounts(currentScopes, proposedScopes, walletSession, proposedCaipAccountIds);
+            if (options.forceRequest || !hasSameScopesAndAccounts) {
+                const optionalScopes = addValidAccounts(getOptionalScopes((_d = options === null || options === void 0 ? void 0 : options.scopes) !== null && _d !== void 0 ? _d : []), getValidAccounts((_e = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _e !== void 0 ? _e : []));
+                const sessionRequest = {
+                    optionalScopes,
+                };
+                const response = yield this.request({
+                    method: 'wallet_createSession',
+                    params: sessionRequest,
+                });
+                if (response.error) {
+                    throw new Error(response.error.message);
+                }
+                // TODO: Maybe find a better way to revoke sessions on wallet without triggering an empty notification
+                // Issue of this is it will send a session update event with an empty session and right after we may get the session recovered
+                // await this.request({ method: 'wallet_revokeSession', params: walletSession });
+                walletSession = response.result;
+            }
+        }
+        else if (!walletSession) {
+            // Hitting this branch implies that the MWP session was established,
+            // but the user has not yet accepted the initial wallet_createSession approval,
+            // but the page has refreshed and we've lost that previous context and so we
+            // are trying to recover by making a new wallet_createSession request.
+            const optionalScopes = addValidAccounts(getOptionalScopes((_f = options === null || options === void 0 ? void 0 : options.scopes) !== null && _f !== void 0 ? _f : []), getValidAccounts((_g = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _g !== void 0 ? _g : []));
+            const sessionRequest = {
+                optionalScopes,
+            };
+            const response = yield this.request({
+                method: 'wallet_createSession',
+                params: sessionRequest,
+            });
+            if (response.error) {
+                throw new Error(response.error.message);
+            }
+            walletSession = response.result;
+        }
+        yield this.removeStoredPendingSessionRequest();
+        this.notifyCallbacks({
+            method: 'wallet_sessionChanged',
+            params: walletSession,
+        });
+    });
+}, _MWPTransport_resumeSession = function _MWPTransport_resumeSession(session, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // Captured before any work begins so that a `session_request` event fired
+        // during resume (e.g. when the resume path falls through to
+        // `wallet_createSession`) doesn't skew the timeout decision.
+        const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+        const resumeDeferred = createDeferredPromise();
+        const runOnResumeHandler = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                resumeDeferred.resolve(yield __classPrivateFieldGet(this, _MWPTransport_instances, "m", _MWPTransport_onResumeHandler).call(this, options));
+            }
+            catch (err) {
+                resumeDeferred.reject(err);
+            }
+        });
+        if (this.dappClient.state === 'CONNECTED') {
+            runOnResumeHandler();
+        }
+        else {
+            this.dappClient.once('connected', runOnResumeHandler);
+            this.dappClient
+                .resume((_a = session.id) !== null && _a !== void 0 ? _a : '')
+                .catch((err) => resumeDeferred.reject(err));
+        }
+        // The resume path can fall through to `wallet_createSession` (forceRequest,
+        // recovery from a missing wallet session, or a scope/account change), which
+        // requires a human to approve in the wallet. Use the longer
+        // `connectionTimeout` for those flows; only use the shorter `resumeTimeout`
+        // when we're continuing an in-flight prior attempt.
+        const timeoutDeferred = createDeferredPromise();
+        const timeout = setTimeout(() => timeoutDeferred.reject(new TransportTimeoutError()), isContinuingPriorAttempt
+            ? this.options.resumeTimeout
+            : this.options.connectionTimeout);
+        const cleanup = () => this.dappClient.off('connected', runOnResumeHandler);
+        return Promise.race([
+            resumeDeferred.promise,
+            timeoutDeferred.promise,
+        ]).finally(() => {
+            clearTimeout(timeout);
+            cleanup();
+        });
+    });
+}, _MWPTransport_startSession = function _MWPTransport_startSession(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { dappClient } = this;
+        // Captured before any work begins so that the session_request event fired
+        // by `dappClient.connect()` (which overwrites the stored value) doesn't
+        // skew the timeout decision.
+        const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+        const connDeferred = createDeferredPromise();
+        const optionalScopes = addValidAccounts(getOptionalScopes((_a = options === null || options === void 0 ? void 0 : options.scopes) !== null && _a !== void 0 ? _a : []), getValidAccounts((_b = options === null || options === void 0 ? void 0 : options.caipAccountIds) !== null && _b !== void 0 ? _b : []));
+        const sessionRequest = {
+            optionalScopes,
+            sessionProperties: options === null || options === void 0 ? void 0 : options.sessionProperties,
+        };
+        const request = {
+            jsonrpc: '2.0',
+            id: String(getUniqueRequestId()),
+            method: 'wallet_createSession',
+            params: sessionRequest,
+        };
+        let handler;
+        const removeHandler = () => {
+            if (handler) {
+                this.dappClient.off('message', handler);
+                handler = undefined;
+            }
+        };
+        // Handler for initial connection messages — checks for error responses
+        // and properly rejects the connection promise with EIP-1193 error codes
+        handler = (message) => __awaiter(this, void 0, void 0, function* () {
+            if (typeof message !== 'object' || message === null) {
+                return;
+            }
+            if (!('data' in message)) {
+                return;
+            }
+            const messagePayload = message.data;
+            // Match by ID (preferred) or by method (backward compatibility for notifications without ID)
+            const isMatchingId = messagePayload.id === request.id;
+            const isMatchingMethod = messagePayload.method === 'wallet_createSession' ||
+                messagePayload.method === 'wallet_sessionChanged';
+            if (!isMatchingId && !isMatchingMethod) {
+                return;
+            }
+            const responseError = this.getResponseError(messagePayload);
+            // Handle error response (e.g., user rejected the connection)
+            if (responseError) {
+                connDeferred.reject(this.parseWalletError(responseError));
+                return;
+            }
+            // Success case — store session, notify, and resolve
+            yield this.storeWalletSession(request, messagePayload);
+            yield this.removeStoredPendingSessionRequest();
+            this.notifyCallbacks(messagePayload);
+            connDeferred.resolve();
+        });
+        this.dappClient.on('message', handler);
+        const platformType = getPlatformType();
+        const isQRCodeFlow = [
+            PlatformType.DesktopWeb,
+            PlatformType.NonBrowser,
+        ].includes(platformType);
+        const initialPayload = {
+            name: MULTICHAIN_PROVIDER_STREAM_NAME,
+            data: request,
+        };
+        dappClient
+            .connect({
+            mode: 'trusted',
+            initialPayload: isQRCodeFlow ? undefined : initialPayload,
+        })
+            .then(() => __awaiter(this, void 0, void 0, function* () {
+            if (isQRCodeFlow) {
+                return dappClient.sendRequest(initialPayload);
+            }
+            return undefined;
+        }))
+            .catch((error) => connDeferred.reject(error));
+        const timeoutDeferred = createDeferredPromise();
+        const timeout = setTimeout(() => timeoutDeferred.reject(new TransportTimeoutError()), isContinuingPriorAttempt
+            ? this.options.resumeTimeout
+            : this.options.connectionTimeout);
+        return Promise.race([
+            connDeferred.promise,
+            timeoutDeferred.promise,
+        ]).finally(() => {
+            clearTimeout(timeout);
+            removeHandler();
+        });
+    });
+};
 //# sourceMappingURL=index.js.map