@dynamic-labs-wallet/browser 0.0.97 → 0.0.98

package/index.cjs.js

@@ -2,6 +2,7 @@
 
 var core = require('@dynamic-labs-wallet/core');
 var web = require('./internal/web');
+var jwt = require('jsonwebtoken');
 var logger$1 = require('@dynamic-labs/logger');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var axios = require('axios');
@@ -43,9 +44,52 @@ const DEFAULT_LOG_LEVEL = logger$1.LogLevel.DEBUG; //todo: change back to info w
 const STORAGE_KEY = 'dynamic-waas-wallet-client';
 const CLIENT_KEYSHARE_EXPORT_FILENAME_PREFIX = 'dynamicWalletKeyShareBackup';
 
+const handleAxiosError = (error, message, context)=>{
+    var _error_response, _error_response1;
+    logger.debug("[DynamicWaasWalletClient] Axios error: " + message, {
+        error: (_error_response = error.response) == null ? void 0 : _error_response.status,
+        message: error.message,
+        context
+    });
+    switch((_error_response1 = error.response) == null ? void 0 : _error_response1.status){
+        case 400:
+            throw createHttpError(400, 'Invalid request');
+        case 401:
+            throw createHttpError(401, 'Authorization header or cookie is required');
+        case 403:
+            throw createHttpError(403, 'Forbidden');
+        case 422:
+            throw createHttpError(422, 'Unprocessable content');
+        case 500:
+            throw createHttpError(500, 'Internal server error');
+        default:
+            throw createHttpError(500, 'Internal server error');
+    }
+};
+
 const logger = new logger$1.Logger('DynamicWaasWalletClient', logger$1.LogLevel.DEBUG);
-const setLoggerEnvironmentId = (environmentId)=>{
-    logger$1.Logger.setEnvironmentId(environmentId);
+const setLoggerContext = ({ environmentId, sessionId, userId, verifiedCredentials })=>{
+    try {
+        logger$1.Logger.setEnvironmentId(environmentId);
+        logger$1.Logger.globalMetaData.set('sid', sessionId);
+        logger$1.Logger.globalMetaData.set('user_id', userId);
+        logger$1.Logger.globalMetaData.set('verified_credentials', verifiedCredentials);
+    } catch (error) {
+        logError({
+            message: '[DynamicWaasWalletClient] Error setting logger context',
+            error: error,
+            context: {}
+        });
+    }
+};
+const logError = ({ message, error, context })=>{
+    if (error instanceof axios.AxiosError) {
+        handleAxiosError(error, message, context);
+    }
+    logger.error(message, {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        context
+    });
 };
 
 const bytesToBase64 = (arr)=>{
@@ -429,29 +473,6 @@ const downloadFileFromGoogleDrive = async ({ accessToken, fileName })=>{
     }
 };
 
-const handleAxiosError = (error, message, context)=>{
-    var _error_response, _error_response1;
-    logger.debug("[DynamicWaasWalletClient] Axios error: " + message, {
-        error: (_error_response = error.response) == null ? void 0 : _error_response.status,
-        message: error.message,
-        context
-    });
-    switch((_error_response1 = error.response) == null ? void 0 : _error_response1.status){
-        case 400:
-            throw createHttpError(400, 'Invalid request');
-        case 401:
-            throw createHttpError(401, 'Authorization header or cookie is required');
-        case 403:
-            throw createHttpError(403, 'Forbidden');
-        case 422:
-            throw createHttpError(422, 'Unprocessable content');
-        case 500:
-            throw createHttpError(500, 'Internal server error');
-        default:
-            throw createHttpError(500, 'Internal server error');
-    }
-};
-
 const localStorageWriteTest = {
     tested: false,
     writable: false
@@ -522,11 +543,34 @@ const localStorageWriteTest = {
     });
 
 class DynamicWalletClient {
+    async initLoggerContext(authToken) {
+        try {
+            const payload = jwt.decode(authToken);
+            if (!payload || typeof payload !== 'object') {
+                throw new Error('Invalid JWT payload');
+            }
+            const userId = payload['sub'];
+            const sessionId = payload['sid'];
+            const verifiedCredentials = payload['verified_credentials'];
+            setLoggerContext({
+                environmentId: this.environmentId,
+                sessionId,
+                userId: userId || 'unknown',
+                verifiedCredentials
+            });
+        } catch (error) {
+            logError({
+                message: '[DynamicWaasWalletClient] Error initializing auth token',
+                error: error,
+                context: {}
+            });
+            throw error;
+        }
+    }
     async initialize() {
         if (this.initializePromise) {
             return await this.initializePromise;
         }
-        setLoggerEnvironmentId(this.environmentId);
         this.logger.debug('[DynamicWaasWalletClient] Initializing Dynamic Waas Wallet SDK');
         this.initializePromise = this._initialize();
         const result = await this.initializePromise;
@@ -669,17 +713,13 @@ class DynamicWalletClient {
                 clientKeyShares
             };
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in keyGen';
-            const context = {
-                chainName,
-                thresholdSignatureScheme
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in keyGen',
+                error: error,
+                context: {
+                    chainName,
+                    thresholdSignatureScheme
+                }
             });
             throw error;
         }
@@ -750,17 +790,13 @@ class DynamicWalletClient {
                 clientKeyShares: clientKeygenResults
             };
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in importRawPrivateKey';
-            const context = {
-                chainName,
-                thresholdSignatureScheme
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in importRawPrivateKey',
+                error: error,
+                context: {
+                    chainName,
+                    thresholdSignatureScheme
+                }
             });
             throw error;
         }
