@xyo-network/node 2.33.4 → 2.33.6

package/src/Queries/index.ts

@@ -2,23 +2,25 @@ import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/mod
 
 import { XyoNodeAttachQuery, XyoNodeAttachQuerySchema } from './Attach'
 import { XyoNodeAttachedQuery, XyoNodeAttachedQuerySchema } from './Attached'
-import { XyoNodeAvailableQuery, XyoNodeAvailableQuerySchema } from './Available'
 import { XyoNodeDetatchQuery, XyoNodeDetatchQuerySchema } from './Detatch'
+import { XyoNodeRegisteredQuery, XyoNodeRegisteredQuerySchema } from './Registered'
 
 export * from './Attach'
 export * from './Attached'
-export * from './Available'
 export * from './Detatch'
+export * from './Registered'
 
 type XyoNodeQuerySchemaBase =
   | XyoNodeAttachQuerySchema
   | XyoNodeDetatchQuerySchema
   | XyoNodeAttachedQuerySchema
-  | XyoNodeAvailableQuerySchema
+  | XyoNodeRegisteredQuerySchema
   | XyoModuleQuerySchema
 
 export type XyoNodeQuerySchema<T extends string | void = void> = T extends string ? XyoNodeQuerySchemaBase | T : XyoNodeQuerySchemaBase
 
-type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery | XyoModuleQuery
+type XyoNodeQueryBase<T extends XyoQuery | void = void> = T extends XyoQuery
+  ? XyoModuleQuery<XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery | T>
+  : XyoModuleQuery<XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery>
 
-export type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase
+export type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase<T> : XyoNodeQueryBase

package/src/XyoNode.ts

@@ -1,10 +1,16 @@
 import { XyoAccount } from '@xyo-network/account'
-import { XyoModule, XyoModuleResolverFunc } from '@xyo-network/module'
+import { XyoModule, XyoModuleQueryResult, XyoModuleResolverFunc } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 
 import { NodeConfig } from './Config'
-import { NodeModule } from './Node'
-import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeAvailableQuerySchema, XyoNodeDetatchQuerySchema, XyoNodeQuery } from './Queries'
+import { NodeModule } from './NodeModule'
+import {
+  XyoNodeAttachedQuerySchema,
+  XyoNodeAttachQuerySchema,
+  XyoNodeDetatchQuerySchema,
+  XyoNodeQuery,
+  XyoNodeRegisteredQuerySchema,
+} from './Queries'
 export abstract class XyoNode<
     TConfig extends NodeConfig = NodeConfig,
     TQuery extends XyoNodeQuery = XyoNodeQuery,
@@ -12,7 +18,7 @@ export abstract class XyoNode<
     TModule extends XyoModule = XyoModule,
   >
   extends XyoModule<TQuery, TQueryResult, TConfig>
