@xyo-network/witness 2.62.2 → 2.63.0
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/AbstractWitness.js +5 -3
- package/dist/cjs/AbstractWitness.js.map +1 -1
- package/dist/cjs/WitnessWrapper.js.map +1 -1
- package/dist/docs.json +41018 -73666
- package/dist/esm/AbstractWitness.js +6 -4
- package/dist/esm/AbstractWitness.js.map +1 -1
- package/dist/types/AbstractWitness.d.ts.map +1 -1
- package/package.json +10 -10
- package/src/AbstractWitness.ts +14 -4
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { Account } from '@xyo-network/account';
|
|
3
3
|
import { PayloadHasher } from '@xyo-network/core';
|
|
4
|
-
import { AbstractModule, ModuleErrorBuilder, QueryBoundWitnessWrapper } from '@xyo-network/module';
|
|
4
|
+
import { AbstractModule, creatableModule, ModuleErrorBuilder, QueryBoundWitnessWrapper, } from '@xyo-network/module';
|
|
5
5
|
import { WitnessConfigSchema } from './Config';
|
|
6
6
|
import { WitnessObserveQuerySchema } from './Queries';
|
|
7
|
+
creatableModule();
|
|
7
8
|
export class AbstractWitness extends AbstractModule {
|
|
8
9
|
static configSchema = WitnessConfigSchema;
|
|
9
10
|
get queries() {
|
|
@@ -30,14 +31,14 @@ export class AbstractWitness extends AbstractModule {
|
|
|
30
31
|
assertEx(this.queryable(query, payloads, queryConfig));
|
|
31
32
|
// Remove the query payload from the arguments passed to us so we don't observe it
|
|
32
33
|
const filteredObservation = await PayloadHasher.filterExclude(payloads, query.query);
|
|
33
|
-
const queryAccount =
|
|
34
|
+
const queryAccount = Account.random();
|
|
34
35
|
try {
|
|
35
36
|
switch (queryPayload.schema) {
|
|
36
37
|
case WitnessObserveQuerySchema: {
|
|
37
38
|
await this.emit('reportStart', { inPayloads: payloads, module: this });
|
|
38
39
|
const resultPayloads = await this.observe(filteredObservation);
|
|
39
40
|
await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads });
|
|
40
|
-
return this.bindQueryResult(queryPayload, resultPayloads, [queryAccount]);
|
|
41
|
+
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount]))[0];
|
|
41
42
|
}
|
|
42
43
|
default: {
|
|
43
44
|
return super.queryHandler(query, payloads);
|
|
@@ -46,12 +47,13 @@ export class AbstractWitness extends AbstractModule {
|
|
|
46
47
|
}
|
|
47
48
|
catch (ex) {
|
|
48
49
|
const error = ex;
|
|
49
|
-
|
|
50
|
+
const [result] = await this.bindQueryResult(queryPayload, [
|
|
50
51
|
new ModuleErrorBuilder()
|
|
51
52
|
.sources([await wrapper.hashAsync()])
|
|
52
53
|
.message(error.message)
|
|
53
54
|
.build(),
|
|
54
55
|
], [queryAccount]);
|
|
56
|
+
return result;
|
|
55
57
|
}
|
|
56
58
|
}
|
|
57
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEd,YAAY,EAEZ,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAA2C,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACrF,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAGhF,qBAAa,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,EAAE,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,CAC5I,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC;IAE7C,OAAgB,YAAY,EAAE,MAAM,CAAsB;IAE1D,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ3B,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;CAkC9B"}
|
package/package.json
CHANGED
|
@@ -11,17 +11,17 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.1",
|
|
14
|
-
"@xyo-network/account": "^2.
|
|
15
|
-
"@xyo-network/core": "^2.
|
|
16
|
-
"@xyo-network/module": "^2.
|
|
17
|
-
"@xyo-network/module-model": "^2.
|
|
18
|
-
"@xyo-network/payload-model": "^2.
|
|
19
|
-
"@xyo-network/payload-wrapper": "^2.
|
|
20
|
-
"@xyo-network/promise": "^2.
|
|
14
|
+
"@xyo-network/account": "^2.63.0",
|
|
15
|
+
"@xyo-network/core": "^2.63.0",
|
|
16
|
+
"@xyo-network/module": "^2.63.0",
|
|
17
|
+
"@xyo-network/module-model": "^2.63.0",
|
|
18
|
+
"@xyo-network/payload-model": "^2.63.0",
|
|
19
|
+
"@xyo-network/payload-wrapper": "^2.63.0",
|
|
20
|
+
"@xyo-network/promise": "^2.63.0"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@xylabs/ts-scripts-yarn3": "^2.17.
|
|
24
|
-
"@xylabs/tsconfig": "^2.17.
|
|
23
|
+
"@xylabs/ts-scripts-yarn3": "^2.17.17",
|
|
24
|
+
"@xylabs/tsconfig": "^2.17.17",
|
|
25
25
|
"typescript": "^5.1.3"
|
|
26
26
|
},
|
|
27
27
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
},
|
|
58
58
|
"sideEffects": false,
|
|
59
59
|
"types": "dist/types/index.d.ts",
|
|
60
|
-
"version": "2.
|
|
60
|
+
"version": "2.63.0"
|
|
61
61
|
}
|
package/src/AbstractWitness.ts
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { Account } from '@xyo-network/account'
|
|
3
3
|
import { PayloadHasher } from '@xyo-network/core'
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
AbstractModule,
|
|
6
|
+
creatableModule,
|
|
7
|
+
ModuleConfig,
|
|
8
|
+
ModuleErrorBuilder,
|
|
9
|
+
ModuleQueryResult,
|
|
10
|
+
QueryBoundWitness,
|
|
11
|
+
QueryBoundWitnessWrapper,
|
|
12
|
+
} from '@xyo-network/module'
|
|
5
13
|
import { Payload } from '@xyo-network/payload-model'
|
|
6
14
|
import { Promisable } from '@xyo-network/promise'
|
|
7
15
|
|
|
@@ -9,6 +17,7 @@ import { WitnessConfigSchema } from './Config'
|
|
|
9
17
|
import { WitnessObserveQuerySchema, WitnessQuery, WitnessQueryBase } from './Queries'
|
|
10
18
|
import { WitnessModule, WitnessModuleEventData, WitnessParams } from './Witness'
|
|
11
19
|
|
|
20
|
+
creatableModule()
|
|
12
21
|
export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData>
|
|
13
22
|
extends AbstractModule<TParams, TEventData>
|
|
14
23
|
implements WitnessModule<TParams, TEventData>
|
|
@@ -47,14 +56,14 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
|
|
|
47
56
|
assertEx(this.queryable(query, payloads, queryConfig))
|
|
48
57
|
// Remove the query payload from the arguments passed to us so we don't observe it
|
|
49
58
|
const filteredObservation = await PayloadHasher.filterExclude(payloads, query.query)
|
|
50
|
-
const queryAccount =
|
|
59
|
+
const queryAccount = Account.random()
|
|
51
60
|
try {
|
|
52
61
|
switch (queryPayload.schema) {
|
|
53
62
|
case WitnessObserveQuerySchema: {
|
|
54
63
|
await this.emit('reportStart', { inPayloads: payloads, module: this })
|
|
55
64
|
const resultPayloads = await this.observe(filteredObservation)
|
|
56
65
|
await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
|
|
57
|
-
return this.bindQueryResult(queryPayload, resultPayloads, [queryAccount])
|
|
66
|
+
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount]))[0]
|
|
58
67
|
}
|
|
59
68
|
default: {
|
|
60
69
|
return super.queryHandler(query, payloads)
|
|
@@ -62,7 +71,7 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
|
|
|
62
71
|
}
|
|
63
72
|
} catch (ex) {
|
|
64
73
|
const error = ex as Error
|
|
65
|
-
|
|
74
|
+
const [result] = await this.bindQueryResult(
|
|
66
75
|
queryPayload,
|
|
67
76
|
[
|
|
68
77
|
new ModuleErrorBuilder()
|
|
@@ -72,6 +81,7 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
|
|
|
72
81
|
],
|
|
73
82
|
[queryAccount],
|
|
74
83
|
)
|
|
84
|
+
return result
|
|
75
85
|
}
|
|
76
86
|
}
|
|
77
87
|
}
|