@mocanetwork/airkit 1.6.0-beta.4 → 1.6.0

package/dist/airkit.umd.js

@@ -101,7 +101,7 @@
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
-    var version = "1.6.0-beta.4";
+    var version = "1.6.0";
     var airkitPackage = {
     	version: version};
 
@@ -112,6 +112,8 @@
       LOGIN_REQUEST: "air_auth_login_request",
       LOGIN_RESPONSE: "air_auth_login_response",
       LOGIN_SERVICE_RESPONSE: "air_auth_login_service_response",
+      UPDATE_SESSION_CONFIG_REQUEST: "air_auth_update_session_config_request",
+      UPDATE_SESSION_CONFIG_RESPONSE: "air_auth_update_session_config_response",
       USER_INFO_REQUEST: "air_auth_user_info_request",
       USER_INFO_RESPONSE: "air_auth_user_info_response",
       PARTNER_USER_INFO_REQUEST: "air_auth_partner_user_info_request",
@@ -145,6 +147,8 @@
       INITIALIZATION_REQUEST: "air_credential_initialization_request",
       INITIALIZATION_RESPONSE: "air_credential_initialization_response",
       CREDENTIAL_IFRAME_VISIBILITY_REQUEST: "air_credential_iframe_visibility_request",
+      UPDATE_SESSION_CONFIG_REQUEST: "air_credential_update_session_config_request",
+      UPDATE_SESSION_CONFIG_RESPONSE: "air_credential_update_session_config_response",
       LOGOUT_REQUEST: "air_credential_logout_request",
       LOGOUT_RESPONSE: "air_credential_logout_response",
       // New credential operation message types
@@ -161,6 +165,8 @@
       INITIALIZATION_RESPONSE: "air_recovery_initialization_response",
       RECOVERY_INITIALIZED: "air_recovery_initialized",
       RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request",
+      UPDATE_SESSION_CONFIG_REQUEST: "air_recovery_update_session_config_request",
+      UPDATE_SESSION_CONFIG_RESPONSE: "air_recovery_update_session_config_response",
       LOGOUT_REQUEST: "air_recovery_logout_request",
       LOGOUT_RESPONSE: "air_recovery_logout_response"
     };
@@ -172,6 +178,8 @@
       CLOSE_MODAL_REQUEST: "air_close_modal_request",
       CLOSE_MODAL_RESPONSE: "air_close_modal_response",
       WALLET_INITIALIZED: "air_wallet_initialized",
+      UPDATE_SESSION_CONFIG_REQUEST: "air_wallet_update_session_config_request",
+      UPDATE_SESSION_CONFIG_RESPONSE: "air_wallet_update_session_config_response",
       WALLET_LOGIN_REQUEST: "air_wallet_login_request",
       WALLET_LOGIN_RESPONSE: "air_wallet_login_response",
       SETUP_OR_UPDATE_MFA_REQUEST: "air_setup_mfa_request",
@@ -718,7 +726,7 @@
     class TransactionRejectedRpcError extends ProviderRpcError {
         constructor(message) {
             // Remove the "Version: viem@x.x.x" suffix if present
-            const cleanMessage = message.replace(/\nVersion:.*$/, '');
+            const cleanMessage = message.replace(/\nVersion:.*$/, "");
             super(cleanMessage);
             this.code = -32003;
             this.name = "TransactionRejectedRpcError";
@@ -1872,7 +1880,7 @@
             if (!loginResult) {
                 throw new UnauthorizedProviderError("User is not logged in");
             }
-            if (method === "eth_accounts" &&
+            if ((method === "eth_accounts" || method === "eth_requestAccounts") &&
                 !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this) &&
                 loginResult?.abstractAccountAddress) {
                 return [loginResult.abstractAccountAddress];
@@ -1938,6 +1946,7 @@
         AirAuthMessageTypes.SETUP_WALLET_REQUEST,
         AirAuthMessageTypes.SETUP_RECOVERY_REQUEST,
         AirAuthMessageTypes.LOGOUT_RESPONSE,
+        AirAuthMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE,
         AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE,
         AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE,
         AirAuthMessageTypes.PARTNER_ACCESS_TOKEN_RESPONSE,
@@ -1965,6 +1974,11 @@
             });
             return response;
         }
+        async sendUpdateSessionConfigRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE)));
+            await this.sendMessage({ type: AirAuthMessageTypes.UPDATE_SESSION_CONFIG_REQUEST, payload });
+            return response;
+        }
         async sendLoginRequest(payload) {
             const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.LOGIN_RESPONSE)));
             await this.sendMessage({ type: AirAuthMessageTypes.LOGIN_REQUEST, payload });
@@ -2038,6 +2052,7 @@
     const ALLOWED_CREDENTIAL_MESSAGES = [
         AirCredentialMessageTypes.INITIALIZATION_RESPONSE,
         AirCredentialMessageTypes.CREDENTIAL_IFRAME_VISIBILITY_REQUEST,
+        AirCredentialMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE,
         AirCredentialMessageTypes.LOGOUT_RESPONSE,
         AirCredentialMessageTypes.ISSUE_CREDENTIAL_RESPONSE,
         AirCredentialMessageTypes.VERIFY_CREDENTIAL_RESPONSE,
@@ -2063,6 +2078,14 @@
             });
             return response;
         }
+        async sendUpdateSessionConfigRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirCredentialMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE)));
+            await this.sendMessage({
+                type: AirCredentialMessageTypes.UPDATE_SESSION_CONFIG_REQUEST,
+                payload,
+            });
+            return response;
+        }
         async logout() {
             const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirCredentialMessageTypes.LOGOUT_RESPONSE)));
             await this.sendMessage({
@@ -2186,6 +2209,14 @@
         async onInitialized() {
             return firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.RECOVERY_INITIALIZED)));
         }
+        async sendUpdateSessionConfigRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE)));
+            await this.sendMessage({
+                type: AirRecoveryMessageTypes.UPDATE_SESSION_CONFIG_REQUEST,
+                payload,
+            });
+            return response;
+        }
         async logout() {
             const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.LOGOUT_RESPONSE)));
             await this.sendMessage({ type: AirRecoveryMessageTypes.LOGOUT_REQUEST });
@@ -2205,6 +2236,7 @@
     const ALLOWED_WALLET_MESSAGES = [
         AirWalletMessageTypes.INITIALIZATION_RESPONSE,
         AirWalletMessageTypes.WALLET_INITIALIZED,
+        AirWalletMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE,
         AirWalletMessageTypes.WALLET_LOGIN_RESPONSE,
         AirWalletMessageTypes.SETUP_OR_UPDATE_MFA_RESPONSE,
         AirWalletMessageTypes.SHOW_SWAP_UI_RESPONSE,
@@ -2256,6 +2288,11 @@
         onInitialized() {
             return firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirWalletMessageTypes.WALLET_INITIALIZED)));
         }
+        async sendUpdateSessionConfigRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirWalletMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE)));
+            await this.sendMessage({ type: AirWalletMessageTypes.UPDATE_SESSION_CONFIG_REQUEST, payload });
+            return response;
+        }
         async sendLoginRequest() {
             const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirWalletMessageTypes.WALLET_LOGIN_RESPONSE)));
             await this.sendMessage({
@@ -2463,7 +2500,7 @@
             ]);
             return (await response).data;
         }
