@polkadot/extension-dapp 0.43.2 → 0.43.3-2

package/bundle-polkadot-extension-dapp.js

@@ -20,7 +20,7 @@
     name: '@polkadot/extension-dapp',
     path: (({ url: (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href)) }) && (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))) ? new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))).pathname.substring(0, new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))).pathname.lastIndexOf('/') + 1) : 'auto',
     type: 'esm',
-    version: '0.43.2'
+    version: '0.43.3-2'
   };
 
   const unwrapBytes = util.u8aUnwrapBytes;
@@ -92,6 +92,7 @@
   }
   async function web3Accounts({
     accountType,
+    extensions,
     ss58Format
   } = {}) {
     if (!exports.web3EnablePromise) {
@@ -99,7 +100,9 @@
     }
     const accounts = [];
     const injected = await exports.web3EnablePromise;
-    const retrieved = await Promise.all(injected.map(async ({
+    const retrieved = await Promise.all(injected.filter(({
+      name: source
+    }) => !extensions || extensions.includes(source)).map(async ({
       accounts,
       name: source
     }) => {
@@ -122,6 +125,7 @@
     return accounts;
   }
   async function web3AccountsSubscribe(cb, {
+    extensions,
     ss58Format
   } = {}) {
     if (!exports.web3EnablePromise) {
@@ -132,14 +136,21 @@
       result.push(...mapAccounts(source, list, ss58Format));
       return result;
     }, []));
-    const unsubs = (await exports.web3EnablePromise).map(({
+    const unsubs = (await exports.web3EnablePromise).filter(({
+      name: source
+    }) => !extensions || extensions.includes(source)).map(({
       accounts: {
         subscribe
       },
       name: source
     }) => subscribe(result => {
       accounts[source] = result;
-      triggerUpdate();
+      try {
+        var _triggerUpdate;
+        (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+      } catch (error) {
+        console.error(error);
+      }
     }));
     return () => {
       unsubs.forEach(unsub => {

package/bundle.d.ts

@@ -5,8 +5,8 @@ declare let isWeb3Injected: boolean;
 declare let web3EnablePromise: Promise<InjectedExtension[]> | null;
 export { isWeb3Injected, web3EnablePromise };
 export declare function web3Enable(originName: string, compatInits?: (() => Promise<boolean>)[]): Promise<InjectedExtension[]>;
-export declare function web3Accounts({ accountType, ss58Format }?: Web3AccountsOptions): Promise<InjectedAccountWithMeta[]>;
-export declare function web3AccountsSubscribe(cb: (accounts: InjectedAccountWithMeta[]) => void | Promise<void>, { ss58Format }?: Web3AccountsOptions): Promise<Unsubcall>;
+export declare function web3Accounts({ accountType, extensions, ss58Format }?: Web3AccountsOptions): Promise<InjectedAccountWithMeta[]>;
+export declare function web3AccountsSubscribe(cb: (accounts: InjectedAccountWithMeta[]) => void | Promise<void>, { extensions, ss58Format }?: Web3AccountsOptions): Promise<Unsubcall>;
 export declare function web3FromSource(source: string): Promise<InjectedExtension>;
 export declare function web3FromAddress(address: string): Promise<InjectedExtension>;
 export declare function web3ListRpcProviders(source: string): Promise<ProviderList | null>;

package/bundle.js

@@ -90,6 +90,7 @@ export function web3Enable(originName, compatInits = []) {
 
 export async function web3Accounts({
   accountType,
+  extensions,
   ss58Format
 } = {}) {
   if (!web3EnablePromise) {
@@ -98,7 +99,9 @@ export async function web3Accounts({
 
   const accounts = [];
   const injected = await web3EnablePromise;
-  const retrieved = await Promise.all(injected.map(async ({
+  const retrieved = await Promise.all(injected.filter(({
+    name: source
+  }) => !extensions || extensions.includes(source)).map(async ({
     accounts,
     name: source
   }) => {
@@ -122,6 +125,7 @@ export async function web3Accounts({
   return accounts;
 }
 export async function web3AccountsSubscribe(cb, {
+  extensions,
   ss58Format
 } = {}) {
   if (!web3EnablePromise) {
@@ -135,15 +139,23 @@ export async function web3AccountsSubscribe(cb, {
     return result;
   }, []));
 
-  const unsubs = (await web3EnablePromise).map(({
+  const unsubs = (await web3EnablePromise).filter(({
+    name: source
+  }) => !extensions || extensions.includes(source)).map(({
     accounts: {
       subscribe
     },
     name: source
   }) => subscribe(result => {
-    accounts[source] = result; // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    accounts[source] = result;
+
+    try {
+      var _triggerUpdate;
 
-    triggerUpdate();
+      (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+    } catch (error) {
+      console.error(error);
+    }
   }));
   return () => {
     unsubs.forEach(unsub => {

package/cjs/bundle.js

@@ -144,6 +144,7 @@ function web3Enable(originName) {
 async function web3Accounts() {
   let {
     accountType,
+    extensions,
     ss58Format
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -153,18 +154,23 @@ async function web3Accounts() {
 
   const accounts = [];
   const injected = await web3EnablePromise;
-  const retrieved = await Promise.all(injected.map(async _ref5 => {
+  const retrieved = await Promise.all(injected.filter(_ref5 => {
     let {
-      accounts,
       name: source
     } = _ref5;
+    return !extensions || extensions.includes(source);
+  }).map(async _ref6 => {
+    let {
+      accounts,
+      name: source
+    } = _ref6;
 
     try {
       const list = await accounts.get();
-      return mapAccounts(source, list.filter(_ref6 => {
+      return mapAccounts(source, list.filter(_ref7 => {
         let {
           type
-        } = _ref6;
+        } = _ref7;
         return type && accountType ? accountType.includes(type) : true;
       }), ss58Format);
     } catch (error) {
@@ -175,10 +181,10 @@ async function web3Accounts() {
   retrieved.forEach(result => {
     accounts.push(...result);
   });
-  const addresses = accounts.map(_ref7 => {
+  const addresses = accounts.map(_ref8 => {
     let {
       address
-    } = _ref7;
+    } = _ref8;
     return address;
   });
   console.log(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}: ${addresses.join(', ')}`);
@@ -187,6 +193,7 @@ async function web3Accounts() {
 
 async function web3AccountsSubscribe(cb) {
   let {
+    extensions,
     ss58Format
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -196,23 +203,34 @@ async function web3AccountsSubscribe(cb) {
 
   const accounts = {};
 
-  const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, _ref8) => {
-    let [source, list] = _ref8;
+  const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, _ref9) => {
+    let [source, list] = _ref9;
     result.push(...mapAccounts(source, list, ss58Format));
     return result;
   }, []));
 
-  const unsubs = (await web3EnablePromise).map(_ref9 => {
+  const unsubs = (await web3EnablePromise).filter(_ref10 => {
+    let {
+      name: source
+    } = _ref10;
+    return !extensions || extensions.includes(source);
+  }).map(_ref11 => {
     let {
       accounts: {
         subscribe
       },
       name: source
-    } = _ref9;
+    } = _ref11;
     return subscribe(result => {
-      accounts[source] = result; // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      accounts[source] = result;
 
-      triggerUpdate();
+      try {
+        var _triggerUpdate;
+
+        (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+      } catch (error) {
+        console.error(error);
+      }
     });
   });
   return () => {
@@ -229,10 +247,10 @@ async function web3FromSource(source) {
   }
 
   const sources = await web3EnablePromise;
-  const found = source && sources.find(_ref10 => {
+  const found = source && sources.find(_ref12 => {
     let {
       name
-    } = _ref10;
+    } = _ref12;
     return name === source;
   });
 

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/extension-dapp',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.43.2'
+  version: '0.43.3-2'
 };
 exports.packageInfo = packageInfo;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.43.2",
+  "version": "0.43.3-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/extension-inject": "^0.43.2",
+    "@polkadot/extension-inject": "^0.43.3-2",
     "@polkadot/util": "^9.2.1",
     "@polkadot/util-crypto": "^9.2.1"
   },

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/extension-dapp',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '0.43.2'
+  version: '0.43.3-2'
 };