@web3auth/no-modal 8.7.0 → 8.9.1

package/dist/noModal.cjs.js

@@ -130,7 +130,8 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
     try {
       projectConfig = await (0,base_namespaceObject.fetchProjectConfig)(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
     } catch (e) {
-      throw base_namespaceObject.WalletInitializationError.notReady("failed to fetch project configurations");
+      base_namespaceObject.log.error("Failed to fetch project configurations", e);
+      throw base_namespaceObject.WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
     const initPromises = Object.keys(this.walletAdapters).map(async adapterName => {
       this.subscribeToAdapterEvents(this.walletAdapters[adapterName]);
@@ -294,9 +295,15 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
     return this.walletAdapters[this.connectedAdapterName].authenticateUser();
   }
   addPlugin(plugin) {
-    if (this.plugins[plugin.name]) throw new Error(`Plugin ${plugin.name} already exist`);
-    if (plugin.pluginNamespace !== base_namespaceObject.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.coreOptions.chainConfig.chainNamespace) throw new Error(`This plugin belongs to ${plugin.pluginNamespace} namespace which is incompatible with currently used namespace: ${this.coreOptions.chainConfig.chainNamespace}`);
+    if (this.plugins[plugin.name]) throw base_namespaceObject.WalletInitializationError.duplicateAdapterError(`Plugin ${plugin.name} already exist`);
+    if (plugin.pluginNamespace !== base_namespaceObject.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.coreOptions.chainConfig.chainNamespace) throw base_namespaceObject.WalletInitializationError.incompatibleChainNameSpace(`This plugin belongs to ${plugin.pluginNamespace} namespace which is incompatible with currently used namespace: ${this.coreOptions.chainConfig.chainNamespace}`);
     this.plugins[plugin.name] = plugin;
+    if (this.status === base_namespaceObject.ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) {
+      // web3auth is already connected. can initialize plugins
+      this.connectToPlugins({
+        adapter: this.connectedAdapterName
+      });
+    }
     return this;
   }
   getPlugin(name) {
@@ -313,32 +320,7 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
       this.connectedAdapterName = data.adapter;
       this.cacheWallet(data.adapter);
       base_namespaceObject.log.debug("connected", this.status, this.connectedAdapterName);
-      Object.values(this.plugins).map(async plugin => {
-        try {
-          if (!plugin.SUPPORTED_ADAPTERS.includes(data.adapter)) {
-            return;
-          }
-          const {
-            openloginInstance
-          } = this.walletAdapters[this.connectedAdapterName];
-          const {
-            options,
-            sessionId,
-            sessionNamespace
-          } = openloginInstance || {};
-          await plugin.initWithWeb3Auth(this, options.whiteLabel);
-          await plugin.connect({
-            sessionId,
-            sessionNamespace
-          });
-        } catch (error) {
-          // swallow error if connector adapter doesn't supports this plugin.
-          if (error.code === 5211) {
-            return;
-          }
-          base_namespaceObject.log.error(error);
-        }
-      });
+      this.connectToPlugins(data);
       this.emit(base_namespaceObject.ADAPTER_EVENTS.CONNECTED, objectSpread2_default()({}, data));
     });
     walletAdapter.on(base_namespaceObject.ADAPTER_EVENTS.DISCONNECTED, async data => {
@@ -396,6 +378,35 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
     window[this.storage].setItem(ADAPTER_CACHE_KEY, walletName);
     this.cachedAdapter = walletName;
   }
+  connectToPlugins(data) {
+    Object.values(this.plugins).map(async plugin => {
+      try {
+        if (!plugin.SUPPORTED_ADAPTERS.includes(data.adapter)) {
+          return;
+        }
+        if (plugin.status === base_namespaceObject.PLUGIN_STATUS.CONNECTED) return;
+        const {
+          openloginInstance
+        } = this.walletAdapters[this.connectedAdapterName];
+        const {
+          options,
+          sessionId,
+          sessionNamespace
+        } = openloginInstance || {};
+        await plugin.initWithWeb3Auth(this, options.whiteLabel);
+        await plugin.connect({
+          sessionId,
+          sessionNamespace
+        });
+      } catch (error) {
+        // swallow error if connector adapter doesn't supports this plugin.
+        if (error.code === 5211) {
+          return;
+        }
+        base_namespaceObject.log.error(error);
+      }
+    });
+  }
 }
 ;// CONCATENATED MODULE: ./src/index.ts
 

package/dist/noModal.esm.js

@@ -1,7 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@toruslabs/openlogin-jrpc';
-import { ADAPTER_STATUS, WalletInitializationError, log, CHAIN_NAMESPACES, storageAvailable, getChainConfig, fetchProjectConfig, WALLET_ADAPTERS, ADAPTER_EVENTS, ADAPTER_NAMESPACES, WalletLoginError, PLUGIN_NAMESPACES } from '@web3auth/base';
+import { ADAPTER_STATUS, WalletInitializationError, log, CHAIN_NAMESPACES, storageAvailable, getChainConfig, fetchProjectConfig, WALLET_ADAPTERS, ADAPTER_EVENTS, ADAPTER_NAMESPACES, WalletLoginError, PLUGIN_NAMESPACES, PLUGIN_STATUS } from '@web3auth/base';
 import { CommonJRPCProvider } from '@web3auth/base-provider';
 import { LOGIN_PROVIDER } from '@web3auth/openlogin-adapter';
 import clonedeep from 'lodash.clonedeep';
@@ -54,7 +54,8 @@ class Web3AuthNoModal extends SafeEventEmitter {
     try {
       projectConfig = await fetchProjectConfig(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
     } catch (e) {
-      throw WalletInitializationError.notReady("failed to fetch project configurations");
+      log.error("Failed to fetch project configurations", e);
+      throw WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
     const initPromises = Object.keys(this.walletAdapters).map(async adapterName => {
       this.subscribeToAdapterEvents(this.walletAdapters[adapterName]);
@@ -218,9 +219,15 @@ class Web3AuthNoModal extends SafeEventEmitter {
     return this.walletAdapters[this.connectedAdapterName].authenticateUser();
   }
   addPlugin(plugin) {
-    if (this.plugins[plugin.name]) throw new Error(`Plugin ${plugin.name} already exist`);
-    if (plugin.pluginNamespace !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.coreOptions.chainConfig.chainNamespace) throw new Error(`This plugin belongs to ${plugin.pluginNamespace} namespace which is incompatible with currently used namespace: ${this.coreOptions.chainConfig.chainNamespace}`);
+    if (this.plugins[plugin.name]) throw WalletInitializationError.duplicateAdapterError(`Plugin ${plugin.name} already exist`);
+    if (plugin.pluginNamespace !== PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== this.coreOptions.chainConfig.chainNamespace) throw WalletInitializationError.incompatibleChainNameSpace(`This plugin belongs to ${plugin.pluginNamespace} namespace which is incompatible with currently used namespace: ${this.coreOptions.chainConfig.chainNamespace}`);
     this.plugins[plugin.name] = plugin;
+    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName) {
+      // web3auth is already connected. can initialize plugins
+      this.connectToPlugins({
+        adapter: this.connectedAdapterName
+      });
+    }
     return this;
   }
   getPlugin(name) {
@@ -237,32 +244,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
       this.connectedAdapterName = data.adapter;
       this.cacheWallet(data.adapter);
       log.debug("connected", this.status, this.connectedAdapterName);
-      Object.values(this.plugins).map(async plugin => {
-        try {
-          if (!plugin.SUPPORTED_ADAPTERS.includes(data.adapter)) {
-            return;
-          }
-          const {
-            openloginInstance
-          } = this.walletAdapters[this.connectedAdapterName];
-          const {
-            options,
-            sessionId,
-            sessionNamespace
-          } = openloginInstance || {};
-          await plugin.initWithWeb3Auth(this, options.whiteLabel);
-          await plugin.connect({
-            sessionId,
-            sessionNamespace
-          });
-        } catch (error) {
-          // swallow error if connector adapter doesn't supports this plugin.
-          if (error.code === 5211) {
-            return;
-          }
-          log.error(error);
-        }
-      });
+      this.connectToPlugins(data);
       this.emit(ADAPTER_EVENTS.CONNECTED, _objectSpread({}, data));
     });
     walletAdapter.on(ADAPTER_EVENTS.DISCONNECTED, async data => {
@@ -320,6 +302,35 @@ class Web3AuthNoModal extends SafeEventEmitter {
     window[this.storage].setItem(ADAPTER_CACHE_KEY, walletName);
     this.cachedAdapter = walletName;
   }
+  connectToPlugins(data) {
+    Object.values(this.plugins).map(async plugin => {
+      try {
+        if (!plugin.SUPPORTED_ADAPTERS.includes(data.adapter)) {
+          return;
+        }
+        if (plugin.status === PLUGIN_STATUS.CONNECTED) return;
+        const {
+          openloginInstance
+        } = this.walletAdapters[this.connectedAdapterName];
+        const {
+          options,
+          sessionId,
+          sessionNamespace
+        } = openloginInstance || {};
+        await plugin.initWithWeb3Auth(this, options.whiteLabel);
+        await plugin.connect({
+          sessionId,
+          sessionNamespace
+        });
+      } catch (error) {
+        // swallow error if connector adapter doesn't supports this plugin.
+        if (error.code === 5211) {
+          return;
+        }
+        log.error(error);
+      }
+    });
+  }
 }
 
 export { Web3AuthNoModal };