@xyo-network/bridge-module-resolver 2.66.3 → 2.66.5
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/cjs/ModuleResolver.js +3 -3
- package/dist/cjs/ModuleResolver.js.map +1 -1
- package/dist/cjs/ProxyModule.js.map +1 -1
- package/dist/docs.json +878 -1218
- package/dist/esm/ModuleResolver.js +3 -3
- package/dist/esm/ModuleResolver.js.map +1 -1
- package/dist/esm/ProxyModule.js.map +1 -1
- package/dist/types/ModuleResolver.d.ts +3 -3
- package/dist/types/ModuleResolver.d.ts.map +1 -1
- package/dist/types/ProxyModule.d.ts +4 -4
- package/dist/types/ProxyModule.d.ts.map +1 -1
- package/package.json +20 -20
- package/src/ModuleResolver.ts +25 -35
- package/src/ProxyModule.ts +5 -9
|
@@ -74,7 +74,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
74
74
|
}
|
|
75
75
|
const cached = this.resolvedModules[targetAddress];
|
|
76
76
|
if (cached)
|
|
77
|
-
return
|
|
77
|
+
return await cached;
|
|
78
78
|
this.resolvedModules[targetAddress] =
|
|
79
79
|
this.resolvedModules[targetAddress] ??
|
|
80
80
|
(async (address) => {
|
|
@@ -97,7 +97,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
97
97
|
if (isSentinelModule(mod)) {
|
|
98
98
|
return SentinelWrapper.wrap(mod, this.wrapperAccount);
|
|
99
99
|
}
|
|
100
|
-
console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}
|
|
100
|
+
console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`);
|
|
101
101
|
return ModuleWrapper.wrap(mod, this.wrapperAccount);
|
|
102
102
|
}
|
|
103
103
|
catch (ex) {
|
|
@@ -106,7 +106,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
})(targetAddress);
|
|
109
|
-
return
|
|
109
|
+
return await this.resolvedModules[targetAddress];
|
|
110
110
|
}
|
|
111
111
|
async resolveByName(name) {
|
|
112
112
|
return Object.values(await this.currentResolvedModules()).filter((module) => module.config.name === name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleResolver.js","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AAEzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"ModuleResolver.js","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AAEzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAqB,MAAM,eAAe,CAAA;AAEvF,MAAM,OAAO,oBAAqB,SAAQ,uBAAuB;IAMhC;IAAgC;IALvD,eAAe,CAAoB;IACnC,eAAe,GAAoC,EAAE,CAAA;IAE7D,yEAAyE;IACzE,uCAAuC;IACvC,YAA+B,MAAoB,EAAY,cAA+B;QAC5F,KAAK,EAAE,CAAA;QADsB,WAAM,GAAN,MAAM,CAAc;QAAY,mBAAc,GAAd,cAAc,CAAiB;IAE9F,CAAC;IAED,IAAa,gBAAgB;QAC3B,OAAO,IAAI,CAAA;IACb,CAAC;IAIQ,GAAG,CAAC,OAA0B;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,MAAM,GAAsB,EAAE,CAAA;QACpC,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9D,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,CAAM,CAAA;QAClC,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,eAAe;YAClB,IAAI,CAAC,eAAe;gBACpB,CAAC,KAAK,IAAI,EAAE;oBACV,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;oBACnD,OAAO,OAAO,CACZ,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;wBACxB,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE;4BACpC,MAAM,aAAa,GAAG,OAAyB,CAAA;4BAC/C,OAAO,aAAa,CAAC,OAAO,CAAA;yBAC7B;6BAAM;4BACL,OAAO,IAAI,CAAA;yBACZ;oBACH,CAAC,CAAC,CACH,CAAA;gBACH,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,MAAM,IAAI,CAAC,eAAe,CAAA;IACnC,CAAC;IAEQ,MAAM,CAAC,QAA2B;QACzC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAIQ,KAAK,CAAC,OAAO,CAAC,qBAA6C;QAClE,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,OAAO,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAA;SACjH;aAAM;YACL,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;SAC9D;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,aAAqB;QAClD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAEvD,2BAA2B;QAC3B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,aAAa,CAAC,EAAE;YACjE,iDAAiD;YACjD,OAAO,SAAS,CAAA;SACjB;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;QAClD,IAAI,MAAM;YAAE,OAAO,MAAM,MAAM,CAAA;QAE/B,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;YACjC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;gBACnC,CAAC,KAAK,EAAE,OAAe,EAAE,EAAE;oBACzB,MAAM,GAAG,GAAW,IAAI,WAAW,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE,EAAuB,CAAC,CAAA;oBAEvI,IAAI;wBACF,6CAA6C;wBAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;wBAEzC,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;4BAC1B,OAAO,wBAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;yBAC/D;wBAED,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;4BACxB,OAAO,sBAAsB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;yBAC7D;wBAED,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;4BACxB,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;yBACrD;wBAED,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;4BACrB,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;yBAClD;wBAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE;4BACzB,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;yBACtD;wBACD,OAAO,CAAC,IAAI,CAAC,+CAA+C,aAAa,GAAG,CAAC,CAAA;wBAC7E,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;qBACpD;oBAAC,OAAO,EAAE,EAAE;wBACX,WAAW,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;4BACxB,OAAO,CAAC,KAAK,CAAC,0CAA0C,KAAK,CAAC,OAAO,KAAK,aAAa,GAAG,CAAC,CAAA;wBAC7F,CAAC,CAAC,CAAA;qBACH;gBACH,CAAC,CAAC,CAAC,aAAa,CAAC,CAAA;QAEnB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;IAClD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAAY;QACtC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IAC3G,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAiB;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1E,kCAAkC;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAA;YAEhF,wCAAwC;YACxC,OAAO,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAA;QACxC,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,MAAqB;QACtD,IAAK,MAA8B,EAAE,OAAO,EAAE;YAC5C,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAA6B,CAAC,CAAA;SAC/E;QAED,IAAK,MAA2B,EAAE,IAAI,EAAE;YACtC,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAA0B,CAAC,CAAA;SACzE;QAED,IAAK,MAA4B,EAAE,KAAK,EAAE;YACxC,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAA2B,CAAC,CAAA;SAC3E;QAED,iBAAiB;QACjB,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;IAC/F,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,MAA2B;QACrE,OAAO,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACpG,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,MAAwB;QAC/D,OAAO,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7G,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,MAAyB;QACjE,OAAO,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IACjH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAInF,OAAO,EAEL,WAAW,EACX,uBAAuB,
|
|
1
|
+
{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AccountInstance } from '@xyo-network/account-model';
|
|
2
2
|
import { BridgeModule } from '@xyo-network/bridge-model';
|
|
3
3
|
import { CompositeModuleResolver } from '@xyo-network/module';
|
|
4
|
-
import {
|
|
4
|
+
import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model';
|
|
5
5
|
export declare class BridgeModuleResolver extends CompositeModuleResolver implements ModuleResolver {
|
|
6
6
|
protected readonly bridge: BridgeModule;
|
|
7
7
|
protected wrapperAccount: AccountInstance;
|
|
@@ -14,8 +14,8 @@ export declare class BridgeModuleResolver extends CompositeModuleResolver implem
|
|
|
14
14
|
currentResolvedModules<T extends Module = Module>(): Promise<Record<string, T>>;
|
|
15
15
|
getRemoteAddresses(): Promise<string[]>;
|
|
16
16
|
remove(_address: string | string[]): this;
|
|
17
|
-
resolve
|
|
18
|
-
resolve
|
|
17
|
+
resolve(filter?: ModuleFilter): Promise<Module[]>;
|
|
18
|
+
resolve(nameOrAddress: string): Promise<Module | undefined>;
|
|
19
19
|
private resolveByAddress;
|
|
20
20
|
private resolveByName;
|
|
21
21
|
private resolveByQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleResolver.d.ts","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAI5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAIxD,OAAO,EAAE,uBAAuB,EAAiB,MAAM,qBAAqB,CAAA;AAC5E,OAAO,
|
|
1
|
+
{"version":3,"file":"ModuleResolver.d.ts","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAI5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAIxD,OAAO,EAAE,uBAAuB,EAAiB,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAuB,MAAM,EAAE,YAAY,EAAE,cAAc,EAAuC,MAAM,2BAA2B,CAAA;AAU1I,qBAAa,oBAAqB,SAAQ,uBAAwB,YAAW,cAAc;IAM7E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAAE,SAAS,CAAC,cAAc,EAAE,eAAe;IAL9F,OAAO,CAAC,eAAe,CAAC,CAAmB;IAC3C,OAAO,CAAC,eAAe,CAAsC;gBAI9B,MAAM,EAAE,YAAY,EAAY,cAAc,EAAE,eAAe;IAI9F,IAAa,gBAAgB,IAAI,OAAO,CAEvC;IAEQ,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAK9B,sBAAsB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAW/E,kBAAkB;IAmBf,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAInC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACjD,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAS5D,gBAAgB;YAoDhB,aAAa;YAIb,cAAc;YAUd,oBAAoB;YAiBpB,6BAA6B;YAI7B,0BAA0B;YAI1B,2BAA2B;CAG1C"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
|
|
2
2
|
import { BridgeModule } from '@xyo-network/bridge-model';
|
|
3
3
|
import { ModuleManifest } from '@xyo-network/manifest-model';
|
|
4
|
-
import { AddressPreviousHashPayload, BaseEmitter, CompositeModuleResolver,
|
|
4
|
+
import { AddressPreviousHashPayload, BaseEmitter, CompositeModuleResolver, Module, ModuleConfig, ModuleDescription, ModuleEventData, ModuleFilter, ModuleFilterOptions, ModuleParams, ModuleQueryResult } from '@xyo-network/module';
|
|
5
5
|
import { Payload } from '@xyo-network/payload-model';
|
|
6
6
|
import { Promisable } from '@xyo-network/promise';
|
|
7
7
|
export type ProxyModuleConfigSchema = 'network.xyo.module.proxy.config';
|
|
@@ -52,7 +52,7 @@ export declare class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEv
|
|
|
52
52
|
schema: string;
|
|
53
53
|
}, "schema"> & {
|
|
54
54
|
schema: string;
|
|
55
|
-
}>, ModuleEventData
|
|
55
|
+
}>, ModuleEventData>;
|
|
56
56
|
get config(): ModuleConfig;
|
|
57
57
|
get downResolver(): import("@xyo-network/module").ModuleResolver;
|
|
58
58
|
get queries(): string[];
|
|
@@ -63,7 +63,7 @@ export declare class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEv
|
|
|
63
63
|
previousHash(): Promise<string | undefined>;
|
|
64
64
|
query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult>;
|
|
65
65
|
queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean>;
|
|
66
|
-
resolve
|
|
67
|
-
resolve
|
|
66
|
+
resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>;
|
|
67
|
+
resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>;
|
|
68
68
|
}
|
|
69
69
|
//# sourceMappingURL=ProxyModule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyModule.d.ts","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EACL,0BAA0B,EAC1B,WAAW,EACX,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"ProxyModule.d.ts","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EACL,0BAA0B,EAC1B,WAAW,EACX,uBAAuB,EACvB,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EAClB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,MAAM,MAAM,uBAAuB,GAAG,iCAAiC,CAAA;AACvE,eAAO,MAAM,uBAAuB,EAAE,uBAA2D,CAAA;AAEjG,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC;IAAE,MAAM,EAAE,uBAAuB,CAAA;CAAE,CAAC,CAAA;AAElF,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAC1C,kBAAkB,EAClB;IACE,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,YAAY,CAAA;CACrB,CACF,CAAA;AAED,qBAAa,WAAY,SAAQ,WAAW,CAAC,iBAAiB,EAAE,eAAe,CAAE,YAAW,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC;IAC/H,QAAQ,CAAC,UAAU,0BAAgC;gBAEvC,MAAM,EAAE,iBAAiB;IAIrC,IAAI,OAAO,WAEV;IAED,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAET;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,YAAY,iDAEf;IAED,IAAI,OAAO,aAEV;IAED,mBAAmB,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAIpD,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAqB5C,QAAQ,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAIjC,QAAQ,IAAI,UAAU,CAAC,cAAc,CAAC;IAKtC,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIrC,KAAK,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAMlH,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7G,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChF,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAQ3F"}
|
package/package.json
CHANGED
|
@@ -11,25 +11,25 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
|
-
"@xyo-network/account-model": "
|
|
15
|
-
"@xyo-network/address-payload-plugin": "
|
|
16
|
-
"@xyo-network/archivist-model": "
|
|
17
|
-
"@xyo-network/archivist-wrapper": "
|
|
18
|
-
"@xyo-network/boundwitness-builder": "
|
|
19
|
-
"@xyo-network/bridge-model": "
|
|
20
|
-
"@xyo-network/diviner": "
|
|
21
|
-
"@xyo-network/diviner-model": "
|
|
22
|
-
"@xyo-network/error": "
|
|
23
|
-
"@xyo-network/manifest-model": "
|
|
24
|
-
"@xyo-network/module": "
|
|
25
|
-
"@xyo-network/module-model": "
|
|
26
|
-
"@xyo-network/node-model": "
|
|
27
|
-
"@xyo-network/node-wrapper": "
|
|
28
|
-
"@xyo-network/payload-model": "
|
|
29
|
-
"@xyo-network/promise": "
|
|
30
|
-
"@xyo-network/sentinel": "
|
|
31
|
-
"@xyo-network/witness-model": "
|
|
32
|
-
"@xyo-network/witness-wrapper": "
|
|
14
|
+
"@xyo-network/account-model": "~2.66.5",
|
|
15
|
+
"@xyo-network/address-payload-plugin": "~2.66.5",
|
|
16
|
+
"@xyo-network/archivist-model": "~2.66.5",
|
|
17
|
+
"@xyo-network/archivist-wrapper": "~2.66.5",
|
|
18
|
+
"@xyo-network/boundwitness-builder": "~2.66.5",
|
|
19
|
+
"@xyo-network/bridge-model": "~2.66.5",
|
|
20
|
+
"@xyo-network/diviner": "~2.66.5",
|
|
21
|
+
"@xyo-network/diviner-model": "~2.66.5",
|
|
22
|
+
"@xyo-network/error": "~2.66.5",
|
|
23
|
+
"@xyo-network/manifest-model": "~2.66.5",
|
|
24
|
+
"@xyo-network/module": "~2.66.5",
|
|
25
|
+
"@xyo-network/module-model": "~2.66.5",
|
|
26
|
+
"@xyo-network/node-model": "~2.66.5",
|
|
27
|
+
"@xyo-network/node-wrapper": "~2.66.5",
|
|
28
|
+
"@xyo-network/payload-model": "~2.66.5",
|
|
29
|
+
"@xyo-network/promise": "~2.66.5",
|
|
30
|
+
"@xyo-network/sentinel": "~2.66.5",
|
|
31
|
+
"@xyo-network/witness-model": "~2.66.5",
|
|
32
|
+
"@xyo-network/witness-wrapper": "~2.66.5",
|
|
33
33
|
"lodash": "^4.17.21"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
},
|
|
71
71
|
"sideEffects": false,
|
|
72
72
|
"types": "dist/types/index.d.ts",
|
|
73
|
-
"version": "2.66.
|
|
73
|
+
"version": "2.66.5"
|
|
74
74
|
}
|
package/src/ModuleResolver.ts
CHANGED
|
@@ -7,15 +7,7 @@ import { IndirectDivinerWrapper } from '@xyo-network/diviner'
|
|
|
7
7
|
import { isDivinerModule } from '@xyo-network/diviner-model'
|
|
8
8
|
import { handleError } from '@xyo-network/error'
|
|
9
9
|
import { CompositeModuleResolver, ModuleWrapper } from '@xyo-network/module'
|
|
10
|
-
import {
|
|
11
|
-
AddressModuleFilter,
|
|
12
|
-
IndirectModule,
|
|
13
|
-
Module,
|
|
14
|
-
ModuleFilter,
|
|
15
|
-
ModuleResolver,
|
|
16
|
-
NameModuleFilter,
|
|
17
|
-
QueryModuleFilter,
|
|
18
|
-
} from '@xyo-network/module-model'
|
|
10
|
+
import { AddressModuleFilter, Module, ModuleFilter, ModuleResolver, NameModuleFilter, QueryModuleFilter } from '@xyo-network/module-model'
|
|
19
11
|
import { isNodeModule } from '@xyo-network/node-model'
|
|
20
12
|
import { NodeWrapper } from '@xyo-network/node-wrapper'
|
|
21
13
|
import { isSentinelModule, SentinelWrapper } from '@xyo-network/sentinel'
|
|
@@ -79,19 +71,17 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
79
71
|
throw new Error('Method not implemented.')
|
|
80
72
|
}
|
|
81
73
|
|
|
82
|
-
override async resolve
|
|
83
|
-
override async resolve
|
|
84
|
-
override async resolve<
|
|
85
|
-
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
86
|
-
): Promise<TModule | TModule[] | undefined> {
|
|
74
|
+
override async resolve(filter?: ModuleFilter): Promise<Module[]>
|
|
75
|
+
override async resolve(nameOrAddress: string): Promise<Module | undefined>
|
|
76
|
+
override async resolve(nameOrAddressOrFilter?: ModuleFilter | string): Promise<Module | Module[] | undefined> {
|
|
87
77
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
88
|
-
return (await this.resolveByAddress
|
|
78
|
+
return (await this.resolveByAddress(nameOrAddressOrFilter)) ?? (await this.resolveByName(nameOrAddressOrFilter))
|
|
89
79
|
} else {
|
|
90
|
-
return await this.resolveRemoteModules
|
|
80
|
+
return await this.resolveRemoteModules(nameOrAddressOrFilter)
|
|
91
81
|
}
|
|
92
82
|
}
|
|
93
83
|
|
|
94
|
-
private async resolveByAddress
|
|
84
|
+
private async resolveByAddress(targetAddress: string): Promise<Module | undefined> {
|
|
95
85
|
const remoteAddresses = await this.getRemoteAddresses()
|
|
96
86
|
|
|
97
87
|
//check if it is even there
|
|
@@ -101,7 +91,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
101
91
|
}
|
|
102
92
|
|
|
103
93
|
const cached = this.resolvedModules[targetAddress]
|
|
104
|
-
if (cached) return
|
|
94
|
+
if (cached) return await cached
|
|
105
95
|
|
|
106
96
|
this.resolvedModules[targetAddress] =
|
|
107
97
|
this.resolvedModules[targetAddress] ??
|
|
@@ -131,7 +121,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
131
121
|
if (isSentinelModule(mod)) {
|
|
132
122
|
return SentinelWrapper.wrap(mod, this.wrapperAccount)
|
|
133
123
|
}
|
|
134
|
-
console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}
|
|
124
|
+
console.warn(`BridgeModuleResolver: Unknown Module Type: [${targetAddress}]`)
|
|
135
125
|
return ModuleWrapper.wrap(mod, this.wrapperAccount)
|
|
136
126
|
} catch (ex) {
|
|
137
127
|
handleError(ex, (error) => {
|
|
@@ -140,15 +130,15 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
140
130
|
}
|
|
141
131
|
})(targetAddress)
|
|
142
132
|
|
|
143
|
-
return
|
|
133
|
+
return await this.resolvedModules[targetAddress]
|
|
144
134
|
}
|
|
145
135
|
|
|
146
|
-
private async resolveByName
|
|
147
|
-
return Object.values(await this.currentResolvedModules
|
|
136
|
+
private async resolveByName(name: string): Promise<Module[]> {
|
|
137
|
+
return Object.values(await this.currentResolvedModules()).filter((module) => module.config.name === name)
|
|
148
138
|
}
|
|
149
139
|
|
|
150
|
-
private async resolveByQuery
|
|
151
|
-
return Object.values(await this.currentResolvedModules
|
|
140
|
+
private async resolveByQuery(queries: string[]): Promise<Module[]> {
|
|
141
|
+
return Object.values(await this.currentResolvedModules()).filter((module) => {
|
|
152
142
|
//filter out the requested queries
|
|
153
143
|
const found = module.queries.filter((query) => queries.find((q) => q === query))
|
|
154
144
|
|
|
@@ -157,32 +147,32 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
157
147
|
})
|
|
158
148
|
}
|
|
159
149
|
|
|
160
|
-
private async resolveRemoteModules
|
|
150
|
+
private async resolveRemoteModules(filter?: ModuleFilter): Promise<Module[]> {
|
|
161
151
|
if ((filter as AddressModuleFilter)?.address) {
|
|
162
|
-
return await this.resolveRemoteModulesByAddress
|
|
152
|
+
return await this.resolveRemoteModulesByAddress(filter as AddressModuleFilter)
|
|
163
153
|
}
|
|
164
154
|
|
|
165
155
|
if ((filter as NameModuleFilter)?.name) {
|
|
166
|
-
return await this.resolveRemoteModulesByName
|
|
156
|
+
return await this.resolveRemoteModulesByName(filter as NameModuleFilter)
|
|
167
157
|
}
|
|
168
158
|
|
|
169
159
|
if ((filter as QueryModuleFilter)?.query) {
|
|
170
|
-
return await this.resolveRemoteModulesByQuery
|
|
160
|
+
return await this.resolveRemoteModulesByQuery(filter as QueryModuleFilter)
|
|
171
161
|
}
|
|
172
162
|
|
|
173
163
|
//get all of them
|
|
174
|
-
return await this.resolveRemoteModulesByAddress
|
|
164
|
+
return await this.resolveRemoteModulesByAddress({ address: await this.getRemoteAddresses() })
|
|
175
165
|
}
|
|
176
166
|
|
|
177
|
-
private async resolveRemoteModulesByAddress
|
|
178
|
-
return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress
|
|
167
|
+
private async resolveRemoteModulesByAddress(filter: AddressModuleFilter): Promise<Module[]> {
|
|
168
|
+
return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress(address))))
|
|
179
169
|
}
|
|
180
170
|
|
|
181
|
-
private async resolveRemoteModulesByName
|
|
182
|
-
return compact((await Promise.all(filter.name.map(async (name) => await this.resolveByName
|
|
171
|
+
private async resolveRemoteModulesByName(filter: NameModuleFilter): Promise<Module[]> {
|
|
172
|
+
return compact((await Promise.all(filter.name.map(async (name) => await this.resolveByName(name)))).flat())
|
|
183
173
|
}
|
|
184
174
|
|
|
185
|
-
private async resolveRemoteModulesByQuery
|
|
186
|
-
return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery
|
|
175
|
+
private async resolveRemoteModulesByQuery(filter: QueryModuleFilter): Promise<Module[]> {
|
|
176
|
+
return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery(query)))).flat())
|
|
187
177
|
}
|
|
188
178
|
}
|
package/src/ProxyModule.ts
CHANGED
|
@@ -7,7 +7,6 @@ import {
|
|
|
7
7
|
AddressPreviousHashPayload,
|
|
8
8
|
BaseEmitter,
|
|
9
9
|
CompositeModuleResolver,
|
|
10
|
-
IndirectModule,
|
|
11
10
|
Module,
|
|
12
11
|
ModuleConfig,
|
|
13
12
|
ModuleDescription,
|
|
@@ -110,16 +109,13 @@ export class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData>
|
|
|
110
109
|
}
|
|
111
110
|
|
|
112
111
|
/* Resolves a filter from the perspective of the module, including through the parent/gateway module */
|
|
113
|
-
resolve
|
|
114
|
-
resolve
|
|
115
|
-
async resolve<
|
|
116
|
-
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
117
|
-
options?: ModuleFilterOptions,
|
|
118
|
-
): Promise<TModule | TModule[] | undefined> {
|
|
112
|
+
resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>
|
|
113
|
+
resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>
|
|
114
|
+
async resolve(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions): Promise<Module | Module[] | undefined> {
|
|
119
115
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
120
|
-
return await this.bridge.targetResolve
|
|
116
|
+
return await this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)
|
|
121
117
|
} else {
|
|
122
|
-
return await this.bridge.targetResolve
|
|
118
|
+
return await this.bridge.targetResolve(this.address, nameOrAddressOrFilter, options)
|
|
123
119
|
}
|
|
124
120
|
}
|
|
125
121
|
}
|