@xyo-network/sentinel 2.66.9 → 2.67.0-rc.2
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/AbstractSentinel.js +3 -14
- package/dist/cjs/AbstractSentinel.js.map +1 -1
- package/dist/cjs/MemorySentinel.js +10 -4
- package/dist/cjs/MemorySentinel.js.map +1 -1
- package/dist/cjs/Wrapper.js +1 -2
- package/dist/cjs/Wrapper.js.map +1 -1
- package/dist/cjs/typeChecks.js +5 -4
- package/dist/cjs/typeChecks.js.map +1 -1
- package/dist/esm/AbstractSentinel.js +5 -11
- package/dist/esm/AbstractSentinel.js.map +1 -1
- package/dist/esm/MemorySentinel.js +11 -5
- package/dist/esm/MemorySentinel.js.map +1 -1
- package/dist/esm/Wrapper.js +1 -2
- package/dist/esm/Wrapper.js.map +1 -1
- package/dist/esm/typeChecks.js +6 -5
- package/dist/esm/typeChecks.js.map +1 -1
- package/dist/types/AbstractSentinel.d.ts +5 -7
- package/dist/types/AbstractSentinel.d.ts.map +1 -1
- package/dist/types/MemorySentinel.d.ts +1 -1
- package/dist/types/MemorySentinel.d.ts.map +1 -1
- package/dist/types/SentinelModel.d.ts +2 -2
- package/dist/types/SentinelModel.d.ts.map +1 -1
- package/dist/types/Wrapper.d.ts +3 -3
- package/dist/types/Wrapper.d.ts.map +1 -1
- package/dist/types/typeChecks.d.ts +5 -5
- package/dist/types/typeChecks.d.ts.map +1 -1
- package/package.json +17 -16
- package/src/AbstractSentinel.ts +8 -16
- package/src/MemorySentinel.ts +12 -6
- package/src/SentinelModel.ts +2 -2
- package/src/Wrapper.ts +6 -4
- package/src/typeChecks.ts +6 -5
- package/dist/docs.json +0 -68058
|
@@ -12,7 +12,7 @@ const witness_1 = require("@xyo-network/witness");
|
|
|
12
12
|
const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
|
|
13
13
|
const Config_1 = require("./Config");
|
|
14
14
|
const Queries_1 = require("./Queries");
|
|
15
|
-
class AbstractSentinel extends archivist_1.
|
|
15
|
+
class AbstractSentinel extends archivist_1.AbstractArchivingModule {
|
|
16
16
|
constructor() {
|
|
17
17
|
super(...arguments);
|
|
18
18
|
this.history = [];
|
|
@@ -47,28 +47,17 @@ class AbstractSentinel extends archivist_1.ArchivingModule {
|
|
|
47
47
|
return this._archivists;
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
getWitnesses(
|
|
50
|
+
getWitnesses() {
|
|
51
51
|
var _a, _b, _c, _d;
|
|
52
52
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
53
|
const addresses = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.witnesses) ? (Array.isArray(this.config.witnesses) ? (_b = this.config) === null || _b === void 0 ? void 0 : _b.witnesses : [this.config.witnesses]) : [];
|
|
54
|
-
this._witnesses =
|
|
55
|
-
(_c = this._witnesses) !== null && _c !== void 0 ? _c : (yield this.resolve({ address: addresses })).map((witness) => witness_1.WitnessWrapper.wrap(witness, account !== null && account !== void 0 ? account : this.account));
|
|
54
|
+
this._witnesses = (_c = this._witnesses) !== null && _c !== void 0 ? _c : (yield this.resolve({ address: addresses }, { identity: witness_1.isWitnessInstance }));
|
|
56
55
|
if (addresses.length !== this._witnesses.length) {
|
|
57
56
|
(_d = this.logger) === null || _d === void 0 ? void 0 : _d.warn(`Not all witnesses found [Requested: ${addresses.length}, Found: ${this._witnesses.length}]`);
|
|
58
57
|
}
|
|
59
58
|
return this._witnesses;
|
|
60
59
|
});
|
|
61
60
|
}
|
|
62
|
-
loadAccount() {
|
|
63
|
-
const _super = Object.create(null, {
|
|
64
|
-
loadAccount: { get: () => super.loadAccount }
|
|
65
|
-
});
|
|
66
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
const account = yield _super.loadAccount.call(this);
|
|
68
|
-
this.downResolver.add(this);
|
|
69
|
-
return account;
|
|
70
|
-
});
|
|
71
|
-
}
|
|
72
61
|
removeArchivist(address) {
|
|
73
62
|
var _a;
|
|
74
63
|
this.config.archivists = ((_a = this.config.archivists) !== null && _a !== void 0 ? _a : []).filter((archivist) => !address.includes(archivist));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractSentinel.js","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAA8C;
|
|
1
|
+
{"version":3,"file":"AbstractSentinel.js","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const account_1 = require("@xyo-network/account");
|
|
|
8
8
|
const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
|
|
9
9
|
const error_1 = require("@xyo-network/error");
|
|
10
10
|
const module_1 = require("@xyo-network/module");
|
|
11
|
-
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
12
11
|
const AbstractSentinel_1 = require("./AbstractSentinel");
|
|
13
12
|
const Config_1 = require("./Config");
|
|
14
13
|
const Queries_1 = require("./Queries");
|
|
@@ -21,9 +20,10 @@ class MemorySentinel extends AbstractSentinel_1.AbstractSentinel {
|
|
|
21
20
|
const allWitnesses = [...(yield this.getWitnesses())];
|
|
22
21
|
const resultPayloads = [];
|
|
23
22
|
try {
|
|
24
|
-
const generatedPayloads =
|
|
23
|
+
const [generatedPayloads, generatedErrors] = yield this.generateResults(allWitnesses);
|
|
25
24
|
const combinedPayloads = [...generatedPayloads, ...payloads];
|
|
26
25
|
resultPayloads.push(...combinedPayloads);
|
|
26
|
+
errors.push(...generatedErrors);
|
|
27
27
|
}
|
|
28
28
|
catch (ex) {
|
|
29
29
|
(0, error_1.handleError)(ex, (error) => {
|
|
@@ -71,12 +71,18 @@ class MemorySentinel extends AbstractSentinel_1.AbstractSentinel {
|
|
|
71
71
|
return (yield this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0];
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
|
-
|
|
74
|
+
generateResults(witnesses) {
|
|
75
75
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
76
|
-
|
|
76
|
+
const results = yield Promise.allSettled(witnesses === null || witnesses === void 0 ? void 0 : witnesses.map((witness) => witness.observe()));
|
|
77
|
+
const payloads = results
|
|
77
78
|
.filter(promise_1.fulfilled)
|
|
78
79
|
.map((result) => result.value)
|
|
79
80
|
.flat();
|
|
81
|
+
const errors = results
|
|
82
|
+
.filter(promise_1.rejected)
|
|
83
|
+
.map((result) => result.reason)
|
|
84
|
+
.flat();
|
|
85
|
+
return [payloads, errors];
|
|
80
86
|
});
|
|
81
87
|
}
|
|
82
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/Wrapper.js
CHANGED
|
@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.SentinelWrapper = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const module_1 = require("@xyo-network/module");
|
|
7
|
-
const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
|
|
8
7
|
const Queries_1 = require("./Queries");
|
|
9
8
|
const typeChecks_1 = require("./typeChecks");
|
|
10
9
|
(0, module_1.constructableModuleWrapper)();
|
|
11
10
|
class SentinelWrapper extends (_b = module_1.ModuleWrapper) {
|
|
12
11
|
report(payloads) {
|
|
13
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const queryPayload =
|
|
13
|
+
const queryPayload = { schema: Queries_1.SentinelReportQuerySchema };
|
|
15
14
|
const result = yield this.sendQuery(queryPayload, payloads);
|
|
16
15
|
return result;
|
|
17
16
|
});
|
package/dist/cjs/Wrapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":";;;;;AAAA,gDAA+E;
|
|
1
|
+
{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":";;;;;AAAA,gDAA+E;AAG/E,uCAA0E;AAE1E,6CAAmE;AAEnE,IAAA,mCAA0B,GAAE,CAAA;AAC5B,MAAa,eACX,SAAQ,MAAA,sBAAa,CAAS;IAOxB,MAAM,CAAC,QAAoB;;YAC/B,MAAM,YAAY,GAAwB,EAAE,MAAM,EAAE,mCAAyB,EAAE,CAAA;YAC/E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAC3D,OAAO,MAAM,CAAA;QACf,CAAC;KAAA;;AAZH,0CAaC;;AATiB,qCAAqB,GAAG,+BAAkB,AAArB,CAAqB;AAC1C,mCAAmB,GAAG,6BAAgB,AAAnB,CAAmB;AACtC,+BAAe,GAAG,CAAC,mCAAyB,EAAE,GAAG,sCAAqB,CAAC,AAAxD,CAAwD"}
|
package/dist/cjs/typeChecks.js
CHANGED
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withSentinelInstance = exports.withSentinelModule = exports.asSentinelInstance = exports.asSentinelModule = exports.isSentinelModule = exports.isSentinelInstance = void 0;
|
|
4
4
|
const module_model_1 = require("@xyo-network/module-model");
|
|
5
|
+
const object_identity_1 = require("@xyo-network/object-identity");
|
|
5
6
|
const Queries_1 = require("./Queries");
|
|
6
|
-
exports.isSentinelInstance = module_model_1.IsInstanceFactory.create({ report: 'function' }, module_model_1.isModuleInstance);
|
|
7
|
-
exports.isSentinelModule = module_model_1.IsModuleFactory.create([Queries_1.SentinelReportQuerySchema]);
|
|
8
|
-
exports.asSentinelModule =
|
|
9
|
-
exports.asSentinelInstance =
|
|
7
|
+
exports.isSentinelInstance = new module_model_1.IsInstanceFactory().create({ report: 'function' }, [module_model_1.isModuleInstance]);
|
|
8
|
+
exports.isSentinelModule = new module_model_1.IsModuleFactory().create([Queries_1.SentinelReportQuerySchema]);
|
|
9
|
+
exports.asSentinelModule = object_identity_1.AsObjectFactory.create(exports.isSentinelModule);
|
|
10
|
+
exports.asSentinelInstance = object_identity_1.AsObjectFactory.create(exports.isSentinelInstance);
|
|
10
11
|
exports.withSentinelModule = module_model_1.WithFactory.create(exports.isSentinelModule);
|
|
11
12
|
exports.withSentinelInstance = module_model_1.WithFactory.create(exports.isSentinelInstance);
|
|
12
13
|
//# sourceMappingURL=typeChecks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,4DAA6G;AAC7G,kEAA8D;AAE9D,uCAAqD;AAGxC,QAAA,kBAAkB,GAAG,IAAI,gCAAiB,EAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,+BAAgB,CAAC,CAAC,CAAA;AACjH,QAAA,gBAAgB,GAAG,IAAI,8BAAe,EAAkB,CAAC,MAAM,CAAC,CAAC,mCAAyB,CAAC,CAAC,CAAA;AAE5F,QAAA,gBAAgB,GAAG,iCAAe,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAA;AAC3D,QAAA,kBAAkB,GAAG,iCAAe,CAAC,MAAM,CAAC,0BAAkB,CAAC,CAAA;AAC/D,QAAA,kBAAkB,GAAG,0BAAW,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAA;AACzD,QAAA,oBAAoB,GAAG,0BAAW,CAAC,MAAM,CAAC,0BAAkB,CAAC,CAAA"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { Account } from '@xyo-network/account';
|
|
3
|
-
import {
|
|
3
|
+
import { AbstractArchivingModule, asArchivistInstance } from '@xyo-network/archivist';
|
|
4
4
|
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
|
|
5
5
|
import { handleErrorAsync } from '@xyo-network/error';
|
|
6
6
|
import { ModuleErrorBuilder } from '@xyo-network/module';
|
|
7
|
-
import {
|
|
7
|
+
import { isWitnessInstance } from '@xyo-network/witness';
|
|
8
8
|
import uniq from 'lodash/uniq';
|
|
9
9
|
import { SentinelConfigSchema } from './Config';
|
|
10
10
|
import { SentinelReportQuerySchema } from './Queries';
|
|
11
|
-
export class AbstractSentinel extends
|
|
11
|
+
export class AbstractSentinel extends AbstractArchivingModule {
|
|
12
12
|
static configSchemas = [SentinelConfigSchema];
|
|
13
13
|
history = [];
|
|
14
14
|
_archivists;
|
|
@@ -39,20 +39,14 @@ export class AbstractSentinel extends ArchivingModule {
|
|
|
39
39
|
}
|
|
40
40
|
return this._archivists;
|
|
41
41
|
}
|
|
42
|
-
async getWitnesses(
|
|
42
|
+
async getWitnesses() {
|
|
43
43
|
const addresses = this.config?.witnesses ? (Array.isArray(this.config.witnesses) ? this.config?.witnesses : [this.config.witnesses]) : [];
|
|
44
|
-
this._witnesses =
|
|
45
|
-
this._witnesses ?? (await this.resolve({ address: addresses })).map((witness) => WitnessWrapper.wrap(witness, account ?? this.account));
|
|
44
|
+
this._witnesses = this._witnesses ?? (await this.resolve({ address: addresses }, { identity: isWitnessInstance }));
|
|
46
45
|
if (addresses.length !== this._witnesses.length) {
|
|
47
46
|
this.logger?.warn(`Not all witnesses found [Requested: ${addresses.length}, Found: ${this._witnesses.length}]`);
|
|
48
47
|
}
|
|
49
48
|
return this._witnesses;
|
|
50
49
|
}
|
|
51
|
-
async loadAccount() {
|
|
52
|
-
const account = await super.loadAccount();
|
|
53
|
-
this.downResolver.add(this);
|
|
54
|
-
return account;
|
|
55
|
-
}
|
|
56
50
|
removeArchivist(address) {
|
|
57
51
|
this.config.archivists = (this.config.archivists ?? []).filter((archivist) => !address.includes(archivist));
|
|
58
52
|
this._archivists = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractSentinel.js","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractSentinel.js","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
|
-
import { fulfilled } from '@xylabs/promise';
|
|
2
|
+
import { fulfilled, rejected } from '@xylabs/promise';
|
|
3
3
|
import { Account } from '@xyo-network/account';
|
|
4
4
|
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
|
|
5
5
|
import { handleError, handleErrorAsync } from '@xyo-network/error';
|
|
6
6
|
import { ModuleErrorBuilder } from '@xyo-network/module';
|
|
7
|
-
import compact from 'lodash/compact';
|
|
8
7
|
import { AbstractSentinel } from './AbstractSentinel';
|
|
9
8
|
import { SentinelConfigSchema } from './Config';
|
|
10
9
|
import { SentinelReportQuerySchema } from './Queries';
|
|
@@ -17,9 +16,10 @@ export class MemorySentinel extends AbstractSentinel {
|
|
|
17
16
|
const allWitnesses = [...(await this.getWitnesses())];
|
|
18
17
|
const resultPayloads = [];
|
|
19
18
|
try {
|
|
20
|
-
const generatedPayloads =
|
|
19
|
+
const [generatedPayloads, generatedErrors] = await this.generateResults(allWitnesses);
|
|
21
20
|
const combinedPayloads = [...generatedPayloads, ...payloads];
|
|
22
21
|
resultPayloads.push(...combinedPayloads);
|
|
22
|
+
errors.push(...generatedErrors);
|
|
23
23
|
}
|
|
24
24
|
catch (ex) {
|
|
25
25
|
handleError(ex, (error) => {
|
|
@@ -60,11 +60,17 @@ export class MemorySentinel extends AbstractSentinel {
|
|
|
60
60
|
}
|
|
61
61
|
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0];
|
|
62
62
|
}
|
|
63
|
-
async
|
|
64
|
-
|
|
63
|
+
async generateResults(witnesses) {
|
|
64
|
+
const results = await Promise.allSettled(witnesses?.map((witness) => witness.observe()));
|
|
65
|
+
const payloads = results
|
|
65
66
|
.filter(fulfilled)
|
|
66
67
|
.map((result) => result.value)
|
|
67
68
|
.flat();
|
|
69
|
+
const errors = results
|
|
70
|
+
.filter(rejected)
|
|
71
|
+
.map((result) => result.reason)
|
|
72
|
+
.flat();
|
|
73
|
+
return [payloads, errors];
|
|
68
74
|
}
|
|
69
75
|
}
|
|
70
76
|
//# sourceMappingURL=MemorySentinel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Wrapper.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
|
|
2
|
-
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
3
2
|
import { SentinelReportQuerySchema } from './Queries';
|
|
4
3
|
import { isSentinelInstance, isSentinelModule } from './typeChecks';
|
|
5
4
|
constructableModuleWrapper();
|
|
@@ -8,7 +7,7 @@ export class SentinelWrapper extends ModuleWrapper {
|
|
|
8
7
|
static moduleIdentityCheck = isSentinelModule;
|
|
9
8
|
static requiredQueries = [SentinelReportQuerySchema, ...super.requiredQueries];
|
|
10
9
|
async report(payloads) {
|
|
11
|
-
const queryPayload =
|
|
10
|
+
const queryPayload = { schema: SentinelReportQuerySchema };
|
|
12
11
|
const result = await this.sendQuery(queryPayload, payloads);
|
|
13
12
|
return result;
|
|
14
13
|
}
|
package/dist/esm/Wrapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAG/E,OAAO,EAAuB,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAE1E,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAEnE,0BAA0B,EAAE,CAAA;AAC5B,MAAM,OAAO,eACX,SAAQ,aAAsB;IAG9B,MAAM,CAAU,qBAAqB,GAAG,kBAAkB,CAAA;IAC1D,MAAM,CAAU,mBAAmB,GAAG,gBAAgB,CAAA;IACtD,MAAM,CAAU,eAAe,GAAG,CAAC,yBAAyB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEvF,KAAK,CAAC,MAAM,CAAC,QAAoB;QAC/B,MAAM,YAAY,GAAwB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QAC/E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACf,CAAC"}
|
package/dist/esm/typeChecks.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model';
|
|
2
|
+
import { AsObjectFactory } from '@xyo-network/object-identity';
|
|
2
3
|
import { SentinelReportQuerySchema } from './Queries';
|
|
3
|
-
export const isSentinelInstance = IsInstanceFactory.create({ report: 'function' }, isModuleInstance);
|
|
4
|
-
export const isSentinelModule = IsModuleFactory.create([SentinelReportQuerySchema]);
|
|
5
|
-
export const asSentinelModule =
|
|
6
|
-
export const asSentinelInstance =
|
|
4
|
+
export const isSentinelInstance = new IsInstanceFactory().create({ report: 'function' }, [isModuleInstance]);
|
|
5
|
+
export const isSentinelModule = new IsModuleFactory().create([SentinelReportQuerySchema]);
|
|
6
|
+
export const asSentinelModule = AsObjectFactory.create(isSentinelModule);
|
|
7
|
+
export const asSentinelInstance = AsObjectFactory.create(isSentinelInstance);
|
|
7
8
|
export const withSentinelModule = WithFactory.create(isSentinelModule);
|
|
8
9
|
export const withSentinelInstance = WithFactory.create(isSentinelInstance);
|
|
9
10
|
//# sourceMappingURL=typeChecks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAGrD,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,EAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;AAC9H,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,eAAe,EAAkB,CAAC,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAA;AAEzG,MAAM,CAAC,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;AACxE,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ArchivingModule, ArchivistInstance } from '@xyo-network/archivist';
|
|
1
|
+
import { AbstractArchivingModule, ArchivistInstance } from '@xyo-network/archivist';
|
|
3
2
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
|
|
4
3
|
import { BoundWitness } from '@xyo-network/boundwitness-model';
|
|
5
4
|
import { AnyConfigSchema, ModuleConfig, ModuleQueryResult } from '@xyo-network/module';
|
|
6
5
|
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
-
import {
|
|
6
|
+
import { WitnessInstance } from '@xyo-network/witness';
|
|
8
7
|
import { SentinelConfig } from './Config';
|
|
9
8
|
import { SentinelQueryBase } from './Queries';
|
|
10
|
-
import {
|
|
11
|
-
export declare abstract class AbstractSentinel<TParams extends SentinelParams<AnyConfigSchema<SentinelConfig>> = SentinelParams<SentinelConfig>, TEventData extends SentinelModuleEventData = SentinelModuleEventData> extends
|
|
9
|
+
import { SentinelInstance, SentinelModuleEventData, SentinelParams } from './SentinelModel';
|
|
10
|
+
export declare abstract class AbstractSentinel<TParams extends SentinelParams<AnyConfigSchema<SentinelConfig>> = SentinelParams<SentinelConfig>, TEventData extends SentinelModuleEventData = SentinelModuleEventData> extends AbstractArchivingModule<TParams, TEventData> implements SentinelInstance<TParams, TEventData> {
|
|
12
11
|
static readonly configSchemas: string[];
|
|
13
12
|
history: BoundWitness[];
|
|
14
13
|
private _archivists;
|
|
@@ -18,8 +17,7 @@ export declare abstract class AbstractSentinel<TParams extends SentinelParams<An
|
|
|
18
17
|
addArchivist(address: string[]): void;
|
|
19
18
|
addWitness(address: string[]): void;
|
|
20
19
|
getArchivists(): Promise<ArchivistInstance[]>;
|
|
21
|
-
getWitnesses(
|
|
22
|
-
loadAccount(): Promise<AccountInstance>;
|
|
20
|
+
getWitnesses(): Promise<WitnessInstance[]>;
|
|
23
21
|
removeArchivist(address: string[]): void;
|
|
24
22
|
removeWitness(address: string[]): void;
|
|
25
23
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractSentinel.d.ts","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractSentinel.d.ts","sourceRoot":"","sources":["../../src/AbstractSentinel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAuB,MAAM,wBAAwB,CAAA;AACxG,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAsB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC1G,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAqB,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGzE,OAAO,EAAE,cAAc,EAAwB,MAAM,UAAU,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAA6B,MAAM,WAAW,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAE3F,8BAAsB,gBAAgB,CAClC,OAAO,SAAS,cAAc,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC,cAAc,CAAC,EAChG,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,CAEtE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CACnD,YAAW,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;IAEhD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyB;IAEzE,OAAO,EAAE,YAAY,EAAE,CAAK;IAE5B,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,UAAU,CAA+B;IAEjD,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIvF;IAED,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE;IAK9B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;IAKtB,aAAa;IAcb,YAAY;IAWlB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE;IAKjC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE;cAKN,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAyC7B,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAC1D"}
|
|
@@ -9,6 +9,6 @@ export declare class MemorySentinel<TParams extends MemorySentinelParams = Memor
|
|
|
9
9
|
static configSchemas: "network.xyo.sentinel.config"[];
|
|
10
10
|
report(payloads?: Payload[]): Promise<Payload[]>;
|
|
11
11
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
|
|
12
|
-
private
|
|
12
|
+
private generateResults;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=MemorySentinel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemorySentinel.d.ts","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAE/F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAsB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC1G,OAAO,EAAe,OAAO,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"MemorySentinel.d.ts","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAE/F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAsB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC1G,OAAO,EAAe,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAwB,MAAM,UAAU,CAAA;AAE/D,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEzF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,IAAI,cAAc,CAClI,eAAe,CAAC,OAAO,CAAC,CACzB,CAAA;AAED,qBAAa,cAAc,CACvB,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,CAEtE,SAAQ,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAC5C,YAAW,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC;IAE9C,OAAgB,aAAa,kCAAyB;IAEhD,MAAM,CAAC,QAAQ,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAwBjC,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;YA+Bf,eAAe;CAY9B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BoundWitness } from '@xyo-network/boundwitness-model';
|
|
2
2
|
import { AnyObject } from '@xyo-network/core';
|
|
3
|
-
import { AnyConfigSchema, EventData, Module, ModuleEventArgs, ModuleEventData, ModuleParams } from '@xyo-network/module';
|
|
3
|
+
import { AnyConfigSchema, EventData, Module, ModuleEventArgs, ModuleEventData, ModuleInstance, ModuleParams } from '@xyo-network/module';
|
|
4
4
|
import { Payload } from '@xyo-network/payload-model';
|
|
5
5
|
import { Promisable } from '@xyo-network/promise';
|
|
6
6
|
import { SentinelConfig } from './Config';
|
|
@@ -26,5 +26,5 @@ export interface SentinelModuleEventData extends SentinelReportEndEventData, Sen
|
|
|
26
26
|
}
|
|
27
27
|
export type SentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditionalParams>;
|
|
28
28
|
export type SentinelModule<TParams extends SentinelParams = SentinelParams, TEventData extends SentinelModuleEventData = SentinelModuleEventData> = Module<TParams, TEventData>;
|
|
29
|
-
export type SentinelInstance<TParams extends SentinelParams = SentinelParams, TEventData extends SentinelModuleEventData = SentinelModuleEventData> = SentinelModule<TParams, TEventData> & Sentinel;
|
|
29
|
+
export type SentinelInstance<TParams extends SentinelParams = SentinelParams, TEventData extends SentinelModuleEventData = SentinelModuleEventData> = SentinelModule<TParams, TEventData> & ModuleInstance & Sentinel;
|
|
30
30
|
//# sourceMappingURL=SentinelModel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SentinelModel.d.ts","sourceRoot":"","sources":["../../src/SentinelModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"SentinelModel.d.ts","sourceRoot":"","sources":["../../src/SentinelModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACxI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;CACxD;AAED,MAAM,MAAM,0BAA0B,GAAG,eAAe,CACtD,cAAc,EACd;IACE,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;IACtB,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,0BAA2B,SAAQ,SAAS;IAC3D,SAAS,EAAE,0BAA0B,CAAA;CACtC;AAED,MAAM,MAAM,4BAA4B,GAAG,eAAe,CACxD,cAAc,EACd;IACE,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,4BAA6B,SAAQ,SAAS;IAC7D,WAAW,EAAE,4BAA4B,CAAA;CAC1C;AAED,MAAM,WAAW,uBAAwB,SAAQ,0BAA0B,EAAE,4BAA4B,EAAE,eAAe;CAAG;AAE7H,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,eAAe,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,EACjF,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAE5C,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,cAAc,GAAG,cAAc,EAC/C,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,IAClE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAE/B,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,cAAc,GAAG,cAAc,EAC/C,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,IAClE,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,cAAc,GAAG,QAAQ,CAAA"}
|
package/dist/types/Wrapper.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ModuleWrapper } from '@xyo-network/module';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
|
-
import { SentinelModule } from './SentinelModel';
|
|
4
|
-
export declare class SentinelWrapper<TModule extends SentinelModule = SentinelModule> extends ModuleWrapper<TModule> implements
|
|
5
|
-
static instanceIdentityCheck: import("@xyo-network/
|
|
3
|
+
import { SentinelInstance, SentinelModule } from './SentinelModel';
|
|
4
|
+
export declare class SentinelWrapper<TModule extends SentinelModule = SentinelModule> extends ModuleWrapper<TModule> implements SentinelInstance<TModule['params']> {
|
|
5
|
+
static instanceIdentityCheck: import("@xyo-network/object-identity").ObjectTypeCheck<SentinelInstance>;
|
|
6
6
|
static moduleIdentityCheck: import("@xyo-network/module").ModuleTypeCheck<SentinelModule>;
|
|
7
7
|
static requiredQueries: string[];
|
|
8
8
|
report(payloads?: Payload[]): Promise<Payload[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAIlE,qBAAa,eAAe,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,CAC1E,SAAQ,aAAa,CAAC,OAAO,CAC7B,YAAW,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE9C,OAAgB,qBAAqB,2EAAqB;IAC1D,OAAgB,mBAAmB,gEAAmB;IACtD,OAAgB,eAAe,WAAwD;IAEjF,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAKvD"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { SentinelInstance, SentinelModule } from './SentinelModel';
|
|
2
|
-
export declare const isSentinelInstance: import("@xyo-network/
|
|
2
|
+
export declare const isSentinelInstance: import("@xyo-network/object-identity").ObjectTypeCheck<SentinelInstance>;
|
|
3
3
|
export declare const isSentinelModule: import("@xyo-network/module-model").ModuleTypeCheck<SentinelModule>;
|
|
4
4
|
export declare const asSentinelModule: {
|
|
5
|
-
(
|
|
6
|
-
(
|
|
5
|
+
(obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): SentinelModule | undefined;
|
|
6
|
+
(obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): SentinelModule;
|
|
7
7
|
};
|
|
8
8
|
export declare const asSentinelInstance: {
|
|
9
|
-
(
|
|
10
|
-
(
|
|
9
|
+
(obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): SentinelInstance | undefined;
|
|
10
|
+
(obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): SentinelInstance;
|
|
11
11
|
};
|
|
12
12
|
export declare const withSentinelModule: <R>(module: any, closure: (module: SentinelModule) => R) => R | undefined;
|
|
13
13
|
export declare const withSentinelInstance: <R>(module: any, closure: (module: SentinelInstance) => R) => R | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAElE,eAAO,MAAM,kBAAkB,0EAA+F,CAAA;AAC9H,eAAO,MAAM,gBAAgB,qEAA4E,CAAA;AAEzG,eAAO,MAAM,gBAAgB;;;CAA2C,CAAA;AACxE,eAAO,MAAM,kBAAkB;;;CAA6C,CAAA;AAC5E,eAAO,MAAM,kBAAkB,2EAAuC,CAAA;AACtE,eAAO,MAAM,oBAAoB,6EAAyC,CAAA"}
|
package/package.json
CHANGED
|
@@ -12,26 +12,26 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
14
|
"@xylabs/promise": "^2.9.3",
|
|
15
|
-
"@xyo-network/account": "~2.
|
|
16
|
-
"@xyo-network/
|
|
17
|
-
"@xyo-network/
|
|
18
|
-
"@xyo-network/boundwitness-
|
|
19
|
-
"@xyo-network/
|
|
20
|
-
"@xyo-network/
|
|
21
|
-
"@xyo-network/
|
|
22
|
-
"@xyo-network/module": "~2.
|
|
23
|
-
"@xyo-network/
|
|
24
|
-
"@xyo-network/payload-model": "~2.
|
|
25
|
-
"@xyo-network/payload-wrapper": "~2.
|
|
26
|
-
"@xyo-network/promise": "~2.
|
|
27
|
-
"@xyo-network/witness": "~2.
|
|
15
|
+
"@xyo-network/account": "~2.67.0-rc.2",
|
|
16
|
+
"@xyo-network/archivist": "~2.67.0-rc.2",
|
|
17
|
+
"@xyo-network/boundwitness-builder": "~2.67.0-rc.2",
|
|
18
|
+
"@xyo-network/boundwitness-model": "~2.67.0-rc.2",
|
|
19
|
+
"@xyo-network/core": "~2.67.0-rc.2",
|
|
20
|
+
"@xyo-network/error": "~2.67.0-rc.2",
|
|
21
|
+
"@xyo-network/module": "~2.67.0-rc.2",
|
|
22
|
+
"@xyo-network/module-model": "~2.67.0-rc.2",
|
|
23
|
+
"@xyo-network/object-identity": "~2.67.0-rc.2",
|
|
24
|
+
"@xyo-network/payload-model": "~2.67.0-rc.2",
|
|
25
|
+
"@xyo-network/payload-wrapper": "~2.67.0-rc.2",
|
|
26
|
+
"@xyo-network/promise": "~2.67.0-rc.2",
|
|
27
|
+
"@xyo-network/witness": "~2.67.0-rc.2",
|
|
28
28
|
"lodash": "^4.17.21"
|
|
29
29
|
},
|
|
30
30
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@types/lodash": "^4.14.195",
|
|
33
|
-
"@xylabs/ts-scripts-yarn3": "^2.
|
|
34
|
-
"@xylabs/tsconfig": "^2.
|
|
33
|
+
"@xylabs/ts-scripts-yarn3": "^2.19.0",
|
|
34
|
+
"@xylabs/tsconfig": "^2.19.0",
|
|
35
35
|
"typescript": "^5.1.6"
|
|
36
36
|
},
|
|
37
37
|
"browser": "dist/esm/index.js",
|
|
@@ -66,5 +66,6 @@
|
|
|
66
66
|
},
|
|
67
67
|
"sideEffects": false,
|
|
68
68
|
"types": "dist/types/index.d.ts",
|
|
69
|
-
"version": "2.
|
|
69
|
+
"version": "2.67.0-rc.2",
|
|
70
|
+
"stableVersion": "2.66.9"
|
|
70
71
|
}
|
package/src/AbstractSentinel.ts
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { Account } from '@xyo-network/account'
|
|
3
|
-
import {
|
|
4
|
-
import { ArchivingModule, ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist'
|
|
3
|
+
import { AbstractArchivingModule, ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist'
|
|
5
4
|
import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
|
|
6
5
|
import { BoundWitness } from '@xyo-network/boundwitness-model'
|
|
7
6
|
import { handleErrorAsync } from '@xyo-network/error'
|
|
8
7
|
import { AnyConfigSchema, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
|
|
9
8
|
import { Payload } from '@xyo-network/payload-model'
|
|
10
|
-
import {
|
|
9
|
+
import { isWitnessInstance, WitnessInstance } from '@xyo-network/witness'
|
|
11
10
|
import uniq from 'lodash/uniq'
|
|
12
11
|
|
|
13
12
|
import { SentinelConfig, SentinelConfigSchema } from './Config'
|
|
14
13
|
import { SentinelQueryBase, SentinelReportQuerySchema } from './Queries'
|
|
15
|
-
import {
|
|
14
|
+
import { SentinelInstance, SentinelModuleEventData, SentinelParams } from './SentinelModel'
|
|
16
15
|
|
|
17
16
|
export abstract class AbstractSentinel<
|
|
18
17
|
TParams extends SentinelParams<AnyConfigSchema<SentinelConfig>> = SentinelParams<SentinelConfig>,
|
|
19
18
|
TEventData extends SentinelModuleEventData = SentinelModuleEventData,
|
|
20
19
|
>
|
|
21
|
-
extends
|
|
22
|
-
implements
|
|
20
|
+
extends AbstractArchivingModule<TParams, TEventData>
|
|
21
|
+
implements SentinelInstance<TParams, TEventData>
|
|
23
22
|
{
|
|
24
23
|
static override readonly configSchemas: string[] = [SentinelConfigSchema]
|
|
25
24
|
|
|
26
25
|
history: BoundWitness[] = []
|
|
27
26
|
|
|
28
27
|
private _archivists: ArchivistInstance[] | undefined
|
|
29
|
-
private _witnesses:
|
|
28
|
+
private _witnesses: WitnessInstance[] | undefined
|
|
30
29
|
|
|
31
30
|
override get queries(): string[] {
|
|
32
31
|
return [SentinelReportQuerySchema, ...super.queries]
|
|
@@ -62,10 +61,9 @@ export abstract class AbstractSentinel<
|
|
|
62
61
|
return this._archivists
|
|
63
62
|
}
|
|
64
63
|
|
|
65
|
-
async getWitnesses(
|
|
64
|
+
async getWitnesses() {
|
|
66
65
|
const addresses = this.config?.witnesses ? (Array.isArray(this.config.witnesses) ? this.config?.witnesses : [this.config.witnesses]) : []
|
|
67
|
-
this._witnesses =
|
|
68
|
-
this._witnesses ?? (await this.resolve({ address: addresses })).map((witness) => WitnessWrapper.wrap(witness, account ?? this.account))
|
|
66
|
+
this._witnesses = this._witnesses ?? ((await this.resolve({ address: addresses }, { identity: isWitnessInstance })) as WitnessInstance[])
|
|
69
67
|
|
|
70
68
|
if (addresses.length !== this._witnesses.length) {
|
|
71
69
|
this.logger?.warn(`Not all witnesses found [Requested: ${addresses.length}, Found: ${this._witnesses.length}]`)
|
|
@@ -74,12 +72,6 @@ export abstract class AbstractSentinel<
|
|
|
74
72
|
return this._witnesses
|
|
75
73
|
}
|
|
76
74
|
|
|
77
|
-
override async loadAccount() {
|
|
78
|
-
const account = await super.loadAccount()
|
|
79
|
-
this.downResolver.add(this)
|
|
80
|
-
return account
|
|
81
|
-
}
|
|
82
|
-
|
|
83
75
|
removeArchivist(address: string[]) {
|
|
84
76
|
this.config.archivists = (this.config.archivists ?? []).filter((archivist) => !address.includes(archivist))
|
|
85
77
|
this._archivists = undefined
|