-        async openAndInitializeWalletServiceWindow({ url, windowId, partnerId, enableLogging, onRetry, sdkVersion, enableAutomation, }) {
+        async openAndInitializeWalletServiceWindow({ url, windowId, sessionId, partnerId, enableLogging, onRetry, sdkVersion, enableAutomation, }) {
             if (this.windowControllers.has(windowId)) {
                 throw new Error("Window controller already exists");
             }
@@ -2481,6 +2518,7 @@
                             try {
                                 channel = new MessageChannel();
                                 const { payload } = await this.sendWindowInitializationRequest(windowId, {
+                                    sessionId,
                                     partnerId,
                                     enableLogging,
                                     sdkVersion,
@@ -2520,7 +2558,7 @@
     }
     var WindowService$1 = WindowService.instance;
 
-    var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_authMessagingService, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airAuthListener, _AirService_walletMessagingService, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_walletLoggedInResult, _AirService_airWalletProvider, _AirService_recoveryInitialization, _AirService_recoveryMessagingService, _AirService_recoveryIframeController, _AirService_credentialsInitialization, _AirService_credentialMessagingService, _AirService_credentialIframeController, _AirService_ensureCredential, _AirService_initializeCredentials, _AirService_subscribeToCredentialEvents, _AirService_cleanUpCredential, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_subscribeToWalletEvents, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_createWalletInitializedResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet, _AirService_ensureRecovery, _AirService_initializeRecovery, _AirService_subscribeToRecoveryEvents, _AirService_cleanUpRecovery;
+    var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_sessionId, _AirService_sessionConfig, _AirService_authMessagingService, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airEventListener, _AirService_walletMessagingService, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_walletLoggedInResult, _AirService_airWalletProvider, _AirService_recoveryInitialization, _AirService_recoveryMessagingService, _AirService_recoveryIframeController, _AirService_credentialsInitialization, _AirService_credentialMessagingService, _AirService_credentialIframeController, _AirService_assertInitialized, _AirService_assertLoggedIn, _AirService_ensureCredential, _AirService_initializeCredentials, _AirService_subscribeToCredentialEvents, _AirService_cleanUpCredential, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_subscribeToWalletEvents, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_createWalletInitializedResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet, _AirService_ensureRecovery, _AirService_initializeRecovery, _AirService_subscribeToRecoveryEvents, _AirService_cleanUpRecovery;
     const airKitVersion = airkitPackage.version;
     class AirService {
         constructor({ partnerId }) {
@@ -2529,11 +2567,13 @@
             _AirService_buildEnv.set(this, void 0);
             _AirService_enableLogging.set(this, false);
             _AirService_partnerId.set(this, void 0);
+            _AirService_sessionId.set(this, void 0);
+            _AirService_sessionConfig.set(this, void 0);
             //#modalZIndex: number; TODO implement z index overwrite
             _AirService_authMessagingService.set(this, void 0);
             _AirService_authIframeController.set(this, void 0);
             _AirService_isAuthInitialized.set(this, false);
-            _AirService_airAuthListener.set(this, []);
+            _AirService_airEventListener.set(this, []);
             _AirService_walletMessagingService.set(this, void 0);
             _AirService_walletIframeController.set(this, void 0);
             _AirService_walletInitialization.set(this, void 0);
@@ -2583,15 +2623,17 @@
         shouldEnableAutomation() {
             return localStorage.getItem("automation") === "true" && __classPrivateFieldGet(this, _AirService_buildEnv, "f") !== BUILD_ENV.PRODUCTION;
         }
-        async init({ buildEnv = BUILD_ENV.PRODUCTION, enableLogging = false, skipRehydration = false, }) {
+        async init({ buildEnv = BUILD_ENV.PRODUCTION, enableLogging = false, skipRehydration = false, sessionConfig = undefined, }) {
             if (!__classPrivateFieldGet(this, _AirService_partnerId, "f"))
-                throw new Error("Partner ID is required to initialize auth service");
+                throw new AirServiceError("CLIENT_ERROR", "Partner ID is required to initialize the service");
             if (__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                return;
+                return __classPrivateFieldGet(this, _AirService_loginResult, "f") ?? null;
             __classPrivateFieldSet(this, _AirService_buildEnv, buildEnv, "f");
             __classPrivateFieldSet(this, _AirService_enableLogging, enableLogging, "f");
+            __classPrivateFieldSet(this, _AirService_sessionConfig, sessionConfig, "f");
             const { authUrl } = AIR_URLS[buildEnv];
             configureLogLevel(buildEnv, enableLogging);
+            __classPrivateFieldSet(this, _AirService_sessionId, randomId(), "f");
             const authIframeOrigin = new URL(authUrl).origin;
             __classPrivateFieldSet(this, _AirService_authIframeController, new IframeController("air-auth", authUrl), "f");
             try {
@@ -2641,12 +2683,14 @@
                         if (ev.data === AirAuthMessageTypes.AUTH_SETUP_COMPLETED) {
                             window.removeEventListener("message", handleAuthMessage);
                             const { payload } = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendInitializationRequest({
+                                sessionId: __classPrivateFieldGet(this, _AirService_sessionId, "f"),
                                 partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                                 skipRehydration,
                                 partnerDAppUrl: window.location.href,
                                 sdkVersion: airKitVersion,
                                 enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                                 enableAutomation: this.shouldEnableAutomation(),
+                                sessionConfig,
                             });
                             if (payload.success === true) {
                                 resolve(payload);
@@ -2672,13 +2716,12 @@
             catch (error) {
                 log.debug("Error initializing auth service", error);
                 await this.cleanUp();
-                throw error;
+                throw AirServiceError.from(error);
             }
             return null;
         }
         async login(options) {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
             if (__classPrivateFieldGet(this, _AirService_loginResult, "f"))
                 return __classPrivateFieldGet(this, _AirService_loginResult, "f");
             const { payload } = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendLoginRequest({
@@ -2695,38 +2738,24 @@
          * @experimental This method is experimental and will change in the future.
          */
         async deploySmartAccount() {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
-            try {
-                log.info("deploySmartAccount");
-                const { payload } = await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendDeploySmartAccountRequest();
-                if (payload.success === false) {
-                    throw new AirServiceError(payload.errorName, payload.errorMessage);
-                }
-                return { txHash: payload.txHash };
-            }
-            catch (error) {
-                throw AirServiceError.from(error);
+            log.info("deploySmartAccount");
+            const { payload } = await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendDeploySmartAccountRequest();
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
             }
+            return { txHash: payload.txHash };
         }
         /**
          * @experimental This method is experimental and will change in the future.
          */
         async isSmartAccountDeployed() {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
-            try {
-                const { payload } = await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendIsSmartAccountDeployedRequest();
-                if (payload.success === false) {
-                    throw new AirServiceError(payload.errorName, payload.errorMessage);
-                }
-                return payload.isDeployed;
-            }
-            catch (error) {
-                throw AirServiceError.from(error);
+            const { payload } = await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendIsSmartAccountDeployedRequest();
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
             }
+            return payload.isDeployed;
         }
         getProvider() {
             return this.provider;
@@ -2778,8 +2807,7 @@
             }
         }
         async getUserInfo() {
-            if (!this.isLoggedIn)
-                throw new Error("User not logged in");
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
             const info = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
             if (info.payload.success === false) {
                 throw new AirServiceError(info.payload.errorName, info.payload.errorMessage);
@@ -2796,11 +2824,37 @@
                 },
             };
         }
+        async updateSessionConfig(config) {
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
+            __classPrivateFieldSet(this, _AirService_sessionConfig, config, "f");
+            const resultsPromise = [__classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendUpdateSessionConfigRequest(config)];
+            if (__classPrivateFieldGet(this, _AirService_walletInitialization, "f")) {
+                resultsPromise.push(__classPrivateFieldGet(this, _AirService_walletInitialization, "f")
+                    .then(() => __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendUpdateSessionConfigRequest(config))
+                    .catch(() => null));
+            }
+            if (__classPrivateFieldGet(this, _AirService_recoveryInitialization, "f")) {
+                resultsPromise.push(__classPrivateFieldGet(this, _AirService_recoveryInitialization, "f")
+                    .then(() => __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendUpdateSessionConfigRequest(config))
+                    .catch(() => null));
+            }
+            if (__classPrivateFieldGet(this, _AirService_credentialsInitialization, "f")) {
+                resultsPromise.push(__classPrivateFieldGet(this, _AirService_credentialsInitialization, "f")
+                    .then(() => __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").sendUpdateSessionConfigRequest(config))
+                    .catch(() => null));
+            }
+            const results = await Promise.all(resultsPromise);
+            for (const result of results) {
+                if (result && result.payload.success === false) {
+                    throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
+                }
+            }
+            const sessionConfig = { locale: results[0].payload.locale };
+            __classPrivateFieldSet(this, _AirService_sessionConfig, sessionConfig, "f");
+            return sessionConfig;
+        }
         async goToPartner(partnerUrl) {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
-            if (!this.isLoggedIn)
-                throw new Error("No active session to generate token");
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
             const result = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendCrossPartnerTokenRequest(partnerUrl);
             if (result.payload.success === false) {
                 throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
@@ -2810,35 +2864,24 @@
             };
         }
         async startRecovery(payload) {
-            try {
-                const result = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendAccountRecoveryRequest(payload);
-                if (result.payload.success === false) {
-                    throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
-                }
-            }
-            catch (error) {
-                throw AirServiceError.from(error);
+            const result = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendAccountRecoveryRequest(payload);
+            if (result.payload.success === false) {
+                throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
             }
         }
         async getAccessToken() {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
-            if (!this.isLoggedIn)
-                throw new Error("No active session to get partner access token");
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
             const result = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendPartnerAccessTokenRequest();
             if (result.payload.success !== true) {
                 throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
             }
             if (!result.payload.partnerAccessToken) {
-                throw new Error("Partner access token not found in response");
+                throw new AirServiceError("UNAUTHORIZED", "Partner access token not found in response");
             }
             return { token: result.payload.partnerAccessToken };
         }
         async logout() {
-            if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
-                throw new Error("Service is not initialized");
-            if (!this.isLoggedIn)
-                throw new Error("No active session to logout");
+            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
             // Clear up credentials first to avoid issues with wallet and auth messaging services
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpCredential).call(this);
             await Promise.all([
@@ -2850,33 +2893,21 @@
             __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerAirAuthLoggedOut).call(this);
         }
         async cleanUp() {
+            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpCredential).call(this);
+            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpRecovery).call(this);
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpAuth).call(this);
-            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpRecovery).call(this);
-            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpCredential).call(this);
-            this.clearEventListeners();
+            __classPrivateFieldSet(this, _AirService_airEventListener, [], "f");
+            __classPrivateFieldSet(this, _AirService_sessionId, undefined, "f");
+            __classPrivateFieldSet(this, _AirService_buildEnv, undefined, "f");
         }
-        /**
-         * Register an event listener for Air service events.
-         *
-         * Available events:
-         * - "initialized": Service initialization completed
-         * - "logged_in": User successfully logged in
-         * - "logged_out": User logged out
-         * - "wallet_initialized": Wallet initialization completed
-         *
-         * @param listener The event listener function
-         */
         on(listener) {
-            if (__classPrivateFieldGet(this, _AirService_airAuthListener, "f").indexOf(listener) < 0)
-                __classPrivateFieldGet(this, _AirService_airAuthListener, "f").push(listener);
+            if (__classPrivateFieldGet(this, _AirService_airEventListener, "f").indexOf(listener) < 0)
+                __classPrivateFieldGet(this, _AirService_airEventListener, "f").push(listener);
         }
         off(listener) {
-            if (__classPrivateFieldGet(this, _AirService_airAuthListener, "f").indexOf(listener) >= 0)
-                __classPrivateFieldGet(this, _AirService_airAuthListener, "f").splice(__classPrivateFieldGet(this, _AirService_airAuthListener, "f").indexOf(listener), 1);
-        }
-        clearEventListeners() {
-            __classPrivateFieldSet(this, _AirService_airAuthListener, [], "f");
+            if (__classPrivateFieldGet(this, _AirService_airEventListener, "f").indexOf(listener) >= 0)
+                __classPrivateFieldGet(this, _AirService_airEventListener, "f").splice(__classPrivateFieldGet(this, _AirService_airEventListener, "f").indexOf(listener), 1);
         }
         async preloadCredential() {
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredential).call(this);
@@ -2909,9 +2940,15 @@
             return payload.verificationResult;
         }
     }
-    _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_authMessagingService = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airAuthListener = new WeakMap(), _AirService_walletMessagingService = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_walletLoggedInResult = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_recoveryInitialization = new WeakMap(), _AirService_recoveryMessagingService = new WeakMap(), _AirService_recoveryIframeController = new WeakMap(), _AirService_credentialsInitialization = new WeakMap(), _AirService_credentialMessagingService = new WeakMap(), _AirService_credentialIframeController = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_ensureCredential = async function _AirService_ensureCredential() {
-        if (!this.isInitialized)
-            throw new Error("Service not initialized");
+    _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_sessionId = new WeakMap(), _AirService_sessionConfig = new WeakMap(), _AirService_authMessagingService = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airEventListener = new WeakMap(), _AirService_walletMessagingService = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_walletLoggedInResult = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_recoveryInitialization = new WeakMap(), _AirService_recoveryMessagingService = new WeakMap(), _AirService_recoveryIframeController = new WeakMap(), _AirService_credentialsInitialization = new WeakMap(), _AirService_credentialMessagingService = new WeakMap(), _AirService_credentialIframeController = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_assertInitialized = function _AirService_assertInitialized() {
+        if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
+            throw new AirServiceError("NOT_INITIALIZED", "Service is not initialized");
+    }, _AirService_assertLoggedIn = function _AirService_assertLoggedIn() {
+        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
+        if (!this.isLoggedIn)
+            throw new AirServiceError("NOT_LOGGED_IN", "User not logged in");
+    }, _AirService_ensureCredential = async function _AirService_ensureCredential() {
+        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
         void __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
         try {
             if (!__classPrivateFieldGet(this, _AirService_credentialsInitialization, "f"))
@@ -2921,11 +2958,11 @@
         catch (error) {
             __classPrivateFieldSet(this, _AirService_credentialsInitialization, null, "f");
             log.error("Error ensuring credentials", error);
-            throw error;
+            throw AirServiceError.from(error);
         }
     }, _AirService_initializeCredentials = async function _AirService_initializeCredentials() {
         if (__classPrivateFieldGet(this, _AirService_credentialsInitialization, "f")) {
-            throw new Error("Already initializing credentials");
+            throw new AirServiceError("ALREADY_INITIALIZING", "Already initializing credentials");
         }
         const { credentialUrl } = AIR_URLS[__classPrivateFieldGet(this, _AirService_buildEnv, "f")];
         const credentialIframeOrigin = new URL(credentialUrl).origin;
@@ -2938,11 +2975,13 @@
                     if (ev.data === AirCredentialMessageTypes.SERVICE_STARTED) {
                         window.removeEventListener("message", handleCredentialMessage);
                         const { payload } = await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").sendInitializationRequest({
+                            sessionId: __classPrivateFieldGet(this, _AirService_sessionId, "f"),
                             partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                             enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                             sdkVersion: airKitVersion,
                             partnerDAppUrl: window.location.href,
                             enableAutomation: this.shouldEnableAutomation(),
+                            sessionConfig: __classPrivateFieldGet(this, _AirService_sessionConfig, "f"),
                         });
                         if (payload.success === true) {
                             resolve();
@@ -2970,7 +3009,7 @@
             if (closeDApp) {
                 window.close();
             }
-            throw error;
+            throw AirServiceError.from(error);
         }
     }, _AirService_subscribeToCredentialEvents = function _AirService_subscribeToCredentialEvents() {
         __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").messages$.subscribe(async (message) => {
@@ -2995,8 +3034,7 @@
         await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").close();
         __classPrivateFieldSet(this, _AirService_credentialsInitialization, undefined, "f");
     }, _AirService_ensureWallet = async function _AirService_ensureWallet(option) {
-        if (!this.isInitialized)
-            throw new Error("Service not initialized");
+        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
         if (!__classPrivateFieldGet(this, _AirService_walletInitialization, "f"))
             __classPrivateFieldSet(this, _AirService_walletInitialization, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_initializeWallet).call(this, option), "f");
         if (__classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f"))
@@ -3010,7 +3048,7 @@
         catch (error) {
             __classPrivateFieldSet(this, _AirService_walletInitialization, null, "f");
             log.error("Error initializing wallet", error);
-            throw error;
+            throw AirServiceError.from(error);
         }
         if (__classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f"))
             return __classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f");
@@ -3021,7 +3059,7 @@
         return __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_createWalletInitializedResult).call(this, walletLoginResult.payload);
     }, _AirService_initializeWallet = async function _AirService_initializeWallet(option) {
         if (__classPrivateFieldGet(this, _AirService_walletInitialization, "f"))
-            throw new Error("Already initializing");
+            throw new AirServiceError("ALREADY_INITIALIZING", "Already initializing");
         const { walletUrl } = AIR_URLS[__classPrivateFieldGet(this, _AirService_buildEnv, "f")];
         const walletIframeOrigin = new URL(walletUrl).origin;
         try {
@@ -3032,10 +3070,12 @@
                     if (ev.data === AirWalletMessageTypes.SERVICE_STARTED) {
                         window.removeEventListener("message", handleWalletMessage);
                         const { payload } = await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").sendInitializationRequest({
+                            sessionId: __classPrivateFieldGet(this, _AirService_sessionId, "f"),
                             partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                             enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                             sdkVersion: airKitVersion,
                             enableAutomation: this.shouldEnableAutomation(),
+                            sessionConfig: __classPrivateFieldGet(this, _AirService_sessionConfig, "f"),
                         });
                         if (payload.success === true) {
                             resolve();
@@ -3071,7 +3111,7 @@
         catch (error) {
             log.error("Error initializing wallet", error);
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
-            throw error;
+            throw AirServiceError.from(error);
         }
     }, _AirService_subscribeToWalletEvents = function _AirService_subscribeToWalletEvents() {
         __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").messages$.subscribe(async (msg) => {
@@ -3100,6 +3140,7 @@
                         const { windowController, port } = await WindowService$1.openAndInitializeWalletServiceWindow({
                             url: msg.payload.url,
                             windowId: msg.payload.windowId,
+                            sessionId: __classPrivateFieldGet(this, _AirService_sessionId, "f"),
                             partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                             enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                             sdkVersion: airKitVersion,
@@ -3118,7 +3159,7 @@
             }
         });
     }, _AirService_triggerEventListeners = function _AirService_triggerEventListeners(data) {
-        __classPrivateFieldGet(this, _AirService_airAuthListener, "f").forEach((listener) => {
+        __classPrivateFieldGet(this, _AirService_airEventListener, "f").forEach((listener) => {
             listener(data);
         });
     }, _AirService_triggerAirAuthInitialized = function _AirService_triggerAirAuthInitialized(result) {
@@ -3181,8 +3222,7 @@
         __classPrivateFieldSet(this, _AirService_walletLoggedInResult, undefined, "f");
         __classPrivateFieldSet(this, _AirService_walletInitialization, undefined, "f");
     }, _AirService_ensureRecovery = async function _AirService_ensureRecovery() {
-        if (!this.isInitialized)
-            throw new Error("Service not initialized");
+        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertInitialized).call(this);
         if (!__classPrivateFieldGet(this, _AirService_recoveryInitialization, "f")) {
             __classPrivateFieldSet(this, _AirService_recoveryInitialization, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_initializeRecovery).call(this), "f");
         }
@@ -3192,11 +3232,11 @@
         catch (error) {
             __classPrivateFieldSet(this, _AirService_recoveryInitialization, null, "f");
             log.error("Error initializing recovery", error);
-            throw error;
+            throw AirServiceError.from(error);
         }
     }, _AirService_initializeRecovery = async function _AirService_initializeRecovery() {
         if (__classPrivateFieldGet(this, _AirService_recoveryInitialization, "f"))
-            throw new Error("Already initializing");
+            throw new AirServiceError("ALREADY_INITIALIZING", "Already initializing");
         const { recoveryUrl } = AIR_URLS[__classPrivateFieldGet(this, _AirService_buildEnv, "f")];
         const recoveryIframeOrigin = new URL(recoveryUrl).origin;
         try {
@@ -3207,10 +3247,12 @@
                     if (ev.data === AirRecoveryMessageTypes.SERVICE_STARTED) {
                         window.removeEventListener("message", handleRecoveryMessage);
                         const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendInitializationRequest({
+                            sessionId: __classPrivateFieldGet(this, _AirService_sessionId, "f"),
                             partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                             enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                             sdkVersion: airKitVersion,
                             enableAutomation: this.shouldEnableAutomation(),
+                            sessionConfig: __classPrivateFieldGet(this, _AirService_sessionConfig, "f"),
                         });
                         if (payload.success === true) {
                             resolve();
@@ -3234,7 +3276,7 @@
         catch (error) {
             log.error("Error initializing recovery", error);
             await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpRecovery).call(this);
-            throw error;
+            throw AirServiceError.from(error);
         }
     }, _AirService_subscribeToRecoveryEvents = function _AirService_subscribeToRecoveryEvents() {
         __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").messages$.subscribe(async (message) => {

package/dist/types/airService.d.ts

@@ -1,5 +1,5 @@
 import { AirAuthStartRecoveryRequestPayload } from "@mocanetwork/common/src/air/messaging/auth";
-import { AirEventListener, AirLoginResult, AirUserDetails, BUILD_ENV_TYPE, ClaimAirIdOptions, ClaimAirIdResult, CredentialVerificationResult, EIP1193Provider } from "./interfaces";
+import { AirEventListener, AirLoginResult, AirSessionConfig, AirUserDetails, BUILD_ENV_TYPE, ClaimAirIdOptions, ClaimAirIdResult, CredentialVerificationResult, EIP1193Provider } from "./interfaces";
 declare class AirService {
     #private;
     constructor({ partnerId }: {
@@ -13,11 +13,11 @@ declare class AirService {
     get isWalletInitialized(): boolean;
     get provider(): EIP1193Provider;
     private shouldEnableAutomation;
-    init({ buildEnv, enableLogging, skipRehydration, }: {
+    init({ buildEnv, enableLogging, skipRehydration, sessionConfig, }: {
         buildEnv: BUILD_ENV_TYPE;
         enableLogging: boolean;
         skipRehydration: boolean;
-        preloadWallet?: boolean;
+        sessionConfig?: Partial<AirSessionConfig>;
     }): Promise<AirLoginResult | null>;
     login(options?: {
         authToken?: string;
@@ -53,6 +53,7 @@ declare class AirService {
         targetCurrencyCode?: string;
     }): Promise<void>;
     getUserInfo(): Promise<AirUserDetails>;
+    updateSessionConfig(config: Partial<AirSessionConfig>): Promise<AirSessionConfig>;
     goToPartner(partnerUrl: string): Promise<{
         urlWithToken: string;
     }>;
@@ -62,20 +63,8 @@ declare class AirService {
     }>;
     logout(): Promise<void>;
     cleanUp(): Promise<void>;
-    /**
-     * Register an event listener for Air service events.
-     *
-     * Available events:
-     * - "initialized": Service initialization completed
-     * - "logged_in": User successfully logged in
-     * - "logged_out": User logged out
-     * - "wallet_initialized": Wallet initialization completed
-     *
-     * @param listener The event listener function
-     */
     on(listener: AirEventListener): void;
     off(listener: AirEventListener): void;
-    clearEventListeners(): void;
     preloadCredential(): Promise<void>;
     issueCredential({ authToken, issuerDid, credentialId, credentialSubject, }: {
         authToken: string;