@xyo-network/react-node 2.59.0-rc.2 → 2.59.0

package/dist/esm/hooks/useModuleFromNode.js

@@ -1,96 +1,36 @@
-import { useAsyncEffect } from '@xylabs/react-async-effect';
-import { asModuleInstance, isModuleInstance } from '@xyo-network/module-model';
-import { useDataState } from '@xyo-network/react-shared';
-import { useMemo, useState } from 'react';
+import { usePromise } from '@xylabs/react-promise';
+import { asModuleInstance } from '@xyo-network/module';
+import { useState } from 'react';
 import { useProvidedNode } from './provided';
 export const useModuleFromNode = (nameOrAddress, config) => {
     const [providedNode] = useProvidedNode();
-    const [module, setModule] = useState();
-    const [error, setError] = useState();
-    const [configMemo, setConfigMemo] = useDataState(config);
-    setConfigMemo(config);
-    const address = useMemo(() => module?.address, [module]);
-    useAsyncEffect(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    async (mounted) => {
-        const { logger, node, ...resolverConfig } = configMemo ?? {};
-        const eventUnsubscribe = [];
-        try {
-            const activeNode = node ?? providedNode;
-            if (activeNode) {
-                const attachHandler = (args) => {
-                    const eventModule = args.module;
-                    if (nameOrAddress && (eventModule?.address === nameOrAddress || eventModule?.config?.name === nameOrAddress)) {
-                        logger?.debug(`attachHandler-setting [${nameOrAddress}]`);
-                        if (eventModule) {
-                            if (isModuleInstance(eventModule)) {
-                                setModule(eventModule);
-                                setError(undefined);
-                            }
-                            else {
-                                const error = Error(`Attached module failed identity check [${eventModule.config?.schema}:${eventModule.config?.name}:${eventModule.address}]`);
-                                console.error(error.message);
-                                setModule(undefined);
-                                setError(error);
-                            }
-                        }
-                        else {
-                            setModule(undefined);
-                            setError(undefined);
-                        }
-                    }
-                };
-                const detachHandler = (args) => {
-                    const eventModule = args.module;
-                    if (eventModule.address === address) {
-                        logger?.debug(`detachHandler-clearing [${address}]`);
-                        setModule(undefined);
-                        setError(undefined);
-                    }
-                };
-                const module = nameOrAddress ? await activeNode.resolve(nameOrAddress, resolverConfig) : undefined;
-                if (mounted()) {
-                    const instance = asModuleInstance(module);
-                    if (module) {
-                        if (!instance) {
-                            const error = Error(`Attached module failed identity check [${module.config?.schema}:${module.config?.name}:${module.address}]`);
-                            setModule(undefined);
-                            setError(error);
-                        }
-                        else {
-                            eventUnsubscribe.push(activeNode.on('moduleAttached', attachHandler));
-                            eventUnsubscribe.push(activeNode.on('moduleDetached', detachHandler));
-                            logger?.debug(`resolved [${nameOrAddress}]`);
-                            setModule(instance ?? null);
-                            setError(undefined);
-                        }
-                    }
-                    else {
-                        setModule(undefined);
-                        setError(undefined);
-                    }
+    const { logger, node: paramNode, ...resolveConfig } = config ?? {};
+    const [result, setResult] = useState();
+    const [, error] = usePromise(async () => {
+        logger?.debug('useModuleFromNode: resolving');
+        const activeNode = paramNode ?? providedNode;
+        if (activeNode && nameOrAddress) {
+            activeNode.on('moduleAttached', ({ module }) => {
+                logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`);
+                if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+                    setResult(asModuleInstance(module));
                 }
-            }
-            else {
-                if (mounted()) {
-                    setModule(activeNode ? activeNode : undefined);
-                    setError(undefined);
+            });
+            activeNode.on('moduleDetached', ({ module }) => {
+                logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`);
+                if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+                    setResult(undefined);
                 }
-            }
-            return () => {
-                //remove the event handler on unmount
-                eventUnsubscribe.forEach((func) => func());
-            };
+            });
+            const result = await activeNode.resolve(nameOrAddress, resolveConfig);
+            console.log(`Result: ${result?.address}`);
+            setResult(result);
+            return result;
         }
-        catch (ex) {
-            if (mounted()) {
-                const error = ex;
-                logger?.error(error.message);
-                setError(error);
-                setModule(undefined);
-            }
-        }
-    }, [nameOrAddress, providedNode, address, configMemo]);
-    return [module, error];
+        console.log('Result: No Node');
+        return undefined;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [paramNode, providedNode, nameOrAddress]);
+    return [result, error];
 };
 //# sourceMappingURL=useModuleFromNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAO5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAmD,EAAE;IAC1I,MAAM,CAAC,YAAY,CAAC,GAAG,eAAe,EAAE,CAAA;IACxC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,IAAI,EAAE,CAAA;IAClE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAA8B,CAAA;IAClE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACtC,MAAM,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,SAAS,IAAI,YAAY,CAAA;QAC5C,IAAI,UAAU,IAAI,aAAa,EAAE;YAC/B,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7C,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;iBACpC;YACH,CAAC,CAAC,CAAA;YACF,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7C,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;YACH,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;YACrE,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;YACzC,SAAS,CAAC,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;SACd;QACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAC9B,OAAO,SAAS,CAAA;QAChB,uDAAuD;IACzD,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAA;IAC5C,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/esm/hooks/useModulesFromNode.js

@@ -1,58 +1,32 @@
 import { usePromise } from '@xylabs/react-promise';
-import { isModuleInstance } from '@xyo-network/module-model';
-import { useRefresh } from '@xyo-network/react-module';
-import { useDataState } from '@xyo-network/react-shared';
-import compact from 'lodash/compact';
-import { useEffect, useRef, useState } from 'react';
+import { useState } from 'react';
 import { useProvidedNode } from './provided';
 export const useModulesFromNode = (filter, config) => {
     const [providedNode] = useProvidedNode();
-    const [configMemo, setConfigMemo] = useDataState(config);
-    const [refreshed, refresh] = useRefresh();
-    const [resolvedModules, setResolvedModules] = useState();
-    setConfigMemo(config);
-    //we store this to prevent the need of a deep compare to prevent  re-render
-    const modulesLength = useRef();
-    const eventUnsubscribe = [];
-    const [, resolvedModulesError] = usePromise(async () => {
-        const { logger, ...resolverConfig } = configMemo ?? {};
-        const activeNode = configMemo?.node ?? providedNode;
+    const { logger, node: paramNode, ...resolveConfig } = config ?? {};
+    const [result, setResult] = useState();
+    const [, error] = usePromise(async () => {
+        logger?.debug('useModuleFromNode: resolving');
+        const activeNode = paramNode ?? providedNode;
         if (activeNode) {
-            const allResolvedModules = compact((await activeNode.resolve(filter, resolverConfig)).map((module) => (isModuleInstance(module) ? module : undefined)));
-            logger?.debug(`getModulesFromResolution:allResolvedModules [${allResolvedModules?.length}]`);
-            if (allResolvedModules?.length !== modulesLength.current) {
-                logger?.debug(`getModulesFromResolution-setting: [${allResolvedModules?.length}]`);
-                modulesLength.current = allResolvedModules?.length;
-                setResolvedModules(allResolvedModules);
-                return allResolvedModules?.length;
-            }
+            activeNode.on('moduleAttached', async ({ module }) => {
+                logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`);
+                const moduleInstances = await activeNode.resolve(filter, resolveConfig);
+                setResult(moduleInstances);
+            });
+            activeNode.on('moduleDetached', async ({ module }) => {
+                logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`);
+                const moduleInstances = await activeNode.resolve(filter, resolveConfig);
+                setResult(moduleInstances);
+            });
+            const moduleInstances = await activeNode.resolve(filter, resolveConfig);
+            setResult(moduleInstances);
+            setResult(moduleInstances);
+            return moduleInstances;
         }
-        return modulesLength.current;
-    }, [providedNode, filter, configMemo, refreshed]);
-    useEffect(() => {
-        const { logger, node } = configMemo ?? {};
-        const activeNode = node ?? providedNode;
-        if (activeNode) {
-            while (eventUnsubscribe.length) {
-                eventUnsubscribe.pop()?.();
-            }
-            eventUnsubscribe.push(activeNode.on('moduleAttached', ({ module }) => {
-                logger?.debug(`moduleAttached: useModulesFromNode [${module.config.name ?? module.address}]`);
-                refresh();
-            }));
-            eventUnsubscribe.push(activeNode.on('moduleDetached', ({ module }) => {
-                logger?.debug(`moduleDetached: useModulesFromNode [${module.config.name ?? module.address}]`);
-                refresh();
-            }));
-        }
-        return () => {
-            //unsubscribe events
-            eventUnsubscribe.forEach((func) => func());
-            while (eventUnsubscribe.length) {
-                eventUnsubscribe.pop();
-            }
-        };
-    }, [providedNode, configMemo]);
-    return [resolvedModules, resolvedModulesError];
+        console.log('Result: No Node');
+        return undefined;
+    }, [paramNode, providedNode, filter]);
+    return [result, error];
 };
 //# sourceMappingURL=useModulesFromNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAG5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAE,MAA6B,EAAqD,EAAE;IAC5I,MAAM,CAAC,YAAY,CAAC,GAAG,eAAe,EAAE,CAAA;IACxC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,IAAI,EAAE,CAAA;IAClE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAgC,CAAA;IACpE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACtC,MAAM,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,SAAS,IAAI,YAAY,CAAA;QAC5C,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBACnD,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;gBACvE,SAAS,CAAC,eAAe,CAAC,CAAA;YAC5B,CAAC,CAAC,CAAA;YACF,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBACnD,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;gBACvE,SAAS,CAAC,eAAe,CAAC,CAAA;YAC5B,CAAC,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;YACvE,SAAS,CAAC,eAAe,CAAC,CAAA;YAC1B,SAAS,CAAC,eAAe,CAAC,CAAA;YAC1B,OAAO,eAAe,CAAA;SACvB;QACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAC9B,OAAO,SAAS,CAAA;IAClB,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IACrC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAsC,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACnH,OAAO,EAAoD,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAMlG,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,YAAY,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA2FvI,CAAA"}
