@serve.zone/interfaces 32.0.1 → 32.1.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 +32 -0
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/noderetirement.d.ts +39 -0
- package/dist_ts/data/noderetirement.js +31 -0
- package/dist_ts/data/serviceruntime.d.ts +10 -2
- package/dist_ts/data/serviceruntime.js +4 -3
- package/dist_ts/platform/objectstorageretention.d.ts +7 -0
- package/dist_ts/platform/objectstorageretention.js +3 -2
- package/dist_ts/requests/node.d.ts +25 -0
- package/package.json +1 -1
- package/readme.md +25 -3
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/data/index.ts +1 -0
- package/ts/data/noderetirement.ts +63 -0
- package/ts/data/serviceruntime.ts +12 -3
- package/ts/platform/objectstorageretention.ts +9 -1
- package/ts/requests/node.ts +29 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-18 - 32.1.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add `data.INodeRuntimeRetirement { id, clusterId, state: 'retiring' | 'retired', actorId, since }`
|
|
8
|
+
with `snapshotNodeRuntimeRetirement`, the record the producer chain reads to take a node out of
|
|
9
|
+
its cluster's runtime. The producers read its presence, not its state: a node that has a
|
|
10
|
+
retirement row is no longer an egress member and desires no slots.
|
|
11
|
+
- Add `requests.node.retireClusterNode { identity, nodeId, expectedGeneration }` → `{ retirement }`,
|
|
12
|
+
the admin write that starts a node's retirement and so makes it deletable. It fences on the
|
|
13
|
+
cluster runtime generation read with `getClusterRuntime`, and refuses with one of
|
|
14
|
+
`data.nodeRuntimeRetirementRefusals`: `node-missing`, `cluster-runtime-not-pallet`,
|
|
15
|
+
`node-already-retired` or `conflict`.
|
|
16
|
+
- Add `ports-too-many` and `node-authority-unsupported` to `data.TServiceRuntimeRefusal`. The first
|
|
17
|
+
names a service declaring more target ports than `runtimeConfigContract.maximumTargetPorts`
|
|
18
|
+
carries, which until now had no name and left Cloudly throwing an unattributable contract
|
|
19
|
+
assertion; the second names a node whose session resolved fewer workload authorities than the spec
|
|
20
|
+
needs, which the admit step refuses instead of parking the work on the node.
|
|
21
|
+
|
|
22
|
+
## 2026-09-18 - 32.0.2
|
|
23
|
+
|
|
24
|
+
### Fixes
|
|
25
|
+
|
|
26
|
+
- Restore `IObjectStorageRetentionSentinelEvidence.version`, which 32.0.0 removed with our own
|
|
27
|
+
version members. The sentinel is `@lossless.org/objectstorage`'s `ObjectRetentionRecord`, handed
|
|
28
|
+
back verbatim by `getBucketRetentionReceipt()`, so the member is that package's on-disk layout and
|
|
29
|
+
stays under naming rule N10 like its object key does. `validateObjectStorageRetentionEvidence()`
|
|
30
|
+
reads it again in the sentinel's exact-key set and requires the value `1`, so real provider
|
|
31
|
+
evidence passes instead of failing with "sentinel evidence must use its exact schema". The
|
|
32
|
+
capability evidence keeps no version: Corestore composes it member by member, so those bytes are
|
|
33
|
+
ours. An audit of every other version member 32.0.0 removed found no second foreign one.
|
|
34
|
+
|
|
3
35
|
## 2026-09-18 - 32.0.1
|
|
4
36
|
|
|
5
37
|
### Fixes
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
|
-
name:
|
|
6
|
-
version:
|
|
7
|
-
description:
|
|
5
|
+
name: '@serve.zone/interfaces',
|
|
6
|
+
version: '32.1.0',
|
|
7
|
+
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export * from './isolatedrestore.golden.js';
|
|
|
25
25
|
export * from './mail.js';
|
|
26
26
|
export * from './nodecredential.js';
|
|
27
27
|
export * from './nodeenrollment.js';
|
|
28
|
+
export * from './noderetirement.js';
|
|
28
29
|
export * from './networkaddressplan.js';
|
|
29
30
|
export * from './networkauthority.js';
|
|
30
31
|
export * from './networkcredential.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -25,6 +25,7 @@ export * from './isolatedrestore.golden.js';
|
|
|
25
25
|
export * from './mail.js';
|
|
26
26
|
export * from './nodecredential.js';
|
|
27
27
|
export * from './nodeenrollment.js';
|
|
28
|
+
export * from './noderetirement.js';
|
|
28
29
|
export * from './networkaddressplan.js';
|
|
29
30
|
export * from './networkauthority.js';
|
|
30
31
|
export * from './networkcredential.js';
|
|
@@ -57,4 +58,4 @@ export * from './traffic.js';
|
|
|
57
58
|
export * from './user.js';
|
|
58
59
|
export * from './version.js';
|
|
59
60
|
export * from './webpush.js';
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsd0JBQXdCLENBQUM7QUFFdkMsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsY0FBYyxDQUFDIn0=
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
declare const nodeRuntimeRetirementStates: readonly ["retiring", "retired"];
|
|
2
|
+
/**
|
|
3
|
+
* How far a node's retirement has come: `retiring` while the producer still stops and removes the
|
|
4
|
+
* node's slots, the compiler quarantines its handoff and both node credentials are revoked;
|
|
5
|
+
* `retired` once all of that has settled and nothing but the node document is left to delete.
|
|
6
|
+
*/
|
|
7
|
+
export type TNodeRuntimeRetirementState = typeof nodeRuntimeRetirementStates[number];
|
|
8
|
+
/**
|
|
9
|
+
* That one node leaves its cluster's runtime, stored beside the node document rather than inside
|
|
10
|
+
* it, because a node update merges caller data and no caller may retire a node with it.
|
|
11
|
+
*
|
|
12
|
+
* The producers read the row's presence rather than its state: a node that has one is no longer an
|
|
13
|
+
* egress member and desires no slots. The row is therefore written before anything is taken away,
|
|
14
|
+
* and it stays for as long as the node document does.
|
|
15
|
+
*/
|
|
16
|
+
export interface INodeRuntimeRetirement {
|
|
17
|
+
/** The node id. */
|
|
18
|
+
id: string;
|
|
19
|
+
/** The cluster the node is retiring from, copied by Cloudly; never caller-chosen. */
|
|
20
|
+
clusterId: string;
|
|
21
|
+
state: TNodeRuntimeRetirementState;
|
|
22
|
+
/** The administrator who asked for the retirement. */
|
|
23
|
+
actorId: string;
|
|
24
|
+
/** Unix milliseconds on Cloudly's clock, when the row entered its current state. */
|
|
25
|
+
since: number;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Every reason Cloudly answers instead of retiring a node. Each travels as a `TypedResponseError`,
|
|
29
|
+
* and none of them takes anything away: a refused retirement leaves the node exactly as it was.
|
|
30
|
+
*/
|
|
31
|
+
export declare const nodeRuntimeRetirementRefusals: readonly ["node-missing", "cluster-runtime-not-pallet", "node-already-retired", "conflict"];
|
|
32
|
+
/** One of the reasons Cloudly answers instead of a retirement row. */
|
|
33
|
+
export type TNodeRuntimeRetirementRefusal = typeof nodeRuntimeRetirementRefusals[number];
|
|
34
|
+
/**
|
|
35
|
+
* Structural snapshot for exact persistence; whether the node exists and whether its cluster admits
|
|
36
|
+
* the retirement is Cloudly's.
|
|
37
|
+
*/
|
|
38
|
+
export declare const snapshotNodeRuntimeRetirement: (value: unknown) => INodeRuntimeRetirement;
|
|
39
|
+
export {};
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { captureNetwork, networkCounter, networkId, networkRecord, requireNetwork } from '../private/networkcontract.js';
|
|
2
|
+
import { isOneOf, producerSafe } from '../private/producercontract.js';
|
|
3
|
+
const nodeRuntimeRetirementStates = ['retiring', 'retired'];
|
|
4
|
+
/**
|
|
5
|
+
* Every reason Cloudly answers instead of retiring a node. Each travels as a `TypedResponseError`,
|
|
6
|
+
* and none of them takes anything away: a refused retirement leaves the node exactly as it was.
|
|
7
|
+
*/
|
|
8
|
+
export const nodeRuntimeRetirementRefusals = Object.freeze([
|
|
9
|
+
/** No node of that id exists, so there is nothing to retire. */
|
|
10
|
+
'node-missing',
|
|
11
|
+
/**
|
|
12
|
+
* The node's cluster runs no Pallet runtime — it has no phase record, or a phase other than
|
|
13
|
+
* `pallet`. Which of the two it is, `getClusterRuntime` says.
|
|
14
|
+
*/
|
|
15
|
+
'cluster-runtime-not-pallet',
|
|
16
|
+
/** The node already carries a retirement row; neither of its states is left by retiring again. */
|
|
17
|
+
'node-already-retired',
|
|
18
|
+
/** `expectedGeneration` is not the cluster runtime's current generation, so a cutover moved underneath the caller. */
|
|
19
|
+
'conflict',
|
|
20
|
+
]);
|
|
21
|
+
/**
|
|
22
|
+
* Structural snapshot for exact persistence; whether the node exists and whether its cluster admits
|
|
23
|
+
* the retirement is Cloudly's.
|
|
24
|
+
*/
|
|
25
|
+
export const snapshotNodeRuntimeRetirement = (value) => producerSafe(() => {
|
|
26
|
+
const item = networkRecord(captureNetwork(value), ['id', 'clusterId', 'state', 'actorId', 'since']);
|
|
27
|
+
requireNetwork(isOneOf(nodeRuntimeRetirementStates, item.state));
|
|
28
|
+
return { id: networkId(item.id), clusterId: networkId(item.clusterId), state: item.state,
|
|
29
|
+
actorId: networkId(item.actorId), since: networkCounter(item.since) };
|
|
30
|
+
});
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZXJldGlyZW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL25vZGVyZXRpcmVtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsY0FBYyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDekgsT0FBTyxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV2RSxNQUFNLDJCQUEyQixHQUFHLENBQUMsVUFBVSxFQUFFLFNBQVMsQ0FBVSxDQUFDO0FBNkJyRTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSw2QkFBNkIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ3pELGdFQUFnRTtJQUNoRSxjQUFjO0lBQ2Q7OztPQUdHO0lBQ0gsNEJBQTRCO0lBQzVCLGtHQUFrRztJQUNsRyxzQkFBc0I7SUFDdEIsc0hBQXNIO0lBQ3RILFVBQVU7Q0FDRixDQUFDLENBQUM7QUFLWjs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSw2QkFBNkIsR0FBRyxDQUFDLEtBQWMsRUFBMEIsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLEVBQUU7SUFDekcsTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3BHLGNBQWMsQ0FBQyxPQUFPLENBQUMsMkJBQTJCLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDakUsT0FBTyxFQUFFLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztRQUN0RixPQUFPLEVBQUUsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxLQUFLLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO0FBQzFFLENBQUMsQ0FBQyxDQUFDIn0=
|
|
@@ -70,14 +70,22 @@ export declare const serviceRuntimeContract: Readonly<{
|
|
|
70
70
|
readonly maximumAssignmentPageSize: 256;
|
|
71
71
|
}>;
|
|
72
72
|
declare const serviceRuntimeWaitingReasons: readonly ["node-network-pending", "conflict", "failure-backoff"];
|
|
73
|
-
declare const serviceRuntimeRefusals: readonly ["cluster-runtime-missing", "organization-missing", "image-plan-missing", "platform-unsupported", "secrets-unsupported", "volumes-unsupported", "port-protocol-unsupported", "readiness-target-undeclared", "environment-too-large", "no-eligible-node", "replica-limit"];
|
|
73
|
+
declare const serviceRuntimeRefusals: readonly ["cluster-runtime-missing", "organization-missing", "image-plan-missing", "platform-unsupported", "secrets-unsupported", "volumes-unsupported", "port-protocol-unsupported", "ports-too-many", "readiness-target-undeclared", "environment-too-large", "no-eligible-node", "replica-limit", "node-authority-unsupported"];
|
|
74
74
|
/**
|
|
75
75
|
* Why the producer is not converging yet, though nothing needs an administrator:
|
|
76
76
|
* `node-network-pending` waits for a node's network readiness, `conflict` for a sweep over inputs
|
|
77
77
|
* that changed while it ran, `failure-backoff` for a failed replica's backoff to elapse.
|
|
78
78
|
*/
|
|
79
79
|
export type TServiceRuntimeWaitingReason = typeof serviceRuntimeWaitingReasons[number];
|
|
80
|
-
/**
|
|
80
|
+
/**
|
|
81
|
+
* Why the producer admits nothing for this spec revision. A refusal never retires running slots.
|
|
82
|
+
*
|
|
83
|
+
* The two a reader cannot derive from the name alone: `ports-too-many` is a service declaring more
|
|
84
|
+
* target ports than `runtimeConfigContract.maximumTargetPorts` a config carries — a count, where
|
|
85
|
+
* `port-protocol-unsupported` is about one port's protocol — and `node-authority-unsupported` is a
|
|
86
|
+
* node whose session resolved fewer workload authorities than this spec needs, which the admit step
|
|
87
|
+
* refuses rather than handing the node work it would silently park.
|
|
88
|
+
*/
|
|
81
89
|
export type TServiceRuntimeRefusal = typeof serviceRuntimeRefusals[number];
|
|
82
90
|
interface IServiceRuntimeStatusBase {
|
|
83
91
|
/** The service id. */
|
|
@@ -15,8 +15,9 @@ export const serviceRuntimeContract = Object.freeze({
|
|
|
15
15
|
const serviceRuntimeWaitingReasons = ['node-network-pending', 'conflict', 'failure-backoff'];
|
|
16
16
|
const serviceRuntimeRefusals = [
|
|
17
17
|
'cluster-runtime-missing', 'organization-missing', 'image-plan-missing', 'platform-unsupported',
|
|
18
|
-
'secrets-unsupported', 'volumes-unsupported', 'port-protocol-unsupported', '
|
|
19
|
-
'environment-too-large', 'no-eligible-node', 'replica-limit',
|
|
18
|
+
'secrets-unsupported', 'volumes-unsupported', 'port-protocol-unsupported', 'ports-too-many',
|
|
19
|
+
'readiness-target-undeclared', 'environment-too-large', 'no-eligible-node', 'replica-limit',
|
|
20
|
+
'node-authority-unsupported',
|
|
20
21
|
];
|
|
21
22
|
const sortedIds = (value, maximum) => networkSorted(networkList(value, maximum, networkId), id => id);
|
|
22
23
|
const placementOf = (value) => {
|
|
@@ -89,4 +90,4 @@ export const snapshotServiceRuntimeStatus = (value) => producerSafe(() => {
|
|
|
89
90
|
requireNetwork(item.state === 'refused' && isOneOf(serviceRuntimeRefusals, item.reason));
|
|
90
91
|
return { ...base, state: item.state, reason: item.reason };
|
|
91
92
|
});
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZXJ1bnRpbWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL3NlcnZpY2VydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxjQUFjLEVBQUUsZ0JBQWdCLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLGFBQWEsRUFDN0csY0FBYyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2hHLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSx1QkFBdUIsRUFBRSxrQkFBa0IsRUFDaEgsb0JBQW9CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQXdENUQsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNsRCxzQkFBc0IsRUFBRSxFQUFFO0lBQzFCLCtGQUErRjtJQUMvRixlQUFlLEVBQUUsRUFBRTtJQUNuQixvSEFBb0g7SUFDcEgsa0JBQWtCLEVBQUUsK0JBQStCLENBQUMsd0JBQXdCO0lBQzVFLHdCQUF3QixFQUFFLCtCQUErQixDQUFDLHdCQUF3QjtJQUNsRixnR0FBZ0c7SUFDaEcseUJBQXlCLEVBQUUsR0FBRztDQUN0QixDQUFDLENBQUM7QUFFWixNQUFNLDRCQUE0QixHQUFHLENBQUMsc0JBQXNCLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixDQUFVLENBQUM7QUFDdEcsTUFBTSxzQkFBc0IsR0FBRztJQUM3Qix5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxvQkFBb0IsRUFBRSxzQkFBc0I7SUFDL0YscUJBQXFCLEVBQUUscUJBQXFCLEVBQUUsMkJBQTJCLEVBQUUsZ0JBQWdC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
|
|
@@ -21,6 +21,13 @@ export interface IObjectStorageRetentionAuthority {
|
|
|
21
21
|
bindingRequestDigest: string;
|
|
22
22
|
}
|
|
23
23
|
export interface IObjectStorageRetentionSentinelEvidence extends IObjectStorageRetentionIntent {
|
|
24
|
+
/**
|
|
25
|
+
* ObjectStorage's own record version, pinned verbatim: `@lossless.org/objectstorage` serialises
|
|
26
|
+
* its `ObjectRetentionRecord` with this member and `getBucketRetentionReceipt()` returns the
|
|
27
|
+
* sentinel exactly as the record was written, so the member is that package's on-disk layout and
|
|
28
|
+
* not a serve.zone name (naming rule N10 — foreign bytes stay).
|
|
29
|
+
*/
|
|
30
|
+
version: 1;
|
|
24
31
|
createdAt: number;
|
|
25
32
|
retainUntil: number;
|
|
26
33
|
payloadSha256: string;
|
|
@@ -171,6 +171,7 @@ export const validateObjectStorageRetentionEvidence = async (evidenceArg, expect
|
|
|
171
171
|
const sentinel = receipt.sentinel;
|
|
172
172
|
if (!isRecord(sentinel)
|
|
173
173
|
|| !hasExactKeys(sentinel, [
|
|
174
|
+
'version',
|
|
174
175
|
'mode',
|
|
175
176
|
'policyId',
|
|
176
177
|
'retentionDurationSeconds',
|
|
@@ -183,7 +184,7 @@ export const validateObjectStorageRetentionEvidence = async (evidenceArg, expect
|
|
|
183
184
|
errors.push('objectstorage retention sentinel evidence must use its exact schema');
|
|
184
185
|
return errors;
|
|
185
186
|
}
|
|
186
|
-
if (!retentionIntentFieldsEqual(sentinel, intent)) {
|
|
187
|
+
if (sentinel.version !== 1 || !retentionIntentFieldsEqual(sentinel, intent)) {
|
|
187
188
|
errors.push('objectstorage retention sentinel intent must equal its evidence intent');
|
|
188
189
|
}
|
|
189
190
|
if (!isPositiveSafeInteger(sentinel.createdAt)
|
|
@@ -248,4 +249,4 @@ export const validatePlatformBindingObjectStorageRetention = async (bindingArg,
|
|
|
248
249
|
}
|
|
249
250
|
return validateObjectStorageRetentionBinding(bindingArg.objectstorageRetention, expectedArg);
|
|
250
251
|
};
|
|
251
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"objectstorageretention.js","sourceRoot":"","sources":["../../ts/platform/objectstorageretention.ts"],"names":[],"mappings":"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"}
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"objectstorageretention.js","sourceRoot":"","sources":["../../ts/platform/objectstorageretention.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,uCAAuC,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,MAAM,CAAC;IACxD,qBAAqB,EAAE,EAAE;IACzB,+BAA+B,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;CAC1D,CAAC,CAAC;AAoEH,MAAM,eAAe,GAAG,wBAAwB,CAAC;AACjD,MAAM,iBAAiB,GAAG,qCAAqC,CAAC;AAChE,MAAM,aAAa,GAAG,gBAAgB,CAAC;AACvC,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,6DAA6D,CAAC;AAEzF,MAAM,QAAQ,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAAC,CAC3E,OAAO,CAAC,QAAQ,CAAC;OACd,OAAO,QAAQ,KAAK,QAAQ;OAC5B,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;OACxB,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC,SAAS;WACnD,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,CAC/C,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CACvE,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAK,QAAmB,GAAG,CAAC,CAC3D,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAClD,SAAkB,EAClB,OAAO,GAAG,gCAAgC,EAChC,EAAE;IACZ,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;WACnB,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,0BAA0B,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,SAAS,CAAC,IAAI,KAAK,YAAY;WAC9B,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ;WACtC,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,8CAA8C,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,wBAAwB,CAAC;WACxD,SAAS,CAAC,wBAAmC;cAC7C,4BAA4B,CAAC,+BAA+B,EAAE,CAAC;QACnE,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,mDAAmD,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,YAAoB,EACpB,2BAAmC,EAC3B,EAAE;IACV,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC;WACnC,CAAC,qBAAqB,CAAC,2BAA2B,CAAC;WACnD,2BAA2B,GAAG,4BAA4B,CAAC,+BAA+B,EAAE,CAAC;QAChG,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,WAAW,GAAG,YAAY,GAAG,2BAA2B,GAAG,IAAI,CAAC;IACtE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6CAA6C,GAAG,CAC3D,SAAwC,EAChC,EAAE;IACV,MAAM,MAAM,GAAG,oCAAoC,CAAC,SAAS,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,UAAU,EAAE,eAAe;QAC3B,SAAS,EAAE;YACT,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,wBAAwB,EAAE,SAAS,CAAC,wBAAwB;SAC7D;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yCAAyC,GAAG,KAAK,EAC5D,SAAwC,EACvB,EAAE,CAAC,4BAA4B,CAChD,6CAA6C,CAAC,SAAS,CAAC,EACxD,CAAC,SAAS,EAAE,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC/C,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,OAAgB,EAChB,QAAiB,EACR,EAAE,CAAC,oCAAoC,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;OACnE,oCAAoC,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;OAC1D,OAAyC,CAAC,IAAI;YAC3C,QAA0C,CAAC,IAAI;OAClD,OAAyC,CAAC,QAAQ;YAC/C,QAA0C,CAAC,QAAQ;OACtD,OAAyC,CAAC,wBAAwB;YAC/D,QAA0C,CAAC,wBAAwB,CAAC;AAE7E,MAAM,0BAA0B,GAAG,CACjC,OAAgB,EAChB,QAAiB,EACR,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;OAC1B,QAAQ,CAAC,QAAQ,CAAC;OAClB,OAAO,CAAC,IAAI,KAAK,YAAY;OAC7B,QAAQ,CAAC,IAAI,KAAK,YAAY;OAC9B,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;OACpC,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ;OACtC,qBAAqB,CAAC,OAAO,CAAC,wBAAwB,CAAC;OACvD,OAAO,CAAC,wBAAwB,KAAK,QAAQ,CAAC,wBAAwB,CAAC;AAE5E,MAAM,CAAC,MAAM,sCAAsC,GAAG,KAAK,EACzD,WAAoB,EACpB,WAAuD,EACpC,EAAE;IACrB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;WACrB,CAAC,YAAY,CAAC,WAAW,EAAE;YAC5B,QAAQ;YACR,cAAc;YACd,WAAW;YACX,YAAY;YACZ,SAAS;YACT,YAAY;SACb,CAAC,EAAE,CAAC;QACL,OAAO,CAAC,4DAA4D,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,MAAM,GAAG,oCAAoC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAuC,CAAC;IACnE,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5D,MAAM,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,OAAO,WAAW,CAAC,YAAY,KAAK,QAAQ;WAC3C,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;WAC7C,MAAM,CAAC,MAAM,KAAK,CAAC;eACjB,WAAW,CAAC,YAAY,KAAK,MAAM,yCAAyC,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5F,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IACxC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;WACnB,CAAC,YAAY,CAAC,SAAS,EAAE;YAC1B,WAAW;YACX,WAAW;YACX,0BAA0B;YAC1B,sBAAsB;SACvB,CAAC;WACC,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ;WACvC,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;WAC5C,SAAS,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS;WAC7C,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ;WACvC,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;WAC5C,SAAS,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS;WAC7C,CAAC,qBAAqB,CAAC,SAAS,CAAC,wBAAwB,CAAC;WAC1D,SAAS,CAAC,wBAAwB,KAAK,WAAW,CAAC,wBAAwB;WAC3E,OAAO,SAAS,CAAC,oBAAoB,KAAK,QAAQ;WAClD,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC;WACnD,SAAS,CAAC,oBAAoB,KAAK,WAAW,CAAC,oBAAoB,EAAE,CAAC;QACzE,MAAM,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;IAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;WACpB,CAAC,YAAY,CAAC,UAAU,EAAE;YAC3B,WAAW;YACX,SAAS;YACT,OAAO;YACP,kBAAkB;YAClB,4BAA4B;SAC7B,CAAC;WACC,UAAU,CAAC,SAAS,KAAK,IAAI;WAC7B,CAAC,UAAU,CAAC,OAAO,KAAK,YAAY,IAAI,UAAU,CAAC,OAAO,KAAK,WAAW,CAAC;WAC3E,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;WAChC,UAAU,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;WAC7B,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY;WACpC,UAAU,CAAC,gBAAgB,KAAK,IAAI;WACpC,UAAU,CAAC,0BAA0B,KAAK,KAAK,EAAE,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;WACjB,CAAC,YAAY,CAAC,OAAO,EAAE;YACxB,MAAM;YACN,UAAU;YACV,0BAA0B;YAC1B,YAAY;YACZ,cAAc;YACd,aAAa;YACb,UAAU;SACX,CAAC,EAAE,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;QACzE,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,uCAAuC,CACzC,OAAO,CAAC,UAAU,EAClB,wCAAwC,CACzC,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,UAAU,KAAK,WAAW,CAAC,UAAU,EAAE,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC;WAC3C,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;WACvC,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;WAClB,CAAC,YAAY,CAAC,QAAQ,EAAE;YACzB,SAAS;YACT,MAAM;YACN,UAAU;YACV,0BAA0B;YAC1B,WAAW;YACX,aAAa;YACb,eAAe;YACf,gBAAgB;YAChB,MAAM;SACP,CAAC,EAAE,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;QAC5E,MAAM,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC;WACzC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC;WAC5C,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC;WAC3C,QAAQ,CAAC,SAAoB,GAAI,OAAO,CAAC,YAAuB,EAAE,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,WAAW,KAAK,uCAAuC,CAClE,QAAQ,CAAC,SAAS,EAClB,MAAM,CAAC,wBAAwB,CAChC,EAAE,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IACD,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;WACxF,OAAO,QAAQ,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;WAC3F,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC;WAC7C,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC;WACzC,WAAW,CAAC,UAAqB,GAAI,QAAQ,CAAC,SAAoB,EAAE,CAAC;QACzE,MAAM,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAG,KAAK,EACxD,UAAmB,EACnB,WAAuD,EACpC,EAAE;IACrB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;WACpB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC;WACpC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACxF,OAAO,CAAC,2DAA2D,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,MAAM,GAAG,oCAAoC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACvE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,sCAAsC,CACzD,UAAU,CAAC,QAAQ,EACnB,WAAW,CACZ,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6CAA6C,GAAG,KAAK,EAChE,UAAmB,EACnB,WAAuD,EACpC,EAAE;IACrB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,4DAA4D,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,uCAAuC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC;WACzE,uCAAuC,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5F,OAAO,CAAC,sEAAsE,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,KAAK,eAAe;WACxC,UAAU,CAAC,EAAE,KAAK,WAAW,CAAC,SAAS;WACvC,UAAU,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS;WAC9C,UAAU,CAAC,uBAAuB,KAAK,WAAW,CAAC,UAAU,EAAE,CAAC;QACnE,OAAO,CAAC,gFAAgF,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,UAAU,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QACpD,OAAO,CAAC,wEAAwE,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,qCAAqC,CAAC,UAAU,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;AAC/F,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ import type { IClusterNode, INodeAction, INodeMetricsSample, TNodeActionName } f
|
|
|
5
5
|
import type { IDeployment } from '../data/deployment.js';
|
|
6
6
|
import type { IIdentity } from '../data/user.js';
|
|
7
7
|
import type { INodeCredentialMetadata, INodeCredentialMutationPreconditions, INodeCredentialMutationResult, TNodeCredentialPurpose } from '../data/nodecredential.js';
|
|
8
|
+
import type { INodeRuntimeRetirement } from '../data/noderetirement.js';
|
|
8
9
|
import type { INodeEnrollmentRequest, INodeEnrollmentAcknowledgement, INodeEnrollmentState } from '../data/nodeenrollment.js';
|
|
9
10
|
/** Node-self adoption preconditions, not an admin or workload RBAC grant. */
|
|
10
11
|
export interface IReq_Spark_Cloudly_GetNodeEnrollmentState extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Spark_Cloudly_GetNodeEnrollmentState> {
|
|
@@ -150,6 +151,30 @@ export interface IReq_Any_Cloudly_DeleteNodeById extends plugins.typedrequestInt
|
|
|
150
151
|
ok: boolean;
|
|
151
152
|
};
|
|
152
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* An administrator retires one node from its cluster's Pallet runtime.
|
|
156
|
+
*
|
|
157
|
+
* Requires verified platform-infrastructure admin authority. This is the step that makes a node
|
|
158
|
+
* deletable: it writes the retirement row, on which the producer stops and removes the node's
|
|
159
|
+
* slots, the compiler quarantines its handoff, and both node credentials are revoked. Cloudly
|
|
160
|
+
* answers the row as it stands, which is `retiring` until all of that has settled.
|
|
161
|
+
*
|
|
162
|
+
* `expectedGeneration` is the cluster runtime generation the caller read with `getClusterRuntime`:
|
|
163
|
+
* retirement is a statement about a node of a Pallet cluster, so a cutover that moved the phase
|
|
164
|
+
* meanwhile refuses the write instead of retiring a node out of a runtime it no longer runs in.
|
|
165
|
+
* Every refusal is one of `data.nodeRuntimeRetirementRefusals` and takes nothing away.
|
|
166
|
+
*/
|
|
167
|
+
export interface IReq_Any_Cloudly_RetireClusterNode extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_RetireClusterNode> {
|
|
168
|
+
method: 'retireClusterNode';
|
|
169
|
+
request: {
|
|
170
|
+
identity: IIdentity;
|
|
171
|
+
nodeId: string;
|
|
172
|
+
expectedGeneration: number;
|
|
173
|
+
};
|
|
174
|
+
response: {
|
|
175
|
+
retirement: INodeRuntimeRetirement;
|
|
176
|
+
};
|
|
177
|
+
}
|
|
153
178
|
/**
|
|
154
179
|
* An administrator states where one node's Corestore control API answers.
|
|
155
180
|
*
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -892,9 +892,14 @@ on one spec revision, and each reason belongs to exactly one state. `converged`
|
|
|
892
892
|
carry `reason: null`. `waiting` carries a `TServiceRuntimeWaitingReason`: `node-network-pending`,
|
|
893
893
|
`conflict` or `failure-backoff`. `refused` carries a `TServiceRuntimeRefusal`:
|
|
894
894
|
`cluster-runtime-missing`, `organization-missing`, `image-plan-missing`, `platform-unsupported`,
|
|
895
|
-
`secrets-unsupported`, `volumes-unsupported`, `port-protocol-unsupported`,
|
|
896
|
-
`readiness-target-undeclared`, `environment-too-large`, `no-eligible-node
|
|
897
|
-
|
|
895
|
+
`secrets-unsupported`, `volumes-unsupported`, `port-protocol-unsupported`, `ports-too-many`,
|
|
896
|
+
`readiness-target-undeclared`, `environment-too-large`, `no-eligible-node`, `replica-limit` or
|
|
897
|
+
`node-authority-unsupported`. `ports-too-many` is a service declaring more target ports than the
|
|
898
|
+
`runtimeConfigContract.maximumTargetPorts` (64) a config carries, where `port-protocol-unsupported`
|
|
899
|
+
is about one port's protocol; `node-authority-unsupported` is a node whose session resolved fewer
|
|
900
|
+
workload authorities than the spec needs, refused at the admit step rather than handed to a node
|
|
901
|
+
that would silently park it. A refusal never retires running slots.
|
|
902
|
+
`snapshotServiceRuntimeStatus` enforces the pairing.
|
|
898
903
|
|
|
899
904
|
### Runtime Assignment Views
|
|
900
905
|
|
|
@@ -911,6 +916,23 @@ through every slot on a cluster's nodes; `limit` runs from 1 to
|
|
|
911
916
|
`requests.service.pushServiceRuntimeChanged { serviceId }` tells admin UIs that a service's spec,
|
|
912
917
|
status or assignments changed; it carries no state, so a late push never overwrites a newer read.
|
|
913
918
|
|
|
919
|
+
### Node Retirement
|
|
920
|
+
|
|
921
|
+
`data.INodeRuntimeRetirement { id, clusterId, state, actorId, since }` records that one node leaves
|
|
922
|
+
its cluster's Pallet runtime. `TNodeRuntimeRetirementState` is `retiring` while the producer still
|
|
923
|
+
stops and removes the node's slots, the compiler quarantines its handoff and both node credentials
|
|
924
|
+
are revoked, and `retired` once that has settled. It is stored beside the node document, because a
|
|
925
|
+
node update merges caller data and no caller may retire a node with it. The producers read the row's
|
|
926
|
+
presence rather than its state: a node that has one is no longer an egress member and desires no
|
|
927
|
+
slots, so the row is written before anything is taken away and stays as long as the node document.
|
|
928
|
+
`snapshotNodeRuntimeRetirement` checks the record.
|
|
929
|
+
|
|
930
|
+
`requests.node.retireClusterNode { identity, nodeId, expectedGeneration }` answers `{ retirement }`.
|
|
931
|
+
`expectedGeneration` is the cluster runtime generation the caller read with `getClusterRuntime`, so a
|
|
932
|
+
cutover that moved the phase meanwhile refuses the write. Every refusal is one of
|
|
933
|
+
`data.nodeRuntimeRetirementRefusals` — `node-missing`, `cluster-runtime-not-pallet`,
|
|
934
|
+
`node-already-retired` or `conflict` — and takes nothing away.
|
|
935
|
+
|
|
914
936
|
### Corestore Database Export Packaging
|
|
915
937
|
|
|
916
938
|
The Node-only `@serve.zone/interfaces/runtime` export provides metadata-only
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
|
-
name:
|
|
6
|
-
version:
|
|
7
|
-
description:
|
|
5
|
+
name: '@serve.zone/interfaces',
|
|
6
|
+
version: '32.1.0',
|
|
7
|
+
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
}
|
package/ts/data/index.ts
CHANGED
|
@@ -25,6 +25,7 @@ export * from './isolatedrestore.golden.js';
|
|
|
25
25
|
export * from './mail.js';
|
|
26
26
|
export * from './nodecredential.js';
|
|
27
27
|
export * from './nodeenrollment.js';
|
|
28
|
+
export * from './noderetirement.js';
|
|
28
29
|
export * from './networkaddressplan.js';
|
|
29
30
|
export * from './networkauthority.js';
|
|
30
31
|
export * from './networkcredential.js';
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { captureNetwork, networkCounter, networkId, networkRecord, requireNetwork } from '../private/networkcontract.js';
|
|
2
|
+
import { isOneOf, producerSafe } from '../private/producercontract.js';
|
|
3
|
+
|
|
4
|
+
const nodeRuntimeRetirementStates = ['retiring', 'retired'] as const;
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* How far a node's retirement has come: `retiring` while the producer still stops and removes the
|
|
8
|
+
* node's slots, the compiler quarantines its handoff and both node credentials are revoked;
|
|
9
|
+
* `retired` once all of that has settled and nothing but the node document is left to delete.
|
|
10
|
+
*/
|
|
11
|
+
export type TNodeRuntimeRetirementState = typeof nodeRuntimeRetirementStates[number];
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* That one node leaves its cluster's runtime, stored beside the node document rather than inside
|
|
15
|
+
* it, because a node update merges caller data and no caller may retire a node with it.
|
|
16
|
+
*
|
|
17
|
+
* The producers read the row's presence rather than its state: a node that has one is no longer an
|
|
18
|
+
* egress member and desires no slots. The row is therefore written before anything is taken away,
|
|
19
|
+
* and it stays for as long as the node document does.
|
|
20
|
+
*/
|
|
21
|
+
export interface INodeRuntimeRetirement {
|
|
22
|
+
/** The node id. */
|
|
23
|
+
id: string;
|
|
24
|
+
/** The cluster the node is retiring from, copied by Cloudly; never caller-chosen. */
|
|
25
|
+
clusterId: string;
|
|
26
|
+
state: TNodeRuntimeRetirementState;
|
|
27
|
+
/** The administrator who asked for the retirement. */
|
|
28
|
+
actorId: string;
|
|
29
|
+
/** Unix milliseconds on Cloudly's clock, when the row entered its current state. */
|
|
30
|
+
since: number;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Every reason Cloudly answers instead of retiring a node. Each travels as a `TypedResponseError`,
|
|
35
|
+
* and none of them takes anything away: a refused retirement leaves the node exactly as it was.
|
|
36
|
+
*/
|
|
37
|
+
export const nodeRuntimeRetirementRefusals = Object.freeze([
|
|
38
|
+
/** No node of that id exists, so there is nothing to retire. */
|
|
39
|
+
'node-missing',
|
|
40
|
+
/**
|
|
41
|
+
* The node's cluster runs no Pallet runtime — it has no phase record, or a phase other than
|
|
42
|
+
* `pallet`. Which of the two it is, `getClusterRuntime` says.
|
|
43
|
+
*/
|
|
44
|
+
'cluster-runtime-not-pallet',
|
|
45
|
+
/** The node already carries a retirement row; neither of its states is left by retiring again. */
|
|
46
|
+
'node-already-retired',
|
|
47
|
+
/** `expectedGeneration` is not the cluster runtime's current generation, so a cutover moved underneath the caller. */
|
|
48
|
+
'conflict',
|
|
49
|
+
] as const);
|
|
50
|
+
|
|
51
|
+
/** One of the reasons Cloudly answers instead of a retirement row. */
|
|
52
|
+
export type TNodeRuntimeRetirementRefusal = typeof nodeRuntimeRetirementRefusals[number];
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Structural snapshot for exact persistence; whether the node exists and whether its cluster admits
|
|
56
|
+
* the retirement is Cloudly's.
|
|
57
|
+
*/
|
|
58
|
+
export const snapshotNodeRuntimeRetirement = (value: unknown): INodeRuntimeRetirement => producerSafe(() => {
|
|
59
|
+
const item = networkRecord(captureNetwork(value), ['id', 'clusterId', 'state', 'actorId', 'since']);
|
|
60
|
+
requireNetwork(isOneOf(nodeRuntimeRetirementStates, item.state));
|
|
61
|
+
return { id: networkId(item.id), clusterId: networkId(item.clusterId), state: item.state,
|
|
62
|
+
actorId: networkId(item.actorId), since: networkCounter(item.since) };
|
|
63
|
+
});
|
|
@@ -77,8 +77,9 @@ export const serviceRuntimeContract = Object.freeze({
|
|
|
77
77
|
const serviceRuntimeWaitingReasons = ['node-network-pending', 'conflict', 'failure-backoff'] as const;
|
|
78
78
|
const serviceRuntimeRefusals = [
|
|
79
79
|
'cluster-runtime-missing', 'organization-missing', 'image-plan-missing', 'platform-unsupported',
|
|
80
|
-
'secrets-unsupported', 'volumes-unsupported', 'port-protocol-unsupported', '
|
|
81
|
-
'environment-too-large', 'no-eligible-node', 'replica-limit',
|
|
80
|
+
'secrets-unsupported', 'volumes-unsupported', 'port-protocol-unsupported', 'ports-too-many',
|
|
81
|
+
'readiness-target-undeclared', 'environment-too-large', 'no-eligible-node', 'replica-limit',
|
|
82
|
+
'node-authority-unsupported',
|
|
82
83
|
] as const;
|
|
83
84
|
|
|
84
85
|
/**
|
|
@@ -88,7 +89,15 @@ const serviceRuntimeRefusals = [
|
|
|
88
89
|
*/
|
|
89
90
|
export type TServiceRuntimeWaitingReason = typeof serviceRuntimeWaitingReasons[number];
|
|
90
91
|
|
|
91
|
-
/**
|
|
92
|
+
/**
|
|
93
|
+
* Why the producer admits nothing for this spec revision. A refusal never retires running slots.
|
|
94
|
+
*
|
|
95
|
+
* The two a reader cannot derive from the name alone: `ports-too-many` is a service declaring more
|
|
96
|
+
* target ports than `runtimeConfigContract.maximumTargetPorts` a config carries — a count, where
|
|
97
|
+
* `port-protocol-unsupported` is about one port's protocol — and `node-authority-unsupported` is a
|
|
98
|
+
* node whose session resolved fewer workload authorities than this spec needs, which the admit step
|
|
99
|
+
* refuses rather than handing the node work it would silently park.
|
|
100
|
+
*/
|
|
92
101
|
export type TServiceRuntimeRefusal = typeof serviceRuntimeRefusals[number];
|
|
93
102
|
|
|
94
103
|
interface IServiceRuntimeStatusBase {
|
|
@@ -30,6 +30,13 @@ export interface IObjectStorageRetentionAuthority {
|
|
|
30
30
|
|
|
31
31
|
export interface IObjectStorageRetentionSentinelEvidence
|
|
32
32
|
extends IObjectStorageRetentionIntent {
|
|
33
|
+
/**
|
|
34
|
+
* ObjectStorage's own record version, pinned verbatim: `@lossless.org/objectstorage` serialises
|
|
35
|
+
* its `ObjectRetentionRecord` with this member and `getBucketRetentionReceipt()` returns the
|
|
36
|
+
* sentinel exactly as the record was written, so the member is that package's on-disk layout and
|
|
37
|
+
* not a serve.zone name (naming rule N10 — foreign bytes stay).
|
|
38
|
+
*/
|
|
39
|
+
version: 1;
|
|
33
40
|
createdAt: number;
|
|
34
41
|
retainUntil: number;
|
|
35
42
|
payloadSha256: string;
|
|
@@ -273,6 +280,7 @@ export const validateObjectStorageRetentionEvidence = async (
|
|
|
273
280
|
const sentinel = receipt.sentinel;
|
|
274
281
|
if (!isRecord(sentinel)
|
|
275
282
|
|| !hasExactKeys(sentinel, [
|
|
283
|
+
'version',
|
|
276
284
|
'mode',
|
|
277
285
|
'policyId',
|
|
278
286
|
'retentionDurationSeconds',
|
|
@@ -285,7 +293,7 @@ export const validateObjectStorageRetentionEvidence = async (
|
|
|
285
293
|
errors.push('objectstorage retention sentinel evidence must use its exact schema');
|
|
286
294
|
return errors;
|
|
287
295
|
}
|
|
288
|
-
if (!retentionIntentFieldsEqual(sentinel, intent)) {
|
|
296
|
+
if (sentinel.version !== 1 || !retentionIntentFieldsEqual(sentinel, intent)) {
|
|
289
297
|
errors.push('objectstorage retention sentinel intent must equal its evidence intent');
|
|
290
298
|
}
|
|
291
299
|
if (!isPositiveSafeInteger(sentinel.createdAt)
|
package/ts/requests/node.ts
CHANGED
|
@@ -10,6 +10,7 @@ import type {
|
|
|
10
10
|
INodeCredentialMutationResult,
|
|
11
11
|
TNodeCredentialPurpose,
|
|
12
12
|
} from '../data/nodecredential.js';
|
|
13
|
+
import type { INodeRuntimeRetirement } from '../data/noderetirement.js';
|
|
13
14
|
import type {
|
|
14
15
|
INodeEnrollmentRequest,
|
|
15
16
|
INodeEnrollmentAcknowledgement,
|
|
@@ -203,6 +204,34 @@ export interface IReq_Any_Cloudly_DeleteNodeById extends plugins.typedrequestInt
|
|
|
203
204
|
};
|
|
204
205
|
}
|
|
205
206
|
|
|
207
|
+
/**
|
|
208
|
+
* An administrator retires one node from its cluster's Pallet runtime.
|
|
209
|
+
*
|
|
210
|
+
* Requires verified platform-infrastructure admin authority. This is the step that makes a node
|
|
211
|
+
* deletable: it writes the retirement row, on which the producer stops and removes the node's
|
|
212
|
+
* slots, the compiler quarantines its handoff, and both node credentials are revoked. Cloudly
|
|
213
|
+
* answers the row as it stands, which is `retiring` until all of that has settled.
|
|
214
|
+
*
|
|
215
|
+
* `expectedGeneration` is the cluster runtime generation the caller read with `getClusterRuntime`:
|
|
216
|
+
* retirement is a statement about a node of a Pallet cluster, so a cutover that moved the phase
|
|
217
|
+
* meanwhile refuses the write instead of retiring a node out of a runtime it no longer runs in.
|
|
218
|
+
* Every refusal is one of `data.nodeRuntimeRetirementRefusals` and takes nothing away.
|
|
219
|
+
*/
|
|
220
|
+
export interface IReq_Any_Cloudly_RetireClusterNode extends plugins.typedrequestInterfaces.implementsTR<
|
|
221
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
222
|
+
IReq_Any_Cloudly_RetireClusterNode
|
|
223
|
+
> {
|
|
224
|
+
method: 'retireClusterNode';
|
|
225
|
+
request: {
|
|
226
|
+
identity: IIdentity;
|
|
227
|
+
nodeId: string;
|
|
228
|
+
expectedGeneration: number;
|
|
229
|
+
};
|
|
230
|
+
response: {
|
|
231
|
+
retirement: INodeRuntimeRetirement;
|
|
232
|
+
};
|
|
233
|
+
}
|
|
234
|
+
|
|
206
235
|
/**
|
|
207
236
|
* An administrator states where one node's Corestore control API answers.
|
|
208
237
|
*
|