@serve.zone/interfaces 31.9.0 → 32.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +476 -0
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/appstore/types.d.ts +4 -6
- package/dist_ts/appstore/types.js +5 -5
- package/dist_ts/data/backup.d.ts +3 -26
- package/dist_ts/data/cluster.d.ts +36 -11
- package/dist_ts/data/cluster.js +33 -22
- package/dist_ts/data/clusteringress.d.ts +8 -0
- package/dist_ts/data/clusteringress.js +13 -8
- package/dist_ts/data/clusternode.d.ts +121 -74
- package/dist_ts/data/clusternode.js +109 -132
- package/dist_ts/data/coremail.d.ts +3 -7
- package/dist_ts/data/coremail.js +2 -2
- package/dist_ts/data/coremail.runtime.d.ts +0 -1
- package/dist_ts/data/coremail.runtime.js +5 -22
- package/dist_ts/data/deploymentadoption.d.ts +0 -2
- package/dist_ts/data/deploymentadoption.js +40 -6
- package/dist_ts/data/deploymentoperation.js +16 -3
- package/dist_ts/data/deploymentpreflight.d.ts +0 -2
- package/dist_ts/data/deploymentpreflight.js +1 -1
- package/dist_ts/data/immutableimage.d.ts +38 -21
- package/dist_ts/data/immutableimage.js +45 -5
- package/dist_ts/data/index.d.ts +1 -1
- package/dist_ts/data/isolatedrestore.d.ts +139 -21
- package/dist_ts/data/isolatedrestore.golden.d.ts +0 -1
- package/dist_ts/data/isolatedrestore.golden.js +6 -9
- package/dist_ts/data/isolatedrestore.js +176 -40
- package/dist_ts/data/mail.d.ts +1 -1
- package/dist_ts/data/networkaddressplan.d.ts +8 -8
- package/dist_ts/data/networkaddressplan.js +4 -4
- package/dist_ts/data/networkauthority.d.ts +20 -22
- package/dist_ts/data/networkauthority.js +26 -28
- package/dist_ts/data/networkcredential.d.ts +10 -10
- package/dist_ts/data/networkcredential.js +16 -16
- package/dist_ts/data/networkdelivery.d.ts +18 -18
- package/dist_ts/data/networkdelivery.js +16 -16
- package/dist_ts/data/networklease.d.ts +18 -7
- package/dist_ts/data/networklease.js +29 -7
- package/dist_ts/data/networknode.d.ts +2 -2
- package/dist_ts/data/networkprojection.d.ts +59 -60
- package/dist_ts/data/networkprojection.js +53 -57
- package/dist_ts/data/networkprotection.d.ts +27 -28
- package/dist_ts/data/networkprotection.js +36 -36
- package/dist_ts/data/networkrouter.d.ts +11 -11
- package/dist_ts/data/networkrouter.js +1 -1
- package/dist_ts/data/networksigning.d.ts +16 -18
- package/dist_ts/data/networksigning.js +20 -21
- package/dist_ts/data/nodecredential.d.ts +4 -6
- package/dist_ts/data/nodeenrollment.d.ts +35 -40
- package/dist_ts/data/nodeenrollment.js +57 -72
- package/dist_ts/data/privatenetwork.d.ts +21 -24
- package/dist_ts/data/privatenetwork.js +39 -54
- package/dist_ts/data/runtimeassignment.d.ts +50 -34
- package/dist_ts/data/runtimeassignment.js +79 -45
- package/dist_ts/data/runtimeconfig.d.ts +21 -22
- package/dist_ts/data/runtimeconfig.js +24 -24
- package/dist_ts/data/runtimesession.d.ts +100 -62
- package/dist_ts/data/runtimesession.js +98 -79
- package/dist_ts/data/runtimeterminalreceipt.d.ts +28 -29
- package/dist_ts/data/runtimeterminalreceipt.js +42 -42
- package/dist_ts/data/secret.d.ts +18 -25
- package/dist_ts/data/secret.js +12 -52
- package/dist_ts/data/servicecredential.d.ts +14 -16
- package/dist_ts/data/servicecredential.js +17 -28
- package/dist_ts/data/serviceruntime.d.ts +7 -7
- package/dist_ts/data/serviceruntime.js +4 -4
- package/dist_ts/data/sparknodereport.d.ts +27 -14
- package/dist_ts/data/sparknodereport.js +35 -28
- package/dist_ts/data/webpush.d.ts +0 -1
- package/dist_ts/index.d.ts +2 -1
- package/dist_ts/index.js +3 -2
- package/dist_ts/platform/objectstorageretention.d.ts +21 -24
- package/dist_ts/platform/objectstorageretention.js +10 -17
- package/dist_ts/platform/storage.d.ts +1 -3
- package/dist_ts/platform/storagemigration.d.ts +0 -7
- package/dist_ts/platform/storagemigration.golden.d.ts +0 -1
- package/dist_ts/platform/storagemigration.golden.js +8 -12
- package/dist_ts/platform/storagemigration.js +6 -51
- package/dist_ts/platform/types.d.ts +2 -2
- package/dist_ts/private/canonicaljson.d.ts +9 -1
- package/dist_ts/private/canonicaljson.js +14 -2
- package/dist_ts/private/dataproperties.d.ts +62 -0
- package/dist_ts/private/dataproperties.js +117 -0
- package/dist_ts/private/networkcontract.d.ts +10 -10
- package/dist_ts/private/networkcontract.js +1 -1
- package/dist_ts/private/releaseversion.d.ts +37 -0
- package/dist_ts/private/releaseversion.js +48 -0
- package/dist_ts/private/runtimepolicy.d.ts +2 -2
- package/dist_ts/private/runtimepolicy.js +1 -1
- package/dist_ts/private/tokenlist.d.ts +9 -0
- package/dist_ts/private/tokenlist.js +23 -0
- package/dist_ts/protocol.d.ts +137 -0
- package/dist_ts/protocol.js +255 -0
- package/dist_ts/requests/admin.d.ts +8 -8
- package/dist_ts/requests/backup.d.ts +102 -112
- package/dist_ts/requests/cluster.d.ts +10 -10
- package/dist_ts/requests/clusteringress.d.ts +9 -0
- package/dist_ts/requests/clusteringress.js +1 -1
- package/dist_ts/requests/config.d.ts +3 -3
- package/dist_ts/requests/corestore.d.ts +0 -3
- package/dist_ts/requests/corestore.js +5 -9
- package/dist_ts/requests/network.d.ts +30 -30
- package/dist_ts/requests/node.d.ts +15 -28
- package/dist_ts/requests/pallet.d.ts +13 -13
- package/dist_ts/requests/runtimesession.d.ts +53 -41
- package/dist_ts/requests/secret.d.ts +4 -5
- package/dist_ts/requests/secret.js +1 -5
- package/dist_ts/runtime.corestore.d.ts +56 -74
- package/dist_ts/runtime.corestore.databaseexportpackage.d.ts +30 -36
- package/dist_ts/runtime.corestore.databaseexportpackage.golden.d.ts +11 -12
- package/dist_ts/runtime.corestore.databaseexportpackage.golden.js +54 -71
- package/dist_ts/runtime.corestore.databaseexportpackage.js +9 -25
- package/dist_ts/runtime.corestore.js +35 -135
- package/dist_ts/runtime.corestore.relay.js +2 -7
- package/dist_ts/runtime.d.ts +38 -48
- package/dist_ts/runtime.js +20 -77
- package/dist_ts/runtime.networkprojection.d.ts +4 -4
- package/dist_ts/runtime.networkprojection.js +18 -18
- package/dist_ts/runtime.workloadinit.d.ts +23 -24
- package/dist_ts/runtime.workloadinit.js +6 -13
- package/package.json +2 -2
- package/readme.md +421 -270
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/appstore/types.ts +4 -6
- package/ts/data/backup.ts +3 -38
- package/ts/data/cluster.ts +51 -34
- package/ts/data/clusteringress.ts +12 -12
- package/ts/data/clusternode.ts +204 -232
- package/ts/data/coremail.runtime.ts +4 -21
- package/ts/data/coremail.ts +3 -7
- package/ts/data/deploymentadoption.ts +46 -4
- package/ts/data/deploymentoperation.ts +16 -1
- package/ts/data/deploymentpreflight.ts +0 -2
- package/ts/data/immutableimage.ts +71 -24
- package/ts/data/index.ts +1 -1
- package/ts/data/isolatedrestore.golden.ts +5 -9
- package/ts/data/isolatedrestore.ts +339 -54
- package/ts/data/mail.ts +1 -1
- package/ts/data/networkaddressplan.ts +13 -13
- package/ts/data/networkauthority.ts +42 -46
- package/ts/data/networkcredential.ts +24 -24
- package/ts/data/networkdelivery.ts +27 -27
- package/ts/data/networklease.ts +40 -13
- package/ts/data/networknode.ts +2 -2
- package/ts/data/networkprojection.ts +119 -124
- package/ts/data/networkprotection.ts +54 -55
- package/ts/data/networkrouter.ts +14 -14
- package/ts/data/networksigning.ts +29 -32
- package/ts/data/nodecredential.ts +4 -6
- package/ts/data/nodeenrollment.ts +96 -114
- package/ts/data/privatenetwork.ts +58 -74
- package/ts/data/runtimeassignment.ts +143 -94
- package/ts/data/runtimeconfig.ts +45 -46
- package/ts/data/runtimesession.ts +185 -138
- package/ts/data/runtimeterminalreceipt.ts +72 -73
- package/ts/data/secret.ts +28 -76
- package/ts/data/servicecredential.ts +33 -43
- package/ts/data/serviceruntime.ts +11 -11
- package/ts/data/sparknodereport.ts +48 -36
- package/ts/data/webpush.ts +0 -1
- package/ts/index.ts +2 -0
- package/ts/platform/objectstorageretention.ts +40 -54
- package/ts/platform/storage.ts +1 -3
- package/ts/platform/storagemigration.golden.ts +7 -11
- package/ts/platform/storagemigration.ts +5 -55
- package/ts/platform/types.ts +2 -2
- package/ts/private/canonicaljson.ts +13 -1
- package/ts/private/dataproperties.ts +139 -0
- package/ts/private/networkcontract.ts +9 -9
- package/ts/private/releaseversion.ts +70 -0
- package/ts/private/runtimepolicy.ts +2 -2
- package/ts/private/tokenlist.ts +30 -0
- package/ts/protocol.ts +364 -0
- package/ts/requests/admin.ts +11 -11
- package/ts/requests/backup.ts +112 -117
- package/ts/requests/cluster.ts +13 -13
- package/ts/requests/clusteringress.ts +9 -0
- package/ts/requests/config.ts +3 -3
- package/ts/requests/corestore.ts +4 -16
- package/ts/requests/network.ts +40 -40
- package/ts/requests/node.ts +21 -38
- package/ts/requests/pallet.ts +17 -17
- package/ts/requests/runtimesession.ts +63 -51
- package/ts/requests/secret.ts +5 -10
- package/ts/runtime.corestore.databaseexportpackage.golden.ts +77 -95
- package/ts/runtime.corestore.databaseexportpackage.ts +51 -73
- package/ts/runtime.corestore.relay.ts +1 -10
- package/ts/runtime.corestore.ts +118 -268
- package/ts/runtime.networkprojection.ts +30 -30
- package/ts/runtime.ts +83 -158
- package/ts/runtime.workloadinit.ts +36 -48
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.d.ts +0 -902
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.golden.d.ts +0 -35
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.golden.js +0 -315
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.js +0 -3315
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.d.ts +0 -291
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.d.ts +0 -30
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.js +0 -408
- package/dist_ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.js +0 -1126
- package/ts/runtime.cloudlylegacydeploymentsettlement.golden.ts +0 -421
- package/ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.golden.ts +0 -510
- package/ts/runtime.cloudlylegacydeploymentsettlement.offlineexport.ts +0 -2470
- package/ts/runtime.cloudlylegacydeploymentsettlement.ts +0 -6630
|
@@ -1,8 +1,57 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
+
import { protocolRefusalHttpStatus, validateProtocolOfferOn } from '../protocol.js';
|
|
2
3
|
import { canonicalizeStrictJson, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
import { hasExactKeys } from '../private/dataproperties.js';
|
|
5
|
+
/**
|
|
6
|
+
* The Swarm-era Spark runtime's own routes.
|
|
7
|
+
*
|
|
8
|
+
* A separate runtime, not an older version of the node runtime: a worker in `coreflow-node` mode
|
|
9
|
+
* posts these four bodies, while a pallet node posts `sparkNodeHeartbeatContract.endpoint`. They
|
|
10
|
+
* retire together with coreflow, not with this release.
|
|
11
|
+
*
|
|
12
|
+
* Each route states its endpoint beside the bytes it reads and writes, in the same three members
|
|
13
|
+
* as `sparkNodeHeartbeatContract`, so one bounded-read helper serves every Spark route. The four
|
|
14
|
+
* bounds differ because the bodies do: a bound is the largest body its own shape can carry here,
|
|
15
|
+
* rounded up, and nothing larger is read before it is refused. Every route is judged in the one
|
|
16
|
+
* server order `protocol.readProtocolOffer` states, against this server's `sparkSwarmNode` offer;
|
|
17
|
+
* none of them carries a typed error, so a refusal is answered with `protocolRefusalStatus` and an
|
|
18
|
+
* `IProtocolRefusal` body before the node is authenticated and before the body is acted on. Every
|
|
19
|
+
* answer states this server's own offer, exactly as the request states the reporter's, so each
|
|
20
|
+
* side judges the other from the bodies they exchanged.
|
|
21
|
+
*/
|
|
22
|
+
export const sparkSwarmNodeContracts = Object.freeze({
|
|
23
|
+
/** The full runtime description on every beat; each described service costs some 600 bytes. */
|
|
24
|
+
heartbeat: Object.freeze({
|
|
25
|
+
endpoint: '/spark/swarm-nodes/heartbeat',
|
|
26
|
+
maxRequestBytes: 32_768,
|
|
27
|
+
maxResponseBytes: 2048,
|
|
28
|
+
}),
|
|
29
|
+
/** One sample up, every action the server holds for this node back down. */
|
|
30
|
+
metricsSample: Object.freeze({
|
|
31
|
+
endpoint: '/spark/swarm-nodes/metrics-sample',
|
|
32
|
+
maxRequestBytes: 4096,
|
|
33
|
+
maxResponseBytes: 32_768,
|
|
34
|
+
}),
|
|
35
|
+
/** `resultText` is the body here, and a server keeps at most 4000 characters of it. */
|
|
36
|
+
actionResult: Object.freeze({
|
|
37
|
+
endpoint: '/spark/swarm-nodes/action-result',
|
|
38
|
+
maxRequestBytes: 8192,
|
|
39
|
+
maxResponseBytes: 2048,
|
|
40
|
+
}),
|
|
41
|
+
/**
|
|
42
|
+
* By far the largest of the four: a manager snapshot carries up to the 1024 observed nodes
|
|
43
|
+
* `validateSparkSwarmObservationRequest` admits, each with two identifiers of up to 200
|
|
44
|
+
* characters, which is close to 600 KiB of body this route must still be able to read.
|
|
45
|
+
*/
|
|
46
|
+
swarmObservation: Object.freeze({
|
|
47
|
+
endpoint: '/spark/swarm-nodes/swarm-observation',
|
|
48
|
+
maxRequestBytes: 786_432,
|
|
49
|
+
maxResponseBytes: 2048,
|
|
50
|
+
}),
|
|
51
|
+
protocolRefusalStatus: protocolRefusalHttpStatus,
|
|
52
|
+
});
|
|
53
|
+
export const sparkSwarmObservationContract = Object.freeze({
|
|
54
|
+
digestDomain: 'serve.zone/spark-swarm-observation',
|
|
6
55
|
maximumPastAgeMs: 300_000,
|
|
7
56
|
maximumFutureSkewMs: 30_000,
|
|
8
57
|
retainedRetiredSessionIds: 32,
|
|
@@ -26,7 +75,6 @@ const runtimePlatforms = new Set([
|
|
|
26
75
|
]);
|
|
27
76
|
const maximumSwarmNodes = 1024;
|
|
28
77
|
const isRuntimeRecord = (valueArg) => (Boolean(valueArg) && typeof valueArg === 'object' && !Array.isArray(valueArg));
|
|
29
|
-
const hasExactRuntimeKeys = (valueArg, keysArg) => JSON.stringify(Object.keys(valueArg).sort()) === JSON.stringify([...keysArg].sort());
|
|
30
78
|
const isRuntimeIdentifier = (valueArg) => (typeof valueArg === 'string' && runtimeIdentifierRegex.test(valueArg));
|
|
31
79
|
const isPositiveSafeInteger = (valueArg) => (Number.isSafeInteger(valueArg) && valueArg > 0);
|
|
32
80
|
const computeSha256 = async (inputArg) => {
|
|
@@ -35,14 +83,14 @@ const computeSha256 = async (inputArg) => {
|
|
|
35
83
|
.map((byteArg) => byteArg.toString(16).padStart(2, '0'))
|
|
36
84
|
.join('')}`;
|
|
37
85
|
};
|
|
38
|
-
const
|
|
39
|
-
throw new Error(`Spark Swarm observation
|
|
86
|
+
const failSparkSwarmObservationCanonicalization = (reasonArg) => {
|
|
87
|
+
throw new Error(`Spark Swarm observation cannot be canonicalized: ${reasonArg}`);
|
|
40
88
|
};
|
|
41
|
-
export const
|
|
42
|
-
domain:
|
|
89
|
+
export const createSparkSwarmObservationDigestInput = (observationArg) => canonicalizeStrictJson({
|
|
90
|
+
domain: sparkSwarmObservationContract.digestDomain,
|
|
43
91
|
observation: observationArg,
|
|
44
|
-
},
|
|
45
|
-
export const
|
|
92
|
+
}, failSparkSwarmObservationCanonicalization, 'Spark Swarm observation digest input');
|
|
93
|
+
export const computeSparkSwarmObservationDigest = async (observationArg) => `sha256:${await createCanonicalJsonSha256Hex(createSparkSwarmObservationDigestInput(observationArg), failSparkSwarmObservationCanonicalization)}`;
|
|
46
94
|
const canonicalSwarmNode = (nodeArg) => ({
|
|
47
95
|
swarmNodeId: nodeArg.swarmNodeId,
|
|
48
96
|
nodeName: nodeArg.nodeName,
|
|
@@ -58,10 +106,8 @@ const canonicalSwarmNode = (nodeArg) => ({
|
|
|
58
106
|
: null,
|
|
59
107
|
});
|
|
60
108
|
export const createSwarmManagerSnapshotDigestInput = (swarmClusterIdArg, snapshotArg) => JSON.stringify({
|
|
61
|
-
schemaVersion: 1,
|
|
62
109
|
purpose: 'serve.zone/swarm-manager-snapshot',
|
|
63
110
|
swarmClusterId: swarmClusterIdArg,
|
|
64
|
-
snapshotVersion: snapshotArg.snapshotVersion,
|
|
65
111
|
nodeCount: snapshotArg.nodeCount,
|
|
66
112
|
managerCount: snapshotArg.managerCount,
|
|
67
113
|
nodes: snapshotArg.nodes.map(canonicalSwarmNode),
|
|
@@ -69,8 +115,7 @@ export const createSwarmManagerSnapshotDigestInput = (swarmClusterIdArg, snapsho
|
|
|
69
115
|
export const computeSwarmManagerSnapshotDigest = async (swarmClusterIdArg, snapshotArg) => computeSha256(createSwarmManagerSnapshotDigestInput(swarmClusterIdArg, snapshotArg));
|
|
70
116
|
const validateSwarmManagerSnapshot = async (swarmClusterIdArg, localSwarmNodeIdArg, snapshotArg) => {
|
|
71
117
|
if (!isRuntimeRecord(snapshotArg)
|
|
72
|
-
|| !
|
|
73
|
-
'snapshotVersion',
|
|
118
|
+
|| !hasExactKeys(snapshotArg, [
|
|
74
119
|
'snapshotDigest',
|
|
75
120
|
'nodeCount',
|
|
76
121
|
'managerCount',
|
|
@@ -79,9 +124,6 @@ const validateSwarmManagerSnapshot = async (swarmClusterIdArg, localSwarmNodeIdA
|
|
|
79
124
|
return ['Spark Swarm manager snapshot must use its exact schema'];
|
|
80
125
|
}
|
|
81
126
|
const errors = [];
|
|
82
|
-
if (snapshotArg.snapshotVersion !== 1) {
|
|
83
|
-
errors.push('Spark Swarm manager snapshotVersion must be 1');
|
|
84
|
-
}
|
|
85
127
|
if (typeof snapshotArg.snapshotDigest !== 'string'
|
|
86
128
|
|| !runtimeDigestRegex.test(snapshotArg.snapshotDigest)) {
|
|
87
129
|
errors.push('Spark Swarm manager snapshot digest must be canonical');
|
|
@@ -116,7 +158,7 @@ const validateSwarmManagerSnapshot = async (swarmClusterIdArg, localSwarmNodeIdA
|
|
|
116
158
|
'state',
|
|
117
159
|
...(isManager ? ['managerStatus'] : []),
|
|
118
160
|
];
|
|
119
|
-
if (!
|
|
161
|
+
if (!hasExactKeys(nodeArg, expectedKeys)) {
|
|
120
162
|
errors.push(`Spark Swarm manager snapshot nodes[${index}] must use its exact role schema`);
|
|
121
163
|
}
|
|
122
164
|
if (!isRuntimeIdentifier(nodeArg.swarmNodeId) || !isRuntimeIdentifier(nodeArg.nodeName)) {
|
|
@@ -133,7 +175,7 @@ const validateSwarmManagerSnapshot = async (swarmClusterIdArg, localSwarmNodeIdA
|
|
|
133
175
|
if (isManager) {
|
|
134
176
|
managerCount++;
|
|
135
177
|
if (!isRuntimeRecord(nodeArg.managerStatus)
|
|
136
|
-
|| !
|
|
178
|
+
|| !hasExactKeys(nodeArg.managerStatus, ['leader', 'reachability'])
|
|
137
179
|
|| typeof nodeArg.managerStatus.leader !== 'boolean'
|
|
138
180
|
|| !['unknown', 'unreachable', 'reachable']
|
|
139
181
|
.includes(nodeArg.managerStatus.reachability)) {
|
|
@@ -189,70 +231,6 @@ export const validateSparkSwarmObservation = async (observationArg) => {
|
|
|
189
231
|
return ['Spark Swarm observation must be an object'];
|
|
190
232
|
const observation = observationArg;
|
|
191
233
|
const commonKeys = [
|
|
192
|
-
'schemaVersion',
|
|
193
|
-
'reporterSessionId',
|
|
194
|
-
'observationSequence',
|
|
195
|
-
'observedAt',
|
|
196
|
-
'state',
|
|
197
|
-
];
|
|
198
|
-
const expectedKeys = observation.state === 'unknown'
|
|
199
|
-
? [...commonKeys, 'reason']
|
|
200
|
-
: observation.state === 'not-member'
|
|
201
|
-
? commonKeys
|
|
202
|
-
: observation.state === 'member'
|
|
203
|
-
? [
|
|
204
|
-
...commonKeys,
|
|
205
|
-
'swarmClusterId',
|
|
206
|
-
'localSwarmNodeId',
|
|
207
|
-
'controlAvailable',
|
|
208
|
-
...(observation.managerSnapshot === undefined ? [] : ['managerSnapshot']),
|
|
209
|
-
]
|
|
210
|
-
: [];
|
|
211
|
-
if (expectedKeys.length === 0 || !hasExactRuntimeKeys(observation, expectedKeys)) {
|
|
212
|
-
return ['Spark Swarm observation must use its exact state schema'];
|
|
213
|
-
}
|
|
214
|
-
const errors = [];
|
|
215
|
-
if (observation.schemaVersion !== 1)
|
|
216
|
-
errors.push('Spark Swarm observation schemaVersion must be 1');
|
|
217
|
-
if (!isRuntimeIdentifier(observation.reporterSessionId)
|
|
218
|
-
|| !isPositiveSafeInteger(observation.observationSequence)
|
|
219
|
-
|| !isPositiveSafeInteger(observation.observedAt)) {
|
|
220
|
-
errors.push('Spark Swarm observation identity, sequence, and timestamp must be canonical');
|
|
221
|
-
}
|
|
222
|
-
if (observation.state === 'unknown'
|
|
223
|
-
&& !['docker-unavailable', 'query-failed', 'not-initialized']
|
|
224
|
-
.includes(observation.reason)) {
|
|
225
|
-
errors.push('Spark Swarm observation unknown reason must be canonical');
|
|
226
|
-
}
|
|
227
|
-
if (observation.state === 'member') {
|
|
228
|
-
if (!isRuntimeIdentifier(observation.swarmClusterId)
|
|
229
|
-
|| !isRuntimeIdentifier(observation.localSwarmNodeId)
|
|
230
|
-
|| typeof observation.controlAvailable !== 'boolean') {
|
|
231
|
-
errors.push('Spark Swarm member observation must have canonical local authority');
|
|
232
|
-
}
|
|
233
|
-
if (observation.managerSnapshot !== undefined) {
|
|
234
|
-
if (observation.controlAvailable !== true) {
|
|
235
|
-
errors.push('Spark Swarm manager snapshot requires controlAvailable');
|
|
236
|
-
}
|
|
237
|
-
else if (isRuntimeIdentifier(observation.swarmClusterId)
|
|
238
|
-
&& isRuntimeIdentifier(observation.localSwarmNodeId)) {
|
|
239
|
-
errors.push(...await validateSwarmManagerSnapshot(observation.swarmClusterId, observation.localSwarmNodeId, observation.managerSnapshot));
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
return errors;
|
|
244
|
-
}
|
|
245
|
-
catch {
|
|
246
|
-
return ['Spark Swarm observation must be safely inspectable'];
|
|
247
|
-
}
|
|
248
|
-
};
|
|
249
|
-
export const validateSparkSwarmObservationV2 = async (observationArg) => {
|
|
250
|
-
try {
|
|
251
|
-
if (!isRuntimeRecord(observationArg))
|
|
252
|
-
return ['Spark Swarm observation v2 must be an object'];
|
|
253
|
-
const observation = observationArg;
|
|
254
|
-
const commonKeys = [
|
|
255
|
-
'schemaVersion',
|
|
256
234
|
'reporterSessionId',
|
|
257
235
|
'observationSequence',
|
|
258
236
|
'observedAt',
|
|
@@ -273,31 +251,28 @@ export const validateSparkSwarmObservationV2 = async (observationArg) => {
|
|
|
273
251
|
...(observation.managerSnapshot === undefined ? [] : ['managerSnapshot']),
|
|
274
252
|
]
|
|
275
253
|
: [];
|
|
276
|
-
if (expectedKeys.length === 0 || !
|
|
277
|
-
return ['Spark Swarm observation
|
|
254
|
+
if (expectedKeys.length === 0 || !hasExactKeys(observation, expectedKeys)) {
|
|
255
|
+
return ['Spark Swarm observation must use its exact state schema'];
|
|
278
256
|
}
|
|
279
257
|
const errors = [];
|
|
280
|
-
if (observation.schemaVersion !== 2) {
|
|
281
|
-
errors.push('Spark Swarm observation v2 schemaVersion must be 2');
|
|
282
|
-
}
|
|
283
258
|
if (!isRuntimeIdentifier(observation.reporterSessionId)
|
|
284
259
|
|| !isPositiveSafeInteger(observation.observationSequence)
|
|
285
260
|
|| !isPositiveSafeInteger(observation.observedAt)) {
|
|
286
|
-
errors.push('Spark Swarm observation
|
|
261
|
+
errors.push('Spark Swarm observation identity, sequence, and timestamp must be canonical');
|
|
287
262
|
}
|
|
288
263
|
if (observation.state === 'unknown'
|
|
289
264
|
&& !['docker-unavailable', 'query-failed', 'not-initialized']
|
|
290
265
|
.includes(observation.reason)) {
|
|
291
|
-
errors.push('Spark Swarm observation
|
|
266
|
+
errors.push('Spark Swarm observation unknown reason must be canonical');
|
|
292
267
|
}
|
|
293
268
|
if (observation.state === 'member') {
|
|
294
269
|
if (!isRuntimeIdentifier(observation.localSwarmNodeId)
|
|
295
270
|
|| typeof observation.controlAvailable !== 'boolean') {
|
|
296
|
-
errors.push('Spark Swarm member observation
|
|
271
|
+
errors.push('Spark Swarm member observation must have canonical local authority');
|
|
297
272
|
}
|
|
298
273
|
if (observation.controlAvailable === true) {
|
|
299
274
|
if (!isRuntimeIdentifier(observation.swarmClusterId)) {
|
|
300
|
-
errors.push('Spark Swarm manager observation
|
|
275
|
+
errors.push('Spark Swarm manager observation must have canonical cluster authority');
|
|
301
276
|
}
|
|
302
277
|
else if (observation.managerSnapshot !== undefined
|
|
303
278
|
&& isRuntimeIdentifier(observation.localSwarmNodeId)) {
|
|
@@ -308,48 +283,48 @@ export const validateSparkSwarmObservationV2 = async (observationArg) => {
|
|
|
308
283
|
return errors;
|
|
309
284
|
}
|
|
310
285
|
catch {
|
|
311
|
-
return ['Spark Swarm observation
|
|
286
|
+
return ['Spark Swarm observation must be safely inspectable'];
|
|
312
287
|
}
|
|
313
288
|
};
|
|
314
|
-
export const
|
|
289
|
+
export const validateSparkSwarmObservationRequest = async (requestArg) => {
|
|
315
290
|
try {
|
|
316
291
|
if (!isRuntimeRecord(requestArg)
|
|
317
|
-
|| !
|
|
318
|
-
return ['Spark Swarm observation
|
|
292
|
+
|| !hasExactKeys(requestArg, ['nodeId', 'nodeToken', 'protocol', 'observation'])) {
|
|
293
|
+
return ['Spark Swarm observation request must use its exact schema'];
|
|
319
294
|
}
|
|
320
295
|
try {
|
|
321
|
-
canonicalizeStrictJson(requestArg,
|
|
296
|
+
canonicalizeStrictJson(requestArg, failSparkSwarmObservationCanonicalization, 'Spark Swarm observation request');
|
|
322
297
|
}
|
|
323
298
|
catch {
|
|
324
|
-
return ['Spark Swarm observation
|
|
299
|
+
return ['Spark Swarm observation request must contain strict canonical JSON data'];
|
|
325
300
|
}
|
|
326
|
-
const errors =
|
|
301
|
+
const errors = validateProtocolOfferOn(requestArg, 'Spark Swarm observation request protocol');
|
|
302
|
+
errors.push(...await validateSparkSwarmObservation(requestArg.observation));
|
|
327
303
|
if (!isRuntimeIdentifier(requestArg.nodeId)) {
|
|
328
|
-
errors.push('Spark Swarm observation
|
|
304
|
+
errors.push('Spark Swarm observation request nodeId must be canonical');
|
|
329
305
|
}
|
|
330
306
|
if (typeof requestArg.nodeToken !== 'string'
|
|
331
307
|
|| requestArg.nodeToken.length < 1
|
|
332
308
|
|| requestArg.nodeToken.length > 512
|
|
333
309
|
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
334
|
-
errors.push('Spark Swarm observation
|
|
310
|
+
errors.push('Spark Swarm observation request nodeToken must be a bounded opaque token');
|
|
335
311
|
}
|
|
336
312
|
return errors;
|
|
337
313
|
}
|
|
338
314
|
catch {
|
|
339
|
-
return ['Spark Swarm observation
|
|
315
|
+
return ['Spark Swarm observation request must be safely inspectable'];
|
|
340
316
|
}
|
|
341
317
|
};
|
|
342
|
-
export const
|
|
318
|
+
export const validateSparkSwarmObservationResponse = async (responseArg, expectedRequestArg) => {
|
|
343
319
|
try {
|
|
344
|
-
const requestErrors = await
|
|
320
|
+
const requestErrors = await validateSparkSwarmObservationRequest(expectedRequestArg);
|
|
345
321
|
if (requestErrors.length > 0) {
|
|
346
|
-
return ['expected Spark Swarm observation
|
|
322
|
+
return ['expected Spark Swarm observation request must be valid'];
|
|
347
323
|
}
|
|
348
324
|
if (!isRuntimeRecord(responseArg)) {
|
|
349
|
-
return ['Spark Swarm observation
|
|
325
|
+
return ['Spark Swarm observation response must be an object'];
|
|
350
326
|
}
|
|
351
327
|
const acceptedKeys = [
|
|
352
|
-
'schemaVersion',
|
|
353
328
|
'state',
|
|
354
329
|
'nodeId',
|
|
355
330
|
'reporterSessionId',
|
|
@@ -357,9 +332,9 @@ export const validateSparkSwarmObservationV2Response = async (responseArg, expec
|
|
|
357
332
|
'observationDigest',
|
|
358
333
|
'acceptedAt',
|
|
359
334
|
'targetGenerationAtAcceptance',
|
|
335
|
+
'protocol',
|
|
360
336
|
];
|
|
361
337
|
const rejectedKeys = [
|
|
362
|
-
'schemaVersion',
|
|
363
338
|
'state',
|
|
364
339
|
'nodeId',
|
|
365
340
|
'reporterSessionId',
|
|
@@ -368,52 +343,59 @@ export const validateSparkSwarmObservationV2Response = async (responseArg, expec
|
|
|
368
343
|
'rejectedAt',
|
|
369
344
|
'code',
|
|
370
345
|
'retryable',
|
|
346
|
+
'protocol',
|
|
371
347
|
];
|
|
372
348
|
const expectedKeys = responseArg.state === 'accepted'
|
|
373
349
|
? acceptedKeys
|
|
374
350
|
: responseArg.state === 'rejected'
|
|
375
351
|
? rejectedKeys
|
|
376
352
|
: [];
|
|
377
|
-
if (expectedKeys.length === 0 || !
|
|
378
|
-
return ['Spark Swarm observation
|
|
353
|
+
if (expectedKeys.length === 0 || !hasExactKeys(responseArg, expectedKeys)) {
|
|
354
|
+
return ['Spark Swarm observation response must use its exact state schema'];
|
|
379
355
|
}
|
|
380
356
|
try {
|
|
381
|
-
canonicalizeStrictJson(responseArg,
|
|
357
|
+
canonicalizeStrictJson(responseArg, failSparkSwarmObservationCanonicalization, 'Spark Swarm observation response');
|
|
382
358
|
}
|
|
383
359
|
catch {
|
|
384
|
-
return ['Spark Swarm observation
|
|
360
|
+
return ['Spark Swarm observation response must contain strict canonical JSON data'];
|
|
385
361
|
}
|
|
386
|
-
const errors =
|
|
387
|
-
const observationDigest = await
|
|
388
|
-
if (responseArg.
|
|
389
|
-
|| responseArg.nodeId !== expectedRequestArg.nodeId
|
|
362
|
+
const errors = validateProtocolOfferOn(responseArg, 'Spark Swarm observation response protocol');
|
|
363
|
+
const observationDigest = await computeSparkSwarmObservationDigest(expectedRequestArg.observation);
|
|
364
|
+
if (responseArg.nodeId !== expectedRequestArg.nodeId
|
|
390
365
|
|| responseArg.reporterSessionId !== expectedRequestArg.observation.reporterSessionId
|
|
391
366
|
|| responseArg.observationSequence !== expectedRequestArg.observation.observationSequence
|
|
392
367
|
|| responseArg.observationDigest !== observationDigest) {
|
|
393
|
-
errors.push('Spark Swarm observation
|
|
368
|
+
errors.push('Spark Swarm observation response must bind the expected request');
|
|
394
369
|
}
|
|
395
370
|
if (responseArg.state === 'accepted') {
|
|
396
371
|
if (!isPositiveSafeInteger(responseArg.acceptedAt)
|
|
397
372
|
|| !Number.isSafeInteger(responseArg.targetGenerationAtAcceptance)
|
|
398
373
|
|| responseArg.targetGenerationAtAcceptance < 0) {
|
|
399
|
-
errors.push('Spark Swarm observation
|
|
374
|
+
errors.push('Spark Swarm observation accepted receipt fields must be canonical');
|
|
400
375
|
}
|
|
401
376
|
}
|
|
402
377
|
else {
|
|
403
|
-
const retryability =
|
|
378
|
+
const retryability = sparkSwarmObservationContract.rejectionRetryability;
|
|
404
379
|
if (!isPositiveSafeInteger(responseArg.rejectedAt)
|
|
405
380
|
|| typeof responseArg.code !== 'string'
|
|
406
381
|
|| !Object.hasOwn(retryability, responseArg.code)
|
|
407
382
|
|| responseArg.retryable !== retryability[responseArg.code]) {
|
|
408
|
-
errors.push('Spark Swarm observation
|
|
383
|
+
errors.push('Spark Swarm observation rejected receipt fields must be canonical');
|
|
409
384
|
}
|
|
410
385
|
}
|
|
411
386
|
return errors;
|
|
412
387
|
}
|
|
413
388
|
catch {
|
|
414
|
-
return ['Spark Swarm observation
|
|
389
|
+
return ['Spark Swarm observation response must be safely inspectable'];
|
|
415
390
|
}
|
|
416
391
|
};
|
|
392
|
+
/**
|
|
393
|
+
* The exact five members of a target that the set digest is taken over.
|
|
394
|
+
*
|
|
395
|
+
* A projection, not the canonical-JSON rule: it drops anything else a caller's target carries, so
|
|
396
|
+
* the digest cannot move with a member no peer agreed on. Canonicalizing the target instead would
|
|
397
|
+
* hash whatever it happens to hold.
|
|
398
|
+
*/
|
|
417
399
|
const canonicalRuntimeTarget = (targetArg) => ({
|
|
418
400
|
cloudlyNodeId: targetArg.cloudlyNodeId,
|
|
419
401
|
swarmClusterId: targetArg.swarmClusterId,
|
|
@@ -422,7 +404,6 @@ const canonicalRuntimeTarget = (targetArg) => ({
|
|
|
422
404
|
platform: targetArg.platform,
|
|
423
405
|
});
|
|
424
406
|
export const createClusterRuntimeTargetSetDigestInput = (targetSetArg) => JSON.stringify({
|
|
425
|
-
schemaVersion: targetSetArg.schemaVersion,
|
|
426
407
|
purpose: 'serve.zone/cluster-runtime-target-set',
|
|
427
408
|
cloudlyClusterId: targetSetArg.cloudlyClusterId,
|
|
428
409
|
swarmClusterId: targetSetArg.swarmClusterId,
|
|
@@ -435,8 +416,7 @@ export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
|
435
416
|
if (!isRuntimeRecord(targetSetArg))
|
|
436
417
|
return ['cluster runtime target set must be an object'];
|
|
437
418
|
if (targetSetArg.state === 'unavailable') {
|
|
438
|
-
if (!
|
|
439
|
-
'schemaVersion',
|
|
419
|
+
if (!hasExactKeys(targetSetArg, [
|
|
440
420
|
'state',
|
|
441
421
|
'cloudlyClusterId',
|
|
442
422
|
'generation',
|
|
@@ -446,8 +426,7 @@ export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
|
446
426
|
return ['unavailable cluster runtime target set must use its exact schema'];
|
|
447
427
|
}
|
|
448
428
|
const errors = [];
|
|
449
|
-
if (targetSetArg.
|
|
450
|
-
|| !isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
429
|
+
if (!isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
451
430
|
|| !Number.isSafeInteger(targetSetArg.generation)
|
|
452
431
|
|| targetSetArg.generation < 0
|
|
453
432
|
|| !isPositiveSafeInteger(targetSetArg.changedAt)
|
|
@@ -466,8 +445,7 @@ export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
|
466
445
|
return errors;
|
|
467
446
|
}
|
|
468
447
|
if (targetSetArg.state !== 'ready'
|
|
469
|
-
|| !
|
|
470
|
-
'schemaVersion',
|
|
448
|
+
|| !hasExactKeys(targetSetArg, [
|
|
471
449
|
'state',
|
|
472
450
|
'cloudlyClusterId',
|
|
473
451
|
'swarmClusterId',
|
|
@@ -480,8 +458,7 @@ export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
|
480
458
|
return ['ready cluster runtime target set must use its exact schema'];
|
|
481
459
|
}
|
|
482
460
|
const errors = [];
|
|
483
|
-
if (targetSetArg.
|
|
484
|
-
|| !isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
461
|
+
if (!isRuntimeIdentifier(targetSetArg.cloudlyClusterId)
|
|
485
462
|
|| !isRuntimeIdentifier(targetSetArg.swarmClusterId)
|
|
486
463
|
|| !isPositiveSafeInteger(targetSetArg.generation)
|
|
487
464
|
|| !isPositiveSafeInteger(targetSetArg.acceptedAt)
|
|
@@ -503,7 +480,7 @@ export const validateClusterRuntimeTargetSet = async (targetSetArg) => {
|
|
|
503
480
|
let previousSortKey;
|
|
504
481
|
for (const [index, targetArg] of targetSetArg.targets.entries()) {
|
|
505
482
|
if (!isRuntimeRecord(targetArg)
|
|
506
|
-
|| !
|
|
483
|
+
|| !hasExactKeys(targetArg, [
|
|
507
484
|
'cloudlyNodeId',
|
|
508
485
|
'swarmClusterId',
|
|
509
486
|
'swarmNodeId',
|
|
@@ -594,4 +571,4 @@ export const validateClusterNodeCorestore = (valueArg, pathArg = 'cluster node c
|
|
|
594
571
|
}
|
|
595
572
|
return errors;
|
|
596
573
|
};
|
|
597
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|
|
574
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAuB,MAAM,gBAAgB,CAAC;AACzG,OAAO,EACL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAiE5D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC;IACnD,+FAA+F;IAC/F,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QACvB,QAAQ,EAAE,8BAA8B;QACxC,eAAe,EAAE,MAAM;QACvB,gBAAgB,EAAE,IAAI;KACd,CAAC;IACX,4EAA4E;IAC5E,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC;QAC3B,QAAQ,EAAE,mCAAmC;QAC7C,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,MAAM;KAChB,CAAC;IACX,uFAAuF;IACvF,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC;QAC1B,QAAQ,EAAE,kCAAkC;QAC5C,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,IAAI;KACd,CAAC;IACX;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC;QAC9B,QAAQ,EAAE,sCAAsC;QAChD,eAAe,EAAE,OAAO;QACxB,gBAAgB,EAAE,IAAI;KACd,CAAC;IACX,qBAAqB,EAAE,yBAAyB;CACxC,CAAC,CAAC;AAwHZ,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,YAAY,EAAE,oCAAoC;IAClD,gBAAgB,EAAE,OAAO;IACzB,mBAAmB,EAAE,MAAM;IAC3B,yBAAyB,EAAE,EAAE;IAC7B,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC;QACnC,mBAAmB,EAAE,KAAK;QAC1B,gBAAgB,EAAE,KAAK;QACvB,cAAc,EAAE,KAAK;QACrB,0BAA0B,EAAE,KAAK;QACjC,iBAAiB,EAAE,KAAK;QACxB,qBAAqB,EAAE,KAAK;QAC5B,yBAAyB,EAAE,KAAK;QAChC,gCAAgC,EAAE,KAAK;QACvC,iBAAiB,EAAE,IAAI;KACuC,CAAC;CACzD,CAAC,CAAC;AAkFZ,MAAM,sBAAsB,GAAG,qCAAqC,CAAC;AACrE,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAA8B;IAC5D,aAAa;IACb,aAAa;CACd,CAAC,CAAC;AACH,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,MAAM,eAAe,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAAC,CAClF,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC9E,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CACrE,OAAO,QAAQ,KAAK,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACtE,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CACvE,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAK,QAAmB,GAAG,CAAC,CAC3D,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAA0B,EAAE;IACvE,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CACjE,SAAS,EACT,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CACnC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACvD,IAAI,CAAC,EAAE,CAAC,EAAmB,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,yCAAyC,GAAG,CAAC,SAAiB,EAAS,EAAE;IAC7E,MAAM,IAAI,KAAK,CAAC,oDAAoD,SAAS,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,cAAsC,EAC9B,EAAE,CAAC,sBAAsB,CACjC;IACE,MAAM,EAAE,6BAA6B,CAAC,YAAY;IAClD,WAAW,EAAE,cAAc;CAC5B,EACD,yCAAyC,EACzC,sCAAsC,CACvC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,cAAsC,EACd,EAAE,CAC1B,UAAU,MAAM,4BAA4B,CAC1C,sCAAsC,CAAC,cAAc,CAAC,EACtD,yCAAyC,CAC1C,EACF,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,OAAkC,EACT,EAAE,CAAC,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;IAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,YAAY,EAAE,OAAO,CAAC,YAAY;IAClC,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,aAAa,EAAE,OAAO,CAAC,aAAa;QAClC,CAAC,CAAC;YACE,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;YACpC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,YAAY;SACjD;QACH,CAAC,CAAC,IAAI;CACT,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CACnD,iBAAyB,EACzB,WAAkC,EAC1B,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,mCAAmC;IAC5C,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,WAAW,CAAC,SAAS;IAChC,YAAY,EAAE,WAAW,CAAC,YAAY;IACtC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC;CACjD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,EACpD,iBAAyB,EACzB,WAAkC,EACV,EAAE,CAAC,aAAa,CACxC,qCAAqC,CAAC,iBAAiB,EAAE,WAAW,CAAC,CACtE,CAAC;AAEF,MAAM,4BAA4B,GAAG,KAAK,EACxC,iBAAyB,EACzB,mBAA2B,EAC3B,WAAoB,EACD,EAAE;IACrB,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;WAC5B,CAAC,YAAY,CAAC,WAAW,EAAE;YAC5B,gBAAgB;YAChB,WAAW;YACX,cAAc;YACd,OAAO;SACR,CAAC,EAAE,CAAC;QACL,OAAO,CAAC,wDAAwD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,OAAO,WAAW,CAAC,cAAc,KAAK,QAAQ;WAC7C,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;WAChC,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;WAC9B,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;QACpF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,KAAK,CAAC,MAAM;WACjD,CAAC,qBAAqB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,eAAmC,CAAC;IACxC,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qBAAqB,CAAC,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;QAC7C,MAAM,YAAY,GAAG;YACnB,aAAa;YACb,UAAU;YACV,UAAU;YACV,MAAM;YACN,cAAc;YACd,OAAO;YACP,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACxC,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,kCAAkC,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxF,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,8BAA8B,CAAC,CAAC;QACzF,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAuC,CAAC,EAAE,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,8BAA8B,CAAC,CAAC;QACzF,CAAC;QACD,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAc,CAAC;eACtD,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAsB,CAAC;eACtE,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAe,CAAC,EAAE,CAAC;YACrF,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qCAAqC,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC;mBACtC,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;mBAChE,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,SAAS;mBACjD,CAAC,CAAC,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC;qBACxC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,YAAsB,CAAC,EAAE,CAAC;gBAC5D,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,mCAAmC,CAAC,CAAC;YAC9F,CAAC;iBAAM,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBACxC,WAAW,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACrC,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACxE,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtF,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnF,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,IAAI,eAAe,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC5E,CAAC;YACD,eAAe,GAAG,OAAO,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,YAAY,KAAK,YAAY,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAClG,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,WAAW,GAAG,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IAChG,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CACrD,eAAe,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,WAAW,KAAK,mBAAmB,CACxE,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;WAC3B,UAAU,CAAC,IAAI,KAAK,SAAS;WAC7B,UAAU,CAAC,YAAY,KAAK,QAAQ;WACpC,UAAU,CAAC,KAAK,KAAK,OAAO;WAC5B,CAAC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;WAC1C,UAAU,CAAC,aAAa,CAAC,YAAY,KAAK,WAAW,EAAE,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;WAClB,WAAW,CAAC,cAAc,KAAK,MAAM,iCAAiC,CACvE,iBAAiB,EACjB,WAA+C,CAChD,EAAE,CAAC;QACJ,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,EAChD,cAAuB,EACJ,EAAE;IACrB,IAAI,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;YAAE,OAAO,CAAC,2CAA2C,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,cAAyC,CAAC;QAC9D,MAAM,UAAU,GAAG;YACjB,mBAAmB;YACnB,qBAAqB;YACrB,YAAY;YACZ,OAAO;SACR,CAAC;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,KAAK,SAAS;YAClD,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC;YAC3B,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,YAAY;gBAClC,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,QAAQ,IAAI,WAAW,CAAC,gBAAgB,KAAK,KAAK;oBACxE,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;oBACzD,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,QAAQ,IAAI,WAAW,CAAC,gBAAgB,KAAK,IAAI;wBACvE,CAAC,CAAC;4BACE,GAAG,UAAU;4BACb,gBAAgB;4BAChB,kBAAkB;4BAClB,kBAAkB;4BAClB,GAAG,CAAC,WAAW,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;yBAC1E;wBACH,CAAC,CAAC,EAAE,CAAC;QACb,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAC1E,OAAO,CAAC,yDAAyD,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,iBAAiB,CAAC;eAClD,CAAC,qBAAqB,CAAC,WAAW,CAAC,mBAAmB,CAAC;eACvD,CAAC,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS;eAC9B,CAAC,CAAC,oBAAoB,EAAE,cAAc,EAAE,iBAAiB,CAAC;iBAC1D,QAAQ,CAAC,WAAW,CAAC,MAAgB,CAAC,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,WAAW,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,gBAAgB,CAAC;mBACjD,OAAO,WAAW,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;gBACvD,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YACpF,CAAC;YACD,IAAI,WAAW,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAC1C,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;oBACrD,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;gBACvF,CAAC;qBAAM,IAAI,WAAW,CAAC,eAAe,KAAK,SAAS;uBAC/C,mBAAmB,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,4BAA4B,CAC/C,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,gBAAgB,EAC5B,WAAW,CAAC,eAAe,CAC5B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,oDAAoD,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,KAAK,EACvD,UAAmB,EACA,EAAE;IACrB,IAAI,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;eAC3B,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;YACnF,OAAO,CAAC,2DAA2D,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC;YACH,sBAAsB,CACpB,UAAU,EACV,yCAAyC,EACzC,iCAAiC,CAClC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,yEAAyE,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,MAAM,GAAG,uBAAuB,CACpC,UAAU,EACV,0CAA0C,CAC3C,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,6BAA6B,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,QAAQ;eACvC,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;eAC/B,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG;eACjC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,UAAU,CAAC,SAAS,EAAE,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,4DAA4D,CAAC,CAAC;IACxE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAG,KAAK,EACxD,WAAoB,EACpB,kBAAiD,EAC9B,EAAE;IACrB,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,oCAAoC,CAC9D,kBAAkB,CACnB,CAAC;QACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,wDAAwD,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,oDAAoD,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,YAAY,GAAG;YACnB,OAAO;YACP,QAAQ;YACR,mBAAmB;YACnB,qBAAqB;YACrB,mBAAmB;YACnB,YAAY;YACZ,8BAA8B;YAC9B,UAAU;SACX,CAAC;QACF,MAAM,YAAY,GAAG;YACnB,OAAO;YACP,QAAQ;YACR,mBAAmB;YACnB,qBAAqB;YACrB,mBAAmB;YACnB,YAAY;YACZ,MAAM;YACN,WAAW;YACX,UAAU;SACX,CAAC;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,KAAK,UAAU;YACnD,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,UAAU;gBAChC,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,EAAE,CAAC;QACT,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAC1E,OAAO,CAAC,kEAAkE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,CAAC;YACH,sBAAsB,CACpB,WAAW,EACX,yCAAyC,EACzC,kCAAkC,CACnC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,0EAA0E,CAAC,CAAC;QACtF,CAAC;QACD,MAAM,MAAM,GAAG,uBAAuB,CACpC,WAAW,EACX,2CAA2C,CAC5C,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,kCAAkC,CAChE,kBAAkB,CAAC,WAAW,CAC/B,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM;eAC/C,WAAW,CAAC,iBAAiB,KAAK,kBAAkB,CAAC,WAAW,CAAC,iBAAiB;eAClF,WAAW,CAAC,mBAAmB,KAAK,kBAAkB,CAAC,WAAW,CAAC,mBAAmB;eACtF,WAAW,CAAC,iBAAiB,KAAK,iBAAiB,EAAE,CAAC;YACzD,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,WAAW,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACrC,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC;mBAC7C,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,4BAA4B,CAAC;mBAC9D,WAAW,CAAC,4BAAuC,GAAG,CAAC,EAAE,CAAC;gBAC9D,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,6BAA6B,CAAC,qBAAqB,CAAC;YACzE,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC;mBAC7C,OAAO,WAAW,CAAC,IAAI,KAAK,QAAQ;mBACpC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC;mBAC9C,WAAW,CAAC,SAAS,KAAK,YAAY,CACvC,WAAW,CAAC,IAA2C,CACxD,EAAE,CAAC;gBACJ,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,6DAA6D,CAAC,CAAC;IACzE,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,sBAAsB,GAAG,CAC7B,SAAgC,EACT,EAAE,CAAC,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC,aAAa;IACtC,cAAc,EAAE,SAAS,CAAC,cAAc;IACxC,WAAW,EAAE,SAAS,CAAC,WAAW;IAClC,QAAQ,EAAE,SAAS,CAAC,QAAQ;IAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;CAC7B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wCAAwC,GAAG,CACtD,YAA2C,EACnC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,uCAAuC;IAChD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;IAC/C,cAAc,EAAE,YAAY,CAAC,cAAc;IAC3C,UAAU,EAAE,YAAY,CAAC,UAAU;IACnC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oCAAoC,GAAG,KAAK,EACvD,YAA2C,EACnB,EAAE,CAAC,aAAa,CAAC,wCAAwC,CAAC,YAAY,CAAC,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,YAAqB,EACF,EAAE;IACrB,IAAI,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;YAAE,OAAO,CAAC,8CAA8C,CAAC,CAAC;QAC5F,IAAI,YAAY,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC9B,OAAO;gBACP,kBAAkB;gBAClB,YAAY;gBACZ,WAAW;gBACX,QAAQ;aACT,CAAC,EAAE,CAAC;gBACH,OAAO,CAAC,kEAAkE,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC;mBAClD,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC;mBAC7C,YAAY,CAAC,UAAqB,GAAG,CAAC;mBACvC,CAAC,qBAAqB,CAAC,YAAY,CAAC,SAAS,CAAC;mBAC9C,CAAC;oBACF,gBAAgB;oBAChB,OAAO;oBACP,sBAAsB;oBACtB,mBAAmB;oBACnB,wBAAwB;iBACzB,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAgB,CAAC,EAAE,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,YAAY,CAAC,MAAM,KAAK,gBAAgB,IAAI,YAAY,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBAC9E,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,YAAY,CAAC,KAAK,KAAK,OAAO;eAC7B,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC7B,OAAO;gBACP,kBAAkB;gBAClB,gBAAgB;gBAChB,YAAY;gBACZ,iBAAiB;gBACjB,YAAY;gBACZ,YAAY;gBACZ,SAAS;aACV,CAAC,EAAE,CAAC;YACL,OAAO,CAAC,4DAA4D,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC;eAClD,CAAC,mBAAmB,CAAC,YAAY,CAAC,cAAc,CAAC;eACjD,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC/C,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC/C,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC9C,YAAY,CAAC,UAAqB,IAAK,YAAY,CAAC,UAAqB;eAC1E,OAAO,YAAY,CAAC,eAAe,KAAK,QAAQ;eAChD,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;YAC5D,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;eACnC,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;eACjC,YAAY,CAAC,OAAO,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;YAC1F,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;QACpC,IAAI,eAAmC,CAAC;QACxC,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAChE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;mBAC1B,CAAC,YAAY,CAAC,SAAS,EAAE;oBAC1B,eAAe;oBACf,gBAAgB;oBAChB,aAAa;oBACb,UAAU;oBACV,UAAU;iBACX,CAAC;mBACC,CAAC,mBAAmB,CAAC,SAAS,CAAC,aAAa,CAAC;mBAC7C,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc,CAAC;mBAC9C,CAAC,mBAAmB,CAAC,SAAS,CAAC,WAAW,CAAC;mBAC3C,CAAC,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC;mBACxC,SAAS,CAAC,cAAc,KAAK,YAAY,CAAC,cAAc;mBACxD,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAuC,CAAC,EAAE,CAAC;gBAC9E,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qBAAqB,CAAC,CAAC;gBAC9E,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,GAAG,SAAS,CAAC,aAAa,KAAK,SAAS,CAAC,cAAc,KACrE,SAAS,CAAC,WACZ,KAAK,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACjD,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,IAAI,eAAe,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC5E,CAAC;YACD,eAAe,GAAG,OAAO,CAAC;YAC1B,MAAM,UAAU,GAAG,GAAG,SAAS,CAAC,cAAc,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;YAC3E,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC;mBAC1C,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;mBAC/B,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAClE,CAAC;YACD,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAC5C,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;eAClB,YAAY,CAAC,eAAe,KAAK,MAAM,oCAAoC,CAC5E,YAAwD,CACzD,EAAE,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,uDAAuD,CAAC,CAAC;IACnE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,YAAsC,EACtC,MAAc,EACiC,EAAE,CAAC,CAClD,YAAY,CAAC,KAAK,KAAK,OAAO;OAC3B,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC;OAC5B,MAAM,IAAI,YAAY,CAAC,UAAU;OACjC,MAAM,GAAG,YAAY,CAAC,UAAU,CACpC,CAAC;AAyIF,MAAM,yCAAyC,GAAG,IAAI,CAAC;AAEvD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,QAAiB,EACjB,OAAO,GAAG,wBAAwB,EACxB,EAAE;IACZ,IAAI,CAAC,QAAQ;WACR,OAAO,QAAQ,KAAK,QAAQ;WAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;WACvB,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC,SAAS;eACnD,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;WAC3C,MAAM,CAAC,IAAI,CAAC,QAAmC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC;QAC/E,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,QAAQ,GAAI,QAAkC,CAAC,QAAQ,CAAC;IAC9D,IAAI,OAAO,QAAQ,KAAK,QAAQ;WAC3B,QAAQ,CAAC,MAAM,KAAK,CAAC;WACrB,QAAQ,CAAC,MAAM,GAAG,yCAAyC,EAAE,CAAC;QACjE,OAAO,CAAC,GAAG,OAAO,qCAAqC;kBACnD,GAAG,yCAAyC,aAAa,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,cAAmB,CAAC;IACxB,IAAI,CAAC;QACH,cAAc,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,GAAG,OAAO,kCAAkC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,cAAc,CAAC,QAAQ,KAAK,OAAO,IAAI,cAAc,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,6CAA6C,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,mCAAmC,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,cAAc,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CACT,GAAG,OAAO,0CAA0C,cAAc,CAAC,MAAM,IAAI;cACzE,iEAAiE,CACtE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -10,7 +10,7 @@ export type TCoreMailSha256 = `sha256:${string}`;
|
|
|
10
10
|
export type TCoreMailCapability = 'outbound' | 'inbound';
|
|
11
11
|
export type TCoreMailBindingState = 'active' | 'draining' | 'disabled';
|
|
12
12
|
export type TCoreMailCredentialState = 'current' | 'retiring';
|
|
13
|
-
export type TCoreMailCredentialVerifierFormat = 'argon2id
|
|
13
|
+
export type TCoreMailCredentialVerifierFormat = 'argon2id';
|
|
14
14
|
export type TCoreMailPartKind = 'text' | 'html' | 'attachment';
|
|
15
15
|
export type TCoreMailTransferMethod = 'PUT' | 'GET';
|
|
16
16
|
export type TCoreMailSubmissionState = 'preparing' | 'uploading' | 'ready' | 'accepted' | 'queued' | 'delivering' | 'delivered' | 'deferred' | 'failed' | 'deadLettered';
|
|
@@ -133,14 +133,13 @@ export interface ICoreMailBindingCredentialVerifier {
|
|
|
133
133
|
credentialId: string;
|
|
134
134
|
version: number;
|
|
135
135
|
state: TCoreMailCredentialState;
|
|
136
|
-
/**
|
|
136
|
+
/** The verifier contract this hash follows. CoreMail accepts only argon2id. */
|
|
137
137
|
format: TCoreMailCredentialVerifierFormat;
|
|
138
138
|
/** Password-verifier string only. Plaintext credential material is never part of desired state. */
|
|
139
139
|
verificationHash: string;
|
|
140
140
|
acceptUntil?: number;
|
|
141
141
|
}
|
|
142
142
|
export interface ICoreMailBindingDesiredState {
|
|
143
|
-
schemaVersion: 2;
|
|
144
143
|
bindingId: string;
|
|
145
144
|
serviceId: string;
|
|
146
145
|
tenantId: string;
|
|
@@ -172,7 +171,6 @@ export interface ICoreMailGatewayDesiredState {
|
|
|
172
171
|
* configuration; the matching plaintext is delivered only to Coreflow.
|
|
173
172
|
*/
|
|
174
173
|
export interface ICoreMailControlBootstrap {
|
|
175
|
-
schemaVersion: 1;
|
|
176
174
|
coreMailServiceId: string;
|
|
177
175
|
credentials: ICoreMailBindingCredentialVerifier[];
|
|
178
176
|
}
|
|
@@ -181,7 +179,6 @@ export interface ICoreMailControlBootstrap {
|
|
|
181
179
|
* transferOrigin is authoritative control-plane data, never peer supplied.
|
|
182
180
|
*/
|
|
183
181
|
export interface ICoreMailGatewayPeerDesiredState {
|
|
184
|
-
schemaVersion: 1;
|
|
185
182
|
coreMailServiceId: string;
|
|
186
183
|
transferOrigin: string;
|
|
187
184
|
credentials: ICoreMailBindingCredentialVerifier[];
|
|
@@ -218,7 +215,6 @@ export interface ICoreMailSmtpDesiredState {
|
|
|
218
215
|
tls: ICoreMailSmtpTlsDesiredState;
|
|
219
216
|
}
|
|
220
217
|
export interface ICoreMailDesiredState {
|
|
221
|
-
schemaVersion: 2;
|
|
222
218
|
configEpoch: number;
|
|
223
219
|
bindings: ICoreMailBindingDesiredState[];
|
|
224
220
|
gateway: ICoreMailGatewayDesiredState;
|
|
@@ -379,7 +375,7 @@ export declare const coreMailTransferProtocol: Readonly<{
|
|
|
379
375
|
integritySource: "grant-metadata-and-completion";
|
|
380
376
|
}>;
|
|
381
377
|
export declare const coreMailCredentialVerifierPolicy: Readonly<{
|
|
382
|
-
readonly format: "argon2id
|
|
378
|
+
readonly format: "argon2id";
|
|
383
379
|
readonly version: 19;
|
|
384
380
|
readonly memoryCost: 65536;
|
|
385
381
|
readonly timeCost: 3;
|