@w3ux/observables-connect 0.11.3 → 0.12.0

package/accounts/index.cjs

@@ -73,7 +73,7 @@ var processExtensionAccounts = (config, signer, newAccounts) => {
   newAccounts = formatExtensionAccounts(newAccounts, ss58);
   const removedAccounts = _extensionAccounts.getValue().filter((j) => j.source === source).filter((j) => !newAccounts.find((i) => i.address === j.address));
   newAccounts = newAccounts.filter(
-    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address)
+    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address && j.source === source)
   );
   newAccounts = newAccounts.map(({ address, name }) => ({
     address,
@@ -105,7 +105,9 @@ var updateAccounts = ({
   add,
   remove
 }) => {
-  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter((a) => remove.find((s) => s.address === a.address) === void 0);
+  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter(
+    (a) => remove.find((s) => s.address === a.address && s.source === a.source) === void 0
+  );
   _extensionAccounts.next(newAccounts);
 };
 
@@ -126,14 +128,14 @@ var getAccountsFromExtensions = async (extensions, ss58) => {
       const signer = extensionEntries[i][1].signer;
       if (result.status === "fulfilled" && signer) {
         const { value } = result;
-        const accounts = formatExtensionAccounts(value, ss58).filter(
-          ({ address }) => !allAccounts.find((a) => address === a.address)
-        ).map(({ address, name }) => ({
-          address,
-          name,
-          source,
-          signer
-        }));
+        const accounts = formatExtensionAccounts(value, ss58).map(
+          ({ address, name }) => ({
+            address,
+            name,
+            source,
+            signer
+          })
+        );
         allAccounts.push(...accounts);
       }
     }

package/accounts/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/accounts/index.ts","../../src/accounts/util.ts","../../src/consts.ts","../../src/subjects.ts","../../src/local.ts","../../src/accounts/get.ts","../../src/accounts/unsubs.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nexport * from './get'\nexport * from './unsubs'\nexport * from './util'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts.getValue().find((j) => j.address === address),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter((a) => remove.find((s) => s.address === a.address) === undefined)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ProcessExtensionAccountsResult } from '@w3ux/types'\n\nexport const DefaultProcessExtensionResult: ProcessExtensionAccountsResult = {\n\tnewAccounts: [],\n\tremovedAccounts: [],\n}\n\n// Local storage active extensions key\nexport const ActiveExtensionsKey = 'active_extensions'\nexport const HardwareAccountsKey = 'hardware_accounts'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionsStatus,\n\tHardwareAccount,\n\tSync,\n} from '@w3ux/types'\nimport { BehaviorSubject } from 'rxjs'\nimport { getHardwareAccountsLocal } from './local'\n\n// NOTE: These subjects stay private to the package and are not exported\n\nexport const _extensionsStatus = new BehaviorSubject<ExtensionsStatus>({})\nexport const _gettingExtensions = new BehaviorSubject<boolean>(true)\nexport const _initialisedExtensions = new BehaviorSubject<string[]>([])\nexport const _reconnectSync = new BehaviorSubject<Sync>('unsynced')\nexport const _extensionAccounts = new BehaviorSubject<ExtensionAccount[]>([])\nexport const _hardwareAccounts = new BehaviorSubject<HardwareAccount[]>(\n\tgetHardwareAccountsLocal(),\n)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { HardwareAccount } from '@w3ux/types'\nimport { localStorageOrDefault } from '@w3ux/utils'\nimport { ActiveExtensionsKey, HardwareAccountsKey } from './consts'\n\n// Gets all active extensions from local storage\nexport const getActiveExtensionsLocal = (): string[] => {\n\tconst current = localStorageOrDefault<string[]>(ActiveExtensionsKey, [], true)\n\treturn Array.isArray(current) ? current : []\n}\n\n// Check if an extension exists in local storage\nexport const isExtensionLocal = (id: string): boolean =>\n\tgetActiveExtensionsLocal().includes(id)\n\n// Adds an extension to local storage\nexport const addExtensionToLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tif (!current.includes(id)) {\n\t\tlocalStorage.setItem(ActiveExtensionsKey, JSON.stringify([...current, id]))\n\t}\n}\n\n// Removes extension from local storage\nexport const removeExtensionFromLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tlocalStorage.setItem(\n\t\tActiveExtensionsKey,\n\t\tJSON.stringify(current.filter((localId) => localId !== id)),\n\t)\n}\n\n// Gets imported hardware accounts from local storage\nexport const getHardwareAccountsLocal = (): HardwareAccount[] => {\n\tconst accounts = localStorageOrDefault(\n\t\tHardwareAccountsKey,\n\t\t[],\n\t\ttrue,\n\t) as HardwareAccount[]\n\n\treturn accounts\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\n\t\t\t\t// This is duplicating what `handleExtensionAccountsUpdate` is doing to accounts: --\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58)\n\t\t\t\t\t.filter(\n\t\t\t\t\t\t({ address }) => !allAccounts.find((a) => address === a.address),\n\t\t\t\t\t)\n\t\t\t\t\t.map(({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}))\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n"],"mappings":"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","names":["import_utils"]}
+{"version":3,"sources":["../../src/accounts/index.ts","../../src/accounts/util.ts","../../src/consts.ts","../../src/subjects.ts","../../src/local.ts","../../src/accounts/get.ts","../../src/accounts/unsubs.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nexport * from './get'\nexport * from './unsubs'\nexport * from './util'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts\n\t\t\t\t.getValue()\n\t\t\t\t.find((j) => j.address === address && j.source === source),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter(\n\t\t\t(a) =>\n\t\t\t\tremove.find((s) => s.address === a.address && s.source === a.source) ===\n\t\t\t\tundefined,\n\t\t)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ProcessExtensionAccountsResult } from '@w3ux/types'\n\nexport const DefaultProcessExtensionResult: ProcessExtensionAccountsResult = {\n\tnewAccounts: [],\n\tremovedAccounts: [],\n}\n\n// Local storage active extensions key\nexport const ActiveExtensionsKey = 'active_extensions'\nexport const HardwareAccountsKey = 'hardware_accounts'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionsStatus,\n\tHardwareAccount,\n\tSync,\n} from '@w3ux/types'\nimport { BehaviorSubject } from 'rxjs'\nimport { getHardwareAccountsLocal } from './local'\n\n// NOTE: These subjects stay private to the package and are not exported\n\nexport const _extensionsStatus = new BehaviorSubject<ExtensionsStatus>({})\nexport const _gettingExtensions = new BehaviorSubject<boolean>(true)\nexport const _initialisedExtensions = new BehaviorSubject<string[]>([])\nexport const _reconnectSync = new BehaviorSubject<Sync>('unsynced')\nexport const _extensionAccounts = new BehaviorSubject<ExtensionAccount[]>([])\nexport const _hardwareAccounts = new BehaviorSubject<HardwareAccount[]>(\n\tgetHardwareAccountsLocal(),\n)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { HardwareAccount } from '@w3ux/types'\nimport { localStorageOrDefault } from '@w3ux/utils'\nimport { ActiveExtensionsKey, HardwareAccountsKey } from './consts'\n\n// Gets all active extensions from local storage\nexport const getActiveExtensionsLocal = (): string[] => {\n\tconst current = localStorageOrDefault<string[]>(ActiveExtensionsKey, [], true)\n\treturn Array.isArray(current) ? current : []\n}\n\n// Check if an extension exists in local storage\nexport const isExtensionLocal = (id: string): boolean =>\n\tgetActiveExtensionsLocal().includes(id)\n\n// Adds an extension to local storage\nexport const addExtensionToLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tif (!current.includes(id)) {\n\t\tlocalStorage.setItem(ActiveExtensionsKey, JSON.stringify([...current, id]))\n\t}\n}\n\n// Removes extension from local storage\nexport const removeExtensionFromLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tlocalStorage.setItem(\n\t\tActiveExtensionsKey,\n\t\tJSON.stringify(current.filter((localId) => localId !== id)),\n\t)\n}\n\n// Gets imported hardware accounts from local storage\nexport const getHardwareAccountsLocal = (): HardwareAccount[] => {\n\tconst accounts = localStorageOrDefault(\n\t\tHardwareAccountsKey,\n\t\t[],\n\t\ttrue,\n\t) as HardwareAccount[]\n\n\treturn accounts\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58).map(\n\t\t\t\t\t({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}),\n\t\t\t\t)\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n"],"mappings":"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","names":["import_utils"]}

package/accounts/index.js

@@ -6,7 +6,7 @@ import {
   unsubAll,
   unsubs,
   updateAccounts
-} from "../chunk-XVKV7X7C.js";
+} from "../chunk-TPEE4DI4.js";
 import "../chunk-J5456N26.js";
 export {
   addUnsub,

package/{chunk-XVKV7X7C.js → chunk-TPEE4DI4.js}

@@ -13,7 +13,7 @@ var processExtensionAccounts = (config, signer, newAccounts) => {
   newAccounts = formatExtensionAccounts(newAccounts, ss58);
   const removedAccounts = _extensionAccounts.getValue().filter((j) => j.source === source).filter((j) => !newAccounts.find((i) => i.address === j.address));
   newAccounts = newAccounts.filter(
-    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address)
+    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address && j.source === source)
   );
   newAccounts = newAccounts.map(({ address, name }) => ({
     address,
@@ -45,7 +45,9 @@ var updateAccounts = ({
   add,
   remove
 }) => {
-  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter((a) => remove.find((s) => s.address === a.address) === void 0);
+  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter(
+    (a) => remove.find((s) => s.address === a.address && s.source === a.source) === void 0
+  );
   _extensionAccounts.next(newAccounts);
 };
 
@@ -66,14 +68,14 @@ var getAccountsFromExtensions = async (extensions, ss58) => {
       const signer = extensionEntries[i][1].signer;
       if (result.status === "fulfilled" && signer) {
         const { value } = result;
-        const accounts = formatExtensionAccounts(value, ss58).filter(
-          ({ address }) => !allAccounts.find((a) => address === a.address)
-        ).map(({ address, name }) => ({
-          address,
-          name,
-          source,
-          signer
-        }));
+        const accounts = formatExtensionAccounts(value, ss58).map(
+          ({ address, name }) => ({
+            address,
+            name,
+            source,
+            signer
+          })
+        );
         allAccounts.push(...accounts);
       }
     }
@@ -106,4 +108,4 @@ export {
 };
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */
-//# sourceMappingURL=chunk-XVKV7X7C.js.map
+//# sourceMappingURL=chunk-TPEE4DI4.js.map

package/chunk-TPEE4DI4.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/accounts/util.ts","../src/accounts/get.ts","../src/accounts/unsubs.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts\n\t\t\t\t.getValue()\n\t\t\t\t.find((j) => j.address === address && j.source === source),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter(\n\t\t\t(a) =>\n\t\t\t\tremove.find((s) => s.address === a.address && s.source === a.source) ===\n\t\t\t\tundefined,\n\t\t)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58).map(\n\t\t\t\t\t({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}),\n\t\t\t\t)\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n"],"mappings":";;;;;;AAOA,SAAS,mBAAmB,sBAAsB;AAU3C,IAAM,2BAA2B,CACvC,QACA,QACA,gBACoC;AACpC,QAAM,EAAE,QAAQ,KAAK,IAAI;AACzB,MAAI,CAAC,YAAY,QAAQ;AACxB,WAAO;AAAA,EACR;AAGA,gBAAc,wBAAwB,aAAa,IAAI;AAGvD,QAAM,kBAAkB,mBACtB,SAAS,EACT,OAAO,CAAC,MAAM,EAAE,WAAW,MAAM,EACjC,OAAO,CAAC,MAAM,CAAC,YAAY,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC;AAGjE,gBAAc,YAAY;AAAA,IACzB,CAAC,EAAE,QAAQ,MACV,CAAC,mBACC,SAAS,EACT,KAAK,CAAC,MAAM,EAAE,YAAY,WAAW,EAAE,WAAW,MAAM;AAAA,EAC5D;AAGA,gBAAc,YAAY,IAAI,CAAC,EAAE,SAAS,KAAK,OAAO;AAAA,IACrD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD,EAAE;AAGF,iBAAe;AAAA,IACd,KAAK;AAAA,IACL,QAAQ;AAAA,EACT,CAAC;AAED,SAAO;AAAA,IACN;AAAA,IACA,iBAAiB,CAAC,GAAG,eAAe;AAAA,EACrC;AACD;AAGO,IAAM,0BAA0B,CACtC,UACA,SACI;AACJ,aAAW,SAET,OAAO,CAAC,EAAE,QAAQ,MAAM,eAAe,OAAO,CAAC,EAE/C,IAAI,CAAC,YAAY;AACjB,UAAM,mBAAmB,kBAAkB,QAAQ,SAAS,IAAI;AAChE,QAAI,CAAC,kBAAkB;AACtB,aAAO;AAAA,IACR;AACA,YAAQ,UAAU;AAClB,WAAO;AAAA,EACR,CAAC,EAEA,OAAO,CAAC,YAAY,YAAY,IAAI;AAEtC,SAAO;AACR;AAGO,IAAM,iBAAiB,CAAC;AAAA,EAC9B;AAAA,EACA;AACD,MAGM;AACL,QAAM,cAAc,CAAC,GAAG,mBAAmB,SAAS,CAAC,EACnD,OAAO,GAAG,EACV;AAAA,IACA,CAAC,MACA,OAAO,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,MACnE;AAAA,EACF;AACD,qBAAmB,KAAK,WAAW;AACpC;;;AC5FO,IAAM,4BAA4B,OACxC,YACA,SACiC;AACjC,MAAI;AACH,UAAM,mBAAmB,MAAM,KAAK,WAAW,QAAQ,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,cAAc,IAAI,EAChD;AAAA,MACA,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,MACtB,CAAC,QAAQ,SAAS;AAAA,IACpB;AAED,UAAM,mBAAmB,iBAAiB,IAAI,CAAC,CAAC,EAAE,SAAS,MAAM,SAAS;AAE1E,UAAM,UAAU,MAAM,QAAQ;AAAA,MAC7B,iBAAiB,IAAI,CAAC,cAAc,UAAU,SAAS,IAAI,CAAC;AAAA,IAC7D;AAEA,UAAM,cAAkC,CAAC;AACzC,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACxC,YAAM,SAAS,QAAQ,CAAC;AACxB,YAAM,SAAS,iBAAiB,CAAC,EAAE,CAAC;AACpC,YAAM,SAAS,iBAAiB,CAAC,EAAE,CAAC,EAAE;AAEtC,UAAI,OAAO,WAAW,eAAe,QAAQ;AAC5C,cAAM,EAAE,MAAM,IAAI;AAClB,cAAM,WAAW,wBAAwB,OAAO,IAAI,EAAE;AAAA,UACrD,CAAC,EAAE,SAAS,KAAK,OAAO;AAAA,YACvB;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACD;AAAA,QACD;AACA,oBAAY,KAAK,GAAG,QAAQ;AAAA,MAC7B;AAAA,IACD;AACA,WAAO;AAAA,EACR,SAAS,GAAG;AACX,YAAQ,MAAM,qCAAqC,CAAC;AACpD,WAAO,CAAC;AAAA,EACT;AACD;;;ACjDO,IAAM,SAAqC,CAAC;AAG5C,IAAM,WAAW,CAAC,IAAY,UAAsB;AAC1D,SAAO,EAAE,IAAI;AACd;AAGO,IAAM,WAAW,MAAM;AAC7B,SAAO,OAAO,MAAM,EAAE,QAAQ,CAAC,UAAU;AACxC,UAAM;AAAA,EACP,CAAC;AACF;","names":[]}

package/extensions/index.cjs

@@ -106,7 +106,7 @@ var processExtensionAccounts = (config, signer, newAccounts) => {
   newAccounts = formatExtensionAccounts(newAccounts, ss58);
   const removedAccounts = _extensionAccounts.getValue().filter((j) => j.source === source).filter((j) => !newAccounts.find((i) => i.address === j.address));
   newAccounts = newAccounts.filter(
-    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address)
+    ({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address && j.source === source)
   );
   newAccounts = newAccounts.map(({ address, name }) => ({
     address,
@@ -138,7 +138,9 @@ var updateAccounts = ({
   add,
   remove
 }) => {
-  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter((a) => remove.find((s) => s.address === a.address) === void 0);
+  const newAccounts = [..._extensionAccounts.getValue()].concat(add).filter(
+    (a) => remove.find((s) => s.address === a.address && s.source === a.source) === void 0
+  );
   _extensionAccounts.next(newAccounts);
 };
 
@@ -367,14 +369,14 @@ var getAccountsFromExtensions = async (extensions2, ss58) => {
       const signer = extensionEntries[i][1].signer;
       if (result.status === "fulfilled" && signer) {
         const { value } = result;
-        const accounts = formatExtensionAccounts(value, ss58).filter(
-          ({ address }) => !allAccounts.find((a) => address === a.address)
-        ).map(({ address, name }) => ({
-          address,
-          name,
-          source,
-          signer
-        }));
+        const accounts = formatExtensionAccounts(value, ss58).map(
+          ({ address, name }) => ({
+            address,
+            name,
+            source,
+            signer
+          })
+        );
         allAccounts.push(...accounts);
       }
     }

package/extensions/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/extensions/index.ts","../../src/accounts/unsubs.ts","../../src/accounts/util.ts","../../src/consts.ts","../../src/subjects.ts","../../src/local.ts","../../src/util.ts","../../src/extensions/connect.ts","../../src/extensions/discover.ts","../../src/extensions/enable.ts","../../src/extensions/init.ts","../../src/extensions/mimir.ts","../../src/accounts/get.ts","../../src/extensions/reconnect.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nexport * from './connect'\nexport * from './discover'\nexport * from './enable'\nexport * from './init'\nexport * from './mimir'\nexport * from './reconnect'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts.getValue().find((j) => j.address === address),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter((a) => remove.find((s) => s.address === a.address) === undefined)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ProcessExtensionAccountsResult } from '@w3ux/types'\n\nexport const DefaultProcessExtensionResult: ProcessExtensionAccountsResult = {\n\tnewAccounts: [],\n\tremovedAccounts: [],\n}\n\n// Local storage active extensions key\nexport const ActiveExtensionsKey = 'active_extensions'\nexport const HardwareAccountsKey = 'hardware_accounts'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionsStatus,\n\tHardwareAccount,\n\tSync,\n} from '@w3ux/types'\nimport { BehaviorSubject } from 'rxjs'\nimport { getHardwareAccountsLocal } from './local'\n\n// NOTE: These subjects stay private to the package and are not exported\n\nexport const _extensionsStatus = new BehaviorSubject<ExtensionsStatus>({})\nexport const _gettingExtensions = new BehaviorSubject<boolean>(true)\nexport const _initialisedExtensions = new BehaviorSubject<string[]>([])\nexport const _reconnectSync = new BehaviorSubject<Sync>('unsynced')\nexport const _extensionAccounts = new BehaviorSubject<ExtensionAccount[]>([])\nexport const _hardwareAccounts = new BehaviorSubject<HardwareAccount[]>(\n\tgetHardwareAccountsLocal(),\n)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { HardwareAccount } from '@w3ux/types'\nimport { localStorageOrDefault } from '@w3ux/utils'\nimport { ActiveExtensionsKey, HardwareAccountsKey } from './consts'\n\n// Gets all active extensions from local storage\nexport const getActiveExtensionsLocal = (): string[] => {\n\tconst current = localStorageOrDefault<string[]>(ActiveExtensionsKey, [], true)\n\treturn Array.isArray(current) ? current : []\n}\n\n// Check if an extension exists in local storage\nexport const isExtensionLocal = (id: string): boolean =>\n\tgetActiveExtensionsLocal().includes(id)\n\n// Adds an extension to local storage\nexport const addExtensionToLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tif (!current.includes(id)) {\n\t\tlocalStorage.setItem(ActiveExtensionsKey, JSON.stringify([...current, id]))\n\t}\n}\n\n// Removes extension from local storage\nexport const removeExtensionFromLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tlocalStorage.setItem(\n\t\tActiveExtensionsKey,\n\t\tJSON.stringify(current.filter((localId) => localId !== id)),\n\t)\n}\n\n// Gets imported hardware accounts from local storage\nexport const getHardwareAccountsLocal = (): HardwareAccount[] => {\n\tconst accounts = localStorageOrDefault(\n\t\tHardwareAccountsKey,\n\t\t[],\n\t\ttrue,\n\t) as HardwareAccount[]\n\n\treturn accounts\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionStatus, HardwareAccount, Sync } from '@w3ux/types'\nimport {\n\t_extensionAccounts,\n\t_extensionsStatus,\n\t_hardwareAccounts,\n\t_reconnectSync,\n} from './subjects'\n\n// Gets an extension status\nexport const getStatus = (id: string): ExtensionStatus =>\n\t_extensionsStatus.getValue()[id] || undefined\n\n// Sets an extension status\nexport const setStatus = (id: string, status: ExtensionStatus) => {\n\tconst newValue = { ..._extensionsStatus.getValue() }\n\tnewValue[id] = status\n\t_extensionsStatus.next(newValue)\n}\n\n// Removes an extension status\nexport const removeStatus = (id: string) => {\n\tconst { [id]: _, ...rest } = _extensionsStatus.getValue()\n\t_extensionsStatus.next(rest)\n}\n\n// Whether an extension can be connected\nexport const canConnect = (id: string) =>\n\t![undefined, 'connected'].includes(_extensionsStatus.getValue()[id])\n\n// Reset accounts\nexport const resetAccounts = () => {\n\t_extensionAccounts.next([])\n}\n\n// Get previously enabled extension reconnect sync status\nexport const getReconnectSync = () => _reconnectSync.getValue()\n\n// Set previously enabled extension reconnect sync status\nexport const setReconnectSync = (sync: Sync) => {\n\t_reconnectSync.next(sync)\n}\n\n// Get hardware accounts\nexport const getHardwareAccounts = () => _hardwareAccounts.getValue()\n\n// Set hardware accounts\nexport const setHardwareAccounts = (accounts: HardwareAccount[]) => {\n\t_hardwareAccounts.next(accounts)\n}\n\n// Checks whether app is open in a mimir iframe\nexport const isMimir = (id: string): boolean =>\n\twindow.self !== window.top && id === 'mimir'\n\n// Check if an injected web3 entry has a valid enable function\nexport const hasValidEnable = (id: string): boolean => {\n\ttry {\n\t\tconst enable = isMimir(id)\n\t\t\t? window.injectedWeb3![id].enable\n\t\t\t: window.parent.injectedWeb3![id].enable\n\n\t\treturn enable !== undefined && typeof enable === 'function'\n\t} catch {\n\t\treturn false\n\t}\n}\n\n// Enable an injected web3 entry\nexport const enableInjectedWeb3Entry = (id: string, dappName: string) => {\n\tif (isMimir(id)) {\n\t\tconst result = window.injectedWeb3![id].enable(dappName)\n\t\treturn result\n\t}\n\tconst result = window.parent.injectedWeb3![id].enable(dappName)\n\treturn result\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionAccount, ExtensionInterface } from '@w3ux/types'\nimport { addUnsub } from '../accounts/unsubs'\nimport { processExtensionAccounts } from '../accounts/util'\nimport { canConnect } from '../util'\nimport { initExtensions } from './index'\n\n// Handles accounts from a single extension\nconst handleAccounts = (\n\tss58: number,\n\tid: string,\n\textension: ExtensionInterface,\n\taccounts: ExtensionAccount[],\n) => {\n\tprocessExtensionAccounts(\n\t\t{\n\t\t\tsource: id,\n\t\t\tss58,\n\t\t},\n\t\textension.signer,\n\t\taccounts,\n\t)\n}\n\n// Connects to a single extension and processes its accounts\nexport const connectExtension = async (\n\tdappName: string,\n\tss58: number,\n\tid: string,\n): Promise<boolean> => {\n\tif (canConnect(id)) {\n\t\tconst { connected } = await initExtensions(dappName, [id])\n\t\tif (connected.size === 0) {\n\t\t\treturn false\n\t\t}\n\t\tconst result = connected.get(id)\n\t\tconst extension = result?.extension\n\t\tconst canSubscribe =\n\t\t\t!!extension && typeof extension.accounts.subscribe === 'function'\n\n\t\t// If account subscriptions are not supported, simply get the account(s) from the extension,\n\t\t// otherwise, subscribe to accounts\n\t\tif (extension) {\n\t\t\tif (!canSubscribe) {\n\t\t\t\tconst accounts = await extension.accounts.get()\n\t\t\t\thandleAccounts(ss58, id, extension, accounts)\n\t\t\t} else {\n\t\t\t\tconst unsub = extension.accounts.subscribe((accounts) => {\n\t\t\t\t\thandleAccounts(ss58, id, extension, accounts)\n\t\t\t\t})\n\t\t\t\taddUnsub(id, unsub)\n\t\t\t}\n\t\t}\n\t\treturn true\n\t}\n\treturn false\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport extensions from '@w3ux/extension-assets'\nimport { _extensionsStatus, _gettingExtensions } from '../subjects'\n\n// Gets extensions from injectedWeb3\nexport const getExtensions = async () => {\n\t_gettingExtensions.next(true)\n\tlet injectedWeb3Interval: ReturnType<typeof setInterval> | undefined\n\n\t// Format installed extensions\n\tconst formatInstalled = () =>\n\t\tObject.keys(extensions).reduce(\n\t\t\t(acc, key) => {\n\t\t\t\tacc[key] =\n\t\t\t\t\twindow?.injectedWeb3?.[key] !== undefined ? 'installed' : acc[key]\n\t\t\t\treturn acc\n\t\t\t},\n\t\t\t{ ..._extensionsStatus.getValue() },\n\t\t)\n\n\t// Handle completed interval check\n\tconst handleCompleted = async (foundExtensions: boolean) => {\n\t\tclearInterval(injectedWeb3Interval)\n\t\tif (foundExtensions) {\n\t\t\t_extensionsStatus.next(formatInstalled())\n\t\t}\n\t\t_gettingExtensions.next(false)\n\t}\n\n\tconst interval = 200\n\tconst maxChecks = 10\n\tconst minVerifications = 2\n\n\t// Getter for the currently installed extensions\n\tlet counter = 0\n\tlet verifications = 0\n\tinjectedWeb3Interval = setInterval(() => {\n\t\tcounter++\n\t\tif (counter === maxChecks) {\n\t\t\thandleCompleted(false)\n\t\t} else {\n\t\t\tconst injected = window?.injectedWeb3\n\n\t\t\t// Check if injected exists and all extensions have a valid enable function\n\t\t\tconst ready =\n\t\t\t\tinjected !== undefined &&\n\t\t\t\tObject.entries(injected).every(\n\t\t\t\t\t([, ext]) => ext && typeof ext.enable === 'function',\n\t\t\t\t)\n\n\t\t\t// Increment verifications if the extensions are ready\n\t\t\tif (ready) {\n\t\t\t\tverifications++\n\t\t\t} else {\n\t\t\t\tverifications = 0\n\t\t\t}\n\n\t\t\tif (counter > 2 && verifications >= minVerifications) {\n\t\t\t\thandleCompleted(true)\n\t\t\t}\n\t\t}\n\t}, interval)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionEnableResult,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { enableInjectedWeb3Entry, hasValidEnable } from '../util'\n\n// Get extensions and enable them\nexport const enableExtensions = async (ids: string[], dappName: string) => {\n\tconst extensionIds = getExtensionsById(ids)\n\tconst enableResults = await doEnable(extensionIds, dappName)\n\n\treturn formatEnabledExtensions(extensionIds, enableResults)\n}\n\n// Gets extensions from injectedWeb3 by their ids\nconst getExtensionsById = (ids: string[]) => {\n\tconst validIds: string[] = []\n\tids.forEach((id) => {\n\t\tif (hasValidEnable(id)) {\n\t\t\tvalidIds.push(id)\n\t\t}\n\t})\n\treturn validIds\n}\n\n// Calls enable for the provided extensions\nconst doEnable = async (\n\textensionIds: string[],\n\tdappName: string,\n): Promise<PromiseSettledResult<ExtensionInterface>[]> =>\n\tawait Promise.allSettled(\n\t\tArray.from(extensionIds).map((id) => enableInjectedWeb3Entry(id, dappName)),\n\t)\n\nconst formatEnabledExtensions = (\n\textensionIds: string[],\n\tenabledResults: PromiseSettledResult<ExtensionInterface>[],\n): ExtensionEnableResults => {\n\tconst extensionsState = new Map<string, ExtensionEnableResult>()\n\n\tfor (let i = 0; i < enabledResults.length; i++) {\n\t\tconst result = enabledResults[i]\n\t\tconst id = extensionIds[i]\n\n\t\tif (result.status === 'fulfilled') {\n\t\t\textensionsState.set(id, {\n\t\t\t\textension: result.value,\n\t\t\t\tconnected: true,\n\t\t\t})\n\t\t} else if (result.status === 'rejected') {\n\t\t\textensionsState.set(id, {\n\t\t\t\textension: null,\n\t\t\t\tconnected: false,\n\t\t\t\terror: result.reason,\n\t\t\t})\n\t\t}\n\t}\n\treturn extensionsState\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionEnableResults } from '@w3ux/types'\nimport { addExtensionToLocal, removeExtensionFromLocal } from '../local'\nimport { _extensionsStatus, _initialisedExtensions } from '../subjects'\nimport { enableExtensions } from './enable'\n\n// Connects to previously connected extensions, or to a specific set of extensions\nexport const initExtensions = async (\n\tdappName: string,\n\textensionIds: string[],\n): Promise<{ connected: ExtensionEnableResults }> => {\n\tif (!extensionIds.length) {\n\t\treturn {\n\t\t\tconnected: new Map(),\n\t\t}\n\t}\n\t// Get extensions and enable them\n\tconst enableResults = await enableExtensions(extensionIds, dappName)\n\n\t// Determine which extensions are connected and which have errors\n\tconst [connected, withError] = [\n\t\tfilterConnectedExtensions(enableResults),\n\t\tfilterFailedExtensions(enableResults),\n\t]\n\n\t// Manage local storage depending on connection status\n\tArray.from(connected.keys()).forEach((id) => {\n\t\taddExtensionToLocal(id)\n\t})\n\tArray.from(withError.keys()).forEach((id) => {\n\t\tremoveExtensionFromLocal(id)\n\t})\n\n\t// Handle new extension statuses\n\tconst newStatus = { ..._extensionsStatus.getValue() }\n\tArray.from(connected.keys()).forEach((id) => {\n\t\tnewStatus[id] = 'connected'\n\t})\n\tArray.from(withError.entries()).forEach(([id, { error }]) => {\n\t\tconst errStr = String(error || '')\n\t\tif (errStr.startsWith('Error')) {\n\t\t\t// Extension not found - remove from state\n\t\t\tif (errStr.substring(0, 17) === 'NotInstalledError') {\n\t\t\t\tdelete newStatus[id]\n\t\t\t} else {\n\t\t\t\t// Assume extension not authenticated\n\t\t\t\tnewStatus[id] = 'not_authenticated'\n\t\t\t}\n\t\t}\n\t})\n\n\t// Record initialised extensions\n\tconst newInitialised = [..._initialisedExtensions.getValue()]\n\textensionIds.forEach((id) => {\n\t\tif (!newInitialised.includes(id)) {\n\t\t\tnewInitialised.push(id)\n\t\t}\n\t})\n\n\t// Commit updates to observables\n\t_extensionsStatus.next(newStatus)\n\t_initialisedExtensions.next(newInitialised)\n\n\treturn { connected }\n}\n\n// Filter successfully connected extensions\nconst filterConnectedExtensions = (\n\textensions: ExtensionEnableResults,\n): ExtensionEnableResults =>\n\tnew Map(\n\t\tArray.from(extensions.entries()).filter(([, state]) => state.connected),\n\t)\n\n// Filter extensions that failed to connect\nconst filterFailedExtensions = (\n\textensions: ExtensionEnableResults,\n): ExtensionEnableResults =>\n\tnew Map(\n\t\tArray.from(extensions.entries()).filter(([, state]) => !state.connected),\n\t)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { inject, isMimirReady, MIMIR_REGEXP } from '@mimirdev/apps-inject'\n\nexport const injectMimir = async () => {\n\tconst openInIframe = window !== window.parent\n\t// Return if not opened in an iframe\n\tif (!openInIframe) {\n\t\treturn\n\t}\n\tconst origin = await isMimirReady()\n\t// Return if not opened in Mimir\n\tif (!origin) {\n\t\treturn\n\t}\n\tif (MIMIR_REGEXP.test(origin)) {\n\t\tinject()\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\n\t\t\t\t// This is duplicating what `handleExtensionAccountsUpdate` is doing to accounts: --\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58)\n\t\t\t\t\t.filter(\n\t\t\t\t\t\t({ address }) => !allAccounts.find((a) => address === a.address),\n\t\t\t\t\t)\n\t\t\t\t\t.map(({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}))\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport {\n\taddUnsub,\n\tgetAccountsFromExtensions,\n\tprocessExtensionAccounts,\n\tupdateAccounts,\n} from '../accounts/index'\nimport { getActiveExtensionsLocal } from '../local'\nimport { setReconnectSync } from '../util'\nimport { initExtensions } from '.'\n\nexport const reconnectExtensions = async (dappName: string, ss58: number) => {\n\tsetReconnectSync('syncing')\n\tconst { connected } = await initExtensions(\n\t\tdappName,\n\t\tgetActiveExtensionsLocal(),\n\t)\n\tif (connected.size > 0) {\n\t\t// Perform initial account state update\n\t\tupdateAccounts({\n\t\t\tadd: await getAccountsFromExtensions(connected, ss58),\n\t\t\tremove: [],\n\t\t})\n\n\t\t// If available, subscribe to accounts for each connected extension\n\t\tfor (const [id, { extension }] of Array.from(connected.entries())) {\n\t\t\tif (typeof extension!.accounts.subscribe === 'function') {\n\t\t\t\tconst unsub = extension!.accounts.subscribe((accounts) => {\n\t\t\t\t\tprocessExtensionAccounts(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsource: id,\n\t\t\t\t\t\t\tss58,\n\t\t\t\t\t\t},\n\t\t\t\t\t\textension!.signer,\n\t\t\t\t\t\taccounts,\n\t\t\t\t\t)\n\t\t\t\t})\n\t\t\t\taddUnsub(id, unsub)\n\t\t\t}\n\t\t}\n\t}\n\tsetReconnectSync('synced')\n}\n"],"mappings":"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","names":["import_utils","result","extensions","extensions","extensions"]}
+{"version":3,"sources":["../../src/extensions/index.ts","../../src/accounts/unsubs.ts","../../src/accounts/util.ts","../../src/consts.ts","../../src/subjects.ts","../../src/local.ts","../../src/util.ts","../../src/extensions/connect.ts","../../src/extensions/discover.ts","../../src/extensions/enable.ts","../../src/extensions/init.ts","../../src/extensions/mimir.ts","../../src/accounts/get.ts","../../src/extensions/reconnect.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nexport * from './connect'\nexport * from './discover'\nexport * from './enable'\nexport * from './init'\nexport * from './mimir'\nexport * from './reconnect'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts\n\t\t\t\t.getValue()\n\t\t\t\t.find((j) => j.address === address && j.source === source),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter(\n\t\t\t(a) =>\n\t\t\t\tremove.find((s) => s.address === a.address && s.source === a.source) ===\n\t\t\t\tundefined,\n\t\t)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ProcessExtensionAccountsResult } from '@w3ux/types'\n\nexport const DefaultProcessExtensionResult: ProcessExtensionAccountsResult = {\n\tnewAccounts: [],\n\tremovedAccounts: [],\n}\n\n// Local storage active extensions key\nexport const ActiveExtensionsKey = 'active_extensions'\nexport const HardwareAccountsKey = 'hardware_accounts'\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionsStatus,\n\tHardwareAccount,\n\tSync,\n} from '@w3ux/types'\nimport { BehaviorSubject } from 'rxjs'\nimport { getHardwareAccountsLocal } from './local'\n\n// NOTE: These subjects stay private to the package and are not exported\n\nexport const _extensionsStatus = new BehaviorSubject<ExtensionsStatus>({})\nexport const _gettingExtensions = new BehaviorSubject<boolean>(true)\nexport const _initialisedExtensions = new BehaviorSubject<string[]>([])\nexport const _reconnectSync = new BehaviorSubject<Sync>('unsynced')\nexport const _extensionAccounts = new BehaviorSubject<ExtensionAccount[]>([])\nexport const _hardwareAccounts = new BehaviorSubject<HardwareAccount[]>(\n\tgetHardwareAccountsLocal(),\n)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { HardwareAccount } from '@w3ux/types'\nimport { localStorageOrDefault } from '@w3ux/utils'\nimport { ActiveExtensionsKey, HardwareAccountsKey } from './consts'\n\n// Gets all active extensions from local storage\nexport const getActiveExtensionsLocal = (): string[] => {\n\tconst current = localStorageOrDefault<string[]>(ActiveExtensionsKey, [], true)\n\treturn Array.isArray(current) ? current : []\n}\n\n// Check if an extension exists in local storage\nexport const isExtensionLocal = (id: string): boolean =>\n\tgetActiveExtensionsLocal().includes(id)\n\n// Adds an extension to local storage\nexport const addExtensionToLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tif (!current.includes(id)) {\n\t\tlocalStorage.setItem(ActiveExtensionsKey, JSON.stringify([...current, id]))\n\t}\n}\n\n// Removes extension from local storage\nexport const removeExtensionFromLocal = (id: string): void => {\n\tconst current = getActiveExtensionsLocal()\n\tlocalStorage.setItem(\n\t\tActiveExtensionsKey,\n\t\tJSON.stringify(current.filter((localId) => localId !== id)),\n\t)\n}\n\n// Gets imported hardware accounts from local storage\nexport const getHardwareAccountsLocal = (): HardwareAccount[] => {\n\tconst accounts = localStorageOrDefault(\n\t\tHardwareAccountsKey,\n\t\t[],\n\t\ttrue,\n\t) as HardwareAccount[]\n\n\treturn accounts\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionStatus, HardwareAccount, Sync } from '@w3ux/types'\nimport {\n\t_extensionAccounts,\n\t_extensionsStatus,\n\t_hardwareAccounts,\n\t_reconnectSync,\n} from './subjects'\n\n// Gets an extension status\nexport const getStatus = (id: string): ExtensionStatus =>\n\t_extensionsStatus.getValue()[id] || undefined\n\n// Sets an extension status\nexport const setStatus = (id: string, status: ExtensionStatus) => {\n\tconst newValue = { ..._extensionsStatus.getValue() }\n\tnewValue[id] = status\n\t_extensionsStatus.next(newValue)\n}\n\n// Removes an extension status\nexport const removeStatus = (id: string) => {\n\tconst { [id]: _, ...rest } = _extensionsStatus.getValue()\n\t_extensionsStatus.next(rest)\n}\n\n// Whether an extension can be connected\nexport const canConnect = (id: string) =>\n\t![undefined, 'connected'].includes(_extensionsStatus.getValue()[id])\n\n// Reset accounts\nexport const resetAccounts = () => {\n\t_extensionAccounts.next([])\n}\n\n// Get previously enabled extension reconnect sync status\nexport const getReconnectSync = () => _reconnectSync.getValue()\n\n// Set previously enabled extension reconnect sync status\nexport const setReconnectSync = (sync: Sync) => {\n\t_reconnectSync.next(sync)\n}\n\n// Get hardware accounts\nexport const getHardwareAccounts = () => _hardwareAccounts.getValue()\n\n// Set hardware accounts\nexport const setHardwareAccounts = (accounts: HardwareAccount[]) => {\n\t_hardwareAccounts.next(accounts)\n}\n\n// Checks whether app is open in a mimir iframe\nexport const isMimir = (id: string): boolean =>\n\twindow.self !== window.top && id === 'mimir'\n\n// Check if an injected web3 entry has a valid enable function\nexport const hasValidEnable = (id: string): boolean => {\n\ttry {\n\t\tconst enable = isMimir(id)\n\t\t\t? window.injectedWeb3![id].enable\n\t\t\t: window.parent.injectedWeb3![id].enable\n\n\t\treturn enable !== undefined && typeof enable === 'function'\n\t} catch {\n\t\treturn false\n\t}\n}\n\n// Enable an injected web3 entry\nexport const enableInjectedWeb3Entry = (id: string, dappName: string) => {\n\tif (isMimir(id)) {\n\t\tconst result = window.injectedWeb3![id].enable(dappName)\n\t\treturn result\n\t}\n\tconst result = window.parent.injectedWeb3![id].enable(dappName)\n\treturn result\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionAccount, ExtensionInterface } from '@w3ux/types'\nimport { addUnsub } from '../accounts/unsubs'\nimport { processExtensionAccounts } from '../accounts/util'\nimport { canConnect } from '../util'\nimport { initExtensions } from './index'\n\n// Handles accounts from a single extension\nconst handleAccounts = (\n\tss58: number,\n\tid: string,\n\textension: ExtensionInterface,\n\taccounts: ExtensionAccount[],\n) => {\n\tprocessExtensionAccounts(\n\t\t{\n\t\t\tsource: id,\n\t\t\tss58,\n\t\t},\n\t\textension.signer,\n\t\taccounts,\n\t)\n}\n\n// Connects to a single extension and processes its accounts\nexport const connectExtension = async (\n\tdappName: string,\n\tss58: number,\n\tid: string,\n): Promise<boolean> => {\n\tif (canConnect(id)) {\n\t\tconst { connected } = await initExtensions(dappName, [id])\n\t\tif (connected.size === 0) {\n\t\t\treturn false\n\t\t}\n\t\tconst result = connected.get(id)\n\t\tconst extension = result?.extension\n\t\tconst canSubscribe =\n\t\t\t!!extension && typeof extension.accounts.subscribe === 'function'\n\n\t\t// If account subscriptions are not supported, simply get the account(s) from the extension,\n\t\t// otherwise, subscribe to accounts\n\t\tif (extension) {\n\t\t\tif (!canSubscribe) {\n\t\t\t\tconst accounts = await extension.accounts.get()\n\t\t\t\thandleAccounts(ss58, id, extension, accounts)\n\t\t\t} else {\n\t\t\t\tconst unsub = extension.accounts.subscribe((accounts) => {\n\t\t\t\t\thandleAccounts(ss58, id, extension, accounts)\n\t\t\t\t})\n\t\t\t\taddUnsub(id, unsub)\n\t\t\t}\n\t\t}\n\t\treturn true\n\t}\n\treturn false\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport extensions from '@w3ux/extension-assets'\nimport { _extensionsStatus, _gettingExtensions } from '../subjects'\n\n// Gets extensions from injectedWeb3\nexport const getExtensions = async () => {\n\t_gettingExtensions.next(true)\n\tlet injectedWeb3Interval: ReturnType<typeof setInterval> | undefined\n\n\t// Format installed extensions\n\tconst formatInstalled = () =>\n\t\tObject.keys(extensions).reduce(\n\t\t\t(acc, key) => {\n\t\t\t\tacc[key] =\n\t\t\t\t\twindow?.injectedWeb3?.[key] !== undefined ? 'installed' : acc[key]\n\t\t\t\treturn acc\n\t\t\t},\n\t\t\t{ ..._extensionsStatus.getValue() },\n\t\t)\n\n\t// Handle completed interval check\n\tconst handleCompleted = async (foundExtensions: boolean) => {\n\t\tclearInterval(injectedWeb3Interval)\n\t\tif (foundExtensions) {\n\t\t\t_extensionsStatus.next(formatInstalled())\n\t\t}\n\t\t_gettingExtensions.next(false)\n\t}\n\n\tconst interval = 200\n\tconst maxChecks = 10\n\tconst minVerifications = 2\n\n\t// Getter for the currently installed extensions\n\tlet counter = 0\n\tlet verifications = 0\n\tinjectedWeb3Interval = setInterval(() => {\n\t\tcounter++\n\t\tif (counter === maxChecks) {\n\t\t\thandleCompleted(false)\n\t\t} else {\n\t\t\tconst injected = window?.injectedWeb3\n\n\t\t\t// Check if injected exists and all extensions have a valid enable function\n\t\t\tconst ready =\n\t\t\t\tinjected !== undefined &&\n\t\t\t\tObject.entries(injected).every(\n\t\t\t\t\t([, ext]) => ext && typeof ext.enable === 'function',\n\t\t\t\t)\n\n\t\t\t// Increment verifications if the extensions are ready\n\t\t\tif (ready) {\n\t\t\t\tverifications++\n\t\t\t} else {\n\t\t\t\tverifications = 0\n\t\t\t}\n\n\t\t\tif (counter > 2 && verifications >= minVerifications) {\n\t\t\t\thandleCompleted(true)\n\t\t\t}\n\t\t}\n\t}, interval)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionEnableResult,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { enableInjectedWeb3Entry, hasValidEnable } from '../util'\n\n// Get extensions and enable them\nexport const enableExtensions = async (ids: string[], dappName: string) => {\n\tconst extensionIds = getExtensionsById(ids)\n\tconst enableResults = await doEnable(extensionIds, dappName)\n\n\treturn formatEnabledExtensions(extensionIds, enableResults)\n}\n\n// Gets extensions from injectedWeb3 by their ids\nconst getExtensionsById = (ids: string[]) => {\n\tconst validIds: string[] = []\n\tids.forEach((id) => {\n\t\tif (hasValidEnable(id)) {\n\t\t\tvalidIds.push(id)\n\t\t}\n\t})\n\treturn validIds\n}\n\n// Calls enable for the provided extensions\nconst doEnable = async (\n\textensionIds: string[],\n\tdappName: string,\n): Promise<PromiseSettledResult<ExtensionInterface>[]> =>\n\tawait Promise.allSettled(\n\t\tArray.from(extensionIds).map((id) => enableInjectedWeb3Entry(id, dappName)),\n\t)\n\nconst formatEnabledExtensions = (\n\textensionIds: string[],\n\tenabledResults: PromiseSettledResult<ExtensionInterface>[],\n): ExtensionEnableResults => {\n\tconst extensionsState = new Map<string, ExtensionEnableResult>()\n\n\tfor (let i = 0; i < enabledResults.length; i++) {\n\t\tconst result = enabledResults[i]\n\t\tconst id = extensionIds[i]\n\n\t\tif (result.status === 'fulfilled') {\n\t\t\textensionsState.set(id, {\n\t\t\t\textension: result.value,\n\t\t\t\tconnected: true,\n\t\t\t})\n\t\t} else if (result.status === 'rejected') {\n\t\t\textensionsState.set(id, {\n\t\t\t\textension: null,\n\t\t\t\tconnected: false,\n\t\t\t\terror: result.reason,\n\t\t\t})\n\t\t}\n\t}\n\treturn extensionsState\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionEnableResults } from '@w3ux/types'\nimport { addExtensionToLocal, removeExtensionFromLocal } from '../local'\nimport { _extensionsStatus, _initialisedExtensions } from '../subjects'\nimport { enableExtensions } from './enable'\n\n// Connects to previously connected extensions, or to a specific set of extensions\nexport const initExtensions = async (\n\tdappName: string,\n\textensionIds: string[],\n): Promise<{ connected: ExtensionEnableResults }> => {\n\tif (!extensionIds.length) {\n\t\treturn {\n\t\t\tconnected: new Map(),\n\t\t}\n\t}\n\t// Get extensions and enable them\n\tconst enableResults = await enableExtensions(extensionIds, dappName)\n\n\t// Determine which extensions are connected and which have errors\n\tconst [connected, withError] = [\n\t\tfilterConnectedExtensions(enableResults),\n\t\tfilterFailedExtensions(enableResults),\n\t]\n\n\t// Manage local storage depending on connection status\n\tArray.from(connected.keys()).forEach((id) => {\n\t\taddExtensionToLocal(id)\n\t})\n\tArray.from(withError.keys()).forEach((id) => {\n\t\tremoveExtensionFromLocal(id)\n\t})\n\n\t// Handle new extension statuses\n\tconst newStatus = { ..._extensionsStatus.getValue() }\n\tArray.from(connected.keys()).forEach((id) => {\n\t\tnewStatus[id] = 'connected'\n\t})\n\tArray.from(withError.entries()).forEach(([id, { error }]) => {\n\t\tconst errStr = String(error || '')\n\t\tif (errStr.startsWith('Error')) {\n\t\t\t// Extension not found - remove from state\n\t\t\tif (errStr.substring(0, 17) === 'NotInstalledError') {\n\t\t\t\tdelete newStatus[id]\n\t\t\t} else {\n\t\t\t\t// Assume extension not authenticated\n\t\t\t\tnewStatus[id] = 'not_authenticated'\n\t\t\t}\n\t\t}\n\t})\n\n\t// Record initialised extensions\n\tconst newInitialised = [..._initialisedExtensions.getValue()]\n\textensionIds.forEach((id) => {\n\t\tif (!newInitialised.includes(id)) {\n\t\t\tnewInitialised.push(id)\n\t\t}\n\t})\n\n\t// Commit updates to observables\n\t_extensionsStatus.next(newStatus)\n\t_initialisedExtensions.next(newInitialised)\n\n\treturn { connected }\n}\n\n// Filter successfully connected extensions\nconst filterConnectedExtensions = (\n\textensions: ExtensionEnableResults,\n): ExtensionEnableResults =>\n\tnew Map(\n\t\tArray.from(extensions.entries()).filter(([, state]) => state.connected),\n\t)\n\n// Filter extensions that failed to connect\nconst filterFailedExtensions = (\n\textensions: ExtensionEnableResults,\n): ExtensionEnableResults =>\n\tnew Map(\n\t\tArray.from(extensions.entries()).filter(([, state]) => !state.connected),\n\t)\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { inject, isMimirReady, MIMIR_REGEXP } from '@mimirdev/apps-inject'\n\nexport const injectMimir = async () => {\n\tconst openInIframe = window !== window.parent\n\t// Return if not opened in an iframe\n\tif (!openInIframe) {\n\t\treturn\n\t}\n\tconst origin = await isMimirReady()\n\t// Return if not opened in Mimir\n\tif (!origin) {\n\t\treturn\n\t}\n\tif (MIMIR_REGEXP.test(origin)) {\n\t\tinject()\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58).map(\n\t\t\t\t\t({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}),\n\t\t\t\t)\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport {\n\taddUnsub,\n\tgetAccountsFromExtensions,\n\tprocessExtensionAccounts,\n\tupdateAccounts,\n} from '../accounts/index'\nimport { getActiveExtensionsLocal } from '../local'\nimport { setReconnectSync } from '../util'\nimport { initExtensions } from '.'\n\nexport const reconnectExtensions = async (dappName: string, ss58: number) => {\n\tsetReconnectSync('syncing')\n\tconst { connected } = await initExtensions(\n\t\tdappName,\n\t\tgetActiveExtensionsLocal(),\n\t)\n\tif (connected.size > 0) {\n\t\t// Perform initial account state update\n\t\tupdateAccounts({\n\t\t\tadd: await getAccountsFromExtensions(connected, ss58),\n\t\t\tremove: [],\n\t\t})\n\n\t\t// If available, subscribe to accounts for each connected extension\n\t\tfor (const [id, { extension }] of Array.from(connected.entries())) {\n\t\t\tif (typeof extension!.accounts.subscribe === 'function') {\n\t\t\t\tconst unsub = extension!.accounts.subscribe((accounts) => {\n\t\t\t\t\tprocessExtensionAccounts(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tsource: id,\n\t\t\t\t\t\t\tss58,\n\t\t\t\t\t\t},\n\t\t\t\t\t\textension!.signer,\n\t\t\t\t\t\taccounts,\n\t\t\t\t\t)\n\t\t\t\t})\n\t\t\t\taddUnsub(id, unsub)\n\t\t\t}\n\t\t}\n\t}\n\tsetReconnectSync('synced')\n}\n"],"mappings":"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","names":["import_utils","result","extensions","extensions","extensions"]}

package/extensions/index.js

@@ -9,7 +9,7 @@ import {
   getAccountsFromExtensions,
   processExtensionAccounts,
   updateAccounts
-} from "../chunk-XVKV7X7C.js";
+} from "../chunk-TPEE4DI4.js";
 import {
   _extensionsStatus,
   _gettingExtensions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w3ux/observables-connect",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "license": "GPL-3.0-only",
   "type": "module",
   "description": "Observables for extensions and accounts discovery",

package/chunk-XVKV7X7C.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/accounts/util.ts","../src/accounts/get.ts","../src/accounts/unsubs.ts"],"sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { DefaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../subjects'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n\tsource: string\n\tss58: number\n}\nexport const processExtensionAccounts = (\n\tconfig: Config,\n\tsigner: unknown,\n\tnewAccounts: ExtensionAccount[],\n): ProcessExtensionAccountsResult => {\n\tconst { source, ss58 } = config\n\tif (!newAccounts.length) {\n\t\treturn DefaultProcessExtensionResult\n\t}\n\n\t// Get valid accounts from extension\n\tnewAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n\t// Find any accounts that have been removed from this extension\n\tconst removedAccounts = _extensionAccounts\n\t\t.getValue()\n\t\t.filter((j) => j.source === source)\n\t\t.filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n\t// Remove accounts that have already been imported\n\tnewAccounts = newAccounts.filter(\n\t\t({ address }) =>\n\t\t\t!_extensionAccounts.getValue().find((j) => j.address === address),\n\t)\n\n\t// Format accounts properties\n\tnewAccounts = newAccounts.map(({ address, name }) => ({\n\t\taddress,\n\t\tname,\n\t\tsource,\n\t\tsigner,\n\t}))\n\n\t// Update observable state\n\tupdateAccounts({\n\t\tadd: newAccounts,\n\t\tremove: removedAccounts,\n\t})\n\n\treturn {\n\t\tnewAccounts,\n\t\tremovedAccounts: [...removedAccounts],\n\t}\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n\taccounts: ExtensionAccount[],\n\tss58: number,\n) => {\n\taccounts = accounts\n\t\t// Remove accounts that do not contain correctly formatted addresses\n\t\t.filter(({ address }) => isValidAddress(address))\n\t\t// Reformat addresses to ensure default ss58 format\n\t\t.map((account) => {\n\t\t\tconst formattedAddress = formatAccountSs58(account.address, ss58)\n\t\t\tif (!formattedAddress) {\n\t\t\t\treturn null\n\t\t\t}\n\t\t\taccount.address = formattedAddress\n\t\t\treturn account\n\t\t})\n\t\t// Remove null entries resulting from invalid formatted addresses\n\t\t.filter((account) => account !== null)\n\n\treturn accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n\tadd,\n\tremove,\n}: {\n\tadd: ExtensionAccount[]\n\tremove: ExtensionAccount[]\n}) => {\n\tconst newAccounts = [..._extensionAccounts.getValue()]\n\t\t.concat(add)\n\t\t.filter((a) => remove.find((s) => s.address === a.address) === undefined)\n\t_extensionAccounts.next(newAccounts)\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n\tExtensionAccount,\n\tExtensionEnableResults,\n\tExtensionInterface,\n} from '@w3ux/types'\nimport { formatExtensionAccounts } from './util'\n\n// Connects to provided extensions and gets all accounts\nexport const getAccountsFromExtensions = async (\n\textensions: ExtensionEnableResults,\n\tss58: number,\n): Promise<ExtensionAccount[]> => {\n\ttry {\n\t\tconst extensionEntries = Array.from(extensions.entries())\n\t\t\t.filter(([, { extension }]) => extension !== null)\n\t\t\t.map(\n\t\t\t\t([source, { extension }]) =>\n\t\t\t\t\t[source, extension] as [string, ExtensionInterface],\n\t\t\t)\n\n\t\tconst activeExtensions = extensionEntries.map(([, extension]) => extension)\n\n\t\tconst results = await Promise.allSettled(\n\t\t\tactiveExtensions.map((extension) => extension.accounts.get()),\n\t\t)\n\n\t\tconst allAccounts: ExtensionAccount[] = []\n\t\tfor (let i = 0; i < results.length; i++) {\n\t\t\tconst result = results[i]\n\t\t\tconst source = extensionEntries[i][0]\n\t\t\tconst signer = extensionEntries[i][1].signer\n\n\t\t\tif (result.status === 'fulfilled' && signer) {\n\t\t\t\tconst { value } = result\n\n\t\t\t\t// This is duplicating what `handleExtensionAccountsUpdate` is doing to accounts: --\n\t\t\t\tconst accounts = formatExtensionAccounts(value, ss58)\n\t\t\t\t\t.filter(\n\t\t\t\t\t\t({ address }) => !allAccounts.find((a) => address === a.address),\n\t\t\t\t\t)\n\t\t\t\t\t.map(({ address, name }) => ({\n\t\t\t\t\t\taddress,\n\t\t\t\t\t\tname,\n\t\t\t\t\t\tsource,\n\t\t\t\t\t\tsigner,\n\t\t\t\t\t}))\n\t\t\t\tallAccounts.push(...accounts)\n\t\t\t}\n\t\t}\n\t\treturn allAccounts\n\t} catch (e) {\n\t\tconsole.error('Error during account formatting: ', e)\n\t\treturn []\n\t}\n}\n","/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\n// Extension account subscription unsubs\nexport const unsubs: Record<string, () => void> = {}\n\n// Add an extension id to unsub state\nexport const addUnsub = (id: string, unsub: () => void) => {\n\tunsubs[id] = unsub\n}\n\n// Unsubscribe to all unsubs\nexport const unsubAll = () => {\n\tObject.values(unsubs).forEach((unsub) => {\n\t\tunsub()\n\t})\n}\n"],"mappings":";;;;;;AAOA,SAAS,mBAAmB,sBAAsB;AAU3C,IAAM,2BAA2B,CACvC,QACA,QACA,gBACoC;AACpC,QAAM,EAAE,QAAQ,KAAK,IAAI;AACzB,MAAI,CAAC,YAAY,QAAQ;AACxB,WAAO;AAAA,EACR;AAGA,gBAAc,wBAAwB,aAAa,IAAI;AAGvD,QAAM,kBAAkB,mBACtB,SAAS,EACT,OAAO,CAAC,MAAM,EAAE,WAAW,MAAM,EACjC,OAAO,CAAC,MAAM,CAAC,YAAY,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC;AAGjE,gBAAc,YAAY;AAAA,IACzB,CAAC,EAAE,QAAQ,MACV,CAAC,mBAAmB,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,OAAO;AAAA,EAClE;AAGA,gBAAc,YAAY,IAAI,CAAC,EAAE,SAAS,KAAK,OAAO;AAAA,IACrD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD,EAAE;AAGF,iBAAe;AAAA,IACd,KAAK;AAAA,IACL,QAAQ;AAAA,EACT,CAAC;AAED,SAAO;AAAA,IACN;AAAA,IACA,iBAAiB,CAAC,GAAG,eAAe;AAAA,EACrC;AACD;AAGO,IAAM,0BAA0B,CACtC,UACA,SACI;AACJ,aAAW,SAET,OAAO,CAAC,EAAE,QAAQ,MAAM,eAAe,OAAO,CAAC,EAE/C,IAAI,CAAC,YAAY;AACjB,UAAM,mBAAmB,kBAAkB,QAAQ,SAAS,IAAI;AAChE,QAAI,CAAC,kBAAkB;AACtB,aAAO;AAAA,IACR;AACA,YAAQ,UAAU;AAClB,WAAO;AAAA,EACR,CAAC,EAEA,OAAO,CAAC,YAAY,YAAY,IAAI;AAEtC,SAAO;AACR;AAGO,IAAM,iBAAiB,CAAC;AAAA,EAC9B;AAAA,EACA;AACD,MAGM;AACL,QAAM,cAAc,CAAC,GAAG,mBAAmB,SAAS,CAAC,EACnD,OAAO,GAAG,EACV,OAAO,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,MAAM,MAAS;AACzE,qBAAmB,KAAK,WAAW;AACpC;;;ACtFO,IAAM,4BAA4B,OACxC,YACA,SACiC;AACjC,MAAI;AACH,UAAM,mBAAmB,MAAM,KAAK,WAAW,QAAQ,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,cAAc,IAAI,EAChD;AAAA,MACA,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,MACtB,CAAC,QAAQ,SAAS;AAAA,IACpB;AAED,UAAM,mBAAmB,iBAAiB,IAAI,CAAC,CAAC,EAAE,SAAS,MAAM,SAAS;AAE1E,UAAM,UAAU,MAAM,QAAQ;AAAA,MAC7B,iBAAiB,IAAI,CAAC,cAAc,UAAU,SAAS,IAAI,CAAC;AAAA,IAC7D;AAEA,UAAM,cAAkC,CAAC;AACzC,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACxC,YAAM,SAAS,QAAQ,CAAC;AACxB,YAAM,SAAS,iBAAiB,CAAC,EAAE,CAAC;AACpC,YAAM,SAAS,iBAAiB,CAAC,EAAE,CAAC,EAAE;AAEtC,UAAI,OAAO,WAAW,eAAe,QAAQ;AAC5C,cAAM,EAAE,MAAM,IAAI;AAGlB,cAAM,WAAW,wBAAwB,OAAO,IAAI,EAClD;AAAA,UACA,CAAC,EAAE,QAAQ,MAAM,CAAC,YAAY,KAAK,CAAC,MAAM,YAAY,EAAE,OAAO;AAAA,QAChE,EACC,IAAI,CAAC,EAAE,SAAS,KAAK,OAAO;AAAA,UAC5B;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACD,EAAE;AACH,oBAAY,KAAK,GAAG,QAAQ;AAAA,MAC7B;AAAA,IACD;AACA,WAAO;AAAA,EACR,SAAS,GAAG;AACX,YAAQ,MAAM,qCAAqC,CAAC;AACpD,WAAO,CAAC;AAAA,EACT;AACD;;;ACrDO,IAAM,SAAqC,CAAC;AAG5C,IAAM,WAAW,CAAC,IAAY,UAAsB;AAC1D,SAAO,EAAE,IAAI;AACd;AAGO,IAAM,WAAW,MAAM;AAC7B,SAAO,OAAO,MAAM,EAAE,QAAQ,CAAC,UAAU;AACxC,UAAM;AAAA,EACP,CAAC;AACF;","names":[]}