+{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKhD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,YAAY,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA8BvI,CAAA"}

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

@@ -1,4 +1,5 @@
-import { ModuleFilter, ModuleInstance } from '@xyo-network/module-model';
+import { ModuleFilter } from '@xyo-network/module';
+import { ModuleInstance } from '@xyo-network/module-model';
 import { ModuleFromNodeConfig } from './useModuleFromNode';
-export declare const useModulesFromNode: (filter?: ModuleFilter, config?: ModuleFromNodeConfig) => [ModuleInstance[] | null | undefined, Error | undefined];
+export declare const useModulesFromNode: (filter?: ModuleFilter, config?: ModuleFromNodeConfig) => [ModuleInstance[] | undefined, Error | undefined];
 //# sourceMappingURL=useModulesFromNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModulesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAO1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,eAAO,MAAM,kBAAkB,YACpB,YAAY,WACZ,oBAAoB,KAC5B,CAAC,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA8DzD,CAAA"}
+{"version":3,"file":"useModulesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,eAAO,MAAM,kBAAkB,YAAa,YAAY,WAAW,oBAAoB,KAAG,CAAC,cAAc,EAAE,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA2BzI,CAAA"}

package/package.json

@@ -17,24 +17,19 @@
     "@xylabs/react-shared": "~2.17.7",
     "@xyo-network/logger": "^2.67.0",
     "@xyo-network/module": "^2.67.0",
-    "@xyo-network/module-events": "^2.67.0",
     "@xyo-network/module-model": "^2.67.0",
     "@xyo-network/node": "^2.67.0",
     "@xyo-network/node-model": "^2.67.0",
-    "@xyo-network/react-module": "~2.59.0-rc.2",
-    "@xyo-network/react-node-context": "~2.59.0-rc.2",
-    "@xyo-network/react-node-provider": "~2.59.0-rc.2",
-    "@xyo-network/react-shared": "~2.59.0-rc.2",
-    "lodash": "^4.17.21"
+    "@xyo-network/react-node-context": "~2.59.0",
+    "@xyo-network/react-node-provider": "~2.59.0"
   },
   "devDependencies": {
     "@storybook/react": "^7.1.1",
-    "@types/lodash": "^4.14.196",
     "@xylabs/ts-scripts-yarn3": "^2.19.0",
     "@xylabs/tsconfig-react": "^2.19.0",
     "@xyo-network/payload-model": "^2.67.0",
-    "@xyo-network/react-storybook": "~2.59.0-rc.2",
-    "@xyo-network/react-wallet": "~2.59.0-rc.2",
+    "@xyo-network/react-storybook": "~2.59.0",
+    "@xyo-network/react-wallet": "~2.59.0",
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
@@ -89,6 +84,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.59.0-rc.2",
-  "stableVersion": "2.58.0"
+  "version": "2.59.0"
 }

