@serve.zone/interfaces 32.2.0 → 32.3.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 +23 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusternode.d.ts +21 -0
- package/dist_ts/data/clusternode.js +345 -11
- package/dist_ts/platform/storage.d.ts +19 -0
- package/dist_ts/platform/storage.js +23 -3
- package/package.json +1 -1
- package/readme.md +35 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusternode.ts +457 -10
- package/ts/platform/storage.ts +27 -5
package/changelog.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-18 - 32.3.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add `platform.normalizeStorageRequest(value)`, the contract's own statement of which storage
|
|
8
|
+
requests exist: it reads a body against the exact request schema and returns the request in its
|
|
9
|
+
contract shape — canonical environment keys, no empty `protection` block, no explicitly undefined
|
|
10
|
+
member, `retentionDays` within its bound, no `-0` or unsafe integer, plain JSON data members
|
|
11
|
+
only. `canonicalizeStorageRequest` and `createStorageRequestSha256` are now derived from it, so a
|
|
12
|
+
consumer that admits requests and the control plane that digests them apply one set of acceptance
|
|
13
|
+
rules instead of each keeping an aligned copy. The input is never mutated, the returned request
|
|
14
|
+
is fresh, and a body that is not a storage request is refused with `platform.StorageContractError`
|
|
15
|
+
whose message names the failing member.
|
|
16
|
+
- Add `data.validateSparkSwarmNodeHeartbeatRequest`, `data.validateSparkMetricsSampleRequest` and
|
|
17
|
+
`data.validateSparkActionResultRequest`, so all four Spark Swarm routes are judged by the
|
|
18
|
+
contract that owns their shapes instead of by member checks a consumer keeps beside them. Each
|
|
19
|
+
reads the exact key set, the sender's `protocol` offer and the reporter's identity, then names
|
|
20
|
+
every refused member of its payload — a heartbeat's metrics and runtime description down to each
|
|
21
|
+
described serve.zone service, a sample's observations and optional network rates, and an action
|
|
22
|
+
result whose status is one a node can report, never `pending`. They answer in the same
|
|
23
|
+
`Promise<string[]>` shape as `validateSparkSwarmObservationRequest`, refuse an accessor instead
|
|
24
|
+
of running it, and neither authenticate a node nor act on the body.
|
|
25
|
+
|
|
3
26
|
## 2026-09-18 - 32.2.0
|
|
4
27
|
|
|
5
28
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.3.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=
|
|
@@ -288,6 +288,27 @@ export declare const computeSwarmManagerSnapshotDigest: (swarmClusterIdArg: stri
|
|
|
288
288
|
export declare const validateSparkSwarmObservation: (observationArg: unknown) => Promise<string[]>;
|
|
289
289
|
export declare const validateSparkSwarmObservationRequest: (requestArg: unknown) => Promise<string[]>;
|
|
290
290
|
export declare const validateSparkSwarmObservationResponse: (responseArg: unknown, expectedRequestArg: ISparkSwarmObservationRequest) => Promise<string[]>;
|
|
291
|
+
/**
|
|
292
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.heartbeat.endpoint`.
|
|
293
|
+
*
|
|
294
|
+
* Stated here beside the shape it judges, so the server that reads the beat and the node that
|
|
295
|
+
* writes it apply one set of acceptance rules; a reader that kept its own member checks would
|
|
296
|
+
* decide on its own which beats exist.
|
|
297
|
+
*
|
|
298
|
+
* Every Spark route validator answers the same way — one string per refused member, empty for an
|
|
299
|
+
* admissible body, and the same `(body) => Promise<string[]>` signature, so a server can hold the
|
|
300
|
+
* four routes in one table.
|
|
301
|
+
*/
|
|
302
|
+
export declare const validateSparkSwarmNodeHeartbeatRequest: (requestArg: unknown) => Promise<string[]>;
|
|
303
|
+
/** Spark -> Cloudly body for `sparkSwarmNodeContracts.metricsSample.endpoint`. */
|
|
304
|
+
export declare const validateSparkMetricsSampleRequest: (requestArg: unknown) => Promise<string[]>;
|
|
305
|
+
/**
|
|
306
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.actionResult.endpoint`.
|
|
307
|
+
*
|
|
308
|
+
* `pending` is the one status a node never reports: an action it has not started has no result to
|
|
309
|
+
* post, and a server that accepted one would reopen an action it already handed out.
|
|
310
|
+
*/
|
|
311
|
+
export declare const validateSparkActionResultRequest: (requestArg: unknown) => Promise<string[]>;
|
|
291
312
|
export declare const createClusterRuntimeTargetSetDigestInput: (targetSetArg: IClusterRuntimeTargetSetReady) => string;
|
|
292
313
|
export declare const computeClusterRuntimeTargetSetDigest: (targetSetArg: IClusterRuntimeTargetSetReady) => Promise<TSha256Digest>;
|
|
293
314
|
export declare const validateClusterRuntimeTargetSet: (targetSetArg: unknown) => Promise<string[]>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { protocolRefusalHttpStatus, validateProtocolOfferOn } from '../protocol.js';
|
|
3
3
|
import { canonicalizeStrictJson, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
4
|
-
import { hasExactKeys } from '../private/dataproperties.js';
|
|
4
|
+
import { hasExactKeys, readDataElements, readDataProperties, } from '../private/dataproperties.js';
|
|
5
5
|
/**
|
|
6
6
|
* The Swarm-era Spark runtime's own routes.
|
|
7
7
|
*
|
|
@@ -286,6 +286,25 @@ export const validateSparkSwarmObservation = async (observationArg) => {
|
|
|
286
286
|
return ['Spark Swarm observation must be safely inspectable'];
|
|
287
287
|
}
|
|
288
288
|
};
|
|
289
|
+
/**
|
|
290
|
+
* Which node is reporting, in the two members every Spark route body carries.
|
|
291
|
+
*
|
|
292
|
+
* All four routes authenticate the same reporter from the same pair, so the rule lives here: a
|
|
293
|
+
* copy per route is how one route ends up admitting a bearer another refuses.
|
|
294
|
+
*/
|
|
295
|
+
const validateSparkReporterIdentity = (requestArg, labelArg) => {
|
|
296
|
+
const errors = [];
|
|
297
|
+
if (!isRuntimeIdentifier(requestArg.nodeId)) {
|
|
298
|
+
errors.push(`${labelArg} nodeId must be canonical`);
|
|
299
|
+
}
|
|
300
|
+
if (typeof requestArg.nodeToken !== 'string'
|
|
301
|
+
|| requestArg.nodeToken.length < 1
|
|
302
|
+
|| requestArg.nodeToken.length > 512
|
|
303
|
+
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
304
|
+
errors.push(`${labelArg} nodeToken must be a bounded opaque token`);
|
|
305
|
+
}
|
|
306
|
+
return errors;
|
|
307
|
+
};
|
|
289
308
|
export const validateSparkSwarmObservationRequest = async (requestArg) => {
|
|
290
309
|
try {
|
|
291
310
|
if (!isRuntimeRecord(requestArg)
|
|
@@ -300,15 +319,7 @@ export const validateSparkSwarmObservationRequest = async (requestArg) => {
|
|
|
300
319
|
}
|
|
301
320
|
const errors = validateProtocolOfferOn(requestArg, 'Spark Swarm observation request protocol');
|
|
302
321
|
errors.push(...await validateSparkSwarmObservation(requestArg.observation));
|
|
303
|
-
|
|
304
|
-
errors.push('Spark Swarm observation request nodeId must be canonical');
|
|
305
|
-
}
|
|
306
|
-
if (typeof requestArg.nodeToken !== 'string'
|
|
307
|
-
|| requestArg.nodeToken.length < 1
|
|
308
|
-
|| requestArg.nodeToken.length > 512
|
|
309
|
-
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
310
|
-
errors.push('Spark Swarm observation request nodeToken must be a bounded opaque token');
|
|
311
|
-
}
|
|
322
|
+
errors.push(...validateSparkReporterIdentity(requestArg, 'Spark Swarm observation request'));
|
|
312
323
|
return errors;
|
|
313
324
|
}
|
|
314
325
|
catch {
|
|
@@ -389,6 +400,329 @@ export const validateSparkSwarmObservationResponse = async (responseArg, expecte
|
|
|
389
400
|
return ['Spark Swarm observation response must be safely inspectable'];
|
|
390
401
|
}
|
|
391
402
|
};
|
|
403
|
+
/** A runtime description or a service name: bounded, and free of bytes JSON text cannot carry. */
|
|
404
|
+
const maximumSparkRuntimeTextLength = 512;
|
|
405
|
+
/** An operator-facing message, which may hold line breaks but is still bounded. */
|
|
406
|
+
const maximumSparkMessageTextLength = 2048;
|
|
407
|
+
/** `sparkSwarmNodeContracts.actionResult` states what a server keeps of an action's output. */
|
|
408
|
+
const maximumSparkActionResultTextLength = 4000;
|
|
409
|
+
/**
|
|
410
|
+
* The route's own byte bound refuses an oversized runtime description first; this stops an
|
|
411
|
+
* in-process caller from making the validator walk a list no route could have delivered.
|
|
412
|
+
*/
|
|
413
|
+
const maximumSparkRuntimeServices = 64;
|
|
414
|
+
const sparkCloudlyConnectionStatuses = new Set([
|
|
415
|
+
'not-configured',
|
|
416
|
+
'connecting',
|
|
417
|
+
'connected',
|
|
418
|
+
'failed',
|
|
419
|
+
]);
|
|
420
|
+
const sparkNodeModes = new Set(['cloudly', 'coreflow-node']);
|
|
421
|
+
const sparkActionResultStatuses = new Set([
|
|
422
|
+
'running',
|
|
423
|
+
'succeeded',
|
|
424
|
+
'failed',
|
|
425
|
+
]);
|
|
426
|
+
const isBoundedText = (valueArg, maximumLengthArg = maximumSparkRuntimeTextLength) => (typeof valueArg === 'string'
|
|
427
|
+
&& valueArg.length > 0
|
|
428
|
+
&& valueArg.length <= maximumLengthArg
|
|
429
|
+
&& !/[\u0000-\u001f\u007f]/u.test(valueArg));
|
|
430
|
+
/** Message text a node reports: line breaks and tabs are its content, other control bytes are not. */
|
|
431
|
+
const isBoundedMessageText = (valueArg, maximumLengthArg) => (typeof valueArg === 'string'
|
|
432
|
+
&& valueArg.length <= maximumLengthArg
|
|
433
|
+
&& !/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/u.test(valueArg));
|
|
434
|
+
const isNonNegativeNumber = (valueArg, maximumArg = Number.MAX_SAFE_INTEGER) => (typeof valueArg === 'number'
|
|
435
|
+
&& Number.isFinite(valueArg)
|
|
436
|
+
&& !Object.is(valueArg, -0)
|
|
437
|
+
&& valueArg >= 0
|
|
438
|
+
&& valueArg <= maximumArg);
|
|
439
|
+
const isNonNegativeSafeInteger = (valueArg) => (Number.isSafeInteger(valueArg) && !Object.is(valueArg, -0) && valueArg >= 0);
|
|
440
|
+
/**
|
|
441
|
+
* One level of a Spark body: own enumerable data properties only, then the exact key set.
|
|
442
|
+
*
|
|
443
|
+
* The heartbeat, metrics-sample and action-result bodies are judged member by member rather than
|
|
444
|
+
* as canonical bytes, because only the observation is digested and those three legitimately carry
|
|
445
|
+
* fractional CPU, memory and rate observations that the digest's integer encoding would refuse.
|
|
446
|
+
* What the canonical reader also gave — a body that cannot run code or answer differently on a
|
|
447
|
+
* second read — is kept here by copying the data properties away from the caller's object before
|
|
448
|
+
* any member is judged.
|
|
449
|
+
*/
|
|
450
|
+
const readSparkRecord = (valueArg, labelArg, requiredKeysArg, optionalKeysArg = []) => {
|
|
451
|
+
const record = readDataProperties(valueArg);
|
|
452
|
+
if (record === null) {
|
|
453
|
+
return { record: null, errors: [`${labelArg} must contain plain JSON data properties`] };
|
|
454
|
+
}
|
|
455
|
+
if (!hasExactKeys(record, requiredKeysArg, optionalKeysArg)) {
|
|
456
|
+
return { record: null, errors: [`${labelArg} must use its exact schema`] };
|
|
457
|
+
}
|
|
458
|
+
return { record, errors: [] };
|
|
459
|
+
};
|
|
460
|
+
/**
|
|
461
|
+
* The envelope a Spark route body states before its payload: the exact key set, the reporter's
|
|
462
|
+
* protocol offer read by name, and the reporter's identity — in that order, because a server
|
|
463
|
+
* answers an unreadable offer before it looks at anything the body claims about a node.
|
|
464
|
+
*/
|
|
465
|
+
const readSparkRouteEnvelope = (requestArg, labelArg, requiredKeysArg, optionalKeysArg = []) => {
|
|
466
|
+
const reading = readSparkRecord(requestArg, labelArg, requiredKeysArg, optionalKeysArg);
|
|
467
|
+
if (reading.record === null) {
|
|
468
|
+
return reading;
|
|
469
|
+
}
|
|
470
|
+
return {
|
|
471
|
+
record: reading.record,
|
|
472
|
+
errors: [
|
|
473
|
+
...validateProtocolOfferOn(reading.record, `${labelArg} protocol`),
|
|
474
|
+
...validateSparkReporterIdentity(reading.record, labelArg),
|
|
475
|
+
],
|
|
476
|
+
};
|
|
477
|
+
};
|
|
478
|
+
/**
|
|
479
|
+
* One reason per member, collected rather than thrown.
|
|
480
|
+
*
|
|
481
|
+
* A Spark route answers a refusal before the node is authenticated, so the reporter only ever
|
|
482
|
+
* learns which member of its own body was wrong; naming that member is what lets an operator fix
|
|
483
|
+
* a node without reading the server's source.
|
|
484
|
+
*/
|
|
485
|
+
const createSparkFieldErrors = (recordArg, labelArg) => {
|
|
486
|
+
const errors = [];
|
|
487
|
+
return {
|
|
488
|
+
errors,
|
|
489
|
+
number: (keyArg, maximumArg) => {
|
|
490
|
+
if (!isNonNegativeNumber(recordArg[keyArg], maximumArg)) {
|
|
491
|
+
errors.push(`${labelArg} ${keyArg} must be a bounded non-negative number`);
|
|
492
|
+
}
|
|
493
|
+
},
|
|
494
|
+
percentage: (keyArg) => {
|
|
495
|
+
if (!isNonNegativeNumber(recordArg[keyArg], 100)) {
|
|
496
|
+
errors.push(`${labelArg} ${keyArg} must be a percentage between 0 and 100`);
|
|
497
|
+
}
|
|
498
|
+
},
|
|
499
|
+
count: (keyArg) => {
|
|
500
|
+
if (!isNonNegativeSafeInteger(recordArg[keyArg])) {
|
|
501
|
+
errors.push(`${labelArg} ${keyArg} must be a non-negative safe integer`);
|
|
502
|
+
}
|
|
503
|
+
},
|
|
504
|
+
instant: (keyArg) => {
|
|
505
|
+
if (!isPositiveSafeInteger(recordArg[keyArg])) {
|
|
506
|
+
errors.push(`${labelArg} ${keyArg} must be a positive safe integer timestamp`);
|
|
507
|
+
}
|
|
508
|
+
},
|
|
509
|
+
text: (keyArg) => {
|
|
510
|
+
if (!isBoundedText(recordArg[keyArg])) {
|
|
511
|
+
errors.push(`${labelArg} ${keyArg} must be bounded non-empty text`);
|
|
512
|
+
}
|
|
513
|
+
},
|
|
514
|
+
messageText: (keyArg, maximumLengthArg) => {
|
|
515
|
+
if (!isBoundedMessageText(recordArg[keyArg], maximumLengthArg)) {
|
|
516
|
+
errors.push(`${labelArg} ${keyArg} must be bounded message text`);
|
|
517
|
+
}
|
|
518
|
+
},
|
|
519
|
+
identifier: (keyArg) => {
|
|
520
|
+
if (!isRuntimeIdentifier(recordArg[keyArg])) {
|
|
521
|
+
errors.push(`${labelArg} ${keyArg} must be canonical`);
|
|
522
|
+
}
|
|
523
|
+
},
|
|
524
|
+
boolean: (keyArg) => {
|
|
525
|
+
if (typeof recordArg[keyArg] !== 'boolean') {
|
|
526
|
+
errors.push(`${labelArg} ${keyArg} must be a boolean`);
|
|
527
|
+
}
|
|
528
|
+
},
|
|
529
|
+
member: (keyArg, allowedArg) => {
|
|
530
|
+
if (!allowedArg.has(recordArg[keyArg])) {
|
|
531
|
+
errors.push(`${labelArg} ${keyArg} is outside the supported values`);
|
|
532
|
+
}
|
|
533
|
+
},
|
|
534
|
+
/** Runs `checkArg` only when the optional member is present at all. */
|
|
535
|
+
optional: (keyArg, checkArg) => {
|
|
536
|
+
if (recordArg[keyArg] !== undefined) {
|
|
537
|
+
checkArg(keyArg);
|
|
538
|
+
}
|
|
539
|
+
},
|
|
540
|
+
};
|
|
541
|
+
};
|
|
542
|
+
const validateSparkNodeMetrics = (valueArg, labelArg) => {
|
|
543
|
+
const reading = readSparkRecord(valueArg, labelArg, [
|
|
544
|
+
'cpuUsagePercent',
|
|
545
|
+
'memoryUsedMB',
|
|
546
|
+
'memoryAvailableMB',
|
|
547
|
+
'diskUsedGB',
|
|
548
|
+
'diskAvailableGB',
|
|
549
|
+
'containerCount',
|
|
550
|
+
'timestamp',
|
|
551
|
+
]);
|
|
552
|
+
if (reading.record === null) {
|
|
553
|
+
return reading.errors;
|
|
554
|
+
}
|
|
555
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
556
|
+
field.percentage('cpuUsagePercent');
|
|
557
|
+
field.number('memoryUsedMB');
|
|
558
|
+
field.number('memoryAvailableMB');
|
|
559
|
+
field.number('diskUsedGB');
|
|
560
|
+
field.number('diskAvailableGB');
|
|
561
|
+
field.count('containerCount');
|
|
562
|
+
field.instant('timestamp');
|
|
563
|
+
return field.errors;
|
|
564
|
+
};
|
|
565
|
+
const validateNodeMetricsSample = (valueArg, labelArg) => {
|
|
566
|
+
const reading = readSparkRecord(valueArg, labelArg, ['timestamp', 'cpuUsagePercent', 'memoryUsedMB', 'memoryAvailableMB'], ['networkRxBytesPerSec', 'networkTxBytesPerSec']);
|
|
567
|
+
if (reading.record === null) {
|
|
568
|
+
return reading.errors;
|
|
569
|
+
}
|
|
570
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
571
|
+
field.instant('timestamp');
|
|
572
|
+
field.percentage('cpuUsagePercent');
|
|
573
|
+
field.number('memoryUsedMB');
|
|
574
|
+
field.number('memoryAvailableMB');
|
|
575
|
+
field.optional('networkRxBytesPerSec', field.number);
|
|
576
|
+
field.optional('networkTxBytesPerSec', field.number);
|
|
577
|
+
return field.errors;
|
|
578
|
+
};
|
|
579
|
+
const validateServeZoneServiceRuntimeInfo = (valueArg, labelArg) => {
|
|
580
|
+
const reading = readSparkRecord(valueArg, labelArg, ['name', 'running', 'checkedAt'], [
|
|
581
|
+
'serviceId',
|
|
582
|
+
'image',
|
|
583
|
+
'desiredImage',
|
|
584
|
+
'imageVersion',
|
|
585
|
+
'runningImageId',
|
|
586
|
+
'runningTaskCount',
|
|
587
|
+
'updatedAt',
|
|
588
|
+
'error',
|
|
589
|
+
]);
|
|
590
|
+
if (reading.record === null) {
|
|
591
|
+
return reading.errors;
|
|
592
|
+
}
|
|
593
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
594
|
+
field.text('name');
|
|
595
|
+
field.boolean('running');
|
|
596
|
+
field.instant('checkedAt');
|
|
597
|
+
field.optional('serviceId', field.text);
|
|
598
|
+
field.optional('image', field.text);
|
|
599
|
+
field.optional('desiredImage', field.text);
|
|
600
|
+
field.optional('imageVersion', field.text);
|
|
601
|
+
field.optional('runningImageId', field.text);
|
|
602
|
+
field.optional('runningTaskCount', field.count);
|
|
603
|
+
field.optional('updatedAt', field.instant);
|
|
604
|
+
field.optional('error', (keyArg) => field.messageText(keyArg, maximumSparkMessageTextLength));
|
|
605
|
+
return field.errors;
|
|
606
|
+
};
|
|
607
|
+
const validateSparkNodeRuntimeInfo = (valueArg, labelArg) => {
|
|
608
|
+
const reading = readSparkRecord(valueArg, labelArg, [
|
|
609
|
+
'runtime',
|
|
610
|
+
'nodeId',
|
|
611
|
+
'platform',
|
|
612
|
+
'arch',
|
|
613
|
+
'sparkVersion',
|
|
614
|
+
'cloudlyConnectionStatus',
|
|
615
|
+
'dockerAvailable',
|
|
616
|
+
'checkedAt',
|
|
617
|
+
], [
|
|
618
|
+
'mode',
|
|
619
|
+
'hostname',
|
|
620
|
+
'osRelease',
|
|
621
|
+
'cloudlyUrl',
|
|
622
|
+
'swarmNodeId',
|
|
623
|
+
'serveZoneServices',
|
|
624
|
+
'lastError',
|
|
625
|
+
]);
|
|
626
|
+
if (reading.record === null) {
|
|
627
|
+
return reading.errors;
|
|
628
|
+
}
|
|
629
|
+
const runtimeInfo = reading.record;
|
|
630
|
+
const field = createSparkFieldErrors(runtimeInfo, labelArg);
|
|
631
|
+
if (runtimeInfo.runtime !== 'spark') {
|
|
632
|
+
field.errors.push(`${labelArg} runtime must be spark`);
|
|
633
|
+
}
|
|
634
|
+
field.identifier('nodeId');
|
|
635
|
+
field.text('platform');
|
|
636
|
+
field.text('arch');
|
|
637
|
+
field.text('sparkVersion');
|
|
638
|
+
field.member('cloudlyConnectionStatus', sparkCloudlyConnectionStatuses);
|
|
639
|
+
field.boolean('dockerAvailable');
|
|
640
|
+
field.instant('checkedAt');
|
|
641
|
+
field.optional('mode', (keyArg) => field.member(keyArg, sparkNodeModes));
|
|
642
|
+
field.optional('hostname', field.text);
|
|
643
|
+
field.optional('osRelease', field.text);
|
|
644
|
+
field.optional('cloudlyUrl', field.text);
|
|
645
|
+
field.optional('swarmNodeId', field.identifier);
|
|
646
|
+
field.optional('lastError', (keyArg) => field.messageText(keyArg, maximumSparkMessageTextLength));
|
|
647
|
+
if (runtimeInfo.serveZoneServices !== undefined) {
|
|
648
|
+
const services = readDataElements(runtimeInfo.serveZoneServices, maximumSparkRuntimeServices);
|
|
649
|
+
if (services === null) {
|
|
650
|
+
field.errors.push(`${labelArg} serveZoneServices must be a bounded list of at most `
|
|
651
|
+
+ `${maximumSparkRuntimeServices} described services`);
|
|
652
|
+
}
|
|
653
|
+
else {
|
|
654
|
+
services.forEach((serviceArg, indexArg) => {
|
|
655
|
+
field.errors.push(...validateServeZoneServiceRuntimeInfo(serviceArg, `${labelArg} serveZoneServices[${indexArg}]`));
|
|
656
|
+
});
|
|
657
|
+
}
|
|
658
|
+
}
|
|
659
|
+
return field.errors;
|
|
660
|
+
};
|
|
661
|
+
/**
|
|
662
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.heartbeat.endpoint`.
|
|
663
|
+
*
|
|
664
|
+
* Stated here beside the shape it judges, so the server that reads the beat and the node that
|
|
665
|
+
* writes it apply one set of acceptance rules; a reader that kept its own member checks would
|
|
666
|
+
* decide on its own which beats exist.
|
|
667
|
+
*
|
|
668
|
+
* Every Spark route validator answers the same way — one string per refused member, empty for an
|
|
669
|
+
* admissible body, and the same `(body) => Promise<string[]>` signature, so a server can hold the
|
|
670
|
+
* four routes in one table.
|
|
671
|
+
*/
|
|
672
|
+
export const validateSparkSwarmNodeHeartbeatRequest = async (requestArg) => {
|
|
673
|
+
const label = 'Spark Swarm node heartbeat request';
|
|
674
|
+
try {
|
|
675
|
+
const envelope = readSparkRouteEnvelope(requestArg, label, ['nodeId', 'nodeToken', 'protocol', 'metrics', 'runtimeInfo']);
|
|
676
|
+
if (envelope.record === null) {
|
|
677
|
+
return envelope.errors;
|
|
678
|
+
}
|
|
679
|
+
envelope.errors.push(...validateSparkNodeMetrics(envelope.record.metrics, `${label} metrics`));
|
|
680
|
+
envelope.errors.push(...validateSparkNodeRuntimeInfo(envelope.record.runtimeInfo, `${label} runtimeInfo`));
|
|
681
|
+
return envelope.errors;
|
|
682
|
+
}
|
|
683
|
+
catch {
|
|
684
|
+
return [`${label} must be safely inspectable`];
|
|
685
|
+
}
|
|
686
|
+
};
|
|
687
|
+
/** Spark -> Cloudly body for `sparkSwarmNodeContracts.metricsSample.endpoint`. */
|
|
688
|
+
export const validateSparkMetricsSampleRequest = async (requestArg) => {
|
|
689
|
+
const label = 'Spark metrics sample request';
|
|
690
|
+
try {
|
|
691
|
+
const envelope = readSparkRouteEnvelope(requestArg, label, ['nodeId', 'nodeToken', 'protocol', 'sample']);
|
|
692
|
+
if (envelope.record === null) {
|
|
693
|
+
return envelope.errors;
|
|
694
|
+
}
|
|
695
|
+
envelope.errors.push(...validateNodeMetricsSample(envelope.record.sample, `${label} sample`));
|
|
696
|
+
return envelope.errors;
|
|
697
|
+
}
|
|
698
|
+
catch {
|
|
699
|
+
return [`${label} must be safely inspectable`];
|
|
700
|
+
}
|
|
701
|
+
};
|
|
702
|
+
/**
|
|
703
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.actionResult.endpoint`.
|
|
704
|
+
*
|
|
705
|
+
* `pending` is the one status a node never reports: an action it has not started has no result to
|
|
706
|
+
* post, and a server that accepted one would reopen an action it already handed out.
|
|
707
|
+
*/
|
|
708
|
+
export const validateSparkActionResultRequest = async (requestArg) => {
|
|
709
|
+
const label = 'Spark action result request';
|
|
710
|
+
try {
|
|
711
|
+
const envelope = readSparkRouteEnvelope(requestArg, label, ['nodeId', 'nodeToken', 'protocol', 'actionId', 'status'], ['resultText']);
|
|
712
|
+
if (envelope.record === null) {
|
|
713
|
+
return envelope.errors;
|
|
714
|
+
}
|
|
715
|
+
const field = createSparkFieldErrors(envelope.record, label);
|
|
716
|
+
field.identifier('actionId');
|
|
717
|
+
field.member('status', sparkActionResultStatuses);
|
|
718
|
+
field.optional('resultText', (keyArg) => field.messageText(keyArg, maximumSparkActionResultTextLength));
|
|
719
|
+
envelope.errors.push(...field.errors);
|
|
720
|
+
return envelope.errors;
|
|
721
|
+
}
|
|
722
|
+
catch {
|
|
723
|
+
return [`${label} must be safely inspectable`];
|
|
724
|
+
}
|
|
725
|
+
};
|
|
392
726
|
/**
|
|
393
727
|
* The exact five members of a target that the set digest is taken over.
|
|
394
728
|
*
|
|
@@ -571,4 +905,4 @@ export const validateClusterNodeCorestore = (valueArg, pathArg = 'cluster node c
|
|
|
571
905
|
}
|
|
572
906
|
return errors;
|
|
573
907
|
};
|
|
574
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|
|
908
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TAppStoreStorageRequest } from '../appstore/types.js';
|
|
1
2
|
import type { TSecretManagementScope } from '../data/secret.js';
|
|
2
3
|
/**
|
|
3
4
|
* Backend-neutral storage vocabulary shared by App Store manifests, control
|
|
@@ -187,6 +188,24 @@ export type TResolvedStorageBinding = IResolvedFilesystemStorageBinding | IResol
|
|
|
187
188
|
export declare class StorageContractError extends Error {
|
|
188
189
|
constructor(reasonArg: string);
|
|
189
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* The one judgement of what a storage request is: the request read against its exact schema and
|
|
193
|
+
* returned in its contract shape — required members present, optional members carried only when
|
|
194
|
+
* the request declares them, and every value within the bounds an adapter can fulfil.
|
|
195
|
+
*
|
|
196
|
+
* A control plane that admits requests, a fulfillment adapter that provisions them, and an App
|
|
197
|
+
* Store front end that assembles them all have to agree on the same acceptance rules; a second
|
|
198
|
+
* copy of them anywhere is a second answer to which requests exist, and the digest one side issues
|
|
199
|
+
* would name a request the other never accepted. `canonicalizeStorageRequest` and
|
|
200
|
+
* `createStorageRequestSha256` are derived from this function rather than the other way round, so
|
|
201
|
+
* a consumer that needs the judged request itself does not have to re-parse its own canonical
|
|
202
|
+
* bytes.
|
|
203
|
+
*
|
|
204
|
+
* The returned request is a fresh value; the input is never read again after normalization and
|
|
205
|
+
* never mutated. Anything that is not a storage request is refused with `StorageContractError`,
|
|
206
|
+
* whose message names the failing field so a consumer can map it to its own status vocabulary.
|
|
207
|
+
*/
|
|
208
|
+
export declare const normalizeStorageRequest: (valueArg: unknown) => TAppStoreStorageRequest;
|
|
190
209
|
/**
|
|
191
210
|
* The exact bytes a storage request's digest is taken over: the request normalized to its contract
|
|
192
211
|
* shape, written as strict canonical JSON — keys in UTF-16 code-unit order, no whitespace, no
|
|
@@ -16,7 +16,27 @@ export class StorageContractError extends Error {
|
|
|
16
16
|
const fail = (reasonArg) => {
|
|
17
17
|
throw new StorageContractError(reasonArg);
|
|
18
18
|
};
|
|
19
|
-
const { normalizeStorageRequest } = createStorageContractReaders(fail);
|
|
19
|
+
const { normalizeStorageRequest: readStorageRequest } = createStorageContractReaders(fail);
|
|
20
|
+
/**
|
|
21
|
+
* The one judgement of what a storage request is: the request read against its exact schema and
|
|
22
|
+
* returned in its contract shape — required members present, optional members carried only when
|
|
23
|
+
* the request declares them, and every value within the bounds an adapter can fulfil.
|
|
24
|
+
*
|
|
25
|
+
* A control plane that admits requests, a fulfillment adapter that provisions them, and an App
|
|
26
|
+
* Store front end that assembles them all have to agree on the same acceptance rules; a second
|
|
27
|
+
* copy of them anywhere is a second answer to which requests exist, and the digest one side issues
|
|
28
|
+
* would name a request the other never accepted. `canonicalizeStorageRequest` and
|
|
29
|
+
* `createStorageRequestSha256` are derived from this function rather than the other way round, so
|
|
30
|
+
* a consumer that needs the judged request itself does not have to re-parse its own canonical
|
|
31
|
+
* bytes.
|
|
32
|
+
*
|
|
33
|
+
* The returned request is a fresh value; the input is never read again after normalization and
|
|
34
|
+
* never mutated. Anything that is not a storage request is refused with `StorageContractError`,
|
|
35
|
+
* whose message names the failing field so a consumer can map it to its own status vocabulary.
|
|
36
|
+
*/
|
|
37
|
+
export const normalizeStorageRequest = (valueArg) => {
|
|
38
|
+
return readStorageRequest(valueArg, 'storage request');
|
|
39
|
+
};
|
|
20
40
|
/**
|
|
21
41
|
* The exact bytes a storage request's digest is taken over: the request normalized to its contract
|
|
22
42
|
* shape, written as strict canonical JSON — keys in UTF-16 code-unit order, no whitespace, no
|
|
@@ -26,7 +46,7 @@ const { normalizeStorageRequest } = createStorageContractReaders(fail);
|
|
|
26
46
|
* unjudged body would name a request no adapter could fulfil.
|
|
27
47
|
*/
|
|
28
48
|
export const canonicalizeStorageRequest = (valueArg) => {
|
|
29
|
-
return canonicalizeStrictJson(normalizeStorageRequest(valueArg
|
|
49
|
+
return canonicalizeStrictJson(normalizeStorageRequest(valueArg), fail);
|
|
30
50
|
};
|
|
31
51
|
/**
|
|
32
52
|
* The storage request digest: bare lowercase hex SHA-256 over the canonical request, with no
|
|
@@ -41,4 +61,4 @@ export const createStorageRequestSha256 = async (valueArg) => {
|
|
|
41
61
|
return createCanonicalJsonSha256Hex(canonicalizeStorageRequest(valueArg), fail);
|
|
42
62
|
};
|
|
43
63
|
export { storageRequestCanonicalDigestGoldenVectors, } from './storage.golden.js';
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsYXRmb3JtL3N0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUNMLHNCQUFzQixFQUN0Qiw0QkFBNEIsR0FDN0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQVE3RTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRztJQUM5QyxhQUFhLEVBQUUsZUFBZTtDQUN0QixDQUFDO0FBaU9YLE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxLQUFLO0lBQzdDLFlBQW1CLFNBQWlCO1FBQ2xDLEtBQUssQ0FBQywyQkFBMkIsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO0lBQ3JDLENBQUM7Q0FDRjtBQUVELE1BQU0sSUFBSSxHQUFHLENBQUMsU0FBaUIsRUFBUyxFQUFFO0lBQ3hDLE1BQU0sSUFBSSxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUM7QUFFRixNQUFNLEVBQUUsdUJBQXVCLEVBQUUsa0JBQWtCLEVBQUUsR0FDbkQsNEJBQTRCLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFckM7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUNyQyxRQUFpQixFQUNRLEVBQUU7SUFDM0IsT0FBTyxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUN6RCxDQUFDLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxRQUFpQixFQUFVLEVBQUU7SUFDdEUsT0FBTyxzQkFBc0IsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUN6RSxDQUFDLENBQUM7QUFFRjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsUUFBaUIsRUFDQSxFQUFFO0lBQ25CLE9BQU8sNEJBQTRCLENBQUMsMEJBQTBCLENBQUMsUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDbEYsQ0FBQyxDQUFDO0FBRUYsT0FBTyxFQUNMLDBDQUEwQyxHQUUzQyxNQUFNLHFCQUFxQixDQUFDIn0=
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -146,6 +146,22 @@ rather than with this release. `ISparkSwarmNodeHeartbeatRequest` is now owned he
|
|
|
146
146
|
so Cloudly and Spark no longer carry private copies of it, and every Swarm-era body
|
|
147
147
|
— request and answer alike — carries `protocol` and is judged in the same order.
|
|
148
148
|
|
|
149
|
+
Each of the four routes has its validator here, so a server never writes its own
|
|
150
|
+
member checks: `data.validateSparkSwarmNodeHeartbeatRequest`,
|
|
151
|
+
`data.validateSparkMetricsSampleRequest`, `data.validateSparkActionResultRequest`
|
|
152
|
+
and `data.validateSparkSwarmObservationRequest`. All four answer the same way —
|
|
153
|
+
one string per refused member, naming the member, and an empty list for an
|
|
154
|
+
admissible body — so a route table can hold them side by side. They read the
|
|
155
|
+
envelope first (exact key set, the sender's offer, then the reporter's identity),
|
|
156
|
+
then the payload: a heartbeat's metrics and full runtime description including
|
|
157
|
+
each described serve.zone service, a sample's four observations and optional
|
|
158
|
+
network rates, and an action result whose status is one a node can actually
|
|
159
|
+
report, never `pending`. Bodies are judged member by member rather than as
|
|
160
|
+
canonical bytes, because only the observation is digested and the others carry
|
|
161
|
+
fractional CPU, memory and rate observations; every level is copied away from the
|
|
162
|
+
caller's object first, so an accessor is refused instead of run. None of them
|
|
163
|
+
authenticates a node or acts on the body.
|
|
164
|
+
|
|
149
165
|
Cloudly must authenticate the bearer against current Spark authority and fence
|
|
150
166
|
credential generation and session epoch transactionally before recording host
|
|
151
167
|
liveness. `ISparkNodeHeartbeatReceipt` contains only server-derived acceptance
|
|
@@ -1308,6 +1324,25 @@ around the request. A body that is not a storage request is refused with
|
|
|
1308
1324
|
taken over. `platform.storageRequestCanonicalDigestGoldenVectors` states both
|
|
1309
1325
|
for a filesystem request and for both object-storage deliveries.
|
|
1310
1326
|
|
|
1327
|
+
Which requests exist at all is stated by the same contract:
|
|
1328
|
+
|
|
1329
|
+
```typescript
|
|
1330
|
+
const storageRequest = platform.normalizeStorageRequest(declaredRequest);
|
|
1331
|
+
```
|
|
1332
|
+
|
|
1333
|
+
`platform.normalizeStorageRequest` reads a body against the exact request schema
|
|
1334
|
+
and returns the request in its contract shape — required members present,
|
|
1335
|
+
optional members carried only when declared, canonical environment keys, no
|
|
1336
|
+
empty `protection` block, no explicitly undefined member, no `-0` or unsafe
|
|
1337
|
+
integer, and plain JSON data members only. It is the value the other two
|
|
1338
|
+
functions are derived from: canonicalizing and digesting a request normalize it
|
|
1339
|
+
first, so a consumer that admits a request through this function and a control
|
|
1340
|
+
plane that digests it cannot accept different sets of requests. The input is
|
|
1341
|
+
never mutated and the returned request is a fresh object. A body that is not a
|
|
1342
|
+
storage request is refused with `platform.StorageContractError`, whose message
|
|
1343
|
+
names the failing member so a consumer can map the refusal to its own status
|
|
1344
|
+
vocabulary instead of restating the rules.
|
|
1345
|
+
|
|
1311
1346
|
Portable manifests and resolved bindings intentionally have no fields for
|
|
1312
1347
|
Synology, NFS, Kerberos, Corestore, Kubernetes, Docker drivers, servers,
|
|
1313
1348
|
exports, mount options, provider credential values, or local fallback paths. Runtimes
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/clusternode.ts
CHANGED
|
@@ -6,7 +6,11 @@ import {
|
|
|
6
6
|
canonicalizeStrictJson,
|
|
7
7
|
createCanonicalJsonSha256Hex,
|
|
8
8
|
} from '../private/canonicaljson.js';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
hasExactKeys,
|
|
11
|
+
readDataElements,
|
|
12
|
+
readDataProperties,
|
|
13
|
+
} from '../private/dataproperties.js';
|
|
10
14
|
|
|
11
15
|
export interface IClusterNodeMetrics {
|
|
12
16
|
cpuUsagePercent: number;
|
|
@@ -610,6 +614,29 @@ export const validateSparkSwarmObservation = async (
|
|
|
610
614
|
}
|
|
611
615
|
};
|
|
612
616
|
|
|
617
|
+
/**
|
|
618
|
+
* Which node is reporting, in the two members every Spark route body carries.
|
|
619
|
+
*
|
|
620
|
+
* All four routes authenticate the same reporter from the same pair, so the rule lives here: a
|
|
621
|
+
* copy per route is how one route ends up admitting a bearer another refuses.
|
|
622
|
+
*/
|
|
623
|
+
const validateSparkReporterIdentity = (
|
|
624
|
+
requestArg: Record<string, unknown>,
|
|
625
|
+
labelArg: string,
|
|
626
|
+
): string[] => {
|
|
627
|
+
const errors: string[] = [];
|
|
628
|
+
if (!isRuntimeIdentifier(requestArg.nodeId)) {
|
|
629
|
+
errors.push(`${labelArg} nodeId must be canonical`);
|
|
630
|
+
}
|
|
631
|
+
if (typeof requestArg.nodeToken !== 'string'
|
|
632
|
+
|| requestArg.nodeToken.length < 1
|
|
633
|
+
|| requestArg.nodeToken.length > 512
|
|
634
|
+
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
635
|
+
errors.push(`${labelArg} nodeToken must be a bounded opaque token`);
|
|
636
|
+
}
|
|
637
|
+
return errors;
|
|
638
|
+
};
|
|
639
|
+
|
|
613
640
|
export const validateSparkSwarmObservationRequest = async (
|
|
614
641
|
requestArg: unknown,
|
|
615
642
|
): Promise<string[]> => {
|
|
@@ -632,15 +659,10 @@ export const validateSparkSwarmObservationRequest = async (
|
|
|
632
659
|
'Spark Swarm observation request protocol',
|
|
633
660
|
);
|
|
634
661
|
errors.push(...await validateSparkSwarmObservation(requestArg.observation));
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|| requestArg.nodeToken.length < 1
|
|
640
|
-
|| requestArg.nodeToken.length > 512
|
|
641
|
-
|| requestArg.nodeToken.trim() !== requestArg.nodeToken) {
|
|
642
|
-
errors.push('Spark Swarm observation request nodeToken must be a bounded opaque token');
|
|
643
|
-
}
|
|
662
|
+
errors.push(...validateSparkReporterIdentity(
|
|
663
|
+
requestArg,
|
|
664
|
+
'Spark Swarm observation request',
|
|
665
|
+
));
|
|
644
666
|
return errors;
|
|
645
667
|
} catch {
|
|
646
668
|
return ['Spark Swarm observation request must be safely inspectable'];
|
|
@@ -735,6 +757,431 @@ export const validateSparkSwarmObservationResponse = async (
|
|
|
735
757
|
}
|
|
736
758
|
};
|
|
737
759
|
|
|
760
|
+
/** A runtime description or a service name: bounded, and free of bytes JSON text cannot carry. */
|
|
761
|
+
const maximumSparkRuntimeTextLength = 512;
|
|
762
|
+
/** An operator-facing message, which may hold line breaks but is still bounded. */
|
|
763
|
+
const maximumSparkMessageTextLength = 2048;
|
|
764
|
+
/** `sparkSwarmNodeContracts.actionResult` states what a server keeps of an action's output. */
|
|
765
|
+
const maximumSparkActionResultTextLength = 4000;
|
|
766
|
+
/**
|
|
767
|
+
* The route's own byte bound refuses an oversized runtime description first; this stops an
|
|
768
|
+
* in-process caller from making the validator walk a list no route could have delivered.
|
|
769
|
+
*/
|
|
770
|
+
const maximumSparkRuntimeServices = 64;
|
|
771
|
+
|
|
772
|
+
const sparkCloudlyConnectionStatuses = new Set<TSparkCloudlyConnectionStatus>([
|
|
773
|
+
'not-configured',
|
|
774
|
+
'connecting',
|
|
775
|
+
'connected',
|
|
776
|
+
'failed',
|
|
777
|
+
]);
|
|
778
|
+
const sparkNodeModes = new Set<TSparkNodeMode>(['cloudly', 'coreflow-node']);
|
|
779
|
+
const sparkActionResultStatuses = new Set<TNodeActionStatus>([
|
|
780
|
+
'running',
|
|
781
|
+
'succeeded',
|
|
782
|
+
'failed',
|
|
783
|
+
]);
|
|
784
|
+
|
|
785
|
+
const isBoundedText = (
|
|
786
|
+
valueArg: unknown,
|
|
787
|
+
maximumLengthArg = maximumSparkRuntimeTextLength,
|
|
788
|
+
): valueArg is string => (
|
|
789
|
+
typeof valueArg === 'string'
|
|
790
|
+
&& valueArg.length > 0
|
|
791
|
+
&& valueArg.length <= maximumLengthArg
|
|
792
|
+
&& !/[\u0000-\u001f\u007f]/u.test(valueArg)
|
|
793
|
+
);
|
|
794
|
+
|
|
795
|
+
/** Message text a node reports: line breaks and tabs are its content, other control bytes are not. */
|
|
796
|
+
const isBoundedMessageText = (
|
|
797
|
+
valueArg: unknown,
|
|
798
|
+
maximumLengthArg: number,
|
|
799
|
+
): valueArg is string => (
|
|
800
|
+
typeof valueArg === 'string'
|
|
801
|
+
&& valueArg.length <= maximumLengthArg
|
|
802
|
+
&& !/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/u.test(valueArg)
|
|
803
|
+
);
|
|
804
|
+
|
|
805
|
+
const isNonNegativeNumber = (
|
|
806
|
+
valueArg: unknown,
|
|
807
|
+
maximumArg = Number.MAX_SAFE_INTEGER,
|
|
808
|
+
): valueArg is number => (
|
|
809
|
+
typeof valueArg === 'number'
|
|
810
|
+
&& Number.isFinite(valueArg)
|
|
811
|
+
&& !Object.is(valueArg, -0)
|
|
812
|
+
&& valueArg >= 0
|
|
813
|
+
&& valueArg <= maximumArg
|
|
814
|
+
);
|
|
815
|
+
|
|
816
|
+
const isNonNegativeSafeInteger = (valueArg: unknown): valueArg is number => (
|
|
817
|
+
Number.isSafeInteger(valueArg) && !Object.is(valueArg, -0) && (valueArg as number) >= 0
|
|
818
|
+
);
|
|
819
|
+
|
|
820
|
+
/** A record a Spark body states, detached from the caller's object, or `null` with the reason. */
|
|
821
|
+
interface ISparkRecordReading {
|
|
822
|
+
record: Record<string, unknown> | null;
|
|
823
|
+
errors: string[];
|
|
824
|
+
}
|
|
825
|
+
|
|
826
|
+
/**
|
|
827
|
+
* One level of a Spark body: own enumerable data properties only, then the exact key set.
|
|
828
|
+
*
|
|
829
|
+
* The heartbeat, metrics-sample and action-result bodies are judged member by member rather than
|
|
830
|
+
* as canonical bytes, because only the observation is digested and those three legitimately carry
|
|
831
|
+
* fractional CPU, memory and rate observations that the digest's integer encoding would refuse.
|
|
832
|
+
* What the canonical reader also gave — a body that cannot run code or answer differently on a
|
|
833
|
+
* second read — is kept here by copying the data properties away from the caller's object before
|
|
834
|
+
* any member is judged.
|
|
835
|
+
*/
|
|
836
|
+
const readSparkRecord = (
|
|
837
|
+
valueArg: unknown,
|
|
838
|
+
labelArg: string,
|
|
839
|
+
requiredKeysArg: readonly string[],
|
|
840
|
+
optionalKeysArg: readonly string[] = [],
|
|
841
|
+
): ISparkRecordReading => {
|
|
842
|
+
const record = readDataProperties(valueArg);
|
|
843
|
+
if (record === null) {
|
|
844
|
+
return { record: null, errors: [`${labelArg} must contain plain JSON data properties`] };
|
|
845
|
+
}
|
|
846
|
+
if (!hasExactKeys(record, requiredKeysArg, optionalKeysArg)) {
|
|
847
|
+
return { record: null, errors: [`${labelArg} must use its exact schema`] };
|
|
848
|
+
}
|
|
849
|
+
return { record, errors: [] };
|
|
850
|
+
};
|
|
851
|
+
|
|
852
|
+
/**
|
|
853
|
+
* The envelope a Spark route body states before its payload: the exact key set, the reporter's
|
|
854
|
+
* protocol offer read by name, and the reporter's identity — in that order, because a server
|
|
855
|
+
* answers an unreadable offer before it looks at anything the body claims about a node.
|
|
856
|
+
*/
|
|
857
|
+
const readSparkRouteEnvelope = (
|
|
858
|
+
requestArg: unknown,
|
|
859
|
+
labelArg: string,
|
|
860
|
+
requiredKeysArg: readonly string[],
|
|
861
|
+
optionalKeysArg: readonly string[] = [],
|
|
862
|
+
): ISparkRecordReading => {
|
|
863
|
+
const reading = readSparkRecord(requestArg, labelArg, requiredKeysArg, optionalKeysArg);
|
|
864
|
+
if (reading.record === null) {
|
|
865
|
+
return reading;
|
|
866
|
+
}
|
|
867
|
+
return {
|
|
868
|
+
record: reading.record,
|
|
869
|
+
errors: [
|
|
870
|
+
...validateProtocolOfferOn(reading.record, `${labelArg} protocol`),
|
|
871
|
+
...validateSparkReporterIdentity(reading.record, labelArg),
|
|
872
|
+
],
|
|
873
|
+
};
|
|
874
|
+
};
|
|
875
|
+
|
|
876
|
+
/**
|
|
877
|
+
* One reason per member, collected rather than thrown.
|
|
878
|
+
*
|
|
879
|
+
* A Spark route answers a refusal before the node is authenticated, so the reporter only ever
|
|
880
|
+
* learns which member of its own body was wrong; naming that member is what lets an operator fix
|
|
881
|
+
* a node without reading the server's source.
|
|
882
|
+
*/
|
|
883
|
+
const createSparkFieldErrors = (
|
|
884
|
+
recordArg: Record<string, unknown>,
|
|
885
|
+
labelArg: string,
|
|
886
|
+
) => {
|
|
887
|
+
const errors: string[] = [];
|
|
888
|
+
return {
|
|
889
|
+
errors,
|
|
890
|
+
number: (keyArg: string, maximumArg?: number): void => {
|
|
891
|
+
if (!isNonNegativeNumber(recordArg[keyArg], maximumArg)) {
|
|
892
|
+
errors.push(`${labelArg} ${keyArg} must be a bounded non-negative number`);
|
|
893
|
+
}
|
|
894
|
+
},
|
|
895
|
+
percentage: (keyArg: string): void => {
|
|
896
|
+
if (!isNonNegativeNumber(recordArg[keyArg], 100)) {
|
|
897
|
+
errors.push(`${labelArg} ${keyArg} must be a percentage between 0 and 100`);
|
|
898
|
+
}
|
|
899
|
+
},
|
|
900
|
+
count: (keyArg: string): void => {
|
|
901
|
+
if (!isNonNegativeSafeInteger(recordArg[keyArg])) {
|
|
902
|
+
errors.push(`${labelArg} ${keyArg} must be a non-negative safe integer`);
|
|
903
|
+
}
|
|
904
|
+
},
|
|
905
|
+
instant: (keyArg: string): void => {
|
|
906
|
+
if (!isPositiveSafeInteger(recordArg[keyArg])) {
|
|
907
|
+
errors.push(`${labelArg} ${keyArg} must be a positive safe integer timestamp`);
|
|
908
|
+
}
|
|
909
|
+
},
|
|
910
|
+
text: (keyArg: string): void => {
|
|
911
|
+
if (!isBoundedText(recordArg[keyArg])) {
|
|
912
|
+
errors.push(`${labelArg} ${keyArg} must be bounded non-empty text`);
|
|
913
|
+
}
|
|
914
|
+
},
|
|
915
|
+
messageText: (keyArg: string, maximumLengthArg: number): void => {
|
|
916
|
+
if (!isBoundedMessageText(recordArg[keyArg], maximumLengthArg)) {
|
|
917
|
+
errors.push(`${labelArg} ${keyArg} must be bounded message text`);
|
|
918
|
+
}
|
|
919
|
+
},
|
|
920
|
+
identifier: (keyArg: string): void => {
|
|
921
|
+
if (!isRuntimeIdentifier(recordArg[keyArg])) {
|
|
922
|
+
errors.push(`${labelArg} ${keyArg} must be canonical`);
|
|
923
|
+
}
|
|
924
|
+
},
|
|
925
|
+
boolean: (keyArg: string): void => {
|
|
926
|
+
if (typeof recordArg[keyArg] !== 'boolean') {
|
|
927
|
+
errors.push(`${labelArg} ${keyArg} must be a boolean`);
|
|
928
|
+
}
|
|
929
|
+
},
|
|
930
|
+
member: <TMember extends string>(keyArg: string, allowedArg: ReadonlySet<TMember>): void => {
|
|
931
|
+
if (!allowedArg.has(recordArg[keyArg] as TMember)) {
|
|
932
|
+
errors.push(`${labelArg} ${keyArg} is outside the supported values`);
|
|
933
|
+
}
|
|
934
|
+
},
|
|
935
|
+
/** Runs `checkArg` only when the optional member is present at all. */
|
|
936
|
+
optional: (keyArg: string, checkArg: (keyArg: string) => void): void => {
|
|
937
|
+
if (recordArg[keyArg] !== undefined) {
|
|
938
|
+
checkArg(keyArg);
|
|
939
|
+
}
|
|
940
|
+
},
|
|
941
|
+
};
|
|
942
|
+
};
|
|
943
|
+
|
|
944
|
+
const validateSparkNodeMetrics = (valueArg: unknown, labelArg: string): string[] => {
|
|
945
|
+
const reading = readSparkRecord(valueArg, labelArg, [
|
|
946
|
+
'cpuUsagePercent',
|
|
947
|
+
'memoryUsedMB',
|
|
948
|
+
'memoryAvailableMB',
|
|
949
|
+
'diskUsedGB',
|
|
950
|
+
'diskAvailableGB',
|
|
951
|
+
'containerCount',
|
|
952
|
+
'timestamp',
|
|
953
|
+
]);
|
|
954
|
+
if (reading.record === null) {
|
|
955
|
+
return reading.errors;
|
|
956
|
+
}
|
|
957
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
958
|
+
field.percentage('cpuUsagePercent');
|
|
959
|
+
field.number('memoryUsedMB');
|
|
960
|
+
field.number('memoryAvailableMB');
|
|
961
|
+
field.number('diskUsedGB');
|
|
962
|
+
field.number('diskAvailableGB');
|
|
963
|
+
field.count('containerCount');
|
|
964
|
+
field.instant('timestamp');
|
|
965
|
+
return field.errors;
|
|
966
|
+
};
|
|
967
|
+
|
|
968
|
+
const validateNodeMetricsSample = (valueArg: unknown, labelArg: string): string[] => {
|
|
969
|
+
const reading = readSparkRecord(
|
|
970
|
+
valueArg,
|
|
971
|
+
labelArg,
|
|
972
|
+
['timestamp', 'cpuUsagePercent', 'memoryUsedMB', 'memoryAvailableMB'],
|
|
973
|
+
['networkRxBytesPerSec', 'networkTxBytesPerSec'],
|
|
974
|
+
);
|
|
975
|
+
if (reading.record === null) {
|
|
976
|
+
return reading.errors;
|
|
977
|
+
}
|
|
978
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
979
|
+
field.instant('timestamp');
|
|
980
|
+
field.percentage('cpuUsagePercent');
|
|
981
|
+
field.number('memoryUsedMB');
|
|
982
|
+
field.number('memoryAvailableMB');
|
|
983
|
+
field.optional('networkRxBytesPerSec', field.number);
|
|
984
|
+
field.optional('networkTxBytesPerSec', field.number);
|
|
985
|
+
return field.errors;
|
|
986
|
+
};
|
|
987
|
+
|
|
988
|
+
const validateServeZoneServiceRuntimeInfo = (
|
|
989
|
+
valueArg: unknown,
|
|
990
|
+
labelArg: string,
|
|
991
|
+
): string[] => {
|
|
992
|
+
const reading = readSparkRecord(
|
|
993
|
+
valueArg,
|
|
994
|
+
labelArg,
|
|
995
|
+
['name', 'running', 'checkedAt'],
|
|
996
|
+
[
|
|
997
|
+
'serviceId',
|
|
998
|
+
'image',
|
|
999
|
+
'desiredImage',
|
|
1000
|
+
'imageVersion',
|
|
1001
|
+
'runningImageId',
|
|
1002
|
+
'runningTaskCount',
|
|
1003
|
+
'updatedAt',
|
|
1004
|
+
'error',
|
|
1005
|
+
],
|
|
1006
|
+
);
|
|
1007
|
+
if (reading.record === null) {
|
|
1008
|
+
return reading.errors;
|
|
1009
|
+
}
|
|
1010
|
+
const field = createSparkFieldErrors(reading.record, labelArg);
|
|
1011
|
+
field.text('name');
|
|
1012
|
+
field.boolean('running');
|
|
1013
|
+
field.instant('checkedAt');
|
|
1014
|
+
field.optional('serviceId', field.text);
|
|
1015
|
+
field.optional('image', field.text);
|
|
1016
|
+
field.optional('desiredImage', field.text);
|
|
1017
|
+
field.optional('imageVersion', field.text);
|
|
1018
|
+
field.optional('runningImageId', field.text);
|
|
1019
|
+
field.optional('runningTaskCount', field.count);
|
|
1020
|
+
field.optional('updatedAt', field.instant);
|
|
1021
|
+
field.optional('error', (keyArg) => field.messageText(keyArg, maximumSparkMessageTextLength));
|
|
1022
|
+
return field.errors;
|
|
1023
|
+
};
|
|
1024
|
+
|
|
1025
|
+
const validateSparkNodeRuntimeInfo = (valueArg: unknown, labelArg: string): string[] => {
|
|
1026
|
+
const reading = readSparkRecord(
|
|
1027
|
+
valueArg,
|
|
1028
|
+
labelArg,
|
|
1029
|
+
[
|
|
1030
|
+
'runtime',
|
|
1031
|
+
'nodeId',
|
|
1032
|
+
'platform',
|
|
1033
|
+
'arch',
|
|
1034
|
+
'sparkVersion',
|
|
1035
|
+
'cloudlyConnectionStatus',
|
|
1036
|
+
'dockerAvailable',
|
|
1037
|
+
'checkedAt',
|
|
1038
|
+
],
|
|
1039
|
+
[
|
|
1040
|
+
'mode',
|
|
1041
|
+
'hostname',
|
|
1042
|
+
'osRelease',
|
|
1043
|
+
'cloudlyUrl',
|
|
1044
|
+
'swarmNodeId',
|
|
1045
|
+
'serveZoneServices',
|
|
1046
|
+
'lastError',
|
|
1047
|
+
],
|
|
1048
|
+
);
|
|
1049
|
+
if (reading.record === null) {
|
|
1050
|
+
return reading.errors;
|
|
1051
|
+
}
|
|
1052
|
+
const runtimeInfo = reading.record;
|
|
1053
|
+
const field = createSparkFieldErrors(runtimeInfo, labelArg);
|
|
1054
|
+
if (runtimeInfo.runtime !== 'spark') {
|
|
1055
|
+
field.errors.push(`${labelArg} runtime must be spark`);
|
|
1056
|
+
}
|
|
1057
|
+
field.identifier('nodeId');
|
|
1058
|
+
field.text('platform');
|
|
1059
|
+
field.text('arch');
|
|
1060
|
+
field.text('sparkVersion');
|
|
1061
|
+
field.member('cloudlyConnectionStatus', sparkCloudlyConnectionStatuses);
|
|
1062
|
+
field.boolean('dockerAvailable');
|
|
1063
|
+
field.instant('checkedAt');
|
|
1064
|
+
field.optional('mode', (keyArg) => field.member(keyArg, sparkNodeModes));
|
|
1065
|
+
field.optional('hostname', field.text);
|
|
1066
|
+
field.optional('osRelease', field.text);
|
|
1067
|
+
field.optional('cloudlyUrl', field.text);
|
|
1068
|
+
field.optional('swarmNodeId', field.identifier);
|
|
1069
|
+
field.optional('lastError', (keyArg) => field.messageText(keyArg, maximumSparkMessageTextLength));
|
|
1070
|
+
if (runtimeInfo.serveZoneServices !== undefined) {
|
|
1071
|
+
const services = readDataElements(runtimeInfo.serveZoneServices, maximumSparkRuntimeServices);
|
|
1072
|
+
if (services === null) {
|
|
1073
|
+
field.errors.push(
|
|
1074
|
+
`${labelArg} serveZoneServices must be a bounded list of at most `
|
|
1075
|
+
+ `${maximumSparkRuntimeServices} described services`,
|
|
1076
|
+
);
|
|
1077
|
+
} else {
|
|
1078
|
+
services.forEach((serviceArg, indexArg) => {
|
|
1079
|
+
field.errors.push(...validateServeZoneServiceRuntimeInfo(
|
|
1080
|
+
serviceArg,
|
|
1081
|
+
`${labelArg} serveZoneServices[${indexArg}]`,
|
|
1082
|
+
));
|
|
1083
|
+
});
|
|
1084
|
+
}
|
|
1085
|
+
}
|
|
1086
|
+
return field.errors;
|
|
1087
|
+
};
|
|
1088
|
+
|
|
1089
|
+
/**
|
|
1090
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.heartbeat.endpoint`.
|
|
1091
|
+
*
|
|
1092
|
+
* Stated here beside the shape it judges, so the server that reads the beat and the node that
|
|
1093
|
+
* writes it apply one set of acceptance rules; a reader that kept its own member checks would
|
|
1094
|
+
* decide on its own which beats exist.
|
|
1095
|
+
*
|
|
1096
|
+
* Every Spark route validator answers the same way — one string per refused member, empty for an
|
|
1097
|
+
* admissible body, and the same `(body) => Promise<string[]>` signature, so a server can hold the
|
|
1098
|
+
* four routes in one table.
|
|
1099
|
+
*/
|
|
1100
|
+
export const validateSparkSwarmNodeHeartbeatRequest = async (
|
|
1101
|
+
requestArg: unknown,
|
|
1102
|
+
): Promise<string[]> => {
|
|
1103
|
+
const label = 'Spark Swarm node heartbeat request';
|
|
1104
|
+
try {
|
|
1105
|
+
const envelope = readSparkRouteEnvelope(
|
|
1106
|
+
requestArg,
|
|
1107
|
+
label,
|
|
1108
|
+
['nodeId', 'nodeToken', 'protocol', 'metrics', 'runtimeInfo'],
|
|
1109
|
+
);
|
|
1110
|
+
if (envelope.record === null) {
|
|
1111
|
+
return envelope.errors;
|
|
1112
|
+
}
|
|
1113
|
+
envelope.errors.push(...validateSparkNodeMetrics(
|
|
1114
|
+
envelope.record.metrics,
|
|
1115
|
+
`${label} metrics`,
|
|
1116
|
+
));
|
|
1117
|
+
envelope.errors.push(...validateSparkNodeRuntimeInfo(
|
|
1118
|
+
envelope.record.runtimeInfo,
|
|
1119
|
+
`${label} runtimeInfo`,
|
|
1120
|
+
));
|
|
1121
|
+
return envelope.errors;
|
|
1122
|
+
} catch {
|
|
1123
|
+
return [`${label} must be safely inspectable`];
|
|
1124
|
+
}
|
|
1125
|
+
};
|
|
1126
|
+
|
|
1127
|
+
/** Spark -> Cloudly body for `sparkSwarmNodeContracts.metricsSample.endpoint`. */
|
|
1128
|
+
export const validateSparkMetricsSampleRequest = async (
|
|
1129
|
+
requestArg: unknown,
|
|
1130
|
+
): Promise<string[]> => {
|
|
1131
|
+
const label = 'Spark metrics sample request';
|
|
1132
|
+
try {
|
|
1133
|
+
const envelope = readSparkRouteEnvelope(
|
|
1134
|
+
requestArg,
|
|
1135
|
+
label,
|
|
1136
|
+
['nodeId', 'nodeToken', 'protocol', 'sample'],
|
|
1137
|
+
);
|
|
1138
|
+
if (envelope.record === null) {
|
|
1139
|
+
return envelope.errors;
|
|
1140
|
+
}
|
|
1141
|
+
envelope.errors.push(...validateNodeMetricsSample(
|
|
1142
|
+
envelope.record.sample,
|
|
1143
|
+
`${label} sample`,
|
|
1144
|
+
));
|
|
1145
|
+
return envelope.errors;
|
|
1146
|
+
} catch {
|
|
1147
|
+
return [`${label} must be safely inspectable`];
|
|
1148
|
+
}
|
|
1149
|
+
};
|
|
1150
|
+
|
|
1151
|
+
/**
|
|
1152
|
+
* Spark -> Cloudly body for `sparkSwarmNodeContracts.actionResult.endpoint`.
|
|
1153
|
+
*
|
|
1154
|
+
* `pending` is the one status a node never reports: an action it has not started has no result to
|
|
1155
|
+
* post, and a server that accepted one would reopen an action it already handed out.
|
|
1156
|
+
*/
|
|
1157
|
+
export const validateSparkActionResultRequest = async (
|
|
1158
|
+
requestArg: unknown,
|
|
1159
|
+
): Promise<string[]> => {
|
|
1160
|
+
const label = 'Spark action result request';
|
|
1161
|
+
try {
|
|
1162
|
+
const envelope = readSparkRouteEnvelope(
|
|
1163
|
+
requestArg,
|
|
1164
|
+
label,
|
|
1165
|
+
['nodeId', 'nodeToken', 'protocol', 'actionId', 'status'],
|
|
1166
|
+
['resultText'],
|
|
1167
|
+
);
|
|
1168
|
+
if (envelope.record === null) {
|
|
1169
|
+
return envelope.errors;
|
|
1170
|
+
}
|
|
1171
|
+
const field = createSparkFieldErrors(envelope.record, label);
|
|
1172
|
+
field.identifier('actionId');
|
|
1173
|
+
field.member('status', sparkActionResultStatuses);
|
|
1174
|
+
field.optional('resultText', (keyArg) => field.messageText(
|
|
1175
|
+
keyArg,
|
|
1176
|
+
maximumSparkActionResultTextLength,
|
|
1177
|
+
));
|
|
1178
|
+
envelope.errors.push(...field.errors);
|
|
1179
|
+
return envelope.errors;
|
|
1180
|
+
} catch {
|
|
1181
|
+
return [`${label} must be safely inspectable`];
|
|
1182
|
+
}
|
|
1183
|
+
};
|
|
1184
|
+
|
|
738
1185
|
/**
|
|
739
1186
|
* The exact five members of a target that the set digest is taken over.
|
|
740
1187
|
*
|
package/ts/platform/storage.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TAppStoreStorageRequest } from '../appstore/types.js';
|
|
1
2
|
import type { TSecretManagementScope } from '../data/secret.js';
|
|
2
3
|
import {
|
|
3
4
|
canonicalizeStrictJson,
|
|
@@ -253,7 +254,31 @@ const fail = (reasonArg: string): never => {
|
|
|
253
254
|
throw new StorageContractError(reasonArg);
|
|
254
255
|
};
|
|
255
256
|
|
|
256
|
-
const { normalizeStorageRequest } =
|
|
257
|
+
const { normalizeStorageRequest: readStorageRequest } =
|
|
258
|
+
createStorageContractReaders(fail);
|
|
259
|
+
|
|
260
|
+
/**
|
|
261
|
+
* The one judgement of what a storage request is: the request read against its exact schema and
|
|
262
|
+
* returned in its contract shape — required members present, optional members carried only when
|
|
263
|
+
* the request declares them, and every value within the bounds an adapter can fulfil.
|
|
264
|
+
*
|
|
265
|
+
* A control plane that admits requests, a fulfillment adapter that provisions them, and an App
|
|
266
|
+
* Store front end that assembles them all have to agree on the same acceptance rules; a second
|
|
267
|
+
* copy of them anywhere is a second answer to which requests exist, and the digest one side issues
|
|
268
|
+
* would name a request the other never accepted. `canonicalizeStorageRequest` and
|
|
269
|
+
* `createStorageRequestSha256` are derived from this function rather than the other way round, so
|
|
270
|
+
* a consumer that needs the judged request itself does not have to re-parse its own canonical
|
|
271
|
+
* bytes.
|
|
272
|
+
*
|
|
273
|
+
* The returned request is a fresh value; the input is never read again after normalization and
|
|
274
|
+
* never mutated. Anything that is not a storage request is refused with `StorageContractError`,
|
|
275
|
+
* whose message names the failing field so a consumer can map it to its own status vocabulary.
|
|
276
|
+
*/
|
|
277
|
+
export const normalizeStorageRequest = (
|
|
278
|
+
valueArg: unknown,
|
|
279
|
+
): TAppStoreStorageRequest => {
|
|
280
|
+
return readStorageRequest(valueArg, 'storage request');
|
|
281
|
+
};
|
|
257
282
|
|
|
258
283
|
/**
|
|
259
284
|
* The exact bytes a storage request's digest is taken over: the request normalized to its contract
|
|
@@ -264,10 +289,7 @@ const { normalizeStorageRequest } = createStorageContractReaders(fail);
|
|
|
264
289
|
* unjudged body would name a request no adapter could fulfil.
|
|
265
290
|
*/
|
|
266
291
|
export const canonicalizeStorageRequest = (valueArg: unknown): string => {
|
|
267
|
-
return canonicalizeStrictJson(
|
|
268
|
-
normalizeStorageRequest(valueArg, 'storage request'),
|
|
269
|
-
fail,
|
|
270
|
-
);
|
|
292
|
+
return canonicalizeStrictJson(normalizeStorageRequest(valueArg), fail);
|
|
271
293
|
};
|
|
272
294
|
|
|
273
295
|
/**
|