@xyo-network/react-node 2.45.0-rc.8 → 2.45.0

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

@@ -1,60 +1,4 @@
-import { Account } from '@xyo-network/account';
-import { Module, ModuleWrapper } from '@xyo-network/module';
-import { NodeModule, NodeWrapper } from '@xyo-network/node';
-export type WrapFunc<TModule extends Module = Module, TWrapper extends ModuleWrapper = ModuleWrapper> = (module?: TModule, account?: Account) => TWrapper | undefined;
-export type NodeFunc = () => [NodeModule | undefined, Error | undefined];
-export declare const createUseModuleHook: <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;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}> = 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;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>, TWrapper extends ModuleWrapper<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;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>> = ModuleWrapper<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;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>>, TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>>(wrapFunc: TWrapFunc, nodeFunc: NodeFunc) => {
-    (name?: string): [TModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined];
-    (wrap: true | Account): [TWrapper | undefined, Error | undefined];
-    (address: string): [TModule | undefined, Error | undefined];
-    (address: string, wrap: true | Account): [TWrapper | undefined, Error | undefined];
-};
-export declare const useNode: {
-    (name?: string): [NodeModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-    (wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-    (address: string): [NodeModule | undefined, Error | undefined];
-    (address: string, wrap: true | Account): [NodeWrapper | 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":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,QAAQ,SAAS,aAAa,GAAG,aAAa,IAAI,CACtG,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,OAAO,KACd,QAAQ,GAAG,SAAS,CAAA;AAEzB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAMpB,QAAQ;YAEE,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAkDnD,CAAA;AAED,eAAO,MAAM,OAAO;YAxDE,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAoDsE,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;AAmBhG,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;AAM3D,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,CA2B7G,CAAA"}

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

@@ -0,0 +1,39 @@
+import { AccountInstance } from '@xyo-network/account-model';
+import { ModuleWrapper } from '@xyo-network/module';
+export interface WrapperStatic<TModuleWrapper extends ModuleWrapper = ModuleWrapper> {
+    requiredQueries: string[];
+    wrap: (module?: TModuleWrapper['module'], account?: AccountInstance) => TModuleWrapper;
+}
+export declare const WrappedModuleHookFactory: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").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;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>> = ModuleWrapper<import("@xyo-network/module").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;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>>>(wrapperObject: WrapperStatic<TModuleWrapper>, name?: string) => (nameOrAddress?: string, account?: AccountInstance, spinCheck?: boolean) => [TModuleWrapper | undefined, Error | undefined];
+export declare const useWrappedModule: (nameOrAddress?: string, account?: AccountInstance, spinCheck?: boolean) => [ModuleWrapper<import("@xyo-network/module").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;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>> | undefined, Error | undefined];
+//# sourceMappingURL=useWrappedModule.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAMnD,MAAM,WAAW,aAAa,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa;IACjF,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,cAAc,CAAA;CACvF;AAED,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;0DAE5B,MAAM,sBAEoB,MAAM,YAAY,eAAe,cAAc,OAAO,oDAyCxF,CAAA;AAED,eAAO,MAAM,gBAAgB,mBA3CM,MAAM,YAAY,eAAe,cAAc,OAAO;;;;;;;;;;mCA2ClB,CAAA"}

package/package.json

@@ -10,24 +10,24 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@mui/lab": "^5.0.0-alpha.121",
-    "@xylabs/react-flexbox": "^2.16.8",
-    "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/account": "^2.51.1",
-    "@xyo-network/archivist": "^2.51.1",
-    "@xyo-network/diviner-model": "^2.51.1",
-    "@xyo-network/diviner-wrapper": "^2.51.1",
-    "@xyo-network/module": "^2.51.1",
-    "@xyo-network/module-model": "^2.51.1",
-    "@xyo-network/node": "^2.51.1",
-    "@xyo-network/payload-model": "^2.51.1",
-    "@xyo-network/react-shared": "^2.45.0-rc.8",
-    "@xyo-network/witness": "^2.51.1"
+    "@mui/lab": "^5.0.0-alpha.122",
+    "@xylabs/react-flexbox": "^2.16.11",
+    "@xylabs/react-render-spin-check": "^2.16.11",
+    "@xylabs/react-shared": "^2.16.11",
+    "@xyo-network/account-model": "^2.51.7",
+    "@xyo-network/module": "^2.51.7",
+    "@xyo-network/module-model": "^2.51.7",
+    "@xyo-network/node": "^2.51.7",
+    "@xyo-network/react-shared": "^2.45.0",
+    "@xyo-network/react-wallet": "^2.45.0"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
+    "@xyo-network/account": "^2.51.7",
+    "@xyo-network/react-storybook": "^2.45.0",
+    "@xyo-network/react-wallet": "^2.45.0",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -83,6 +83,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.8",
-  "stableVersion": "2.44.1"
+  "version": "2.45.0"
 }

package/src/components/Node.stories.tsx

@@ -1,29 +1,53 @@
 import { ComponentStory, DecoratorFn, Meta } from '@storybook/react'
-import { useAsyncEffect } from '@xylabs/react-shared'
+import { useAsyncEffect, WithChildren } from '@xylabs/react-shared'
+import { HDWallet } from '@xyo-network/account'
 import { AbstractModule } from '@xyo-network/module'
 import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
-import { useState } from 'react'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
+import { WalletProvider } from '@xyo-network/react-wallet'
+import { useEffect, useState } from 'react'
 
 import { MemoryNodeProvider } from '../contexts'
-import { useProvidedNode } from '../hooks'
+import { useModule, useProvidedNode } from '../hooks'
+
+const randomWallet = HDWallet.fromMnemonic(DefaultSeedPhrase)
 
 class TestModule extends AbstractModule {}
+const TestModuleName = 'TestModule'
+const TestModuleAccount = randomWallet.deriveAccount('0')
+
+const account = randomWallet.deriveAccount('0')
 
 const MemoryNodeDecorator: DecoratorFn = (Story, args) => {
   return (
-    <MemoryNodeProvider config={{ schema: NodeConfigSchema }}>
-      <Story {...args} />
-    </MemoryNodeProvider>
+    <WalletProvider defaultWallet={randomWallet}>
+      <MemoryNodeProvider config={{ schema: NodeConfigSchema }}>
+        <Story {...args} />
+      </MemoryNodeProvider>
+    </WalletProvider>
   )
 }
 
+const UseModuleTest: React.FC<WithChildren> = ({ children }) => {
+  const [testModule] = useModule(TestModuleName, account)
+
+  useEffect(() => {
+    if (testModule) {
+      // Should be called but isn't
+      console.log('*****test module*****', testModule)
+    }
+  }, [testModule])
+
+  return <>{children}</>
+}
+
 // eslint-disable-next-line import/no-default-export
 export default {
   title: 'modules/node/NodeBox',
 } 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(
@@ -31,9 +55,9 @@ const Template: ComponentStory<React.FC> = (props) => {
     async (mounted) => {
       if (node) {
         try {
-          const mod = await TestModule.create({ config: { schema: 'network.xyo.test.module' } })
+          const mod = await TestModule.create({ account: TestModuleAccount, config: { name: TestModuleName, schema: 'network.xyo.test.module' } })
           node?.register(mod)
-          await node?.attach(mod.address)
+          await node?.attach(mod.address, true)
           const wrapper = NodeWrapper.wrap(node)
           const description = await wrapper?.describe()
           if (mounted()) {
@@ -49,7 +73,9 @@ const Template: ComponentStory<React.FC> = (props) => {
 
   return (
     <div {...props}>
-      <pre>{description}</pre>
+      <UseModuleTest>
+        <pre>{description}</pre>
+      </UseModuleTest>
     </div>
   )
 }

package/src/hooks/index.ts

@@ -1,14 +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,5 +1,79 @@
-import { Module, ModuleWrapper } from '@xyo-network/module'
+import { useAsyncEffect } from '@xylabs/react-shared'
+import { AccountInstance } from '@xyo-network/account-model'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
+import { ModuleAttachedEventArgs, ModuleAttachedEventEmitter, ModuleDetachedEventArgs, ModuleDetachedEventEmitter } from '@xyo-network/node'
+import { useMemo, useState } from 'react'
 
-import { createUseModuleHook, useNode } from './useNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModule = createUseModuleHook<Module, ModuleWrapper>((module) => ModuleWrapper.wrap(module), useNode)
+export const useModule = <TModule extends Module = Module>(
+  nameOrAddressOrFilter?: string | ModuleFilter,
+  account?: AccountInstance,
+): [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 [module, setModule] = useState<TModule>()
+  const [error, setError] = useState<Error>()
+
+  const address = module?.address
+
+  useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+      try {
+        if (nodeError) {
+          setError(nodeError)
+          setModule(undefined)
+        } else {
+          if (node) {
+            const attachEmitter = node.module as ModuleAttachedEventEmitter
+            const detachEmitter = node.module as ModuleDetachedEventEmitter
+            const attachHandler = (args: ModuleAttachedEventArgs) => {
+              const eventModule = args.module
+              if (nameOrAddress && (eventModule.address === nameOrAddress || eventModule?.config.name === nameOrAddress) && mounted()) {
+                setModule(eventModule as TModule)
+                setError(undefined)
+              }
+            }
+            const detachHandler = (args: ModuleDetachedEventArgs) => {
+              const eventModule = args.module
+              if (eventModule.address === address && mounted()) {
+                setModule(undefined)
+                setError(undefined)
+              }
+            }
+            const module: TModule | undefined = nameOrAddress
+              ? await node.resolve<TModule>(nameOrAddress)
+              : (await node.resolve<TModule>(filter)).pop()
+            if (mounted()) {
+              attachEmitter.on('moduleAttached', attachHandler, true)
+              detachEmitter.on('moduleDetached', detachHandler, true)
+              detachEmitter.on('moduleDetached', detachHandler)
+              attachEmitter.on('moduleAttached', attachHandler)
+              setModule(module)
+              setError(undefined)
+            }
+            return () => {
+              //remove the event handler on unmount
+              attachEmitter.on('moduleAttached', attachHandler, true)
+              detachEmitter.on('moduleDetached', detachHandler, true)
+            }
+          } else {
+            setError(undefined)
+            setModule(undefined)
+          }
+        }
+      } catch (ex) {
+        if (mounted()) {
+          const error = ex as Error
+          setError(error)
+          setModule(undefined)
+        }
+      }
+    },
+    [nameOrAddress, node, nodeError, address, filter],
+  )
+
+  return [module, error]
+}

package/src/hooks/useModules.ts

@@ -1,23 +1,43 @@
 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 {
+            setError(undefined)
+            setModules(undefined)
+          }
+        }
+      } catch (ex) {
+        if (mounted()) {
+          const error = ex as Error
+          setError(error)
+          setModules(undefined)
+        }
       }
     },
-    [filter, node],
+    [filter, node, nodeError],
   )
 
-  return modules
+  return [modules, error]
 }

package/src/hooks/useNode.tsx

@@ -1,81 +1,51 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-import { useAsyncEffect } from '@xylabs/react-shared'
-import { Account } from '@xyo-network/account'
-import { Module, ModuleWrapper } from '@xyo-network/module'
+import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
+import { useModule } from './useModule'
 import { useProvidedNode } from './useProvidedNode'
 
-export type WrapFunc<TModule extends Module = Module, TWrapper extends ModuleWrapper = ModuleWrapper> = (
-  module?: TModule,
-  account?: Account,
-) => TWrapper | undefined
+//AT: intentionally not exported
+const useNodeModule = (nameOrAddress?: string): [NodeModule | undefined, Error | undefined] => {
+  const [providedNode] = useProvidedNode()
+  const [node, nodeError] = useModule(nameOrAddress)
 
-export type NodeFunc = () => [NodeModule | undefined, Error | undefined]
+  if (nameOrAddress) {
+    if (providedNode) {
+      return [node as NodeModule, nodeError]
+    } else {
+      return [providedNode, undefined]
+    }
+  } else {
+    return [providedNode, undefined]
+  }
+}
+
+export const useNode = (nameOrAddress?: string, account?: AccountInstance): [NodeWrapper | undefined, Error | undefined] => {
+  const [node, nodeError] = useNodeModule(nameOrAddress)
+  const [wrapper, setWrapper] = useState<NodeWrapper>()
+  const [error, setError] = useState<Error>()
 
-export const createUseModuleHook = <
-  TModule extends Module = Module,
-  TWrapper extends ModuleWrapper = ModuleWrapper,
-  TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>,
->(
-  wrapFunc: TWrapFunc,
-  nodeFunc: NodeFunc,
-) => {
-  function use(name?: string): [TModule | undefined, Error | undefined]
-  function use(name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined]
-  function use(wrap: true | Account): [TWrapper | undefined, Error | undefined]
-  function use(address: string): [TModule | undefined, Error | undefined]
-  function use(address: string, wrap: true | Account): [TWrapper | undefined, Error | undefined]
-  function use(
-    nameOrAddressOrWrapOrAccount?: string | boolean | Account,
-    wrap: boolean | Account = false,
-  ): [TWrapper | TModule | undefined, Error | undefined] {
-    const [node, nodeError] = nodeFunc()
-    const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap
-    const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap
-    const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined
-    const [module, setModule] = useState<TModule | TWrapper>()
-    const [error, setError] = useState<Error>()
-    useAsyncEffect(
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      async (mounted) => {
+  useEffect(() => {
+    if (node) {
+      if (nodeError) {
+        setError(nodeError)
+        setWrapper(undefined)
+      } else {
         try {
-          if (nodeError) {
-            console.log(`Setting NodeError [${nodeError.message}]`)
-            setError(nodeError)
-            setModule(undefined)
-          } else {
-            if (node) {
-              const wrappedNode = NodeWrapper.wrap(node)
-              const module = await wrappedNode?.resolve<TModule>(nameOrAddress)
-              const finalModule = shouldWrap ? wrapFunc(module, account) : module
-              if (mounted()) {
-                console.log(`Setting Module [${finalModule?.address}]`)
-                setModule(finalModule)
-                setError(undefined)
-              }
-            } else {
-              console.log('Setting All to undefined')
-              setError(undefined)
-              setModule(undefined)
-            }
-          }
+          const wrapper = NodeWrapper.wrap(node, account)
+          setWrapper(wrapper)
+          setError(undefined)
         } catch (ex) {
-          if (mounted()) {
-            const error = ex as Error
-            console.log(`Setting Error [${error.message}]`)
-            setError(error)
-            setModule(undefined)
-          }
+          setWrapper(undefined)
+          setError(ex as Error)
         }
-      },
-      [wrap, node, nameOrAddress, nodeError, shouldWrap, account],
-    )
+      }
+    } else {
+      setWrapper(undefined)
+      setError(undefined)
+    }
+  }, [node, account, nodeError])
 
-    return [module, error]
-  }
-  return use
+  return [wrapper, error]
 }
-
-export const useNode = createUseModuleHook<NodeModule, NodeWrapper>((module) => NodeWrapper.wrap(module), useProvidedNode)

package/src/hooks/{useModuleAddresses.ts → useNodeAttachedAddresses.ts}

@@ -1,22 +1,22 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useNode } from './useNode'
 
-export const useModuleAddresses = () => {
-  const [node] = useProvidedNode()
-  const [attachedAddresses, setAttachedAddresses] = useState<string[]>()
+export const useNodeAttachedAddresses = () => {
+  const [node] = useNode()
+  const [addresses, setAddresses] = useState<string[]>()
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       const attached = await node?.attached()
       if (mounted()) {
-        setAttachedAddresses(attached)
+        setAddresses(attached)
       }
     },
     [node],
   )
 
-  return [attachedAddresses, node?.registered()]
+  return [addresses, node?.registered()]
 }