package/src/hooks/useModuleFromNode.ts

@@ -0,0 +1,45 @@
+import { usePromise } from '@xylabs/react-promise'
+import { Logger } from '@xyo-network/logger'
+import { asModuleInstance } from '@xyo-network/module'
+import { ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model'
+import { NodeInstance } from '@xyo-network/node'
+import { useState } from 'react'
+
+import { useProvidedNode } from './provided'
+
+export type ModuleFromNodeConfig = ModuleFilterOptions & {
+  logger?: Logger
+  node?: NodeInstance
+}
+
+export const useModuleFromNode = (nameOrAddress?: string, config?: ModuleFromNodeConfig): [ModuleInstance | undefined, Error | undefined] => {
+  const [providedNode] = useProvidedNode()
+  const { logger, node: paramNode, ...resolveConfig } = config ?? {}
+  const [result, setResult] = useState<ModuleInstance | undefined>()
+  const [, error] = usePromise(async () => {
+    logger?.debug('useModuleFromNode: resolving')
+    const activeNode = paramNode ?? providedNode
+    if (activeNode && nameOrAddress) {
+      activeNode.on('moduleAttached', ({ module }) => {
+        logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`)
+        if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+          setResult(asModuleInstance(module))
+        }
+      })
+      activeNode.on('moduleDetached', ({ module }) => {
+        logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`)
+        if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+          setResult(undefined)
+        }
+      })
+      const result = await activeNode.resolve(nameOrAddress, resolveConfig)
+      console.log(`Result: ${result?.address}`)
+      setResult(result)
+      return result
+    }
+    console.log('Result: No Node')
+    return undefined
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [paramNode, providedNode, nameOrAddress])
+  return [result, error]
+}