@@ -794,12 +830,15 @@ class DynamicWalletClient {
             const signature = await mpcSigner.sign(roomId, keyShare, formattedMessage, derivationPath);
             return signature;
         } catch (error) {
-            this.logger.error('[DynamicWaasWalletClient] Error in clientSign', {
-                error,
-                chainName,
-                roomId,
-                derivationPath,
-                isFormatted
+            logError({
+                message: '[DynamicWaasWalletClient] Error in clientSign',
+                error: error,
+                context: {
+                    chainName,
+                    roomId,
+                    derivationPath,
+                    isFormatted
+                }
             });
             throw error;
         }
@@ -853,18 +892,14 @@ class DynamicWalletClient {
             });
             return signature;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in sign';
-            const context = {
-                accountAddress,
-                chainName,
-                isFormatted: isFormatted ? 'true' : 'false'
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in sign',
+                error: error,
+                context: {
+                    accountAddress,
+                    chainName,
+                    isFormatted: isFormatted ? 'true' : 'false'
+                }
             });
             throw error;
         }
@@ -907,17 +942,13 @@ class DynamicWalletClient {
                 signedSessionId
             });
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in refreshWalletAccountShares';
-            const context = {
-                accountAddress,
-                chainName
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in refreshWalletAccountShares',
+                error: error,
+                context: {
+                    accountAddress,
+                    chainName
+                }
             });
             throw error;
         }
@@ -1042,19 +1073,16 @@ class DynamicWalletClient {
                 backupToGoogleDrive
             });
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in reshare';
-            const context = {
-                accountAddress,
-                chainName,
-                oldThresholdSignatureScheme,
-                newThresholdSignatureScheme
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in reshare',
+                error: error,
+                context: {
+                    accountAddress,
+                    chainName,
+                    oldThresholdSignatureScheme,
+                    newThresholdSignatureScheme,
+                    backupToGoogleDrive
+                }
             });
             throw error;
         }
@@ -1113,17 +1141,13 @@ class DynamicWalletClient {
                 derivedPrivateKey
             };
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in exportKey';
-            const context = {
-                accountAddress,
-                chainName
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in exportKey',
+                error: error,
+                context: {
+                    accountAddress,
+                    chainName
+                }
             });
             throw error;
         }
@@ -1164,7 +1188,13 @@ class DynamicWalletClient {
                 rawPublicKey
             };
         } catch (error) {
-            this.logger.error('[DynamicWaasWalletClient] Error in offlineExportKey', error);
+            logError({
+                message: '[DynamicWaasWalletClient] Error in offlineExportKey',
+                error: error,
+                context: {
+                    chainName
+                }
+            });
             throw error;
         }
     }
@@ -1196,7 +1226,13 @@ class DynamicWalletClient {
             }
             return (parsedWalletObject == null ? void 0 : parsedWalletObject.clientKeyShares) || [];
         } catch (error) {
-            this.logger.error(`[DynamicWaasWalletClient] Error parsing clientKeyShares: ${error} for accountAddress: ${accountAddress}`);
+            logError({
+                message: `[DynamicWaasWalletClient] Error parsing clientKeyShares: ${error} for accountAddress: ${accountAddress}`,
+                error: error,
+                context: {
+                    accountAddress
+                }
+            });
             return [];
         }
     }
