@xyo-network/module-abstract 2.92.11 → 2.93.0-rc.2

package/dist/browser/index.js

@@ -16,7 +16,7 @@ import { BoundWitnessBuilder, QueryBoundWitnessBuilder } from "@xyo-network/boun
 import { QueryBoundWitnessWrapper as QueryBoundWitnessWrapper3 } from "@xyo-network/boundwitness-wrapper";
 import { ConfigSchema } from "@xyo-network/config-payload-plugin";
 import { ModuleManifestPayloadSchema } from "@xyo-network/manifest-model";
-import { AddressPreviousHashSchema, DeadModuleError, duplicateModules, isModuleName, ModuleAddressQuerySchema, ModuleDescribeQuerySchema, ModuleDescriptionSchema, ModuleDiscoverQuerySchema, ModuleFactory, ModuleManifestQuerySchema, ModuleStateQuerySchema, ModuleSubscribeQuerySchema, serializableField } from "@xyo-network/module-model";
+import { AddressPreviousHashSchema, DeadModuleError, isModuleName, ModuleAddressQuerySchema, ModuleDescribeQuerySchema, ModuleDescriptionSchema, ModuleDiscoverQuerySchema, ModuleFactory, ModuleManifestQuerySchema, ModuleStateQuerySchema, ModuleSubscribeQuerySchema, serializableField } from "@xyo-network/module-model";
 import { CompositeModuleResolver } from "@xyo-network/module-resolver";
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 import { QuerySchema } from "@xyo-network/query-payload-plugin";
@@ -220,7 +220,7 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
   }
   static allowRandomAccount = true;
   static configSchemas;
-  static defaultLogger = new ConsoleLogger(LogLevel.log);
+  static defaultLogger = new ConsoleLogger(LogLevel.warn);
   static enableLazyLoad = false;
   static privateConstructorKey = Date.now().toString();
   downResolver = new CompositeModuleResolver();
@@ -271,6 +271,9 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
   get allowAnonymous() {
     return !!this.config.security?.allowAnonymous;
   }
+  get archiving() {
+    return this.config.archiving;
+  }
   get config() {
     return this.params.config;
   }
@@ -465,48 +468,6 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
     ];
     return validators.every((validator) => validator(query, payloads));
   }
-  async resolve(idOrFilter = "*", { required = "log", ...options } = {}) {
-    const childOptions = {
-      ...options,
-      required: false
-    };
-    const direction = options?.direction ?? "all";
-    const up = direction === "up" || direction === "all";
-    const down = direction === "down" || direction === "all";
-    let result;
-    if (idOrFilter === "*") {
-      if (this.dead) {
-        return [];
-      }
-      return [
-        ...down ? await this.downResolver.resolve("*", childOptions) : [],
-        ...up ? await this.upResolver.resolve("*", childOptions) : []
-      ].filter(duplicateModules);
-    } else {
-      switch (typeof idOrFilter) {
-        case "string": {
-          if (this.dead) {
-            return void 0;
-          }
-          result = (down ? await this.downResolver.resolve(idOrFilter, childOptions) : void 0) ?? (up ? await this.upResolver.resolve(idOrFilter, childOptions) : void 0);
-          break;
-        }
-        default: {
-          if (this.dead) {
-            return [];
-          }
-          const filter = idOrFilter;
-          result = [
-            ...down ? await this.downResolver.resolve(filter, childOptions) : [],
-            ...up ? await this.upResolver.resolve(filter, childOptions) : []
-          ].filter(duplicateModules);
-          break;
-        }
-      }
-    }
-    this.validateRequiredResolve(required, result, idOrFilter);
-    return result;
-  }
   start(_timeout) {
     this._startPromise = this._startPromise ?? this.startHandler();
     const result = this._startPromise;
@@ -619,7 +580,7 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
       await Promise.all(payloads.map((payload) => PayloadBuilder2.build(payload))),
       await Promise.all((errors ?? [])?.map((error) => PayloadBuilder2.build(error)))
     ];
-    if (this.config.archiving) {
+    if (this.archiving) {
       await this.storeToArchivists(result.flat());
     }
     return result;
@@ -641,7 +602,7 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
     return description;
   }
   async discoverHandler(_maxDepth) {
-    const config = this.config;
+    const config = await PayloadBuilder2.build(this.config);
     const address = await new PayloadBuilder2({
       schema: AddressSchema
     }).fields({
@@ -655,10 +616,10 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
         query
       }).build();
     }));
