@xyo-network/node 2.33.0-rc.1 → 2.33.0-rc.11

package/dist/esm/XyoNode.d.ts

@@ -3,7 +3,7 @@ import { XyoModule, XyoModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { NodeModule } from './Node';
 import { XyoNodeQuery } from './Queries';
-export declare abstract class XyoNode<TConfig extends XyoModuleConfig = XyoModuleConfig, TQuery extends XyoNodeQuery = XyoNodeQuery, TQueryResult extends XyoPayload = XyoPayload, TModule extends XyoModule = XyoModule> extends XyoModule<TConfig, TQuery, TQueryResult> implements NodeModule<TQuery, TQueryResult> {
+export declare abstract class XyoNode<TConfig extends XyoModuleConfig = XyoModuleConfig, TQuery extends XyoNodeQuery = XyoNodeQuery, TQueryResult extends XyoPayload = XyoPayload, TModule extends XyoModule = XyoModule> extends XyoModule<TQuery, TQueryResult, TConfig> implements NodeModule<TQuery, TQueryResult> {
     /** Query Functions - Start */
     abstract attach(_address: string): void;
     abstract detatch(_address: string): void;
@@ -13,7 +13,7 @@ export declare abstract class XyoNode<TConfig extends XyoModuleConfig = XyoModul
     availableModules(): XyoModule[];
     attachedModules(): XyoModule[];
     /** Query Functions - End */
-    query(query: TQuery): import("@xyo-network/promise").PromiseEx<import("@xyo-network/module").XyoModuleQueryResult<TQueryResult>, XyoAccount>;
+    query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<TQueryResult>> | import("@xyo-network/promise").PromiseEx<import("@xyo-network/module").XyoModuleQueryResult<TQueryResult>, XyoAccount>;
     register(_module: TModule): void;
     abstract get(_address: string): TModule | undefined;
 }

package/dist/esm/XyoNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgH,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtJ,8BAAsB,OAAO,CACzB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CAEvC,SAAQ,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAC/C,YAAW,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;IAE3C,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACxC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAEpD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,gBAAgB,IAAI,SAAS,EAAE;IAG/B,eAAe,IAAI,SAAS,EAAE;IAG9B,4BAA4B;IAE5B,KAAK,CAAC,KAAK,EAAE,MAAM;IAwBnB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CACpD"}
+{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgH,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtJ,8BAAsB,OAAO,CACzB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CAEvC,SAAQ,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAC/C,YAAW,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;IAE3C,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACxC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAEpD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,gBAAgB,IAAI,SAAS,EAAE;IAG/B,eAAe,IAAI,SAAS,EAAE;IAG9B,4BAA4B;IAE5B,KAAK,CAAC,KAAK,EAAE,MAAM;IA0BnB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CACpD"}

package/dist/esm/XyoNode.js

@@ -35,6 +35,8 @@ export class XyoNode extends XyoModule {
                 this.registered();
                 break;
             }
+            default:
+                return super.query(query);
         }
         return this.bindPayloads(payloads, queryAccount);
     }

package/dist/esm/XyoNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.js","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAmB,MAAM,qBAAqB,CAAA;AAIhE,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,yBAAyB,EAAgB,MAAM,WAAW,CAAA;AAEtJ,MAAM,OAAgB,OAMpB,SAAQ,SAAwC;IAQhD,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,gBAAgB;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,4BAA4B;IAE5B,KAAK,CAAC,KAAa;QACjB,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,QAAQ,GAA4B,EAAE,CAAA;QAC5C,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC1B,MAAK;aACN;YACD,KAAK,yBAAyB,CAAC,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC3B,MAAK;aACN;YACD,KAAK,0BAA0B,CAAC,CAAC;gBAC/B,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACf,MAAK;aACN;YACD,KAAK,2BAA2B,CAAC,CAAC;gBAChC,IAAI,CAAC,UAAU,EAAE,CAAA;gBACjB,MAAK;aACN;SACF;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CAGF"}
+{"version":3,"file":"XyoNode.js","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAmB,MAAM,qBAAqB,CAAA;AAIhE,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,yBAAyB,EAAgB,MAAM,WAAW,CAAA;AAEtJ,MAAM,OAAgB,OAMpB,SAAQ,SAAwC;IAQhD,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,gBAAgB;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,4BAA4B;IAE5B,KAAK,CAAC,KAAa;QACjB,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,QAAQ,GAA4B,EAAE,CAAA;QAC5C,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC1B,MAAK;aACN;YACD,KAAK,yBAAyB,CAAC,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC3B,MAAK;aACN;YACD,KAAK,0BAA0B,CAAC,CAAC;gBAC/B,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACf,MAAK;aACN;YACD,KAAK,2BAA2B,CAAC,CAAC;gBAChC,IAAI,CAAC,UAAU,EAAE,CAAA;gBACjB,MAAK;aACN;YACD;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAC5B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CAGF"}

package/dist/esm/cli/terminal.d.ts

@@ -1,2 +1,2 @@
-export declare const startTerminal: () => Promise<never>;
+export declare const startTerminal: () => Promise<void>;
 //# sourceMappingURL=terminal.d.ts.map

package/dist/esm/cli/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/cli/terminal.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,aAAa,sBAezB,CAAA"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/cli/terminal.ts"],"names":[],"mappings":"AAwGA,eAAO,MAAM,aAAa,qBAOzB,CAAA"}

