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

package/dist/esm/MemoryNode.d.ts

@@ -3,11 +3,14 @@ import { XyoPayload } from '@xyo-network/payload';
 import { XyoNodeQuery } from './Queries';
 import { XyoNode } from './XyoNode';
 export declare class XyoMemoryNode<TConfig extends XyoModuleConfig = XyoModuleConfig, TQuery extends XyoNodeQuery = XyoNodeQuery, TQueryResult extends XyoPayload = XyoPayload, TModule extends XyoModule = XyoModule> extends XyoNode<TConfig, TQuery, TQueryResult, TModule> {
-    private registeredModules;
-    private attachedModules;
+    private registeredModuleMap;
+    private attachedModuleMap;
     queries(): TQuery['schema'][];
     attached(): string[];
-    available(): string[];
+    registered(): string[];
+    attachedModules(): TModule[];
+    availableModules(): TModule[];
+    resolve(address: string): TModule | null;
     register(module: TModule): void;
     attach(address: string): void;
     detatch(address: string): void;

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

@@ -1 +1 @@
-{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAA4B,YAAY,EAAE,MAAM,WAAW,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,aAAa,CACxB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CACrC,SAAQ,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC;IACvD,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,eAAe,CAA6B;IAEpC,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;IAIpC,QAAQ;IAMR,SAAS;IAMT,QAAQ,CAAC,MAAM,EAAE,OAAO;IAIxB,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,GAAG,CAAC,OAAO,EAAE,MAAM;CAG7B"}
+{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAA4B,YAAY,EAAE,MAAM,WAAW,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,aAAa,CACxB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CACrC,SAAQ,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC;IACvD,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,iBAAiB,CAA6B;IAEtC,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;IAIpC,QAAQ;IAMR,UAAU;IAMV,eAAe;IAMf,gBAAgB;IAMhB,OAAO,CAAC,OAAO,EAAE,MAAM;IASvB,QAAQ,CAAC,MAAM,EAAE,OAAO;IAIxB,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,GAAG,CAAC,OAAO,EAAE,MAAM;CAG7B"}

package/dist/esm/MemoryNode.js

@@ -1,34 +1,53 @@
 import { assertEx } from '@xylabs/assert';
+import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist';
 import { XyoNodeAttachQuerySchema } from './Queries';
 import { XyoNode } from './XyoNode';
 export class XyoMemoryNode extends XyoNode {
-    registeredModules = new Map();
-    attachedModules = new Map();
+    registeredModuleMap = new Map();
+    attachedModuleMap = new Map();
     queries() {
         return [XyoNodeAttachQuerySchema];
     }
     attached() {
-        return Array.from(this.attachedModules.keys()).map(([key]) => {
+        return Array.from(this.attachedModuleMap.keys()).map((key) => {
             return key;
         });
     }
-    available() {
-        return Array.from(this.registeredModules.keys()).map(([key]) => {
+    registered() {
+        return Array.from(this.registeredModuleMap.keys()).map((key) => {
             return key;
         });
     }
+    attachedModules() {
+        return Array.from(this.attachedModuleMap.values()).map((value) => {
+            return value;
+        });
+    }
+    availableModules() {
+        return Array.from(this.registeredModuleMap.values()).map((value) => {
+            return value;
+        });
+    }
+    resolve(address) {
+        console.log(`Resolving in MemoryNode: ${address}`);
+        if (address === 'archivist') {
+            console.log(`attachedModules: ${JSON.stringify(this.attachedModules(), null, 2)}`);
+            return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null;
+        }
+        return this.attachedModuleMap?.get(address) ?? null;
+    }
     register(module) {
-        this.registeredModules.set(module.address, module);
+        this.registeredModuleMap.set(module.address, module);
     }
     attach(address) {
-        const module = assertEx(this.registeredModules.get(address), 'No module found at that address');
-        this.attachedModules.set(address, module);
+        const module = assertEx(this.registeredModuleMap.get(address), 'No module found at that address');
+        this.attachedModuleMap.set(address, module);
     }
     detatch(address) {
-        this.attachedModules.delete(address);
+        this.attachedModuleMap.delete(address);
     }
     get(address) {
-        return this.attachedModules.get(address);
+        return this.attachedModuleMap.get(address);
     }
 }
 //# sourceMappingURL=MemoryNode.js.map

package/dist/esm/MemoryNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,OAAO,EAAE,wBAAwB,EAAgB,MAAM,WAAW,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,OAAO,aAKX,SAAQ,OAA+C;IAC/C,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAC9C,eAAe,GAAG,IAAI,GAAG,EAAmB,CAAA;IAEpC,OAAO;QACrB,OAAO,CAAC,wBAAwB,CAAC,CAAA;IACnC,CAAC;IAEQ,QAAQ;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;YAC3D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,SAAS;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;YAC7D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACpD,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAA;QAC/F,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC3C,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEQ,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;CACF"}
+{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAInE,OAAO,EAAE,wBAAwB,EAAgB,MAAM,WAAW,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,OAAO,aAKX,SAAQ,OAA+C;IAC/C,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAChD,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAEtC,OAAO;QACrB,OAAO,CAAC,wBAAwB,CAAC,CAAA;IACnC,CAAC;IAEQ,QAAQ;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,UAAU;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,eAAe;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,gBAAgB;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,OAAO,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAA;QAClD,IAAI,OAAO,KAAK,WAAW,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAClF,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAA;SACrG;QACD,OAAO,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACrD,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACtD,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAA;QACjG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAEQ,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/dist/esm/Node.d.ts

@@ -1,10 +1,10 @@
 import { Module, XyoQuery } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
-import { Promisable } from '@xyo-network/promisable';
+import { Promisable } from '@xyo-network/promise';
 export interface Node {
     attach(address: string): void;
     detatch(address: string): void;
-    available(): Promisable<string[]>;
+    registered(): Promisable<string[]>;
     attached(): Promisable<string[]>;
 }
 export interface NodeModule<TQuery extends XyoQuery = XyoQuery, TQueryResult extends XyoPayload = XyoPayload> extends Node, Module<TQuery, TQueryResult> {

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

@@ -1 +1 @@
-{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IACjC,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,UAAU,CAAC,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAAE,YAAY,SAAS,UAAU,GAAG,UAAU,CAC1G,SAAQ,IAAI,EACV,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;CAAG"}
+{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAClC,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,UAAU,CAAC,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAAE,YAAY,SAAS,UAAU,GAAG,UAAU,CAC1G,SAAQ,IAAI,EACV,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;CAAG"}

package/dist/esm/XyoNode.d.ts

@@ -1,16 +1,19 @@
-import { XyoModule, XyoModuleConfig, XyoModuleQueryResult } from '@xyo-network/module';
+import { XyoAccount } from '@xyo-network/account';
+import { XyoModule, XyoModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
-import { Promisable } from '@xyo-network/promisable';
 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> {
     /** Query Functions - Start */
     abstract attach(_address: string): void;
     abstract detatch(_address: string): void;
-    available(): string[];
+    abstract resolve(_address: string): XyoModule | null;
+    registered(): string[];
     attached(): string[];
+    availableModules(): XyoModule[];
+    attachedModules(): XyoModule[];
     /** Query Functions - End */
-    query(query: TQuery): Promisable<XyoModuleQueryResult<TQueryResult>>;
+    query(query: TQuery): 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,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,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;IAExC,SAAS,IAAI,MAAM,EAAE;IAGrB,QAAQ,IAAI,MAAM,EAAE;IAGpB,4BAA4B;IAE5B,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAuBpE,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,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"}

package/dist/esm/XyoNode.js

@@ -1,14 +1,22 @@
+import { XyoAccount } from '@xyo-network/account';
 import { XyoModule } from '@xyo-network/module';
 import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeAvailableQuerySchema, XyoNodeDetatchQuerySchema } from './Queries';
 export class XyoNode extends XyoModule {
-    available() {
+    registered() {
         throw new Error('Method not implemented.');
     }
     attached() {
         throw new Error('Method not implemented.');
     }
+    availableModules() {
+        throw new Error('Method not implemented.');
+    }
+    attachedModules() {
+        throw new Error('Method not implemented.');
+    }
     /** Query Functions - End */
     query(query) {
+        const queryAccount = new XyoAccount();
         const payloads = [];
         switch (query.schema) {
             case XyoNodeAttachQuerySchema: {
@@ -24,11 +32,11 @@ export class XyoNode extends XyoModule {
                 break;
             }
             case XyoNodeAvailableQuerySchema: {
-                this.available();
+                this.registered();
                 break;
             }
         }
-        return [this.bindPayloads(payloads), payloads];
+        return this.bindPayloads(payloads, queryAccount);
     }
     register(_module) {
         throw new Error('Method not implemented.');

package/dist/esm/XyoNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.js","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAyC,MAAM,qBAAqB,CAAA;AAKtF,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,yBAAyB,EAAgB,MAAM,WAAW,CAAA;AAEtJ,MAAM,OAAgB,OAMpB,SAAQ,SAAwC;IAOhD,SAAS;QACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,4BAA4B;IAE5B,KAAK,CAAC,KAAa;QACjB,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,SAAS,EAAE,CAAA;gBAChB,MAAK;aACN;SACF;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,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;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"}

package/dist/esm/XyoNodeWrapper.d.ts

@@ -1,7 +1,7 @@
 import { XyoModuleWrapper } from '@xyo-network/module';
 import { Node } from './Node';
 export declare class XyoNodeWrapper extends XyoModuleWrapper implements Node {
-    available(): Promise<string[]>;
+    registered(): Promise<string[]>;
     attached(): Promise<string[]>;
     attach(address: string): Promise<void>;
     detatch(address: string): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"XyoNodeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAY7B,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,IAAI;IAC5D,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK9C"}
+{"version":3,"file":"XyoNodeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAY7B,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,IAAI;IAC5D,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI/B,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK9C"}

package/dist/esm/XyoNodeWrapper.js

@@ -2,7 +2,7 @@ import { XyoModuleWrapper } from '@xyo-network/module';
 import compact from 'lodash/compact';
 import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeAvailableQuerySchema, XyoNodeDetatchQuerySchema, } from './Queries';
 export class XyoNodeWrapper extends XyoModuleWrapper {
-    async available() {
+    async registered() {
         const query = { schema: XyoNodeAvailableQuerySchema };
         return compact((await this.module.query(query))[1].map((payload) => payload?.schema));
     }

package/dist/esm/XyoNodeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAGpC,OAAO,EAEL,0BAA0B,EAE1B,wBAAwB,EAExB,2BAA2B,EAE3B,yBAAyB,GAC1B,MAAM,WAAW,CAAA;AAElB,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAClD,KAAK,CAAC,SAAS;QACb,MAAM,KAAK,GAA0B,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAA;QAC5E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAyB,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAA;QAC1E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,KAAK,GAAuB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAA;QAC/E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,OAAe;QAC3B,MAAM,KAAK,GAAwB,EAAE,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QACjF,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;CACF"}
+{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAGpC,OAAO,EAEL,0BAA0B,EAE1B,wBAAwB,EAExB,2BAA2B,EAE3B,yBAAyB,GAC1B,MAAM,WAAW,CAAA;AAElB,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAClD,KAAK,CAAC,UAAU;QACd,MAAM,KAAK,GAA0B,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAA;QAC5E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAyB,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAA;QAC1E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,KAAK,GAAuB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAA;QAC/E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,OAAe;QAC3B,MAAM,KAAK,GAAwB,EAAE,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QACjF,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;CACF"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":""}

package/dist/esm/cli/index.js

@@ -0,0 +1,53 @@
+import { forget } from '@xylabs/forget';
+import yargs from 'yargs';
+// eslint-disable-next-line import/no-internal-modules
+import { hideBin } from 'yargs/helpers';
+import { XyoMemoryNode } from '../MemoryNode';
+import { startTerminal } from './terminal';
+const parseOptions = () => {
+    return yargs(hideBin(process.argv))
+        .option('verbose', {
+        alias: 'v',
+        default: false,
+        description: 'Run with verbose logging',
+        type: 'boolean',
+    })
+        .option('module', {
+        alias: 'm',
+        description: 'Modules to load',
+        type: 'string',
+    });
+};
+const loadModule = async (pkg, name, resolver) => {
+    const loadedPkg = await import(pkg);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const ModuleConstructor = name ? loadedPkg[name] : loadedPkg;
+    return new ModuleConstructor(undefined, undefined, resolver);
+};
+const xyo = () => {
+    return parseOptions().command('node', 'Start an XYO Node', (yargs) => {
+        return yargs;
+    }, async (yargs) => {
+        console.log(`yargs: ${JSON.stringify(yargs, null, 2)}`);
+        const { verbose, module } = yargs;
+        const modules = Array.isArray(module) ? module : [module];
+        if (verbose)
+            console.info('Starting Node');
+        const node = new XyoMemoryNode();
+        const resolver = (address) => {
+            console.log(`Resolving: ${address}`);
+            return node.resolve(address);
+        };
+        await Promise.all(modules.map(async (module) => {
+            const [pkg, name] = module.split('.');
+            const instance = await loadModule(pkg, name, resolver);
+            console.log(`Arg: ${instance.address}`);
+            node.register(instance);
+            node.attach(instance.address);
+            console.log(`Module Loaded: ${instance.address}`);
+        }));
+    }).argv;
+};
+void xyo();
+forget(startTerminal());
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}

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

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

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

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

package/dist/esm/cli/terminal.js

@@ -0,0 +1,32 @@
+import path from 'path';
+import { terminal } from 'terminal-kit';
+import xyo_logo_black from './xyo_logo_black.png';
+const commands = ['exit', 'plugin'];
+const getCommand = () => {
+    return new Promise((resolve, reject) => {
+        terminal.inputField({ autoComplete: commands, autoCompleteMenu: true }, (error, input) => {
+            terminal('\n');
+            if (error) {
+                reject(error);
+            }
+            else {
+                resolve(input);
+            }
+        });
+    });
+};
+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;
+        }
+    }
+    process.exit(0);
+};
+//# sourceMappingURL=terminal.js.map

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

@@ -0,0 +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"}

package/package.json

@@ -11,11 +11,25 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/module": "^2.32.0",
-    "@xyo-network/payload": "^2.32.0",
-    "@xyo-network/promisable": "^2.32.0",
+    "@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",
     "lodash": "^4.17.21",
-    "tslib": "^2.4.0"
+    "terminal-kit": "^2.11.4",
+    "tslib": "^2.4.0",
+    "yargs": "^17.5.1"
+  },
+  "bin": {
+    "xyo": "dist/cjs/cli/index.js"
+  },
+  "devDependencies": {
+    "@types/node": "^18.7.17",
+    "@types/terminal-kit": "^2.5.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -49,6 +63,10 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
+  "scripts": {
+    "xyo-ts": "ts-node src/cli/index.ts"
+  },
   "types": "dist/esm/index.d.ts",
-  "version": "2.32.0"
+  "version": "2.33.0-rc.1",
+  "stableVersion": "2.32.1"
 }

package/src/MemoryNode.spec.ts

@@ -1,10 +1,4 @@
-import {
-  XyoArchivistAllQuery,
-  XyoArchivistAllQuerySchema,
-  XyoArchivistInsertQuery,
-  XyoArchivistInsertQuerySchema,
-  XyoMemoryArchivist,
-} from '@xyo-network/archivist'
+import { XyoArchivistAllQuery, XyoArchivistAllQuerySchema, XyoArchivistInsertQuery, XyoArchivistInsertQuerySchema } from '@xyo-network/archivist'
 import { XyoArchivistPayloadDiviner, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema, XyoHuriPayload, XyoHuriSchema } from '@xyo-network/diviner'
 import { XyoModule } from '@xyo-network/module'
 import { XyoPayloadBuilder, XyoPayloadSchema, XyoPayloadWrapper } from '@xyo-network/sdk'
@@ -12,6 +6,7 @@ import { XyoPayloadBuilder, XyoPayloadSchema, XyoPayloadWrapper } from '@xyo-net
 import { XyoMemoryNode } from './MemoryNode'
 
 test('Create Node', async () => {
+  const XyoMemoryArchivist = (await import('@xyo-network/archivist')).XyoMemoryArchivist
   const node = new XyoMemoryNode()
   const archivist = new XyoMemoryArchivist()
   const diviner: XyoModule = new XyoArchivistPayloadDiviner({}, archivist)
@@ -19,7 +14,7 @@ test('Create Node', async () => {
   node.attach(archivist.address)
   node.register(diviner)
   node.attach(diviner.address)
-  expect(node.available().length).toBe(2)
+  expect(node.registered().length).toBe(2)
   expect(node.attached().length).toBe(2)
   const foundArchivist = node.get(archivist.address)
   expect(foundArchivist).toBeDefined()

package/src/MemoryNode.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/assert'
+import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { XyoModule, XyoModuleConfig } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 
@@ -11,39 +12,60 @@ export class XyoMemoryNode<
   TQueryResult extends XyoPayload = XyoPayload,
   TModule extends XyoModule = XyoModule,
 > extends XyoNode<TConfig, TQuery, TQueryResult, TModule> {
-  private registeredModules = new Map<string, TModule>()
-  private attachedModules = new Map<string, TModule>()
+  private registeredModuleMap = new Map<string, TModule>()
+  private attachedModuleMap = new Map<string, TModule>()
 
   public override queries(): TQuery['schema'][] {
     return [XyoNodeAttachQuerySchema]
   }
 
   override attached() {
-    return Array.from(this.attachedModules.keys()).map(([key]) => {
+    return Array.from(this.attachedModuleMap.keys()).map((key) => {
       return key
     })
   }
 
-  override available() {
-    return Array.from(this.registeredModules.keys()).map(([key]) => {
+  override registered() {
+    return Array.from(this.registeredModuleMap.keys()).map((key) => {
       return key
     })
   }
 
+  override attachedModules() {
+    return Array.from(this.attachedModuleMap.values()).map((value) => {
+      return value
+    })
+  }
+
+  override availableModules() {
+    return Array.from(this.registeredModuleMap.values()).map((value) => {
+      return value
+    })
+  }
+
+  override resolve(address: string) {
+    console.log(`Resolving in MemoryNode: ${address}`)
+    if (address === 'archivist') {
+      console.log(`attachedModules: ${JSON.stringify(this.attachedModules(), null, 2)}`)
+      return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null
+    }
+    return this.attachedModuleMap?.get(address) ?? null
+  }
+
   override register(module: TModule) {
-    this.registeredModules.set(module.address, module)
+    this.registeredModuleMap.set(module.address, module)
   }
 
   override attach(address: string) {
-    const module = assertEx(this.registeredModules.get(address), 'No module found at that address')
-    this.attachedModules.set(address, module)
+    const module = assertEx(this.registeredModuleMap.get(address), 'No module found at that address')
+    this.attachedModuleMap.set(address, module)
   }
 
   override detatch(address: string) {
-    this.attachedModules.delete(address)
+    this.attachedModuleMap.delete(address)
   }
 
   override get(address: string) {
-    return this.attachedModules.get(address)
+    return this.attachedModuleMap.get(address)
   }
 }

package/src/Node.ts

@@ -1,11 +1,11 @@
 import { Module, XyoQuery } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
-import { Promisable } from '@xyo-network/promisable'
+import { Promisable } from '@xyo-network/promise'
 
 export interface Node {
   attach(address: string): void
   detatch(address: string): void
-  available(): Promisable<string[]>
+  registered(): Promisable<string[]>
   attached(): Promisable<string[]>
 }
 

package/src/XyoNode.ts

@@ -1,6 +1,6 @@
-import { XyoModule, XyoModuleConfig, XyoModuleQueryResult } from '@xyo-network/module'
+import { XyoAccount } from '@xyo-network/account'
+import { XyoModule, XyoModuleConfig } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
-import { Promisable } from '@xyo-network/promisable'
 
 import { NodeModule } from './Node'
 import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeAvailableQuerySchema, XyoNodeDetatchQuerySchema, XyoNodeQuery } from './Queries'
@@ -17,16 +17,25 @@ export abstract class XyoNode<
   /** Query Functions - Start */
   abstract attach(_address: string): void
   abstract detatch(_address: string): void
+  abstract resolve(_address: string): XyoModule | null
 
-  available(): string[] {
+  registered(): string[] {
     throw new Error('Method not implemented.')
   }
   attached(): string[] {
     throw new Error('Method not implemented.')
   }
+
+  availableModules(): XyoModule[] {
+    throw new Error('Method not implemented.')
+  }
+  attachedModules(): XyoModule[] {
+    throw new Error('Method not implemented.')
+  }
   /** Query Functions - End */
 
-  query(query: TQuery): Promisable<XyoModuleQueryResult<TQueryResult>> {
+  query(query: TQuery) {
+    const queryAccount = new XyoAccount()
     const payloads: (TQueryResult | null)[] = []
     switch (query.schema) {
       case XyoNodeAttachQuerySchema: {
@@ -42,11 +51,11 @@ export abstract class XyoNode<
         break
       }
       case XyoNodeAvailableQuerySchema: {
-        this.available()
+        this.registered()
         break
       }
     }
-    return [this.bindPayloads(payloads), payloads]
+    return this.bindPayloads(payloads, queryAccount)
   }
 
   register(_module: TModule): void {

package/src/XyoNodeWrapper.ts

@@ -14,7 +14,7 @@ import {
 } from './Queries'
 
 export class XyoNodeWrapper extends XyoModuleWrapper implements Node {
-  async available(): Promise<string[]> {
+  async registered(): Promise<string[]> {
     const query: XyoNodeAvailableQuery = { schema: XyoNodeAvailableQuerySchema }
     return compact((await this.module.query(query))[1].map((payload) => payload?.schema))
   }