@xyo-network/react-node 2.45.0-rc.17 → 2.45.0-rc.19

package/dist/esm/hooks/index.js

@@ -1,16 +1,8 @@
-export * from './useArchiveArchivists';
-export * from './useArchivistModule';
-export * from './useArchivistModules';
-export * from './useDivinerModule';
-export * from './useDivinerModules';
 export * from './useMemoryNodeUpdates';
 export * from './useModule';
-export * from './useModuleAddresses';
 export * from './useModules';
 export * from './useNode';
-export * from './useNodeQueryDiviner';
+export * from './useNodeAttachedAddresses';
 export * from './useProvidedNode';
-export * from './useWitnessModule';
-export * from './useWitnessModules';
 export * from './useWrappedModule';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,4BAA4B,CAAA;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}

package/dist/esm/hooks/useMemoryNodeUpdates.js

@@ -5,7 +5,7 @@ export const useMemoryNodeUpdates = (refreshAddresses) => {
     const [module, setModule] = useState();
     useEffect(() => {
         if (node) {
-            const onFunc = node.on;
+            const onFunc = node.module.on;
             onFunc('moduleAttached', (args) => {
                 if (refreshAddresses) {
                     if (refreshAddresses.some((address) => address === args?.module.address))

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

@@ -1 +1 @@
-{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAA2B,CAAA;IAE/D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,EAAsC,CAAA;YAC1D,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAA2B,CAAA;IAE/D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAsC,CAAA;YACjE,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useModule.js

@@ -1,31 +1,39 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { NodeWrapper } from '@xyo-network/node';
 import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModule = (nameOrAddress) => {
-    const [node, nodeError] = useProvidedNode();
+    const [node, nodeError] = useProvidedWrappedNode();
     const [module, setModule] = useState();
     const [error, setError] = useState();
+    const address = module?.address;
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+        const detachHandler = (args) => {
+            const eventModule = args.module;
+            if (eventModule.address === address && mounted()) {
+                setModule(undefined);
+                setError(undefined);
+            }
+        };
         try {
             if (nodeError) {
-                console.log(`Setting NodeError [${nodeError.message}]`);
                 setError(nodeError);
                 setModule(undefined);
             }
             else {
-                const wrappedNode = NodeWrapper.tryWrap(node);
-                if (wrappedNode) {
-                    const module = nameOrAddress
-                        ? await wrappedNode?.resolve(nameOrAddress)
-                        : (await wrappedNode.resolve()).pop();
+                if (node) {
+                    const emitter = node.module;
+                    const module = nameOrAddress ? await node.resolve(nameOrAddress) : (await node.resolve()).pop();
                     if (mounted()) {
-                        console.log(`Setting Module [${module?.address}]`);
+                        emitter.on('moduleDetached', detachHandler);
                         setModule(module);
                         setError(undefined);
                     }
+                    return () => {
+                        //remove the event handler on unmount
+                        emitter.on('moduleDetached', detachHandler, true);
+                    };
                 }
                 else {
                     console.log('Setting All to undefined');
@@ -42,7 +50,7 @@ export const useModule = (nameOrAddress) => {
                 setModule(undefined);
             }
         }
-    }, [nameOrAddress, node, nodeError]);
+    }, [nameOrAddress, node, nodeError, address]);
     return [module, error];
 };
 //# sourceMappingURL=useModule.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,EAAE,CAAA;IAC3C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,SAAS,CAAC,OAAO,GAAG,CAAC,CAAA;gBACvD,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC7C,IAAI,WAAW,EAAE;oBACf,MAAM,MAAM,GAAwB,aAAa;wBAC/C,CAAC,CAAC,MAAM,WAAW,EAAE,OAAO,CAAU,aAAa,CAAC;wBACpD,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBAChD,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,EAAE,OAAO,GAAG,CAAC,CAAA;wBAClD,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAA;IAC/B,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;YAC/B,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,EAAE,EAAE;gBAChD,SAAS,CAAC,SAAS,CAAC,CAAA;gBACpB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;QACH,CAAC,CAAA;QACD,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAAG,IAAI,CAAC,MAAoC,CAAA;oBACzD,MAAM,MAAM,GAAwB,aAAa,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAU,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBACtI,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;wBAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBACD,OAAO,GAAG,EAAE;wBACV,qCAAqC;wBACrC,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAC1C,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/esm/hooks/useModules.js

@@ -1,17 +1,42 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModules = (filter) => {
-    const [node] = useProvidedNode(true);
+    const [node, nodeError] = useProvidedWrappedNode();
     const [modules, setModules] = useState();
+    const [error, setError] = useState();
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        const modules = await node?.resolve(filter);
-        if (mounted()) {
-            setModules(modules);
+        try {
+            if (nodeError) {
+                setError(nodeError);
+                setModules(undefined);
+            }
+            else {
+                if (node) {
+                    const modules = await node.resolve(filter);
+                    if (mounted()) {
+                        setModules(modules);
+                        setError(undefined);
+                    }
+                }
+                else {
+                    console.log('Setting All to undefined');
+                    setError(undefined);
+                    setModules(undefined);
+                }
+            }
         }
-    }, [filter, node]);
-    return modules;
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                console.log(`Setting Error [${error.message}]`);
+                setError(error);
+                setModules(undefined);
+            }
+        }
+    }, [filter, node, nodeError]);
+    return [modules, error];
 };
 //# 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":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAO,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,EAAE,OAAO,CAAI,MAAM,CAAC,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAA8C,EAAE;IAC/H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAa,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;oBAC1E,IAAI,OAAO,EAAE,EAAE;wBACb,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;SACF;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAC1B,CAAA;IAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA"}

package/dist/esm/hooks/useNode.js

@@ -1,16 +1,50 @@
+import { NodeWrapper } from '@xyo-network/node';
+import { useEffect, useState } from 'react';
 import { useModule } from './useModule';
 import { useProvidedNode } from './useProvidedNode';
-export const useNode = (nameOrAddress) => {
-    const providedNode = useProvidedNode();
-    const node = useModule(nameOrAddress);
+//AT: intentionally not exported
+const useNodeModule = (nameOrAddress) => {
+    const [providedNode] = useProvidedNode();
+    const [node, nodeError] = useModule(nameOrAddress);
     if (nameOrAddress) {
-        if (providedNode && node) {
-            return node;
+        if (providedNode) {
+            return [node, nodeError];
+        }
+        else {
+            return [providedNode, undefined];
         }
     }
     else {
-        return providedNode;
+        return [providedNode, undefined];
     }
-    return [undefined, undefined];
+};
+export const useNode = (nameOrAddress, account) => {
+    const [node, nodeError] = useNodeModule();
+    const [wrapper, setWrapper] = useState();
+    const [error, setError] = useState();
+    useEffect(() => {
+        if (node) {
+            if (nodeError) {
+                setError(nodeError);
+                setWrapper(undefined);
+            }
+            else {
+                try {
+                    const wrapper = NodeWrapper.wrap(node, account);
+                    setWrapper(wrapper);
+                    setError(undefined);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
+                }
+            }
+        }
+        else {
+            setWrapper(undefined);
+            setError(undefined);
+        }
+    }, [node, account, nodeError]);
+    return [wrapper, error];
 };
 //# sourceMappingURL=useNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;IACtC,MAAM,IAAI,GAAG,SAAS,CAAa,aAAa,CAAC,CAAA;IAEjD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,IAAI,IAAI,EAAE;YACxB,OAAO,IAAI,CAAA;SACZ;KACF;SAAM;QACL,OAAO,YAAY,CAAA;KACpB;IACD,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAC/B,CAAC,CAAA"}
+{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,gCAAgC;AAChC,MAAM,aAAa,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC5F,MAAM,CAAC,YAAY,CAAC,GAAG,eAAe,EAAE,CAAA;IACxC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,CAAA;IAElD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,IAAkB,EAAE,SAAS,CAAC,CAAA;SACvC;aAAM;YACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;SACjC;KACF;SAAM;QACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;KACjC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAgD,EAAE;IACzH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,aAAa,EAAE,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAe,CAAA;IACrD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI;oBACF,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBAC/C,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;SACF;aAAM;YACL,UAAU,CAAC,SAAS,CAAC,CAAA;YACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;SACpB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;IAE9B,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA"}

package/dist/esm/hooks/useNodeAttachedAddresses.js

@@ -0,0 +1,17 @@
+import { useAsyncEffect } from '@xylabs/react-shared';
+import { useState } from 'react';
+import { useNode } from './useNode';
+export const useNodeAttachedAddresses = () => {
+    const [node] = useNode();
+    const [addresses, setAddresses] = useState();
+    useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+        const attached = await node?.attached();
+        if (mounted()) {
+            setAddresses(attached);
+        }
+    }, [node]);
+    return [addresses, node?.registered()];
+};
+//# sourceMappingURL=useNodeAttachedAddresses.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNodeAttachedAddresses.js","sourceRoot":"","sources":["../../../src/hooks/useNodeAttachedAddresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,CAAA;IACxB,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAY,CAAA;IAEtD,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,QAAQ,EAAE,CAAA;QACvC,IAAI,OAAO,EAAE,EAAE;YACb,YAAY,CAAC,QAAQ,CAAC,CAAA;SACvB;IACH,CAAC,EACD,CAAC,IAAI,CAAC,CACP,CAAA;IAED,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;AACxC,CAAC,CAAA"}

package/dist/esm/hooks/useProvidedNode.js

@@ -1,24 +1,26 @@
 import { NodeWrapper } from '@xyo-network/node';
 import { useContext, useEffect, useState } from 'react';
 import { NodeContext } from '../contexts';
-function useProvidedNodeFunc(wrap) {
+export const useProvidedNode = () => {
     const { node } = useContext(NodeContext);
+    return [node];
+};
+export const useProvidedWrappedNode = (account) => {
+    const [node] = useProvidedNode();
     const [wrappedNode, setWrappedNode] = useState();
     const [error, setError] = useState();
     useEffect(() => {
         try {
             if (node) {
-                const account = typeof wrap === 'boolean' ? undefined : wrap;
-                const wrappedNode = wrap ? NodeWrapper.wrap(node, account) : undefined;
-                setWrappedNode(wrappedNode);
+                setWrappedNode(NodeWrapper.wrap(node, account));
                 setError(undefined);
             }
         }
         catch (ex) {
+            setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, wrap]);
-    return [wrap ? wrappedNode : wrappedNode?.module, error];
-}
-export const useProvidedNode = useProvidedNodeFunc;
+    }, [node, account]);
+    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,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAKzC,SAAS,mBAAmB,CAAC,IAAmC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,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,EAAE;gBACR,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBACtE,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAEhB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,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,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,EAAE;gBACR,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC/C,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,OAAO,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA"}

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

@@ -1,16 +1,8 @@
-export * from './useArchiveArchivists';
-export * from './useArchivistModule';
-export * from './useArchivistModules';
-export * from './useDivinerModule';
-export * from './useDivinerModules';
 export * from './useMemoryNodeUpdates';
 export * from './useModule';
-export * from './useModuleAddresses';
 export * from './useModules';
 export * from './useNode';
-export * from './useNodeQueryDiviner';
+export * from './useNodeAttachedAddresses';
 export * from './useProvidedNode';
-export * from './useWitnessModule';
-export * from './useWitnessModules';
 export * from './useWrappedModule';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,4BAA4B,CAAA;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA"}

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,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;oBAAqD,MAAM,6CA0ChF,CAAA"}
+{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;oBAAqD,MAAM,6CAmDhF,CAAA"}

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

@@ -1,9 +1,9 @@
-import { Module, ModuleFilter } from '@xyo-network/module';
-export declare const useModules: <T extends Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+import { Module, ModuleFilter } from '@xyo-network/module-model';
+export declare const useModules: <TModule extends Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     name?: string | undefined;
     security?: {
         allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
     } | undefined;
     storeQueries?: boolean | undefined;
@@ -13,11 +13,11 @@ export declare const useModules: <T extends Module<import("@xyo-network/payload-
     name?: string | undefined;
     security?: {
         allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
     } | undefined;
     storeQueries?: boolean | undefined;
 } & {
     schema: string;
-}>>(filter?: ModuleFilter) => T[] | undefined;
+}>>(filter?: ModuleFilter) => [TModule[] | undefined, Error | undefined];
 //# sourceMappingURL=useModules.d.ts.map

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,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAK1D,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;aAAwC,YAAY,oBAgB1E,CAAA"}
+{"version":3,"file":"useModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKhE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;aAA8C,YAAY,+CAsChF,CAAA"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAK9C,eAAO,MAAM,OAAO,mBAAoB,MAAM,KAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAY1F,CAAA"}
+{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAsB3D,eAAO,MAAM,OAAO,mBAAoB,MAAM,YAAY,eAAe,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA2BtH,CAAA"}

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

@@ -0,0 +1,2 @@
+export declare const useNodeAttachedAddresses: () => (string[] | Promise<string[]> | undefined)[];
+//# sourceMappingURL=useNodeAttachedAddresses.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNodeAttachedAddresses.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeAttachedAddresses.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB,oDAgBpC,CAAA"}

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

@@ -1,8 +1,5 @@
-import { Account } from '@xyo-network/account';
+import { AccountInstance } from '@xyo-network/account-model';
 import { NodeModule, NodeWrapper } from '@xyo-network/node';
-declare function useProvidedNodeFunc(wrap?: undefined): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: false): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-export declare const useProvidedNode: typeof useProvidedNodeFunc;
-export {};
+export declare const useProvidedNode: () => [NodeModule | undefined];
+export declare const useProvidedWrappedNode: (account?: AccountInstance) => [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,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,iBAAS,mBAAmB,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAC3F,iBAAS,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AACtF,iBAAS,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAsBhG,eAAO,MAAM,eAAe,4BAAsB,CAAA"}
+{"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,CAkB7G,CAAA"}

package/package.json

@@ -13,16 +13,11 @@
     "@mui/lab": "^5.0.0-alpha.121",
     "@xylabs/react-flexbox": "^2.16.8",
     "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/account": "^2.51.2",
-    "@xyo-network/archivist": "^2.51.2",
-    "@xyo-network/diviner-model": "^2.51.2",
-    "@xyo-network/diviner-wrapper": "^2.51.2",
-    "@xyo-network/module": "^2.51.2",
-    "@xyo-network/module-model": "^2.51.2",
-    "@xyo-network/node": "^2.51.2",
-    "@xyo-network/payload-model": "^2.51.2",
-    "@xyo-network/react-shared": "^2.45.0-rc.17",
-    "@xyo-network/witness": "^2.51.2"
+    "@xyo-network/account-model": "^2.51.4",
+    "@xyo-network/module": "^2.51.4",
+    "@xyo-network/module-model": "^2.51.4",
+    "@xyo-network/node": "^2.51.4",
+    "@xyo-network/react-shared": "^2.45.0-rc.19"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
@@ -83,6 +78,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.17",
+  "version": "2.45.0-rc.19",
   "stableVersion": "2.44.1"
 }

package/src/components/Node.stories.tsx

@@ -23,7 +23,7 @@ export default {
 } as Meta
 
 const Template: ComponentStory<React.FC> = (props) => {
-  const [node] = useProvidedNode() as [MemoryNode, Error]
+  const [node] = useProvidedNode() as [MemoryNode]
   const [description, setDescription] = useState<string>()
 
   useAsyncEffect(

package/src/hooks/index.ts

@@ -1,15 +1,7 @@
-export * from './useArchiveArchivists'
-export * from './useArchivistModule'
-export * from './useArchivistModules'
-export * from './useDivinerModule'
-export * from './useDivinerModules'
 export * from './useMemoryNodeUpdates'
 export * from './useModule'
-export * from './useModuleAddresses'
 export * from './useModules'
 export * from './useNode'
-export * from './useNodeQueryDiviner'
+export * from './useNodeAttachedAddresses'
 export * from './useProvidedNode'
-export * from './useWitnessModule'
-export * from './useWitnessModules'
 export * from './useWrappedModule'

package/src/hooks/useMemoryNodeUpdates.tsx

@@ -16,7 +16,7 @@ export const useMemoryNodeUpdates = (refreshAddresses?: string[]): UseMemoryNode
 
   useEffect(() => {
     if (node) {
-      const onFunc = node.on as ModuleAttachedEventEmitter['on']
+      const onFunc = node.module.on as ModuleAttachedEventEmitter['on']
       onFunc('moduleAttached', (args) => {
         if (refreshAddresses) {
           if (refreshAddresses.some((address) => address === args?.module.address)) setModule(args)

package/src/hooks/useModule.tsx

@@ -1,33 +1,42 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { Module } from '@xyo-network/module-model'
-import { NodeWrapper } from '@xyo-network/node'
+import { ModuleDetachedEventArgs, ModuleDetachedEventEmitter } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useModule = <TModule extends Module = Module>(nameOrAddress?: string): [TModule | undefined, Error | undefined] => {
-  const [node, nodeError] = useProvidedNode()
+  const [node, nodeError] = useProvidedWrappedNode()
   const [module, setModule] = useState<TModule>()
   const [error, setError] = useState<Error>()
+  const address = module?.address
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+      const detachHandler = (args: ModuleDetachedEventArgs) => {
+        const eventModule = args.module
+        if (eventModule.address === address && mounted()) {
+          setModule(undefined)
+          setError(undefined)
+        }
+      }
       try {
         if (nodeError) {
-          console.log(`Setting NodeError [${nodeError.message}]`)
           setError(nodeError)
           setModule(undefined)
         } else {
-          const wrappedNode = NodeWrapper.tryWrap(node)
-          if (wrappedNode) {
-            const module: TModule | undefined = nameOrAddress
-              ? await wrappedNode?.resolve<TModule>(nameOrAddress)
-              : (await wrappedNode.resolve<TModule>()).pop()
+          if (node) {
+            const emitter = node.module as ModuleDetachedEventEmitter
+            const module: TModule | undefined = nameOrAddress ? await node.resolve<TModule>(nameOrAddress) : (await node.resolve<TModule>()).pop()
             if (mounted()) {
-              console.log(`Setting Module [${module?.address}]`)
+              emitter.on('moduleDetached', detachHandler)
               setModule(module)
               setError(undefined)
             }
+            return () => {
+              //remove the event handler on unmount
+              emitter.on('moduleDetached', detachHandler, true)
+            }
           } else {
             console.log('Setting All to undefined')
             setError(undefined)
@@ -43,7 +52,7 @@ export const useModule = <TModule extends Module = Module>(nameOrAddress?: strin
         }
       }
     },
-    [nameOrAddress, node, nodeError],
+    [nameOrAddress, node, nodeError, address],
   )
 
   return [module, error]

package/src/hooks/useModules.ts

@@ -1,23 +1,45 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { Module, ModuleFilter } from '@xyo-network/module'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModules = <T extends Module = Module>(filter?: ModuleFilter) => {
-  const [node] = useProvidedNode(true)
-  const [modules, setModules] = useState<T[]>()
+export const useModules = <TModule extends Module = Module>(filter?: ModuleFilter): [TModule[] | undefined, Error | undefined] => {
+  const [node, nodeError] = useProvidedWrappedNode()
+  const [modules, setModules] = useState<TModule[]>()
+  const [error, setError] = useState<Error>()
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      const modules = await node?.resolve<T>(filter)
-      if (mounted()) {
-        setModules(modules)
+      try {
+        if (nodeError) {
+          setError(nodeError)
+          setModules(undefined)
+        } else {
+          if (node) {
+            const modules: TModule[] | undefined = await node.resolve<TModule>(filter)
+            if (mounted()) {
+              setModules(modules)
+              setError(undefined)
+            }
+          } else {
+            console.log('Setting All to undefined')
+            setError(undefined)
+            setModules(undefined)
+          }
+        }
+      } catch (ex) {
+        if (mounted()) {
+          const error = ex as Error
+          console.log(`Setting Error [${error.message}]`)
+          setError(error)
+          setModules(undefined)
+        }
       }
     },
-    [filter, node],
+    [filter, node, nodeError],
   )
 
-  return modules
+  return [modules, error]
 }