package/src/hooks/useModulesFromNode.ts

@@ -1,77 +1,36 @@
 import { usePromise } from '@xylabs/react-promise'
-import { EventUnsubscribeFunction } from '@xyo-network/module-events'
-import { isModuleInstance, ModuleFilter, ModuleInstance } from '@xyo-network/module-model'
-import { useRefresh } from '@xyo-network/react-module'
-import { useDataState } from '@xyo-network/react-shared'
-import compact from 'lodash/compact'
-import { useEffect, useRef, useState } from 'react'
+import { ModuleFilter } from '@xyo-network/module'
+import { ModuleInstance } from '@xyo-network/module-model'
+import { useState } from 'react'
 
 import { useProvidedNode } from './provided'
 import { ModuleFromNodeConfig } from './useModuleFromNode'
 
-export const useModulesFromNode = (
-  filter?: ModuleFilter,
-  config?: ModuleFromNodeConfig,
-): [ModuleInstance[] | null | undefined, Error | undefined] => {
+export const useModulesFromNode = (filter?: ModuleFilter, config?: ModuleFromNodeConfig): [ModuleInstance[] | undefined, Error | undefined] => {
   const [providedNode] = useProvidedNode()
-  const [configMemo, setConfigMemo] = useDataState(config)
-  const [refreshed, refresh] = useRefresh()
-  const [resolvedModules, setResolvedModules] = useState<ModuleInstance[]>()
-
-  setConfigMemo(config)
-
-  //we store this to prevent the need of a deep compare to prevent  re-render
-  const modulesLength = useRef<number>()
-
-  const eventUnsubscribe: EventUnsubscribeFunction[] = []
-
-  const [, resolvedModulesError] = usePromise<number | null | undefined>(async () => {
-    const { logger, ...resolverConfig } = configMemo ?? {}
-    const activeNode = configMemo?.node ?? providedNode
-    if (activeNode) {
-      const allResolvedModules = compact(
-        (await activeNode.resolve(filter, resolverConfig)).map((module) => (isModuleInstance(module) ? module : undefined)),
-      )
-      logger?.debug(`getModulesFromResolution:allResolvedModules [${allResolvedModules?.length}]`)
-      if (allResolvedModules?.length !== modulesLength.current) {
-        logger?.debug(`getModulesFromResolution-setting: [${allResolvedModules?.length}]`)
-        modulesLength.current = allResolvedModules?.length
-        setResolvedModules(allResolvedModules)
-        return allResolvedModules?.length
-      }
-    }
-    return modulesLength.current
-  }, [providedNode, filter, configMemo, refreshed])
-
-  useEffect(() => {
-    const { logger, node } = configMemo ?? {}
-    const activeNode = node ?? providedNode
+  const { logger, node: paramNode, ...resolveConfig } = config ?? {}
+  const [result, setResult] = useState<ModuleInstance[] | undefined>()
+  const [, error] = usePromise(async () => {
+    logger?.debug('useModuleFromNode: resolving')
+    const activeNode = paramNode ?? providedNode
     if (activeNode) {
-      while (eventUnsubscribe.length) {
-        eventUnsubscribe.pop()?.()
-      }
-      eventUnsubscribe.push(
-        activeNode.on('moduleAttached', ({ module }) => {
-          logger?.debug(`moduleAttached: useModulesFromNode [${module.config.name ?? module.address}]`)
-          refresh()
-        }),
-      )
-      eventUnsubscribe.push(
-        activeNode.on('moduleDetached', ({ module }) => {
-          logger?.debug(`moduleDetached: useModulesFromNode [${module.config.name ?? module.address}]`)
-          refresh()
-        }),
-      )
+      activeNode.on('moduleAttached', async ({ module }) => {
+        logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`)
+        const moduleInstances = await activeNode.resolve(filter, resolveConfig)
+        setResult(moduleInstances)
+      })
+      activeNode.on('moduleDetached', async ({ module }) => {
+        logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`)
+        const moduleInstances = await activeNode.resolve(filter, resolveConfig)
+        setResult(moduleInstances)
+      })
+      const moduleInstances = await activeNode.resolve(filter, resolveConfig)
+      setResult(moduleInstances)
+      setResult(moduleInstances)
+      return moduleInstances
     }
-
-    return () => {
-      //unsubscribe events
-      eventUnsubscribe.forEach((func) => func())
-      while (eventUnsubscribe.length) {
-        eventUnsubscribe.pop()
-      }
-    }
-  }, [providedNode, configMemo])
-
-  return [resolvedModules, resolvedModulesError]
+    console.log('Result: No Node')
+    return undefined
+  }, [paramNode, providedNode, filter])
+  return [result, error]
 }

