@xyo-network/module-abstract 2.64.7 → 2.64.9

package/src/AbstractModule.ts

@@ -1,445 +1,44 @@
 import { assertEx } from '@xylabs/assert'
-import { exists } from '@xylabs/exists'
-import { HDWallet } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
-import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
-import { ArchivistModule } from '@xyo-network/archivist-model'
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'
-import { handleErrorAsync } from '@xyo-network/error'
-import { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'
-import {
-  AccountModuleParams,
-  AddressPreviousHashPayload,
-  AddressPreviousHashSchema,
-  CreatableModule,
-  CreatableModuleFactory,
-  IndividualArchivistConfig,
-  Module,
-  ModuleAddressQuerySchema,
-  ModuleConfig,
-  ModuleDiscoverQuerySchema,
-  ModuleError,
-  ModuleEventData,
-  ModuleFilter,
-  ModuleParams,
-  ModuleQueriedEventArgs,
-  ModuleQuery,
-  ModuleQueryBase,
-  ModuleQueryResult,
-  ModuleSubscribeQuerySchema,
-  Query,
-  QueryBoundWitness,
-  SchemaString,
-  WalletModuleParams,
-} from '@xyo-network/module-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { ModuleManifestPayload } from '@xyo-network/manifest-model'
+import { AddressPreviousHashPayload, Module, ModuleDescriptionPayload, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-import { Promisable, PromiseEx } from '@xyo-network/promise'
-import { QueryPayload, QuerySchema } from '@xyo-network/query-payload-plugin'
-import { IdLogger } from '@xyo-network/shared'
-import compact from 'lodash/compact'
 
-import { BaseEmitter } from './BaseEmitter'
-import { ModuleErrorBuilder } from './Error'
-import { duplicateModules, serializableField } from './lib'
-import { ModuleFactory } from './ModuleFactory'
-import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query'
-import { ModuleConfigQueryValidator, Queryable, SupportedQueryValidator } from './QueryValidator'
-import { CompositeModuleResolver } from './Resolver'
+import { AbstractIndirectModule } from './AbstractIndirectModule'
 
 export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventData extends ModuleEventData = ModuleEventData>
-  extends BaseEmitter<TParams, TEventData>
+  extends AbstractIndirectModule<TParams, TEventData>
   implements Module<TParams, TEventData>
 {
-  static configSchemas: string[]
-
-  protected static privateConstructorKey = Date.now().toString()
-
-  readonly downResolver = new CompositeModuleResolver()
-  readonly upResolver = new CompositeModuleResolver()
-
-  protected _account: AccountInstance | undefined = undefined
-  protected readonly _baseModuleQueryAccountPaths: Record<ModuleQueryBase['schema'], string> = {
-    'network.xyo.query.module.address': '1',
-    'network.xyo.query.module.discover': '2',
-    'network.xyo.query.module.subscribe': '3',
-  }
-  protected readonly _queryAccounts: Record<ModuleQueryBase['schema'], AccountInstance | undefined> = {
-    'network.xyo.query.module.address': undefined,
-    'network.xyo.query.module.discover': undefined,
-    'network.xyo.query.module.subscribe': undefined,
-  }
-  protected _started = false
-  protected readonly moduleConfigQueryValidator: Queryable
-  protected readonly supportedQueryValidator: Queryable
-
   constructor(privateConstructorKey: string, params: TParams) {
     assertEx(AbstractModule.privateConstructorKey === privateConstructorKey, 'Use create function instead of constructor')
     // Clone params to prevent mutation of the incoming object
     const mutatedParams = { ...params } as TParams
-    super(mutatedParams)
-
-    this.supportedQueryValidator = new SupportedQueryValidator(this as Module).queryable
-    this.moduleConfigQueryValidator = new ModuleConfigQueryValidator(mutatedParams?.config).queryable
-  }
-
-  static get configSchema(): string {
-    return this.configSchemas[0]
-  }
-
-  get account() {
-    return assertEx(this._account, 'Missing account')
-  }
-
-  get address() {
-    return this.account.address
-  }
-
-  get allowAnonymous() {
-    return !!this.config.security?.allowAnonymous
-  }
-
-  get config(): TParams['config'] {
-    return this.params.config
-  }
-
-  get ephemeralQueryAccountEnabled(): boolean {
-    return !!this.params.ephemeralQueryAccountEnabled
-  }
-
-  get queries(): string[] {
-    return [ModuleDiscoverQuerySchema, ModuleAddressQuerySchema, ModuleSubscribeQuerySchema]
-  }
-
-  get queryAccountPaths(): Readonly<Record<Query['schema'], string | undefined>> {
-    return { ...this._baseModuleQueryAccountPaths, ...this._queryAccountPaths }
-  }
-
-  get queryAccounts(): Readonly<Record<Query['schema'], AccountInstance | undefined>> {
-    return this._queryAccounts
-  }
-
-  protected abstract get _queryAccountPaths(): Record<Query['schema'], string>
-
-  static async create<TModule extends Module>(this: CreatableModule<TModule>, params?: TModule['params']) {
-    if (!this.configSchemas || this.configSchemas.length === 0) {
-      throw Error(`Missing configSchema [${params?.config?.schema}][${this.name}]`)
-    }
-    const schema: string = params?.config?.schema ?? this.configSchema
-    const allowedSchemas: string[] = this.configSchemas
-
-    assertEx(
-      allowedSchemas.filter((allowedSchema) => allowedSchema === schema).length > 0,
-      `Bad Config Schema [Received ${schema}] [Expected ${JSON.stringify(allowedSchemas)}]`,
-    )
-    const mutatedConfig: TModule['params']['config'] = { ...params?.config, schema }
-    params?.logger?.debug(`config: ${JSON.stringify(mutatedConfig, null, 2)}`)
-    const mutatedParams = { ...params, config: mutatedConfig } as TModule['params']
-    const newModule = new this(AbstractModule.privateConstructorKey, mutatedParams)
-    await newModule.loadAccount?.()
-    await newModule.start?.()
-    return newModule
-  }
-
-  static factory<TModule extends Module>(this: CreatableModule<TModule>, params?: TModule['params']): CreatableModuleFactory<TModule> {
-    return ModuleFactory.withParams(this, params)
-  }
-
-  addressPreviousHash(): Promisable<AddressPreviousHashPayload> {
-    return { address: this.address, previousHash: this._account?.previousHash, schema: AddressPreviousHashSchema }
-  }
-
-  discover(): Promisable<Payload[]> {
-    const config = this.config
-    const address = new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: this.address, name: this.config.name }).build()
-    const queries = this.queries.map((query) => {
-      return new PayloadBuilder<QueryPayload>({ schema: QuerySchema }).fields({ query }).build()
-    })
-    const configSchema: ConfigPayload = {
-      config: config.schema,
-      schema: ConfigSchema,
-    }
-    return compact([config, configSchema, address, ...queries])
+    super(privateConstructorKey, mutatedParams)
   }
 
-  async loadAccount() {
-    if (!this._account) {
-      const activeLogger = this.params.logger ?? AbstractModule.defaultLogger
-      let { account } = this.params as AccountModuleParams<TParams['config']>
-      const { wallet, accountDerivationPath } = this.params as WalletModuleParams<TParams['config']>
-      if (wallet) {
-        account = assertEx(accountDerivationPath ? await wallet.derivePath(accountDerivationPath) : wallet, 'Failed to derive account from path')
-      }
-      this.params.logger = activeLogger ? new IdLogger(activeLogger, () => `0x${account.address}`) : undefined
-      if (!account) console.warn(`AbstractModule.loadAccount: No account provided - Creating Random account [${this.config.schema}]`)
-      this._account = account ?? (await HDWallet.random())
-    }
-    this.downResolver.add(this as Module)
-    return this._account
+  /* make it public */
+  override async addressPreviousHash(): Promise<AddressPreviousHashPayload> {
+    return await super.addressPreviousHash()
   }
 
-  manifest(): Promisable<ModuleManifestPayload> {
-    const name = assertEx(this.config.name, 'Calling manifest on un-named module is not supported')
-    return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }
+  /* make it public */
+  override async describe(): Promise<ModuleDescriptionPayload> {
+    return await super.describe()
   }
 
-  moduleAddressQuery(): Promisable<(AddressPayload | AddressPreviousHashPayload)[]> {
-    // Return array of all addresses and their previous hash
-    const queryAccounts = Object.entries(this.queryAccounts)
-      .filter((value): value is [string, AccountInstance] => {
-        return exists(value[1])
-      })
-      .map(([name, account]) => {
-        const address = account.address
-        const previousHash = account.previousHash
-        return [
-          { address, name, schema: AddressSchema },
-          { address, previousHash, schema: AddressPreviousHashSchema },
-        ]
-      })
-    const address = this.address
-    const name = this.config.name
-    const previousHash = this.address
-    const moduleAccount = name ? { address, name, schema: AddressSchema } : { address, schema: AddressSchema }
-    const moduleAccountPreviousHash = previousHash
-      ? { address, previousHash, schema: AddressPreviousHashSchema }
-      : { address, schema: AddressPreviousHashSchema }
-    return [moduleAccount, moduleAccountPreviousHash, ...queryAccounts].flat()
+  /* make it public */
+  override async discover(): Promise<Payload[]> {
+    return await super.discover()
   }
 
-  async query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
-    query: T,
-    payloads?: Payload[],
-    queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
-    this.started('throw')
-    const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)
-
-    const args: ModuleQueriedEventArgs = { module: this as Module, payloads, query, result }
-    await this.emit('moduleQueried', args)
-
-    return result
-  }
-
-  queryable<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
-    query: T,
-    payloads?: Payload[],
-    queryConfig?: TConfig,
-  ): boolean {
-    if (!this.started('warn')) return false
-    const configValidator = queryConfig
-      ? new ModuleConfigQueryValidator(Object.assign({}, this.config, queryConfig)).queryable
-      : this.moduleConfigQueryValidator
-    const validators = [this.supportedQueryValidator, configValidator]
-
-    return validators.every((validator) => validator(query, payloads))
-  }
-
-  async start(_timeout?: number): Promise<void> {
-    this.validateConfig()
-    await this.initializeQueryAccounts()
-    this._started = true
-  }
-
-  started(notStartedAction?: 'error' | 'throw' | 'warn' | 'log' | 'none') {
-    if (!this._started) {
-      switch (notStartedAction) {
-        case 'throw':
-          throw Error(`Module not Started [${this.address}]`)
-        case 'warn':
-          this.logger?.warn('Module not started')
-          break
-        case 'error':
-          this.logger?.error('Module not started')
-          break
-        case 'none':
-          break
-        case 'log':
-        default:
-          this.logger?.log('Module not started')
-      }
-    }
-    return this._started
+  /* make it public */
+  override async manifest(): Promise<ModuleManifestPayload> {
+    return await super.manifest()
   }
 
-  subscribe(_queryAccount?: AccountInstance) {
-    return
-  }
-
-  protected bindHashes(hashes: string[], schema: SchemaString[], account?: AccountInstance) {
-    const promise = new PromiseEx((resolve) => {
-      const result = this.bindHashesInternal(hashes, schema, account)
-      resolve?.(result)
-      return result
-    }, account)
-    return promise
-  }
-
-  protected async bindHashesInternal(hashes: string[], schema: SchemaString[], account?: AccountInstance): Promise<BoundWitness> {
-    const builder = new BoundWitnessBuilder().hashes(hashes, schema).witness(this.account)
-    const result = (await (account ? builder.witness(account) : builder).build())[0]
-    this.logger?.debug(`result: ${JSON.stringify(result, null, 2)}`)
-    return result
-  }
-
-  protected bindQuery<T extends Query | PayloadWrapper<Query>>(
-    query: T,
-    payloads?: Payload[],
-    account?: AccountInstance,
-  ): PromiseEx<[QueryBoundWitness, Payload[], Payload[]], AccountInstance> {
-    const promise = new PromiseEx<[QueryBoundWitness, Payload[], Payload[]], AccountInstance>(async (resolve) => {
-      const result = await this.bindQueryInternal(query, payloads, account)
-      resolve?.(result)
-      return result
-    }, account)
-    return promise
-  }
-
-  protected async bindQueryInternal<T extends Query | PayloadWrapper<Query>>(
-    query: T,
-    payloads?: Payload[],
-    account?: AccountInstance,
-  ): Promise<[QueryBoundWitness, Payload[], Payload[]]> {
-    const builder = new QueryBoundWitnessBuilder().payloads(payloads).witness(this.account).query(query)
-    const result = await (account ? builder.witness(account) : builder).build()
-    return result
-  }
-
-  protected async bindQueryResult<T extends Query | PayloadWrapper<Query>>(
-    query: T,
-    payloads: Payload[],
-    additionalWitnesses: AccountInstance[] = [],
-    errors?: ModuleError[],
-  ): Promise<[ModuleQueryResult, AccountInstance[]]> {
-    const builder = new BoundWitnessBuilder().payloads(payloads).errors(errors)
-    const queryWitnessAccount = this.queryAccounts[query.schema as ModuleQueryBase['schema']]
-    const witnesses = [this.account, queryWitnessAccount, ...additionalWitnesses].filter(exists)
-    builder.witnesses(witnesses)
-    const result: ModuleQueryResult = [(await builder.build())[0], payloads, errors ?? []]
-    return [result, witnesses]
-  }
-
-  protected commitArchivist = () => this.getArchivist('commit')
-
-  protected async initializeQueryAccounts() {
-    // Ensure distinct/unique wallet paths
-    const paths = Object.values(this.queryAccountPaths).filter(exists)
-    const distinctPaths = new Set<string>(paths)
-    assertEx(distinctPaths.size === paths.length, `${this.config?.name ? this.config.name + ': ' : ''}Duplicate query account paths`)
-    // Create an account for query this module supports
-    const wallet = this.account as unknown as HDWallet
-    if (wallet?.derivePath) {
-      for (const key in this.queryAccountPaths) {
-        if (Object.prototype.hasOwnProperty.call(this.queryAccountPaths, key)) {
-          const query = key as ModuleQueryBase['schema']
-          const queryAccountPath = this.queryAccountPaths[query]
-          if (queryAccountPath) {
-            this._queryAccounts[query] = await wallet.derivePath?.(queryAccountPath)
-          }
-        }
-      }
-    }
-  }
-
-  protected async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
-    query: T,
-    payloads?: Payload[],
-    queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
-    this.started('throw')
-    const wrapper = QueryBoundWitnessWrapper.parseQuery<ModuleQuery>(query, payloads)
-    if (!this.allowAnonymous) {
-      if (query.addresses.length === 0) {
-        console.warn(`Anonymous Queries not allowed, but running anyway [${this.config.name}], [${this.address}]`)
-      }
-    }
-    const queryPayload = await wrapper.getQuery()
-    assertEx(this.queryable(query, payloads, queryConfig))
-    const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    const queryAccount = this.ephemeralQueryAccountEnabled ? await HDWallet.random() : undefined
-    try {
-      switch (queryPayload.schema) {
-        case ModuleDiscoverQuerySchema: {
-          resultPayloads.push(...(await this.discover()))
-          break
-        }
-        case ModuleAddressQuerySchema: {
-          resultPayloads.push(...(await this.moduleAddressQuery()))
-          break
-        }
-        case ModuleSubscribeQuerySchema: {
-          this.subscribe(queryAccount)
-          break
-        }
-        default:
-          console.error(`Unsupported Query [${(queryPayload as Payload).schema}]`)
-      }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
-    }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads))[0]
-  }
-
-  protected readArchivist = () => this.getArchivist('read')
-
-  protected async resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]> {
-    return [...(await this.upResolver.resolve<TModule>(filter)), ...(await this.downResolver.resolve<TModule>(filter))].filter(duplicateModules)
-  }
-
-  protected stop(_timeout?: number): Promisable<this> {
-    this._started = false
-    return this
-  }
-
-  protected validateConfig(config?: unknown, parents: string[] = []): boolean {
-    return Object.entries(config ?? this.config ?? {}).reduce((valid, [key, value]) => {
-      switch (typeof value) {
-        case 'function':
-          this.logger?.warn(`Fields of type function not allowed in config [${parents?.join('.')}.${key}]`)
-          return false
-        case 'object': {
-          if (Array.isArray(value)) {
-            return (
-              value.reduce((valid, value) => {
-                return this.validateConfig(value, [...parents, key]) && valid
-              }, true) && valid
-            )
-          }
-
-          if (!serializableField(value)) {
-            this.logger?.warn(`Fields that are not serializable to JSON are not allowed in config [${parents?.join('.')}.${key}]`)
-            return false
-          }
-          return value ? this.validateConfig(value, [...parents, key]) && valid : true
-        }
-        default:
-          return valid
-      }
-    }, true)
-  }
-
-  protected writeArchivist = () => this.getArchivist('write')
-
-  private async getArchivist(kind: keyof IndividualArchivistConfig): Promise<ArchivistModule | undefined> {
-    if (!this.config.archivist) return undefined
-    const filter =
-      typeof this.config.archivist === 'string' || this.config.archivist instanceof String
-        ? (this.config.archivist as string)
-        : (this.config?.archivist?.[kind] as string)
-    const resolved = await this.upResolver.resolveOne(filter)
-    return resolved ? (resolved as ArchivistModule) : undefined
+  /* make it public */
+  override subscribe(_queryAccount?: AccountInstance) {
+    return super.subscribe()
   }
 }

