@serve.zone/interfaces 24.1.0 → 25.0.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/changelog.md +18 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusternode.d.ts +57 -0
- package/dist_ts/data/clusternode.js +131 -1
- package/dist_ts/data/service.d.ts +2 -0
- package/dist_ts/data/service.js +9 -1
- package/dist_ts/requests/service.d.ts +2 -0
- package/package.json +1 -1
- package/readme.md +29 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusternode.ts +217 -0
- package/ts/data/service.ts +10 -0
- package/ts/requests/service.ts +2 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-08-01 - 25.0.0
|
|
4
|
+
|
|
5
|
+
### Breaking Changes
|
|
6
|
+
|
|
7
|
+
- require canonical organization authority for service creation (service)
|
|
8
|
+
- Add a required top-level `organizationId` to the `createService` request.
|
|
9
|
+
- Keep organization ownership excluded from caller-writable service data.
|
|
10
|
+
- Export canonical organization identifier validation and contract coverage.
|
|
11
|
+
|
|
12
|
+
## 2026-08-01 - 24.2.0
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- add Spark Swarm observation v2 transport contract (spark-observation)
|
|
17
|
+
- Add authenticated request and immutable acceptance/rejection receipt interfaces for Spark Swarm observation v2.
|
|
18
|
+
- Add canonical digest helpers and validators for v2 transport request and response binding.
|
|
19
|
+
- Document replay, sequencing, receipt persistence, and validation responsibilities for the v2 endpoint.
|
|
20
|
+
|
|
3
21
|
## 2026-08-01 - 24.1.0
|
|
4
22
|
|
|
5
23
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '
|
|
6
|
+
version: '25.0.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -140,6 +140,59 @@ export type TSparkSwarmObservationV2 = (ISparkSwarmObservationBaseV2 & {
|
|
|
140
140
|
controlAvailable: true;
|
|
141
141
|
managerSnapshot?: ISwarmManagerSnapshotV1;
|
|
142
142
|
});
|
|
143
|
+
export type TSparkSwarmObservationV2RejectionCode = 'sequence-conflict' | 'sequence-stale' | 'sequence-gap' | 'session-sequence-invalid' | 'session-retired' | 'observation-too-old' | 'observation-from-future' | 'observation-time-not-advancing' | 'acceptance-race';
|
|
144
|
+
export declare const sparkSwarmObservationV2Contract: Readonly<{
|
|
145
|
+
readonly endpoint: "/spark/v2/nodes/swarm-observation";
|
|
146
|
+
readonly digestDomain: "serve.zone/spark-swarm-observation-v2";
|
|
147
|
+
readonly maximumPastAgeMs: 300000;
|
|
148
|
+
readonly maximumFutureSkewMs: 30000;
|
|
149
|
+
readonly retainedRetiredSessionIds: 32;
|
|
150
|
+
readonly rejectionRetryability: Readonly<{
|
|
151
|
+
'sequence-conflict': false;
|
|
152
|
+
'sequence-stale': false;
|
|
153
|
+
'sequence-gap': false;
|
|
154
|
+
'session-sequence-invalid': false;
|
|
155
|
+
'session-retired': false;
|
|
156
|
+
'observation-too-old': false;
|
|
157
|
+
'observation-from-future': false;
|
|
158
|
+
'observation-time-not-advancing': false;
|
|
159
|
+
'acceptance-race': true;
|
|
160
|
+
}>;
|
|
161
|
+
}>;
|
|
162
|
+
/** Cloudly derives node and cluster scope from this authenticated Spark request. */
|
|
163
|
+
export interface ISparkSwarmObservationV2Request {
|
|
164
|
+
nodeId: string;
|
|
165
|
+
nodeToken: string;
|
|
166
|
+
observation: TSparkSwarmObservationV2;
|
|
167
|
+
}
|
|
168
|
+
export interface ISparkSwarmObservationV2AcceptedReceipt {
|
|
169
|
+
schemaVersion: 2;
|
|
170
|
+
state: 'accepted';
|
|
171
|
+
nodeId: string;
|
|
172
|
+
reporterSessionId: string;
|
|
173
|
+
observationSequence: number;
|
|
174
|
+
observationDigest: TSha256Digest;
|
|
175
|
+
acceptedAt: number;
|
|
176
|
+
/** Runtime target generation observed immediately after this acceptance. */
|
|
177
|
+
targetGenerationAtAcceptance: number;
|
|
178
|
+
}
|
|
179
|
+
export interface ISparkSwarmObservationV2RejectedReceipt {
|
|
180
|
+
schemaVersion: 2;
|
|
181
|
+
state: 'rejected';
|
|
182
|
+
nodeId: string;
|
|
183
|
+
reporterSessionId: string;
|
|
184
|
+
observationSequence: number;
|
|
185
|
+
observationDigest: TSha256Digest;
|
|
186
|
+
rejectedAt: number;
|
|
187
|
+
code: TSparkSwarmObservationV2RejectionCode;
|
|
188
|
+
retryable: boolean;
|
|
189
|
+
}
|
|
190
|
+
/**
|
|
191
|
+
* Bound receipts are returned only after request validation and node
|
|
192
|
+
* authentication. Malformed and authentication failures use generic HTTP
|
|
193
|
+
* errors so they cannot expose credential or persisted replay state.
|
|
194
|
+
*/
|
|
195
|
+
export type TSparkSwarmObservationV2Response = ISparkSwarmObservationV2AcceptedReceipt | ISparkSwarmObservationV2RejectedReceipt;
|
|
143
196
|
/** Cloudly derives node and cluster scope from this authenticated Spark request. */
|
|
144
197
|
export interface ISparkSwarmObservationRequest {
|
|
145
198
|
nodeId: string;
|
|
@@ -179,10 +232,14 @@ export interface IClusterRuntimeTargetSetUnavailableV1 {
|
|
|
179
232
|
reason: 'never-observed' | 'stale' | 'no-manager-consensus' | 'identity-conflict' | 'no-schedulable-targets';
|
|
180
233
|
}
|
|
181
234
|
export type TClusterRuntimeTargetSetV1 = IClusterRuntimeTargetSetReadyV1 | IClusterRuntimeTargetSetUnavailableV1;
|
|
235
|
+
export declare const createSparkSwarmObservationV2DigestInput: (observationArg: TSparkSwarmObservationV2) => string;
|
|
236
|
+
export declare const computeSparkSwarmObservationV2Digest: (observationArg: TSparkSwarmObservationV2) => Promise<TSha256Digest>;
|
|
182
237
|
export declare const createSwarmManagerSnapshotDigestInput: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => string;
|
|
183
238
|
export declare const computeSwarmManagerSnapshotDigest: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => Promise<TSha256Digest>;
|
|
184
239
|
export declare const validateSparkSwarmObservation: (observationArg: unknown) => Promise<string[]>;
|
|
185
240
|
export declare const validateSparkSwarmObservationV2: (observationArg: unknown) => Promise<string[]>;
|
|
241
|
+
export declare const validateSparkSwarmObservationV2Request: (requestArg: unknown) => Promise<string[]>;
|
|
242
|
+
export declare const validateSparkSwarmObservationV2Response: (responseArg: unknown, expectedRequestArg: ISparkSwarmObservationV2Request) => Promise<string[]>;
|
|
186
243
|
export declare const createClusterRuntimeTargetSetDigestInput: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => string;
|
|
187
244
|
export declare const computeClusterRuntimeTargetSetDigest: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => Promise<TSha256Digest>;
|
|
188
245
|
export declare const validateClusterRuntimeTargetSet: (targetSetArg: unknown) => Promise<string[]>;
|
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
+
import { canonicalizeStrictJson, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
3
|
+
export const sparkSwarmObservationV2Contract = Object.freeze({
|
|
4
|
+
endpoint: '/spark/v2/nodes/swarm-observation',
|
|
5
|
+
digestDomain: 'serve.zone/spark-swarm-observation-v2',
|
|
6
|
+
maximumPastAgeMs: 300_000,
|
|
7
|
+
maximumFutureSkewMs: 30_000,
|
|
8
|
+
retainedRetiredSessionIds: 32,
|
|
9
|
+
rejectionRetryability: Object.freeze({
|
|
10
|
+
'sequence-conflict': false,
|
|
11
|
+
'sequence-stale': false,
|
|
12
|
+
'sequence-gap': false,
|
|
13
|
+
'session-sequence-invalid': false,
|
|
14
|
+
'session-retired': false,
|
|
15
|
+
'observation-too-old': false,
|
|
16
|
+
'observation-from-future': false,
|
|
17
|
+
'observation-time-not-advancing': false,
|
|
18
|
+
'acceptance-race': true,
|
|
19
|
+
}),
|
|
20
|
+
});
|
|
2
21
|
const runtimeIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
3
22
|
const runtimeDigestRegex = /^sha256:[a-f0-9]{64}$/;
|
|
4
23
|
const runtimePlatforms = new Set([
|
|
@@ -16,6 +35,14 @@ const computeSha256 = async (inputArg) => {
|
|
|
16
35
|
.map((byteArg) => byteArg.toString(16).padStart(2, '0'))
|
|
17
36
|
.join('')}`;
|
|
18
37
|
};
|
|
38
|
+
const failSparkSwarmObservationV2Canonicalization = (reasonArg) => {
|
|
39
|
+
throw new Error(`Spark Swarm observation v2 cannot be canonicalized: ${reasonArg}`);
|
|
40
|
+
};
|
|
41
|
+
export const createSparkSwarmObservationV2DigestInput = (observationArg) => canonicalizeStrictJson({
|
|
42
|
+
domain: sparkSwarmObservationV2Contract.digestDomain,
|
|
43
|
+
observation: observationArg,
|
|
44
|
+
}, failSparkSwarmObservationV2Canonicalization, 'Spark Swarm observation v2 digest input');
|
|
45
|
+
export const computeSparkSwarmObservationV2Digest = async (observationArg) => `sha256:${await createCanonicalJsonSha256Hex(createSparkSwarmObservationV2DigestInput(observationArg), failSparkSwarmObservationV2Canonicalization)}`;
|
|
19
46
|
const canonicalSwarmNode = (nodeArg) => ({
|
|
20
47
|
swarmNodeId: nodeArg.swarmNodeId,
|
|
21
48
|
nodeName: nodeArg.nodeName,
|
|
@@ -284,6 +311,109 @@ export const validateSparkSwarmObservationV2 = async (observationArg) => {
|
|
|
284
311
|
return ['Spark Swarm observation v2 must be safely inspectable'];
|
|
285
312
|
}
|
|
286
313
|
};
|
|
314
|
+
export const validateSparkSwarmObservationV2Request = async (requestArg) => {
|
|
315
|
+
try {
|
|
316
|
+
if (!isRuntimeRecord(requestArg)
|
|
317
|
+
|| !hasExactRuntimeKeys(requestArg, ['nodeId', 'nodeToken', 'observation'])) {
|
|
318
|
+
return ['Spark Swarm observation v2 request must use its exact schema'];
|
|
319
|
+
}
|
|
320
|
+
try {
|
|
321
|
+
canonicalizeStrictJson(requestArg, failSparkSwarmObservationV2Canonicalization, 'Spark Swarm observation v2 request');
|
|
322
|
+
}
|
|
323
|
+
catch {
|
|
324
|
+
return ['Spark Swarm observation v2 request must contain strict canonical JSON data'];
|
|
325
|
+
}
|
|
326
|
+
const errors = await validateSparkSwarmObservationV2(requestArg.observation);
|
|
327
|
+
if (!isRuntimeIdentifier(requestArg.nodeId)) {
|
|
328
|
+
errors.push('Spark Swarm observation v2 request nodeId must be canonical');
|
|
329
|
+
}
|
|
330
|
+
if (typeof requestArg.nodeToken !== 'string'
|
|
331
|
+
|| requestArg.nodeToken.length < 1
|
|
332
|
+
|| requestArg.nodeToken.length > 512
|
|
333
|
+
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
334
|
+
errors.push('Spark Swarm observation v2 request nodeToken must be a bounded opaque token');
|
|
335
|
+
}
|
|
336
|
+
return errors;
|
|
337
|
+
}
|
|
338
|
+
catch {
|
|
339
|
+
return ['Spark Swarm observation v2 request must be safely inspectable'];
|
|
340
|
+
}
|
|
341
|
+
};
|
|
342
|
+
export const validateSparkSwarmObservationV2Response = async (responseArg, expectedRequestArg) => {
|
|
343
|
+
try {
|
|
344
|
+
const requestErrors = await validateSparkSwarmObservationV2Request(expectedRequestArg);
|
|
345
|
+
if (requestErrors.length > 0) {
|
|
346
|
+
return ['expected Spark Swarm observation v2 request must be valid'];
|
|
347
|
+
}
|
|
348
|
+
if (!isRuntimeRecord(responseArg)) {
|
|
349
|
+
return ['Spark Swarm observation v2 response must be an object'];
|
|
350
|
+
}
|
|
351
|
+
const acceptedKeys = [
|
|
352
|
+
'schemaVersion',
|
|
353
|
+
'state',
|
|
354
|
+
'nodeId',
|
|
355
|
+
'reporterSessionId',
|
|
356
|
+
'observationSequence',
|
|
357
|
+
'observationDigest',
|
|
358
|
+
'acceptedAt',
|
|
359
|
+
'targetGenerationAtAcceptance',
|
|
360
|
+
];
|
|
361
|
+
const rejectedKeys = [
|
|
362
|
+
'schemaVersion',
|
|
363
|
+
'state',
|
|
364
|
+
'nodeId',
|
|
365
|
+
'reporterSessionId',
|
|
366
|
+
'observationSequence',
|
|
367
|
+
'observationDigest',
|
|
368
|
+
'rejectedAt',
|
|
369
|
+
'code',
|
|
370
|
+
'retryable',
|
|
371
|
+
];
|
|
372
|
+
const expectedKeys = responseArg.state === 'accepted'
|
|
373
|
+
? acceptedKeys
|
|
374
|
+
: responseArg.state === 'rejected'
|
|
375
|
+
? rejectedKeys
|
|
376
|
+
: [];
|
|
377
|
+
if (expectedKeys.length === 0 || !hasExactRuntimeKeys(responseArg, expectedKeys)) {
|
|
378
|
+
return ['Spark Swarm observation v2 response must use its exact state schema'];
|
|
379
|
+
}
|
|
380
|
+
try {
|
|
381
|
+
canonicalizeStrictJson(responseArg, failSparkSwarmObservationV2Canonicalization, 'Spark Swarm observation v2 response');
|
|
382
|
+
}
|
|
383
|
+
catch {
|
|
384
|
+
return ['Spark Swarm observation v2 response must contain strict canonical JSON data'];
|
|
385
|
+
}
|
|
386
|
+
const errors = [];
|
|
387
|
+
const observationDigest = await computeSparkSwarmObservationV2Digest(expectedRequestArg.observation);
|
|
388
|
+
if (responseArg.schemaVersion !== 2
|
|
389
|
+
|| responseArg.nodeId !== expectedRequestArg.nodeId
|
|
390
|
+
|| responseArg.reporterSessionId !== expectedRequestArg.observation.reporterSessionId
|
|
391
|
+
|| responseArg.observationSequence !== expectedRequestArg.observation.observationSequence
|
|
392
|
+
|| responseArg.observationDigest !== observationDigest) {
|
|
393
|
+
errors.push('Spark Swarm observation v2 response must bind the expected request');
|
|
394
|
+
}
|
|
395
|
+
if (responseArg.state === 'accepted') {
|
|
396
|
+
if (!isPositiveSafeInteger(responseArg.acceptedAt)
|
|
397
|
+
|| !Number.isSafeInteger(responseArg.targetGenerationAtAcceptance)
|
|
398
|
+
|| responseArg.targetGenerationAtAcceptance < 0) {
|
|
399
|
+
errors.push('Spark Swarm observation v2 accepted receipt fields must be canonical');
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
else {
|
|
403
|
+
const retryability = sparkSwarmObservationV2Contract.rejectionRetryability;
|
|
404
|
+
if (!isPositiveSafeInteger(responseArg.rejectedAt)
|
|
405
|
+
|| typeof responseArg.code !== 'string'
|
|
406
|
+
|| !Object.hasOwn(retryability, responseArg.code)
|
|
407
|
+
|| responseArg.retryable !== retryability[responseArg.code]) {
|
|
408
|
+
errors.push('Spark Swarm observation v2 rejected receipt fields must be canonical');
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
return errors;
|
|
412
|
+
}
|
|
413
|
+
catch {
|
|
414
|
+
return ['Spark Swarm observation v2 response must be safely inspectable'];
|
|
415
|
+
}
|
|
416
|
+
};
|
|
287
417
|
const canonicalRuntimeTarget = (targetArg) => ({
|
|
288
418
|
cloudlyNodeId: targetArg.cloudlyNodeId,
|
|
289
419
|
swarmClusterId: targetArg.swarmClusterId,
|
|
@@ -418,4 +548,4 @@ export const isClusterRuntimeTargetSetFresh = (targetSetArg, nowArg) => (targetS
|
|
|
418
548
|
&& Number.isSafeInteger(nowArg)
|
|
419
549
|
&& nowArg >= targetSetArg.acceptedAt
|
|
420
550
|
&& nowArg < targetSetArg.freshUntil);
|
|
421
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|
|
551
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,8 @@ export interface IServiceVolume {
|
|
|
22
22
|
/** Driver-specific options forwarded to Docker's VolumeDriver.Create request. */
|
|
23
23
|
options?: Record<string, string>;
|
|
24
24
|
}
|
|
25
|
+
/** Validates the canonical organization authority used by service operations. */
|
|
26
|
+
export declare const validateOrganizationId: (valueArg: unknown) => string[];
|
|
25
27
|
export declare const serviceContainerArgLimits: {
|
|
26
28
|
readonly maximumArgs: 64;
|
|
27
29
|
readonly maximumArgBytes: 4096;
|
package/dist_ts/data/service.js
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
const organizationIdRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
2
|
+
/** Validates the canonical organization authority used by service operations. */
|
|
3
|
+
export const validateOrganizationId = (valueArg) => {
|
|
4
|
+
if (typeof valueArg !== 'string' || !organizationIdRegex.test(valueArg)) {
|
|
5
|
+
return ['organizationId must be a canonical 1-200 character identifier'];
|
|
6
|
+
}
|
|
7
|
+
return [];
|
|
8
|
+
};
|
|
1
9
|
export const serviceContainerArgLimits = {
|
|
2
10
|
maximumArgs: 64,
|
|
3
11
|
maximumArgBytes: 4096,
|
|
@@ -57,4 +65,4 @@ export const validateServiceContainerArgs = (containerArgsArg) => {
|
|
|
57
65
|
}
|
|
58
66
|
return [];
|
|
59
67
|
};
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFvQ0EsTUFBTSxtQkFBbUIsR0FBRyxxQ0FBcUMsQ0FBQztBQUVsRSxpRkFBaUY7QUFDakYsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxRQUFpQixFQUFZLEVBQUU7SUFDcEUsSUFBSSxPQUFPLFFBQVEsS0FBSyxRQUFRLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUN4RSxPQUFPLENBQUMsK0RBQStELENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBQ0QsT0FBTyxFQUFFLENBQUM7QUFDWixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRztJQUN2QyxXQUFXLEVBQUUsRUFBRTtJQUNmLGVBQWUsRUFBRSxJQUFJO0lBQ3JCLGlCQUFpQixFQUFFLEVBQUUsR0FBRyxJQUFJO0NBQ3BCLENBQUM7QUFFWCxNQUFNLENBQUMsTUFBTSw0QkFBNEIsR0FBRyxDQUFDLE9BQWUsRUFBc0IsRUFBRTtJQUNsRixJQUFJLE9BQU8sT0FBTyxLQUFLLFFBQVE7V0FDMUIsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQztXQUN4QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztXQUN0QixPQUFPLENBQUMsTUFBTSxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBQzFCLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBYSxFQUFFLENBQUM7SUFDOUIsS0FBSyxNQUFNLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDekMsSUFBSSxDQUFDLE9BQU8sSUFBSSxPQUFPLEtBQUssR0FBRztZQUFFLFNBQVM7UUFDMUMsSUFBSSxPQUFPLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDckIsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUM7Z0JBQUUsT0FBTyxTQUFTLENBQUM7WUFDNUMsUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ2YsU0FBUztRQUNYLENBQUM7UUFDRCxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBQ3pELFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUNELE9BQU8sSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7QUFDbEMsQ0FBQyxDQUFDO0FBRUYsdUZBQXVGO0FBQ3ZGLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLENBQUMsZ0JBQXlCLEVBQVksRUFBRTtJQUNsRixJQUFJLGdCQUFnQixLQUFLLFNBQVM7UUFBRSxPQUFPLEVBQUUsQ0FBQztJQUM5QyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQztRQUFFLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO0lBQ2hGLElBQUksZ0JBQWdCLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE9BQU8sQ0FBQywrREFBK0QsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFDRCxJQUFJLGdCQUFnQixDQUFDLE1BQU0sR0FBRyx5QkFBeUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNwRSxPQUFPLENBQUMsc0NBQXNDLHlCQUF5QixDQUFDLFdBQVcsVUFBVSxDQUFDLENBQUM7SUFDakcsQ0FBQztJQUNELElBQUksVUFBVSxHQUFHLENBQUMsQ0FBQztJQUNuQixLQUFLLE1BQU0sQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLElBQUksZ0JBQWdCLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztRQUMzRCxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQzFELE9BQU8sQ0FBQyxpQkFBaUIsS0FBSyw4QkFBOEIsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxJQUFJLHVCQUF1QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1lBQzNDLE9BQU8sQ0FBQyxpQkFBaUIsS0FBSyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxNQUFNLGFBQWEsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxVQUFVLENBQUM7UUFDcEUsSUFBSSxhQUFhLEdBQUcseUJBQXlCLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDOUQsT0FBTyxDQUFDLGlCQUFpQixLQUFLLG9DQUFvQyxDQUFDLENBQUM7UUFDdEUsQ0FBQztRQUNELFVBQVUsSUFBSSxhQUFhLENBQUM7SUFDOUIsQ0FBQztJQUNELElBQUksVUFBVSxHQUFHLHlCQUF5QixDQUFDLGlCQUFpQixFQUFFLENBQUM7UUFDN0QsT0FBTyxDQUFDLHNEQUFzRCxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQyxDQUFDIn0=
|
|
@@ -202,6 +202,8 @@ export interface IRequest_Any_Cloudly_CreateService extends plugins.typedrequest
|
|
|
202
202
|
method: 'createService';
|
|
203
203
|
request: {
|
|
204
204
|
identity: IIdentity;
|
|
205
|
+
/** Canonical organization authority assigned by Cloudly to the new service. */
|
|
206
|
+
organizationId: string;
|
|
205
207
|
serviceData: TServiceWritableData;
|
|
206
208
|
};
|
|
207
209
|
response: {
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -30,6 +30,13 @@ import { appstore, data, platform, platformservice, requests } from '@serve.zone
|
|
|
30
30
|
|
|
31
31
|
This package intentionally has no service implementation logic. It is a stable vocabulary for services that need to agree on payload shape, method names, and response types.
|
|
32
32
|
|
|
33
|
+
Service creation carries canonical ownership separately from caller-writable
|
|
34
|
+
service data. `requests.service.IRequest_Any_Cloudly_CreateService` requires a
|
|
35
|
+
top-level `organizationId`, while `data.TServiceWritableData` excludes the
|
|
36
|
+
server-managed ownership field. Consumers should use
|
|
37
|
+
`data.validateOrganizationId()` to validate the identifier shape and verify
|
|
38
|
+
the request's ownership authorization separately before persistence.
|
|
39
|
+
|
|
33
40
|
## Secrets v24 Pre-Cutover Contract
|
|
34
41
|
|
|
35
42
|
Version 24 retains the value-free v23 architecture while replacing the remaining
|
|
@@ -102,11 +109,28 @@ Coreflow connection:
|
|
|
102
109
|
- `TSparkSwarmObservationV2` lets workers report only their local Swarm node ID,
|
|
103
110
|
because Docker does not expose the Swarm cluster ID to workers. Cloudly may
|
|
104
111
|
associate that node with a cluster only through authenticated node scope and
|
|
105
|
-
accepted manager consensus.
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
112
|
+
accepted manager consensus. The v2 transport contract designates
|
|
113
|
+
`/spark/v2/nodes/swarm-observation`. A conforming Spark sender must retain one
|
|
114
|
+
exact request until it receives a request-bound acceptance receipt. A
|
|
115
|
+
conforming Cloudly consumer must authenticate the node before inspecting
|
|
116
|
+
replay state, derive cluster scope from that persisted identity, and never
|
|
117
|
+
register, translate, or accept v1 observations as an authority fallback.
|
|
118
|
+
- `computeSparkSwarmObservationV2Digest` uses strict canonical JSON and the
|
|
119
|
+
`serve.zone/spark-swarm-observation-v2` domain. A reporter session starts at
|
|
120
|
+
sequence one. The contract requires a Cloudly consumer to accept only the
|
|
121
|
+
exact next sequence with a strictly advancing `observedAt`, while an exact
|
|
122
|
+
same-sequence/same-digest retry returns the byte-equivalent persisted receipt
|
|
123
|
+
before age checks. It must reject conflicting, stale, skipped,
|
|
124
|
+
retired-session, old, future, or non-advancing reports. A reused session ID
|
|
125
|
+
may be treated as new only after it leaves the bounded retired window, and its
|
|
126
|
+
sequence-one observation must still advance the permanent timestamp
|
|
127
|
+
high-water mark. The consumer must persist acceptance state and its receipt
|
|
128
|
+
in one atomic boundary.
|
|
129
|
+
- `validateSparkSwarmObservationV2` validates exact structure and attached
|
|
130
|
+
snapshots, while `validateSparkSwarmObservationV2Request` and
|
|
131
|
+
`validateSparkSwarmObservationV2Response` validate transport and request
|
|
132
|
+
binding. None of these functions authenticates a node, persists replay state,
|
|
133
|
+
establishes manager consensus, or creates runtime authority.
|
|
110
134
|
- WorkloadInit approval binds a clean stable release identity, version-tagged
|
|
111
135
|
OCI index, exact amd64 and arm64 platform/executable digests, policy
|
|
112
136
|
generation, and a Cloudly summary of detached Cosign DSSE/SLSA verification.
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/clusternode.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import type { TSha256Digest, TImmutableContainerPlatform } from './immutableimage.js';
|
|
3
|
+
import {
|
|
4
|
+
canonicalizeStrictJson,
|
|
5
|
+
createCanonicalJsonSha256Hex,
|
|
6
|
+
} from '../private/canonicaljson.js';
|
|
3
7
|
|
|
4
8
|
export interface IClusterNodeMetrics {
|
|
5
9
|
cpuUsagePercent: number;
|
|
@@ -164,6 +168,76 @@ export type TSparkSwarmObservationV2 =
|
|
|
164
168
|
managerSnapshot?: ISwarmManagerSnapshotV1;
|
|
165
169
|
});
|
|
166
170
|
|
|
171
|
+
export type TSparkSwarmObservationV2RejectionCode =
|
|
172
|
+
| 'sequence-conflict'
|
|
173
|
+
| 'sequence-stale'
|
|
174
|
+
| 'sequence-gap'
|
|
175
|
+
| 'session-sequence-invalid'
|
|
176
|
+
| 'session-retired'
|
|
177
|
+
| 'observation-too-old'
|
|
178
|
+
| 'observation-from-future'
|
|
179
|
+
| 'observation-time-not-advancing'
|
|
180
|
+
| 'acceptance-race';
|
|
181
|
+
|
|
182
|
+
export const sparkSwarmObservationV2Contract = Object.freeze({
|
|
183
|
+
endpoint: '/spark/v2/nodes/swarm-observation',
|
|
184
|
+
digestDomain: 'serve.zone/spark-swarm-observation-v2',
|
|
185
|
+
maximumPastAgeMs: 300_000,
|
|
186
|
+
maximumFutureSkewMs: 30_000,
|
|
187
|
+
retainedRetiredSessionIds: 32,
|
|
188
|
+
rejectionRetryability: Object.freeze({
|
|
189
|
+
'sequence-conflict': false,
|
|
190
|
+
'sequence-stale': false,
|
|
191
|
+
'sequence-gap': false,
|
|
192
|
+
'session-sequence-invalid': false,
|
|
193
|
+
'session-retired': false,
|
|
194
|
+
'observation-too-old': false,
|
|
195
|
+
'observation-from-future': false,
|
|
196
|
+
'observation-time-not-advancing': false,
|
|
197
|
+
'acceptance-race': true,
|
|
198
|
+
} satisfies Record<TSparkSwarmObservationV2RejectionCode, boolean>),
|
|
199
|
+
} as const);
|
|
200
|
+
|
|
201
|
+
/** Cloudly derives node and cluster scope from this authenticated Spark request. */
|
|
202
|
+
export interface ISparkSwarmObservationV2Request {
|
|
203
|
+
nodeId: string;
|
|
204
|
+
nodeToken: string;
|
|
205
|
+
observation: TSparkSwarmObservationV2;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
export interface ISparkSwarmObservationV2AcceptedReceipt {
|
|
209
|
+
schemaVersion: 2;
|
|
210
|
+
state: 'accepted';
|
|
211
|
+
nodeId: string;
|
|
212
|
+
reporterSessionId: string;
|
|
213
|
+
observationSequence: number;
|
|
214
|
+
observationDigest: TSha256Digest;
|
|
215
|
+
acceptedAt: number;
|
|
216
|
+
/** Runtime target generation observed immediately after this acceptance. */
|
|
217
|
+
targetGenerationAtAcceptance: number;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
export interface ISparkSwarmObservationV2RejectedReceipt {
|
|
221
|
+
schemaVersion: 2;
|
|
222
|
+
state: 'rejected';
|
|
223
|
+
nodeId: string;
|
|
224
|
+
reporterSessionId: string;
|
|
225
|
+
observationSequence: number;
|
|
226
|
+
observationDigest: TSha256Digest;
|
|
227
|
+
rejectedAt: number;
|
|
228
|
+
code: TSparkSwarmObservationV2RejectionCode;
|
|
229
|
+
retryable: boolean;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
/**
|
|
233
|
+
* Bound receipts are returned only after request validation and node
|
|
234
|
+
* authentication. Malformed and authentication failures use generic HTTP
|
|
235
|
+
* errors so they cannot expose credential or persisted replay state.
|
|
236
|
+
*/
|
|
237
|
+
export type TSparkSwarmObservationV2Response =
|
|
238
|
+
| ISparkSwarmObservationV2AcceptedReceipt
|
|
239
|
+
| ISparkSwarmObservationV2RejectedReceipt;
|
|
240
|
+
|
|
167
241
|
/** Cloudly derives node and cluster scope from this authenticated Spark request. */
|
|
168
242
|
export interface ISparkSwarmObservationRequest {
|
|
169
243
|
nodeId: string;
|
|
@@ -251,6 +325,30 @@ const computeSha256 = async (inputArg: string): Promise<TSha256Digest> => {
|
|
|
251
325
|
.join('')}` as TSha256Digest;
|
|
252
326
|
};
|
|
253
327
|
|
|
328
|
+
const failSparkSwarmObservationV2Canonicalization = (reasonArg: string): never => {
|
|
329
|
+
throw new Error(`Spark Swarm observation v2 cannot be canonicalized: ${reasonArg}`);
|
|
330
|
+
};
|
|
331
|
+
|
|
332
|
+
export const createSparkSwarmObservationV2DigestInput = (
|
|
333
|
+
observationArg: TSparkSwarmObservationV2,
|
|
334
|
+
): string => canonicalizeStrictJson(
|
|
335
|
+
{
|
|
336
|
+
domain: sparkSwarmObservationV2Contract.digestDomain,
|
|
337
|
+
observation: observationArg,
|
|
338
|
+
},
|
|
339
|
+
failSparkSwarmObservationV2Canonicalization,
|
|
340
|
+
'Spark Swarm observation v2 digest input',
|
|
341
|
+
);
|
|
342
|
+
|
|
343
|
+
export const computeSparkSwarmObservationV2Digest = async (
|
|
344
|
+
observationArg: TSparkSwarmObservationV2,
|
|
345
|
+
): Promise<TSha256Digest> => (
|
|
346
|
+
`sha256:${await createCanonicalJsonSha256Hex(
|
|
347
|
+
createSparkSwarmObservationV2DigestInput(observationArg),
|
|
348
|
+
failSparkSwarmObservationV2Canonicalization,
|
|
349
|
+
)}` as TSha256Digest
|
|
350
|
+
);
|
|
351
|
+
|
|
254
352
|
const canonicalSwarmNode = (
|
|
255
353
|
nodeArg: ISwarmManagerObservedNodeV1,
|
|
256
354
|
): Record<string, unknown> => ({
|
|
@@ -547,6 +645,125 @@ export const validateSparkSwarmObservationV2 = async (
|
|
|
547
645
|
}
|
|
548
646
|
};
|
|
549
647
|
|
|
648
|
+
export const validateSparkSwarmObservationV2Request = async (
|
|
649
|
+
requestArg: unknown,
|
|
650
|
+
): Promise<string[]> => {
|
|
651
|
+
try {
|
|
652
|
+
if (!isRuntimeRecord(requestArg)
|
|
653
|
+
|| !hasExactRuntimeKeys(requestArg, ['nodeId', 'nodeToken', 'observation'])) {
|
|
654
|
+
return ['Spark Swarm observation v2 request must use its exact schema'];
|
|
655
|
+
}
|
|
656
|
+
try {
|
|
657
|
+
canonicalizeStrictJson(
|
|
658
|
+
requestArg,
|
|
659
|
+
failSparkSwarmObservationV2Canonicalization,
|
|
660
|
+
'Spark Swarm observation v2 request',
|
|
661
|
+
);
|
|
662
|
+
} catch {
|
|
663
|
+
return ['Spark Swarm observation v2 request must contain strict canonical JSON data'];
|
|
664
|
+
}
|
|
665
|
+
const errors = await validateSparkSwarmObservationV2(requestArg.observation);
|
|
666
|
+
if (!isRuntimeIdentifier(requestArg.nodeId)) {
|
|
667
|
+
errors.push('Spark Swarm observation v2 request nodeId must be canonical');
|
|
668
|
+
}
|
|
669
|
+
if (typeof requestArg.nodeToken !== 'string'
|
|
670
|
+
|| requestArg.nodeToken.length < 1
|
|
671
|
+
|| requestArg.nodeToken.length > 512
|
|
672
|
+
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
673
|
+
errors.push('Spark Swarm observation v2 request nodeToken must be a bounded opaque token');
|
|
674
|
+
}
|
|
675
|
+
return errors;
|
|
676
|
+
} catch {
|
|
677
|
+
return ['Spark Swarm observation v2 request must be safely inspectable'];
|
|
678
|
+
}
|
|
679
|
+
};
|
|
680
|
+
|
|
681
|
+
export const validateSparkSwarmObservationV2Response = async (
|
|
682
|
+
responseArg: unknown,
|
|
683
|
+
expectedRequestArg: ISparkSwarmObservationV2Request,
|
|
684
|
+
): Promise<string[]> => {
|
|
685
|
+
try {
|
|
686
|
+
const requestErrors = await validateSparkSwarmObservationV2Request(
|
|
687
|
+
expectedRequestArg,
|
|
688
|
+
);
|
|
689
|
+
if (requestErrors.length > 0) {
|
|
690
|
+
return ['expected Spark Swarm observation v2 request must be valid'];
|
|
691
|
+
}
|
|
692
|
+
if (!isRuntimeRecord(responseArg)) {
|
|
693
|
+
return ['Spark Swarm observation v2 response must be an object'];
|
|
694
|
+
}
|
|
695
|
+
const acceptedKeys = [
|
|
696
|
+
'schemaVersion',
|
|
697
|
+
'state',
|
|
698
|
+
'nodeId',
|
|
699
|
+
'reporterSessionId',
|
|
700
|
+
'observationSequence',
|
|
701
|
+
'observationDigest',
|
|
702
|
+
'acceptedAt',
|
|
703
|
+
'targetGenerationAtAcceptance',
|
|
704
|
+
];
|
|
705
|
+
const rejectedKeys = [
|
|
706
|
+
'schemaVersion',
|
|
707
|
+
'state',
|
|
708
|
+
'nodeId',
|
|
709
|
+
'reporterSessionId',
|
|
710
|
+
'observationSequence',
|
|
711
|
+
'observationDigest',
|
|
712
|
+
'rejectedAt',
|
|
713
|
+
'code',
|
|
714
|
+
'retryable',
|
|
715
|
+
];
|
|
716
|
+
const expectedKeys = responseArg.state === 'accepted'
|
|
717
|
+
? acceptedKeys
|
|
718
|
+
: responseArg.state === 'rejected'
|
|
719
|
+
? rejectedKeys
|
|
720
|
+
: [];
|
|
721
|
+
if (expectedKeys.length === 0 || !hasExactRuntimeKeys(responseArg, expectedKeys)) {
|
|
722
|
+
return ['Spark Swarm observation v2 response must use its exact state schema'];
|
|
723
|
+
}
|
|
724
|
+
try {
|
|
725
|
+
canonicalizeStrictJson(
|
|
726
|
+
responseArg,
|
|
727
|
+
failSparkSwarmObservationV2Canonicalization,
|
|
728
|
+
'Spark Swarm observation v2 response',
|
|
729
|
+
);
|
|
730
|
+
} catch {
|
|
731
|
+
return ['Spark Swarm observation v2 response must contain strict canonical JSON data'];
|
|
732
|
+
}
|
|
733
|
+
const errors: string[] = [];
|
|
734
|
+
const observationDigest = await computeSparkSwarmObservationV2Digest(
|
|
735
|
+
expectedRequestArg.observation,
|
|
736
|
+
);
|
|
737
|
+
if (responseArg.schemaVersion !== 2
|
|
738
|
+
|| responseArg.nodeId !== expectedRequestArg.nodeId
|
|
739
|
+
|| responseArg.reporterSessionId !== expectedRequestArg.observation.reporterSessionId
|
|
740
|
+
|| responseArg.observationSequence !== expectedRequestArg.observation.observationSequence
|
|
741
|
+
|| responseArg.observationDigest !== observationDigest) {
|
|
742
|
+
errors.push('Spark Swarm observation v2 response must bind the expected request');
|
|
743
|
+
}
|
|
744
|
+
if (responseArg.state === 'accepted') {
|
|
745
|
+
if (!isPositiveSafeInteger(responseArg.acceptedAt)
|
|
746
|
+
|| !Number.isSafeInteger(responseArg.targetGenerationAtAcceptance)
|
|
747
|
+
|| (responseArg.targetGenerationAtAcceptance as number) < 0) {
|
|
748
|
+
errors.push('Spark Swarm observation v2 accepted receipt fields must be canonical');
|
|
749
|
+
}
|
|
750
|
+
} else {
|
|
751
|
+
const retryability = sparkSwarmObservationV2Contract.rejectionRetryability;
|
|
752
|
+
if (!isPositiveSafeInteger(responseArg.rejectedAt)
|
|
753
|
+
|| typeof responseArg.code !== 'string'
|
|
754
|
+
|| !Object.hasOwn(retryability, responseArg.code)
|
|
755
|
+
|| responseArg.retryable !== retryability[
|
|
756
|
+
responseArg.code as TSparkSwarmObservationV2RejectionCode
|
|
757
|
+
]) {
|
|
758
|
+
errors.push('Spark Swarm observation v2 rejected receipt fields must be canonical');
|
|
759
|
+
}
|
|
760
|
+
}
|
|
761
|
+
return errors;
|
|
762
|
+
} catch {
|
|
763
|
+
return ['Spark Swarm observation v2 response must be safely inspectable'];
|
|
764
|
+
}
|
|
765
|
+
};
|
|
766
|
+
|
|
550
767
|
const canonicalRuntimeTarget = (
|
|
551
768
|
targetArg: IClusterRuntimeTargetV1,
|
|
552
769
|
): IClusterRuntimeTargetV1 => ({
|
package/ts/data/service.ts
CHANGED
|
@@ -34,6 +34,16 @@ export interface IServiceVolume {
|
|
|
34
34
|
options?: Record<string, string>;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
const organizationIdRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
38
|
+
|
|
39
|
+
/** Validates the canonical organization authority used by service operations. */
|
|
40
|
+
export const validateOrganizationId = (valueArg: unknown): string[] => {
|
|
41
|
+
if (typeof valueArg !== 'string' || !organizationIdRegex.test(valueArg)) {
|
|
42
|
+
return ['organizationId must be a canonical 1-200 character identifier'];
|
|
43
|
+
}
|
|
44
|
+
return [];
|
|
45
|
+
};
|
|
46
|
+
|
|
37
47
|
export const serviceContainerArgLimits = {
|
|
38
48
|
maximumArgs: 64,
|
|
39
49
|
maximumArgBytes: 4096,
|
package/ts/requests/service.ts
CHANGED
|
@@ -304,6 +304,8 @@ extends plugins.typedrequestInterfaces.implementsTR<
|
|
|
304
304
|
method: 'createService';
|
|
305
305
|
request: {
|
|
306
306
|
identity: IIdentity;
|
|
307
|
+
/** Canonical organization authority assigned by Cloudly to the new service. */
|
|
308
|
+
organizationId: string;
|
|
307
309
|
serviceData: TServiceWritableData;
|
|
308
310
|
};
|
|
309
311
|
response: {
|