@xyo-network/node 2.41.0 → 2.41.2

package/dist/esm/MemoryNode.d.ts

@@ -1,19 +1,16 @@
-import { Module, XyoModuleParams } from '@xyo-network/module';
+import { ModuleFilter, XyoModule, XyoModuleParams } from '@xyo-network/module';
 import { NodeConfig } from './Config';
 import { XyoNode } from './XyoNode';
-export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends Module = Module> extends XyoNode<TConfig, TModule> {
-    private attachedModuleMap;
+export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule> extends XyoNode<TConfig, TModule> {
     private registeredModuleMap;
     static create(params?: XyoModuleParams<NodeConfig>): Promise<MemoryNode>;
     attach(address: string): void;
-    attached(): string[];
-    attachedModules(): TModule[];
     detach(address: string): void;
-    find(schema: string[]): (TModule | null)[];
     queries(): string[];
     register(module: TModule): void;
     registered(): string[];
     registeredModules(): TModule[];
-    resolve(addresses: string[]): (TModule | null)[];
+    resolve(filter?: ModuleFilter): Promise<TModule[]>;
+    unregister(module: TModule): void;
 }
 //# sourceMappingURL=MemoryNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;IACjI,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,mBAAmB,CAA6B;WAElC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAI9E,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,QAAQ;IAMR,eAAe;IAMf,MAAM,CAAC,OAAO,EAAE,MAAM;IAItB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE;IAWnC,OAAO,IAAI,MAAM,EAAE;IAI1B,QAAQ,CAAC,MAAM,EAAE,OAAO;IAIxB,UAAU;IAMV,iBAAiB;IAMjB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE;CAM1D"}
+{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;IACvI,OAAO,CAAC,mBAAmB,CAA6B;WAElC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAI9E,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,MAAM,CAAC,OAAO,EAAE,MAAM;IAIf,OAAO,IAAI,MAAM,EAAE;IAI1B,QAAQ,CAAC,MAAM,EAAE,OAAO;IAKxB,UAAU;IAMV,iBAAiB;IAMX,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIxD,UAAU,CAAC,MAAM,EAAE,OAAO;CAGpC"}

package/dist/esm/MemoryNode.js

@@ -1,44 +1,23 @@
 import { assertEx } from '@xylabs/assert';
-import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist';
 import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries';
 import { XyoNode } from './XyoNode';
 export class MemoryNode extends XyoNode {
-    attachedModuleMap = new Map();
     registeredModuleMap = new Map();
     static async create(params) {
         return (await super.create(params));
     }
     attach(address) {
         const module = assertEx(this.registeredModuleMap.get(address), 'No module found at that address');
-        this.attachedModuleMap.set(address, module);
-    }
-    attached() {
-        return Array.from(this.attachedModuleMap.keys()).map((key) => {
-            return key;
-        });
-    }
-    attachedModules() {
-        return Array.from(this.attachedModuleMap.values()).map((value) => {
-            return value;
-        });
+        this.internalResolver.add(module);
     }
     detach(address) {
-        this.attachedModuleMap.delete(address);
-    }
-    find(schema) {
-        return schema.map((schema) => {
-            this.logger?.log(`Finding in MemoryNode: ${schema}`);
-            if (schema === 'network.xyo.archivist') {
-                this.logger?.log(`attachedModules: ${JSON.stringify(this.attachedModules(), null, 2)}`);
-                return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null;
-            }
-            return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null;
-        });
+        this.internalResolver.remove(address);
     }
     queries() {
         return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, ...super.queries()];
     }
     register(module) {
+        module.resolver = this.internalResolver;
         this.registeredModuleMap.set(module.address, module);
     }
     registered() {
@@ -51,11 +30,11 @@ export class MemoryNode extends XyoNode {
             return value;
         });
     }
-    resolve(addresses) {
-        return addresses.map((address) => {
-            this.logger?.log(`Resolving in MemoryNode: ${address}`);
-            return this.attachedModuleMap?.get(address) ?? null;
-        });
+    async resolve(filter) {
+        return (await this.internalResolver.resolve(filter)) ?? (await this.resolver?.resolve(filter)) ?? [];
+    }
+    unregister(module) {
+        this.registeredModuleMap.delete(module.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":"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"}
+{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,OAAO,UAA2F,SAAQ,OAAyB;IAC/H,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAExD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAoC;QAC/D,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAe,CAAA;IACnD,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,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC;IAEe,OAAO;QACrB,OAAO,CAAC,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACjF,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAA;QACvC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACtD,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,iBAAiB;QACxB,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,KAAK,CAAC,OAAO,CAAC,MAAqB;QAC1C,OAAO,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;IACtG,CAAC;IAEQ,UAAU,CAAC,MAAe;QACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACjD,CAAC;CACF"}

package/dist/esm/NodeModule.d.ts

@@ -1,10 +1,11 @@
-import { Module } from '@xyo-network/module';
+import { Module, ModuleFilter } from '@xyo-network/module';
 import { Promisable, PromisableArray } from '@xyo-network/promise';
 import { Node } from './Node';
 export interface NodeModule<TModule extends Module = Module> extends Node, Module {
     attachedModules(): PromisableArray<TModule>;
     register(module: TModule): Promisable<void>;
     registeredModules(): PromisableArray<TModule>;
-    resolve(address: string[]): Promisable<(TModule | null)[]>;
+    resolve(filter?: ModuleFilter): Promisable<TModule[]>;
+    unregister(module: TModule): Promisable<void>;
 }
 //# sourceMappingURL=NodeModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"NodeModule.d.ts","sourceRoot":"","sources":["../../src/NodeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,IAAI,EAAE,MAAM;IAC/E,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;IAC3C,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IAC3C,iBAAiB,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;IAC7C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAA;CAC3D"}
+{"version":3,"file":"NodeModule.d.ts","sourceRoot":"","sources":["../../src/NodeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,IAAI,EAAE,MAAM;IAC/E,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;IAC3C,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IAC3C,iBAAiB,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;IAC7C,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;IACrD,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;CAC9C"}

package/dist/esm/XyoNode.d.ts

@@ -1,21 +1,26 @@
-import { Module, ModuleQueryResult, XyoModule, XyoQueryBoundWitness } from '@xyo-network/module';
+import { Module, ModuleFilter, ModuleQueryResult, ModuleResolver, XyoModule, XyoModuleParams, XyoModuleResolver, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
+import { Promisable } from '@xyo-network/promise';
 import { NodeConfig } from './Config';
 import { NodeModule } from './NodeModule';
-export declare abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends Module = Module> extends XyoModule<TConfig> implements NodeModule {
+export declare abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule> extends XyoModule<TConfig> implements NodeModule, ModuleResolver {
+    isModuleResolver: boolean;
+    protected internalResolver: XyoModuleResolver<TModule>;
     private _archivist?;
-    attached(): string[];
-    attachedModules(): TModule[];
+    protected constructor(params: XyoModuleParams<TConfig>, internalResolver?: XyoModuleResolver<TModule>);
+    static create(params?: Partial<XyoModuleParams<NodeConfig>>): Promise<XyoNode>;
+    attached(): Promise<string[]>;
+    attachedModules(): Promise<TModule[]>;
     getArchivist(): Promise<Module>;
     query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult>;
     register(_module: TModule): void;
     registered(): string[];
     registeredModules(): TModule[];
     start(): Promise<this>;
+    unregister(_module: TModule): void;
     private storeInstanceData;
     abstract attach(_address: string): void;
     abstract detach(_address: string): void;
-    abstract find(_schema: string[]): (TModule | null)[];
-    abstract resolve(_address: string[]): (TModule | null)[];
+    abstract resolve(_filter?: ModuleFilter): Promisable<TModule[]>;
 }
 //# sourceMappingURL=XyoNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAA6C,SAAS,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE3I,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,8BAAsB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,MAAM,GAAG,MAAM,CACpG,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU;IAErB,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B,QAAQ,IAAI,MAAM,EAAE;IAIpB,eAAe,IAAI,OAAO,EAAE;IAIf,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU7B,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAmC1I,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,UAAU,IAAI,MAAM,EAAE;IAItB,iBAAiB,IAAI,OAAO,EAAE;IAIf,KAAK;YAMN,iBAAiB;IAM/B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE;IACpD,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE;CACzD"}
+{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,cAAc,EAGd,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,8BAAsB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAC1G,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU,EAAE,cAAc;IAE9B,gBAAgB,UAAO;IAE9B,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACtD,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B,SAAS,aAAa,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC;WAK/E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvF,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAI9B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU7B,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAmC1I,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,UAAU,IAAI,MAAM,EAAE;IAItB,iBAAiB,IAAI,OAAO,EAAE;IAIf,KAAK;IAMpB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIpB,iBAAiB;IAM/B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAChE"}

package/dist/esm/XyoNode.js

@@ -1,22 +1,31 @@
 import { assertEx } from '@xylabs/assert';
 import { XyoAccount } from '@xyo-network/account';
 import { XyoArchivistWrapper, XyoMemoryArchivist } from '@xyo-network/archivist';
-import { QueryBoundWitnessWrapper, XyoErrorBuilder, XyoModule } from '@xyo-network/module';
+import { QueryBoundWitnessWrapper, XyoErrorBuilder, XyoModule, XyoModuleResolver, } from '@xyo-network/module';
 import { XyoModuleInstanceSchema } from '@xyo-network/module-instance-payload-plugin';
 import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema } from './Queries';
 export class XyoNode extends XyoModule {
+    isModuleResolver = true;
+    internalResolver;
     _archivist;
-    attached() {
-        throw new Error('Method not implemented.');
+    constructor(params, internalResolver) {
+        super(params);
+        this.internalResolver = internalResolver ?? new XyoModuleResolver();
     }
-    attachedModules() {
-        throw new Error('Method not implemented.');
+    static async create(params) {
+        return (await super.create(params));
+    }
+    async attached() {
+        return (await this.attachedModules()).map((module) => module.address);
+    }
+    async attachedModules() {
+        return await (this.internalResolver.resolve() ?? []);
     }
     async getArchivist() {
         if (!this._archivist) {
             this._archivist =
                 this._archivist ??
-                    (this.config?.archivist ? this.resolver?.fromAddress([this.config?.archivist]).shift() : undefined) ??
+                    (this.config?.archivist ? ((await this.resolver?.resolve({ address: [this.config?.archivist] })) ?? []).shift() : undefined) ??
                     (await XyoMemoryArchivist.create());
         }
         return this._archivist;
@@ -38,7 +47,7 @@ export class XyoNode extends XyoModule {
                     break;
                 }
                 case XyoNodeAttachedQuerySchema: {
-                    this.attached();
+                    await this.attached();
                     break;
                 }
                 case XyoNodeRegisteredQuerySchema: {
@@ -69,6 +78,9 @@ export class XyoNode extends XyoModule {
         await this.storeInstanceData();
         return this;
     }
+    unregister(_module) {
+        throw new Error('Method not implemented.');
+    }
     async storeInstanceData() {
         const payload = { address: this.address, queries: this.queries, schema: XyoModuleInstanceSchema };
         const [bw] = await this.bindResult([payload]);

package/dist/esm/XyoNode.js.map

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

package/dist/esm/XyoNodeWrapper.d.ts

@@ -1,5 +1,5 @@
 import { XyoArchivistWrapper } from '@xyo-network/archivist';
-import { Module, XyoModule, XyoModuleWrapper } from '@xyo-network/module';
+import { Module, ModuleFilter, XyoModule, XyoModuleWrapper } from '@xyo-network/module';
 import { Promisable } from '@xyo-network/promise';
 import { NodeModule } from './NodeModule';
 export declare class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
@@ -9,9 +9,11 @@ export declare class XyoNodeWrapper extends XyoModuleWrapper implements NodeModu
     attached(): Promise<string[]>;
     attachedModules(): Promise<XyoModule[]>;
     detach(address: string): Promise<void>;
+    find(_filter: ModuleFilter): Promisable<XyoModule[]>;
     register(_module: Module): void;
     registered(): Promise<string[]>;
     registeredModules(): Promise<XyoModule[]>;
-    resolve(_address: string[]): Promisable<(XyoModule | null)[]>;
+    resolve(_filter: ModuleFilter): Promisable<XyoModule[]>;
+    unregister(_module: Module): void;
 }
 //# sourceMappingURL=XyoNodeWrapper.d.ts.map

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,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAYzC,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,UAAU;IACxE,OAAO,CAAC,UAAU,CAAC,CAAqB;IACxC,IAAW,SAAS,wBAGnB;IAEK,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7B,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAKvC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ/B,iBAAiB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAK/C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;CAG9D"}
+{"version":3,"file":"XyoNodeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEvF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAYzC,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,UAAU;IACxE,OAAO,CAAC,UAAU,CAAC,CAAqB;IACxC,IAAW,SAAS,wBAGnB;IAEK,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7B,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAKvC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;IAIpD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ/B,iBAAiB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAK/C,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;IAIvD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAGlC"}

package/dist/esm/XyoNodeWrapper.js

@@ -24,7 +24,7 @@ export class XyoNodeWrapper extends XyoModuleWrapper {
     }
     async attachedModules() {
         const addresses = await this.attached();
-        return compact(await this.resolve(addresses));
+        return compact(await this.resolve({ address: addresses }));
     }
     async detach(address) {
         const queryPayload = PayloadWrapper.parse({ address, schema: XyoNodeDetachQuerySchema });
@@ -32,6 +32,9 @@ export class XyoNodeWrapper extends XyoModuleWrapper {
         const result = await this.module.query(query[0], query[1]);
         this.throwErrors(query, result);
     }
+    find(_filter) {
+        throw Error('Not implemented');
+    }
     register(_module) {
         throw Error('Not implemented');
     }
@@ -44,9 +47,12 @@ export class XyoNodeWrapper extends XyoModuleWrapper {
     }
     async registeredModules() {
         const addresses = await this.registered();
-        return compact(await this.resolve(addresses));
+        return compact(await this.resolve({ address: addresses }));
+    }
+    resolve(_filter) {
+        throw Error('Not implemented');
     }
-    resolve(_address) {
+    unregister(_module) {
         throw Error('Not implemented');
     }
 }

package/dist/esm/XyoNodeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAqB,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAGpC,OAAO,EAEL,0BAA0B,EAE1B,wBAAwB,EAExB,wBAAwB,EAExB,4BAA4B,GAC7B,MAAM,WAAW,CAAA;AAElB,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAC1C,UAAU,CAAsB;IACxC,IAAW,SAAS;QAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzE,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAC5G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAuB,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAAA;QACvG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACvC,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAC5G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACjC,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAA;QAC3G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACzC,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,OAAO,CAAC,QAAkB;QACxB,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.9",
-    "@xyo-network/account": "^2.41.0",
-    "@xyo-network/archivist": "^2.41.0",
-    "@xyo-network/module": "^2.41.0",
-    "@xyo-network/module-instance-payload-plugin": "^2.41.0",
-    "@xyo-network/payload": "^2.41.0",
-    "@xyo-network/promise": "^2.41.0",
+    "@xyo-network/account": "^2.41.2",
+    "@xyo-network/archivist": "^2.41.2",
+    "@xyo-network/module": "^2.41.2",
+    "@xyo-network/module-instance-payload-plugin": "^2.41.2",
+    "@xyo-network/payload": "^2.41.2",
+    "@xyo-network/promise": "^2.41.2",
     "lodash": "^4.17.21",
     "tslib": "^2.4.1"
   },
@@ -61,5 +61,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.0"
+  "version": "2.41.2"
 }

package/src/MemoryNode.spec.ts

@@ -28,7 +28,7 @@ test('Create Node', async () => {
   node.attach(diviner.address)
   expect((await node.registered()).length).toBe(2)
   expect((await node.attached()).length).toBe(2)
-  const foundArchivist = (await node.resolve([archivist.address])).shift()
+  const foundArchivist = (await node.resolve({ address: [archivist.address] })).shift()
   expect(foundArchivist).toBeDefined()
   expect(foundArchivist?.address).toBe(archivist.address)
   const testPayload = new XyoPayloadBuilder<XyoPayload<{ schema: XyoPayloadSchema; test: boolean }>>({ schema: XyoPayloadSchema })
@@ -47,7 +47,7 @@ test('Create Node', async () => {
   if (payloads && payloads[0]) {
     const huri = new PayloadWrapper(payloads[0]).hash
     const huriPayload: XyoHuriPayload = { huri: [huri], schema: XyoHuriSchema }
-    const module = (await node.resolve([diviner.address])).shift() as DivinerModule
+    const module = (await node.resolve({ address: [diviner.address] })).shift() as DivinerModule
     const foundDiviner = module ? new XyoDivinerWrapper(module) : null
     expect(foundDiviner).toBeDefined()
     if (foundDiviner) {

package/src/MemoryNode.ts

@@ -1,13 +1,11 @@
 import { assertEx } from '@xylabs/assert'
-import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist'
-import { Module, XyoModuleParams } from '@xyo-network/module'
+import { ModuleFilter, XyoModule, XyoModuleParams } from '@xyo-network/module'
 
 import { NodeConfig } from './Config'
 import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries'
 import { XyoNode } from './XyoNode'
 
-export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends Module = Module> extends XyoNode<TConfig, TModule> {
-  private attachedModuleMap = new Map<string, TModule>()
+export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule> extends XyoNode<TConfig, TModule> {
   private registeredModuleMap = new Map<string, TModule>()
 
   static override async create(params?: XyoModuleParams<NodeConfig>): Promise<MemoryNode> {
@@ -16,34 +14,11 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
 
   override attach(address: string) {
     const module = assertEx(this.registeredModuleMap.get(address), 'No module found at that address')
-    this.attachedModuleMap.set(address, module)
-  }
-
-  override attached() {
-    return Array.from(this.attachedModuleMap.keys()).map((key) => {
-      return key
-    })
-  }
-
-  override attachedModules() {
-    return Array.from(this.attachedModuleMap.values()).map((value) => {
-      return value
-    })
+    this.internalResolver.add(module)
   }
 
   override detach(address: string) {
-    this.attachedModuleMap.delete(address)
-  }
-
-  override find(schema: string[]): (TModule | null)[] {
-    return schema.map((schema) => {
-      this.logger?.log(`Finding in MemoryNode: ${schema}`)
-      if (schema === 'network.xyo.archivist') {
-        this.logger?.log(`attachedModules: ${JSON.stringify(this.attachedModules(), null, 2)}`)
-        return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null
-      }
-      return this.attachedModules().find((module) => module.queryable(XyoArchivistGetQuerySchema)) ?? null
-    })
+    this.internalResolver.remove(address)
   }
 
   public override queries(): string[] {
@@ -51,6 +26,7 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
   }
 
   override register(module: TModule) {
+    module.resolver = this.internalResolver
     this.registeredModuleMap.set(module.address, module)
   }
 
@@ -66,10 +42,11 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
     })
   }
 
-  override resolve(addresses: string[]): (TModule | null)[] {
-    return addresses.map((address) => {
-      this.logger?.log(`Resolving in MemoryNode: ${address}`)
-      return this.attachedModuleMap?.get(address) ?? null
-    })
+  override async resolve(filter?: ModuleFilter): Promise<TModule[]> {
+    return (await this.internalResolver.resolve(filter)) ?? (await this.resolver?.resolve(filter)) ?? []
+  }
+
+  override unregister(module: TModule) {
+    this.registeredModuleMap.delete(module.address)
   }
 }

package/src/NodeModule.ts

@@ -1,4 +1,4 @@
-import { Module } from '@xyo-network/module'
+import { Module, ModuleFilter } from '@xyo-network/module'
 import { Promisable, PromisableArray } from '@xyo-network/promise'
 
 import { Node } from './Node'
@@ -7,5 +7,6 @@ export interface NodeModule<TModule extends Module = Module> extends Node, Modul
   attachedModules(): PromisableArray<TModule>
   register(module: TModule): Promisable<void>
   registeredModules(): PromisableArray<TModule>
-  resolve(address: string[]): Promisable<(TModule | null)[]>
+  resolve(filter?: ModuleFilter): Promisable<TModule[]>
+  unregister(module: TModule): Promisable<void>
 }

package/src/XyoNode.ts

@@ -1,32 +1,57 @@
 import { assertEx } from '@xylabs/assert'
 import { XyoAccount } from '@xyo-network/account'
 import { XyoArchivistWrapper, XyoMemoryArchivist } from '@xyo-network/archivist'
-import { Module, ModuleQueryResult, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoModule, XyoQueryBoundWitness } from '@xyo-network/module'
+import {
+  Module,
+  ModuleFilter,
+  ModuleQueryResult,
+  ModuleResolver,
+  QueryBoundWitnessWrapper,
+  XyoErrorBuilder,
+  XyoModule,
+  XyoModuleParams,
+  XyoModuleResolver,
+  XyoQueryBoundWitness,
+} from '@xyo-network/module'
 import { XyoModuleInstanceSchema } from '@xyo-network/module-instance-payload-plugin'
 import { XyoPayload } from '@xyo-network/payload'
+import { Promisable } from '@xyo-network/promise'
 
 import { NodeConfig } from './Config'
 import { NodeModule } from './NodeModule'
 import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeQuery, XyoNodeRegisteredQuerySchema } from './Queries'
-export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends Module = Module>
+
+export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule>
   extends XyoModule<TConfig>
-  implements NodeModule
+  implements NodeModule, ModuleResolver
 {
+  public isModuleResolver = true
+
+  protected internalResolver: XyoModuleResolver<TModule>
   private _archivist?: Module
 
-  attached(): string[] {
-    throw new Error('Method not implemented.')
+  protected constructor(params: XyoModuleParams<TConfig>, internalResolver?: XyoModuleResolver<TModule>) {
+    super(params)
+    this.internalResolver = internalResolver ?? new XyoModuleResolver<TModule>()
   }
 
-  attachedModules(): TModule[] {
-    throw new Error('Method not implemented.')
+  static override async create(params?: Partial<XyoModuleParams<NodeConfig>>): Promise<XyoNode> {
+    return (await super.create(params)) as XyoNode
+  }
+
+  async attached(): Promise<string[]> {
+    return (await this.attachedModules()).map((module) => module.address)
+  }
+
+  async attachedModules(): Promise<TModule[]> {
+    return await (this.internalResolver.resolve() ?? [])
   }
 
   public async getArchivist(): Promise<Module> {
     if (!this._archivist) {
       this._archivist =
         this._archivist ??
-        (this.config?.archivist ? this.resolver?.fromAddress([this.config?.archivist]).shift() : undefined) ??
+        (this.config?.archivist ? ((await this.resolver?.resolve({ address: [this.config?.archivist] })) ?? []).shift() : undefined) ??
         (await XyoMemoryArchivist.create())
     }
     return this._archivist
@@ -50,7 +75,7 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
           break
         }
         case XyoNodeAttachedQuerySchema: {
-          this.attached()
+          await this.attached()
           break
         }
         case XyoNodeRegisteredQuerySchema: {
@@ -85,6 +110,10 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
     return this
   }
 
+  unregister(_module: TModule): void {
+    throw new Error('Method not implemented.')
+  }
+
   private async storeInstanceData() {
     const payload = { address: this.address, queries: this.queries, schema: XyoModuleInstanceSchema }
     const [bw] = await this.bindResult([payload])
@@ -93,6 +122,5 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
 
   abstract attach(_address: string): void
   abstract detach(_address: string): void
-  abstract find(_schema: string[]): (TModule | null)[]
-  abstract resolve(_address: string[]): (TModule | null)[]
+  abstract resolve(_filter?: ModuleFilter): Promisable<TModule[]>
 }

package/src/XyoNodeWrapper.ts

@@ -1,5 +1,5 @@
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
-import { Module, XyoModule, XyoModuleWrapper } from '@xyo-network/module'
+import { Module, ModuleFilter, XyoModule, XyoModuleWrapper } from '@xyo-network/module'
 import { PayloadWrapper } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -40,7 +40,7 @@ export class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
 
   async attachedModules(): Promise<XyoModule[]> {
     const addresses = await this.attached()
-    return compact(await this.resolve(addresses))
+    return compact(await this.resolve({ address: addresses }))
   }
 
   async detach(address: string): Promise<void> {
@@ -50,6 +50,10 @@ export class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
     this.throwErrors(query, result)
   }
 
+  find(_filter: ModuleFilter): Promisable<XyoModule[]> {
+    throw Error('Not implemented')
+  }
+
   register(_module: Module): void {
     throw Error('Not implemented')
   }
@@ -64,10 +68,14 @@ export class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
 
   async registeredModules(): Promise<XyoModule[]> {
     const addresses = await this.registered()
-    return compact(await this.resolve(addresses))
+    return compact(await this.resolve({ address: addresses }))
+  }
+
+  resolve(_filter: ModuleFilter): Promisable<XyoModule[]> {
+    throw Error('Not implemented')
   }
 
-  resolve(_address: string[]): Promisable<(XyoModule | null)[]> {
+  unregister(_module: Module): void {
     throw Error('Not implemented')
   }
 }