@console-wallet/dapp-sdk 2.0.0 → 2.0.2

package/dist/cjs/helpers/handleResponse.helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExpectedResponse = exports.isPossibleResponseType = void 0;
+exports.isExpectedMobileResponse = exports.isExpectedResponse = exports.isPossibleResponseType = void 0;
 const constants_1 = require("../constants");
 const types_1 = require("../types");
 const isPossibleResponseType = (str) => {
@@ -23,4 +23,14 @@ const isExpectedResponse = (event, id, type) => {
     }
 };
 exports.isExpectedResponse = isExpectedResponse;
+const isExpectedMobileResponse = (event, id, type) => {
+    if (type) {
+        console.log('🚀 ~ file: handleResponse.helper.ts:38 ~ type:', type, event.type === type, event.id == id);
+        return event.type === type && event.id == id;
+    }
+    else {
+        return (0, exports.isPossibleResponseType)(event.type || '') && event.id == id;
+    }
+};
+exports.isExpectedMobileResponse = isExpectedMobileResponse;
 //# sourceMappingURL=handleResponse.helper.js.map

package/dist/cjs/helpers/handleResponse.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleResponse.helper.js","sourceRoot":"","sources":["../../../src/helpers/handleResponse.helper.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAC7C,oCAA2C;AAGpC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAiC,EAAE;IACnF,MAAM,UAAU,GAAsB,MAAM,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAC;IACrE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,IAAI,WAAW,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC;AAEK,MAAM,kBAAkB,GAAG,CAChC,KAAmB,EACnB,EAAU,EACV,IAA6B,EACpB,EAAE;IACX,IAAI,IAAI,EAAE;QACR,OAAO,CACL,KAAK,CAAC,MAAM,KAAK,MAAM;YACvB,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,yBAAa;YACpC,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;YACzB,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CACrB,CAAC;KACH;SAAM;QACL,OAAO,CACL,KAAK,CAAC,MAAM,KAAK,MAAM;YACvB,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,yBAAa;YACpC,IAAA,8BAAsB,EAAC,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CACrB,CAAC;KACH;AACH,CAAC,CAAC;AApBW,QAAA,kBAAkB,sBAoB7B"}
+{"version":3,"file":"handleResponse.helper.js","sourceRoot":"","sources":["../../../src/helpers/handleResponse.helper.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAC7C,oCAA2C;AAGpC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAiC,EAAE;IACnF,MAAM,UAAU,GAAsB,MAAM,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAC;IACrE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,IAAI,WAAW,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC;AAEK,MAAM,kBAAkB,GAAG,CAChC,KAAmB,EACnB,EAAU,EACV,IAA6B,EACpB,EAAE;IACX,IAAI,IAAI,EAAE;QACR,OAAO,CACL,KAAK,CAAC,MAAM,KAAK,MAAM;YACvB,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,yBAAa;YACpC,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;YACzB,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CACrB,CAAC;KACH;SAAM;QACL,OAAO,CACL,KAAK,CAAC,MAAM,KAAK,MAAM;YACvB,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,yBAAa;YACpC,IAAA,8BAAsB,EAAC,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CACrB,CAAC;KACH;AACH,CAAC,CAAC;AApBW,QAAA,kBAAkB,sBAoB7B;AAEK,MAAM,wBAAwB,GAAG,CACtC,KAA8B,EAC9B,EAAU,EACV,IAA6B,EACpB,EAAE;IACX,IAAI,IAAI,EAAE;QACR,OAAO,CAAC,GAAG,CACT,gDAAgD,EAChD,IAAI,EACJ,KAAK,CAAC,IAAI,KAAK,IAAI,EACnB,KAAK,CAAC,EAAE,IAAI,EAAE,CACf,CAAC;QACF,OAAO,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;KAC9C;SAAM;QACL,OAAO,IAAA,8BAAsB,EAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;KACnE;AACH,CAAC,CAAC;AAhBW,QAAA,wBAAwB,4BAgBnC"}

package/dist/cjs/helpers/mobile-check.helper.d.ts

@@ -0,0 +1,7 @@
+type DeviceInfo = {
+    isMobile: boolean;
+    isIOS: boolean;
+    isAndroid: boolean;
+};
+export declare const getDeviceInfo: () => DeviceInfo;
+export {};

package/dist/cjs/helpers/mobile-check.helper.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDeviceInfo = void 0;
+const getDeviceInfo = () => {
+    if (typeof navigator === 'undefined') {
+        return {
+            isMobile: false,
+            isIOS: false,
+            isAndroid: false,
+        };
+    }
+    const ua = navigator.userAgent.toLowerCase();
+    const platform = navigator.platform;
+    const isAndroid = ua.includes('android');
+    const isIOS = ua.includes('iphone') ||
+        ua.includes('ipad') ||
+        ua.includes('ipod') ||
+        (platform === 'MacIntel' && navigator.maxTouchPoints > 1);
+    const isMobile = isAndroid || isIOS;
+    return {
+        isMobile,
+        isIOS,
+        isAndroid,
+    };
+};
+exports.getDeviceInfo = getDeviceInfo;
+//# sourceMappingURL=mobile-check.helper.js.map

package/dist/cjs/helpers/mobile-check.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mobile-check.helper.js","sourceRoot":"","sources":["../../../src/helpers/mobile-check.helper.ts"],"names":[],"mappings":";;;AAMO,MAAM,aAAa,GAAG,GAAe,EAAE;IAC5C,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;QACpC,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,KAAK;SACjB,CAAC;KACH;IAED,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IAEpC,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEzC,MAAM,KAAK,GACT,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACrB,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnB,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnB,CAAC,QAAQ,KAAK,UAAU,IAAI,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;IAE5D,MAAM,QAAQ,GAAG,SAAS,IAAI,KAAK,CAAC;IAEpC,OAAO;QACL,QAAQ;QACR,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,aAAa,iBA2BxB"}

package/dist/cjs/index.d.ts

@@ -1,6 +1,7 @@
 export * from './types';
 export * from './constants';
 export * from './types';
+import './styles.css';
 export declare const consoleWallet: {
     onAccountsChanged: (onChange?: ((value: import("./types").GetAccountResponse) => void) | undefined) => void;
     onConnectionStatusChanged: (onChange?: ((value: import("./types").StatusEvent) => void) | undefined) => void;
@@ -11,7 +12,7 @@ export declare const consoleWallet: {
     submitCommands: (data: import("./types").SignSendRequest) => Promise<import("./types").SignSendResponse>;
     signBatch: (data: import("./types").SignBatchRequest) => Promise<import("./types").SignBatchResponse>;
     submitInstructionChoice: (data: import("./types").SignInstructionChoiceRequest) => Promise<import("./types").SignInstructionChoiceResponse>;
-    connect: ({ icon, name }: import("./types").ConnectRequest) => Promise<import("./types").ConnectResponse>;
+    connect: ({ icon, name, target, }: import("./types").ConnectRequest) => Promise<import("./types").ConnectResponse>;
     disconnect: () => Promise<void>;
     isConnected: () => Promise<import("./types").ConnectResponse>;
     status: () => Promise<import("./types").StatusEvent>;

package/dist/cjs/index.js

@@ -8,6 +8,7 @@ const utilsInternal = tslib_1.__importStar(require("./utils"));
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./constants"), exports);
 tslib_1.__exportStar(require("./types"), exports);
+require("./styles.css");
 exports.consoleWallet = {
     ...requests,
     ...triggersNative,

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,6DAAuC;AACvC,yEAAmD;AACnD,+DAAyC;AAEzC,kDAAwB;AACxB,sDAA4B;AAC5B,kDAAwB;AAEX,QAAA,aAAa,GAAG;IAC3B,GAAG,QAAQ;IACX,GAAG,cAAc;CAClB,CAAC;AAEW,QAAA,KAAK,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,6DAAuC;AACvC,yEAAmD;AACnD,+DAAyC;AAEzC,kDAAwB;AACxB,sDAA4B;AAC5B,kDAAwB;AAExB,wBAAsB;AAET,QAAA,aAAa,GAAG;IAC3B,GAAG,QAAQ;IACX,GAAG,cAAc;CAClB,CAAC;AAEW,QAAA,KAAK,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC"}

package/dist/cjs/requests/connect.d.ts

@@ -11,4 +11,4 @@ import type { ConnectRequest, ConnectResponse } from '../types';
  * @example
  * await connect({ name: 'Canton Demo', icon: 'https://example.com/icon.png' });
  */
-export declare const connect: ({ icon, name }: ConnectRequest) => Promise<ConnectResponse>;
+export declare const connect: ({ icon, name, target, }: ConnectRequest) => Promise<ConnectResponse>;

package/dist/cjs/requests/connect.js

@@ -2,36 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = void 0;
 const constants_1 = require("../constants");
+const wc_constants_1 = require("../constants/wc.constants");
 const handleResponse_helper_1 = require("../helpers/handleResponse.helper");
+const mobile_check_helper_1 = require("../helpers/mobile-check.helper");
+const connector_select_1 = require("../services/wc-service/connector-select");
+const prepare_wc_1 = require("../services/wc-service/prepare-wc");
+const wc_service_1 = require("../services/wc-service/wc-service");
 const types_1 = require("../types");
+const checkAvailability_1 = require("./checkAvailability");
 const getIsConnected_1 = require("./getIsConnected");
-/**
- * Initiates a connection request to the wallet with optional dApp metadata.
- *
- * Emits `${PUBLIC_REQUESTS.CONNECT}_RESPONSE` when the user approves or rejects.
- * If the dApp origin is not yet connected, the wallet will prompt the user.
- *
- * @param {string} [name] Human‑readable dApp name shown in the wallet UI.
- * @param {string} [icon] Absolute URL to an icon displayed during connect.
- * @returns {Promise<ConnectResponse>}
- * @example
- * await connect({ name: 'Canton Demo', icon: 'https://example.com/icon.png' });
- */
-const connect = async ({ name, icon, }) => new Promise((resolve, reject) => {
+const type = types_1.PUBLIC_REQUESTS.CONNECT;
+const browserFunction = async ({ name, icon }) => new Promise((resolve, reject) => {
     const handleRequest = () => {
         const id = crypto.randomUUID();
         window.postMessage({
-            type: types_1.PUBLIC_REQUESTS.CONNECT,
+            type,
             target: constants_1.WALLET_TARGET,
             sdkVersion: constants_1.PROVIDER_VERSION,
             id,
+            fromOrigin: window.location.origin,
             name,
             icon,
         }, '*');
         function handleResponse(event) {
-            if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${types_1.PUBLIC_REQUESTS.CONNECT}_RESPONSE`)) {
+            if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${type}_RESPONSE`)) {
                 window.removeEventListener('message', handleResponse);
                 if (event.data.error) {
+                    console.log('🚀 ~ file: connect.ts:37 ~ event.data.error:', event.data.error);
                     reject(event.data.error);
                 }
                 else {
@@ -55,5 +52,83 @@ const connect = async ({ name, icon, }) => new Promise((resolve, reject) => {
         handleRequest();
     });
 });
+const mobileFunction = async ({ name, icon, target = 'combined', }) => new Promise((resolve, reject) => {
+    const handleRequest = () => {
+        const id = crypto.randomUUID();
+        wc_service_1.wcSessionService
+            .init({
+            type,
+            target,
+            sdkVersion: constants_1.PROVIDER_VERSION,
+            id,
+            fromOrigin: window.location.origin,
+            name,
+            icon,
+        })
+            .then(() => {
+            (0, prepare_wc_1.handlePrepareWC)();
+            wc_service_1.wcSessionService.addSubscriber(id, (message) => {
+                console.log('🚀 ~ file: connect.ts:88 ~ response:', message);
+                const response = JSON.parse(message.serializedPayload);
+                console.log('🚀 ~ file: connect.ts:90 ~ response:', response);
+                console.log('🚀 ~ file: connect.ts:91 ~ isExpectedMobileResponse:', (0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`));
+                if ((0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`)) {
+                    if (response.error) {
+                        reject(response.error);
+                    }
+                    else {
+                        resolve(response.data);
+                        document.getElementById(wc_constants_1.WC_PLACEHOLDER_DIV_ID)?.remove();
+                    }
+                }
+            });
+        });
+    };
+    (0, getIsConnected_1.isConnected)()
+        .then((isConnectedResponse) => {
+        if (isConnectedResponse.isConnected) {
+            resolve(isConnectedResponse);
+        }
+        else {
+            handleRequest();
+        }
+    })
+        .catch(() => {
+        handleRequest();
+    });
+});
+/**
+ * Initiates a connection request to the wallet with optional dApp metadata.
+ *
+ * Emits `${PUBLIC_REQUESTS.CONNECT}_RESPONSE` when the user approves or rejects.
+ * If the dApp origin is not yet connected, the wallet will prompt the user.
+ *
+ * @param {string} [name] Human‑readable dApp name shown in the wallet UI.
+ * @param {string} [icon] Absolute URL to an icon displayed during connect.
+ * @returns {Promise<ConnectResponse>}
+ * @example
+ * await connect({ name: 'Canton Demo', icon: 'https://example.com/icon.png' });
+ */
+const connect = async ({ name, icon, target = 'combined' }) => {
+    const deviceInfo = (0, mobile_check_helper_1.getDeviceInfo)();
+    console.log('🚀 ~ file: connect.ts:130 ~ deviceInfo:', deviceInfo);
+    alert(JSON.stringify(deviceInfo));
+    if (target === 'local') {
+        await browserFunction({ name, icon, target });
+    }
+    if (target === 'remote') {
+        return await mobileFunction({ name, icon, target });
+    }
+    const isExtensionInstalled = await (0, checkAvailability_1.checkExtensionAvailability)();
+    if (isExtensionInstalled.status === 'notInstalled' || deviceInfo.isMobile) {
+        return await mobileFunction({ name, icon, target });
+    }
+    else {
+        return await (0, connector_select_1.selectConnector)({
+            mobileFunction: async () => await mobileFunction({ name, icon, target }),
+            browserFunction: async () => await browserFunction({ name, icon, target }),
+        });
+    }
+};
 exports.connect = connect;
 //# sourceMappingURL=connect.js.map

package/dist/cjs/requests/connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/requests/connect.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAC/D,4EAAsE;AACtE,oCAA2C;AAE3C,qDAA+C;AAE/C;;;;;;;;;;;GAWG;AACI,MAAM,OAAO,GAAiE,KAAK,EAAE,EAC1F,IAAI,EACJ,IAAI,GACL,EAAE,EAAE,CACH,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE/B,MAAM,CAAC,WAAW,CAChB;YACE,IAAI,EAAE,uBAAe,CAAC,OAAO;YAC7B,MAAM,EAAE,yBAAa;YACrB,UAAU,EAAE,4BAAgB;YAC5B,EAAE;YACF,IAAI;YACJ,IAAI;SACL,EACD,GAAG,CACJ,CAAC;QAEF,SAAS,cAAc,CAAC,KAAmB;YACzC,IAAI,IAAA,0CAAkB,EAAC,KAAK,EAAE,EAAE,EAAE,GAAG,uBAAe,CAAC,OAAO,WAAW,CAAC,EAAE;gBACxE,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAEtD,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;oBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC1B;qBAAM;oBACL,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1B;aACF;QACH,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACrD,CAAC,CAAC;IAEF,IAAA,4BAAW,GAAE;SACV,IAAI,CAAC,CAAC,mBAAmB,EAAE,EAAE;QAC5B,IAAI,mBAAmB,CAAC,WAAW,EAAE;YACnC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAC7B,OAAO;SACR;aAAM;YACL,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,EAAE;QACV,aAAa,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AA/CQ,QAAA,OAAO,WA+Cf"}
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/requests/connect.ts"],"names":[],"mappings":"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"}

package/dist/cjs/requests/disconnect.js

@@ -3,27 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.disconnect = void 0;
 const constants_1 = require("../constants");
 const handleResponse_helper_1 = require("../helpers/handleResponse.helper");
+const prepare_wc_1 = require("../services/wc-service/prepare-wc");
+const wc_request_separator_1 = require("../services/wc-service/wc-request-separator");
+const wc_service_1 = require("../services/wc-service/wc-service");
 const types_1 = require("../types");
-/**
- * Terminates the current dApp–wallet connection.
- *
- * Emits `${PUBLIC_REQUESTS.DISCONNECT}_RESPONSE` when the user confirms.
- * After disconnect, most requests will trigger a reconnect prompt.
- *
- * @returns {Promise<DisconnectResponse>} "disconnected" when completed.
- * @example
- * await disconnect();
- */
-const disconnect = async () => new Promise((resolve, reject) => {
+const type = types_1.PUBLIC_REQUESTS.DISCONNECT;
+const browserFunction = async () => new Promise((resolve, reject) => {
     const id = crypto.randomUUID();
     window.postMessage({
-        type: types_1.PUBLIC_REQUESTS.DISCONNECT,
+        type,
         target: constants_1.WALLET_TARGET,
         sdkVersion: constants_1.PROVIDER_VERSION,
         id,
+        fromOrigin: window.location.origin,
     }, '*');
     function handleResponse(event) {
-        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${types_1.PUBLIC_REQUESTS.DISCONNECT}_RESPONSE`)) {
+        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${type}_RESPONSE`)) {
             window.removeEventListener('message', handleResponse);
             if (event.data.error) {
                 reject(event.data.error);
@@ -35,5 +30,44 @@ const disconnect = async () => new Promise((resolve, reject) => {
     }
     window.addEventListener('message', handleResponse);
 });
+const mobileFunction = async () => new Promise((resolve, reject) => {
+    const id = crypto.randomUUID();
+    wc_service_1.wcSessionService
+        .sendMessage(JSON.stringify({
+        type,
+        target: constants_1.WALLET_TARGET,
+        sdkVersion: constants_1.PROVIDER_VERSION,
+        id,
+        fromOrigin: window.location.origin,
+    }), type, id)
+        .then(() => {
+        (0, prepare_wc_1.handlePrepareWC)();
+        wc_service_1.wcSessionService.addSubscriber(id, (message) => {
+            const response = JSON.parse(message.serializedPayload);
+            if ((0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`)) {
+                if (response.error) {
+                    reject(response.error);
+                }
+                else {
+                    resolve(response.data);
+                }
+            }
+        });
+    });
+});
+/**
+ * Terminates the current dApp–wallet connection.
+ *
+ * Emits `${PUBLIC_REQUESTS.DISCONNECT}_RESPONSE` when the user confirms.
+ * After disconnect, most requests will trigger a reconnect prompt.
+ *
+ * @returns {Promise<DisconnectResponse>} "disconnected" when completed.
+ * @example
+ * await disconnect();
+ */
+const disconnect = async () => {
+    const res = await (0, wc_request_separator_1.wcRequestLogicSeparator)(async () => await browserFunction(), async () => await mobileFunction());
+    return res;
+};
 exports.disconnect = disconnect;
 //# sourceMappingURL=disconnect.js.map

package/dist/cjs/requests/disconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../../src/requests/disconnect.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAC/D,4EAAsE;AACtE,oCAA2C;AAG3C;;;;;;;;;GASG;AACI,MAAM,UAAU,GAAsC,KAAK,IAAI,EAAE,CACtE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,CAChB;QACE,IAAI,EAAE,uBAAe,CAAC,UAAU;QAChC,MAAM,EAAE,yBAAa;QACrB,UAAU,EAAE,4BAAgB;QAC5B,EAAE;KACH,EACD,GAAG,CACJ,CAAC;IAEF,SAAS,cAAc,CAAC,KAAmB;QACzC,IAAI,IAAA,0CAAkB,EAAC,KAAK,EAAE,EAAE,EAAE,GAAG,uBAAe,CAAC,UAAU,WAAW,CAAC,EAAE;YAC3E,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YAEtD,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AA3BQ,QAAA,UAAU,cA2BlB"}
+{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../../src/requests/disconnect.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAC/D,4EAAgG;AAChG,kEAAoE;AACpE,sFAAsF;AACtF,kEAAqE;AACrE,oCAA2C;AAG3C,MAAM,IAAI,GAAG,uBAAe,CAAC,UAAU,CAAC;AAExC,MAAM,eAAe,GAAsC,KAAK,IAAI,EAAE,CACpE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,CAChB;QACE,IAAI;QACJ,MAAM,EAAE,yBAAa;QACrB,UAAU,EAAE,4BAAgB;QAC5B,EAAE;QACF,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;KACnC,EACD,GAAG,CACJ,CAAC;IAEF,SAAS,cAAc,CAAC,KAAmB;QACzC,IAAI,IAAA,0CAAkB,EAAC,KAAK,EAAE,EAAE,EAAE,GAAG,IAAI,WAAW,CAAC,EAAE;YACrD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YAEtD,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEL,MAAM,cAAc,GAAsC,KAAK,IAAI,EAAE,CACnE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAE/B,6BAAgB;SACb,WAAW,CACV,IAAI,CAAC,SAAS,CAAC;QACb,IAAI;QACJ,MAAM,EAAE,yBAAa;QACrB,UAAU,EAAE,4BAAgB;QAC5B,EAAE;QACF,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;KACnC,CAAC,EACF,IAAI,EACJ,EAAE,CACH;SACA,IAAI,CAAC,GAAG,EAAE;QACT,IAAA,4BAAe,GAAE,CAAC;QAClB,6BAAgB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACvD,IAAI,IAAA,gDAAwB,EAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,WAAW,CAAC,EAAE;gBAC9D,IAAI,QAAQ,CAAC,KAAK,EAAE;oBAClB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACxB;qBAAM;oBACL,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBACxB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEL;;;;;;;;;GASG;AACI,MAAM,UAAU,GAAsC,KAAK,IAAI,EAAE;IACtE,MAAM,GAAG,GAAG,MAAM,IAAA,8CAAuB,EACvC,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,EAAE,EACnC,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,EAAE,CACnC,CAAC;IAEF,OAAO,GAAyB,CAAC;AACnC,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}

package/dist/cjs/requests/getAccounts.js

@@ -3,31 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAccounts = void 0;
 const constants_1 = require("../constants");
 const handleResponse_helper_1 = require("../helpers/handleResponse.helper");
+const wc_request_separator_1 = require("../services/wc-service/wc-request-separator");
+const wc_service_1 = require("../services/wc-service/wc-service");
 const types_1 = require("../types");
-/**
- * Lists all accounts available to the connected dApp origin.
- *
- * Emits `${PUBLIC_REQUESTS.GET_ACCOUNTS}_RESPONSE` with an array of wallets.
- * Requires a connected origin; otherwise the wallet may trigger a connect flow.
- *
- * @returns {Promise<GetAccountsResponse>} Accounts array or undefined.
- * @example
- * const accounts = await getAccounts();
- */
-const getAccounts = async () => new Promise((resolve, reject) => {
+const type = types_1.PUBLIC_REQUESTS.GET_ACCOUNTS;
+const browserFunction = async () => new Promise((resolve, reject) => {
     const id = crypto.randomUUID();
     window.postMessage({
-        type: types_1.PUBLIC_REQUESTS.GET_ACCOUNTS,
+        type,
         target: constants_1.WALLET_TARGET,
         sdkVersion: constants_1.PROVIDER_VERSION,
         id,
+        fromOrigin: window.location.origin,
     }, '*');
     const timeOut = setTimeout(() => {
         const error = types_1.EIP_1474_ERROR[types_1.EIP_1474_ERROR_ENUM.ResourceUnavailable];
         reject(error);
     }, 500);
     function handleResponse(event) {
-        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${types_1.PUBLIC_REQUESTS.GET_ACCOUNTS}_RESPONSE`)) {
+        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${type}_RESPONSE`)) {
             window.removeEventListener('message', handleResponse);
             clearTimeout(timeOut);
             if (event.data.error) {
@@ -40,5 +34,48 @@ const getAccounts = async () => new Promise((resolve, reject) => {
     }
     window.addEventListener('message', handleResponse);
 });
+const mobileFunction = async () => new Promise((resolve, reject) => {
+    const id = crypto.randomUUID();
+    // TODO: add timeout for request
+    // const timeOut = setTimeout(() => {
+    //   const error: ConsoleWalletError = EIP_1474_ERROR[EIP_1474_ERROR_ENUM.ResourceUnavailable];
+    //   reject(error);
+    // }, 500);
+    wc_service_1.wcSessionService
+        .sendMessage(JSON.stringify({
+        type,
+        target: constants_1.WALLET_TARGET,
+        sdkVersion: constants_1.PROVIDER_VERSION,
+        id,
+        fromOrigin: window.location.origin,
+    }), type, id)
+        .then(() => {
+        wc_service_1.wcSessionService.addSubscriber(id, (message) => {
+            const response = JSON.parse(message.serializedPayload);
+            if ((0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`)) {
+                if (response.error) {
+                    reject(response.error);
+                }
+                else {
+                    resolve(response.data);
+                }
+            }
+        });
+    });
+});
+/**
+ * Lists all accounts available to the connected dApp origin.
+ *
+ * Emits `${PUBLIC_REQUESTS.GET_ACCOUNTS}_RESPONSE` with an array of wallets.
+ * Requires a connected origin; otherwise the wallet may trigger a connect flow.
+ *
+ * @returns {Promise<GetAccountsResponse>} Accounts array or undefined.
+ * @example
+ * const accounts = await getAccounts();
+ */
+const getAccounts = async () => {
+    const res = await (0, wc_request_separator_1.wcRequestLogicSeparator)(async () => await browserFunction(), async () => await mobileFunction());
+    return res;
+};
 exports.getAccounts = getAccounts;
 //# sourceMappingURL=getAccounts.js.map

package/dist/cjs/requests/getAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAccounts.js","sourceRoot":"","sources":["../../../src/requests/getAccounts.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAC/D,4EAAsE;AACtE,oCAMkB;AAElB;;;;;;;;;GASG;AACI,MAAM,WAAW,GAAuC,KAAK,IAAI,EAAE,CACxE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,CAChB;QACE,IAAI,EAAE,uBAAe,CAAC,YAAY;QAClC,MAAM,EAAE,yBAAa;QACrB,UAAU,EAAE,4BAAgB;QAC5B,EAAE;KACH,EACD,GAAG,CACJ,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,MAAM,KAAK,GAAuB,sBAAc,CAAC,2BAAmB,CAAC,mBAAmB,CAAC,CAAC;QAC1F,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,SAAS,cAAc,CAAC,KAAmB;QACzC,IAAI,IAAA,0CAAkB,EAAC,KAAK,EAAE,EAAE,EAAE,GAAG,uBAAe,CAAC,YAAY,WAAW,CAAC,EAAE;YAC7E,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YAEtD,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtB,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAlCQ,QAAA,WAAW,eAkCnB"}
+{"version":3,"file":"getAccounts.js","sourceRoot":"","sources":["../../../src/requests/getAccounts.ts"],"names":[],"mappings":"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"}

package/dist/cjs/requests/getActiveAccount.js

@@ -3,31 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrimaryAccount = void 0;
 const constants_1 = require("../constants");
 const handleResponse_helper_1 = require("../helpers/handleResponse.helper");
+const wc_request_separator_1 = require("../services/wc-service/wc-request-separator");
+const wc_service_1 = require("../services/wc-service/wc-service");
 const types_1 = require("../types");
-/**
- * Returns the active (primary) account selected in the wallet.
- *
- * Emits `${PUBLIC_REQUESTS.GET_ACTIVE_ACCOUNT}_RESPONSE` with account details.
- * If the origin is not connected, the wallet may prevent access or prompt connect.
- *
- * @returns {Promise<GetAccountResponse>} Active account or undefined.
- * @example
- * const account = await getPrimaryAccount();
- */
-const getPrimaryAccount = async () => new Promise((resolve, reject) => {
+const type = types_1.PUBLIC_REQUESTS.GET_ACTIVE_ACCOUNT;
+const browserFunction = async () => new Promise((resolve, reject) => {
     const id = crypto.randomUUID();
     window.postMessage({
-        type: types_1.PUBLIC_REQUESTS.GET_ACTIVE_ACCOUNT,
+        type,
         target: constants_1.WALLET_TARGET,
         sdkVersion: constants_1.PROVIDER_VERSION,
         id,
+        fromOrigin: window.location.origin,
     }, '*');
     const timeOut = setTimeout(() => {
         const error = types_1.EIP_1474_ERROR[types_1.EIP_1474_ERROR_ENUM.ResourceUnavailable];
         reject(error);
     }, 500);
     function handleResponse(event) {
-        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${types_1.PUBLIC_REQUESTS.GET_ACTIVE_ACCOUNT}_RESPONSE`)) {
+        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${type}_RESPONSE`)) {
             window.removeEventListener('message', handleResponse);
             clearTimeout(timeOut);
             if (event.data.error) {
@@ -40,5 +34,48 @@ const getPrimaryAccount = async () => new Promise((resolve, reject) => {
     }
     window.addEventListener('message', handleResponse);
 });
+const mobileFunction = async () => new Promise((resolve, reject) => {
+    const id = crypto.randomUUID();
+    // TODO: add timeout for request
+    // const timeOut = setTimeout(() => {
+    //   const error: ConsoleWalletError = EIP_1474_ERROR[EIP_1474_ERROR_ENUM.ResourceUnavailable];
+    //   reject(error);
+    // }, 500);
+    wc_service_1.wcSessionService
+        .sendMessage(JSON.stringify({
+        type,
+        target: constants_1.WALLET_TARGET,
+        sdkVersion: constants_1.PROVIDER_VERSION,
+        id,
+        fromOrigin: window.location.origin,
+    }), type, id)
+        .then(() => {
+        wc_service_1.wcSessionService.addSubscriber(id, (message) => {
+            const response = JSON.parse(message.serializedPayload);
+            if ((0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`)) {
+                if (response.error) {
+                    reject(response.error);
+                }
+                else {
+                    resolve(response.data);
+                }
+            }
+        });
+    });
+});
+/**
+ * Returns the active (primary) account selected in the wallet.
+ *
+ * Emits `${PUBLIC_REQUESTS.GET_ACTIVE_ACCOUNT}_RESPONSE` with account details.
+ * If the origin is not connected, the wallet may prevent access or prompt connect.
+ *
+ * @returns {Promise<GetAccountResponse>} Active account or undefined.
+ * @example
+ * const account = await getPrimaryAccount();
+ */
+const getPrimaryAccount = async () => {
+    const res = await (0, wc_request_separator_1.wcRequestLogicSeparator)(async () => await browserFunction(), async () => await mobileFunction());
+    return res;
+};
 exports.getPrimaryAccount = getPrimaryAccount;
 //# sourceMappingURL=getActiveAccount.js.map

package/dist/cjs/requests/getActiveAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"getActiveAccount.js","sourceRoot":"","sources":["../../../src/requests/getActiveAccount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAC/D,4EAAsE;AACtE,oCAMkB;AAElB;;;;;;;;;GASG;AACI,MAAM,iBAAiB,GAAsC,KAAK,IAAI,EAAE,CAC7E,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,CAChB;QACE,IAAI,EAAE,uBAAe,CAAC,kBAAkB;QACxC,MAAM,EAAE,yBAAa;QACrB,UAAU,EAAE,4BAAgB;QAC5B,EAAE;KACH,EACD,GAAG,CACJ,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,MAAM,KAAK,GAAuB,sBAAc,CAAC,2BAAmB,CAAC,mBAAmB,CAAC,CAAC;QAC1F,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,SAAS,cAAc,CAAC,KAAmB;QACzC,IAAI,IAAA,0CAAkB,EAAC,KAAK,EAAE,EAAE,EAAE,GAAG,uBAAe,CAAC,kBAAkB,WAAW,CAAC,EAAE;YACnF,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YAEtD,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtB,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAlCQ,QAAA,iBAAiB,qBAkCzB"}
+{"version":3,"file":"getActiveAccount.js","sourceRoot":"","sources":["../../../src/requests/getActiveAccount.ts"],"names":[],"mappings":"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"}

package/dist/cjs/requests/getActiveNetwork.js

@@ -3,31 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActiveNetwork = void 0;
 const constants_1 = require("../constants");
 const handleResponse_helper_1 = require("../helpers/handleResponse.helper");
+const prepare_wc_1 = require("../services/wc-service/prepare-wc");
+const wc_request_separator_1 = require("../services/wc-service/wc-request-separator");
+const wc_service_1 = require("../services/wc-service/wc-service");
 const types_1 = require("../types");
-/**
- * Retrieves the currently selected network in the wallet.
- *
- * Emits `${PUBLIC_REQUESTS.GET_ACTIVE_NETWORK}_RESPONSE` with network information.
- * Origin should be connected; otherwise a connect flow may be required.
- *
- * @returns {Promise<Network>} Active network data.
- * @example
- * const network = await getActiveNetwork();
- */
-const getActiveNetwork = async () => new Promise((resolve, reject) => {
+const type = types_1.PUBLIC_REQUESTS.GET_ACTIVE_NETWORK;
+const browserFunction = async () => new Promise((resolve, reject) => {
     const id = crypto.randomUUID();
     window.postMessage({
-        type: types_1.PUBLIC_REQUESTS.GET_ACTIVE_NETWORK,
+        type,
         target: constants_1.WALLET_TARGET,
         sdkVersion: constants_1.PROVIDER_VERSION,
         id,
+        fromOrigin: window.location.origin,
     }, '*');
     const timeOut = setTimeout(() => {
         const error = types_1.EIP_1474_ERROR[types_1.EIP_1474_ERROR_ENUM.ResourceUnavailable];
         reject(error);
     }, 500);
     function handleResponse(event) {
-        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${types_1.PUBLIC_REQUESTS.GET_ACTIVE_NETWORK}_RESPONSE`)) {
+        if ((0, handleResponse_helper_1.isExpectedResponse)(event, id, `${type}_RESPONSE`)) {
             window.removeEventListener('message', handleResponse);
             clearTimeout(timeOut);
             if (event.data.error) {
@@ -40,5 +35,49 @@ const getActiveNetwork = async () => new Promise((resolve, reject) => {
     }
     window.addEventListener('message', handleResponse);
 });
+const mobileFunction = async () => new Promise((resolve, reject) => {
+    const id = crypto.randomUUID();
+    // TODO: add timeout for request
+    // const timeOut = setTimeout(() => {
+    //   const error: ConsoleWalletError = EIP_1474_ERROR[EIP_1474_ERROR_ENUM.ResourceUnavailable];
+    //   reject(error);
+    // }, 500);
+    wc_service_1.wcSessionService
+        .sendMessage(JSON.stringify({
+        type,
+        target: constants_1.WALLET_TARGET,
+        sdkVersion: constants_1.PROVIDER_VERSION,
+        id,
+        fromOrigin: window.location.origin,
+    }), type, id)
+        .then(() => {
+        (0, prepare_wc_1.handlePrepareWC)();
+        wc_service_1.wcSessionService.addSubscriber(id, (message) => {
+            const response = JSON.parse(message.serializedPayload);
+            if ((0, handleResponse_helper_1.isExpectedMobileResponse)(response, id, `${type}_RESPONSE`)) {
+                if (response.error) {
+                    reject(response.error);
+                }
+                else {
+                    resolve(response.data);
+                }
+            }
+        });
+    });
+});
+/**
+ * Retrieves the currently selected network in the wallet.
+ *
+ * Emits `${PUBLIC_REQUESTS.GET_ACTIVE_NETWORK}_RESPONSE` with network information.
+ * Origin should be connected; otherwise a connect flow may be required.
+ *
+ * @returns {Promise<Network>} Active network data.
+ * @example
+ * const network = await getActiveNetwork();
+ */
+const getActiveNetwork = async () => {
+    const res = await (0, wc_request_separator_1.wcRequestLogicSeparator)(async () => await browserFunction(), async () => await mobileFunction());
+    return res;
+};
 exports.getActiveNetwork = getActiveNetwork;
 //# sourceMappingURL=getActiveNetwork.js.map