-  implements NodeModule<TQuery, TQueryResult>
+  implements NodeModule<TQuery, TQueryResult, TModule>
 {
   constructor(config?: TConfig, account?: XyoAccount, resolver?: XyoModuleResolverFunc) {
     super(config, account, resolver)
@@ -21,7 +27,7 @@ export abstract class XyoNode<
   /** Query Functions - Start */
   abstract attach(_address: string): void
   abstract detatch(_address: string): void
-  abstract resolve(_address: string): XyoModule | null
+  abstract resolve(_address: string): TModule | null
 
   registered(): string[] {
     throw new Error('Method not implemented.')
@@ -30,15 +36,15 @@ export abstract class XyoNode<
     throw new Error('Method not implemented.')
   }
 
-  availableModules(): XyoModule[] {
+  registeredModules(): TModule[] {
     throw new Error('Method not implemented.')
   }
-  attachedModules(): XyoModule[] {
+  attachedModules(): TModule[] {
     throw new Error('Method not implemented.')
   }
   /** Query Functions - End */
 
-  query(query: TQuery) {
+  override query(query: TQuery): Promise<XyoModuleQueryResult<TQueryResult>> {
     const queryAccount = new XyoAccount()
     const payloads: (TQueryResult | null)[] = []
     switch (query.schema) {
@@ -54,7 +60,7 @@ export abstract class XyoNode<
         this.attached()
         break
       }
-      case XyoNodeAvailableQuerySchema: {
+      case XyoNodeRegisteredQuerySchema: {
         this.registered()
         break
       }
@@ -67,6 +73,4 @@ export abstract class XyoNode<
   register(_module: TModule): void {
     throw new Error('Method not implemented.')
   }
-
-  abstract get(_address: string): TModule | undefined
 }

package/src/XyoNodeWrapper.ts

@@ -1,21 +1,24 @@
-import { XyoModuleWrapper } from '@xyo-network/module'
+import { Module, XyoModule, XyoModuleWrapper } from '@xyo-network/module'
 import compact from 'lodash/compact'
 
-import { Node } from './Node'
+import { NodeModule } from './NodeModule'
 import {
   XyoNodeAttachedQuery,
   XyoNodeAttachedQuerySchema,
   XyoNodeAttachQuery,
   XyoNodeAttachQuerySchema,
-  XyoNodeAvailableQuery,
-  XyoNodeAvailableQuerySchema,
   XyoNodeDetatchQuery,
   XyoNodeDetatchQuerySchema,
+  XyoNodeRegisteredQuery,
+  XyoNodeRegisteredQuerySchema,
 } from './Queries'
 
-export class XyoNodeWrapper extends XyoModuleWrapper implements Node {
+export class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
+  register(_module: Module): void {
+    throw Error('Not implemented')
+  }
   async registered(): Promise<string[]> {
-    const query: XyoNodeAvailableQuery = { schema: XyoNodeAvailableQuerySchema }
+    const query: XyoNodeRegisteredQuery = { schema: XyoNodeRegisteredQuerySchema }
     return compact((await this.module.query(query))[1].map((payload) => payload?.schema))
   }
   async attached(): Promise<string[]> {
@@ -32,4 +35,17 @@ export class XyoNodeWrapper extends XyoModuleWrapper implements Node {
     await this.module.query(query)
     return
   }
+
+  async registeredModules(): Promise<XyoModule[]> {
+    const addresses = await this.registered()
+    return compact(await Promise.all(addresses.map((address) => this.resolve(address))))
+  }
+  async attachedModules(): Promise<XyoModule[]> {
+    const addresses = await this.attached()
+    return compact(await Promise.all(addresses.map((address) => this.resolve(address))))
+  }
+
+  resolve(_address: string): XyoModule | null {
+    throw Error('Not implemented')
+  }
 }

package/src/cli/index.ts

@@ -1,4 +1,4 @@
-import { forget } from '@xylabs/forget'
+import { XyoMemoryArchivist } from '@xyo-network/archivist'
 import { XyoModule, XyoModuleResolverFunc } from '@xyo-network/module'
 import yargs from 'yargs'
 // eslint-disable-next-line import/no-internal-modules
@@ -30,8 +30,10 @@ const loadModule = async (pkg: string, name?: string, resolver?: XyoModuleResolv
   return new ModuleConstructor(undefined, undefined, resolver)
 }
 
-const xyo = () => {
-  return parseOptions().command(
+const xyo = async () => {
+  const node = new MemoryNode()
+  node.register(new XyoMemoryArchivist())
+  await parseOptions().command(
     'node',
     'Start an XYO Node',
     (yargs) => {
@@ -43,7 +45,7 @@ const xyo = () => {
       const modules = Array.isArray(module) ? module : [module]
       if (verbose) console.info('Starting Node')
 
-      const node = new MemoryNode()
+      node.register(new XyoMemoryArchivist())
 
       const resolver: XyoModuleResolverFunc = (address: string) => {
         console.log(`Resolving: ${address}`)
@@ -63,7 +65,17 @@ const xyo = () => {
       )
     },
   ).argv
+  return node
 }
 
-void xyo()
-forget(startTerminal())
+const start = async () => {
+  await startTerminal(await xyo())
+}
+
+start()
+  .then(() => {
+    console.log('Finishing,...')
+  })
+  .catch(() => {
+    console.log('Excepting,...')
+  })

package/src/cli/terminal.ts

@@ -3,6 +3,9 @@ import { readFileSync } from 'fs'
 import path from 'path'
 import { terminal } from 'terminal-kit'
 
+import { MemoryNode } from '../MemoryNode'
+import { Node } from '../Node'
+
 function terminate() {
   terminal.grabInput(false)
   terminal.clear()
@@ -40,7 +43,7 @@ const readFileDeep = (names: string[]) => {
   return [result, resolvedPath]
 }
 
-const getCommand = (): Promise<boolean> => {
+const getCommand = (node: Node): Promise<boolean> => {
   return new Promise((resolve) => {
     terminal.once('key', (name: string) => {
       if (name === 'ESCAPE') {
@@ -78,8 +81,16 @@ const getCommand = (): Promise<boolean> => {
           case 'exit':
             resolve(false)
             break
+          case 'list-registered-plugins': {
+            terminal.yellow('\nList Registered Plugins\n')
+            const registered = await node?.registered()
+            registered.forEach((module) => {
+              terminal(`0x${module}`)
+            })
+            break
+          }
           case 'register-plugin':
-            terminal.yellow('Register Plugin')
+            terminal.yellow('\nRegister Plugin\n')
             break
           case 'show-config': {
             const [config, path] = readFileDeep(['xyo-config.json', 'xyo-config.js'])
@@ -102,10 +113,10 @@ const getCommand = (): Promise<boolean> => {
   })
 }
 
-export const startTerminal = async () => {
+export const startTerminal = async (node: MemoryNode) => {
   let running = true
   while (running) {
-    running = await getCommand()
+    running = await getCommand(node)
   }
 
   terminate()

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './Config'
 export * from './MemoryNode'
 export * from './Node'
+export * from './NodeModule'
 export * from './PartialConfig'
 export * from './XyoNode'

package/dist/cjs/Queries/Available.d.ts

@@ -1,7 +0,0 @@
-import { XyoQuery } from '@xyo-network/module';
-export declare type XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available';
-export declare const XyoNodeAvailableQuerySchema: XyoNodeAvailableQuerySchema;
-export declare type XyoNodeAvailableQuery = XyoQuery<{
-    schema: XyoNodeAvailableQuerySchema;
-}>;
-//# sourceMappingURL=Available.d.ts.map

package/dist/cjs/Queries/Available.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Available.d.ts","sourceRoot":"","sources":["../../../src/Queries/Available.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAC,CAAA"}

package/dist/cjs/Queries/Available.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoNodeAvailableQuerySchema = void 0;
-exports.XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available';
-//# sourceMappingURL=Available.js.map

package/dist/cjs/Queries/Available.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Available.js","sourceRoot":"","sources":["../../../src/Queries/Available.ts"],"names":[],"mappings":";;;AAGa,QAAA,2BAA2B,GAAgC,kCAAkC,CAAA"}

package/dist/esm/Queries/Available.d.ts

@@ -1,7 +0,0 @@
-import { XyoQuery } from '@xyo-network/module';
-export declare type XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available';
-export declare const XyoNodeAvailableQuerySchema: XyoNodeAvailableQuerySchema;
-export declare type XyoNodeAvailableQuery = XyoQuery<{
-    schema: XyoNodeAvailableQuerySchema;
-}>;
-//# sourceMappingURL=Available.d.ts.map

package/dist/esm/Queries/Available.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Available.d.ts","sourceRoot":"","sources":["../../../src/Queries/Available.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAC,CAAA"}

package/dist/esm/Queries/Available.js

@@ -1,2 +0,0 @@
-export const XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available';
-//# sourceMappingURL=Available.js.map

package/dist/esm/Queries/Available.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Available.js","sourceRoot":"","sources":["../../../src/Queries/Available.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,2BAA2B,GAAgC,kCAAkC,CAAA"}

package/src/Queries/Available.ts

@@ -1,8 +0,0 @@
-import { XyoQuery } from '@xyo-network/module'
-
-export type XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available'
-export const XyoNodeAvailableQuerySchema: XyoNodeAvailableQuerySchema = 'network.xyo.query.node.available'
-
-export type XyoNodeAvailableQuery = XyoQuery<{
-  schema: XyoNodeAvailableQuerySchema
-}>