@serve.zone/interfaces 32.0.2 → 32.2.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 +37 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- 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/storage.d.ts +29 -2
- package/dist_ts/platform/storage.golden.d.ts +31 -0
- package/dist_ts/platform/storage.golden.js +84 -0
- package/dist_ts/platform/storage.js +37 -1
- package/dist_ts/platform/storagemigration.js +11 -287
- package/dist_ts/private/storagecontract.d.ts +40 -0
- package/dist_ts/private/storagecontract.js +399 -0
- package/dist_ts/requests/node.d.ts +25 -0
- package/package.json +1 -1
- package/readme.md +40 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/index.ts +1 -0
- package/ts/data/noderetirement.ts +63 -0
- package/ts/data/serviceruntime.ts +12 -3
- package/ts/platform/storage.golden.ts +97 -0
- package/ts/platform/storage.ts +59 -2
- package/ts/platform/storagemigration.ts +31 -440
- package/ts/private/storagecontract.ts +623 -0
- package/ts/requests/node.ts +29 -0
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The readers a storage control body is judged by, and the one normalizer that turns a storage
|
|
3
|
+
* request into the exact value its digest is taken over.
|
|
4
|
+
*
|
|
5
|
+
* Two modules judge the same bytes in their own error vocabulary — `platform/storage.ts` for a
|
|
6
|
+
* storage request on its own and `platform/storagemigration.ts` for the migration control plane
|
|
7
|
+
* that carries one — so the rules take the failure they report through. A second copy of them
|
|
8
|
+
* would be a second answer to what a request is, and a request digest that a control plane issues
|
|
9
|
+
* and a consumer re-derives would stop being one value.
|
|
10
|
+
*/
|
|
11
|
+
import type { IAppStoreFilesystemStorageRequest, IAppStoreObjectStorageRequest, TAppStoreStorageRequest } from '../appstore/types.js';
|
|
12
|
+
import type { TObjectStorageDelivery } from '../platform/storage.js';
|
|
13
|
+
import type { TCanonicalJsonFailure } from './canonicaljson.js';
|
|
14
|
+
/** Byte bounds every reader of a storage control string applies. */
|
|
15
|
+
export declare const storageContractStringLimits: Readonly<{
|
|
16
|
+
maximumConfiguredStringBytes: 2048;
|
|
17
|
+
maximumEnvironmentKeyBytes: 256;
|
|
18
|
+
maximumSecretPathBytes: 2048;
|
|
19
|
+
}>;
|
|
20
|
+
export declare const createStorageContractReaders: (failArg: TCanonicalJsonFailure) => {
|
|
21
|
+
utf8ByteLength: (valueArg: string) => number;
|
|
22
|
+
readRecord: (valueArg: unknown, fieldNameArg: string) => Record<string, unknown>;
|
|
23
|
+
readDenseArray: (valueArg: unknown, fieldNameArg: string, minimumLengthArg: number, maximumLengthArg: number) => unknown[];
|
|
24
|
+
assertKeys: (recordArg: Record<string, unknown>, requiredKeysArg: readonly string[], optionalKeysArg: readonly string[], fieldNameArg: string) => void;
|
|
25
|
+
assertExactKeys: (recordArg: Record<string, unknown>, expectedKeysArg: readonly string[], fieldNameArg: string) => void;
|
|
26
|
+
readString: (valueArg: unknown, fieldNameArg: string, maximumBytesArg?: number) => string;
|
|
27
|
+
readIdentifier: (valueArg: unknown, fieldNameArg: string) => string;
|
|
28
|
+
readSha256: (valueArg: unknown, fieldNameArg: string) => string;
|
|
29
|
+
readSafeInteger: (valueArg: unknown, fieldNameArg: string, minimumArg: number, maximumArg?: number) => number;
|
|
30
|
+
readBoolean: (valueArg: unknown, fieldNameArg: string) => boolean;
|
|
31
|
+
readLiteral: <TLiteral extends string>(valueArg: unknown, allowedArg: readonly TLiteral[], fieldNameArg: string) => TLiteral;
|
|
32
|
+
readCapacityQuantity: (valueArg: unknown, fieldNameArg: string) => string;
|
|
33
|
+
capacityQuantityBytes: (valueArg: string) => bigint;
|
|
34
|
+
readEnvironmentKey: (valueArg: unknown, fieldNameArg: string) => string;
|
|
35
|
+
normalizeCapacityRequest: (valueArg: unknown, fieldNameArg: string) => NonNullable<TAppStoreStorageRequest["capacity"]>;
|
|
36
|
+
normalizeDelivery: (valueArg: unknown, fieldNameArg: string) => TObjectStorageDelivery;
|
|
37
|
+
normalizeObjectStorageRequest: (valueArg: unknown, fieldNameArg: string) => IAppStoreObjectStorageRequest;
|
|
38
|
+
normalizeFilesystemStorageRequest: (valueArg: unknown, fieldNameArg: string) => IAppStoreFilesystemStorageRequest;
|
|
39
|
+
normalizeStorageRequest: (valueArg: unknown, fieldNameArg: string) => TAppStoreStorageRequest;
|
|
40
|
+
};
|
|
@@ -0,0 +1,399 @@
|
|
|
1
|
+
import { normalizeServiceAbsolutePath } from '../data/service.js';
|
|
2
|
+
/** Byte bounds every reader of a storage control string applies. */
|
|
3
|
+
export const storageContractStringLimits = Object.freeze({
|
|
4
|
+
maximumConfiguredStringBytes: 2048,
|
|
5
|
+
maximumEnvironmentKeyBytes: 256,
|
|
6
|
+
maximumSecretPathBytes: 2048,
|
|
7
|
+
});
|
|
8
|
+
const canonicalIdPattern = /^[A-Za-z0-9][A-Za-z0-9._:@-]{0,191}$/;
|
|
9
|
+
const environmentKeyPattern = /^[A-Z_][A-Z0-9_]{0,255}$/;
|
|
10
|
+
const sha256Pattern = /^[a-f0-9]{64}$/;
|
|
11
|
+
const capacityPattern = /^[1-9][0-9]*(?:KiB|MiB|GiB|TiB)$/;
|
|
12
|
+
/**
|
|
13
|
+
* The mount a Secret file is delivered under. A filesystem request that mounts it, or anything
|
|
14
|
+
* containing it, would shadow every credential the platform writes for the same service.
|
|
15
|
+
*/
|
|
16
|
+
const secretDeliveryRoot = '/run/secrets';
|
|
17
|
+
export const createStorageContractReaders = (failArg) => {
|
|
18
|
+
const utf8ByteLength = (valueArg) => {
|
|
19
|
+
return new TextEncoder().encode(valueArg).byteLength;
|
|
20
|
+
};
|
|
21
|
+
const readRecord = (valueArg, fieldNameArg) => {
|
|
22
|
+
if (!valueArg || typeof valueArg !== 'object' || Array.isArray(valueArg)) {
|
|
23
|
+
return failArg(`${fieldNameArg} must be a plain object`);
|
|
24
|
+
}
|
|
25
|
+
const prototype = Object.getPrototypeOf(valueArg);
|
|
26
|
+
if (prototype !== Object.prototype && prototype !== null) {
|
|
27
|
+
return failArg(`${fieldNameArg} must be a plain object`);
|
|
28
|
+
}
|
|
29
|
+
const record = valueArg;
|
|
30
|
+
const ownKeys = Reflect.ownKeys(record);
|
|
31
|
+
if (ownKeys.some((keyArg) => typeof keyArg !== 'string')) {
|
|
32
|
+
return failArg(`${fieldNameArg} must not contain symbol keys`);
|
|
33
|
+
}
|
|
34
|
+
for (const key of ownKeys) {
|
|
35
|
+
const descriptor = Object.getOwnPropertyDescriptor(record, key);
|
|
36
|
+
if (!descriptor ||
|
|
37
|
+
!descriptor.enumerable ||
|
|
38
|
+
!Object.hasOwn(descriptor, 'value') ||
|
|
39
|
+
descriptor.value === undefined) {
|
|
40
|
+
return failArg(`${fieldNameArg} must contain enumerable JSON data properties only`);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return record;
|
|
44
|
+
};
|
|
45
|
+
const readDenseArray = (valueArg, fieldNameArg, minimumLengthArg, maximumLengthArg) => {
|
|
46
|
+
if (!Array.isArray(valueArg) ||
|
|
47
|
+
Object.getPrototypeOf(valueArg) !== Array.prototype) {
|
|
48
|
+
return failArg(`${fieldNameArg} must be a dense plain array`);
|
|
49
|
+
}
|
|
50
|
+
if (valueArg.length < minimumLengthArg ||
|
|
51
|
+
valueArg.length > maximumLengthArg) {
|
|
52
|
+
return failArg(`${fieldNameArg} must contain between ${minimumLengthArg} and ${maximumLengthArg} entries`);
|
|
53
|
+
}
|
|
54
|
+
for (let index = 0; index < valueArg.length; index++) {
|
|
55
|
+
if (!Object.hasOwn(valueArg, index)) {
|
|
56
|
+
return failArg(`${fieldNameArg} must not contain sparse entries`);
|
|
57
|
+
}
|
|
58
|
+
const descriptor = Object.getOwnPropertyDescriptor(valueArg, String(index));
|
|
59
|
+
if (!descriptor ||
|
|
60
|
+
!descriptor.enumerable ||
|
|
61
|
+
!Object.hasOwn(descriptor, 'value') ||
|
|
62
|
+
descriptor.value === undefined) {
|
|
63
|
+
return failArg(`${fieldNameArg} must contain enumerable JSON data entries only`);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
for (const key of Reflect.ownKeys(valueArg)) {
|
|
67
|
+
if (key === 'length')
|
|
68
|
+
continue;
|
|
69
|
+
if (typeof key !== 'string' ||
|
|
70
|
+
!/^(?:0|[1-9][0-9]*)$/.test(key) ||
|
|
71
|
+
Number(key) >= valueArg.length) {
|
|
72
|
+
return failArg(`${fieldNameArg} must not contain extra properties`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return valueArg;
|
|
76
|
+
};
|
|
77
|
+
const assertKeys = (recordArg, requiredKeysArg, optionalKeysArg, fieldNameArg) => {
|
|
78
|
+
const actualKeys = Object.keys(recordArg).sort();
|
|
79
|
+
const allowedKeys = new Set([...requiredKeysArg, ...optionalKeysArg]);
|
|
80
|
+
if (requiredKeysArg.some((keyArg) => !Object.hasOwn(recordArg, keyArg)) ||
|
|
81
|
+
actualKeys.some((keyArg) => !allowedKeys.has(keyArg))) {
|
|
82
|
+
failArg(`${fieldNameArg} does not match its exact schema`);
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
const assertExactKeys = (recordArg, expectedKeysArg, fieldNameArg) => {
|
|
86
|
+
assertKeys(recordArg, expectedKeysArg, [], fieldNameArg);
|
|
87
|
+
};
|
|
88
|
+
const readString = (valueArg, fieldNameArg, maximumBytesArg = storageContractStringLimits.maximumConfiguredStringBytes) => {
|
|
89
|
+
if (typeof valueArg !== 'string' ||
|
|
90
|
+
valueArg.length === 0 ||
|
|
91
|
+
utf8ByteLength(valueArg) > maximumBytesArg ||
|
|
92
|
+
/[\u0000-\u001f\u007f]/u.test(valueArg)) {
|
|
93
|
+
return failArg(`${fieldNameArg} must be a bounded non-empty JSON string`);
|
|
94
|
+
}
|
|
95
|
+
for (let index = 0; index < valueArg.length; index++) {
|
|
96
|
+
const codeUnit = valueArg.charCodeAt(index);
|
|
97
|
+
if (codeUnit >= 0xd800 && codeUnit <= 0xdbff) {
|
|
98
|
+
const following = valueArg.charCodeAt(index + 1);
|
|
99
|
+
if (following < 0xdc00 || following > 0xdfff) {
|
|
100
|
+
return failArg(`${fieldNameArg} contains an unpaired UTF-16 surrogate`);
|
|
101
|
+
}
|
|
102
|
+
index++;
|
|
103
|
+
}
|
|
104
|
+
else if (codeUnit >= 0xdc00 && codeUnit <= 0xdfff) {
|
|
105
|
+
return failArg(`${fieldNameArg} contains an unpaired UTF-16 surrogate`);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return valueArg;
|
|
109
|
+
};
|
|
110
|
+
const readIdentifier = (valueArg, fieldNameArg) => {
|
|
111
|
+
if (typeof valueArg !== 'string' || !canonicalIdPattern.test(valueArg)) {
|
|
112
|
+
return failArg(`${fieldNameArg} must be a canonical identifier`);
|
|
113
|
+
}
|
|
114
|
+
return valueArg;
|
|
115
|
+
};
|
|
116
|
+
const readSha256 = (valueArg, fieldNameArg) => {
|
|
117
|
+
if (typeof valueArg !== 'string' || !sha256Pattern.test(valueArg)) {
|
|
118
|
+
return failArg(`${fieldNameArg} must be a bare lowercase 64-hex SHA-256 digest`);
|
|
119
|
+
}
|
|
120
|
+
return valueArg;
|
|
121
|
+
};
|
|
122
|
+
const readSafeInteger = (valueArg, fieldNameArg, minimumArg, maximumArg = Number.MAX_SAFE_INTEGER) => {
|
|
123
|
+
if (typeof valueArg !== 'number' ||
|
|
124
|
+
!Number.isSafeInteger(valueArg) ||
|
|
125
|
+
Object.is(valueArg, -0) ||
|
|
126
|
+
valueArg < minimumArg ||
|
|
127
|
+
valueArg > maximumArg) {
|
|
128
|
+
return failArg(`${fieldNameArg} must be a safe integer between ${minimumArg} and ${maximumArg}`);
|
|
129
|
+
}
|
|
130
|
+
return valueArg;
|
|
131
|
+
};
|
|
132
|
+
const readBoolean = (valueArg, fieldNameArg) => {
|
|
133
|
+
if (typeof valueArg !== 'boolean') {
|
|
134
|
+
return failArg(`${fieldNameArg} must be a boolean`);
|
|
135
|
+
}
|
|
136
|
+
return valueArg;
|
|
137
|
+
};
|
|
138
|
+
const readLiteral = (valueArg, allowedArg, fieldNameArg) => {
|
|
139
|
+
if (typeof valueArg !== 'string' ||
|
|
140
|
+
!allowedArg.includes(valueArg)) {
|
|
141
|
+
return failArg(`${fieldNameArg} is outside the supported values`);
|
|
142
|
+
}
|
|
143
|
+
return valueArg;
|
|
144
|
+
};
|
|
145
|
+
const readCapacityQuantity = (valueArg, fieldNameArg) => {
|
|
146
|
+
if (typeof valueArg !== 'string' || !capacityPattern.test(valueArg)) {
|
|
147
|
+
return failArg(`${fieldNameArg} must be a canonical base-2 capacity quantity`);
|
|
148
|
+
}
|
|
149
|
+
const numericPart = valueArg.replace(/(?:KiB|MiB|GiB|TiB)$/, '');
|
|
150
|
+
if (!Number.isSafeInteger(Number(numericPart))) {
|
|
151
|
+
return failArg(`${fieldNameArg} exceeds the safe integer quantity range`);
|
|
152
|
+
}
|
|
153
|
+
return valueArg;
|
|
154
|
+
};
|
|
155
|
+
const capacityQuantityBytes = (valueArg) => {
|
|
156
|
+
const units = {
|
|
157
|
+
KiB: 1024n,
|
|
158
|
+
MiB: 1024n ** 2n,
|
|
159
|
+
GiB: 1024n ** 3n,
|
|
160
|
+
TiB: 1024n ** 4n,
|
|
161
|
+
};
|
|
162
|
+
const unit = valueArg.slice(-3);
|
|
163
|
+
return BigInt(valueArg.slice(0, -3)) * units[unit];
|
|
164
|
+
};
|
|
165
|
+
const normalizeCapacityRequest = (valueArg, fieldNameArg) => {
|
|
166
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
167
|
+
assertKeys(value, ['request'], ['limit'], fieldNameArg);
|
|
168
|
+
const request = readCapacityQuantity(value.request, `${fieldNameArg}.request`);
|
|
169
|
+
const limit = Object.hasOwn(value, 'limit')
|
|
170
|
+
? readCapacityQuantity(value.limit, `${fieldNameArg}.limit`)
|
|
171
|
+
: undefined;
|
|
172
|
+
if (limit && capacityQuantityBytes(limit) < capacityQuantityBytes(request)) {
|
|
173
|
+
return failArg(`${fieldNameArg}.limit must be at least request`);
|
|
174
|
+
}
|
|
175
|
+
return {
|
|
176
|
+
request,
|
|
177
|
+
...(limit ? { limit } : {}),
|
|
178
|
+
};
|
|
179
|
+
};
|
|
180
|
+
const readEnvironmentKey = (valueArg, fieldNameArg) => {
|
|
181
|
+
if (typeof valueArg !== 'string' ||
|
|
182
|
+
utf8ByteLength(valueArg) >
|
|
183
|
+
storageContractStringLimits.maximumEnvironmentKeyBytes ||
|
|
184
|
+
!environmentKeyPattern.test(valueArg)) {
|
|
185
|
+
return failArg(`${fieldNameArg} must be a canonical environment key`);
|
|
186
|
+
}
|
|
187
|
+
return valueArg;
|
|
188
|
+
};
|
|
189
|
+
const normalizeDelivery = (valueArg, fieldNameArg) => {
|
|
190
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
191
|
+
if (value.type === 'launcher-environment') {
|
|
192
|
+
assertExactKeys(value, ['type', 'keys'], fieldNameArg);
|
|
193
|
+
const keys = readRecord(value.keys, `${fieldNameArg}.keys`);
|
|
194
|
+
assertKeys(keys, ['endpoint', 'bucket', 'region', 'accessKeyId', 'secretAccessKey'], ['sessionToken'], `${fieldNameArg}.keys`);
|
|
195
|
+
const normalizedKeys = {
|
|
196
|
+
endpoint: readEnvironmentKey(keys.endpoint, `${fieldNameArg}.keys.endpoint`),
|
|
197
|
+
bucket: readEnvironmentKey(keys.bucket, `${fieldNameArg}.keys.bucket`),
|
|
198
|
+
region: readEnvironmentKey(keys.region, `${fieldNameArg}.keys.region`),
|
|
199
|
+
accessKeyId: readEnvironmentKey(keys.accessKeyId, `${fieldNameArg}.keys.accessKeyId`),
|
|
200
|
+
secretAccessKey: readEnvironmentKey(keys.secretAccessKey, `${fieldNameArg}.keys.secretAccessKey`),
|
|
201
|
+
...(Object.hasOwn(keys, 'sessionToken')
|
|
202
|
+
? {
|
|
203
|
+
sessionToken: readEnvironmentKey(keys.sessionToken, `${fieldNameArg}.keys.sessionToken`),
|
|
204
|
+
}
|
|
205
|
+
: {}),
|
|
206
|
+
};
|
|
207
|
+
if (new Set(Object.values(normalizedKeys)).size !==
|
|
208
|
+
Object.keys(normalizedKeys).length) {
|
|
209
|
+
return failArg(`${fieldNameArg}.keys values must be distinct`);
|
|
210
|
+
}
|
|
211
|
+
return { type: 'launcher-environment', keys: normalizedKeys };
|
|
212
|
+
}
|
|
213
|
+
if (value.type === 'file') {
|
|
214
|
+
assertExactKeys(value, ['type', 'targetPath', 'format', 'uid', 'gid', 'mode'], fieldNameArg);
|
|
215
|
+
const targetPath = readString(value.targetPath, `${fieldNameArg}.targetPath`, storageContractStringLimits.maximumSecretPathBytes);
|
|
216
|
+
if (!targetPath.startsWith(`${secretDeliveryRoot}/`) ||
|
|
217
|
+
targetPath.includes('\\') ||
|
|
218
|
+
targetPath.split('/').some((segmentArg) => segmentArg === '.' || segmentArg === '..')) {
|
|
219
|
+
return failArg(`${fieldNameArg}.targetPath must be a canonical path below ${secretDeliveryRoot}`);
|
|
220
|
+
}
|
|
221
|
+
if (value.format !== 'servezone-object-storage') {
|
|
222
|
+
return failArg(`${fieldNameArg}.format is unsupported`);
|
|
223
|
+
}
|
|
224
|
+
return {
|
|
225
|
+
type: 'file',
|
|
226
|
+
targetPath,
|
|
227
|
+
format: 'servezone-object-storage',
|
|
228
|
+
uid: readSafeInteger(value.uid, `${fieldNameArg}.uid`, 0, 2_147_483_647),
|
|
229
|
+
gid: readSafeInteger(value.gid, `${fieldNameArg}.gid`, 0, 2_147_483_647),
|
|
230
|
+
mode: value.mode === 0o400 || value.mode === 0o440
|
|
231
|
+
? value.mode
|
|
232
|
+
: failArg(`${fieldNameArg}.mode must be 0400 or 0440`),
|
|
233
|
+
};
|
|
234
|
+
}
|
|
235
|
+
return failArg(`${fieldNameArg}.type is unsupported`);
|
|
236
|
+
};
|
|
237
|
+
const normalizeObjectStorageProtection = (valueArg, fieldNameArg) => {
|
|
238
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
239
|
+
assertKeys(value, [], ['backup', 'versioning', 'retentionDays'], fieldNameArg);
|
|
240
|
+
if (Object.keys(value).length === 0) {
|
|
241
|
+
return failArg(`${fieldNameArg} must not be empty`);
|
|
242
|
+
}
|
|
243
|
+
return {
|
|
244
|
+
...(Object.hasOwn(value, 'backup')
|
|
245
|
+
? {
|
|
246
|
+
backup: value.backup === 'required'
|
|
247
|
+
? 'required'
|
|
248
|
+
: failArg(`${fieldNameArg}.backup must be required`),
|
|
249
|
+
}
|
|
250
|
+
: {}),
|
|
251
|
+
...(Object.hasOwn(value, 'versioning')
|
|
252
|
+
? {
|
|
253
|
+
versioning: value.versioning === 'required'
|
|
254
|
+
? 'required'
|
|
255
|
+
: failArg(`${fieldNameArg}.versioning must be required`),
|
|
256
|
+
}
|
|
257
|
+
: {}),
|
|
258
|
+
...(Object.hasOwn(value, 'retentionDays')
|
|
259
|
+
? {
|
|
260
|
+
retentionDays: readSafeInteger(value.retentionDays, `${fieldNameArg}.retentionDays`, 1, 365_000),
|
|
261
|
+
}
|
|
262
|
+
: {}),
|
|
263
|
+
};
|
|
264
|
+
};
|
|
265
|
+
const normalizeFilesystemProtection = (valueArg, fieldNameArg) => {
|
|
266
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
267
|
+
assertKeys(value, [], ['backup', 'snapshots', 'consistency'], fieldNameArg);
|
|
268
|
+
if (Object.keys(value).length === 0) {
|
|
269
|
+
return failArg(`${fieldNameArg} must not be empty`);
|
|
270
|
+
}
|
|
271
|
+
return {
|
|
272
|
+
...(Object.hasOwn(value, 'backup')
|
|
273
|
+
? {
|
|
274
|
+
backup: value.backup === 'required'
|
|
275
|
+
? 'required'
|
|
276
|
+
: failArg(`${fieldNameArg}.backup must be required`),
|
|
277
|
+
}
|
|
278
|
+
: {}),
|
|
279
|
+
...(Object.hasOwn(value, 'snapshots')
|
|
280
|
+
? {
|
|
281
|
+
snapshots: readLiteral(value.snapshots, ['portable', 'native'], `${fieldNameArg}.snapshots`),
|
|
282
|
+
}
|
|
283
|
+
: {}),
|
|
284
|
+
...(Object.hasOwn(value, 'consistency')
|
|
285
|
+
? {
|
|
286
|
+
consistency: readLiteral(value.consistency, ['crashConsistent', 'applicationConsistent'], `${fieldNameArg}.consistency`),
|
|
287
|
+
}
|
|
288
|
+
: {}),
|
|
289
|
+
};
|
|
290
|
+
};
|
|
291
|
+
const readMountPath = (valueArg, fieldNameArg) => {
|
|
292
|
+
const value = readString(valueArg, fieldNameArg, storageContractStringLimits.maximumSecretPathBytes);
|
|
293
|
+
if (normalizeServiceAbsolutePath(value) !== value || value === '/') {
|
|
294
|
+
return failArg(`${fieldNameArg} must be a canonical non-root absolute path`);
|
|
295
|
+
}
|
|
296
|
+
if (value === secretDeliveryRoot ||
|
|
297
|
+
value.startsWith(`${secretDeliveryRoot}/`) ||
|
|
298
|
+
secretDeliveryRoot.startsWith(`${value}/`)) {
|
|
299
|
+
return failArg(`${fieldNameArg} must not overlap ${secretDeliveryRoot}`);
|
|
300
|
+
}
|
|
301
|
+
return value;
|
|
302
|
+
};
|
|
303
|
+
const normalizeObjectStorageRequest = (valueArg, fieldNameArg) => {
|
|
304
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
305
|
+
assertKeys(value, [
|
|
306
|
+
'id',
|
|
307
|
+
'kind',
|
|
308
|
+
'storageClass',
|
|
309
|
+
'accessMode',
|
|
310
|
+
'reclaimPolicy',
|
|
311
|
+
'delivery',
|
|
312
|
+
], ['capacity', 'protection'], fieldNameArg);
|
|
313
|
+
if (value.kind !== 'objectStorage') {
|
|
314
|
+
return failArg(`${fieldNameArg}.kind must be objectStorage`);
|
|
315
|
+
}
|
|
316
|
+
return {
|
|
317
|
+
id: readIdentifier(value.id, `${fieldNameArg}.id`),
|
|
318
|
+
kind: 'objectStorage',
|
|
319
|
+
storageClass: readIdentifier(value.storageClass, `${fieldNameArg}.storageClass`),
|
|
320
|
+
accessMode: readLiteral(value.accessMode, ['readOnly', 'readWrite'], `${fieldNameArg}.accessMode`),
|
|
321
|
+
reclaimPolicy: readLiteral(value.reclaimPolicy, ['retain', 'delete'], `${fieldNameArg}.reclaimPolicy`),
|
|
322
|
+
delivery: normalizeDelivery(value.delivery, `${fieldNameArg}.delivery`),
|
|
323
|
+
...(Object.hasOwn(value, 'capacity')
|
|
324
|
+
? {
|
|
325
|
+
capacity: normalizeCapacityRequest(value.capacity, `${fieldNameArg}.capacity`),
|
|
326
|
+
}
|
|
327
|
+
: {}),
|
|
328
|
+
...(Object.hasOwn(value, 'protection')
|
|
329
|
+
? {
|
|
330
|
+
protection: normalizeObjectStorageProtection(value.protection, `${fieldNameArg}.protection`),
|
|
331
|
+
}
|
|
332
|
+
: {}),
|
|
333
|
+
};
|
|
334
|
+
};
|
|
335
|
+
const normalizeFilesystemStorageRequest = (valueArg, fieldNameArg) => {
|
|
336
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
337
|
+
assertKeys(value, [
|
|
338
|
+
'id',
|
|
339
|
+
'kind',
|
|
340
|
+
'storageClass',
|
|
341
|
+
'accessMode',
|
|
342
|
+
'reclaimPolicy',
|
|
343
|
+
'mountPath',
|
|
344
|
+
], ['capacity', 'protection'], fieldNameArg);
|
|
345
|
+
if (value.kind !== 'filesystem') {
|
|
346
|
+
return failArg(`${fieldNameArg}.kind must be filesystem`);
|
|
347
|
+
}
|
|
348
|
+
return {
|
|
349
|
+
id: readIdentifier(value.id, `${fieldNameArg}.id`),
|
|
350
|
+
kind: 'filesystem',
|
|
351
|
+
storageClass: readIdentifier(value.storageClass, `${fieldNameArg}.storageClass`),
|
|
352
|
+
accessMode: readLiteral(value.accessMode, ['ReadWriteOnce', 'ReadOnlyMany', 'ReadWriteMany'], `${fieldNameArg}.accessMode`),
|
|
353
|
+
reclaimPolicy: readLiteral(value.reclaimPolicy, ['retain', 'delete'], `${fieldNameArg}.reclaimPolicy`),
|
|
354
|
+
mountPath: readMountPath(value.mountPath, `${fieldNameArg}.mountPath`),
|
|
355
|
+
...(Object.hasOwn(value, 'capacity')
|
|
356
|
+
? {
|
|
357
|
+
capacity: normalizeCapacityRequest(value.capacity, `${fieldNameArg}.capacity`),
|
|
358
|
+
}
|
|
359
|
+
: {}),
|
|
360
|
+
...(Object.hasOwn(value, 'protection')
|
|
361
|
+
? {
|
|
362
|
+
protection: normalizeFilesystemProtection(value.protection, `${fieldNameArg}.protection`),
|
|
363
|
+
}
|
|
364
|
+
: {}),
|
|
365
|
+
};
|
|
366
|
+
};
|
|
367
|
+
const normalizeStorageRequest = (valueArg, fieldNameArg) => {
|
|
368
|
+
const value = readRecord(valueArg, fieldNameArg);
|
|
369
|
+
if (value.kind === 'filesystem') {
|
|
370
|
+
return normalizeFilesystemStorageRequest(value, fieldNameArg);
|
|
371
|
+
}
|
|
372
|
+
if (value.kind === 'objectStorage') {
|
|
373
|
+
return normalizeObjectStorageRequest(value, fieldNameArg);
|
|
374
|
+
}
|
|
375
|
+
return failArg(`${fieldNameArg}.kind must be filesystem or objectStorage`);
|
|
376
|
+
};
|
|
377
|
+
return {
|
|
378
|
+
utf8ByteLength,
|
|
379
|
+
readRecord,
|
|
380
|
+
readDenseArray,
|
|
381
|
+
assertKeys,
|
|
382
|
+
assertExactKeys,
|
|
383
|
+
readString,
|
|
384
|
+
readIdentifier,
|
|
385
|
+
readSha256,
|
|
386
|
+
readSafeInteger,
|
|
387
|
+
readBoolean,
|
|
388
|
+
readLiteral,
|
|
389
|
+
readCapacityQuantity,
|
|
390
|
+
capacityQuantityBytes,
|
|
391
|
+
readEnvironmentKey,
|
|
392
|
+
normalizeCapacityRequest,
|
|
393
|
+
normalizeDelivery,
|
|
394
|
+
normalizeObjectStorageRequest,
|
|
395
|
+
normalizeFilesystemStorageRequest,
|
|
396
|
+
normalizeStorageRequest,
|
|
397
|
+
};
|
|
398
|
+
};
|
|
399
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storagecontract.js","sourceRoot":"","sources":["../../ts/private/storagecontract.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
|
@@ -1271,6 +1293,21 @@ metadata plus a service-owned credential management scope and delivery policy,
|
|
|
1271
1293
|
never credential references or values. Filesystem
|
|
1272
1294
|
bindings expose the container mount and access mode, never a host path.
|
|
1273
1295
|
|
|
1296
|
+
A binding's `requestDigest` is stated by one function, so the control plane that
|
|
1297
|
+
issues it and the consumer that re-derives it compute the same value:
|
|
1298
|
+
|
|
1299
|
+
```typescript
|
|
1300
|
+
const requestDigest = await platform.createStorageRequestSha256(storageRequest);
|
|
1301
|
+
```
|
|
1302
|
+
|
|
1303
|
+
It normalizes the request to its contract shape, canonicalizes it and returns
|
|
1304
|
+
bare lowercase hex over the request alone — no prefix, and nothing wrapped
|
|
1305
|
+
around the request. A body that is not a storage request is refused with
|
|
1306
|
+
`platform.StorageContractError` instead of hashed, and
|
|
1307
|
+
`platform.canonicalizeStorageRequest` returns the exact bytes the digest is
|
|
1308
|
+
taken over. `platform.storageRequestCanonicalDigestGoldenVectors` states both
|
|
1309
|
+
for a filesystem request and for both object-storage deliveries.
|
|
1310
|
+
|
|
1274
1311
|
Portable manifests and resolved bindings intentionally have no fields for
|
|
1275
1312
|
Synology, NFS, Kerberos, Corestore, Kubernetes, Docker drivers, servers,
|
|
1276
1313
|
exports, mount options, provider credential values, or local fallback paths. Runtimes
|
package/ts/00_commitinfo_data.ts
CHANGED
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';
|