@w3ux/observables-connect 0.9.29 → 0.9.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/accounts/util.d.ts +1 -2
- package/accounts/util.js +1 -8
- package/accounts/util.js.map +1 -1
- package/index.d.ts +2 -0
- package/index.js +6 -0
- package/index.js.map +1 -0
- package/local.d.ts +0 -2
- package/local.js +0 -7
- package/local.js.map +1 -1
- package/package.json +1 -1
- package/util.js.map +1 -1
package/accounts/util.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import type { ExtensionAccount,
|
|
1
|
+
import type { ExtensionAccount, ProcessExtensionAccountsResult } from '@w3ux/types';
|
|
2
2
|
interface Config {
|
|
3
3
|
source: string;
|
|
4
4
|
ss58: number;
|
|
5
5
|
}
|
|
6
6
|
export declare const processExtensionAccounts: (config: Config, signer: unknown, newAccounts: ExtensionAccount[]) => ProcessExtensionAccountsResult;
|
|
7
7
|
export declare const formatExtensionAccounts: (accounts: ExtensionAccount[], ss58: number) => ExtensionAccount[];
|
|
8
|
-
export declare const getInExternalAccounts: (accounts: ImportedAccount[], network: string) => import("@w3ux/types").ExternalAccount[];
|
|
9
8
|
export declare const updateAccounts: ({ add, remove, }: {
|
|
10
9
|
add: ExtensionAccount[];
|
|
11
10
|
remove: ExtensionAccount[];
|
package/accounts/util.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { formatAccountSs58, isValidAddress } from '@w3ux/utils';
|
|
2
2
|
import { defaultProcessExtensionResult } from '../consts';
|
|
3
|
-
import { getLocalExternalAccounts } from '../local';
|
|
4
3
|
import { _extensionAccounts } from '../observables';
|
|
5
4
|
export const processExtensionAccounts = (config, signer, newAccounts) => {
|
|
6
5
|
const { source, ss58 } = config;
|
|
@@ -12,9 +11,7 @@ export const processExtensionAccounts = (config, signer, newAccounts) => {
|
|
|
12
11
|
.getValue()
|
|
13
12
|
.filter((j) => j.source === source)
|
|
14
13
|
.filter((j) => !newAccounts.find((i) => i.address === j.address));
|
|
15
|
-
newAccounts = newAccounts.filter(({ address }) => !_extensionAccounts
|
|
16
|
-
.getValue()
|
|
17
|
-
.find((j) => j.address === address && j.source !== 'external'));
|
|
14
|
+
newAccounts = newAccounts.filter(({ address }) => !_extensionAccounts.getValue().find((j) => j.address === address));
|
|
18
15
|
newAccounts = newAccounts.map(({ address, name }) => ({
|
|
19
16
|
address,
|
|
20
17
|
name,
|
|
@@ -44,10 +41,6 @@ export const formatExtensionAccounts = (accounts, ss58) => {
|
|
|
44
41
|
.filter((account) => account !== null);
|
|
45
42
|
return accounts;
|
|
46
43
|
};
|
|
47
|
-
export const getInExternalAccounts = (accounts, network) => {
|
|
48
|
-
const localExternalAccounts = getLocalExternalAccounts(network);
|
|
49
|
-
return (localExternalAccounts.filter((a) => (accounts || []).find((b) => b.address === a.address) !== undefined) || []);
|
|
50
|
-
};
|
|
51
44
|
export const updateAccounts = ({ add, remove, }) => {
|
|
52
45
|
const newAccounts = [..._extensionAccounts.getValue()]
|
|
53
46
|
.concat(add)
|
package/accounts/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/accounts/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../src/accounts/util.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAQnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAAc,EACd,MAAe,EACf,WAA+B,EACC,EAAE;IAClC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IAC/B,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,6BAA6B,CAAA;IACtC,CAAC;IAGD,WAAW,GAAG,uBAAuB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IAGxD,MAAM,eAAe,GAAG,kBAAkB;SACvC,QAAQ,EAAE;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAGnE,WAAW,GAAG,WAAW,CAAC,MAAM,CAC9B,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CACpE,CAAA;IAGD,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACpD,OAAO;QACP,IAAI;QACJ,MAAM;QACN,MAAM;KACP,CAAC,CAAC,CAAA;IAGH,cAAc,CAAC;QACb,GAAG,EAAE,WAAW;QAChB,MAAM,EAAE,eAAe;KACxB,CAAC,CAAA;IAEF,OAAO;QACL,WAAW;QACX,eAAe,EAAE,CAAC,GAAG,eAAe,CAAC;KACtC,CAAA;AACH,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,QAA4B,EAC5B,IAAY,EACZ,EAAE;IACF,QAAQ,GAAG,QAAQ;SAEhB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAEhD,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACjE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,CAAC,OAAO,GAAG,gBAAgB,CAAA;QAClC,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC;SAED,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAA;IAExC,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,GAAG,EACH,MAAM,GAIP,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,CAAC,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC;SACnD,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAA;IAC3E,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA","file":"util.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n ExtensionAccount,\n ProcessExtensionAccountsResult,\n} from '@w3ux/types'\nimport { formatAccountSs58, isValidAddress } from '@w3ux/utils'\nimport { defaultProcessExtensionResult } from '../consts'\nimport { _extensionAccounts } from '../observables'\n\n// Gets accounts to be imported and commits them to state\n\ninterface Config {\n source: string\n ss58: number\n}\nexport const processExtensionAccounts = (\n config: Config,\n signer: unknown,\n newAccounts: ExtensionAccount[]\n): ProcessExtensionAccountsResult => {\n const { source, ss58 } = config\n if (!newAccounts.length) {\n return defaultProcessExtensionResult\n }\n\n // Get valid accounts from extension\n newAccounts = formatExtensionAccounts(newAccounts, ss58)\n\n // Find any accounts that have been removed from this extension\n const removedAccounts = _extensionAccounts\n .getValue()\n .filter((j) => j.source === source)\n .filter((j) => !newAccounts.find((i) => i.address === j.address))\n\n // Remove accounts that have already been imported\n newAccounts = newAccounts.filter(\n ({ address }) =>\n !_extensionAccounts.getValue().find((j) => j.address === address)\n )\n\n // Format accounts properties\n newAccounts = newAccounts.map(({ address, name }) => ({\n address,\n name,\n source,\n signer,\n }))\n\n // Update observable state\n updateAccounts({\n add: newAccounts,\n remove: removedAccounts,\n })\n\n return {\n newAccounts,\n removedAccounts: [...removedAccounts],\n }\n}\n\n// Formats accounts to correct ss58 and removes invalid accounts\nexport const formatExtensionAccounts = (\n accounts: ExtensionAccount[],\n ss58: number\n) => {\n accounts = accounts\n // Remove accounts that do not contain correctly formatted addresses\n .filter(({ address }) => isValidAddress(address))\n // Reformat addresses to ensure default ss58 format\n .map((account) => {\n const formattedAddress = formatAccountSs58(account.address, ss58)\n if (!formattedAddress) {\n return null\n }\n account.address = formattedAddress\n return account\n })\n // Remove null entries resulting from invalid formatted addresses\n .filter((account) => account !== null)\n\n return accounts\n}\n\n// Updates accounts observable based on removed and added accounts\nexport const updateAccounts = ({\n add,\n remove,\n}: {\n add: ExtensionAccount[]\n remove: ExtensionAccount[]\n}) => {\n const newAccounts = [..._extensionAccounts.getValue()]\n .concat(add)\n .filter((a) => remove.find((s) => s.address === a.address) === undefined)\n _extensionAccounts.next(newAccounts)\n}\n"]}
|
package/index.d.ts
ADDED
package/index.js
ADDED
package/index.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA","file":"index.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nexport * from './observables'\nexport * from './util'\n"]}
|
package/local.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import type { ExternalAccount } from '@w3ux/types';
|
|
2
1
|
export declare const isExtensionLocal: (id: string) => boolean;
|
|
3
2
|
export declare const getActiveExtensionsLocal: () => string[];
|
|
4
3
|
export declare const addExtensionToLocal: (id: string) => void;
|
|
5
4
|
export declare const removeExtensionFromLocal: (id: string) => void;
|
|
6
|
-
export declare const getLocalExternalAccounts: (network?: string) => ExternalAccount[];
|
package/local.js
CHANGED
|
@@ -20,13 +20,6 @@ export const removeExtensionFromLocal = (id) => {
|
|
|
20
20
|
localStorage.setItem(activeExtensionsKey, JSON.stringify(current.filter((localId) => localId !== id)));
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
|
-
export const getLocalExternalAccounts = (network) => {
|
|
24
|
-
let localAccounts = localStorageOrDefault('external_extensionAccounts', [], true);
|
|
25
|
-
if (network) {
|
|
26
|
-
localAccounts = localAccounts.filter((l) => l.network === network);
|
|
27
|
-
}
|
|
28
|
-
return localAccounts;
|
|
29
|
-
};
|
|
30
23
|
|
|
31
24
|
//# sourceMappingURL=local.js.map
|
|
32
25
|
|
package/local.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/local.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../src/local.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAG9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAW,EAAE;IACtD,MAAM,OAAO,GAAG,qBAAqB,CAAW,mBAAmB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;AACvD,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAa,EAAE;IACrD,MAAM,OAAO,GAAG,qBAAqB,CAAW,mBAAmB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;AAC9C,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAQ,EAAE;IACtD,MAAM,OAAO,GAAG,qBAAqB,CAAW,mBAAmB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAC9E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACpD,YAAY,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC7E,CAAC;AACH,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAU,EAAQ,EAAE;IAC3D,MAAM,OAAO,GAAG,qBAAqB,CAAW,mBAAmB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAC9E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,YAAY,CAAC,OAAO,CAClB,mBAAmB,EACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAC5D,CAAA;IACH,CAAC;AACH,CAAC,CAAA","file":"local.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { localStorageOrDefault } from '@w3ux/utils'\nimport { activeExtensionsKey } from './consts'\n\n// Check if an extension exists in local storage\nexport const isExtensionLocal = (id: string): boolean => {\n const current = localStorageOrDefault<string[]>(activeExtensionsKey, [], true)\n return Array.isArray(current) && current.includes(id)\n}\n\n// Gets all active extensions from local storage\nexport const getActiveExtensionsLocal = (): string[] => {\n const current = localStorageOrDefault<string[]>(activeExtensionsKey, [], true)\n return Array.isArray(current) ? current : []\n}\n\n// Adds an extension to local storage\nexport const addExtensionToLocal = (id: string): void => {\n const current = localStorageOrDefault<string[]>(activeExtensionsKey, [], true)\n if (Array.isArray(current) && !current.includes(id)) {\n localStorage.setItem(activeExtensionsKey, JSON.stringify([...current, id]))\n }\n}\n\n// Removes extension from local storage\nexport const removeExtensionFromLocal = (id: string): void => {\n const current = localStorageOrDefault<string[]>(activeExtensionsKey, [], true)\n if (Array.isArray(current)) {\n localStorage.setItem(\n activeExtensionsKey,\n JSON.stringify(current.filter((localId) => localId !== id))\n )\n }\n}\n"]}
|
package/package.json
CHANGED
package/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../src/util.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,GACf,MAAM,eAAe,CAAA;AAGtB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAU,EAAmB,EAAE,CACvD,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,IAAI,SAAS,CAAA;AAG/C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,MAAuB,EAAE,EAAE;IAC/D,MAAM,QAAQ,GAAG,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAA;IACpD,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,CAAA;IACrB,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;AAClC,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAU,EAAE,EAAE;IACzC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAA;IACzD,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAU,EAAE,EAAE,CACvC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAGtE,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAC7B,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAA;AAG/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAU,EAAE,EAAE;IAC7C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC,CAAA","file":"util.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type { ExtensionStatus, Sync } from '@w3ux/types'\nimport {\n _extensionAccounts,\n _extensionsStatus,\n _reconnectSync,\n} from './observables'\n\n// Gets an extension status\nexport const getStatus = (id: string): ExtensionStatus =>\n _extensionsStatus.getValue()[id] || undefined\n\n// Sets an extension status\nexport const setStatus = (id: string, status: ExtensionStatus) => {\n const newValue = { ..._extensionsStatus.getValue() }\n newValue[id] = status\n _extensionsStatus.next(newValue)\n}\n\n// Removes an extension status\nexport const removeStatus = (id: string) => {\n const { [id]: _, ...rest } = _extensionsStatus.getValue()\n _extensionsStatus.next(rest)\n}\n\n// Whether an extension can be connected\nexport const canConnect = (id: string) =>\n ![undefined, 'connected'].includes(_extensionsStatus.getValue()[id])\n\n// Reset accounts\nexport const resetAccounts = () => {\n _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 _reconnectSync.next(sync)\n}\n"]}
|