@xyo-network/bridge-module-resolver 2.90.23 → 2.91.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/ModuleResolver.d.cts +5 -4
- package/dist/browser/ModuleResolver.d.cts.map +1 -1
- package/dist/browser/ModuleResolver.d.mts +5 -4
- package/dist/browser/ModuleResolver.d.mts.map +1 -1
- package/dist/browser/ModuleResolver.d.ts +5 -4
- package/dist/browser/ModuleResolver.d.ts.map +1 -1
- package/dist/browser/ProxyModule.d.cts +49 -7
- package/dist/browser/ProxyModule.d.cts.map +1 -1
- package/dist/browser/ProxyModule.d.mts +49 -7
- package/dist/browser/ProxyModule.d.mts.map +1 -1
- package/dist/browser/ProxyModule.d.ts +49 -7
- package/dist/browser/ProxyModule.d.ts.map +1 -1
- package/dist/browser/index.cjs +4 -1
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +4 -1
- package/dist/browser/index.js.map +1 -1
- package/dist/node/ModuleResolver.d.cts +5 -4
- package/dist/node/ModuleResolver.d.cts.map +1 -1
- package/dist/node/ModuleResolver.d.mts +5 -4
- package/dist/node/ModuleResolver.d.mts.map +1 -1
- package/dist/node/ModuleResolver.d.ts +5 -4
- package/dist/node/ModuleResolver.d.ts.map +1 -1
- package/dist/node/ProxyModule.d.cts +49 -7
- package/dist/node/ProxyModule.d.cts.map +1 -1
- package/dist/node/ProxyModule.d.mts +49 -7
- package/dist/node/ProxyModule.d.mts.map +1 -1
- package/dist/node/ProxyModule.d.ts +49 -7
- package/dist/node/ProxyModule.d.ts.map +1 -1
- package/dist/node/index.cjs +4 -1
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +4 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +28 -27
- package/src/ModuleResolver.ts +19 -9
- package/src/ProxyModule.ts +10 -5
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/ModuleResolver.ts","../../src/ProxyModule.ts"],"sourcesContent":["export * from './ModuleResolver'\nexport * from './ProxyModule'\n","import { handleError } from '@xylabs/error'\nimport { compact } from '@xylabs/lodash'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { isArchivistModule } from '@xyo-network/archivist-model'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { isDivinerModule } from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n AddressModuleFilter,\n Module,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleResolverInstance,\n NameModuleFilter,\n QueryModuleFilter,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { isNodeModule } from '@xyo-network/node-model'\nimport { NodeWrapper } from '@xyo-network/node-wrapper'\nimport { isSentinelModule } from '@xyo-network/sentinel-model'\nimport { SentinelWrapper } from '@xyo-network/sentinel-wrapper'\nimport { isWitnessModule } from '@xyo-network/witness-model'\nimport { WitnessWrapper } from '@xyo-network/witness-wrapper'\n\nimport { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './ProxyModule'\n\nexport class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> extends CompositeModuleResolver implements ModuleResolverInstance {\n private primed: Promise<boolean> | undefined = undefined\n private remoteAddresses?: Promise<string[]>\n private resolvedModules: Record<string, Promise<ModuleInstance>> = {}\n\n // TODO: Allow optional ctor param for supplying address for nested Nodes\n // protected readonly address?: string,\n constructor(\n protected readonly bridge: BridgeModule,\n protected wrapperAccount: AccountInstance,\n protected options?: ModuleFilterOptions<T>,\n ) {\n super()\n }\n\n override add(module: Module): this\n override add(module: Module[]): this\n override add(_module: Module | Module[]): this {\n throw new Error('Method not implemented.')\n }\n\n async currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>> {\n const result: Record<string, T> = {}\n await Promise.all(\n Object.entries(this.resolvedModules).map(async ([key, value]) => {\n result[key] = (await value) as T\n }),\n )\n\n return result\n }\n\n async getRemoteAddresses() {\n this.remoteAddresses =\n this.remoteAddresses ??\n (async () => {\n const discover = await this.bridge.targetDiscover(undefined, this.options?.maxDepth)\n return compact(\n discover?.map((payload) => {\n if (payload.schema === AddressSchema) {\n const schemaPayload = payload as AddressPayload\n return schemaPayload.address\n } else {\n return null\n }\n }),\n )\n })()\n return await this.remoteAddresses\n }\n\n prime() {\n this.primed =\n this.primed ??\n (async () => {\n await this.resolveRemoteModules()\n return true\n })()\n return this.primed\n }\n\n override remove(_address: string | string[]): this {\n throw new Error('Method not implemented.')\n }\n\n reset() {\n this.primed = undefined\n this.remoteAddresses = undefined\n this.resolvedModules = {}\n }\n\n override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n override async resolve<T extends ModuleInstance = ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<T>): Promise<T | undefined>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddressOrFilter?: ModuleFilter<T> | string,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | T[] | undefined> {\n const unfiltered = await (async () => {\n const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? BridgeModuleResolver.defaultMaxDepth) - 1 }\n await this.prime()\n await this.resolveRemoteModules()\n if (typeof nameOrAddressOrFilter === 'string') {\n if (mutatedOptions.maxDepth < 0) {\n return\n }\n const result: T | undefined = (await this.resolveByAddress<T>(nameOrAddressOrFilter)) ?? (await this.resolveByName<T>(nameOrAddressOrFilter))\n return result\n } else {\n if (mutatedOptions.maxDepth < 0) {\n return []\n }\n const result: T[] = await this.resolveRemoteModules<T>(nameOrAddressOrFilter)\n return result\n }\n })()\n\n const identity = options?.identity\n if (identity) {\n return Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module)) : identity(unfiltered) ? unfiltered : undefined\n } else {\n return unfiltered\n }\n }\n\n private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress: string): Promise<T | undefined> {\n const remoteAddresses = await this.getRemoteAddresses()\n\n //check if it is even there\n if (!remoteAddresses.includes(targetAddress)) {\n //this.logger?.log(`Not in RA: ${targetAddress}`)\n return undefined\n }\n\n const cached = this.resolvedModules[targetAddress]\n if (cached !== undefined) return (await cached) as T\n\n this.resolvedModules[targetAddress] =\n this.resolvedModules[targetAddress] ??\n (async (address: string) => {\n //discover it to set the config in the bridge\n await this.bridge.targetDiscover(address)\n\n const mod: Module = new ProxyModule({ address, bridge: this.bridge, config: { schema: ProxyModuleConfigSchema } } as ProxyModuleParams)\n\n try {\n if (isArchivistModule(mod)) {\n return ArchivistWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isDivinerModule(mod)) {\n return DivinerWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isWitnessModule(mod)) {\n return WitnessWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isNodeModule(mod)) {\n return NodeWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isSentinelModule(mod)) {\n return SentinelWrapper.wrap(mod, this.wrapperAccount)\n }\n console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`)\n return ModuleWrapper.wrap(mod, this.wrapperAccount)\n } catch (ex) {\n handleError(ex, (error) => {\n console.error(`BridgeModuleResolver.resolveByAddress: ${error.message} [${targetAddress}]`)\n })\n }\n })(targetAddress)\n\n return (await this.resolvedModules[targetAddress]) as T\n }\n\n private async resolveByName<T extends ModuleInstance = ModuleInstance>(name: string): Promise<T | undefined> {\n const modules = await this.currentResolvedModules()\n return Object.values(modules)\n .filter((module) => module.config.name === name)\n .pop() as T\n }\n\n private async resolveByQuery<T extends ModuleInstance = ModuleInstance>(queries: string[]): Promise<T[]> {\n return Object.values(await this.currentResolvedModules()).filter((module) => {\n //filter out the requested queries\n const found = module.queries.filter((query) => queries.find((q) => q === query))\n\n //did we find all the requested queries?\n return queries.length === found.length\n }) as T[]\n }\n\n private async resolveRemoteModules<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promise<T[]> {\n if ((filter as AddressModuleFilter)?.address) {\n return await this.resolveRemoteModulesByAddress<T>(filter as AddressModuleFilter)\n }\n\n if ((filter as NameModuleFilter)?.name) {\n return await this.resolveRemoteModulesByName<T>(filter as NameModuleFilter)\n }\n\n if ((filter as QueryModuleFilter)?.query) {\n return await this.resolveRemoteModulesByQuery<T>(filter as QueryModuleFilter)\n }\n\n //get all of them\n return await this.resolveRemoteModulesByAddress<T>({ address: await this.getRemoteAddresses() })\n }\n\n private async resolveRemoteModulesByAddress<T extends ModuleInstance = ModuleInstance>(filter: AddressModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress<T>(address))))\n }\n\n private async resolveRemoteModulesByName<T extends ModuleInstance = ModuleInstance>(filter: NameModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName<T>(name))))\n }\n\n private async resolveRemoteModulesByQuery<T extends ModuleInstance = ModuleInstance>(filter: QueryModuleFilter): Promise<T[]> {\n return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery<T>(query)))).flat())\n }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { BaseEmitter } from '@xyo-network/module-abstract'\nimport {\n AddressPreviousHashPayload,\n ModuleBusyEventArgs,\n ModuleConfig,\n ModuleDescription,\n ModuleEventData,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleParams,\n ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\nexport const ProxyModuleConfigSchema: ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\n\nexport type TProxyModuleConfig = ModuleConfig<{ schema: ProxyModuleConfigSchema }>\n\nexport type ProxyModuleParams = ModuleParams<\n TProxyModuleConfig,\n {\n address: string\n bridge: BridgeModule\n }\n>\n\nexport class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {\n readonly upResolver = new CompositeModuleResolver()\n\n private _busyCount = 0\n\n constructor(public proxyParams: ProxyModuleParams) {\n super({ config: proxyParams.bridge.targetConfig(proxyParams.address) })\n }\n\n get address() {\n return this.proxyParams.address.toLowerCase()\n }\n\n get bridge() {\n return this.proxyParams.bridge\n }\n\n get config(): ModuleConfig {\n return this.bridge.targetConfig(this.address)\n }\n\n get downResolver() {\n return assertEx(this.bridge.targetDownResolver(this.address), 'Unable to get resolver')\n }\n\n get id() {\n return this.config.name ?? this.address\n }\n\n get queries() {\n return this.bridge.targetQueries(this.address)\n }\n\n addressPreviousHash(): Promise<AddressPreviousHashPayload> {\n throw new Error('Not Implemented')\n }\n\n async busy<R>(closure: () => Promise<R>) {\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: true, module: this }\n await this.emit('moduleBusy', args)\n }\n this._busyCount++\n try {\n return await closure()\n } finally {\n this._busyCount--\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: false, module: this }\n await this.emit('moduleBusy', args)\n }\n }\n }\n\n async describe(): Promise<ModuleDescription> {\n return await this.busy(async () => {\n const description: ModuleDescription = {\n address: this.address,\n queries: this.queries,\n }\n if (this.config.name) {\n description.name = this.config.name\n }\n\n const discover = await this.discover()\n\n description.children = compact(\n discover?.map((payload) => {\n const address = payload.schema === AddressSchema ? (payload as AddressPayload).address : undefined\n return address == this.address ? undefined : address\n }) ?? [],\n )\n\n return description\n })\n }\n\n async discover(): Promise<Payload[]> {\n return await this.busy(async () => {\n return await this.bridge.targetDiscover()\n })\n }\n\n manifest(_depth?: number): Promisable<ModuleManifestPayload> {\n const name = this.config.name ?? 'Anonymous'\n return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }\n }\n\n moduleAddress(): Promise<AddressPreviousHashPayload[]> {\n throw new Error('Not Implemented')\n }\n\n previousHash(): Promise<string | undefined> {\n throw new Error('Not Implemented')\n }\n\n async query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {\n return await this.busy(async () => {\n const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')\n await this.emit('moduleQueried', { module: this, payloads, query, result })\n return result\n })\n }\n\n async queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean> {\n return await this.bridge.targetQueryable(this.address, query, payloads, queryConfig)\n }\n\n /* Resolves a filter from the perspective of the module, including through the parent/gateway module */\n resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n async resolve(\n nameOrAddressOrFilter?: ModuleFilter | string,\n options?: ModuleFilterOptions,\n ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n return await this.busy(async () => {\n return await (typeof nameOrAddressOrFilter === 'string'\n ? this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)\n : this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options))\n })\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;ACAA,mBAA4B;AAC5B,IAAAA,iBAAwB;AAExB,IAAAC,iCAA8C;AAC9C,6BAAkC;AAClC,+BAAiC;AAEjC,2BAAgC;AAChC,6BAA+B;AAW/B,IAAAC,0BAAwC;AACxC,4BAA8B;AAC9B,wBAA6B;AAC7B,0BAA4B;AAC5B,4BAAiC;AACjC,8BAAgC;AAChC,2BAAgC;AAChC,6BAA+B;;;AC1B/B,oBAAyB;AACzB,oBAAwB;AAExB,oCAA8C;AAG9C,4BAAmE;AACnE,6BAA4B;AAa5B,6BAAwC;AAIjC,IAAMC,0BAAmD;AAYzD,IAAMC,eAAN,MAAMA,qBAAoBC,mCAAAA;;EACtBC;EAEDC;EAERC,YAAmBC,aAAgC;AACjD,UAAM;MAAEC,QAAQD,YAAYE,OAAOC,aAAaH,YAAYI,OAAO;IAAE,CAAA;SADpDJ,cAAAA;SAJVH,aAAa,IAAIQ,+CAAAA;SAElBP,aAAa;EAIrB;EAEA,IAAIM,UAAU;AACZ,WAAO,KAAKJ,YAAYI,QAAQE,YAAW;EAC7C;EAEA,IAAIJ,SAAS;AACX,WAAO,KAAKF,YAAYE;EAC1B;EAEA,IAAID,SAAuB;AACzB,WAAO,KAAKC,OAAOC,aAAa,KAAKC,OAAO;EAC9C;EAEA,IAAIG,eAAe;AACjB,eAAOC,wBAAS,KAAKN,OAAOO,mBAAmB,KAAKL,OAAO,GAAG,wBAAA;EAChE;EAEA,IAAIM,KAAK;AACP,WAAO,KAAKT,OAAOU,QAAQ,KAAKP;EAClC;EAEA,IAAIQ,UAAU;AACZ,WAAO,KAAKV,OAAOW,cAAc,KAAKT,OAAO;EAC/C;EAEAU,sBAA2D;AACzD,UAAM,IAAIC,MAAM,iBAAA;EAClB;EAEA,MAAMC,KAAQC,SAA2B;AACvC,QAAI,KAAKnB,cAAc,GAAG;AACxB,WAAKA,aAAa;AAClB,YAAMoB,OAA4B;QAAEF,MAAM;QAAMG,QAAQ;MAAK;AAC7D,YAAM,KAAKC,KAAK,cAAcF,IAAAA;IAChC;AACA,SAAKpB;AACL,QAAI;AACF,aAAO,MAAMmB,QAAAA;IACf,UAAA;AACE,WAAKnB;AACL,UAAI,KAAKA,cAAc,GAAG;AACxB,aAAKA,aAAa;AAClB,cAAMoB,OAA4B;UAAEF,MAAM;UAAOG,QAAQ;QAAK;AAC9D,cAAM,KAAKC,KAAK,cAAcF,IAAAA;MAChC;IACF;EACF;EAEA,MAAMG,WAAuC;AAC3C,WAAO,MAAM,KAAKL,KAAK,YAAA;AACrB,YAAMM,cAAiC;QACrClB,SAAS,KAAKA;QACdQ,SAAS,KAAKA;MAChB;AACA,UAAI,KAAKX,OAAOU,MAAM;AACpBW,oBAAYX,OAAO,KAAKV,OAAOU;MACjC;AAEA,YAAMY,WAAW,MAAM,KAAKA,SAAQ;AAEpCD,kBAAYE,eAAWC,wBACrBF,qCAAUG,IAAI,CAACC,YAAAA;AACb,cAAMvB,UAAUuB,QAAQC,WAAWC,8CAAiBF,QAA2BvB,UAAU0B;AACzF,eAAO1B,WAAW,KAAKA,UAAU0B,SAAY1B;MAC/C,OAAM,CAAA,CAAE;AAGV,aAAOkB;IACT,CAAA;EACF;EAEA,MAAMC,WAA+B;AACnC,WAAO,MAAM,KAAKP,KAAK,YAAA;AACrB,aAAO,MAAM,KAAKd,OAAO6B,eAAc;IACzC,CAAA;EACF;EAEAC,SAASC,QAAoD;AAC3D,UAAMtB,OAAO,KAAKV,OAAOU,QAAQ;AACjC,WAAO;MAAEV,QAAQ;QAAEU;QAAM,GAAG,KAAKV;MAAO;MAAG2B,QAAQM;IAA4B;EACjF;EAEAC,gBAAuD;AACrD,UAAM,IAAIpB,MAAM,iBAAA;EAClB;EAEAqB,eAA4C;AAC1C,UAAM,IAAIrB,MAAM,iBAAA;EAClB;EAEA,MAAMsB,MAAuDA,OAAUC,UAAkD;AACvH,WAAO,MAAM,KAAKtB,KAAK,YAAA;AACrB,YAAMuB,aAAS/B,wBAAS,MAAM,KAAKN,OAAOsC,YAAY,KAAKpC,SAASiC,OAAOC,QAAAA,GAAW,qBAAA;AACtF,YAAM,KAAKlB,KAAK,iBAAiB;QAAED,QAAQ;QAAMmB;QAAUD;QAAOE;MAAO,CAAA;AACzE,aAAOA;IACT,CAAA;EACF;EAEA,MAAME,UAAUJ,OAA0BC,UAAsBI,aAA8C;AAC5G,WAAO,MAAM,KAAKxC,OAAOyC,gBAAgB,KAAKvC,SAASiC,OAAOC,UAAUI,WAAAA;EAC1E;EAKA,MAAME,QACJC,uBACAC,SACwD;AACxD,WAAO,MAAM,KAAK9B,KAAK,YAAA;AACrB,aAAO,OAAO,OAAO6B,0BAA0B,WAC3C,KAAK3C,OAAO6C,cAAc,KAAK3C,SAASyC,uBAAuBC,OAAAA,IAC/D,KAAK5C,OAAO6C,cAAc,KAAK3C,SAASyC,uBAAuBC,OAAAA;IACrE,CAAA;EACF;AACF;AA3HiClD;AAA1B,IAAMD,cAAN;;;ADNA,IAAMqD,wBAAN,MAAMA,8BAAwEC,gDAAAA;;;;EAC3EC;EACAC;EACAC;;;EAIRC,YACqBC,QACTC,gBACAC,SACV;AACA,UAAK;SAJcF,SAAAA;SACTC,iBAAAA;SACAC,UAAAA;SATJN,SAAuCO;SAEvCL,kBAA2D,CAAC;EAUpE;EAISM,IAAIC,SAAkC;AAC7C,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEA,MAAMC,yBAAgG;AACpG,UAAMC,SAA4B,CAAC;AACnC,UAAMC,QAAQC,IACZC,OAAOC,QAAQ,KAAKd,eAAe,EAAEe,IAAI,OAAO,CAACC,KAAKC,KAAAA,MAAM;AAC1DP,aAAOM,GAAAA,IAAQ,MAAMC;IACvB,CAAA,CAAA;AAGF,WAAOP;EACT;EAEA,MAAMQ,qBAAqB;AACzB,SAAKnB,kBACH,KAAKA,oBACJ,YAAA;AAjEP;AAkEQ,YAAMoB,WAAW,MAAM,KAAKjB,OAAOkB,eAAef,SAAW,UAAKD,YAAL,mBAAciB,QAAAA;AAC3E,iBAAOC,wBACLH,qCAAUJ,IAAI,CAACQ,YAAAA;AACb,YAAIA,QAAQC,WAAWC,8CAAe;AACpC,gBAAMC,gBAAgBH;AACtB,iBAAOG,cAAcC;QACvB,OAAO;AACL,iBAAO;QACT;MACF,EAAA;IAEJ,GAAA;AACF,WAAO,MAAM,KAAK5B;EACpB;EAEA6B,QAAQ;AACN,SAAK9B,SACH,KAAKA,WACJ,YAAA;AACC,YAAM,KAAK+B,qBAAoB;AAC/B,aAAO;IACT,GAAA;AACF,WAAO,KAAK/B;EACd;EAESgC,OAAOC,UAAmC;AACjD,UAAM,IAAIvB,MAAM,yBAAA;EAClB;EAEAwB,QAAQ;AACN,SAAKlC,SAASO;AACd,SAAKN,kBAAkBM;AACvB,SAAKL,kBAAkB,CAAC;EAC1B;EAIA,MAAeiC,QACbC,uBACA9B,SAC8B;AAC9B,UAAM+B,aAAa,OAAO,YAAA;AACxB,YAAMC,iBAAiB;QAAE,GAAGhC;QAASiB,YAAWjB,mCAASiB,aAAYzB,sBAAqByC,mBAAmB;MAAE;AAC/G,YAAM,KAAKT,MAAK;AAChB,YAAM,KAAKC,qBAAoB;AAC/B,UAAI,OAAOK,0BAA0B,UAAU;AAC7C,YAAIE,eAAef,WAAW,GAAG;AAC/B;QACF;AACA,cAAMX,SAAyB,MAAM,KAAK4B,iBAAoBJ,qBAAAA,KAA4B,MAAM,KAAKK,cAAiBL,qBAAAA;AACtH,eAAOxB;MACT,OAAO;AACL,YAAI0B,eAAef,WAAW,GAAG;AAC/B,iBAAO,CAAA;QACT;AACA,cAAMX,SAAc,MAAM,KAAKmB,qBAAwBK,qBAAAA;AACvD,eAAOxB;MACT;IACF,GAAA;AAEA,UAAM8B,WAAWpC,mCAASoC;AAC1B,QAAIA,UAAU;AACZ,aAAOC,MAAMC,QAAQP,UAAAA,IAAcA,yCAAYQ,OAAO,CAACC,YAAWJ,SAASI,OAAAA,KAAWJ,SAASL,UAAAA,IAAcA,aAAa9B;IAC5H,OAAO;AACL,aAAO8B;IACT;EACF;EAEA,MAAcG,iBAA4DO,eAA+C;AACvH,UAAM9C,kBAAkB,MAAM,KAAKmB,mBAAkB;AAGrD,QAAI,CAACnB,gBAAgB+C,SAASD,aAAAA,GAAgB;AAE5C,aAAOxC;IACT;AAEA,UAAM0C,SAAS,KAAK/C,gBAAgB6C,aAAAA;AACpC,QAAIE,WAAW1C;AAAW,aAAQ,MAAM0C;AAExC,SAAK/C,gBAAgB6C,aAAAA,IACnB,KAAK7C,gBAAgB6C,aAAAA,MACpB,OAAOlB,YAAAA;AAEN,YAAM,KAAKzB,OAAOkB,eAAeO,OAAAA;AAEjC,YAAMqB,MAAc,IAAIC,YAAY;QAAEtB;QAASzB,QAAQ,KAAKA;QAAQgD,QAAQ;UAAE1B,QAAQ2B;QAAwB;MAAE,CAAA;AAEhH,UAAI;AACF,gBAAIC,0CAAkBJ,GAAAA,GAAM;AAC1B,iBAAOK,0CAAiBC,KAAKN,KAAK,KAAK7C,cAAc;QACvD;AAEA,gBAAIoD,sCAAgBP,GAAAA,GAAM;AACxB,iBAAOQ,sCAAeF,KAAKN,KAAK,KAAK7C,cAAc;QACrD;AAEA,gBAAIsD,sCAAgBT,GAAAA,GAAM;AACxB,iBAAOU,sCAAeJ,KAAKN,KAAK,KAAK7C,cAAc;QACrD;AAEA,gBAAIwD,gCAAaX,GAAAA,GAAM;AACrB,iBAAOY,gCAAYN,KAAKN,KAAK,KAAK7C,cAAc;QAClD;AAEA,gBAAI0D,wCAAiBb,GAAAA,GAAM;AACzB,iBAAOc,wCAAgBR,KAAKN,KAAK,KAAK7C,cAAc;QACtD;AACA4D,gBAAQC,KAAK,+CAA+CnB,aAAAA,GAAgB;AAC5E,eAAOoB,oCAAcX,KAAKN,KAAK,KAAK7C,cAAc;MACpD,SAAS+D,IAAI;AACXC,sCAAYD,IAAI,CAACE,UAAAA;AACfL,kBAAQK,MAAM,0CAA0CA,MAAMC,OAAO,KAAKxB,aAAAA,GAAgB;QAC5F,CAAA;MACF;IACF,GAAGA,aAAAA;AAEL,WAAQ,MAAM,KAAK7C,gBAAgB6C,aAAAA;EACrC;EAEA,MAAcN,cAAyD+B,MAAsC;AAC3G,UAAMC,UAAU,MAAM,KAAK9D,uBAAsB;AACjD,WAAOI,OAAO2D,OAAOD,OAAAA,EAClB5B,OAAO,CAACC,YAAWA,QAAOM,OAAOoB,SAASA,IAAAA,EAC1CG,IAAG;EACR;EAEA,MAAcC,eAA0DC,SAAiC;AACvG,WAAO9D,OAAO2D,OAAO,MAAM,KAAK/D,uBAAsB,CAAA,EAAIkC,OAAO,CAACC,YAAAA;AAEhE,YAAMgC,QAAQhC,QAAO+B,QAAQhC,OAAO,CAACkC,UAAUF,QAAQG,KAAK,CAACC,MAAMA,MAAMF,KAAAA,CAAAA;AAGzE,aAAOF,QAAQK,WAAWJ,MAAMI;IAClC,CAAA;EACF;EAEA,MAAcnD,qBAAgEc,QAAqC;AACjH,QAAKA,iCAAgChB,SAAS;AAC5C,aAAO,MAAM,KAAKsD,8BAAiCtC,MAAAA;IACrD;AAEA,QAAKA,iCAA6B2B,MAAM;AACtC,aAAO,MAAM,KAAKY,2BAA8BvC,MAAAA;IAClD;AAEA,QAAKA,iCAA8BkC,OAAO;AACxC,aAAO,MAAM,KAAKM,4BAA+BxC,MAAAA;IACnD;AAGA,WAAO,MAAM,KAAKsC,8BAAiC;MAAEtD,SAAS,MAAM,KAAKT,mBAAkB;IAAG,CAAA;EAChG;EAEA,MAAc+D,8BAAyEtC,QAA2C;AAChI,eAAOrB,wBAAQ,MAAMX,QAAQC,IAAI+B,OAAOhB,QAAQZ,IAAI,CAACY,YAAY,KAAKW,iBAAoBX,OAAAA,CAAAA,CAAAA,CAAAA;EAC5F;EAEA,MAAcuD,2BAAsEvC,QAAwC;AAC1H,eAAOrB,wBAAQ,MAAMX,QAAQC,IAAI+B,OAAO2B,KAAKvD,IAAI,OAAOuD,SAAS,MAAM,KAAK/B,cAAiB+B,IAAAA,CAAAA,CAAAA,CAAAA;EAC/F;EAEA,MAAca,4BAAuExC,QAAyC;AAC5H,eAAOrB,yBAAS,MAAMX,QAAQC,IAAI+B,OAAOkC,MAAM9D,IAAI,OAAO8D,UAAU,MAAM,KAAKH,eAAkBG,KAAAA,CAAAA,CAAAA,GAAUO,KAAI,CAAA;EACjH;AACF;AAzMqFvF;AAA9E,IAAMD,uBAAN;","names":["import_lodash","import_address_payload_plugin","import_module_resolver","ProxyModuleConfigSchema","ProxyModule","BaseEmitter","upResolver","_busyCount","constructor","proxyParams","config","bridge","targetConfig","address","CompositeModuleResolver","toLowerCase","downResolver","assertEx","targetDownResolver","id","name","queries","targetQueries","addressPreviousHash","Error","busy","closure","args","module","emit","describe","description","discover","children","compact","map","payload","schema","AddressSchema","undefined","targetDiscover","manifest","_depth","ModuleManifestPayloadSchema","moduleAddress","previousHash","query","payloads","result","targetQuery","queryable","queryConfig","targetQueryable","resolve","nameOrAddressOrFilter","options","targetResolve","BridgeModuleResolver","CompositeModuleResolver","primed","remoteAddresses","resolvedModules","constructor","bridge","wrapperAccount","options","undefined","add","_module","Error","currentResolvedModules","result","Promise","all","Object","entries","map","key","value","getRemoteAddresses","discover","targetDiscover","maxDepth","compact","payload","schema","AddressSchema","schemaPayload","address","prime","resolveRemoteModules","remove","_address","reset","resolve","nameOrAddressOrFilter","unfiltered","mutatedOptions","defaultMaxDepth","resolveByAddress","resolveByName","identity","Array","isArray","filter","module","targetAddress","includes","cached","mod","ProxyModule","config","ProxyModuleConfigSchema","isArchivistModule","ArchivistWrapper","wrap","isDivinerModule","DivinerWrapper","isWitnessModule","WitnessWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","console","warn","ModuleWrapper","ex","handleError","error","message","name","modules","values","pop","resolveByQuery","queries","found","query","find","q","length","resolveRemoteModulesByAddress","resolveRemoteModulesByName","resolveRemoteModulesByQuery","flat"]}
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/ModuleResolver.ts","../../src/ProxyModule.ts"],"sourcesContent":["export * from './ModuleResolver'\nexport * from './ProxyModule'\n","import { handleError } from '@xylabs/error'\nimport { Address } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { isArchivistModule } from '@xyo-network/archivist-model'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { isDivinerModule } from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n AddressModuleFilter,\n Module,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleIdentifier,\n ModuleInstance,\n ModuleResolverInstance,\n NameModuleFilter,\n QueryModuleFilter,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { isNodeModule } from '@xyo-network/node-model'\nimport { NodeWrapper } from '@xyo-network/node-wrapper'\nimport { isSentinelModule } from '@xyo-network/sentinel-model'\nimport { SentinelWrapper } from '@xyo-network/sentinel-wrapper'\nimport { isWitnessModule } from '@xyo-network/witness-model'\nimport { WitnessWrapper } from '@xyo-network/witness-wrapper'\n\nimport { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './ProxyModule'\n\nexport class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> extends CompositeModuleResolver implements ModuleResolverInstance {\n private primed: Promise<boolean> | undefined = undefined\n private remoteAddresses?: Promise<Address[]>\n private resolvedModules: Record<Address, Promise<ModuleInstance>> = {}\n\n // TODO: Allow optional ctor param for supplying address for nested Nodes\n // protected readonly address?: string,\n constructor(\n protected readonly bridge: BridgeModule,\n protected wrapperAccount: AccountInstance,\n protected options?: ModuleFilterOptions<T>,\n ) {\n super()\n }\n\n override add(module: Module): this\n override add(module: Module[]): this\n override add(_module: Module | Module[]): this {\n throw new Error('Method not implemented.')\n }\n\n async currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>> {\n const result: Record<string, T> = {}\n await Promise.all(\n Object.entries(this.resolvedModules).map(async ([key, value]) => {\n result[key] = (await value) as T\n }),\n )\n\n return result\n }\n\n async getRemoteAddresses() {\n this.remoteAddresses =\n this.remoteAddresses ??\n (async () => {\n const discover = await this.bridge.targetDiscover(undefined, this.options?.maxDepth)\n return compact(\n discover?.map((payload) => {\n if (payload.schema === AddressSchema) {\n const schemaPayload = payload as AddressPayload\n return schemaPayload.address\n } else {\n return null\n }\n }),\n )\n })()\n return await this.remoteAddresses\n }\n\n prime() {\n this.primed =\n this.primed ??\n (async () => {\n await this.resolveRemoteModules()\n return true\n })()\n return this.primed\n }\n\n override remove(_address: Address | Address[]): this {\n throw new Error('Method not implemented.')\n }\n\n reset() {\n this.primed = undefined\n this.remoteAddresses = undefined\n this.resolvedModules = {}\n }\n\n override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddress: ModuleIdentifier,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | undefined>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddressOrFilter?: ModuleFilter<T> | ModuleIdentifier,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | T[] | undefined> {\n const unfiltered = await (async () => {\n const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? BridgeModuleResolver.defaultMaxDepth) - 1 }\n await this.prime()\n await this.resolveRemoteModules()\n if (typeof nameOrAddressOrFilter === 'string') {\n if (mutatedOptions.maxDepth < 0) {\n return\n }\n const result: T | undefined =\n (await this.resolveByAddress<T>(nameOrAddressOrFilter as Address)) ?? (await this.resolveByName<T>(nameOrAddressOrFilter))\n return result\n } else {\n if (mutatedOptions.maxDepth < 0) {\n return []\n }\n const result: T[] = await this.resolveRemoteModules<T>(nameOrAddressOrFilter)\n return result\n }\n })()\n\n const identity = options?.identity\n if (identity) {\n return (\n Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module))\n : identity(unfiltered) ? unfiltered\n : undefined\n )\n } else {\n return unfiltered\n }\n }\n\n private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress: Address): Promise<T | undefined> {\n const remoteAddresses = await this.getRemoteAddresses()\n\n //check if it is even there\n if (!remoteAddresses.includes(targetAddress)) {\n //this.logger?.log(`Not in RA: ${targetAddress}`)\n return undefined\n }\n\n const cached = this.resolvedModules[targetAddress]\n if (cached !== undefined) return (await cached) as T\n\n this.resolvedModules[targetAddress] =\n this.resolvedModules[targetAddress] ??\n (async (address: Address) => {\n //discover it to set the config in the bridge\n await this.bridge.targetDiscover(address)\n\n const mod: Module = new ProxyModule({ address, bridge: this.bridge, config: { schema: ProxyModuleConfigSchema } } as ProxyModuleParams)\n\n try {\n if (isArchivistModule(mod)) {\n return ArchivistWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isDivinerModule(mod)) {\n return DivinerWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isWitnessModule(mod)) {\n return WitnessWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isNodeModule(mod)) {\n return NodeWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isSentinelModule(mod)) {\n return SentinelWrapper.wrap(mod, this.wrapperAccount)\n }\n console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`)\n return ModuleWrapper.wrap(mod, this.wrapperAccount)\n } catch (ex) {\n handleError(ex, (error) => {\n console.error(`BridgeModuleResolver.resolveByAddress: ${error.message} [${targetAddress}]`)\n })\n }\n })(targetAddress)\n\n return (await this.resolvedModules[targetAddress]) as T\n }\n\n private async resolveByName<T extends ModuleInstance = ModuleInstance>(name: string): Promise<T | undefined> {\n const modules = await this.currentResolvedModules()\n return Object.values(modules)\n .filter((module) => module.config.name === name)\n .pop() as T\n }\n\n private async resolveByQuery<T extends ModuleInstance = ModuleInstance>(queries: string[]): Promise<T[]> {\n return Object.values(await this.currentResolvedModules()).filter((module) => {\n //filter out the requested queries\n const found = module.queries.filter((query) => queries.find((q) => q === query))\n\n //did we find all the requested queries?\n return queries.length === found.length\n }) as T[]\n }\n\n private async resolveRemoteModules<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promise<T[]> {\n if ((filter as AddressModuleFilter)?.address) {\n return await this.resolveRemoteModulesByAddress<T>(filter as AddressModuleFilter)\n }\n\n if ((filter as NameModuleFilter)?.name) {\n return await this.resolveRemoteModulesByName<T>(filter as NameModuleFilter)\n }\n\n if ((filter as QueryModuleFilter)?.query) {\n return await this.resolveRemoteModulesByQuery<T>(filter as QueryModuleFilter)\n }\n\n //get all of them\n return await this.resolveRemoteModulesByAddress<T>({ address: await this.getRemoteAddresses() })\n }\n\n private async resolveRemoteModulesByAddress<T extends ModuleInstance = ModuleInstance>(filter: AddressModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress<T>(address))))\n }\n\n private async resolveRemoteModulesByName<T extends ModuleInstance = ModuleInstance>(filter: NameModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName<T>(name))))\n }\n\n private async resolveRemoteModulesByQuery<T extends ModuleInstance = ModuleInstance>(filter: QueryModuleFilter): Promise<T[]> {\n return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery<T>(query)))).flat())\n }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Address } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { BaseEmitter } from '@xyo-network/module-abstract'\nimport {\n AddressPreviousHashPayload,\n ModuleBusyEventArgs,\n ModuleConfig,\n ModuleDescription,\n ModuleEventData,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleParams,\n ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\nexport const ProxyModuleConfigSchema: ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\n\nexport type TProxyModuleConfig = ModuleConfig<{ schema: ProxyModuleConfigSchema }>\n\nexport type ProxyModuleParams = ModuleParams<\n TProxyModuleConfig,\n {\n address: Address\n bridge: BridgeModule\n }\n>\n\nexport class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {\n readonly upResolver = new CompositeModuleResolver()\n\n private _busyCount = 0\n\n constructor(public proxyParams: ProxyModuleParams) {\n super({ config: proxyParams.bridge.targetConfig(proxyParams.address) })\n }\n\n get address() {\n return this.proxyParams.address\n }\n\n get bridge() {\n return this.proxyParams.bridge\n }\n\n get config(): ModuleConfig {\n return this.bridge.targetConfig(this.address)\n }\n\n get downResolver() {\n return assertEx(this.bridge.targetDownResolver(this.address), 'Unable to get resolver')\n }\n\n get id() {\n return this.config.name ?? this.address\n }\n\n get queries() {\n return this.bridge.targetQueries(this.address)\n }\n\n addressPreviousHash(): Promise<AddressPreviousHashPayload> {\n throw new Error('Not Implemented')\n }\n\n async busy<R>(closure: () => Promise<R>) {\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: true, module: this }\n await this.emit('moduleBusy', args)\n }\n this._busyCount++\n try {\n return await closure()\n } finally {\n this._busyCount--\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: false, module: this }\n await this.emit('moduleBusy', args)\n }\n }\n }\n\n async describe(): Promise<ModuleDescription> {\n return await this.busy(async () => {\n const description: ModuleDescription = {\n address: this.address,\n queries: this.queries,\n }\n if (this.config.name) {\n description.name = this.config.name\n }\n\n const discover = await this.discover()\n\n description.children = compact(\n discover?.map((payload) => {\n const address = payload.schema === AddressSchema ? (payload as AddressPayload).address : undefined\n return address == this.address ? undefined : address\n }) ?? [],\n )\n\n return description\n })\n }\n\n async discover(): Promise<Payload[]> {\n return await this.busy(async () => {\n return await this.bridge.targetDiscover()\n })\n }\n\n manifest(_depth?: number): Promisable<ModuleManifestPayload> {\n const name = this.config.name ?? 'Anonymous'\n return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }\n }\n\n moduleAddress(): Promise<AddressPreviousHashPayload[]> {\n throw new Error('Not Implemented')\n }\n\n previousHash(): Promise<string | undefined> {\n throw new Error('Not Implemented')\n }\n\n async query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {\n return await this.busy(async () => {\n const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')\n await this.emit('moduleQueried', { module: this, payloads, query, result })\n return result\n })\n }\n\n async queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean> {\n return await this.bridge.targetQueryable(this.address, query, payloads, queryConfig)\n }\n\n /* Resolves a filter from the perspective of the module, including through the parent/gateway module */\n resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n async resolve(\n nameOrAddressOrFilter?: ModuleFilter | string,\n options?: ModuleFilterOptions,\n ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n return await this.busy(async () => {\n return await (typeof nameOrAddressOrFilter === 'string' ?\n this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)\n : this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options))\n })\n }\n\n state() {\n return []\n }\n}\n"],"mappings":"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","names":["import_lodash","import_address_payload_plugin","import_module_resolver","ProxyModuleConfigSchema","ProxyModule","BaseEmitter","upResolver","_busyCount","constructor","proxyParams","config","bridge","targetConfig","address","CompositeModuleResolver","downResolver","assertEx","targetDownResolver","id","name","queries","targetQueries","addressPreviousHash","Error","busy","closure","args","module","emit","describe","description","discover","children","compact","map","payload","schema","AddressSchema","undefined","targetDiscover","manifest","_depth","ModuleManifestPayloadSchema","moduleAddress","previousHash","query","payloads","result","targetQuery","queryable","queryConfig","targetQueryable","resolve","nameOrAddressOrFilter","options","targetResolve","state","BridgeModuleResolver","CompositeModuleResolver","primed","remoteAddresses","resolvedModules","constructor","bridge","wrapperAccount","options","undefined","add","_module","Error","currentResolvedModules","result","Promise","all","Object","entries","map","key","value","getRemoteAddresses","discover","targetDiscover","maxDepth","compact","payload","schema","AddressSchema","schemaPayload","address","prime","resolveRemoteModules","remove","_address","reset","resolve","nameOrAddressOrFilter","unfiltered","mutatedOptions","defaultMaxDepth","resolveByAddress","resolveByName","identity","Array","isArray","filter","module","targetAddress","includes","cached","mod","ProxyModule","config","ProxyModuleConfigSchema","isArchivistModule","ArchivistWrapper","wrap","isDivinerModule","DivinerWrapper","isWitnessModule","WitnessWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","console","warn","ModuleWrapper","ex","handleError","error","message","name","modules","values","pop","resolveByQuery","queries","found","query","find","q","length","resolveRemoteModulesByAddress","resolveRemoteModulesByName","resolveRemoteModulesByQuery","flat"]}
|
package/dist/node/index.js
CHANGED
|
@@ -39,7 +39,7 @@ var _ProxyModule = class _ProxyModule extends BaseEmitter {
|
|
|
39
39
|
this._busyCount = 0;
|
|
40
40
|
}
|
|
41
41
|
get address() {
|
|
42
|
-
return this.proxyParams.address
|
|
42
|
+
return this.proxyParams.address;
|
|
43
43
|
}
|
|
44
44
|
get bridge() {
|
|
45
45
|
return this.proxyParams.bridge;
|
|
@@ -141,6 +141,9 @@ var _ProxyModule = class _ProxyModule extends BaseEmitter {
|
|
|
141
141
|
return await (typeof nameOrAddressOrFilter === "string" ? this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options) : this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options));
|
|
142
142
|
});
|
|
143
143
|
}
|
|
144
|
+
state() {
|
|
145
|
+
return [];
|
|
146
|
+
}
|
|
144
147
|
};
|
|
145
148
|
__name(_ProxyModule, "ProxyModule");
|
|
146
149
|
var ProxyModule = _ProxyModule;
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/ModuleResolver.ts","../../src/ProxyModule.ts"],"sourcesContent":["import { handleError } from '@xylabs/error'\nimport { compact } from '@xylabs/lodash'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { isArchivistModule } from '@xyo-network/archivist-model'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { isDivinerModule } from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n AddressModuleFilter,\n Module,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleResolverInstance,\n NameModuleFilter,\n QueryModuleFilter,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { isNodeModule } from '@xyo-network/node-model'\nimport { NodeWrapper } from '@xyo-network/node-wrapper'\nimport { isSentinelModule } from '@xyo-network/sentinel-model'\nimport { SentinelWrapper } from '@xyo-network/sentinel-wrapper'\nimport { isWitnessModule } from '@xyo-network/witness-model'\nimport { WitnessWrapper } from '@xyo-network/witness-wrapper'\n\nimport { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './ProxyModule'\n\nexport class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> extends CompositeModuleResolver implements ModuleResolverInstance {\n private primed: Promise<boolean> | undefined = undefined\n private remoteAddresses?: Promise<string[]>\n private resolvedModules: Record<string, Promise<ModuleInstance>> = {}\n\n // TODO: Allow optional ctor param for supplying address for nested Nodes\n // protected readonly address?: string,\n constructor(\n protected readonly bridge: BridgeModule,\n protected wrapperAccount: AccountInstance,\n protected options?: ModuleFilterOptions<T>,\n ) {\n super()\n }\n\n override add(module: Module): this\n override add(module: Module[]): this\n override add(_module: Module | Module[]): this {\n throw new Error('Method not implemented.')\n }\n\n async currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>> {\n const result: Record<string, T> = {}\n await Promise.all(\n Object.entries(this.resolvedModules).map(async ([key, value]) => {\n result[key] = (await value) as T\n }),\n )\n\n return result\n }\n\n async getRemoteAddresses() {\n this.remoteAddresses =\n this.remoteAddresses ??\n (async () => {\n const discover = await this.bridge.targetDiscover(undefined, this.options?.maxDepth)\n return compact(\n discover?.map((payload) => {\n if (payload.schema === AddressSchema) {\n const schemaPayload = payload as AddressPayload\n return schemaPayload.address\n } else {\n return null\n }\n }),\n )\n })()\n return await this.remoteAddresses\n }\n\n prime() {\n this.primed =\n this.primed ??\n (async () => {\n await this.resolveRemoteModules()\n return true\n })()\n return this.primed\n }\n\n override remove(_address: string | string[]): this {\n throw new Error('Method not implemented.')\n }\n\n reset() {\n this.primed = undefined\n this.remoteAddresses = undefined\n this.resolvedModules = {}\n }\n\n override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n override async resolve<T extends ModuleInstance = ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<T>): Promise<T | undefined>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddressOrFilter?: ModuleFilter<T> | string,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | T[] | undefined> {\n const unfiltered = await (async () => {\n const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? BridgeModuleResolver.defaultMaxDepth) - 1 }\n await this.prime()\n await this.resolveRemoteModules()\n if (typeof nameOrAddressOrFilter === 'string') {\n if (mutatedOptions.maxDepth < 0) {\n return\n }\n const result: T | undefined = (await this.resolveByAddress<T>(nameOrAddressOrFilter)) ?? (await this.resolveByName<T>(nameOrAddressOrFilter))\n return result\n } else {\n if (mutatedOptions.maxDepth < 0) {\n return []\n }\n const result: T[] = await this.resolveRemoteModules<T>(nameOrAddressOrFilter)\n return result\n }\n })()\n\n const identity = options?.identity\n if (identity) {\n return Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module)) : identity(unfiltered) ? unfiltered : undefined\n } else {\n return unfiltered\n }\n }\n\n private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress: string): Promise<T | undefined> {\n const remoteAddresses = await this.getRemoteAddresses()\n\n //check if it is even there\n if (!remoteAddresses.includes(targetAddress)) {\n //this.logger?.log(`Not in RA: ${targetAddress}`)\n return undefined\n }\n\n const cached = this.resolvedModules[targetAddress]\n if (cached !== undefined) return (await cached) as T\n\n this.resolvedModules[targetAddress] =\n this.resolvedModules[targetAddress] ??\n (async (address: string) => {\n //discover it to set the config in the bridge\n await this.bridge.targetDiscover(address)\n\n const mod: Module = new ProxyModule({ address, bridge: this.bridge, config: { schema: ProxyModuleConfigSchema } } as ProxyModuleParams)\n\n try {\n if (isArchivistModule(mod)) {\n return ArchivistWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isDivinerModule(mod)) {\n return DivinerWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isWitnessModule(mod)) {\n return WitnessWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isNodeModule(mod)) {\n return NodeWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isSentinelModule(mod)) {\n return SentinelWrapper.wrap(mod, this.wrapperAccount)\n }\n console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`)\n return ModuleWrapper.wrap(mod, this.wrapperAccount)\n } catch (ex) {\n handleError(ex, (error) => {\n console.error(`BridgeModuleResolver.resolveByAddress: ${error.message} [${targetAddress}]`)\n })\n }\n })(targetAddress)\n\n return (await this.resolvedModules[targetAddress]) as T\n }\n\n private async resolveByName<T extends ModuleInstance = ModuleInstance>(name: string): Promise<T | undefined> {\n const modules = await this.currentResolvedModules()\n return Object.values(modules)\n .filter((module) => module.config.name === name)\n .pop() as T\n }\n\n private async resolveByQuery<T extends ModuleInstance = ModuleInstance>(queries: string[]): Promise<T[]> {\n return Object.values(await this.currentResolvedModules()).filter((module) => {\n //filter out the requested queries\n const found = module.queries.filter((query) => queries.find((q) => q === query))\n\n //did we find all the requested queries?\n return queries.length === found.length\n }) as T[]\n }\n\n private async resolveRemoteModules<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promise<T[]> {\n if ((filter as AddressModuleFilter)?.address) {\n return await this.resolveRemoteModulesByAddress<T>(filter as AddressModuleFilter)\n }\n\n if ((filter as NameModuleFilter)?.name) {\n return await this.resolveRemoteModulesByName<T>(filter as NameModuleFilter)\n }\n\n if ((filter as QueryModuleFilter)?.query) {\n return await this.resolveRemoteModulesByQuery<T>(filter as QueryModuleFilter)\n }\n\n //get all of them\n return await this.resolveRemoteModulesByAddress<T>({ address: await this.getRemoteAddresses() })\n }\n\n private async resolveRemoteModulesByAddress<T extends ModuleInstance = ModuleInstance>(filter: AddressModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress<T>(address))))\n }\n\n private async resolveRemoteModulesByName<T extends ModuleInstance = ModuleInstance>(filter: NameModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName<T>(name))))\n }\n\n private async resolveRemoteModulesByQuery<T extends ModuleInstance = ModuleInstance>(filter: QueryModuleFilter): Promise<T[]> {\n return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery<T>(query)))).flat())\n }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { BaseEmitter } from '@xyo-network/module-abstract'\nimport {\n AddressPreviousHashPayload,\n ModuleBusyEventArgs,\n ModuleConfig,\n ModuleDescription,\n ModuleEventData,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleParams,\n ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\nexport const ProxyModuleConfigSchema: ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\n\nexport type TProxyModuleConfig = ModuleConfig<{ schema: ProxyModuleConfigSchema }>\n\nexport type ProxyModuleParams = ModuleParams<\n TProxyModuleConfig,\n {\n address: string\n bridge: BridgeModule\n }\n>\n\nexport class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {\n readonly upResolver = new CompositeModuleResolver()\n\n private _busyCount = 0\n\n constructor(public proxyParams: ProxyModuleParams) {\n super({ config: proxyParams.bridge.targetConfig(proxyParams.address) })\n }\n\n get address() {\n return this.proxyParams.address.toLowerCase()\n }\n\n get bridge() {\n return this.proxyParams.bridge\n }\n\n get config(): ModuleConfig {\n return this.bridge.targetConfig(this.address)\n }\n\n get downResolver() {\n return assertEx(this.bridge.targetDownResolver(this.address), 'Unable to get resolver')\n }\n\n get id() {\n return this.config.name ?? this.address\n }\n\n get queries() {\n return this.bridge.targetQueries(this.address)\n }\n\n addressPreviousHash(): Promise<AddressPreviousHashPayload> {\n throw new Error('Not Implemented')\n }\n\n async busy<R>(closure: () => Promise<R>) {\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: true, module: this }\n await this.emit('moduleBusy', args)\n }\n this._busyCount++\n try {\n return await closure()\n } finally {\n this._busyCount--\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: false, module: this }\n await this.emit('moduleBusy', args)\n }\n }\n }\n\n async describe(): Promise<ModuleDescription> {\n return await this.busy(async () => {\n const description: ModuleDescription = {\n address: this.address,\n queries: this.queries,\n }\n if (this.config.name) {\n description.name = this.config.name\n }\n\n const discover = await this.discover()\n\n description.children = compact(\n discover?.map((payload) => {\n const address = payload.schema === AddressSchema ? (payload as AddressPayload).address : undefined\n return address == this.address ? undefined : address\n }) ?? [],\n )\n\n return description\n })\n }\n\n async discover(): Promise<Payload[]> {\n return await this.busy(async () => {\n return await this.bridge.targetDiscover()\n })\n }\n\n manifest(_depth?: number): Promisable<ModuleManifestPayload> {\n const name = this.config.name ?? 'Anonymous'\n return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }\n }\n\n moduleAddress(): Promise<AddressPreviousHashPayload[]> {\n throw new Error('Not Implemented')\n }\n\n previousHash(): Promise<string | undefined> {\n throw new Error('Not Implemented')\n }\n\n async query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {\n return await this.busy(async () => {\n const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')\n await this.emit('moduleQueried', { module: this, payloads, query, result })\n return result\n })\n }\n\n async queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean> {\n return await this.bridge.targetQueryable(this.address, query, payloads, queryConfig)\n }\n\n /* Resolves a filter from the perspective of the module, including through the parent/gateway module */\n resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n async resolve(\n nameOrAddressOrFilter?: ModuleFilter | string,\n options?: ModuleFilterOptions,\n ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n return await this.busy(async () => {\n return await (typeof nameOrAddressOrFilter === 'string'\n ? this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)\n : this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options))\n })\n }\n}\n"],"mappings":"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","names":["handleError","compact","AddressSchema","isArchivistModule","ArchivistWrapper","isDivinerModule","DivinerWrapper","CompositeModuleResolver","ModuleWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","isWitnessModule","WitnessWrapper","assertEx","compact","AddressSchema","ModuleManifestPayloadSchema","BaseEmitter","CompositeModuleResolver","ProxyModuleConfigSchema","ProxyModule","BaseEmitter","upResolver","_busyCount","constructor","proxyParams","config","bridge","targetConfig","address","CompositeModuleResolver","toLowerCase","downResolver","assertEx","targetDownResolver","id","name","queries","targetQueries","addressPreviousHash","Error","busy","closure","args","module","emit","describe","description","discover","children","compact","map","payload","schema","AddressSchema","undefined","targetDiscover","manifest","_depth","ModuleManifestPayloadSchema","moduleAddress","previousHash","query","payloads","result","targetQuery","queryable","queryConfig","targetQueryable","resolve","nameOrAddressOrFilter","options","targetResolve","BridgeModuleResolver","CompositeModuleResolver","primed","remoteAddresses","resolvedModules","constructor","bridge","wrapperAccount","options","undefined","add","_module","Error","currentResolvedModules","result","Promise","all","Object","entries","map","key","value","getRemoteAddresses","discover","targetDiscover","maxDepth","compact","payload","schema","AddressSchema","schemaPayload","address","prime","resolveRemoteModules","remove","_address","reset","resolve","nameOrAddressOrFilter","unfiltered","mutatedOptions","defaultMaxDepth","resolveByAddress","resolveByName","identity","Array","isArray","filter","module","targetAddress","includes","cached","mod","ProxyModule","config","ProxyModuleConfigSchema","isArchivistModule","ArchivistWrapper","wrap","isDivinerModule","DivinerWrapper","isWitnessModule","WitnessWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","console","warn","ModuleWrapper","ex","handleError","error","message","name","modules","values","pop","resolveByQuery","queries","found","query","find","q","length","resolveRemoteModulesByAddress","resolveRemoteModulesByName","resolveRemoteModulesByQuery","flat"]}
|
|
1
|
+
{"version":3,"sources":["../../src/ModuleResolver.ts","../../src/ProxyModule.ts"],"sourcesContent":["import { handleError } from '@xylabs/error'\nimport { Address } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { isArchivistModule } from '@xyo-network/archivist-model'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { isDivinerModule } from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n AddressModuleFilter,\n Module,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleIdentifier,\n ModuleInstance,\n ModuleResolverInstance,\n NameModuleFilter,\n QueryModuleFilter,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { isNodeModule } from '@xyo-network/node-model'\nimport { NodeWrapper } from '@xyo-network/node-wrapper'\nimport { isSentinelModule } from '@xyo-network/sentinel-model'\nimport { SentinelWrapper } from '@xyo-network/sentinel-wrapper'\nimport { isWitnessModule } from '@xyo-network/witness-model'\nimport { WitnessWrapper } from '@xyo-network/witness-wrapper'\n\nimport { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './ProxyModule'\n\nexport class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> extends CompositeModuleResolver implements ModuleResolverInstance {\n private primed: Promise<boolean> | undefined = undefined\n private remoteAddresses?: Promise<Address[]>\n private resolvedModules: Record<Address, Promise<ModuleInstance>> = {}\n\n // TODO: Allow optional ctor param for supplying address for nested Nodes\n // protected readonly address?: string,\n constructor(\n protected readonly bridge: BridgeModule,\n protected wrapperAccount: AccountInstance,\n protected options?: ModuleFilterOptions<T>,\n ) {\n super()\n }\n\n override add(module: Module): this\n override add(module: Module[]): this\n override add(_module: Module | Module[]): this {\n throw new Error('Method not implemented.')\n }\n\n async currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>> {\n const result: Record<string, T> = {}\n await Promise.all(\n Object.entries(this.resolvedModules).map(async ([key, value]) => {\n result[key] = (await value) as T\n }),\n )\n\n return result\n }\n\n async getRemoteAddresses() {\n this.remoteAddresses =\n this.remoteAddresses ??\n (async () => {\n const discover = await this.bridge.targetDiscover(undefined, this.options?.maxDepth)\n return compact(\n discover?.map((payload) => {\n if (payload.schema === AddressSchema) {\n const schemaPayload = payload as AddressPayload\n return schemaPayload.address\n } else {\n return null\n }\n }),\n )\n })()\n return await this.remoteAddresses\n }\n\n prime() {\n this.primed =\n this.primed ??\n (async () => {\n await this.resolveRemoteModules()\n return true\n })()\n return this.primed\n }\n\n override remove(_address: Address | Address[]): this {\n throw new Error('Method not implemented.')\n }\n\n reset() {\n this.primed = undefined\n this.remoteAddresses = undefined\n this.resolvedModules = {}\n }\n\n override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddress: ModuleIdentifier,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | undefined>\n override async resolve<T extends ModuleInstance = ModuleInstance>(\n nameOrAddressOrFilter?: ModuleFilter<T> | ModuleIdentifier,\n options?: ModuleFilterOptions<T>,\n ): Promise<T | T[] | undefined> {\n const unfiltered = await (async () => {\n const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? BridgeModuleResolver.defaultMaxDepth) - 1 }\n await this.prime()\n await this.resolveRemoteModules()\n if (typeof nameOrAddressOrFilter === 'string') {\n if (mutatedOptions.maxDepth < 0) {\n return\n }\n const result: T | undefined =\n (await this.resolveByAddress<T>(nameOrAddressOrFilter as Address)) ?? (await this.resolveByName<T>(nameOrAddressOrFilter))\n return result\n } else {\n if (mutatedOptions.maxDepth < 0) {\n return []\n }\n const result: T[] = await this.resolveRemoteModules<T>(nameOrAddressOrFilter)\n return result\n }\n })()\n\n const identity = options?.identity\n if (identity) {\n return (\n Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module))\n : identity(unfiltered) ? unfiltered\n : undefined\n )\n } else {\n return unfiltered\n }\n }\n\n private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress: Address): Promise<T | undefined> {\n const remoteAddresses = await this.getRemoteAddresses()\n\n //check if it is even there\n if (!remoteAddresses.includes(targetAddress)) {\n //this.logger?.log(`Not in RA: ${targetAddress}`)\n return undefined\n }\n\n const cached = this.resolvedModules[targetAddress]\n if (cached !== undefined) return (await cached) as T\n\n this.resolvedModules[targetAddress] =\n this.resolvedModules[targetAddress] ??\n (async (address: Address) => {\n //discover it to set the config in the bridge\n await this.bridge.targetDiscover(address)\n\n const mod: Module = new ProxyModule({ address, bridge: this.bridge, config: { schema: ProxyModuleConfigSchema } } as ProxyModuleParams)\n\n try {\n if (isArchivistModule(mod)) {\n return ArchivistWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isDivinerModule(mod)) {\n return DivinerWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isWitnessModule(mod)) {\n return WitnessWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isNodeModule(mod)) {\n return NodeWrapper.wrap(mod, this.wrapperAccount)\n }\n\n if (isSentinelModule(mod)) {\n return SentinelWrapper.wrap(mod, this.wrapperAccount)\n }\n console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`)\n return ModuleWrapper.wrap(mod, this.wrapperAccount)\n } catch (ex) {\n handleError(ex, (error) => {\n console.error(`BridgeModuleResolver.resolveByAddress: ${error.message} [${targetAddress}]`)\n })\n }\n })(targetAddress)\n\n return (await this.resolvedModules[targetAddress]) as T\n }\n\n private async resolveByName<T extends ModuleInstance = ModuleInstance>(name: string): Promise<T | undefined> {\n const modules = await this.currentResolvedModules()\n return Object.values(modules)\n .filter((module) => module.config.name === name)\n .pop() as T\n }\n\n private async resolveByQuery<T extends ModuleInstance = ModuleInstance>(queries: string[]): Promise<T[]> {\n return Object.values(await this.currentResolvedModules()).filter((module) => {\n //filter out the requested queries\n const found = module.queries.filter((query) => queries.find((q) => q === query))\n\n //did we find all the requested queries?\n return queries.length === found.length\n }) as T[]\n }\n\n private async resolveRemoteModules<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promise<T[]> {\n if ((filter as AddressModuleFilter)?.address) {\n return await this.resolveRemoteModulesByAddress<T>(filter as AddressModuleFilter)\n }\n\n if ((filter as NameModuleFilter)?.name) {\n return await this.resolveRemoteModulesByName<T>(filter as NameModuleFilter)\n }\n\n if ((filter as QueryModuleFilter)?.query) {\n return await this.resolveRemoteModulesByQuery<T>(filter as QueryModuleFilter)\n }\n\n //get all of them\n return await this.resolveRemoteModulesByAddress<T>({ address: await this.getRemoteAddresses() })\n }\n\n private async resolveRemoteModulesByAddress<T extends ModuleInstance = ModuleInstance>(filter: AddressModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress<T>(address))))\n }\n\n private async resolveRemoteModulesByName<T extends ModuleInstance = ModuleInstance>(filter: NameModuleFilter): Promise<T[]> {\n return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName<T>(name))))\n }\n\n private async resolveRemoteModulesByQuery<T extends ModuleInstance = ModuleInstance>(filter: QueryModuleFilter): Promise<T[]> {\n return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery<T>(query)))).flat())\n }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Address } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BridgeModule } from '@xyo-network/bridge-model'\nimport { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { BaseEmitter } from '@xyo-network/module-abstract'\nimport {\n AddressPreviousHashPayload,\n ModuleBusyEventArgs,\n ModuleConfig,\n ModuleDescription,\n ModuleEventData,\n ModuleFilter,\n ModuleFilterOptions,\n ModuleInstance,\n ModuleParams,\n ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\nexport const ProxyModuleConfigSchema: ProxyModuleConfigSchema = 'network.xyo.module.proxy.config'\n\nexport type TProxyModuleConfig = ModuleConfig<{ schema: ProxyModuleConfigSchema }>\n\nexport type ProxyModuleParams = ModuleParams<\n TProxyModuleConfig,\n {\n address: Address\n bridge: BridgeModule\n }\n>\n\nexport class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {\n readonly upResolver = new CompositeModuleResolver()\n\n private _busyCount = 0\n\n constructor(public proxyParams: ProxyModuleParams) {\n super({ config: proxyParams.bridge.targetConfig(proxyParams.address) })\n }\n\n get address() {\n return this.proxyParams.address\n }\n\n get bridge() {\n return this.proxyParams.bridge\n }\n\n get config(): ModuleConfig {\n return this.bridge.targetConfig(this.address)\n }\n\n get downResolver() {\n return assertEx(this.bridge.targetDownResolver(this.address), 'Unable to get resolver')\n }\n\n get id() {\n return this.config.name ?? this.address\n }\n\n get queries() {\n return this.bridge.targetQueries(this.address)\n }\n\n addressPreviousHash(): Promise<AddressPreviousHashPayload> {\n throw new Error('Not Implemented')\n }\n\n async busy<R>(closure: () => Promise<R>) {\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: true, module: this }\n await this.emit('moduleBusy', args)\n }\n this._busyCount++\n try {\n return await closure()\n } finally {\n this._busyCount--\n if (this._busyCount <= 0) {\n this._busyCount = 0\n const args: ModuleBusyEventArgs = { busy: false, module: this }\n await this.emit('moduleBusy', args)\n }\n }\n }\n\n async describe(): Promise<ModuleDescription> {\n return await this.busy(async () => {\n const description: ModuleDescription = {\n address: this.address,\n queries: this.queries,\n }\n if (this.config.name) {\n description.name = this.config.name\n }\n\n const discover = await this.discover()\n\n description.children = compact(\n discover?.map((payload) => {\n const address = payload.schema === AddressSchema ? (payload as AddressPayload).address : undefined\n return address == this.address ? undefined : address\n }) ?? [],\n )\n\n return description\n })\n }\n\n async discover(): Promise<Payload[]> {\n return await this.busy(async () => {\n return await this.bridge.targetDiscover()\n })\n }\n\n manifest(_depth?: number): Promisable<ModuleManifestPayload> {\n const name = this.config.name ?? 'Anonymous'\n return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }\n }\n\n moduleAddress(): Promise<AddressPreviousHashPayload[]> {\n throw new Error('Not Implemented')\n }\n\n previousHash(): Promise<string | undefined> {\n throw new Error('Not Implemented')\n }\n\n async query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {\n return await this.busy(async () => {\n const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')\n await this.emit('moduleQueried', { module: this, payloads, query, result })\n return result\n })\n }\n\n async queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean> {\n return await this.bridge.targetQueryable(this.address, query, payloads, queryConfig)\n }\n\n /* Resolves a filter from the perspective of the module, including through the parent/gateway module */\n resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n async resolve(\n nameOrAddressOrFilter?: ModuleFilter | string,\n options?: ModuleFilterOptions,\n ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n return await this.busy(async () => {\n return await (typeof nameOrAddressOrFilter === 'string' ?\n this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)\n : this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options))\n })\n }\n\n state() {\n return []\n }\n}\n"],"mappings":";;;;AAAA,SAASA,mBAAmB;AAE5B,SAASC,WAAAA,gBAAe;AAExB,SAAyBC,iBAAAA,sBAAqB;AAC9C,SAASC,yBAAyB;AAClC,SAASC,wBAAwB;AAEjC,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;AAY/B,SAASC,2BAAAA,gCAA+B;AACxC,SAASC,qBAAqB;AAC9B,SAASC,oBAAoB;AAC7B,SAASC,mBAAmB;AAC5B,SAASC,wBAAwB;AACjC,SAASC,uBAAuB;AAChC,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;;;AC5B/B,SAASC,gBAAgB;AAEzB,SAASC,eAAe;AAExB,SAAyBC,qBAAqB;AAG9C,SAAgCC,mCAAmC;AACnE,SAASC,mBAAmB;AAa5B,SAASC,+BAA+B;AAIjC,IAAMC,0BAAmD;AAYzD,IAAMC,eAAN,MAAMA,qBAAoBC,YAAAA;;EACtBC;EAEDC;EAERC,YAAmBC,aAAgC;AACjD,UAAM;MAAEC,QAAQD,YAAYE,OAAOC,aAAaH,YAAYI,OAAO;IAAE,CAAA;SADpDJ,cAAAA;SAJVH,aAAa,IAAIQ,wBAAAA;SAElBP,aAAa;EAIrB;EAEA,IAAIM,UAAU;AACZ,WAAO,KAAKJ,YAAYI;EAC1B;EAEA,IAAIF,SAAS;AACX,WAAO,KAAKF,YAAYE;EAC1B;EAEA,IAAID,SAAuB;AACzB,WAAO,KAAKC,OAAOC,aAAa,KAAKC,OAAO;EAC9C;EAEA,IAAIE,eAAe;AACjB,WAAOC,SAAS,KAAKL,OAAOM,mBAAmB,KAAKJ,OAAO,GAAG,wBAAA;EAChE;EAEA,IAAIK,KAAK;AACP,WAAO,KAAKR,OAAOS,QAAQ,KAAKN;EAClC;EAEA,IAAIO,UAAU;AACZ,WAAO,KAAKT,OAAOU,cAAc,KAAKR,OAAO;EAC/C;EAEAS,sBAA2D;AACzD,UAAM,IAAIC,MAAM,iBAAA;EAClB;EAEA,MAAMC,KAAQC,SAA2B;AACvC,QAAI,KAAKlB,cAAc,GAAG;AACxB,WAAKA,aAAa;AAClB,YAAMmB,OAA4B;QAAEF,MAAM;QAAMG,QAAQ;MAAK;AAC7D,YAAM,KAAKC,KAAK,cAAcF,IAAAA;IAChC;AACA,SAAKnB;AACL,QAAI;AACF,aAAO,MAAMkB,QAAAA;IACf,UAAA;AACE,WAAKlB;AACL,UAAI,KAAKA,cAAc,GAAG;AACxB,aAAKA,aAAa;AAClB,cAAMmB,OAA4B;UAAEF,MAAM;UAAOG,QAAQ;QAAK;AAC9D,cAAM,KAAKC,KAAK,cAAcF,IAAAA;MAChC;IACF;EACF;EAEA,MAAMG,WAAuC;AAC3C,WAAO,MAAM,KAAKL,KAAK,YAAA;AACrB,YAAMM,cAAiC;QACrCjB,SAAS,KAAKA;QACdO,SAAS,KAAKA;MAChB;AACA,UAAI,KAAKV,OAAOS,MAAM;AACpBW,oBAAYX,OAAO,KAAKT,OAAOS;MACjC;AAEA,YAAMY,WAAW,MAAM,KAAKA,SAAQ;AAEpCD,kBAAYE,WAAWC,SACrBF,qCAAUG,IAAI,CAACC,YAAAA;AACb,cAAMtB,UAAUsB,QAAQC,WAAWC,gBAAiBF,QAA2BtB,UAAUyB;AACzF,eAAOzB,WAAW,KAAKA,UAAUyB,SAAYzB;MAC/C,OAAM,CAAA,CAAE;AAGV,aAAOiB;IACT,CAAA;EACF;EAEA,MAAMC,WAA+B;AACnC,WAAO,MAAM,KAAKP,KAAK,YAAA;AACrB,aAAO,MAAM,KAAKb,OAAO4B,eAAc;IACzC,CAAA;EACF;EAEAC,SAASC,QAAoD;AAC3D,UAAMtB,OAAO,KAAKT,OAAOS,QAAQ;AACjC,WAAO;MAAET,QAAQ;QAAES;QAAM,GAAG,KAAKT;MAAO;MAAG0B,QAAQM;IAA4B;EACjF;EAEAC,gBAAuD;AACrD,UAAM,IAAIpB,MAAM,iBAAA;EAClB;EAEAqB,eAA4C;AAC1C,UAAM,IAAIrB,MAAM,iBAAA;EAClB;EAEA,MAAMsB,MAAuDA,OAAUC,UAAkD;AACvH,WAAO,MAAM,KAAKtB,KAAK,YAAA;AACrB,YAAMuB,SAAS/B,SAAS,MAAM,KAAKL,OAAOqC,YAAY,KAAKnC,SAASgC,OAAOC,QAAAA,GAAW,qBAAA;AACtF,YAAM,KAAKlB,KAAK,iBAAiB;QAAED,QAAQ;QAAMmB;QAAUD;QAAOE;MAAO,CAAA;AACzE,aAAOA;IACT,CAAA;EACF;EAEA,MAAME,UAAUJ,OAA0BC,UAAsBI,aAA8C;AAC5G,WAAO,MAAM,KAAKvC,OAAOwC,gBAAgB,KAAKtC,SAASgC,OAAOC,UAAUI,WAAAA;EAC1E;EAKA,MAAME,QACJC,uBACAC,SACwD;AACxD,WAAO,MAAM,KAAK9B,KAAK,YAAA;AACrB,aAAO,OAAO,OAAO6B,0BAA0B,WAC7C,KAAK1C,OAAO4C,cAAc,KAAK1C,SAASwC,uBAAuBC,OAAAA,IAC/D,KAAK3C,OAAO4C,cAAc,KAAK1C,SAASwC,uBAAuBC,OAAAA;IACnE,CAAA;EACF;EAEAE,QAAQ;AACN,WAAO,CAAA;EACT;AACF;AA/HiCnD;AAA1B,IAAMD,cAAN;;;ADLA,IAAMqD,wBAAN,MAAMA,8BAAwEC,yBAAAA;;;;EAC3EC;EACAC;EACAC;;;EAIRC,YACqBC,QACTC,gBACAC,SACV;AACA,UAAK;SAJcF,SAAAA;SACTC,iBAAAA;SACAC,UAAAA;SATJN,SAAuCO;SAEvCL,kBAA4D,CAAC;EAUrE;EAISM,IAAIC,SAAkC;AAC7C,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEA,MAAMC,yBAAgG;AACpG,UAAMC,SAA4B,CAAC;AACnC,UAAMC,QAAQC,IACZC,OAAOC,QAAQ,KAAKd,eAAe,EAAEe,IAAI,OAAO,CAACC,KAAKC,KAAAA,MAAM;AAC1DP,aAAOM,GAAAA,IAAQ,MAAMC;IACvB,CAAA,CAAA;AAGF,WAAOP;EACT;EAEA,MAAMQ,qBAAqB;AACzB,SAAKnB,kBACH,KAAKA,oBACJ,YAAA;AAnEP;AAoEQ,YAAMoB,WAAW,MAAM,KAAKjB,OAAOkB,eAAef,SAAW,UAAKD,YAAL,mBAAciB,QAAAA;AAC3E,aAAOC,SACLH,qCAAUJ,IAAI,CAACQ,YAAAA;AACb,YAAIA,QAAQC,WAAWC,gBAAe;AACpC,gBAAMC,gBAAgBH;AACtB,iBAAOG,cAAcC;QACvB,OAAO;AACL,iBAAO;QACT;MACF,EAAA;IAEJ,GAAA;AACF,WAAO,MAAM,KAAK5B;EACpB;EAEA6B,QAAQ;AACN,SAAK9B,SACH,KAAKA,WACJ,YAAA;AACC,YAAM,KAAK+B,qBAAoB;AAC/B,aAAO;IACT,GAAA;AACF,WAAO,KAAK/B;EACd;EAESgC,OAAOC,UAAqC;AACnD,UAAM,IAAIvB,MAAM,yBAAA;EAClB;EAEAwB,QAAQ;AACN,SAAKlC,SAASO;AACd,SAAKN,kBAAkBM;AACvB,SAAKL,kBAAkB,CAAC;EAC1B;EAOA,MAAeiC,QACbC,uBACA9B,SAC8B;AAC9B,UAAM+B,aAAa,OAAO,YAAA;AACxB,YAAMC,iBAAiB;QAAE,GAAGhC;QAASiB,YAAWjB,mCAASiB,aAAYzB,sBAAqByC,mBAAmB;MAAE;AAC/G,YAAM,KAAKT,MAAK;AAChB,YAAM,KAAKC,qBAAoB;AAC/B,UAAI,OAAOK,0BAA0B,UAAU;AAC7C,YAAIE,eAAef,WAAW,GAAG;AAC/B;QACF;AACA,cAAMX,SACH,MAAM,KAAK4B,iBAAoBJ,qBAAAA,KAAuC,MAAM,KAAKK,cAAiBL,qBAAAA;AACrG,eAAOxB;MACT,OAAO;AACL,YAAI0B,eAAef,WAAW,GAAG;AAC/B,iBAAO,CAAA;QACT;AACA,cAAMX,SAAc,MAAM,KAAKmB,qBAAwBK,qBAAAA;AACvD,eAAOxB;MACT;IACF,GAAA;AAEA,UAAM8B,WAAWpC,mCAASoC;AAC1B,QAAIA,UAAU;AACZ,aACEC,MAAMC,QAAQP,UAAAA,IAAcA,yCAAYQ,OAAO,CAACC,WAAWJ,SAASI,MAAAA,KAClEJ,SAASL,UAAAA,IAAcA,aACvB9B;IAEN,OAAO;AACL,aAAO8B;IACT;EACF;EAEA,MAAcG,iBAA4DO,eAAgD;AACxH,UAAM9C,kBAAkB,MAAM,KAAKmB,mBAAkB;AAGrD,QAAI,CAACnB,gBAAgB+C,SAASD,aAAAA,GAAgB;AAE5C,aAAOxC;IACT;AAEA,UAAM0C,SAAS,KAAK/C,gBAAgB6C,aAAAA;AACpC,QAAIE,WAAW1C;AAAW,aAAQ,MAAM0C;AAExC,SAAK/C,gBAAgB6C,aAAAA,IACnB,KAAK7C,gBAAgB6C,aAAAA,MACpB,OAAOlB,YAAAA;AAEN,YAAM,KAAKzB,OAAOkB,eAAeO,OAAAA;AAEjC,YAAMqB,MAAc,IAAIC,YAAY;QAAEtB;QAASzB,QAAQ,KAAKA;QAAQgD,QAAQ;UAAE1B,QAAQ2B;QAAwB;MAAE,CAAA;AAEhH,UAAI;AACF,YAAIC,kBAAkBJ,GAAAA,GAAM;AAC1B,iBAAOK,iBAAiBC,KAAKN,KAAK,KAAK7C,cAAc;QACvD;AAEA,YAAIoD,gBAAgBP,GAAAA,GAAM;AACxB,iBAAOQ,eAAeF,KAAKN,KAAK,KAAK7C,cAAc;QACrD;AAEA,YAAIsD,gBAAgBT,GAAAA,GAAM;AACxB,iBAAOU,eAAeJ,KAAKN,KAAK,KAAK7C,cAAc;QACrD;AAEA,YAAIwD,aAAaX,GAAAA,GAAM;AACrB,iBAAOY,YAAYN,KAAKN,KAAK,KAAK7C,cAAc;QAClD;AAEA,YAAI0D,iBAAiBb,GAAAA,GAAM;AACzB,iBAAOc,gBAAgBR,KAAKN,KAAK,KAAK7C,cAAc;QACtD;AACA4D,gBAAQC,KAAK,+CAA+CnB,aAAAA,GAAgB;AAC5E,eAAOoB,cAAcX,KAAKN,KAAK,KAAK7C,cAAc;MACpD,SAAS+D,IAAI;AACXC,oBAAYD,IAAI,CAACE,UAAAA;AACfL,kBAAQK,MAAM,0CAA0CA,MAAMC,OAAO,KAAKxB,aAAAA,GAAgB;QAC5F,CAAA;MACF;IACF,GAAGA,aAAAA;AAEL,WAAQ,MAAM,KAAK7C,gBAAgB6C,aAAAA;EACrC;EAEA,MAAcN,cAAyD+B,MAAsC;AAC3G,UAAMC,UAAU,MAAM,KAAK9D,uBAAsB;AACjD,WAAOI,OAAO2D,OAAOD,OAAAA,EAClB5B,OAAO,CAACC,WAAWA,OAAOM,OAAOoB,SAASA,IAAAA,EAC1CG,IAAG;EACR;EAEA,MAAcC,eAA0DC,SAAiC;AACvG,WAAO9D,OAAO2D,OAAO,MAAM,KAAK/D,uBAAsB,CAAA,EAAIkC,OAAO,CAACC,WAAAA;AAEhE,YAAMgC,QAAQhC,OAAO+B,QAAQhC,OAAO,CAACkC,UAAUF,QAAQG,KAAK,CAACC,MAAMA,MAAMF,KAAAA,CAAAA;AAGzE,aAAOF,QAAQK,WAAWJ,MAAMI;IAClC,CAAA;EACF;EAEA,MAAcnD,qBAAgEc,QAAqC;AACjH,QAAKA,iCAAgChB,SAAS;AAC5C,aAAO,MAAM,KAAKsD,8BAAiCtC,MAAAA;IACrD;AAEA,QAAKA,iCAA6B2B,MAAM;AACtC,aAAO,MAAM,KAAKY,2BAA8BvC,MAAAA;IAClD;AAEA,QAAKA,iCAA8BkC,OAAO;AACxC,aAAO,MAAM,KAAKM,4BAA+BxC,MAAAA;IACnD;AAGA,WAAO,MAAM,KAAKsC,8BAAiC;MAAEtD,SAAS,MAAM,KAAKT,mBAAkB;IAAG,CAAA;EAChG;EAEA,MAAc+D,8BAAyEtC,QAA2C;AAChI,WAAOrB,SAAQ,MAAMX,QAAQC,IAAI+B,OAAOhB,QAAQZ,IAAI,CAACY,YAAY,KAAKW,iBAAoBX,OAAAA,CAAAA,CAAAA,CAAAA;EAC5F;EAEA,MAAcuD,2BAAsEvC,QAAwC;AAC1H,WAAOrB,SAAQ,MAAMX,QAAQC,IAAI+B,OAAO2B,KAAKvD,IAAI,OAAOuD,SAAS,MAAM,KAAK/B,cAAiB+B,IAAAA,CAAAA,CAAAA,CAAAA;EAC/F;EAEA,MAAca,4BAAuExC,QAAyC;AAC5H,WAAOrB,UAAS,MAAMX,QAAQC,IAAI+B,OAAOkC,MAAM9D,IAAI,OAAO8D,UAAU,MAAM,KAAKH,eAAkBG,KAAAA,CAAAA,CAAAA,GAAUO,KAAI,CAAA;EACjH;AACF;AAjNqFvF;AAA9E,IAAMD,uBAAN;","names":["handleError","compact","AddressSchema","isArchivistModule","ArchivistWrapper","isDivinerModule","DivinerWrapper","CompositeModuleResolver","ModuleWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","isWitnessModule","WitnessWrapper","assertEx","compact","AddressSchema","ModuleManifestPayloadSchema","BaseEmitter","CompositeModuleResolver","ProxyModuleConfigSchema","ProxyModule","BaseEmitter","upResolver","_busyCount","constructor","proxyParams","config","bridge","targetConfig","address","CompositeModuleResolver","downResolver","assertEx","targetDownResolver","id","name","queries","targetQueries","addressPreviousHash","Error","busy","closure","args","module","emit","describe","description","discover","children","compact","map","payload","schema","AddressSchema","undefined","targetDiscover","manifest","_depth","ModuleManifestPayloadSchema","moduleAddress","previousHash","query","payloads","result","targetQuery","queryable","queryConfig","targetQueryable","resolve","nameOrAddressOrFilter","options","targetResolve","state","BridgeModuleResolver","CompositeModuleResolver","primed","remoteAddresses","resolvedModules","constructor","bridge","wrapperAccount","options","undefined","add","_module","Error","currentResolvedModules","result","Promise","all","Object","entries","map","key","value","getRemoteAddresses","discover","targetDiscover","maxDepth","compact","payload","schema","AddressSchema","schemaPayload","address","prime","resolveRemoteModules","remove","_address","reset","resolve","nameOrAddressOrFilter","unfiltered","mutatedOptions","defaultMaxDepth","resolveByAddress","resolveByName","identity","Array","isArray","filter","module","targetAddress","includes","cached","mod","ProxyModule","config","ProxyModuleConfigSchema","isArchivistModule","ArchivistWrapper","wrap","isDivinerModule","DivinerWrapper","isWitnessModule","WitnessWrapper","isNodeModule","NodeWrapper","isSentinelModule","SentinelWrapper","console","warn","ModuleWrapper","ex","handleError","error","message","name","modules","values","pop","resolveByQuery","queries","found","query","find","q","length","resolveRemoteModulesByAddress","resolveRemoteModulesByName","resolveRemoteModulesByQuery","flat"]}
|
package/package.json
CHANGED
|
@@ -10,34 +10,35 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^
|
|
14
|
-
"@xylabs/error": "^
|
|
15
|
-
"@xylabs/
|
|
16
|
-
"@xylabs/
|
|
17
|
-
"@
|
|
18
|
-
"@xyo-network/
|
|
19
|
-
"@xyo-network/
|
|
20
|
-
"@xyo-network/archivist-
|
|
21
|
-
"@xyo-network/
|
|
22
|
-
"@xyo-network/
|
|
23
|
-
"@xyo-network/
|
|
24
|
-
"@xyo-network/diviner-
|
|
25
|
-
"@xyo-network/
|
|
26
|
-
"@xyo-network/
|
|
27
|
-
"@xyo-network/module-
|
|
28
|
-
"@xyo-network/module-
|
|
29
|
-
"@xyo-network/module-
|
|
30
|
-
"@xyo-network/
|
|
31
|
-
"@xyo-network/node-
|
|
32
|
-
"@xyo-network/
|
|
33
|
-
"@xyo-network/
|
|
34
|
-
"@xyo-network/sentinel-
|
|
35
|
-
"@xyo-network/
|
|
36
|
-
"@xyo-network/witness-
|
|
13
|
+
"@xylabs/assert": "^3.0.2",
|
|
14
|
+
"@xylabs/error": "^3.0.2",
|
|
15
|
+
"@xylabs/hex": "^3.0.2",
|
|
16
|
+
"@xylabs/lodash": "^3.0.2",
|
|
17
|
+
"@xylabs/promise": "^3.0.2",
|
|
18
|
+
"@xyo-network/account-model": "~2.91.1",
|
|
19
|
+
"@xyo-network/address-payload-plugin": "~2.91.1",
|
|
20
|
+
"@xyo-network/archivist-model": "~2.91.1",
|
|
21
|
+
"@xyo-network/archivist-wrapper": "~2.91.1",
|
|
22
|
+
"@xyo-network/boundwitness-model": "~2.91.1",
|
|
23
|
+
"@xyo-network/bridge-model": "~2.91.1",
|
|
24
|
+
"@xyo-network/diviner-model": "~2.91.1",
|
|
25
|
+
"@xyo-network/diviner-wrapper": "~2.91.1",
|
|
26
|
+
"@xyo-network/manifest-model": "~2.91.1",
|
|
27
|
+
"@xyo-network/module-abstract": "~2.91.1",
|
|
28
|
+
"@xyo-network/module-model": "~2.91.1",
|
|
29
|
+
"@xyo-network/module-resolver": "~2.91.1",
|
|
30
|
+
"@xyo-network/module-wrapper": "~2.91.1",
|
|
31
|
+
"@xyo-network/node-model": "~2.91.1",
|
|
32
|
+
"@xyo-network/node-wrapper": "~2.91.1",
|
|
33
|
+
"@xyo-network/payload-model": "~2.91.1",
|
|
34
|
+
"@xyo-network/sentinel-model": "~2.91.1",
|
|
35
|
+
"@xyo-network/sentinel-wrapper": "~2.91.1",
|
|
36
|
+
"@xyo-network/witness-model": "~2.91.1",
|
|
37
|
+
"@xyo-network/witness-wrapper": "~2.91.1"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
|
-
"@xylabs/ts-scripts-yarn3": "^3.
|
|
40
|
-
"@xylabs/tsconfig": "^3.
|
|
40
|
+
"@xylabs/ts-scripts-yarn3": "^3.4.1",
|
|
41
|
+
"@xylabs/tsconfig": "^3.4.1",
|
|
41
42
|
"typescript": "^5.3.3"
|
|
42
43
|
},
|
|
43
44
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -79,6 +80,6 @@
|
|
|
79
80
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
80
81
|
},
|
|
81
82
|
"sideEffects": false,
|
|
82
|
-
"version": "2.
|
|
83
|
+
"version": "2.91.1",
|
|
83
84
|
"type": "module"
|
|
84
85
|
}
|
package/src/ModuleResolver.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { handleError } from '@xylabs/error'
|
|
2
|
+
import { Address } from '@xylabs/hex'
|
|
2
3
|
import { compact } from '@xylabs/lodash'
|
|
3
4
|
import { AccountInstance } from '@xyo-network/account-model'
|
|
4
5
|
import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
|
|
@@ -12,6 +13,7 @@ import {
|
|
|
12
13
|
Module,
|
|
13
14
|
ModuleFilter,
|
|
14
15
|
ModuleFilterOptions,
|
|
16
|
+
ModuleIdentifier,
|
|
15
17
|
ModuleInstance,
|
|
16
18
|
ModuleResolverInstance,
|
|
17
19
|
NameModuleFilter,
|
|
@@ -30,8 +32,8 @@ import { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './Proxy
|
|
|
30
32
|
|
|
31
33
|
export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> extends CompositeModuleResolver implements ModuleResolverInstance {
|
|
32
34
|
private primed: Promise<boolean> | undefined = undefined
|
|
33
|
-
private remoteAddresses?: Promise<
|
|
34
|
-
private resolvedModules: Record<
|
|
35
|
+
private remoteAddresses?: Promise<Address[]>
|
|
36
|
+
private resolvedModules: Record<Address, Promise<ModuleInstance>> = {}
|
|
35
37
|
|
|
36
38
|
// TODO: Allow optional ctor param for supplying address for nested Nodes
|
|
37
39
|
// protected readonly address?: string,
|
|
@@ -89,7 +91,7 @@ export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> ext
|
|
|
89
91
|
return this.primed
|
|
90
92
|
}
|
|
91
93
|
|
|
92
|
-
override remove(_address:
|
|
94
|
+
override remove(_address: Address | Address[]): this {
|
|
93
95
|
throw new Error('Method not implemented.')
|
|
94
96
|
}
|
|
95
97
|
|
|
@@ -100,9 +102,12 @@ export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> ext
|
|
|
100
102
|
}
|
|
101
103
|
|
|
102
104
|
override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
|
|
103
|
-
override async resolve<T extends ModuleInstance = ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<T>): Promise<T | undefined>
|
|
104
105
|
override async resolve<T extends ModuleInstance = ModuleInstance>(
|
|
105
|
-
|
|
106
|
+
nameOrAddress: ModuleIdentifier,
|
|
107
|
+
options?: ModuleFilterOptions<T>,
|
|
108
|
+
): Promise<T | undefined>
|
|
109
|
+
override async resolve<T extends ModuleInstance = ModuleInstance>(
|
|
110
|
+
nameOrAddressOrFilter?: ModuleFilter<T> | ModuleIdentifier,
|
|
106
111
|
options?: ModuleFilterOptions<T>,
|
|
107
112
|
): Promise<T | T[] | undefined> {
|
|
108
113
|
const unfiltered = await (async () => {
|
|
@@ -113,7 +118,8 @@ export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> ext
|
|
|
113
118
|
if (mutatedOptions.maxDepth < 0) {
|
|
114
119
|
return
|
|
115
120
|
}
|
|
116
|
-
const result: T | undefined =
|
|
121
|
+
const result: T | undefined =
|
|
122
|
+
(await this.resolveByAddress<T>(nameOrAddressOrFilter as Address)) ?? (await this.resolveByName<T>(nameOrAddressOrFilter))
|
|
117
123
|
return result
|
|
118
124
|
} else {
|
|
119
125
|
if (mutatedOptions.maxDepth < 0) {
|
|
@@ -126,13 +132,17 @@ export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> ext
|
|
|
126
132
|
|
|
127
133
|
const identity = options?.identity
|
|
128
134
|
if (identity) {
|
|
129
|
-
return
|
|
135
|
+
return (
|
|
136
|
+
Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module))
|
|
137
|
+
: identity(unfiltered) ? unfiltered
|
|
138
|
+
: undefined
|
|
139
|
+
)
|
|
130
140
|
} else {
|
|
131
141
|
return unfiltered
|
|
132
142
|
}
|
|
133
143
|
}
|
|
134
144
|
|
|
135
|
-
private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress:
|
|
145
|
+
private async resolveByAddress<T extends ModuleInstance = ModuleInstance>(targetAddress: Address): Promise<T | undefined> {
|
|
136
146
|
const remoteAddresses = await this.getRemoteAddresses()
|
|
137
147
|
|
|
138
148
|
//check if it is even there
|
|
@@ -146,7 +156,7 @@ export class BridgeModuleResolver<T extends ModuleInstance = ModuleInstance> ext
|
|
|
146
156
|
|
|
147
157
|
this.resolvedModules[targetAddress] =
|
|
148
158
|
this.resolvedModules[targetAddress] ??
|
|
149
|
-
(async (address:
|
|
159
|
+
(async (address: Address) => {
|
|
150
160
|
//discover it to set the config in the bridge
|
|
151
161
|
await this.bridge.targetDiscover(address)
|
|
152
162
|
|
package/src/ProxyModule.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
|
+
import { Address } from '@xylabs/hex'
|
|
2
3
|
import { compact } from '@xylabs/lodash'
|
|
3
4
|
import { Promisable } from '@xylabs/promise'
|
|
4
5
|
import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
|
|
@@ -29,7 +30,7 @@ export type TProxyModuleConfig = ModuleConfig<{ schema: ProxyModuleConfigSchema
|
|
|
29
30
|
export type ProxyModuleParams = ModuleParams<
|
|
30
31
|
TProxyModuleConfig,
|
|
31
32
|
{
|
|
32
|
-
address:
|
|
33
|
+
address: Address
|
|
33
34
|
bridge: BridgeModule
|
|
34
35
|
}
|
|
35
36
|
>
|
|
@@ -44,7 +45,7 @@ export class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> impl
|
|
|
44
45
|
}
|
|
45
46
|
|
|
46
47
|
get address() {
|
|
47
|
-
return this.proxyParams.address
|
|
48
|
+
return this.proxyParams.address
|
|
48
49
|
}
|
|
49
50
|
|
|
50
51
|
get bridge() {
|
|
@@ -152,9 +153,13 @@ export class ProxyModule extends BaseEmitter<ModuleParams, ModuleEventData> impl
|
|
|
152
153
|
options?: ModuleFilterOptions,
|
|
153
154
|
): Promise<ModuleInstance | ModuleInstance[] | undefined> {
|
|
154
155
|
return await this.busy(async () => {
|
|
155
|
-
return await (typeof nameOrAddressOrFilter === 'string'
|
|
156
|
-
|
|
157
|
-
|
|
156
|
+
return await (typeof nameOrAddressOrFilter === 'string' ?
|
|
157
|
+
this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)
|
|
158
|
+
: this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options))
|
|
158
159
|
})
|
|
159
160
|
}
|
|
161
|
+
|
|
162
|
+
state() {
|
|
163
|
+
return []
|
|
164
|
+
}
|
|
160
165
|
}
|