@@ -1244,13 +1280,16 @@ class DynamicWalletClient {
                 accountAddress
             });
             if (!((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.walletId)) {
-                this.logger.error('[DynamicWaasWalletClient] Error in storeEncryptedBackupByWallet, wallet or walletId not found from the wallet map', {
+                const error = new Error(`WalletId not found for accountAddress ${accountAddress}`);
+                logError({
+                    message: '[DynamicWaasWalletClient] Error in storeEncryptedBackupByWallet, wallet or walletId not found from the wallet map',
+                    error,
                     context: {
                         accountAddress,
                         walletMap: this.walletMap
                     }
                 });
-                throw new Error(`WalletId not found for accountAddress ${accountAddress}`);
+                throw error;
             }
             // TODO(zfaizal2): throw error if signedSessionId is not provided after service deploy
             let dynamicClientKeyShares = [];
@@ -1306,16 +1345,12 @@ class DynamicWalletClient {
             await this.storage.setItem(this.storageKey, JSON.stringify(this.walletMap));
             return data;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in storeEncryptedBackupByWallet';
-            const context = {
-                accountAddress
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error: error instanceof Error ? error.message : 'Unknown error',
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in storeEncryptedBackupByWallet',
+                error: error,
+                context: {
+                    accountAddress
+                }
             });
             throw error;
         }
@@ -1365,23 +1400,25 @@ class DynamicWalletClient {
             const user = await this.apiClient.getUser();
             const oauthAccountId = getGoogleOAuthAccountId(user == null ? void 0 : user.verifiedCredentials);
             if (!oauthAccountId) {
-                this.logger.error('No Google OAuth account ID found', {
-                    user,
-                    accountAddress
+                const error = new Error('No Google OAuth account ID found');
+                logError({
+                    message: 'No Google OAuth account ID found',
+                    error,
+                    context: {
+                        user,
+                        accountAddress
+                    }
                 });
-                throw new Error('No Google OAuth account ID found');
+                throw error;
             }
             return oauthAccountId;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in getGoogleOauthAccountIdOrThrow';
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, {
+            logError({
+                message: '[DynamicWaasWalletClient] Error in getGoogleOauthAccountIdOrThrow',
+                error: error,
+                context: {
                     accountAddress
-                });
-            }
-            this.logger.error(message, {
-                error,
-                accountAddress
+                }
             });
             throw error;
         }
@@ -1444,21 +1481,14 @@ class DynamicWalletClient {
             }
             return decryptedKeyShares;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in recoverEncryptedBackupByWallet';
-            const context = {
-                accountAddress,
-                password,
-                walletOperation,
-                signedSessionId,
-                shareCount,
-                storeRecoveredShares
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in recoverEncryptedBackupByWallet',
+                error: error,
+                context: {
+                    accountAddress,
+                    walletOperation,
+                    shareCount
+                }
             });
             throw error;
         }
@@ -1515,13 +1545,13 @@ class DynamicWalletClient {
                 return googleDriveKeyShares.map((ks)=>ks.id);
             }
         } catch (error) {
-            this.logger.error('[DynamicWaasWalletClient]: Error in backupKeySharesToGoogleDrive', error);
-            if (error instanceof axios.AxiosError) {
-                const message = '[DynamicWaasWalletClient] Error in backupKeySharesToGoogleDrive';
-                handleAxiosError(error, message, {
+            logError({
+                message: '[DynamicWaasWalletClient] Error in backupKeySharesToGoogleDrive',
+                error: error,
+                context: {
                     accountAddress
-                });
-            }
+                }
+            });
             throw error;
         }
     }
@@ -1573,16 +1603,12 @@ class DynamicWalletClient {
             });
             return data.keyShares.map((ks)=>ks.id);
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in backupKeySharesToGoogleDrive';
-            const context = {
-                accountAddress
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in backupKeySharesToGoogleDrive',
+                error: error,
+                context: {
+                    accountAddress
+                }
             });
             throw error;
         }