-    const configSchema = {
+    const configSchema = await PayloadBuilder2.build({
       config: config.schema,
       schema: ConfigSchema
-    };
+    });
     return compact([
       config,
       configSchema,
@@ -689,8 +650,18 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
       }
     }
   }
-  manifestHandler(_depth, _ignoreAddresses) {
+  async manifestHandler(maxDepth = 1, _ignoreAddresses = []) {
     const name = this.config.name ?? "Anonymous";
+    const children = await this.downResolver.resolve("*", {
+      direction: "down",
+      maxDepth
+    });
+    const childAddressToName = {};
+    for (const child of children) {
+      if (child.address !== this.address) {
+        childAddressToName[child.address] = child.config.name ?? null;
+      }
+    }
     return {
       config: {
         name,
@@ -698,7 +669,8 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
       },
       schema: ModuleManifestPayloadSchema,
       status: {
-        address: this.address
+        address: this.address,
+        children: childAddressToName
       }
     };
   }
@@ -784,13 +756,6 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
     }
     return resultPayloads;
   }
-  async resolveArchivingArchivists() {
-    const archivists = this.config.archiving?.archivists;
-    if (!archivists)
-      return [];
-    const resolved = await Promise.all(archivists.map((archivist) => this.resolve(archivist)));
-    return compact(resolved.map((mod) => asArchivistInstance(mod)));
-  }
   async startHandler() {
     this.validateConfig();
     await this.initializeQueryAccounts();
@@ -808,12 +773,6 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
     this._started = void 0;
     return true;
   }
-  async storeToArchivists(payloads) {
-    const archivists = await this.resolveArchivingArchivists();
-    return (await Promise.all(archivists.map((archivist) => {
-      return archivist.insert?.(payloads);
-    }))).map(([bw]) => bw);
-  }
   subscribeHandler() {
     return;
   }
@@ -851,20 +810,98 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
       }
     }, true);
   }
