@xyo-network/react-node 2.55.8 → 2.55.10

package/dist/esm/hooks/useModule.js

@@ -1,10 +1,10 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect';
 import { useMemo, useState } from 'react';
 import { useProvidedWrappedNode } from './useProvidedNode';
-export const useModule = (nameOrAddressOrFilter, account, logger) => {
+export const useModule = (nameOrAddressOrFilter, wallet, logger) => {
     const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
     const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
-    const [node, nodeError] = useProvidedWrappedNode(account);
+    const [node, nodeError] = useProvidedWrappedNode(wallet);
     const [module, setModule] = useState();
     const [error, setError] = useState();
     const address = useMemo(() => module?.address, [module]);

package/dist/esm/hooks/useModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"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"}

package/dist/esm/hooks/useModules.js

@@ -1,38 +1,23 @@
-import { useAsyncEffect } from '@xylabs/react-async-effect';
-import { useRef, useState } from 'react';
+import { usePromise } from '@xylabs/react-promise';
+import { useEffect, useRef } from 'react';
 import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModules = (filter, logger) => {
     const [node, nodeError] = useProvidedWrappedNode();
-    const [modules, setModules] = useState();
-    const [error, setError] = useState();
     const modulesLength = useRef();
-    useAsyncEffect(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    async (mounted) => {
-        /* Check pre-conditions */
-        if (nodeError || !node || !filter) {
-            if (mounted()) {
-                nodeError && logger?.error(nodeError.message);
-                modulesLength.current = undefined;
-                setModules(undefined);
-                setError(nodeError);
-            }
-            return;
-        }
-        const eventUnsubscribe = [];
-        try {
-            const getModulesFromResolution = async () => {
+    const eventUnsubscribe = [];
+    const [resolvedModules, resolvedModulesError] = usePromise(async () => {
+        const getModulesFromResolution = async () => {
+            if (node) {
                 const resolvedModules = await node.resolve(filter);
-                if (mounted()) {
-                    if (resolvedModules.length !== modulesLength.current) {
-                        logger?.debug(`getModulesFromResolution-setting: [${resolvedModules.length}]`);
-                        modulesLength.current = resolvedModules.length;
-                        setModules(resolvedModules);
-                        setError(undefined);
-                    }
+                if (resolvedModules?.length !== modulesLength.current) {
+                    logger?.debug(`getModulesFromResolution-setting: [${resolvedModules?.length}]`);
+                    modulesLength.current = resolvedModules?.length;
+                    return resolvedModules;
                 }
-            };
-            await getModulesFromResolution();
+            }
+        };
+        const modules = await getModulesFromResolution();
+        if (node) {
             eventUnsubscribe.push(node.on('moduleAttached', async () => {
                 logger?.debug('moduleAttached: getModulesFromResolution');
                 await getModulesFromResolution();
@@ -41,29 +26,15 @@ export const useModules = (filter, logger) => {
                 logger?.debug('moduleDetached: getModulesFromResolution');
                 await getModulesFromResolution();
             }));
-            //TODO: Obviously get rid of this timer
-            const timeoutFunc = async () => {
-                await getModulesFromResolution();
-                if (mounted()) {
-                    setTimeout(timeoutFunc, 1000);
-                }
-            };
-            setTimeout(timeoutFunc, 1000);
-        }
-        catch (ex) {
-            if (mounted()) {
-                const error = ex;
-                logger?.error(`useModules: useAsyncEffect [${error.message}]`);
-                modulesLength.current = undefined;
-                setModules(undefined);
-                setError(error);
-            }
         }
+        return modules;
+    }, [node, filter, logger]);
+    useEffect(() => {
         return () => {
             //unsubscribe events
             eventUnsubscribe.forEach((func) => func());
         };
     }, [filter, node, logger, nodeError]);
-    return [modules, error];
+    return [resolvedModules, resolvedModulesError];
 };
 //# sourceMappingURL=useModules.js.map

package/dist/esm/hooks/useModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAAE,MAAe,EAA8C,EAAE;IAChJ,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAElD,MAAM,aAAa,GAAG,MAAM,EAAU,CAAA;IAEtC,MAAM,gBAAgB,GAA+B,EAAE,CAAA;IAEvD,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,GAAG,UAAU,CAAwB,KAAK,IAAI,EAAE;QAC3F,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;YAC1C,IAAI,IAAI,EAAE;gBACR,MAAM,eAAe,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;gBAClF,IAAI,eAAe,EAAE,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE;oBACrD,MAAM,EAAE,KAAK,CAAC,sCAAsC,eAAe,EAAE,MAAM,GAAG,CAAC,CAAA;oBAC/E,aAAa,CAAC,OAAO,GAAG,eAAe,EAAE,MAAM,CAAA;oBAC/C,OAAO,eAAe,CAAA;iBACvB;aACF;QACH,CAAC,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,wBAAwB,EAAE,CAAA;QAEhD,IAAI,IAAI,EAAE;YACR,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBACnC,MAAM,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,MAAM,wBAAwB,EAAE,CAAA;YAClC,CAAC,CAAC,CACH,CAAA;YACD,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBACnC,MAAM,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,MAAM,wBAAwB,EAAE,CAAA;YAClC,CAAC,CAAC,CACH,CAAA;SACF;QACD,OAAO,OAAO,CAAA;IAChB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAE1B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,oBAAoB;YACpB,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IAErC,OAAO,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAA;AAChD,CAAC,CAAA"}

package/dist/esm/hooks/useProvidedNode.js

@@ -1,28 +1,20 @@
 import { NodeWrapper } from '@xyo-network/node';
 import { NodeContext } from '@xyo-network/react-node-context';
-import { useAccount } from '@xyo-network/react-wallet';
+import { useWallet } from '@xyo-network/react-wallet';
 import { useContext, useEffect, useState } from 'react';
 export const useProvidedNode = () => {
     const { node } = useContext(NodeContext);
     return [node];
 };
-export const useProvidedWrappedNode = (account) => {
-    const [accountToUse] = useAccount({ account });
+export const useProvidedWrappedNode = (wallet) => {
+    const [walletToUse] = useWallet({ wallet });
     const [node] = useProvidedNode();
     const [wrappedNode, setWrappedNode] = useState();
     const [error, setError] = useState();
-    /*
-    useEffect(() => {
-      if (!accountToUse) {
-        const error = Error('useProvidedWrappedNode requires either an Account context or account parameter')
-        setError(error)
-      }
-    }, [accountToUse])
-    */
     useEffect(() => {
         try {
-            if (node && accountToUse) {
-                setWrappedNode(NodeWrapper.wrap(node, accountToUse));
+            if (node && walletToUse) {
+                setWrappedNode(NodeWrapper.wrap(node, walletToUse));
                 setError(undefined);
             }
             else {
@@ -34,7 +26,7 @@ export const useProvidedWrappedNode = (account) => {
             setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, accountToUse]);
+    }, [node, walletToUse]);
     return [wrappedNode, error];
 };
 //# sourceMappingURL=useProvidedNode.js.map

package/dist/esm/hooks/useProvidedNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C;;;;;;;MAOE;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,YAAY,EAAE;gBACxB,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;gBACpD,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;iBAAM;gBACL,cAAc,CAAC,SAAS,CAAC,CAAA;gBACzB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,cAAc,CAAC,SAAS,CAAC,CAAA;YACzB,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;IAExB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAgD,EAAE;IAC9G,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,WAAW,EAAE;gBACvB,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;gBACnD,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;iBAAM;gBACL,cAAc,CAAC,SAAS,CAAC,CAAA;gBACzB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,cAAc,CAAC,SAAS,CAAC,CAAA;YACzB,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;IAEvB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA"}

package/dist/esm/hooks/useWrappedModule.js

@@ -1,27 +1,29 @@
 import { ModuleWrapper } from '@xyo-network/module';
-import { useAccount } from '@xyo-network/react-wallet';
+import { useWallet } from '@xyo-network/react-wallet';
 import { useEffect, useState } from 'react';
 import { useModule } from './useModule';
 export const WrappedModuleHookFactory = (wrapperObject, name) => {
-    const useHook = (nameOrAddress, account, logger) => {
+    const useHook = (nameOrAddress, wallet, logger) => {
         logger?.debug(`Render: ${name}`);
-        const [accountToUse] = useAccount({ account });
+        const [walletToUse] = useWallet({ wallet });
         const [module, moduleError] = useModule(nameOrAddress ?? {
             query: [wrapperObject.requiredQueries],
-        }, account, logger);
+        }, walletToUse, logger);
         const [wrapper, setWrapper] = useState();
         const [error, setError] = useState();
+        /*
         useEffect(() => {
-            if (!accountToUse) {
-                const error = Error('Module hooks require either an Account context or account parameter');
-                //console.error(error.message)
-                setError(error);
-            }
-        }, [accountToUse]);
+          if (!walletToUse) {
+            const error = Error('Module hooks require either an Account context or account parameter')
+            //console.error(error.message)
+            setError(error)
+          }
+        }, [walletToUse])
+        */
         useEffect(() => {
-            if (module && accountToUse) {
+            if (module && walletToUse) {
                 try {
-                    const wrapper = wrapperObject.wrap(module, accountToUse);
+                    const wrapper = wrapperObject.wrap(module, walletToUse);
                     setWrapper(wrapper);
                     setError(undefined);
                 }
@@ -34,7 +36,7 @@ export const WrappedModuleHookFactory = (wrapperObject, name) => {
                 setWrapper(undefined);
                 setError(moduleError);
             }
-        }, [module, account, moduleError, accountToUse]);
+        }, [module, wallet, moduleError, walletToUse]);
         return [wrapper, error];
     };
     return useHook;

package/dist/esm/hooks/useWrappedModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAE,MAAe,EAAmD,EAAE;QACtI,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CACrC,aAAa,IAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,EACD,OAAO,EACP,MAAM,CACP,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;QAE3C,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,KAAK,GAAG,KAAK,CAAC,qEAAqE,CAAC,CAAA;gBAC1F,8BAA8B;gBAC9B,QAAQ,CAAC,KAAK,CAAC,CAAA;aAChB;QACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;QAElB,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,MAAM,IAAI,YAAY,EAAE;gBAC1B,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;oBACxD,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;QAEhD,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA"}
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,MAAuB,EAAE,MAAe,EAAmD,EAAE;QACpI,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CACrC,aAAa,IAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,EACD,WAAW,EACX,MAAM,CACP,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;QAE3C;;;;;;;;UAQE;QAEF,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,MAAM,IAAI,WAAW,EAAE;gBACzB,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;oBACvD,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;QAE9C,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA"}

package/dist/types/hooks/useModule.d.ts

@@ -1,6 +1,6 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { Logger } from '@xyo-network/core';
 import { Module, ModuleFilter } from '@xyo-network/module-model';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export declare const useModule: <TModule extends Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
     readonly name?: string | undefined;
@@ -57,5 +57,5 @@ export declare const useModule: <TModule extends Module<import("@xyo-network/mod
     readonly storeQueries?: boolean | undefined;
 } & Omit<undefined, "schema">, "schema"> & {
     schema: string;
-}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>(nameOrAddressOrFilter?: string | ModuleFilter, account?: AccountInstance, logger?: Logger) => [TModule | undefined, Error | undefined];
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>(nameOrAddressOrFilter?: string | ModuleFilter, wallet?: WalletInstance, logger?: Logger) => [TModule | undefined, Error | undefined];
 //# sourceMappingURL=useModule.d.ts.map

package/dist/types/hooks/useModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAMhE,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kGACI,MAAM,GAAG,YAAY,YACnC,eAAe,WAChB,MAAM,6CAkEhB,CAAA"}
+{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kGACI,MAAM,GAAG,YAAY,WACpC,cAAc,WACd,MAAM,6CAkEhB,CAAA"}

package/dist/types/hooks/useModules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKhE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mFAA8C,YAAY,WAAW,MAAM,+CA0EjG,CAAA"}
+{"version":3,"file":"useModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKhE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mFAA8C,YAAY,WAAW,MAAM,+CA8CjG,CAAA"}

package/dist/types/hooks/useProvidedNode.d.ts

@@ -1,5 +1,5 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { NodeModule, NodeWrapper } from '@xyo-network/node';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export declare const useProvidedNode: () => [NodeModule | undefined];
-export declare const useProvidedWrappedNode: (account?: AccountInstance) => [NodeWrapper | undefined, Error | undefined];
+export declare const useProvidedWrappedNode: (wallet?: WalletInstance) => [NodeWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useProvidedNode.d.ts.map

package/dist/types/hooks/useProvidedNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,SAAS,CAIzD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,eAAe,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA+B7G,CAAA"}
+{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG1D,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,SAAS,CAIzD,CAAA;AAED,eAAO,MAAM,sBAAsB,YAAa,cAAc,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAsB3G,CAAA"}

package/dist/types/hooks/useWrappedModule.d.ts

@@ -1,6 +1,6 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { Logger } from '@xyo-network/core';
 import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export declare const WrappedModuleHookFactory: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
     readonly name?: string | undefined;
@@ -29,8 +29,8 @@ export declare const WrappedModuleHookFactory: <TModuleWrapper extends ModuleWra
     readonly storeQueries?: boolean | undefined;
 } & Omit<undefined, "schema">, "schema"> & {
     schema: string;
-}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (nameOrAddress?: string, account?: AccountInstance, logger?: Logger) => [TModuleWrapper | undefined, Error | undefined];
-export declare const useWrappedModule: (nameOrAddress?: string, account?: AccountInstance, logger?: Logger) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (nameOrAddress?: string, wallet?: WalletInstance, logger?: Logger) => [TModuleWrapper | undefined, Error | undefined];
+export declare const useWrappedModule: (nameOrAddress?: string, wallet?: WalletInstance, logger?: Logger) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
     readonly name?: string | undefined;
     readonly paging?: Record<string, {

package/dist/types/hooks/useWrappedModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAM/E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;6IAE5B,MAAM,sBAEoB,MAAM,YAAY,eAAe,WAAW,MAAM,oDAyCpF,CAAA;AAED,eAAO,MAAM,gBAAgB,mBA3CM,MAAM,YAAY,eAAe,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;yGA2CM,CAAA"}
+{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;6IAE5B,MAAM,sBAEoB,MAAM,WAAW,cAAc,WAAW,MAAM,oDA2ClF,CAAA;AAED,eAAO,MAAM,gBAAgB,mBA7CM,MAAM,WAAW,cAAc,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;yGA6CQ,CAAA"}

package/package.json

@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@mui/lab": "^5.0.0-alpha.134",
-    "@xylabs/react-async-effect": "^2.17.4",
-    "@xylabs/react-flexbox": "^2.17.4",
-    "@xylabs/react-shared": "^2.17.4",
-    "@xyo-network/account-model": "^2.63.6",
-    "@xyo-network/core": "^2.63.6",
-    "@xyo-network/module": "^2.63.6",
-    "@xyo-network/module-model": "^2.63.6",
-    "@xyo-network/node": "^2.63.6",
-    "@xyo-network/react-node-context": "^2.55.8",
-    "@xyo-network/react-node-provider": "^2.55.8",
-    "@xyo-network/react-wallet": "^2.55.8",
-    "@xyo-network/wallet-model": "^2.63.6",
+    "@xylabs/react-async-effect": "^2.17.6",
+    "@xylabs/react-flexbox": "^2.17.6",
+    "@xylabs/react-promise": "^2.17.6",
+    "@xylabs/react-shared": "^2.17.6",
+    "@xyo-network/core": "^2.63.10",
+    "@xyo-network/module": "^2.63.10",
+    "@xyo-network/module-model": "^2.63.10",
+    "@xyo-network/node": "^2.63.10",
+    "@xyo-network/react-node-context": "^2.55.10",
+    "@xyo-network/react-node-provider": "^2.55.10",
+    "@xyo-network/react-wallet": "^2.55.10",
+    "@xyo-network/wallet-model": "^2.63.10",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -30,8 +30,8 @@
     "@types/lodash": "^4.14.195",
     "@xylabs/ts-scripts-yarn3": "^2.17.17",
     "@xylabs/tsconfig-react": "^2.17.17",
-    "@xyo-network/react-storybook": "^2.55.8",
-    "@xyo-network/react-wallet": "^2.55.8",
+    "@xyo-network/react-storybook": "^2.55.10",
+    "@xyo-network/react-wallet": "^2.55.10",
     "typescript": "^5.1.3"
   },
   "peerDependencies": {
@@ -86,5 +86,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.55.8"
+  "version": "2.55.10"
 }

package/src/hooks/useModule.tsx

@@ -1,21 +1,21 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect'
-import { AccountInstance } from '@xyo-network/account-model'
 import { Logger } from '@xyo-network/core'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
 import { Module, ModuleFilter } from '@xyo-network/module-model'
 import { ModuleAttachedEventArgs, ModuleDetachedEventArgs } from '@xyo-network/node'
+import { WalletInstance } from '@xyo-network/wallet-model'
 import { useMemo, useState } from 'react'
 
 import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useModule = <TModule extends Module = Module>(
   nameOrAddressOrFilter?: string | ModuleFilter,
-  account?: AccountInstance,
+  wallet?: WalletInstance,
   logger?: Logger,
 ): [TModule | undefined, Error | undefined] => {
   const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
   const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
-  const [node, nodeError] = useProvidedWrappedNode(account)
+  const [node, nodeError] = useProvidedWrappedNode(wallet)
   const [module, setModule] = useState<TModule>()
   const [error, setError] = useState<Error>()
 

package/src/hooks/useModules.ts

@@ -1,83 +1,55 @@
-import { useAsyncEffect } from '@xylabs/react-async-effect'
+import { usePromise } from '@xylabs/react-promise'
 import { Logger } from '@xyo-network/core'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
 import { Module, ModuleFilter } from '@xyo-network/module-model'
-import { useRef, useState } from 'react'
+import { useEffect, useRef } from 'react'
 
 import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useModules = <TModule extends Module = Module>(filter?: ModuleFilter, logger?: Logger): [TModule[] | undefined, Error | undefined] => {
   const [node, nodeError] = useProvidedWrappedNode()
-  const [modules, setModules] = useState<TModule[]>()
-  const [error, setError] = useState<Error>()
 
   const modulesLength = useRef<number>()
 
-  useAsyncEffect(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    async (mounted) => {
-      /* Check pre-conditions */
-      if (nodeError || !node || !filter) {
-        if (mounted()) {
-          nodeError && logger?.error(nodeError.message)
-          modulesLength.current = undefined
-          setModules(undefined)
-          setError(nodeError)
+  const eventUnsubscribe: EventUnsubscribeFunction[] = []
+
+  const [resolvedModules, resolvedModulesError] = usePromise<TModule[] | undefined>(async () => {
+    const getModulesFromResolution = async () => {
+      if (node) {
+        const resolvedModules: TModule[] | undefined = await node.resolve<TModule>(filter)
+        if (resolvedModules?.length !== modulesLength.current) {
+          logger?.debug(`getModulesFromResolution-setting: [${resolvedModules?.length}]`)
+          modulesLength.current = resolvedModules?.length
+          return resolvedModules
         }
-        return
       }
+    }
 
-      const eventUnsubscribe: EventUnsubscribeFunction[] = []
-
-      try {
-        const getModulesFromResolution = async () => {
-          const resolvedModules: TModule[] | undefined = await node.resolve<TModule>(filter)
-          if (mounted()) {
-            if (resolvedModules.length !== modulesLength.current) {
-              logger?.debug(`getModulesFromResolution-setting: [${resolvedModules.length}]`)
-              modulesLength.current = resolvedModules.length
-              setModules(resolvedModules)
-              setError(undefined)
-            }
-          }
-        }
-        await getModulesFromResolution()
+    const modules = await getModulesFromResolution()
 
-        eventUnsubscribe.push(
-          node.on('moduleAttached', async () => {
-            logger?.debug('moduleAttached: getModulesFromResolution')
-            await getModulesFromResolution()
-          }),
-        )
-        eventUnsubscribe.push(
-          node.on('moduleDetached', async () => {
-            logger?.debug('moduleDetached: getModulesFromResolution')
-            await getModulesFromResolution()
-          }),
-        )
-        //TODO: Obviously get rid of this timer
-        const timeoutFunc = async () => {
+    if (node) {
+      eventUnsubscribe.push(
+        node.on('moduleAttached', async () => {
+          logger?.debug('moduleAttached: getModulesFromResolution')
           await getModulesFromResolution()
-          if (mounted()) {
-            setTimeout(timeoutFunc, 1000)
-          }
-        }
-        setTimeout(timeoutFunc, 1000)
-      } catch (ex) {
-        if (mounted()) {
-          const error = ex as Error
-          logger?.error(`useModules: useAsyncEffect [${error.message}]`)
-          modulesLength.current = undefined
-          setModules(undefined)
-          setError(error)
-        }
-      }
-      return () => {
-        //unsubscribe events
-        eventUnsubscribe.forEach((func) => func())
-      }
-    },
-    [filter, node, logger, nodeError],
-  )
-  return [modules, error]
+        }),
+      )
+      eventUnsubscribe.push(
+        node.on('moduleDetached', async () => {
+          logger?.debug('moduleDetached: getModulesFromResolution')
+          await getModulesFromResolution()
+        }),
+      )
+    }
+    return modules
+  }, [node, filter, logger])
+
+  useEffect(() => {
+    return () => {
+      //unsubscribe events
+      eventUnsubscribe.forEach((func) => func())
+    }
+  }, [filter, node, logger, nodeError])
+
+  return [resolvedModules, resolvedModulesError]
 }

package/src/hooks/useProvidedNode.tsx

@@ -1,7 +1,7 @@
-import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
 import { NodeContext } from '@xyo-network/react-node-context'
-import { useAccount } from '@xyo-network/react-wallet'
+import { useWallet } from '@xyo-network/react-wallet'
+import { WalletInstance } from '@xyo-network/wallet-model'
 import { useContext, useEffect, useState } from 'react'
 
 export const useProvidedNode = (): [NodeModule | undefined] => {
@@ -10,25 +10,16 @@ export const useProvidedNode = (): [NodeModule | undefined] => {
   return [node]
 }
 
-export const useProvidedWrappedNode = (account?: AccountInstance): [NodeWrapper | undefined, Error | undefined] => {
-  const [accountToUse] = useAccount({ account })
+export const useProvidedWrappedNode = (wallet?: WalletInstance): [NodeWrapper | undefined, Error | undefined] => {
+  const [walletToUse] = useWallet({ wallet })
   const [node] = useProvidedNode()
   const [wrappedNode, setWrappedNode] = useState<NodeWrapper>()
   const [error, setError] = useState<Error>()
 
-  /*
-  useEffect(() => {
-    if (!accountToUse) {
-      const error = Error('useProvidedWrappedNode requires either an Account context or account parameter')
-      setError(error)
-    }
-  }, [accountToUse])
-  */
-
   useEffect(() => {
     try {
-      if (node && accountToUse) {
-        setWrappedNode(NodeWrapper.wrap(node, accountToUse))
+      if (node && walletToUse) {
+        setWrappedNode(NodeWrapper.wrap(node, walletToUse))
         setError(undefined)
       } else {
         setWrappedNode(undefined)
@@ -38,7 +29,7 @@ export const useProvidedWrappedNode = (account?: AccountInstance): [NodeWrapper
       setWrappedNode(undefined)
       setError(ex as Error)
     }
-  }, [node, accountToUse])
+  }, [node, walletToUse])
 
   return [wrappedNode, error]
 }

package/src/hooks/useWrappedModule.tsx

@@ -1,7 +1,7 @@
-import { AccountInstance } from '@xyo-network/account-model'
 import { Logger } from '@xyo-network/core'
 import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
-import { useAccount } from '@xyo-network/react-wallet'
+import { useWallet } from '@xyo-network/react-wallet'
+import { WalletInstance } from '@xyo-network/wallet-model'
 import { useEffect, useState } from 'react'
 
 import { useModule } from './useModule'
@@ -10,32 +10,34 @@ export const WrappedModuleHookFactory = <TModuleWrapper extends ModuleWrapper>(
   wrapperObject: ConstructableModuleWrapper<TModuleWrapper>,
   name?: string,
 ) => {
-  const useHook = (nameOrAddress?: string, account?: AccountInstance, logger?: Logger): [TModuleWrapper | undefined, Error | undefined] => {
+  const useHook = (nameOrAddress?: string, wallet?: WalletInstance, logger?: Logger): [TModuleWrapper | undefined, Error | undefined] => {
     logger?.debug(`Render: ${name}`)
-    const [accountToUse] = useAccount({ account })
+    const [walletToUse] = useWallet({ wallet })
     const [module, moduleError] = useModule<TModuleWrapper['module']>(
       nameOrAddress ?? {
         query: [wrapperObject.requiredQueries],
       },
-      account,
+      walletToUse,
       logger,
     )
 
     const [wrapper, setWrapper] = useState<TModuleWrapper>()
     const [error, setError] = useState<Error>()
 
+    /*
     useEffect(() => {
-      if (!accountToUse) {
+      if (!walletToUse) {
         const error = Error('Module hooks require either an Account context or account parameter')
         //console.error(error.message)
         setError(error)
       }
-    }, [accountToUse])
+    }, [walletToUse])
+    */
 
     useEffect(() => {
-      if (module && accountToUse) {
+      if (module && walletToUse) {
         try {
-          const wrapper = wrapperObject.wrap(module, accountToUse)
+          const wrapper = wrapperObject.wrap(module, walletToUse)
           setWrapper(wrapper)
           setError(undefined)
         } catch (ex) {
@@ -46,7 +48,7 @@ export const WrappedModuleHookFactory = <TModuleWrapper extends ModuleWrapper>(
         setWrapper(undefined)
         setError(moduleError)
       }
-    }, [module, account, moduleError, accountToUse])
+    }, [module, wallet, moduleError, walletToUse])
 
     return [wrapper, error]
   }