@dynamic-labs/global-wallet-client 4.9.7 → 4.9.9

package/src/lib/solana/functions/createSolanaSignTransactionFeature/createSolanaSignTransactionFeature.js

@@ -1,17 +1,20 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { uint8ArrayToBase64, uint8ArrayFromBase64 } from '@dynamic-labs/utils';
+import { convertErrorToStandard } from '../convertErrorToStandard/convertErrorToStandard.js';
 
 const createSolanaSignTransactionFeature = (client) => ({
     signTransaction: (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, transaction, chain }) {
-        const { signedTransaction } = yield client.invoke({
+        const { signedTransaction } = yield client
+            .invoke({
             params: {
                 address: account.address,
                 chain: chain,
                 transaction: uint8ArrayToBase64(transaction),
             },
             pathname: 'solana_signTransaction',
-        });
+        })
+            .catch(convertErrorToStandard);
         return [
             {
                 signedTransaction: uint8ArrayFromBase64(signedTransaction),

package/src/lib/solana/functions/createStandardConnectFeature/createStandardConnectFeature.cjs

@@ -5,11 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var convertBaseWalletToWalletAccount = require('../convertBaseWalletToWalletAccount/convertBaseWalletToWalletAccount.cjs');
+var convertErrorToStandard = require('../convertErrorToStandard/convertErrorToStandard.cjs');
 
 const createStandardConnectFeature = (client) => ({
     connect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!client.solana.wallets.length) {
-            yield client.connect({ chain: 'solana' });
+            yield client.connect({ chain: 'solana' }).catch(convertErrorToStandard.convertErrorToStandard);
         }
         return {
             accounts: client.solana.wallets.map((wallet) => convertBaseWalletToWalletAccount.convertBaseWalletToWalletAccount(wallet, client)),

package/src/lib/solana/functions/createStandardConnectFeature/createStandardConnectFeature.js

@@ -1,11 +1,12 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { convertBaseWalletToWalletAccount } from '../convertBaseWalletToWalletAccount/convertBaseWalletToWalletAccount.js';
+import { convertErrorToStandard } from '../convertErrorToStandard/convertErrorToStandard.js';
 
 const createStandardConnectFeature = (client) => ({
     connect: () => __awaiter(void 0, void 0, void 0, function* () {
         if (!client.solana.wallets.length) {
-            yield client.connect({ chain: 'solana' });
+            yield client.connect({ chain: 'solana' }).catch(convertErrorToStandard);
         }
         return {
             accounts: client.solana.wallets.map((wallet) => convertBaseWalletToWalletAccount(wallet, client)),

package/src/lib/store/createClientStore.cjs

@@ -8,11 +8,20 @@ var store = require('@dynamic-labs/store');
 const createClientStore = ({ storage = localStorage, } = {}) => {
     const store$1 = store.persist({
         name: 'global-wallet-client',
-        partialize: (state) => state,
+        /**
+         * The client should not persist sessionAuthCode
+         */
+        partialize: (state) => ({
+            connection: state.connection,
+            ethereum: state.ethereum,
+            solana: state.solana,
+            wallets: state.wallets,
+        }),
         storage,
         store: store.createStore(() => ({
             connection: null,
             ethereum: null,
+            sessionAuthCode: null,
             solana: null,
             wallets: [],
         })),
@@ -47,6 +56,12 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             }
             return connection;
         },
+        /**
+         * Retrieves the session auth code
+         */
+        get sessionAuthCode() {
+            return store$1.getState().sessionAuthCode;
+        },
         /**
          * Updates current connection, wallets
          * Used when the popup confirm a connection
@@ -55,6 +70,13 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         setInitialConnectionState: ({ connection, wallets, ethereum, solana, }) => {
             store$1.setState({ connection, ethereum, solana, wallets });
         },
+        /**
+         * Updates the session auth code
+         * @param {BufferSource} sessionAuthCode - The session auth code to store
+         */
+        setSessionAuthCode: (sessionAuthCode) => {
+            store$1.setState({ sessionAuthCode });
+        },
         /**
          * Get all Solana wallets connected to the current connection
          */

package/src/lib/store/createClientStore.d.ts

@@ -26,6 +26,11 @@ type ClientStoreState = {
     solana: {
         currentNetwork: string;
     } | null;
+    /**
+     * Session Auth Code
+     * Used to decrypt and encrypt messages between client and popup
+     */
+    sessionAuthCode: BufferSource | null;
 };
 export declare const createClientStore: ({ storage, }?: CreateClientStoreProps) => {
     /**
@@ -46,12 +51,21 @@ export declare const createClientStore: ({ storage, }?: CreateClientStoreProps)
      * @returns {Connection | null} The current connection or null if no connection exists or it has expired
      */
     getActiveConnection: () => GlobalWalletConnection | null;
+    /**
+     * Retrieves the session auth code
+     */
+    readonly sessionAuthCode: BufferSource | null;
     /**
      * Updates current connection, wallets
      * Used when the popup confirm a connection
      * @param {GlobalWalletConnection | null} connection - The connection to store, or null to clear it
      */
     setInitialConnectionState: ({ connection, wallets, ethereum, solana, }: Pick<ClientStoreState, 'connection' | 'wallets' | 'ethereum' | 'solana'>) => void;
+    /**
+     * Updates the session auth code
+     * @param {BufferSource} sessionAuthCode - The session auth code to store
+     */
+    setSessionAuthCode: (sessionAuthCode: BufferSource) => void;
     /**
      * Get all Solana wallets connected to the current connection
      */

package/src/lib/store/createClientStore.js

@@ -4,11 +4,20 @@ import { persist, createStore } from '@dynamic-labs/store';
 const createClientStore = ({ storage = localStorage, } = {}) => {
     const store = persist({
         name: 'global-wallet-client',
-        partialize: (state) => state,
+        /**
+         * The client should not persist sessionAuthCode
+         */
+        partialize: (state) => ({
+            connection: state.connection,
+            ethereum: state.ethereum,
+            solana: state.solana,
+            wallets: state.wallets,
+        }),
         storage,
         store: createStore(() => ({
             connection: null,
             ethereum: null,
+            sessionAuthCode: null,
             solana: null,
             wallets: [],
         })),
@@ -43,6 +52,12 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
             }
             return connection;
         },
+        /**
+         * Retrieves the session auth code
+         */
+        get sessionAuthCode() {
+            return store.getState().sessionAuthCode;
+        },
         /**
          * Updates current connection, wallets
          * Used when the popup confirm a connection
@@ -51,6 +66,13 @@ const createClientStore = ({ storage = localStorage, } = {}) => {
         setInitialConnectionState: ({ connection, wallets, ethereum, solana, }) => {
             store.setState({ connection, ethereum, solana, wallets });
         },
+        /**
+         * Updates the session auth code
+         * @param {BufferSource} sessionAuthCode - The session auth code to store
+         */
+        setSessionAuthCode: (sessionAuthCode) => {
+            store.setState({ sessionAuthCode });
+        },
         /**
          * Get all Solana wallets connected to the current connection
          */

package/src/lib/types/GlobalWalletPopupMessages.d.ts

@@ -0,0 +1,16 @@
+import { SerializedError } from '@dynamic-labs/message-transport';
+import { IPopupActionDefinition } from '@dynamic-labs/types';
+export type GlobalWalletPopupMessages = {
+    sendPopupNonce: (nonce: string) => void;
+    sendPopupSessionPublicKey: (sessionPublicKey: string) => void;
+    actionResolved: (response: {
+        data: unknown;
+        id: string;
+    }) => void;
+    actionRejected: (response: {
+        serializedError: SerializedError;
+        id: string;
+    }) => void;
+    sendError: (serializedError: SerializedError) => void;
+    sendAction: (action: IPopupActionDefinition) => void;
+};

package/src/lib/constants/logger.cjs

@@ -1,10 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var logger$1 = require('@dynamic-labs/logger');
-
-const logger = new logger$1.Logger('@dynamic-labs/global-wallet-client');
-
-exports.logger = logger;

package/src/lib/constants/logger.js

@@ -1,6 +0,0 @@
-'use client'
-import { Logger } from '@dynamic-labs/logger';
-
-const logger = new Logger('@dynamic-labs/global-wallet-client');
-
-export { logger };

package/src/lib/functions/mergeAndEncryptParams/index.d.ts

@@ -1 +0,0 @@
-export { mergeAndEncryptParams } from './mergeAndEncryptParams';

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.cjs

@@ -1,23 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../_virtual/_tslib.cjs');
-var utils = require('@dynamic-labs/utils');
-var mergeURLSearchParams = require('../mergeURLSearchParams/mergeURLSearchParams.cjs');
-
-const mergeAndEncryptParams = (url, params, activeConnection) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    if (activeConnection) {
-        const encryptedParams = yield utils.encryptMessage(activeConnection.sharedSecret, JSON.stringify(params));
-        mergeURLSearchParams.mergeURLSearchParams(url.searchParams, new URLSearchParams({
-            encrypted_message: encryptedParams.encryptedMessage,
-            iv: encryptedParams.iv,
-        }));
-    }
-    else {
-        mergeURLSearchParams.mergeURLSearchParams(url.searchParams, new URLSearchParams(params));
-    }
-});
-
-exports.mergeAndEncryptParams = mergeAndEncryptParams;

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.d.ts

@@ -1,2 +0,0 @@
-import { GlobalWalletConnection } from '@dynamic-labs/types';
-export declare const mergeAndEncryptParams: (url: URL, params: Record<string, string>, activeConnection: GlobalWalletConnection | null) => Promise<void>;

package/src/lib/functions/mergeAndEncryptParams/mergeAndEncryptParams.js

@@ -1,19 +0,0 @@
-'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { encryptMessage } from '@dynamic-labs/utils';
-import { mergeURLSearchParams } from '../mergeURLSearchParams/mergeURLSearchParams.js';
-
-const mergeAndEncryptParams = (url, params, activeConnection) => __awaiter(void 0, void 0, void 0, function* () {
-    if (activeConnection) {
-        const encryptedParams = yield encryptMessage(activeConnection.sharedSecret, JSON.stringify(params));
-        mergeURLSearchParams(url.searchParams, new URLSearchParams({
-            encrypted_message: encryptedParams.encryptedMessage,
-            iv: encryptedParams.iv,
-        }));
-    }
-    else {
-        mergeURLSearchParams(url.searchParams, new URLSearchParams(params));
-    }
-});
-
-export { mergeAndEncryptParams };

package/src/lib/functions/mergeURLSearchParams/index.d.ts

@@ -1 +0,0 @@
-export { mergeURLSearchParams } from './mergeURLSearchParams';

package/src/lib/functions/mergeURLSearchParams/mergeURLSearchParams.cjs

@@ -1,17 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-/**
- * Merges URL search parameters from a source into a target URLSearchParams object
- * @param target - The URLSearchParams object to merge into
- * @param source - The URLSearchParams object to merge from
- */
-const mergeURLSearchParams = (target, source) => {
-    source.forEach((value, key) => {
-        target.set(key, value);
-    });
-};
-
-exports.mergeURLSearchParams = mergeURLSearchParams;

package/src/lib/functions/mergeURLSearchParams/mergeURLSearchParams.d.ts

@@ -1,6 +0,0 @@
-/**
- * Merges URL search parameters from a source into a target URLSearchParams object
- * @param target - The URLSearchParams object to merge into
- * @param source - The URLSearchParams object to merge from
- */
-export declare const mergeURLSearchParams: (target: URLSearchParams, source: URLSearchParams) => void;

package/src/lib/functions/mergeURLSearchParams/mergeURLSearchParams.js

@@ -1,13 +0,0 @@
-'use client'
-/**
- * Merges URL search parameters from a source into a target URLSearchParams object
- * @param target - The URLSearchParams object to merge into
- * @param source - The URLSearchParams object to merge from
- */
-const mergeURLSearchParams = (target, source) => {
-    source.forEach((value, key) => {
-        target.set(key, value);
-    });
-};
-
-export { mergeURLSearchParams };

package/src/lib/functions/waitForPopupResponse/index.d.ts

@@ -1 +0,0 @@
-export { waitForPopupResponse } from './waitForPopupResponse';

package/src/lib/functions/waitForPopupResponse/waitForPopupResponse.cjs

@@ -1,55 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../_virtual/_tslib.cjs');
-var logger = require('../../constants/logger.cjs');
-
-const waitForPopupResponse = ({ popupUrl, decode, onResponse, onError, }) => {
-    const handleOnWindowEvent = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (event.origin !== new URL(popupUrl).origin)
-            return;
-        let parsedData = null;
-        try {
-            parsedData = JSON.parse(event.data);
-        }
-        catch (err) {
-            logger.logger.debug('Error parsing data from WebExtension iFrame event', err);
-            return;
-        }
-        const decodedMessage = decode ? yield decode(parsedData) : parsedData;
-        const { error, success } = parseData(decodedMessage);
-        if (!error && !success) {
-            logger.logger.debug('Error validating event data schema from popup response event', parsedData);
-            return;
-        }
-        if (success) {
-            onResponse(success);
-        }
-        else {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            onError(new Error(error.message));
-        }
-    });
-    window.addEventListener('message', handleOnWindowEvent);
-    return () => {
-        window.removeEventListener('message', handleOnWindowEvent);
-    };
-};
-const parseData = (data) => {
-    if (!data || typeof data !== 'object') {
-        return {};
-    }
-    // Check if it's a success response
-    if (data.name && data.data) {
-        return { success: data };
-    }
-    // Check if it's an error response
-    if (data.message) {
-        return { error: data };
-    }
-    return {};
-};
-
-exports.waitForPopupResponse = waitForPopupResponse;

package/src/lib/functions/waitForPopupResponse/waitForPopupResponse.d.ts

@@ -1,9 +0,0 @@
-import { IPopupActionSuccessResponse } from '@dynamic-labs/types';
-type WaitForPopupResponseProps = {
-    popupUrl: string;
-    decode?: (data: any) => Promise<any>;
-    onResponse: (response: IPopupActionSuccessResponse) => void;
-    onError: (error: Error) => void;
-};
-export declare const waitForPopupResponse: ({ popupUrl, decode, onResponse, onError, }: WaitForPopupResponseProps) => () => void;
-export {};

package/src/lib/functions/waitForPopupResponse/waitForPopupResponse.js

@@ -1,51 +0,0 @@
-'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { logger } from '../../constants/logger.js';
-
-const waitForPopupResponse = ({ popupUrl, decode, onResponse, onError, }) => {
-    const handleOnWindowEvent = (event) => __awaiter(void 0, void 0, void 0, function* () {
-        if (event.origin !== new URL(popupUrl).origin)
-            return;
-        let parsedData = null;
-        try {
-            parsedData = JSON.parse(event.data);
-        }
-        catch (err) {
-            logger.debug('Error parsing data from WebExtension iFrame event', err);
-            return;
-        }
-        const decodedMessage = decode ? yield decode(parsedData) : parsedData;
-        const { error, success } = parseData(decodedMessage);
-        if (!error && !success) {
-            logger.debug('Error validating event data schema from popup response event', parsedData);
-            return;
-        }
-        if (success) {
-            onResponse(success);
-        }
-        else {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            onError(new Error(error.message));
-        }
-    });
-    window.addEventListener('message', handleOnWindowEvent);
-    return () => {
-        window.removeEventListener('message', handleOnWindowEvent);
-    };
-};
-const parseData = (data) => {
-    if (!data || typeof data !== 'object') {
-        return {};
-    }
-    // Check if it's a success response
-    if (data.name && data.data) {
-        return { success: data };
-    }
-    // Check if it's an error response
-    if (data.message) {
-        return { error: data };
-    }
-    return {};
-};
-
-export { waitForPopupResponse };