-  validateRequiredResolve(required, result, idOrFilter) {
+};
+
+// src/AbstractModuleInstance.ts
+import { assertEx as assertEx3 } from "@xylabs/assert";
+import { compact as compact2 } from "@xylabs/lodash";
+import { asArchivistInstance as asArchivistInstance2 } from "@xyo-network/archivist-model";
+
+// src/ResolveHelper.ts
+import { IdLogger as IdLogger2 } from "@xylabs/logger";
+import { toJsonString } from "@xylabs/object";
+import { duplicateModules } from "@xyo-network/module-model";
+var ResolveHelper = class {
+  static {
+    __name(this, "ResolveHelper");
+  }
+  static defaultLogger;
+  static async resolve(config, idOrFilter = "*", { visibility, maxDepth = 5, required = "log", ...options } = {}) {
+    const { module, logger = this.defaultLogger, dead = false, upResolver, downResolver } = config;
+    const log = logger ? new IdLogger2(logger, () => `ResolveHelper [${module.id}][${idOrFilter}][${visibility}]`) : void 0;
+    const childOptions = {
+      ...options,
+      direction: "down",
+      maxDepth: maxDepth - 1,
+      required: false,
+      visibility
+    };
+    const direction = options?.direction ?? "all";
+    const up = direction === "up" || direction === "all";
+    const down = direction === "down" || direction === "all";
+    let result;
+    log?.debug("start", idOrFilter, maxDepth);
+    if (idOrFilter === "*") {
+      if (dead) {
+        log?.warn("failed [dead]", idOrFilter);
+        return [];
+      }
+      const modules = [
+        ...down ? await downResolver.resolve("*", childOptions) : [],
+        ...up ? await upResolver.resolve("*", childOptions) : []
+      ].filter(duplicateModules).filter((module2) => module2.address !== config.address);
+      if (modules.length > 0) {
+        log?.log("modules [count]", modules.length);
+        log?.debug("modules", toJsonString(modules, 4));
+      }
+      if (maxDepth === 0) {
+        return modules;
+      }
+      const childModules = (await Promise.all(modules.map(async (module2) => await module2.resolve("*", childOptions)))).flat().filter(duplicateModules);
+      return [
+        module,
+        ...modules,
+        ...childModules
+      ].filter(duplicateModules);
+    } else {
+      switch (typeof idOrFilter) {
+        case "string": {
+          if (dead) {
+            return void 0;
+          }
+          result = (down ? await downResolver.resolve(idOrFilter, childOptions) : void 0) ?? (up ? await upResolver.resolve(idOrFilter, childOptions) : void 0);
+          break;
+        }
+        default: {
+          if (dead) {
+            return [];
+          }
+          const filter = idOrFilter;
+          result = [
+            ...down ? await downResolver.resolve(filter, childOptions) : [],
+            ...up ? await upResolver.resolve(filter, childOptions) : []
+          ].filter(duplicateModules);
+          break;
+        }
+      }
+    }
+    this.validateRequiredResolve(required, result, idOrFilter, logger);
+    return result;
+  }
+  static validateRequiredResolve(required, result, idOrFilter, logger = this.defaultLogger) {
+    const log = logger ? new IdLogger2(logger, () => `validateRequiredResolve [${idOrFilter}][${result}]`) : void 0;
     if (required && (result === void 0 || Array.isArray(result) && result.length > 0)) {
       switch (required) {
         case "warn": {
-          this.logger.warn("resolve failed", idOrFilter);
+          log?.warn("resolve failed", idOrFilter);
           break;
         }
         case "log": {
-          this.logger.log("resolve failed", idOrFilter);
+          log?.log("resolve failed", idOrFilter);
           break;
         }
         default: {
-          this.logger.error("resolve failed", idOrFilter);
-          break;
+          throw new Error(`resolve failed [${idOrFilter}]`);
         }
       }
     }
@@ -872,7 +909,6 @@ var AbstractModule = class _AbstractModule extends BaseEmitter {
 };
 
 // src/AbstractModuleInstance.ts
-import { assertEx as assertEx3 } from "@xylabs/assert";
 var AbstractModuleInstance = class extends AbstractModule {
   static {
     __name(this, "AbstractModuleInstance");
@@ -892,10 +928,10 @@ var AbstractModuleInstance = class extends AbstractModule {
       return await this.describeHandler();
     });
   }
-  discover() {
+  discover(maxDepth = 5) {
     this._checkDead();
     return this.busy(async () => {
-      return await this.discoverHandler();
+      return await this.discoverHandler(maxDepth);
     });
   }
   manifest(maxDepth, ignoreAddresses) {
@@ -910,6 +946,30 @@ var AbstractModuleInstance = class extends AbstractModule {
       return await this.moduleAddressHandler();
     });
   }
+  async resolve(idOrFilter = "*", options = {}) {
+    const config = {
+      address: this.address,
+      dead: this.dead,
+      downResolver: this.downResolver,
+      logger: this.logger,
+      module: this,
+      upResolver: this.upResolver
+    };
+    if (idOrFilter === "*") {
+      return await ResolveHelper.resolve(config, idOrFilter, options);
+    }
+    switch (typeof idOrFilter) {
+      case "string": {
+        return await ResolveHelper.resolve(config, idOrFilter, options);
+      }
+      case "object": {
+        return await ResolveHelper.resolve(config, idOrFilter, options);
+      }
+      default: {
+        return await ResolveHelper.resolve(config, idOrFilter, options);
+      }
+    }
+  }
   state() {
     this._checkDead();
     return this.busy(async () => {
@@ -920,6 +980,19 @@ var AbstractModuleInstance = class extends AbstractModule {
     this._checkDead();
     return this.subscribeHandler();
   }
+  async resolveArchivingArchivists() {
+    const archivists = this.config.archiving?.archivists;
+    if (!archivists)
+      return [];
+    const resolved = await Promise.all(archivists.map((archivist) => this.resolve(archivist)));
+    return compact2(resolved.map((mod) => asArchivistInstance2(mod)));
+  }
+  async storeToArchivists(payloads) {
+    const archivists = await this.resolveArchivingArchivists();
+    return (await Promise.all(archivists.map((archivist) => {
+      return archivist.insert?.(payloads);
+    }))).map(([bw]) => bw);
+  }
 };
 export {
   AbstractModule,
@@ -927,6 +1000,7 @@ export {
   BaseEmitter,
   ModuleConfigQueryValidator,
   ModuleErrorBuilder,
+  ResolveHelper,
   SupportedQueryValidator,
   isQuerySupportedByModule
 };