@xyo-network/module-abstract 2.64.6 → 2.64.8

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.
@@ -1,11 +1,12 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
2
  import { exists } from '@xylabs/exists';
3
- import { HDWallet } from '@xyo-network/account';
3
+ import { Account, HDWallet } from '@xyo-network/account';
4
4
  import { AddressSchema } from '@xyo-network/address-payload-plugin';
5
5
  import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder';
6
6
  import { ConfigSchema } from '@xyo-network/config-payload-plugin';
7
7
  import { handleErrorAsync } from '@xyo-network/error';
8
- import { AddressPreviousHashSchema, ModuleAccountQuerySchema, ModuleDiscoverQuerySchema, ModuleSubscribeQuerySchema, } from '@xyo-network/module-model';
8
+ import { ModuleManifestPayloadSchema } from '@xyo-network/manifest-model';
9
+ import { AddressPreviousHashSchema, ModuleAddressQuerySchema, ModuleDiscoverQuerySchema, ModuleSubscribeQuerySchema, } from '@xyo-network/module-model';
9
10
  import { PayloadBuilder } from '@xyo-network/payload-builder';
10
11
  import { PromiseEx } from '@xyo-network/promise';
11
12
  import { QuerySchema } from '@xyo-network/query-payload-plugin';
@@ -25,12 +26,12 @@ export class AbstractModule extends BaseEmitter {
25
26
  upResolver = new CompositeModuleResolver();
26
27
  _account = undefined;
27
28
  _baseModuleQueryAccountPaths = {
28
- 'network.xyo.query.module.account': '1',
29
+ 'network.xyo.query.module.address': '1',
29
30
  'network.xyo.query.module.discover': '2',
30
31
  'network.xyo.query.module.subscribe': '3',
31
32
  };
32
33
  _queryAccounts = {
33
- 'network.xyo.query.module.account': undefined,
34
+ 'network.xyo.query.module.address': undefined,
34
35
  'network.xyo.query.module.discover': undefined,
35
36
  'network.xyo.query.module.subscribe': undefined,
36
37
  };
@@ -64,7 +65,7 @@ export class AbstractModule extends BaseEmitter {
64
65
  return !!this.params.ephemeralQueryAccountEnabled;
65
66
  }
66
67
  get queries() {
67
- return [ModuleDiscoverQuerySchema, ModuleAccountQuerySchema, ModuleSubscribeQuerySchema];
68
+ return [ModuleDiscoverQuerySchema, ModuleAddressQuerySchema, ModuleSubscribeQuerySchema];
68
69
  }
69
70
  get queryAccountPaths() {
70
71
  return { ...this._baseModuleQueryAccountPaths, ...this._queryAccountPaths };
@@ -90,6 +91,24 @@ export class AbstractModule extends BaseEmitter {
90
91
  static factory(params) {
91
92
  return ModuleFactory.withParams(this, params);
92
93
  }
94
+ addressPreviousHash() {
95
+ return { address: this.address, previousHash: this._account?.previousHash, schema: AddressPreviousHashSchema };
96
+ }
97
+ async describe() {
98
+ const description = {
99
+ address: this.address,
100
+ queries: this.queries,
101
+ };
102
+ if (this.config.name) {
103
+ description.name = this.config.name;
104
+ }
105
+ const discover = await this.discover();
106
+ description.children = compact(discover?.map((payload) => {
107
+ const address = payload.schema === AddressSchema ? payload.address : undefined;
108
+ return address != this.address ? address : undefined;
109
+ }) ?? []);
110
+ return description;
111
+ }
93
112
  discover() {
94
113
  const config = this.config;
95
114
  const address = new PayloadBuilder({ schema: AddressSchema }).fields({ address: this.address, name: this.config.name }).build();
@@ -120,9 +139,9 @@ export class AbstractModule extends BaseEmitter {
120
139
  }
121
140
  manifest() {
122
141
  const name = assertEx(this.config.name, 'Calling manifest on un-named module is not supported');
123
- return { config: { name, ...this.config } };
142
+ return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema };
124
143
  }
125
- moduleAccountQuery() {
144
+ moduleAddressQuery() {
126
145
  // Return array of all addresses and their previous hash
127
146
  const queryAccounts = Object.entries(this.queryAccounts)
128
147
  .filter((value) => {
@@ -145,6 +164,9 @@ export class AbstractModule extends BaseEmitter {
145
164
  : { address, schema: AddressPreviousHashSchema };
146
165
  return [moduleAccount, moduleAccountPreviousHash, ...queryAccounts].flat();
147
166
  }
167
+ previousHash() {
168
+ return this.account.previousHash;
169
+ }
148
170
  async query(query, payloads, queryConfig) {
149
171
  this.started('throw');
150
172
  const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig);
@@ -161,6 +183,20 @@ export class AbstractModule extends BaseEmitter {
161
183
  const validators = [this.supportedQueryValidator, configValidator];
162
184
  return validators.every((validator) => validator(query, payloads));
163
185
  }
186
+ async resolve(nameOrAddressOrFilter) {
187
+ switch (typeof nameOrAddressOrFilter) {
188
+ case 'string': {
189
+ const byAddress = Account.isAddress(nameOrAddressOrFilter)
190
+ ? (await this.resolve({ address: [nameOrAddressOrFilter] })).pop()
191
+ : undefined;
192
+ return byAddress ?? (await this.resolve({ name: [nameOrAddressOrFilter] })).pop();
193
+ }
194
+ default: {
195
+ const filter = nameOrAddressOrFilter;
196
+ return [...(await this.downResolver.resolve(filter)), ...(await this.upResolver.resolve(filter))].filter(duplicateModules);
197
+ }
198
+ }
199
+ }
164
200
  async start(_timeout) {
165
201
  this.validateConfig();
166
202
  await this.initializeQueryAccounts();
@@ -263,8 +299,8 @@ export class AbstractModule extends BaseEmitter {
263
299
  resultPayloads.push(...(await this.discover()));
264
300
  break;
265
301
  }
266
- case ModuleAccountQuerySchema: {
267
- resultPayloads.push(...(await this.moduleAccountQuery()));
302
+ case ModuleAddressQuerySchema: {
303
+ resultPayloads.push(...(await this.moduleAddressQuery()));
268
304
  break;
269
305
  }
270
306
  case ModuleSubscribeQuerySchema: {
@@ -288,9 +324,6 @@ export class AbstractModule extends BaseEmitter {
288
324
  return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads))[0];
289
325
  }
290
326
  readArchivist = () => this.getArchivist('read');
291
- async resolve(filter) {
292
- return [...(await this.upResolver.resolve(filter)), ...(await this.downResolver.resolve(filter))].filter(duplicateModules);
293
- }
294
327
  stop(_timeout) {
295
328
  this._started = false;
296
329
  return this;
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAEnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAiB,YAAY,EAAE,MAAM,oCAAoC,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAGL,yBAAyB,EAKzB,wBAAwB,EAExB,yBAAyB,EASzB,0BAA0B,GAK3B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,OAAO,EAAc,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAgB,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAC5E,OAAO,EAAE,0BAA0B,EAAa,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,OAAgB,cACpB,SAAQ,WAAgC;IAGxC,MAAM,CAAC,aAAa,CAAU;IAEpB,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAA;IAErD,YAAY,GAAG,IAAI,uBAAuB,EAAE,CAAA;IAC5C,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;IAEzC,QAAQ,GAAgC,SAAS,CAAA;IACxC,4BAA4B,GAA8C;QAC3F,kCAAkC,EAAE,GAAG;QACvC,mCAAmC,EAAE,GAAG;QACxC,oCAAoC,EAAE,GAAG;KAC1C,CAAA;IACkB,cAAc,GAAmE;QAClG,kCAAkC,EAAE,SAAS;QAC7C,mCAAmC,EAAE,SAAS;QAC9C,oCAAoC,EAAE,SAAS;KAChD,CAAA;IACS,QAAQ,GAAG,KAAK,CAAA;IACP,0BAA0B,CAAW;IACrC,uBAAuB,CAAW;IAErD,YAAY,qBAA6B,EAAE,MAAe;QACxD,QAAQ,CAAC,cAAc,CAAC,qBAAqB,KAAK,qBAAqB,EAAE,4CAA4C,CAAC,CAAA;QACtH,0DAA0D;QAC1D,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,EAAa,CAAA;QAC9C,KAAK,CAAC,aAAa,CAAC,CAAA;QAEpB,IAAI,CAAC,uBAAuB,GAAG,IAAI,uBAAuB,CAAC,IAAc,CAAC,CAAC,SAAS,CAAA;QACpF,IAAI,CAAC,0BAA0B,GAAG,IAAI,0BAA0B,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,SAAS,CAAA;IACnG,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;IAC7B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAA;IAC/C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAC3B,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAA;IACnD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,0BAA0B,CAAC,CAAA;IAC1F,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,EAAE,GAAG,IAAI,CAAC,4BAA4B,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7E,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAID,MAAM,CAAC,KAAK,CAAC,MAAM,CAAyD,MAA0B;QACpG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1D,MAAM,KAAK,CAAC,yBAAyB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;SAC9E;QACD,MAAM,MAAM,GAAW,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,YAAY,CAAA;QAClE,MAAM,cAAc,GAAa,IAAI,CAAC,aAAa,CAAA;QAEnD,QAAQ,CACN,cAAc,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAC7E,+BAA+B,MAAM,eAAe,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CACtF,CAAA;QACD,MAAM,aAAa,GAAgC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;QAChF,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QAC1E,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAuB,CAAA;QAC/E,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;QAC/E,MAAM,SAAS,CAAC,WAAW,EAAE,EAAE,CAAA;QAC/B,MAAM,SAAS,CAAC,KAAK,EAAE,EAAE,CAAA;QACzB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,MAAM,CAAC,OAAO,CAAyD,MAA0B;QAC/F,OAAO,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC/C,CAAC;IAED,QAAQ;QACN,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;QAC/I,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzC,OAAO,IAAI,cAAc,CAAe,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,MAAM,YAAY,GAAkB;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,YAAY;SACrB,CAAA;QACD,OAAO,OAAO,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,cAAc,CAAC,aAAa,CAAA;YACvE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAgD,CAAA;YACvE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC,MAA+C,CAAA;YAC9F,IAAI,MAAM,EAAE;gBACV,OAAO,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAA;aAC1I;YACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACxG,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,8EAA8E,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;YAC/H,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAI,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAc,CAAC,CAAA;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,QAAQ;QACN,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,sDAAsD,CAAC,CAAA;QAC/F,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAA;IAC7C,CAAC;IAED,kBAAkB;QAChB,wDAAwD;QACxD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACrD,MAAM,CAAC,CAAC,KAAK,EAAsC,EAAE;YACpD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACzB,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;YAC/B,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;YACzC,OAAO;gBACL,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE;gBACxC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,yBAAyB,EAAE;aAC7D,CAAA;QACH,CAAC,CAAC,CAAA;QACJ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAA;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAA;QAC1G,MAAM,yBAAyB,GAAG,YAAY;YAC5C,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,yBAAyB,EAAE;YAC9D,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QAClD,OAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,GAAG,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,KAAK,CACT,KAAQ,EACR,QAAoB,EACpB,WAAqB;QAErB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QAE/G,MAAM,IAAI,GAA2B,EAAE,MAAM,EAAE,IAAc,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;QACxF,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;QAEtC,OAAO,MAAM,CAAA;IACf,CAAC;IAED,SAAS,CACP,KAAQ,EACR,QAAoB,EACpB,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;QACvC,MAAM,eAAe,GAAG,WAAW;YACjC,CAAC,CAAC,IAAI,0BAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS;YACvF,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAA;QACnC,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAA;QAElE,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAiB;QAC3B,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IACtB,CAAC;IAED,OAAO,CAAC,gBAA8D;QACpE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,QAAQ,gBAAgB,EAAE;gBACxB,KAAK,OAAO;oBACV,MAAM,KAAK,CAAC,uBAAuB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;gBACrD,KAAK,MAAM;oBACT,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAA;oBACvC,MAAK;gBACP,KAAK,OAAO;oBACV,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAA;oBACxC,MAAK;gBACP,KAAK,MAAM;oBACT,MAAK;gBACP,KAAK,KAAK,CAAC;gBACX;oBACE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;aACzC;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,SAAS,CAAC,aAA+B;QACvC,OAAM;IACR,CAAC;IAES,UAAU,CAAC,MAAgB,EAAE,MAAsB,EAAE,OAAyB;QACtF,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC/D,OAAO,EAAE,CAAC,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,OAAO,CAAC,CAAA;QACX,OAAO,OAAO,CAAA;IAChB,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,MAAgB,EAAE,MAAsB,EAAE,OAAyB;QACpG,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACtF,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAChF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QAChE,OAAO,MAAM,CAAA;IACf,CAAC;IAES,SAAS,CACjB,KAAQ,EACR,QAAoB,EACpB,OAAyB;QAEzB,MAAM,OAAO,GAAG,IAAI,SAAS,CAA6D,KAAK,EAAE,OAAO,EAAE,EAAE;YAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACrE,OAAO,EAAE,CAAC,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,OAAO,CAAC,CAAA;QACX,OAAO,OAAO,CAAA;IAChB,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,KAAQ,EACR,QAAoB,EACpB,OAAyB;QAEzB,MAAM,OAAO,GAAG,IAAI,wBAAwB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpG,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;QAC3E,OAAO,MAAM,CAAA;IACf,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,MAAsB;QAEtB,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3E,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAmC,CAAC,CAAA;QACzF,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,mBAAmB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5F,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAC5B,MAAM,MAAM,GAAsB,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,CAAA;QACtF,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAES,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEnD,KAAK,CAAC,uBAAuB;QACrC,sCAAsC;QACtC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAClE,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,CAAA;QAC5C,QAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,+BAA+B,CAAC,CAAA;QACjI,mDAAmD;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,OAA8B,CAAA;QAClD,IAAI,MAAM,EAAE,UAAU,EAAE;YACtB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBACxC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE;oBACrE,MAAM,KAAK,GAAG,GAAgC,CAAA;oBAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;oBACtD,IAAI,gBAAgB,EAAE;wBACpB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;qBACzE;iBACF;aACF;SACF;IACH,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,KAAQ,EACR,QAAoB,EACpB,WAAqB;QAErB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAc,KAAK,EAAE,QAAQ,CAAC,CAAA;QACjF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,sDAAsD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;aAC3G;SACF;QACD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;QAC7C,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,MAAM,cAAc,GAAc,EAAE,CAAA;QACpC,MAAM,aAAa,GAAkB,EAAE,CAAA;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QAC5F,IAAI;YACF,QAAQ,YAAY,CAAC,MAAM,EAAE;gBAC3B,KAAK,yBAAyB,CAAC,CAAC;oBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;oBAC/C,MAAK;iBACN;gBACD,KAAK,wBAAwB,CAAC,CAAC;oBAC7B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;oBACzD,MAAK;iBACN;gBACD,KAAK,0BAA0B,CAAC,CAAC;oBAC/B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;oBAC5B,MAAK;iBACN;gBACD;oBACE,OAAO,CAAC,KAAK,CAAC,sBAAuB,YAAwB,CAAC,MAAM,GAAG,CAAC,CAAA;aAC3E;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACzC,aAAa,CAAC,IAAI,CAChB,IAAI,kBAAkB,EAAE;qBACrB,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;qBACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,WAAW,CAAC;qBACrC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;qBACnB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;qBACtB,KAAK,EAAE,CACX,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QACD,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzH,CAAC;IAES,aAAa,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAE/C,KAAK,CAAC,OAAO,CAAkC,MAAqB;QAC5E,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAC9I,CAAC;IAES,IAAI,CAAC,QAAiB;QAC9B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAES,cAAc,CAAC,MAAgB,EAAE,UAAoB,EAAE;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAChF,QAAQ,OAAO,KAAK,EAAE;gBACpB,KAAK,UAAU;oBACb,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kDAAkD,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;oBACjG,OAAO,KAAK,CAAA;gBACd,KAAK,QAAQ,CAAC,CAAC;oBACb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACxB,OAAO,CACL,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BAC5B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,CAAA;wBAC/D,CAAC,EAAE,IAAI,CAAC,IAAI,KAAK,CAClB,CAAA;qBACF;oBAED,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;wBAC7B,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,uEAAuE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;wBACtH,OAAO,KAAK,CAAA;qBACb;oBACD,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;iBAC7E;gBACD;oBACE,OAAO,KAAK,CAAA;aACf;QACH,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;IAES,cAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAEnD,KAAK,CAAC,YAAY,CAAC,IAAqC;QAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO,SAAS,CAAA;QAC5C,MAAM,MAAM,GACV,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,YAAY,MAAM;YAClF,CAAC,CAAE,IAAI,CAAC,MAAM,CAAC,SAAoB;YACnC,CAAC,CAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,IAAI,CAAY,CAAA;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACzD,OAAO,QAAQ,CAAC,CAAC,CAAE,QAA4B,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,CAAC"}
1
+ {"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"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"}
@@ -50,10 +50,10 @@ export class CompositeModuleResolver extends Base {
50
50
  .filter(duplicateModules);
51
51
  return result;
52
52
  }
53
- async resolveOne(filter) {
53
+ async resolveOne(addressOrName) {
54
54
  for (let i = 0; i < this.resolvers.length; i++) {
55
55
  const resolver = this.resolvers[i];
56
- const result = await resolver.resolveOne(filter);
56
+ const result = await resolver.resolveOne(addressOrName);
57
57
  if (result)
58
58
  return result;
59
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CompositeModuleResolver.js","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAc,MAAM,mBAAmB,CAAA;AAGpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,OAAO,uBAAwB,SAAQ,IAAI;IACrC,SAAS,GAAqB,EAAE,CAAA;IAClC,aAAa,CAAsB;IAE3C,YAAY,SAAqB,EAAE;QACjC,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,MAAM,aAAa,GAAG,IAAI,oBAAoB,EAAE,CAAA;QAChD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAID,GAAG,CAAC,MAAyB;QAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;SACzD;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SAC7B;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,WAAW,CAAC,QAAwB;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,aAAgC;QACrC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAChC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;SACrE;aAAM;YACL,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;SACvC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,QAAwB;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,OAAO,CAA4B,MAAqB;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,OAAO;aACnB,MAAM,CAAC,SAAS,CAAC;aACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aACnB,IAAI,EAAE;aACN,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC3B,OAAO,MAAa,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,UAAU,CAA4B,MAAc;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;YAClC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAI,MAAM,CAAC,CAAA;YACnD,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAA;SAC1B;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,eAAe,CAAC,MAAe;QACrC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;SAC/B;IACH,CAAC;IACO,kBAAkB,CAAC,aAAqB;QAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAC1C,CAAC;CACF"}
1
+ {"version":3,"file":"CompositeModuleResolver.js","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@ import { AccountInstance } from '@xyo-network/account-model';
2
2
  import { AddressPayload } from '@xyo-network/address-payload-plugin';
3
3
  import { ArchivistModule } from '@xyo-network/archivist-model';
4
4
  import { BoundWitness } from '@xyo-network/boundwitness-model';
5
- import { ModuleManifest } from '@xyo-network/manifest-model';
6
- import { AddressPreviousHashPayload, CreatableModule, CreatableModuleFactory, Module, ModuleConfig, ModuleError, ModuleEventData, ModuleFilter, ModuleParams, ModuleQueryBase, ModuleQueryResult, Query, QueryBoundWitness, SchemaString } from '@xyo-network/module-model';
5
+ import { ModuleManifestPayload } from '@xyo-network/manifest-model';
6
+ import { AddressPreviousHashPayload, CreatableModule, CreatableModuleFactory, Module, ModuleConfig, ModuleDescription, ModuleError, ModuleEventData, ModuleFilter, ModuleParams, ModuleQueryBase, ModuleQueryResult, Query, QueryBoundWitness, SchemaString } from '@xyo-network/module-model';
7
7
  import { Payload } from '@xyo-network/payload-model';
8
8
  import { PayloadWrapper } from '@xyo-network/payload-wrapper';
9
9
  import { Promisable, PromiseEx } from '@xyo-network/promise';
@@ -34,12 +34,17 @@ export declare abstract class AbstractModule<TParams extends ModuleParams = Modu
34
34
  protected abstract get _queryAccountPaths(): Record<Query['schema'], string>;
35
35
  static create<TModule extends Module>(this: CreatableModule<TModule>, params?: TModule['params']): Promise<TModule>;
36
36
  static factory<TModule extends Module>(this: CreatableModule<TModule>, params?: TModule['params']): CreatableModuleFactory<TModule>;
37
+ addressPreviousHash(): Promisable<AddressPreviousHashPayload>;
38
+ describe(): Promise<ModuleDescription>;
37
39
  discover(): Promisable<Payload[]>;
38
40
  loadAccount(): Promise<AccountInstance>;
39
- manifest(): Promisable<ModuleManifest>;
40
- moduleAccountQuery(): Promisable<(AddressPayload | AddressPreviousHashPayload)[]>;
41
+ manifest(): Promisable<ModuleManifestPayload>;
42
+ moduleAddressQuery(): Promisable<(AddressPayload | AddressPreviousHashPayload)[]>;
43
+ previousHash(): Promisable<string | undefined>;
41
44
  query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
42
45
  queryable<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): boolean;
46
+ resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]>;
47
+ resolve<TModule extends Module = Module>(nameOrAddress: string): Promise<TModule | undefined>;
43
48
  start(_timeout?: number): Promise<void>;
44
49
  started(notStartedAction?: 'error' | 'throw' | 'warn' | 'log' | 'none'): boolean;
45
50
  subscribe(_queryAccount?: AccountInstance): void;
@@ -52,7 +57,6 @@ export declare abstract class AbstractModule<TParams extends ModuleParams = Modu
52
57
  protected initializeQueryAccounts(): Promise<void>;
53
58
  protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
54
59
  protected readArchivist: () => Promise<ArchivistModule | undefined>;
55
- protected resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]>;
56
60
  protected stop(_timeout?: number): Promisable<this>;
57
61
  protected validateConfig(config?: unknown, parents?: string[]): boolean;
58
62
  protected writeArchivist: () => Promise<ArchivistModule | undefined>;
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAiB,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAG9D,OAAO,EAAE,qBAAqB,EAA+B,MAAM,6BAA6B,CAAA;AAChG,OAAO,EAEL,0BAA0B,EAE1B,eAAe,EACf,sBAAsB,EAEtB,MAAM,EAEN,YAAY,EACZ,iBAAiB,EAEjB,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EAGZ,eAAe,EACf,iBAAiB,EAEjB,KAAK,EACL,iBAAiB,EACjB,YAAY,EAEb,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAK5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK3C,OAAO,EAA8B,SAAS,EAA2B,MAAM,kBAAkB,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAEpD,8BAAsB,cAAc,CAAC,OAAO,SAAS,YAAY,GAAG,YAAY,EAAE,UAAU,SAAS,eAAe,GAAG,eAAe,CACpI,SAAQ,WAAW,CAAC,OAAO,EAAE,UAAU,CACvC,YAAW,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;IAEtC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAA;IAE9B,SAAS,CAAC,MAAM,CAAC,qBAAqB,SAAwB;IAE9D,QAAQ,CAAC,YAAY,0BAAgC;IACrD,QAAQ,CAAC,UAAU,0BAAgC;IAEnD,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,SAAS,CAAY;IAC3D,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIzF;IACD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,CAIhG;IACD,SAAS,CAAC,QAAQ,UAAQ;IAC1B,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,SAAS,CAAA;IACxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,SAAS,CAAA;gBAEzC,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAU1D,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;IAED,IAAI,OAAO,oBAEV;IAED,IAAI,OAAO,WAEV;IAED,IAAI,cAAc,YAEjB;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAE9B;IAED,IAAI,4BAA4B,IAAI,OAAO,CAE1C;IAED,IAAI,OAAO,IAAI,MAAM,EAAE,CAEtB;IAED,IAAI,iBAAiB,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAE7E;IAED,IAAI,aAAa,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,CAAC,CAElF;IAED,SAAS,CAAC,QAAQ,KAAK,kBAAkB,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAA;WAE/D,MAAM,CAAC,OAAO,SAAS,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAoBtG,MAAM,CAAC,OAAO,CAAC,OAAO,SAAS,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC;IAInI,mBAAmB,IAAI,UAAU,CAAC,0BAA0B,CAAC;IAIvD,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAqB5C,QAAQ,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAa3B,WAAW;IAgBjB,QAAQ,IAAI,UAAU,CAAC,qBAAqB,CAAC;IAK7C,kBAAkB,IAAI,UAAU,CAAC,CAAC,cAAc,GAAG,0BAA0B,CAAC,EAAE,CAAC;IAwBjF,YAAY,IAAI,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;IAIxC,KAAK,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACtG,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAU7B,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACpG,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO;IAUJ,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IACnF,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAgB7F,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7C,OAAO,CAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM;IAqBtE,SAAS,CAAC,aAAa,CAAC,EAAE,eAAe;IAIzC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe;cASxE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAO9H,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EACzD,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,OAAO,CAAC,EAAE,eAAe,GACxB,SAAS,CAAC,CAAC,iBAAiB,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,eAAe,CAAC;cASxD,iBAAiB,CAAC,CAAC,SAAS,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EACvE,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,CAAC,iBAAiB,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;cAMrC,eAAe,CAAC,CAAC,SAAS,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EACrE,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,OAAO,EAAE,EACnB,mBAAmB,GAAE,eAAe,EAAO,EAC3C,MAAM,CAAC,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC;IASlD,SAAS,CAAC,eAAe,6CAAoC;cAE7C,uBAAuB;cAoBvB,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACvH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IA6C7B,SAAS,CAAC,aAAa,6CAAkC;IAEzD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;IAKnD,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,GAAE,MAAM,EAAO,GAAG,OAAO;IA2B3E,SAAS,CAAC,cAAc,6CAAmC;YAE7C,YAAY;CAS3B"}
@@ -5,10 +5,14 @@ export declare const isQuerySupportedByModule: <T extends import("@xyo-network/p
5
5
  query: string;
6
6
  resultSet?: string | undefined;
7
7
  schema: "network.xyo.boundwitness";
8
+ } & {
9
+ schema: "network.xyo.boundwitness";
8
10
  } = import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
9
11
  query: string;
10
12
  resultSet?: string | undefined;
11
13
  schema: "network.xyo.boundwitness";
14
+ } & {
15
+ schema: "network.xyo.boundwitness";
12
16
  }>(mod: Module, query: T, payloads?: Payload[]) => Promise<boolean>;
13
17
  export declare class SupportedQueryValidator implements QueryValidator {
14
18
  protected readonly mod: Module;
@@ -1 +1 @@
1
- {"version":3,"file":"SupportedQueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkC,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAE5D,eAAO,MAAM,wBAAwB;;;;;;;;QAC9B,MAAM,uBAEA,OAAO,EAAE,KACnB,QAAQ,OAAO,CAIjB,CAAA;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAChD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;gBAAX,GAAG,EAAE,MAAM;IAC1C,SAAS,EAAE,SAAS,CAEnB;CACF"}
1
+ {"version":3,"file":"SupportedQueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkC,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAE5D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;QAC9B,MAAM,uBAEA,OAAO,EAAE,KACnB,QAAQ,OAAO,CAIjB,CAAA;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAChD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;gBAAX,GAAG,EAAE,MAAM;IAC1C,SAAS,EAAE,SAAS,CAEnB;CACF"}
@@ -11,7 +11,7 @@ export declare class CompositeModuleResolver extends Base implements ModuleRepos
11
11
  remove(addressOrName: string | string[]): this;
12
12
  removeResolver(resolver: ModuleResolver): this;
13
13
  resolve<T extends Module = Module>(filter?: ModuleFilter): Promise<T[]>;
14
- resolveOne<T extends Module = Module>(filter: string): Promise<T | undefined>;
14
+ resolveOne<T extends Module = Module>(addressOrName: string): Promise<T | undefined>;
15
15
  private addSingleModule;
16
16
  private removeSingleModule;
17
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CompositeModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAKlG,qBAAa,uBAAwB,SAAQ,IAAK,YAAW,gBAAgB,EAAE,cAAc;IAC3F,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,CAAK;IAC1C,OAAO,CAAC,aAAa,CAAsB;gBAE/B,MAAM,GAAE,UAAe;IAOnC,IAAI,gBAAgB,YAEnB;IAED,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAU3B,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAK3C,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAS9C,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKxC,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAWvE,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IASnF,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,kBAAkB;CAG3B"}
1
+ {"version":3,"file":"CompositeModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAKlG,qBAAa,uBAAwB,SAAQ,IAAK,YAAW,gBAAgB,EAAE,cAAc;IAC3F,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,CAAK;IAC1C,OAAO,CAAC,aAAa,CAAsB;gBAE/B,MAAM,GAAE,UAAe;IAOnC,IAAI,gBAAgB,YAEnB;IAED,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAU3B,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAK3C,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAS9C,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKxC,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAWvE,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAS1F,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,kBAAkB;CAG3B"}
package/package.json CHANGED
@@ -13,26 +13,26 @@
13
13
  "@xylabs/assert": "^2.9.3",
14
14
  "@xylabs/exists": "^2.9.3",
15
15
  "@xylabs/promise": "^2.9.3",
16
- "@xyo-network/account": "^2.64.6",
17
- "@xyo-network/account-model": "^2.64.6",
18
- "@xyo-network/address-payload-plugin": "^2.64.6",
19
- "@xyo-network/archivist-model": "^2.64.6",
20
- "@xyo-network/boundwitness-builder": "^2.64.6",
21
- "@xyo-network/boundwitness-model": "^2.64.6",
22
- "@xyo-network/boundwitness-validator": "^2.64.6",
23
- "@xyo-network/boundwitness-wrapper": "^2.64.6",
24
- "@xyo-network/config-payload-plugin": "^2.64.6",
25
- "@xyo-network/core": "^2.64.6",
26
- "@xyo-network/error": "^2.64.6",
27
- "@xyo-network/manifest-model": "^2.64.6",
28
- "@xyo-network/module-events": "^2.64.6",
29
- "@xyo-network/module-model": "^2.64.6",
30
- "@xyo-network/payload-builder": "^2.64.6",
31
- "@xyo-network/payload-model": "^2.64.6",
32
- "@xyo-network/payload-wrapper": "^2.64.6",
33
- "@xyo-network/promise": "^2.64.6",
34
- "@xyo-network/query-payload-plugin": "^2.64.6",
35
- "@xyo-network/shared": "^2.64.6",
16
+ "@xyo-network/account": "^2.64.8",
17
+ "@xyo-network/account-model": "^2.64.8",
18
+ "@xyo-network/address-payload-plugin": "^2.64.8",
19
+ "@xyo-network/archivist-model": "^2.64.8",
20
+ "@xyo-network/boundwitness-builder": "^2.64.8",
21
+ "@xyo-network/boundwitness-model": "^2.64.8",
22
+ "@xyo-network/boundwitness-validator": "^2.64.8",
23
+ "@xyo-network/boundwitness-wrapper": "^2.64.8",
24
+ "@xyo-network/config-payload-plugin": "^2.64.8",
25
+ "@xyo-network/core": "^2.64.8",
26
+ "@xyo-network/error": "^2.64.8",
27
+ "@xyo-network/manifest-model": "^2.64.8",
28
+ "@xyo-network/module-events": "^2.64.8",
29
+ "@xyo-network/module-model": "^2.64.8",
30
+ "@xyo-network/payload-builder": "^2.64.8",
31
+ "@xyo-network/payload-model": "^2.64.8",
32
+ "@xyo-network/payload-wrapper": "^2.64.8",
33
+ "@xyo-network/promise": "^2.64.8",
34
+ "@xyo-network/query-payload-plugin": "^2.64.8",
35
+ "@xyo-network/shared": "^2.64.8",
36
36
  "lodash": "^4.17.21"
37
37
  },
38
38
  "devDependencies": {
@@ -75,5 +75,5 @@
75
75
  },
76
76
  "sideEffects": false,
77
77
  "types": "dist/types/index.d.ts",
78
- "version": "2.64.6"
78
+ "version": "2.64.8"
79
79
  }
@@ -1,6 +1,6 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
2
  import { exists } from '@xylabs/exists'
3
- import { HDWallet } from '@xyo-network/account'
3
+ import { Account, HDWallet } from '@xyo-network/account'
4
4
  import { AccountInstance } from '@xyo-network/account-model'
5
5
  import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
6
6
  import { ArchivistModule } from '@xyo-network/archivist-model'
@@ -8,7 +8,7 @@ import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
8
8
  import { BoundWitness } from '@xyo-network/boundwitness-model'
9
9
  import { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'
10
10
  import { handleErrorAsync } from '@xyo-network/error'
11
- import { ModuleManifest } from '@xyo-network/manifest-model'
11
+ import { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'
12
12
  import {
13
13
  AccountModuleParams,
14
14
  AddressPreviousHashPayload,
@@ -17,8 +17,9 @@ import {
17
17
  CreatableModuleFactory,
18
18
  IndividualArchivistConfig,
19
19
  Module,
20
- ModuleAccountQuerySchema,
20
+ ModuleAddressQuerySchema,
21
21
  ModuleConfig,
22
+ ModuleDescription,
22
23
  ModuleDiscoverQuerySchema,
23
24
  ModuleError,
24
25
  ModuleEventData,
@@ -63,12 +64,12 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
63
64
 
64
65
  protected _account: AccountInstance | undefined = undefined
65
66
  protected readonly _baseModuleQueryAccountPaths: Record<ModuleQueryBase['schema'], string> = {
66
- 'network.xyo.query.module.account': '1',
67
+ 'network.xyo.query.module.address': '1',
67
68
  'network.xyo.query.module.discover': '2',
68
69
  'network.xyo.query.module.subscribe': '3',
69
70
  }
70
71
  protected readonly _queryAccounts: Record<ModuleQueryBase['schema'], AccountInstance | undefined> = {
71
- 'network.xyo.query.module.account': undefined,
72
+ 'network.xyo.query.module.address': undefined,
72
73
  'network.xyo.query.module.discover': undefined,
73
74
  'network.xyo.query.module.subscribe': undefined,
74
75
  }
@@ -111,7 +112,7 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
111
112
  }
112
113
 
113
114
  get queries(): string[] {
114
- return [ModuleDiscoverQuerySchema, ModuleAccountQuerySchema, ModuleSubscribeQuerySchema]
115
+ return [ModuleDiscoverQuerySchema, ModuleAddressQuerySchema, ModuleSubscribeQuerySchema]
115
116
  }
116
117
 
117
118
  get queryAccountPaths(): Readonly<Record<Query['schema'], string | undefined>> {
@@ -148,6 +149,31 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
148
149
  return ModuleFactory.withParams(this, params)
149
150
  }
150
151
 
152
+ addressPreviousHash(): Promisable<AddressPreviousHashPayload> {
153
+ return { address: this.address, previousHash: this._account?.previousHash, schema: AddressPreviousHashSchema }
154
+ }
155
+
156
+ async describe(): Promise<ModuleDescription> {
157
+ const description: ModuleDescription = {
158
+ address: this.address,
159
+ queries: this.queries,
160
+ }
161
+ if (this.config.name) {
162
+ description.name = this.config.name
163
+ }
164
+
165
+ const discover = await this.discover()
166
+
167
+ description.children = compact(
168
+ discover?.map((payload) => {
169
+ const address = payload.schema === AddressSchema ? (payload as AddressPayload).address : undefined
170
+ return address != this.address ? address : undefined
171
+ }) ?? [],
172
+ )
173
+
174
+ return description
175
+ }
176
+
151
177
  discover(): Promisable<Payload[]> {
152
178
  const config = this.config
153
179
  const address = new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: this.address, name: this.config.name }).build()
@@ -177,12 +203,12 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
177
203
  return this._account
178
204
  }
179
205
 
180
- manifest(): Promisable<ModuleManifest> {
206
+ manifest(): Promisable<ModuleManifestPayload> {
181
207
  const name = assertEx(this.config.name, 'Calling manifest on un-named module is not supported')
182
- return { config: { name, ...this.config } }
208
+ return { config: { name, ...this.config }, schema: ModuleManifestPayloadSchema }
183
209
  }
184
210
 
185
- moduleAccountQuery(): Promisable<(AddressPayload | AddressPreviousHashPayload)[]> {
211
+ moduleAddressQuery(): Promisable<(AddressPayload | AddressPreviousHashPayload)[]> {
186
212
  // Return array of all addresses and their previous hash
187
213
  const queryAccounts = Object.entries(this.queryAccounts)
188
214
  .filter((value): value is [string, AccountInstance] => {
@@ -206,6 +232,10 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
206
232
  return [moduleAccount, moduleAccountPreviousHash, ...queryAccounts].flat()
207
233
  }
208
234
 
235
+ previousHash(): Promisable<string | undefined> {
236
+ return this.account.previousHash
237
+ }
238
+
209
239
  async query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
210
240
  query: T,
211
241
  payloads?: Payload[],
@@ -234,6 +264,23 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
234
264
  return validators.every((validator) => validator(query, payloads))
235
265
  }
236
266
 
267
+ async resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]>
268
+ async resolve<TModule extends Module = Module>(nameOrAddress: string): Promise<TModule | undefined>
269
+ async resolve<TModule extends Module = Module>(nameOrAddressOrFilter?: ModuleFilter | string): Promise<TModule | TModule[] | undefined> {
270
+ switch (typeof nameOrAddressOrFilter) {
271
+ case 'string': {
272
+ const byAddress = Account.isAddress(nameOrAddressOrFilter)
273
+ ? (await this.resolve<TModule>({ address: [nameOrAddressOrFilter] })).pop()
274
+ : undefined
275
+ return byAddress ?? (await this.resolve<TModule>({ name: [nameOrAddressOrFilter] })).pop()
276
+ }
277
+ default: {
278
+ const filter: ModuleFilter | undefined = nameOrAddressOrFilter
279
+ return [...(await this.downResolver.resolve<TModule>(filter)), ...(await this.upResolver.resolve<TModule>(filter))].filter(duplicateModules)
280
+ }
281
+ }
282
+ }
283
+
237
284
  async start(_timeout?: number): Promise<void> {
238
285
  this.validateConfig()
239
286
  await this.initializeQueryAccounts()
@@ -363,8 +410,8 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
363
410
  resultPayloads.push(...(await this.discover()))
364
411
  break
365
412
  }
366
- case ModuleAccountQuerySchema: {
367
- resultPayloads.push(...(await this.moduleAccountQuery()))
413
+ case ModuleAddressQuerySchema: {
414
+ resultPayloads.push(...(await this.moduleAddressQuery()))
368
415
  break
369
416
  }
370
417
  case ModuleSubscribeQuerySchema: {
@@ -391,10 +438,6 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
391
438
 
392
439
  protected readArchivist = () => this.getArchivist('read')
393
440
 
394
- protected async resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]> {
395
- return [...(await this.upResolver.resolve<TModule>(filter)), ...(await this.downResolver.resolve<TModule>(filter))].filter(duplicateModules)
396
- }
397
-
398
441
  protected stop(_timeout?: number): Promisable<this> {
399
442
  this._started = false
400
443
  return this
@@ -61,10 +61,10 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
61
61
  return result as T[]
62
62
  }
63
63
 
64
- async resolveOne<T extends Module = Module>(filter: string): Promise<T | undefined> {
64
+ async resolveOne<T extends Module = Module>(addressOrName: string): Promise<T | undefined> {
65
65
  for (let i = 0; i < this.resolvers.length; i++) {
66
66
  const resolver = this.resolvers[i]
67
- const result = await resolver.resolveOne<T>(filter)
67
+ const result = await resolver.resolveOne<T>(addressOrName)
68
68
  if (result) return result
69
69
  }
70
70
  return undefined