package/src/hooks/useModuleFromNode.tsx

@@ -1,107 +0,0 @@
-import { useAsyncEffect } from '@xylabs/react-async-effect'
-import { Logger } from '@xyo-network/logger'
-import { EventUnsubscribeFunction } from '@xyo-network/module-events'
-import { asModuleInstance, isModuleInstance, ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model'
-import { ModuleAttachedEventArgs, ModuleDetachedEventArgs, NodeInstance } from '@xyo-network/node'
-import { useDataState } from '@xyo-network/react-shared'
-import { useMemo, useState } from 'react'
-
-import { useProvidedNode } from './provided'
-
-export type ModuleFromNodeConfig = ModuleFilterOptions & {
-  logger?: Logger
-  node?: NodeInstance
-}
-
-export const useModuleFromNode = (nameOrAddress?: string, config?: ModuleFromNodeConfig): [ModuleInstance | undefined, Error | undefined] => {
-  const [providedNode] = useProvidedNode()
-  const [module, setModule] = useState<ModuleInstance>()
-  const [error, setError] = useState<Error>()
-  const [configMemo, setConfigMemo] = useDataState(config)
-
-  setConfigMemo(config)
-
-  const address = useMemo(() => module?.address, [module])
-
-  useAsyncEffect(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    async (mounted) => {
-      const { logger, node, ...resolverConfig } = configMemo ?? {}
-      const eventUnsubscribe: EventUnsubscribeFunction[] = []
-      try {
-        const activeNode = node ?? providedNode
-        if (activeNode) {
-          const attachHandler = (args: ModuleAttachedEventArgs) => {
-            const eventModule = args.module
-            if (nameOrAddress && (eventModule?.address === nameOrAddress || eventModule?.config?.name === nameOrAddress)) {
-              logger?.debug(`attachHandler-setting [${nameOrAddress}]`)
-              if (eventModule) {
-                if (isModuleInstance(eventModule)) {
-                  setModule(eventModule)
-                  setError(undefined)
-                } else {
-                  const error = Error(
-                    `Attached module failed identity check [${eventModule.config?.schema}:${eventModule.config?.name}:${eventModule.address}]`,
-                  )
-                  console.error(error.message)
-                  setModule(undefined)
-                  setError(error)
-                }
-              } else {
-                setModule(undefined)
-                setError(undefined)
-              }
-            }
-          }
-          const detachHandler = (args: ModuleDetachedEventArgs) => {
-            const eventModule = args.module
-            if (eventModule.address === address) {
-              logger?.debug(`detachHandler-clearing [${address}]`)
-              setModule(undefined)
-              setError(undefined)
-            }
-          }
-          const module = nameOrAddress ? await activeNode.resolve(nameOrAddress, resolverConfig) : undefined
-          if (mounted()) {
-            const instance = asModuleInstance(module)
-            if (module) {
-              if (!instance) {
-                const error = Error(`Attached module failed identity check [${module.config?.schema}:${module.config?.name}:${module.address}]`)
-                setModule(undefined)
-                setError(error)
-              } else {
-                eventUnsubscribe.push(activeNode.on('moduleAttached', attachHandler))
-                eventUnsubscribe.push(activeNode.on('moduleDetached', detachHandler))
-                logger?.debug(`resolved [${nameOrAddress}]`)
-                setModule(instance ?? null)
-                setError(undefined)
-              }
-            } else {
-              setModule(undefined)
-              setError(undefined)
-            }
-          }
-        } else {
-          if (mounted()) {
-            setModule(activeNode ? activeNode : undefined)
-            setError(undefined)
-          }
-        }
-        return () => {
-          //remove the event handler on unmount
-          eventUnsubscribe.forEach((func) => func())
-        }
-      } catch (ex) {
-        if (mounted()) {
-          const error = ex as Error
-          logger?.error(error.message)
-          setError(error)
-          setModule(undefined)
-        }
-      }
-    },
-    [nameOrAddress, providedNode, address, configMemo],
-  )
-
-  return [module, error]
-}