@xyo-network/bridge-module-resolver 2.66.8 → 2.67.0-rc.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/cjs/ModuleResolver.js +10 -6
- package/dist/cjs/ModuleResolver.js.map +1 -1
- package/dist/cjs/ProxyModule.js +5 -1
- package/dist/cjs/ProxyModule.js.map +1 -1
- package/dist/esm/ModuleResolver.js +12 -8
- package/dist/esm/ModuleResolver.js.map +1 -1
- package/dist/esm/ProxyModule.js +5 -1
- package/dist/esm/ProxyModule.js.map +1 -1
- package/dist/types/ModuleResolver.d.ts +4 -4
- package/dist/types/ModuleResolver.d.ts.map +1 -1
- package/dist/types/ProxyModule.d.ts +5 -4
- package/dist/types/ProxyModule.d.ts.map +1 -1
- package/package.json +23 -22
- package/src/ModuleResolver.ts +38 -22
- package/src/ProxyModule.ts +9 -4
- package/dist/docs.json +0 -11205
|
@@ -66,10 +66,12 @@ class BridgeModuleResolver extends module_1.CompositeModuleResolver {
|
|
|
66
66
|
var _a;
|
|
67
67
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
68
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
69
|
-
|
|
69
|
+
const result = (_a = (yield this.resolveByAddress(nameOrAddressOrFilter))) !== null && _a !== void 0 ? _a : (yield this.resolveByName(nameOrAddressOrFilter));
|
|
70
|
+
return result;
|
|
70
71
|
}
|
|
71
72
|
else {
|
|
72
|
-
|
|
73
|
+
const result = yield this.resolveRemoteModules(nameOrAddressOrFilter);
|
|
74
|
+
return result;
|
|
73
75
|
}
|
|
74
76
|
});
|
|
75
77
|
}
|
|
@@ -92,10 +94,10 @@ class BridgeModuleResolver extends module_1.CompositeModuleResolver {
|
|
|
92
94
|
//discover it to set the config in the bridge
|
|
93
95
|
yield this.bridge.targetDiscover(address);
|
|
94
96
|
if ((0, archivist_model_1.isArchivistModule)(mod)) {
|
|
95
|
-
return archivist_wrapper_1.
|
|
97
|
+
return archivist_wrapper_1.ArchivistWrapper.wrap(mod, this.wrapperAccount);
|
|
96
98
|
}
|
|
97
99
|
if ((0, diviner_model_1.isDivinerModule)(mod)) {
|
|
98
|
-
return diviner_1.
|
|
100
|
+
return diviner_1.DivinerWrapper.wrap(mod, this.wrapperAccount);
|
|
99
101
|
}
|
|
100
102
|
if ((0, witness_model_1.isWitnessModule)(mod)) {
|
|
101
103
|
return witness_wrapper_1.WitnessWrapper.wrap(mod, this.wrapperAccount);
|
|
@@ -120,7 +122,9 @@ class BridgeModuleResolver extends module_1.CompositeModuleResolver {
|
|
|
120
122
|
}
|
|
121
123
|
resolveByName(name) {
|
|
122
124
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
123
|
-
return Object.values(yield this.currentResolvedModules())
|
|
125
|
+
return Object.values(yield this.currentResolvedModules())
|
|
126
|
+
.filter((module) => module.config.name === name)
|
|
127
|
+
.pop();
|
|
124
128
|
});
|
|
125
129
|
}
|
|
126
130
|
resolveByQuery(queries) {
|
|
@@ -155,7 +159,7 @@ class BridgeModuleResolver extends module_1.CompositeModuleResolver {
|
|
|
155
159
|
}
|
|
156
160
|
resolveRemoteModulesByName(filter) {
|
|
157
161
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
158
|
-
return (0, compact_1.default)(
|
|
162
|
+
return (0, compact_1.default)(yield Promise.all(filter.name.map((name) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.resolveByName(name); }))));
|
|
159
163
|
});
|
|
160
164
|
}
|
|
161
165
|
resolveRemoteModulesByQuery(filter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleResolver.js","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":";;;;AACA,gFAAmF;AACnF,kEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"ModuleResolver.js","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/ProxyModule.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.ProxyModule = exports.ProxyModuleConfigSchema = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assert_1 = require("@xylabs/assert");
|
|
6
6
|
const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
|
|
7
|
+
const manifest_model_1 = require("@xyo-network/manifest-model");
|
|
7
8
|
const module_1 = require("@xyo-network/module");
|
|
8
9
|
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
9
10
|
exports.ProxyModuleConfigSchema = 'network.xyo.module.proxy.config';
|
|
@@ -54,7 +55,10 @@ class ProxyModule extends module_1.BaseEmitter {
|
|
|
54
55
|
manifest() {
|
|
55
56
|
var _a;
|
|
56
57
|
const name = (_a = this.config.name) !== null && _a !== void 0 ? _a : 'Anonymous';
|
|
57
|
-
return { config: Object.assign({ name }, this.config) };
|
|
58
|
+
return { config: Object.assign({ name }, this.config), schema: manifest_model_1.ManifestPayloadSchema };
|
|
59
|
+
}
|
|
60
|
+
moduleAddress() {
|
|
61
|
+
throw Error('Not Implemented');
|
|
58
62
|
}
|
|
59
63
|
previousHash() {
|
|
60
64
|
throw Error('Not Implemented');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,gFAAmF;
|
|
1
|
+
{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
2
2
|
import { isArchivistModule } from '@xyo-network/archivist-model';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
|
|
4
|
+
import { DivinerWrapper } from '@xyo-network/diviner';
|
|
5
5
|
import { isDivinerModule } from '@xyo-network/diviner-model';
|
|
6
6
|
import { handleError } from '@xyo-network/error';
|
|
7
7
|
import { CompositeModuleResolver, ModuleWrapper } from '@xyo-network/module';
|
|
@@ -59,10 +59,12 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
59
59
|
}
|
|
60
60
|
async resolve(nameOrAddressOrFilter) {
|
|
61
61
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
62
|
-
|
|
62
|
+
const result = (await this.resolveByAddress(nameOrAddressOrFilter)) ?? (await this.resolveByName(nameOrAddressOrFilter));
|
|
63
|
+
return result;
|
|
63
64
|
}
|
|
64
65
|
else {
|
|
65
|
-
|
|
66
|
+
const result = await this.resolveRemoteModules(nameOrAddressOrFilter);
|
|
67
|
+
return result;
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
70
|
async resolveByAddress(targetAddress) {
|
|
@@ -83,10 +85,10 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
83
85
|
//discover it to set the config in the bridge
|
|
84
86
|
await this.bridge.targetDiscover(address);
|
|
85
87
|
if (isArchivistModule(mod)) {
|
|
86
|
-
return
|
|
88
|
+
return ArchivistWrapper.wrap(mod, this.wrapperAccount);
|
|
87
89
|
}
|
|
88
90
|
if (isDivinerModule(mod)) {
|
|
89
|
-
return
|
|
91
|
+
return DivinerWrapper.wrap(mod, this.wrapperAccount);
|
|
90
92
|
}
|
|
91
93
|
if (isWitnessModule(mod)) {
|
|
92
94
|
return WitnessWrapper.wrap(mod, this.wrapperAccount);
|
|
@@ -109,7 +111,9 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
109
111
|
return await this.resolvedModules[targetAddress];
|
|
110
112
|
}
|
|
111
113
|
async resolveByName(name) {
|
|
112
|
-
return Object.values(await this.currentResolvedModules())
|
|
114
|
+
return Object.values(await this.currentResolvedModules())
|
|
115
|
+
.filter((module) => module.config.name === name)
|
|
116
|
+
.pop();
|
|
113
117
|
}
|
|
114
118
|
async resolveByQuery(queries) {
|
|
115
119
|
return Object.values(await this.currentResolvedModules()).filter((module) => {
|
|
@@ -136,7 +140,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
|
|
|
136
140
|
return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress(address))));
|
|
137
141
|
}
|
|
138
142
|
async resolveRemoteModulesByName(filter) {
|
|
139
|
-
return compact(
|
|
143
|
+
return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName(name))));
|
|
140
144
|
}
|
|
141
145
|
async resolveRemoteModulesByQuery(filter) {
|
|
142
146
|
return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery(query)))).flat());
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ModuleResolver.js","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/ProxyModule.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
3
|
+
import { ManifestPayloadSchema } from '@xyo-network/manifest-model';
|
|
3
4
|
import { BaseEmitter, CompositeModuleResolver, } from '@xyo-network/module';
|
|
4
5
|
import compact from 'lodash/compact';
|
|
5
6
|
export const ProxyModuleConfigSchema = 'network.xyo.module.proxy.config';
|
|
@@ -46,7 +47,10 @@ export class ProxyModule extends BaseEmitter {
|
|
|
46
47
|
}
|
|
47
48
|
manifest() {
|
|
48
49
|
const name = this.config.name ?? 'Anonymous';
|
|
49
|
-
return { config: { name, ...this.config } };
|
|
50
|
+
return { config: { name, ...this.config }, schema: ManifestPayloadSchema };
|
|
51
|
+
}
|
|
52
|
+
moduleAddress() {
|
|
53
|
+
throw Error('Not Implemented');
|
|
50
54
|
}
|
|
51
55
|
previousHash() {
|
|
52
56
|
throw Error('Not Implemented');
|
|
@@ -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;
|
|
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 { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model';
|
|
4
|
+
import { Module, ModuleFilter, ModuleInstance, 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;
|
|
@@ -11,11 +11,11 @@ export declare class BridgeModuleResolver extends CompositeModuleResolver implem
|
|
|
11
11
|
get isModuleResolver(): boolean;
|
|
12
12
|
add(module: Module): this;
|
|
13
13
|
add(module: Module[]): this;
|
|
14
|
-
currentResolvedModules<T extends
|
|
14
|
+
currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>>;
|
|
15
15
|
getRemoteAddresses(): Promise<string[]>;
|
|
16
16
|
remove(_address: string | string[]): this;
|
|
17
|
-
resolve(filter?: ModuleFilter): Promise<
|
|
18
|
-
resolve(nameOrAddress: string): Promise<
|
|
17
|
+
resolve(filter?: ModuleFilter): Promise<ModuleInstance[]>;
|
|
18
|
+
resolve(nameOrAddress: string): Promise<ModuleInstance | 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,EAEL,MAAM,EACN,YAAY,EACZ,cAAc,EACd,cAAc,EAGf,MAAM,2BAA2B,CAAA;AAUlC,qBAAa,oBAAqB,SAAQ,uBAAwB,YAAW,cAAc;IAOvF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IACvC,SAAS,CAAC,cAAc,EAAE,eAAe;IAP3C,OAAO,CAAC,eAAe,CAAC,CAAmB;IAC3C,OAAO,CAAC,eAAe,CAA8C;gBAKhD,MAAM,EAAE,YAAY,EAC7B,cAAc,EAAE,eAAe;IAK3C,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,cAAc,GAAG,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAW/F,kBAAkB;IAmBf,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAInC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IACzD,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;YAYpE,gBAAgB;YAoDhB,aAAa;YAMb,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
|
-
import {
|
|
4
|
-
import { AddressPreviousHashPayload, BaseEmitter, CompositeModuleResolver, Module, ModuleConfig, ModuleDescription, ModuleEventData, ModuleFilter, ModuleFilterOptions, ModuleParams, ModuleQueryResult } from '@xyo-network/module';
|
|
3
|
+
import { ModuleManifestPayload } from '@xyo-network/manifest-model';
|
|
4
|
+
import { AddressPreviousHashPayload, BaseEmitter, CompositeModuleResolver, Module, ModuleConfig, ModuleDescription, ModuleEventData, ModuleFilter, ModuleFilterOptions, ModuleInstance, 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';
|
|
@@ -13,7 +13,7 @@ export type ProxyModuleParams = ModuleParams<TProxyModuleConfig, {
|
|
|
13
13
|
address: string;
|
|
14
14
|
bridge: BridgeModule;
|
|
15
15
|
}>;
|
|
16
|
-
export declare class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData> implements
|
|
16
|
+
export declare class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {
|
|
17
17
|
readonly upResolver: CompositeModuleResolver;
|
|
18
18
|
constructor(params: ProxyModuleParams);
|
|
19
19
|
get address(): string;
|
|
@@ -59,7 +59,8 @@ export declare class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEv
|
|
|
59
59
|
addressPreviousHash(): Promise<AddressPreviousHashPayload>;
|
|
60
60
|
describe(): Promise<ModuleDescription>;
|
|
61
61
|
discover(): Promisable<Payload[]>;
|
|
62
|
-
manifest(): Promisable<
|
|
62
|
+
manifest(): Promisable<ModuleManifestPayload>;
|
|
63
|
+
moduleAddress(): Promise<AddressPreviousHashPayload[]>;
|
|
63
64
|
previousHash(): Promise<string | undefined>;
|
|
64
65
|
query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult>;
|
|
65
66
|
queryable(query: QueryBoundWitness, payloads?: Payload[], queryConfig?: ModuleConfig): Promise<boolean>;
|
|
@@ -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,
|
|
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,EAAyB,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAC1F,OAAO,EACL,0BAA0B,EAC1B,WAAW,EACX,uBAAuB,EACvB,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,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,cAAc,CAAC,YAAY,EAAE,eAAe,CAAC;IACvI,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,qBAAqB,CAAC;IAK7C,aAAa,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC;IAItD,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,30 +11,30 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
|
-
"@xyo-network/account-model": "~2.
|
|
15
|
-
"@xyo-network/address-payload-plugin": "~2.
|
|
16
|
-
"@xyo-network/archivist-model": "~2.
|
|
17
|
-
"@xyo-network/archivist-wrapper": "~2.
|
|
18
|
-
"@xyo-network/boundwitness-builder": "~2.
|
|
19
|
-
"@xyo-network/bridge-model": "~2.
|
|
20
|
-
"@xyo-network/diviner": "~2.
|
|
21
|
-
"@xyo-network/diviner-model": "~2.
|
|
22
|
-
"@xyo-network/error": "~2.
|
|
23
|
-
"@xyo-network/manifest-model": "~2.
|
|
24
|
-
"@xyo-network/module": "~2.
|
|
25
|
-
"@xyo-network/module-model": "~2.
|
|
26
|
-
"@xyo-network/node-model": "~2.
|
|
27
|
-
"@xyo-network/node-wrapper": "~2.
|
|
28
|
-
"@xyo-network/payload-model": "~2.
|
|
29
|
-
"@xyo-network/promise": "~2.
|
|
30
|
-
"@xyo-network/sentinel": "~2.
|
|
31
|
-
"@xyo-network/witness-model": "~2.
|
|
32
|
-
"@xyo-network/witness-wrapper": "~2.
|
|
14
|
+
"@xyo-network/account-model": "~2.67.0-rc.1",
|
|
15
|
+
"@xyo-network/address-payload-plugin": "~2.67.0-rc.1",
|
|
16
|
+
"@xyo-network/archivist-model": "~2.67.0-rc.1",
|
|
17
|
+
"@xyo-network/archivist-wrapper": "~2.67.0-rc.1",
|
|
18
|
+
"@xyo-network/boundwitness-builder": "~2.67.0-rc.1",
|
|
19
|
+
"@xyo-network/bridge-model": "~2.67.0-rc.1",
|
|
20
|
+
"@xyo-network/diviner": "~2.67.0-rc.1",
|
|
21
|
+
"@xyo-network/diviner-model": "~2.67.0-rc.1",
|
|
22
|
+
"@xyo-network/error": "~2.67.0-rc.1",
|
|
23
|
+
"@xyo-network/manifest-model": "~2.67.0-rc.1",
|
|
24
|
+
"@xyo-network/module": "~2.67.0-rc.1",
|
|
25
|
+
"@xyo-network/module-model": "~2.67.0-rc.1",
|
|
26
|
+
"@xyo-network/node-model": "~2.67.0-rc.1",
|
|
27
|
+
"@xyo-network/node-wrapper": "~2.67.0-rc.1",
|
|
28
|
+
"@xyo-network/payload-model": "~2.67.0-rc.1",
|
|
29
|
+
"@xyo-network/promise": "~2.67.0-rc.1",
|
|
30
|
+
"@xyo-network/sentinel": "~2.67.0-rc.1",
|
|
31
|
+
"@xyo-network/witness-model": "~2.67.0-rc.1",
|
|
32
|
+
"@xyo-network/witness-wrapper": "~2.67.0-rc.1",
|
|
33
33
|
"lodash": "^4.17.21"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@xylabs/ts-scripts-yarn3": "^2.
|
|
37
|
-
"@xylabs/tsconfig": "^2.
|
|
36
|
+
"@xylabs/ts-scripts-yarn3": "^2.19.0",
|
|
37
|
+
"@xylabs/tsconfig": "^2.19.0",
|
|
38
38
|
"typescript": "^5.1.6"
|
|
39
39
|
},
|
|
40
40
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -70,5 +70,6 @@
|
|
|
70
70
|
},
|
|
71
71
|
"sideEffects": false,
|
|
72
72
|
"types": "dist/types/index.d.ts",
|
|
73
|
-
"version": "2.
|
|
73
|
+
"version": "2.67.0-rc.1",
|
|
74
|
+
"stableVersion": "2.66.9"
|
|
74
75
|
}
|
package/src/ModuleResolver.ts
CHANGED
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import { AccountInstance } from '@xyo-network/account-model'
|
|
2
2
|
import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
|
|
3
3
|
import { isArchivistModule } from '@xyo-network/archivist-model'
|
|
4
|
-
import {
|
|
4
|
+
import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
|
|
5
5
|
import { BridgeModule } from '@xyo-network/bridge-model'
|
|
6
|
-
import {
|
|
6
|
+
import { DivinerWrapper } 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 {
|
|
10
|
+
import {
|
|
11
|
+
AddressModuleFilter,
|
|
12
|
+
Module,
|
|
13
|
+
ModuleFilter,
|
|
14
|
+
ModuleInstance,
|
|
15
|
+
ModuleResolver,
|
|
16
|
+
NameModuleFilter,
|
|
17
|
+
QueryModuleFilter,
|
|
18
|
+
} from '@xyo-network/module-model'
|
|
11
19
|
import { isNodeModule } from '@xyo-network/node-model'
|
|
12
20
|
import { NodeWrapper } from '@xyo-network/node-wrapper'
|
|
13
21
|
import { isSentinelModule, SentinelWrapper } from '@xyo-network/sentinel'
|
|
@@ -19,11 +27,14 @@ import { ProxyModule, ProxyModuleConfigSchema, ProxyModuleParams } from './Proxy
|
|
|
19
27
|
|
|
20
28
|
export class BridgeModuleResolver extends CompositeModuleResolver implements ModuleResolver {
|
|
21
29
|
private remoteAddresses?: Promise<string[]>
|
|
22
|
-
private resolvedModules: Record<string, Promise<
|
|
30
|
+
private resolvedModules: Record<string, Promise<ModuleInstance>> = {}
|
|
23
31
|
|
|
24
32
|
// TODO: Allow optional ctor param for supplying address for nested Nodes
|
|
25
33
|
// protected readonly address?: string,
|
|
26
|
-
constructor(
|
|
34
|
+
constructor(
|
|
35
|
+
protected readonly bridge: BridgeModule,
|
|
36
|
+
protected wrapperAccount: AccountInstance,
|
|
37
|
+
) {
|
|
27
38
|
super()
|
|
28
39
|
}
|
|
29
40
|
|
|
@@ -37,7 +48,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
37
48
|
throw new Error('Method not implemented.')
|
|
38
49
|
}
|
|
39
50
|
|
|
40
|
-
async currentResolvedModules<T extends
|
|
51
|
+
async currentResolvedModules<T extends ModuleInstance = ModuleInstance>(): Promise<Record<string, T>> {
|
|
41
52
|
const result: Record<string, T> = {}
|
|
42
53
|
await Promise.all(
|
|
43
54
|
Object.entries(this.resolvedModules).map(async ([key, value]) => {
|
|
@@ -71,17 +82,20 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
71
82
|
throw new Error('Method not implemented.')
|
|
72
83
|
}
|
|
73
84
|
|
|
74
|
-
override async resolve(filter?: ModuleFilter): Promise<
|
|
75
|
-
override async resolve(nameOrAddress: string): Promise<
|
|
76
|
-
override async resolve(nameOrAddressOrFilter?: ModuleFilter | string): Promise<
|
|
85
|
+
override async resolve(filter?: ModuleFilter): Promise<ModuleInstance[]>
|
|
86
|
+
override async resolve(nameOrAddress: string): Promise<ModuleInstance | undefined>
|
|
87
|
+
override async resolve(nameOrAddressOrFilter?: ModuleFilter | string): Promise<ModuleInstance | ModuleInstance[] | undefined> {
|
|
77
88
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
78
|
-
|
|
89
|
+
const result: ModuleInstance | undefined =
|
|
90
|
+
(await this.resolveByAddress(nameOrAddressOrFilter)) ?? (await this.resolveByName(nameOrAddressOrFilter))
|
|
91
|
+
return result
|
|
79
92
|
} else {
|
|
80
|
-
|
|
93
|
+
const result: ModuleInstance[] = await this.resolveRemoteModules(nameOrAddressOrFilter)
|
|
94
|
+
return result
|
|
81
95
|
}
|
|
82
96
|
}
|
|
83
97
|
|
|
84
|
-
private async resolveByAddress(targetAddress: string): Promise<
|
|
98
|
+
private async resolveByAddress(targetAddress: string): Promise<ModuleInstance | undefined> {
|
|
85
99
|
const remoteAddresses = await this.getRemoteAddresses()
|
|
86
100
|
|
|
87
101
|
//check if it is even there
|
|
@@ -103,11 +117,11 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
103
117
|
await this.bridge.targetDiscover(address)
|
|
104
118
|
|
|
105
119
|
if (isArchivistModule(mod)) {
|
|
106
|
-
return
|
|
120
|
+
return ArchivistWrapper.wrap(mod, this.wrapperAccount)
|
|
107
121
|
}
|
|
108
122
|
|
|
109
123
|
if (isDivinerModule(mod)) {
|
|
110
|
-
return
|
|
124
|
+
return DivinerWrapper.wrap(mod, this.wrapperAccount)
|
|
111
125
|
}
|
|
112
126
|
|
|
113
127
|
if (isWitnessModule(mod)) {
|
|
@@ -133,11 +147,13 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
133
147
|
return await this.resolvedModules[targetAddress]
|
|
134
148
|
}
|
|
135
149
|
|
|
136
|
-
private async resolveByName(name: string): Promise<
|
|
137
|
-
return Object.values(await this.currentResolvedModules())
|
|
150
|
+
private async resolveByName(name: string): Promise<ModuleInstance | undefined> {
|
|
151
|
+
return Object.values(await this.currentResolvedModules())
|
|
152
|
+
.filter((module) => module.config.name === name)
|
|
153
|
+
.pop()
|
|
138
154
|
}
|
|
139
155
|
|
|
140
|
-
private async resolveByQuery(queries: string[]): Promise<
|
|
156
|
+
private async resolveByQuery(queries: string[]): Promise<ModuleInstance[]> {
|
|
141
157
|
return Object.values(await this.currentResolvedModules()).filter((module) => {
|
|
142
158
|
//filter out the requested queries
|
|
143
159
|
const found = module.queries.filter((query) => queries.find((q) => q === query))
|
|
@@ -147,7 +163,7 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
147
163
|
})
|
|
148
164
|
}
|
|
149
165
|
|
|
150
|
-
private async resolveRemoteModules(filter?: ModuleFilter): Promise<
|
|
166
|
+
private async resolveRemoteModules(filter?: ModuleFilter): Promise<ModuleInstance[]> {
|
|
151
167
|
if ((filter as AddressModuleFilter)?.address) {
|
|
152
168
|
return await this.resolveRemoteModulesByAddress(filter as AddressModuleFilter)
|
|
153
169
|
}
|
|
@@ -164,15 +180,15 @@ export class BridgeModuleResolver extends CompositeModuleResolver implements Mod
|
|
|
164
180
|
return await this.resolveRemoteModulesByAddress({ address: await this.getRemoteAddresses() })
|
|
165
181
|
}
|
|
166
182
|
|
|
167
|
-
private async resolveRemoteModulesByAddress(filter: AddressModuleFilter): Promise<
|
|
183
|
+
private async resolveRemoteModulesByAddress(filter: AddressModuleFilter): Promise<ModuleInstance[]> {
|
|
168
184
|
return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress(address))))
|
|
169
185
|
}
|
|
170
186
|
|
|
171
|
-
private async resolveRemoteModulesByName(filter: NameModuleFilter): Promise<
|
|
172
|
-
return compact(
|
|
187
|
+
private async resolveRemoteModulesByName(filter: NameModuleFilter): Promise<ModuleInstance[]> {
|
|
188
|
+
return compact(await Promise.all(filter.name.map(async (name) => await this.resolveByName(name))))
|
|
173
189
|
}
|
|
174
190
|
|
|
175
|
-
private async resolveRemoteModulesByQuery(filter: QueryModuleFilter): Promise<
|
|
191
|
+
private async resolveRemoteModulesByQuery(filter: QueryModuleFilter): Promise<ModuleInstance[]> {
|
|
176
192
|
return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery(query)))).flat())
|
|
177
193
|
}
|
|
178
194
|
}
|
package/src/ProxyModule.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { assertEx } from '@xylabs/assert'
|
|
|
2
2
|
import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
|
|
3
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
|
|
4
4
|
import { BridgeModule } from '@xyo-network/bridge-model'
|
|
5
|
-
import {
|
|
5
|
+
import { ManifestPayloadSchema, ModuleManifestPayload } from '@xyo-network/manifest-model'
|
|
6
6
|
import {
|
|
7
7
|
AddressPreviousHashPayload,
|
|
8
8
|
BaseEmitter,
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
ModuleEventData,
|
|
14
14
|
ModuleFilter,
|
|
15
15
|
ModuleFilterOptions,
|
|
16
|
+
ModuleInstance,
|
|
16
17
|
ModuleParams,
|
|
17
18
|
ModuleQueryResult,
|
|
18
19
|
} from '@xyo-network/module'
|
|
@@ -33,7 +34,7 @@ export type ProxyModuleParams = ModuleParams<
|
|
|
33
34
|
}
|
|
34
35
|
>
|
|
35
36
|
|
|
36
|
-
export class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData> implements
|
|
37
|
+
export class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData> implements ModuleInstance<ModuleParams, ModuleEventData> {
|
|
37
38
|
readonly upResolver = new CompositeModuleResolver()
|
|
38
39
|
|
|
39
40
|
constructor(params: ProxyModuleParams) {
|
|
@@ -89,9 +90,13 @@ export class ProxyModule extends BaseEmitter<ProxyModuleParams, ModuleEventData>
|
|
|
89
90
|
return this.bridge.targetDiscover()
|
|
90
91
|
}
|
|
91
92
|
|
|
92
|
-
manifest(): Promisable<
|
|
93
|
+
manifest(): Promisable<ModuleManifestPayload> {
|
|
93
94
|
const name = this.config.name ?? 'Anonymous'
|
|
94
|
-
return { config: { name, ...this.config } }
|
|
95
|
+
return { config: { name, ...this.config }, schema: ManifestPayloadSchema }
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
moduleAddress(): Promise<AddressPreviousHashPayload[]> {
|
|
99
|
+
throw Error('Not Implemented')
|
|
95
100
|
}
|
|
96
101
|
|
|
97
102
|
previousHash(): Promise<string | undefined> {
|