package/dist/esm/cli/terminal.js

@@ -1,32 +1,106 @@
+import { readFileSync } from 'fs';
 import path from 'path';
 import { terminal } from 'terminal-kit';
-import xyo_logo_black from './xyo_logo_black.png';
-const commands = ['exit', 'plugin'];
+function terminate() {
+    terminal.grabInput(false);
+    terminal.clear();
+    terminal.green('\n\nXYO Node Shutdown - Bye\n\n');
+    setTimeout(function () {
+        process.exit();
+    }, 100);
+}
+const readFileDeep = (names) => {
+    let depth = 0;
+    let result;
+    let filename;
+    let resolvedPath;
+    while (depth < 10 && result === undefined) {
+        names.forEach((name) => {
+            if (result === undefined) {
+                filename = name;
+                for (let i = 0; i < depth; i++) {
+                    filename = `../${filename}`;
+                }
+                resolvedPath = path.resolve(filename);
+                try {
+                    result = readFileSync(resolvedPath, { encoding: 'utf8' });
+                }
+                catch (ex) {
+                    const error = ex;
+                    if (error.code !== 'ENOENT') {
+                        terminal.red(`${JSON.stringify(error)}\n`);
+                    }
+                }
+            }
+        });
+        depth++;
+    }
+    return [result, resolvedPath];
+};
 const getCommand = () => {
-    return new Promise((resolve, reject) => {
-        terminal.inputField({ autoComplete: commands, autoCompleteMenu: true }, (error, input) => {
-            terminal('\n');
+    return new Promise((resolve) => {
+        terminal.once('key', (name) => {
+            if (name === 'ESCAPE') {
+                resolve(true);
+            }
+            if (name === 'CTRL_C') {
+                resolve(false);
+            }
+        });
+        const items = [
+            'Register Plugin',
+            'Unregister Plugin',
+            'List Registered Plugins',
+            'Attach Plugin',
+            'Detatch Plugin',
+            'List Attached Plugins',
+            'Show Config',
+            'Status',
+            'Exit',
+        ].map((item, index) => {
+            return {
+                slug: item.toLowerCase().replaceAll(' ', '-'),
+                text: `${index + 1}. ${item}`,
+            };
+        });
+        //terminal.clear()
+        terminal.green('\nXYO Node Running\n');
+        terminal.singleColumnMenu(items.map((item) => item.text), async (error, response) => {
             if (error) {
-                reject(error);
+                terminal.red(`Error: ${error}`);
             }
-            else {
-                resolve(input);
+            switch (items[response.selectedIndex].slug) {
+                case 'exit':
+                    resolve(false);
+                    break;
+                case 'register-plugin':
+                    terminal.yellow('Register Plugin');
+                    break;
+                case 'show-config': {
+                    const [config, path] = readFileDeep(['xyo-config.json', 'xyo-config.js']);
+                    let configObj;
+                    terminal.yellow(`\nConfig found at: ${path}\n`);
+                    if (config) {
+                        if (path?.endsWith('.json')) {
+                            configObj = JSON.parse(config);
+                        }
+                        else if (path?.endsWith('.cjs') || path?.endsWith('.js')) {
+                            configObj = (await import(path));
+                        }
+                    }
+                    terminal(JSON.stringify(configObj ?? {}));
+                    break;
+                }
             }
+            resolve(true);
         });
     });
 };
 export const startTerminal = async () => {
-    const imagePath = path.resolve(__dirname, xyo_logo_black);
-    await terminal.drawImage(imagePath);
-    terminal.green('XYO Node Started\n\n');
-    terminal.green("Type 'exit' to exit\n\n");
     let running = true;
     while (running) {
-        const command = await getCommand();
-        if (command === 'exit') {
-            running = false;
-        }
+        running = await getCommand();
     }
-    process.exit(0);
+    terminate();
 };
 //# sourceMappingURL=terminal.js.map

package/dist/esm/cli/terminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../src/cli/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,OAAO,cAAc,MAAM,sBAAsB,CAAA;AAEjD,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AAEnC,MAAM,UAAU,GAAG,GAAgC,EAAE;IACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACvF,QAAQ,CAAC,IAAI,CAAC,CAAA;YACd,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,KAAK,CAAC,CAAA;aACd;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAA;aACf;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACtC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACzD,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACnC,QAAQ,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACtC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAEzC,IAAI,OAAO,GAAG,IAAI,CAAA;IAElB,OAAO,OAAO,EAAE;QACd,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;QAClC,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,OAAO,GAAG,KAAK,CAAA;SAChB;KACF;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../src/cli/terminal.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -12,11 +12,11 @@
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
     "@xylabs/forget": "^2.6.7",
-    "@xyo-network/account": "^2.33.0-rc.1",
-    "@xyo-network/archivist": "^2.33.0-rc.1",
-    "@xyo-network/module": "^2.33.0-rc.1",
-    "@xyo-network/payload": "^2.33.0-rc.1",
-    "@xyo-network/promise": "^2.33.0-rc.1",
+    "@xyo-network/account": "^2.33.0-rc.11",
+    "@xyo-network/archivist": "^2.33.0-rc.11",
+    "@xyo-network/module": "^2.33.0-rc.11",
+    "@xyo-network/payload": "^2.33.0-rc.11",
+    "@xyo-network/promise": "^2.33.0-rc.11",
     "lodash": "^4.17.21",
     "terminal-kit": "^2.11.4",
     "tslib": "^2.4.0",
@@ -67,6 +67,6 @@
     "xyo-ts": "ts-node src/cli/index.ts"
   },
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.0-rc.1",
+  "version": "2.33.0-rc.11",
   "stableVersion": "2.32.1"
 }

package/src/XyoNode.ts

@@ -11,7 +11,7 @@ export abstract class XyoNode<
     TQueryResult extends XyoPayload = XyoPayload,
     TModule extends XyoModule = XyoModule,
   >
-  extends XyoModule<TConfig, TQuery, TQueryResult>
+  extends XyoModule<TQuery, TQueryResult, TConfig>
   implements NodeModule<TQuery, TQueryResult>
 {
   /** Query Functions - Start */
@@ -54,6 +54,8 @@ export abstract class XyoNode<
         this.registered()
         break
       }
+      default:
+        return super.query(query)
     }
     return this.bindPayloads(payloads, queryAccount)
   }

package/src/cli/terminal.ts

@@ -1,36 +1,112 @@
+import { XyoModuleConfig } from '@xyo-network/module'
+import { readFileSync } from 'fs'
 import path from 'path'
 import { terminal } from 'terminal-kit'
 
-import xyo_logo_black from './xyo_logo_black.png'
+function terminate() {
+  terminal.grabInput(false)
+  terminal.clear()
+  terminal.green('\n\nXYO Node Shutdown - Bye\n\n')
+  setTimeout(function () {
+    process.exit()
+  }, 100)
+}
 
-const commands = ['exit', 'plugin']
+const readFileDeep = (names: string[]) => {
+  let depth = 0
+  let result: string | undefined
+  let filename
+  let resolvedPath
+  while (depth < 10 && result === undefined) {
+    names.forEach((name) => {
+      if (result === undefined) {
+        filename = name
+        for (let i = 0; i < depth; i++) {
+          filename = `../${filename}`
+        }
+        resolvedPath = path.resolve(filename)
+        try {
+          result = readFileSync(resolvedPath, { encoding: 'utf8' })
+        } catch (ex) {
+          const error = ex as NodeJS.ErrnoException
+          if (error.code !== 'ENOENT') {
+            terminal.red(`${JSON.stringify(error)}\n`)
+          }
+        }
+      }
+    })
+    depth++
+  }
+  return [result, resolvedPath]
+}
 
-const getCommand = (): Promise<string | undefined> => {
-  return new Promise((resolve, reject) => {
-    terminal.inputField({ autoComplete: commands, autoCompleteMenu: true }, (error, input) => {
-      terminal('\n')
-      if (error) {
-        reject(error)
-      } else {
-        resolve(input)
+const getCommand = (): Promise<boolean> => {
+  return new Promise((resolve) => {
+    terminal.once('key', (name: string) => {
+      if (name === 'ESCAPE') {
+        resolve(true)
+      }
+      if (name === 'CTRL_C') {
+        resolve(false)
       }
     })
+    const items = [
+      'Register Plugin',
+      'Unregister Plugin',
+      'List Registered Plugins',
+      'Attach Plugin',
+      'Detatch Plugin',
+      'List Attached Plugins',
+      'Show Config',
+      'Status',
+      'Exit',
+    ].map((item, index) => {
+      return {
+        slug: item.toLowerCase().replaceAll(' ', '-'),
+        text: `${index + 1}. ${item}`,
+      }
+    })
+    //terminal.clear()
+    terminal.green('\nXYO Node Running\n')
+    terminal.singleColumnMenu(
+      items.map((item) => item.text),
+      async (error, response) => {
+        if (error) {
+          terminal.red(`Error: ${error}`)
+        }
+        switch (items[response.selectedIndex].slug) {
+          case 'exit':
+            resolve(false)
+            break
+          case 'register-plugin':
+            terminal.yellow('Register Plugin')
+            break
+          case 'show-config': {
+            const [config, path] = readFileDeep(['xyo-config.json', 'xyo-config.js'])
+            let configObj: XyoModuleConfig | undefined
+            terminal.yellow(`\nConfig found at: ${path}\n`)
+            if (config) {
+              if (path?.endsWith('.json')) {
+                configObj = JSON.parse(config) as XyoModuleConfig
+              } else if (path?.endsWith('.cjs') || path?.endsWith('.js')) {
+                configObj = (await import(path)) as XyoModuleConfig
+              }
+            }
+            terminal(JSON.stringify(configObj ?? {}))
+            break
+          }
+        }
+        resolve(true)
+      },
+    )
   })
 }
 
 export const startTerminal = async () => {
-  const imagePath = path.resolve(__dirname, xyo_logo_black)
-  await terminal.drawImage(imagePath)
-  terminal.green('XYO Node Started\n\n')
-  terminal.green("Type 'exit' to exit\n\n")
-
   let running = true
-
   while (running) {
-    const command = await getCommand()
-    if (command === 'exit') {
-      running = false
-    }
+    running = await getCommand()
   }
-  process.exit(0)
+
+  terminate()
 }

package/xyo-config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+module.exports = {
+  version: 1,
+}