package/src/QueryValidator/SupportedQueryValidator.ts

@@ -1,11 +1,11 @@
-import { Module, ModuleQuery, QueryBoundWitness } from '@xyo-network/module-model'
+import { IndirectModule, ModuleQuery, QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
 import { QueryBoundWitnessWrapper } from '../Query'
 import { Queryable, QueryValidator } from './QueryValidator'
 
 export const isQuerySupportedByModule = async <T extends QueryBoundWitness = QueryBoundWitness>(
-  mod: Module,
+  mod: IndirectModule,
   query: T,
   payloads?: Payload[],
 ): Promise<boolean> => {
@@ -15,7 +15,7 @@ export const isQuerySupportedByModule = async <T extends QueryBoundWitness = Que
 }
 
 export class SupportedQueryValidator implements QueryValidator {
-  constructor(protected readonly mod: Module) {}
+  constructor(protected readonly mod: IndirectModule) {}
   queryable: Queryable = (query, payloads) => {
     return isQuerySupportedByModule(this.mod, query, payloads)
   }

package/src/Resolver/CompositeModuleResolver.ts

@@ -1,6 +1,6 @@
 import { fulfilled } from '@xylabs/promise'
 import { Base, BaseParams } from '@xyo-network/core'
-import { Module, ModuleFilter, ModuleRepository, ModuleResolver } from '@xyo-network/module-model'
+import { IndirectModule, ModuleFilter, ModuleRepository, ModuleResolver } from '@xyo-network/module-model'
 
 import { duplicateModules } from '../lib'
 import { SimpleModuleResolver } from './SimpleModuleResolver'
@@ -20,9 +20,9 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return true
   }
 
-  add(module: Module): this
-  add(module: Module[]): this
-  add(module: Module | Module[]): this {
+  add(module: IndirectModule): this
+  add(module: IndirectModule[]): this
+  add(module: IndirectModule | IndirectModule[]): this {
     if (Array.isArray(module)) {
       module.forEach((module) => this.addSingleModule(module))
     } else {
@@ -50,10 +50,9 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return this
   }
 
-  async resolve<T extends Module = Module>(filter?: ModuleFilter): Promise<T[]> {
-    const modules = this.resolvers.map((resolver) => resolver.resolve(filter))
-    const settled = await Promise.allSettled(modules)
-    const result = settled
+  async resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promise<T[]> {
+    const modules = await Promise.allSettled(this.resolvers.map((resolver) => resolver.resolve(filter)))
+    const result = modules
       .filter(fulfilled)
       .map((r) => r.value)
       .flat()
@@ -61,7 +60,7 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return result as T[]
   }
 
-  async resolveOne<T extends Module = Module>(addressOrName: string): Promise<T | undefined> {
+  async resolveOne<T extends IndirectModule = IndirectModule>(addressOrName: string): Promise<T | undefined> {
     for (let i = 0; i < this.resolvers.length; i++) {
       const resolver = this.resolvers[i]
       const result = await resolver.resolveOne<T>(addressOrName)
@@ -70,7 +69,7 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return undefined
   }
 
-  private addSingleModule(module?: Module) {
+  private addSingleModule(module?: IndirectModule) {
     if (module) {
       this.localResolver.add(module)
     }

package/src/Resolver/ResolverEventEmitter.ts

@@ -1,8 +1,8 @@
-import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model'
+import { IndirectModule, ModuleFilter, ModuleResolver } from '@xyo-network/module-model'
 
 export interface ModuleResolvedEventArgs {
   filter?: ModuleFilter
-  module: Module
+  module: IndirectModule
 }
 
 export interface ResolverEventEmitter {
@@ -18,7 +18,7 @@ const getMixin = <T extends ModuleResolver = ModuleResolver>(resolver: T) => {
     listeners.map((listener) => listener(args))
     return true
   }
-  const onModuleResolved = (module: Module, filter?: ModuleFilter) => {
+  const onModuleResolved = (module: IndirectModule, filter?: ModuleFilter) => {
     const args = { filter, module }
     emit('moduleResolved', args)
   }
@@ -31,8 +31,8 @@ const getMixin = <T extends ModuleResolver = ModuleResolver>(resolver: T) => {
     on: (event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void) => {
       listeners.push(listener)
     },
-    resolve: async (filter?: ModuleFilter): Promise<Module[]> => {
-      const modules: Module[] = await originalResolve(filter)
+    resolve: async (filter?: ModuleFilter): Promise<IndirectModule[]> => {
+      const modules: IndirectModule[] = await originalResolve(filter)
       await Promise.allSettled(modules.map((mod) => onModuleResolved(mod, filter)))
       return modules
     },

package/src/Resolver/SimpleModuleResolver.ts

@@ -1,6 +1,6 @@
 import {
   AddressModuleFilter,
-  Module,
+  IndirectModule,
   ModuleFilter,
   ModuleRepository,
   ModuleResolver,
@@ -14,15 +14,15 @@ import flatten from 'lodash/flatten'
 //This class is now package private (not exported from index.ts)
 export class SimpleModuleResolver implements ModuleRepository {
   private addressToName: Record<string, string> = {}
-  private modules: Record<string, Module> = {}
+  private modules: Record<string, IndirectModule> = {}
 
   get isModuleResolver() {
     return true
   }
 
-  add(module: Module): this
-  add(module: Module[]): this
-  add(module: Module | Module[]): this {
+  add(module: IndirectModule): this
+  add(module: IndirectModule[]): this
+  add(module: IndirectModule | IndirectModule[]): this {
     if (Array.isArray(module)) {
       module.forEach((module) => this.addSingleModule(module))
     } else {
@@ -48,7 +48,7 @@ export class SimpleModuleResolver implements ModuleRepository {
     throw 'Removing resolvers not supported'
   }
 
-  resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]> {
+  resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<T[]> {
     const filteredByName: T[] = this.resolveByName<T>(Object.values(this.modules) as T[], (filter as NameModuleFilter)?.name)
 
     const filteredByAddress: T[] = (filter as AddressModuleFilter)?.address
@@ -62,7 +62,7 @@ export class SimpleModuleResolver implements ModuleRepository {
     return filteredByQuery
   }
 
-  resolveOne<T extends Module = Module>(filter: string): Promisable<T | undefined> {
+  resolveOne<T extends IndirectModule = IndirectModule>(filter: string): Promisable<T | undefined> {
     const allModules = Object.values(this.modules) as T[]
     for (const resolutionMethod of [this.resolveByAddress, this.resolveByName]) {
       const filtered: T[] = resolutionMethod(allModules, [filter])
@@ -71,7 +71,7 @@ export class SimpleModuleResolver implements ModuleRepository {
     return undefined
   }
 
-  private addSingleModule(module?: Module) {
+  private addSingleModule(module?: IndirectModule) {
     if (module) {
       this.modules[module.address] = module
     }
@@ -89,7 +89,7 @@ export class SimpleModuleResolver implements ModuleRepository {
     }
   }
 
-  private resolveByAddress<T extends Module = Module>(modules: T[], address?: string[]): T[] {
+  private resolveByAddress<T extends IndirectModule = IndirectModule>(modules: T[], address?: string[]): T[] {
     return address
       ? compact(
           flatten(
@@ -101,14 +101,14 @@ export class SimpleModuleResolver implements ModuleRepository {
       : modules
   }
 
-  private resolveByName<T extends Module = Module>(modules: T[], name?: string[]): T[] {
+  private resolveByName<T extends IndirectModule = IndirectModule>(modules: T[], name?: string[]): T[] {
     if (name) {
       return compact(name.map((name) => modules.filter((module) => module.config.name === name)).flat())
     }
     return modules
   }
 
-  private resolveByQuery<T extends Module = Module>(modules: T[], query?: string[][]): T[] {
+  private resolveByQuery<T extends IndirectModule = IndirectModule>(modules: T[], query?: string[][]): T[] {
     return query
       ? compact(
           modules.filter((module) =>

package/src/lib/duplicateModules.ts

@@ -1,4 +1,4 @@
-import { Module } from '@xyo-network/module-model'
+import { IndirectModule } from '@xyo-network/module-model'
 
 /**
  * Used to filter duplicates from an array of modules
@@ -9,6 +9,6 @@ import { Module } from '@xyo-network/module-model'
  * @returns True if the Module's address is the first occurrence of
  * that address in the array, false otherwise
  */
-export const duplicateModules = (value: Module, index: number, array: Module[]): value is Module => {
+export const duplicateModules = (value: IndirectModule, index: number, array: IndirectModule[]): value is IndirectModule => {
   return array.findIndex((v) => v.address === value.address) === index
 }