@xyo-network/react-node 2.56.3 → 2.56.4

package/src/hooks/useModuleFromNode.tsx

@@ -3,20 +3,18 @@ import { Logger } from '@xyo-network/core'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
 import { Module, ModuleFilter } from '@xyo-network/module-model'
 import { ModuleAttachedEventArgs, ModuleDetachedEventArgs } from '@xyo-network/node'
-import { WalletInstance } from '@xyo-network/wallet-model'
 import { useMemo, useState } from 'react'
 
-import { useWrappedProvidedNode } from './wrapped'
+import { useProvidedNode } from './provided'
 
 export const useModuleFromNode = <TModule extends Module = Module>(
   nameOrAddressOrFilter?: string | ModuleFilter,
-  wallet?: WalletInstance,
   logger?: Logger,
-): [TModule | undefined, Error | undefined] => {
+): [TModule | null | undefined, Error | undefined] => {
   const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
   const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
-  const [node, nodeError] = useWrappedProvidedNode(wallet)
-  const [module, setModule] = useState<TModule>()
+  const [node] = useProvidedNode()
+  const [module, setModule] = useState<TModule | null>()
   const [error, setError] = useState<Error>()
 
   const address = useMemo(() => module?.address, [module])
@@ -26,40 +24,39 @@ export const useModuleFromNode = <TModule extends Module = Module>(
     async (mounted) => {
       const eventUnsubscribe: EventUnsubscribeFunction[] = []
       try {
-        /* Check pre-conditions */
-        if (nodeError || !node || !nameOrAddress) {
-          if (mounted()) {
-            nodeError && logger?.error(nodeError.message)
-            setError(nodeError)
-            setModule(undefined)
+        if (node) {
+          const attachHandler = (args: ModuleAttachedEventArgs) => {
+            const eventModule = args.module
+            if (nameOrAddress && (eventModule.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
+              logger?.debug(`attachHandler-setting [${nameOrAddress}]`)
+              setModule(eventModule as TModule)
+              setError(undefined)
+            }
           }
-          return
-        }
-
-        const attachHandler = (args: ModuleAttachedEventArgs) => {
-          const eventModule = args.module
-          if (nameOrAddress && (eventModule.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
-            logger?.debug(`attachHandler-setting [${nameOrAddress}]`)
-            setModule(eventModule as TModule)
+          const detachHandler = (args: ModuleDetachedEventArgs) => {
+            const eventModule = args.module
+            if (eventModule.address === address) {
+              logger?.debug(`detachHandler-clearing [${address}]`)
+              setModule(undefined)
+              setError(undefined)
+            }
+          }
+          const module: TModule | undefined = nameOrAddress
+            ? (await node.downResolver.resolve<TModule>({ address: [nameOrAddress], name: [nameOrAddress] })).pop()
+            : (await node.downResolver.resolve<TModule>(filter)).pop()
+          if (mounted()) {
+            eventUnsubscribe.push(node.on('moduleAttached', attachHandler))
+            eventUnsubscribe.push(node.on('moduleDetached', detachHandler))
+            logger?.debug(`resolved [${nameOrAddress}]`)
+            setModule(module)
             setError(undefined)
           }
-        }
-        const detachHandler = (args: ModuleDetachedEventArgs) => {
-          const eventModule = args.module
-          if (eventModule.address === address) {
-            logger?.debug(`detachHandler-clearing [${address}]`)
-            setModule(undefined)
+        } else {
+          if (mounted()) {
+            setModule(node)
             setError(undefined)
           }
         }
-        const module: TModule | undefined = nameOrAddress ? await node.resolve<TModule>(nameOrAddress) : (await node.resolve<TModule>(filter)).pop()
-        if (mounted()) {
-          eventUnsubscribe.push(node.on('moduleAttached', attachHandler))
-          eventUnsubscribe.push(node.on('moduleDetached', detachHandler))
-          logger?.debug(`resolved [${nameOrAddress}]`)
-          setModule(module)
-          setError(undefined)
-        }
         return () => {
           //remove the event handler on unmount
           eventUnsubscribe.forEach((func) => func())
@@ -73,7 +70,7 @@ export const useModuleFromNode = <TModule extends Module = Module>(
         }
       }
     },
-    [nameOrAddress, node, nodeError, address, filter, logger],
+    [nameOrAddress, node, address, filter, logger],
   )
 
   return [module, error]

package/src/hooks/useModulesFromNode.ts

@@ -2,17 +2,15 @@ import { usePromise } from '@xylabs/react-promise'
 import { Logger } from '@xyo-network/core'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
 import { Module, ModuleFilter } from '@xyo-network/module-model'
-import { WalletInstance } from '@xyo-network/wallet-model'
 import { useEffect, useRef } from 'react'
 
-import { useWrappedProvidedNode } from './wrapped'
+import { useProvidedNode } from './provided'
 
 export const useModulesFromNode = <TModule extends Module = Module>(
   filter?: ModuleFilter,
-  wallet?: WalletInstance,
   logger?: Logger,
-): [TModule[] | undefined, Error | undefined] => {
-  const [node, nodeError] = useWrappedProvidedNode(wallet)
+): [TModule[] | null | undefined, Error | undefined] => {
+  const [node] = useProvidedNode()
 
   const modulesLength = useRef<number>()
 
@@ -21,7 +19,7 @@ export const useModulesFromNode = <TModule extends Module = Module>(
   const [resolvedModules, resolvedModulesError] = usePromise<TModule[] | undefined>(async () => {
     const getModulesFromResolution = async () => {
       if (node) {
-        const resolvedModules: TModule[] | undefined = await node.resolve<TModule>(filter)
+        const resolvedModules: TModule[] | undefined = await node.downResolver.resolve<TModule>(filter)
         if (resolvedModules?.length !== modulesLength.current) {
           logger?.debug(`getModulesFromResolution-setting: [${resolvedModules?.length}]`)
           modulesLength.current = resolvedModules?.length
@@ -54,7 +52,7 @@ export const useModulesFromNode = <TModule extends Module = Module>(
       //unsubscribe events
       eventUnsubscribe.forEach((func) => func())
     }
-  }, [filter, node, logger, nodeError])
+  }, [filter, node, logger])
 
   return [resolvedModules, resolvedModulesError]
 }

package/src/hooks/useNodeFromNode.tsx

@@ -1,9 +1,8 @@
 import { Logger } from '@xyo-network/core'
 import { ModuleFilter } from '@xyo-network/module'
 import { NodeModule } from '@xyo-network/node'
-import { WalletInstance } from '@xyo-network/wallet-model'
 
 import { useModuleFromNode } from './useModuleFromNode'
 
-export const useNodeFromNode = (nameOrAddressOrFilter?: string | ModuleFilter, wallet?: WalletInstance, logger?: Logger) =>
-  useModuleFromNode<NodeModule>(nameOrAddressOrFilter, wallet, logger)
+export const useNodeFromNode = (nameOrAddressOrFilter?: string | ModuleFilter, logger?: Logger) =>
+  useModuleFromNode<NodeModule>(nameOrAddressOrFilter, logger)

package/src/hooks/useNodesFromNode.tsx

@@ -1,9 +1,7 @@
 import { Logger } from '@xyo-network/core'
 import { ModuleFilter } from '@xyo-network/module'
 import { NodeModule } from '@xyo-network/node'
-import { WalletInstance } from '@xyo-network/wallet-model'
 
 import { useModulesFromNode } from './useModulesFromNode'
 
-export const useNodesFromNode = (filter?: ModuleFilter, wallet?: WalletInstance, logger?: Logger) =>
-  useModulesFromNode<NodeModule>(filter, wallet, logger)
+export const useNodesFromNode = (filter?: ModuleFilter, logger?: Logger) => useModulesFromNode<NodeModule>(filter, logger)

package/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx

@@ -15,7 +15,6 @@ export const WrappedModuleFromNodeHookFactory = {
         nameOrAddress ?? {
           query: [wrapperObject.requiredQueries],
         },
-        walletToUse,
         logger,
       )
 

package/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx

@@ -12,11 +12,11 @@ export const WrappedModulesFromNodeHookFactory = {
     const filter = {
       query: [wrapperObject.requiredQueries],
     }
-    const useHook = (account?: WalletInstance, wallet?: WalletInstance, logger?: Logger): [TModuleWrapper[] | undefined, Error | undefined] => {
+    const useHook = (account?: WalletInstance, logger?: Logger): [TModuleWrapper[] | undefined, Error | undefined] => {
       logger?.debug(`Render: ${name}`)
 
       const [accountToUse] = useAccount({ account })
-      const [modules, moduleError] = useModulesFromNode<TModuleWrapper['module']>(filter, wallet, logger)
+      const [modules, moduleError] = useModulesFromNode<TModuleWrapper['module']>(filter, logger)
 
       const [wrappers, setWrappers] = useState<TModuleWrapper[]>()
       const [error, setError] = useState<Error>()

package/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx

@@ -5,7 +5,7 @@ import { useEffect, useState } from 'react'
 
 import { useProvidedNode } from '../../provided'
 
-export const useWrappedProvidedNode = (wallet?: WalletInstance): [NodeWrapper | undefined, Error | undefined] => {
+export const useWrappedProvidedNode = (wallet?: WalletInstance | null): [NodeWrapper | undefined, Error | undefined] => {
   const [walletToUse] = useWallet({ wallet })
   const [node] = useProvidedNode()
   const [wrappedNode, setWrappedNode] = useState<NodeWrapper>()