@xyo-network/module-abstract 2.93.8 → 2.94.0

package/src/AbstractModule.ts

@@ -30,10 +30,8 @@ import {
   ModuleAddressQuerySchema,
   ModuleBusyEventArgs,
   ModuleConfig,
-  ModuleDescribeQuerySchema,
   ModuleDescriptionPayload,
   ModuleDescriptionSchema,
-  ModuleDiscoverQuerySchema,
   ModuleEventData,
   ModuleFactory,
   ModuleManifestQuerySchema,
@@ -73,8 +71,6 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
   protected _account: AccountInstance | undefined = undefined
   protected readonly _baseModuleQueryAccountPaths: Record<ModuleQueries['schema'], string> = {
     [ModuleAddressQuerySchema]: '1',
-    [ModuleDescribeQuerySchema]: '4',
-    [ModuleDiscoverQuerySchema]: '2',
     [ModuleManifestQuerySchema]: '5',
     [ModuleStateQuerySchema]: '6',
     [ModuleSubscribeQuerySchema]: '3',
@@ -82,8 +78,6 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
   protected _lastError?: Error
   protected readonly _queryAccounts: Record<ModuleQueries['schema'], AccountInstance | undefined> = {
     [ModuleAddressQuerySchema]: undefined,
-    [ModuleDescribeQuerySchema]: undefined,
-    [ModuleDiscoverQuerySchema]: undefined,
     [ModuleManifestQuerySchema]: undefined,
     [ModuleStateQuerySchema]: undefined,
     [ModuleSubscribeQuerySchema]: undefined,
@@ -153,14 +147,7 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
   }
 
   get queries(): string[] {
-    return [
-      ModuleDiscoverQuerySchema,
-      ModuleAddressQuerySchema,
-      ModuleSubscribeQuerySchema,
-      ModuleDescribeQuerySchema,
-      ModuleManifestQuerySchema,
-      ModuleStateQuerySchema,
-    ]
+    return [ModuleAddressQuerySchema, ModuleSubscribeQuerySchema, ModuleManifestQuerySchema, ModuleStateQuerySchema]
   }
 
   get queryAccountPaths(): Readonly<Record<Query['schema'], string | undefined>> {
@@ -510,7 +497,24 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
     return result
   }
 
-  protected async describeHandler(): Promise<ModuleDescriptionPayload> {
+  protected async generateConfigAndAddress(_maxDepth?: number): Promise<Payload[]> {
+    const config = await PayloadBuilder.build(this.config)
+    const address = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema })
+      .fields({ address: this.address, name: this.config?.name })
+      .build()
+    const queries = await Promise.all(
+      this.queries.map(async (query) => {
+        return await new PayloadBuilder<QueryPayload>({ schema: QuerySchema }).fields({ query }).build()
+      }),
+    )
+    const configSchema = await PayloadBuilder.build<ConfigPayload>({
+      config: config.schema,
+      schema: ConfigSchema,
+    })
+    return compact([config, configSchema, address, ...queries])
+  }
+
+  protected async generateDescribe(): Promise<ModuleDescriptionPayload> {
     const description: ModuleDescriptionPayload = {
       address: this.address,
       queries: this.queries,
@@ -520,7 +524,7 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
       description.name = this.config.name
     }
 
-    const discover = await this.discoverHandler()
+    const discover = await this.generateConfigAndAddress()
 
     description.children = compact(
       discover?.map((payload) => {
@@ -532,23 +536,6 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
     return description
   }
 
-  protected async discoverHandler(_maxDepth?: number): Promise<Payload[]> {
-    const config = await PayloadBuilder.build(this.config)
-    const address = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema })
-      .fields({ address: this.address, name: this.config?.name })
-      .build()
-    const queries = await Promise.all(
-      this.queries.map(async (query) => {
-        return await new PayloadBuilder<QueryPayload>({ schema: QuerySchema }).fields({ query }).build()
-      }),
-    )
-    const configSchema = await PayloadBuilder.build<ConfigPayload>({
-      config: config.schema,
-      schema: ConfigSchema,
-    })
-    return compact([config, configSchema, address, ...queries])
-  }
-
   protected async getArchivist(): Promise<ArchivistInstance | undefined> {
     if (!this.config.archivist) return undefined
     const resolved = await this.upResolver.resolve(this.config.archivist)
@@ -629,15 +616,6 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
         resultPayloads.push(await this.manifestHandler(queryPayload.maxDepth))
         break
       }
-      case ModuleDiscoverQuerySchema: {
-        const { maxDepth } = queryPayload
-        resultPayloads.push(...(await this.discoverHandler(maxDepth)))
-        break
-      }
-      case ModuleDescribeQuerySchema: {
-        resultPayloads.push(await this.describeHandler())
-        break
-      }
       case ModuleAddressQuerySchema: {
         resultPayloads.push(...(await this.moduleAddressHandler()))
         break
@@ -665,7 +643,7 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
   }
 
   protected async stateHandler(): Promise<Payload[]> {
-    return [await this.manifestHandler(), ...(await this.discoverHandler()), await this.describeHandler()]
+    return [await this.manifestHandler(), ...(await this.generateConfigAndAddress()), await this.generateDescribe()]
   }
 
   protected stopHandler(_timeout?: number): Promisable<boolean> {

package/src/AbstractModuleInstance.ts

@@ -6,7 +6,6 @@ import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-m
 import { ModuleManifestPayload } from '@xyo-network/manifest-model'
 import {
   AddressPreviousHashPayload,
-  ModuleDescriptionPayload,
   ModuleEventData,
   ModuleFilter,
   ModuleFilterOptions,
@@ -37,20 +36,6 @@ export abstract class AbstractModuleInstance<TParams extends ModuleParams = Modu
     }
   }
 
-  describe(): Promise<ModuleDescriptionPayload> {
-    this._checkDead()
-    return this.busy(async () => {
-      return await this.describeHandler()
-    })
-  }
-
-  discover(maxDepth = 5): Promise<Payload[]> {
-    this._checkDead()
-    return this.busy(async () => {
-      return await this.discoverHandler(maxDepth)
-    })
-  }
-
   manifest(maxDepth?: number, ignoreAddresses?: Address[]): Promise<ModuleManifestPayload> {
     this._checkDead()
     return this.busy(async () => {