@@ -1609,27 +1635,40 @@ class DynamicWalletClient {
                         fileName
                     }));
             } catch (error) {
-                this.logger.error('[DynamicWaasWalletClient] Failed to download backup from Google Drive', {
-                    accountAddress,
-                    fileName,
-                    error
+                logError({
+                    message: '[DynamicWaasWalletClient] Failed to download backup from Google Drive',
+                    error: error,
+                    context: {
+                        accountAddress,
+                        fileName
+                    }
                 });
-                throw new Error('Failed to restore backup from Google Drive');
+                throw error;
             }
             if (!backupData) {
-                this.logger.error('[DynamicWaasWalletClient] No backup file found', {
-                    accountAddress,
-                    fileName
+                const error = new Error('No backup file found');
+                logError({
+                    message: '[DynamicWaasWalletClient] No backup file found',
+                    error: new Error('No backup file found'),
+                    context: {
+                        accountAddress,
+                        fileName
+                    }
                 });
-                throw new Error('No backup file found');
+                throw error;
             }
             // Validate the backup data structure
             if (!backupData.keyShares || !backupData.metadata) {
-                this.logger.error('[DynamicWaasWalletClient] Invalid backup format: missing keyShares or metadata', {
-                    accountAddress,
-                    fileName
+                const error = new Error('Invalid backup format: missing keyShares or metadata');
+                logError({
+                    message: '[DynamicWaasWalletClient] Invalid backup format: missing keyShares or metadata',
+                    error,
+                    context: {
+                        accountAddress,
+                        fileName
+                    }
                 });
-                throw new Error('Invalid backup format: missing keyShares or metadata');
+                throw error;
             }
             const { keyShares } = backupData;
             const decryptedKeyShares = await Promise.all(keyShares.map((keyShare)=>this.decryptKeyShare({
@@ -1643,16 +1682,12 @@ class DynamicWalletClient {
             });
             return decryptedKeyShares;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in restoreBackupFromGoogleDrive';
-            const context = {
-                accountAddress
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
-            this.logger.error(message, {
-                error,
-                context
+            logError({
+                message: '[DynamicWaasWalletClient] Error in restoreBackupFromGoogleDrive',
+                error: error,
+                context: {
+                    accountAddress
+                }
             });
             throw error;
         }
@@ -1779,8 +1814,14 @@ class DynamicWalletClient {
                 signedSessionId
             });
         } catch (error) {
-            this.logger.error('Error in verifying password', error);
-            throw new Error('Incorrect password');
+            logError({
+                message: '[DynamicWaasWalletClient] Error in verifyPassword',
+                error: error,
+                context: {
+                    accountAddress
+                }
+            });
+            throw error;
         }
     }
     async isPasswordEncrypted({ accountAddress }) {
@@ -1839,15 +1880,12 @@ class DynamicWalletClient {
                 walletProperties: wallet == null ? void 0 : wallet.walletProperties
             });
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in getWalletClientKeyShareBackupInfo';
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, {
+            logError({
+                message: '[DynamicWaasWalletClient] Error in getWalletClientKeyShareBackupInfo',
+                error: error,
+                context: {
                     accountAddress
-                });
-            }
-            this.logger.error(message, {
-                error,
-                accountAddress
+                }
             });
             throw error;
         }
@@ -1910,17 +1948,15 @@ class DynamicWalletClient {
             }
             return this.walletMap[accountAddress];
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in getWallet';
-            const context = {
-                accountAddress,
-                walletOperation,
-                shareCount,
-                password,
-                signedSessionId
-            };
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, context);
-            }
+            logError({
+                message: '[DynamicWaasWalletClient] Error in getWallet',
+                error: error,
+                context: {
+                    accountAddress,
+                    walletOperation,
+                    shareCount
+                }
+            });
             throw error;
         }
     }
@@ -1958,12 +1994,10 @@ class DynamicWalletClient {
             }, {});
             return wallets;
         } catch (error) {
-            const message = '[DynamicWaasWalletClient] Error in getWallets';
-            if (error instanceof axios.AxiosError) {
-                handleAxiosError(error, message, {});
-            }
-            this.logger.error(message, {
-                error
+            logError({
+                message: '[DynamicWaasWalletClient] Error in getWallets',
+                error: error,
+                context: {}
             });
             throw error;
         }
@@ -1996,13 +2030,15 @@ class DynamicWalletClient {
         this.iframeDomain = core.IFRAME_DOMAIN_MAP[environment];
         // Generate unique instanceId when client is created
         this.instanceId = crypto.randomUUID();
+        // initialize logger context
+        this.initLoggerContext(authToken);
         // initialize the client
         this.initialize();
     }
 }
 
 const ERROR_KEYGEN_FAILED = '[DynamicWaasWalletClient]: Error with keygen';
-const ERROR_CREATE_WALLET_ACCOUNT = '[DynamicWaasWalletClient]: Error creating evm wallet account';
+const ERROR_CREATE_WALLET_ACCOUNT = '[DynamicWaasWalletClient]: Error creating wallet account';
 const ERROR_SIGN_MESSAGE = '[DynamicWaasWalletClient]: Error signing message';
 const ERROR_ACCOUNT_ADDRESS_REQUIRED = '[DynamicWaasWalletClient]: Account address is required';
 const ERROR_VERIFY_MESSAGE_SIGNATURE = '[DynamicWaasWalletClient]: Error verifying message signature';