@serve.zone/interfaces 32.29.0 → 32.30.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 +49 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/networkprojection.d.ts +74 -3
- package/dist_ts/data/networkprojection.js +21 -2
- package/dist_ts/data/serviceruntime.d.ts +19 -3
- package/dist_ts/data/serviceruntime.js +2 -2
- package/dist_ts/platform/corestoreendpointselection.d.ts +37 -0
- package/dist_ts/platform/corestoreendpointselection.js +45 -0
- package/dist_ts/platform/index.d.ts +3 -1
- package/dist_ts/platform/index.js +4 -2
- package/dist_ts/platform/objectstorage.js +5 -1
- package/dist_ts/private/networkcontract.d.ts +2 -0
- package/dist_ts/private/networkcontract.js +9 -4
- package/dist_ts/requests/network.d.ts +60 -2
- package/package.json +3 -3
- package/readme.md +64 -7
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/networkprojection.ts +96 -4
- package/ts/data/serviceruntime.ts +19 -3
- package/ts/platform/corestoreendpointselection.ts +79 -0
- package/ts/platform/index.ts +3 -0
- package/ts/platform/objectstorage.ts +4 -0
- package/ts/private/networkcontract.ts +7 -3
- package/ts/requests/network.ts +56 -2
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { isNetworkIpv4 } from '../private/networkcontract.js';
|
|
2
|
+
import { validatePlatformDatabaseEndpoint } from './database.js';
|
|
3
|
+
import { validatePlatformObjectStorageEndpoint } from './objectstorage.js';
|
|
4
|
+
const selectedPlatformEndpoints = (selectionArg) => {
|
|
5
|
+
if (selectionArg.network.mode !== 'attached')
|
|
6
|
+
return [];
|
|
7
|
+
const selectedIds = new Set(selectionArg.network.platformEndpointIds);
|
|
8
|
+
return selectionArg.platformEndpoints.filter((endpointArg) => selectedIds.has(endpointArg.id));
|
|
9
|
+
};
|
|
10
|
+
/** Platform endpoints are IPv4, so only a canonical IPv4 host can be one; a DNS name or IPv6 literal never is. */
|
|
11
|
+
const selectsTcp = (endpointsArg, hostArg, portArg) => (isNetworkIpv4(hostArg) && endpointsArg.some((endpointArg) => endpointArg.address === hostArg
|
|
12
|
+
&& endpointArg.protocol === 'tcp' && endpointArg.port === portArg));
|
|
13
|
+
/** The origin's port, or the scheme's default (80 for `http:`, 443 for `https:`) when it states none. */
|
|
14
|
+
const objectStorageOriginPort = (originArg) => (originArg.port === '' ? (originArg.protocol === 'https:' ? 443 : 80) : Number(originArg.port));
|
|
15
|
+
/**
|
|
16
|
+
* Which of a node's Corestore endpoints a service's workload would dial without its network
|
|
17
|
+
* selecting them, as the service runtime refusals that name them; empty when none.
|
|
18
|
+
*
|
|
19
|
+
* An endpoint is selected when one of the spec's selected platform endpoints has the endpoint's host
|
|
20
|
+
* as its `address`, `tcp` as its `protocol` and the endpoint's port as its `port`: the database
|
|
21
|
+
* endpoint's `host` and `port`, and the object-storage endpoint origin's host and port, or 80 for
|
|
22
|
+
* `http:` and 443 for `https:` when the origin states none. An `isolated` network selects nothing, a
|
|
23
|
+
* selected id the protected authority does not hold selects nothing, and a DNS-name or IPv6 host is
|
|
24
|
+
* never selected. Only a valid endpoint is judged: one `validatePlatformDatabaseEndpoint` or
|
|
25
|
+
* `validatePlatformObjectStorageEndpoint` refuses is the `-missing` refusal's, not this one's. The
|
|
26
|
+
* answer is sorted, so it does not depend on the order of the inputs.
|
|
27
|
+
*/
|
|
28
|
+
export const findUnselectedCorestoreEndpoints = (selectionArg) => {
|
|
29
|
+
const selected = selectedPlatformEndpoints(selectionArg);
|
|
30
|
+
const refusals = [];
|
|
31
|
+
const database = selectionArg.database;
|
|
32
|
+
if (database !== null && validatePlatformDatabaseEndpoint(database).length === 0
|
|
33
|
+
&& !selectsTcp(selected, database.host, database.port)) {
|
|
34
|
+
refusals.push('database-endpoint-unselected');
|
|
35
|
+
}
|
|
36
|
+
const objectStorage = selectionArg.objectStorage;
|
|
37
|
+
if (objectStorage !== null && validatePlatformObjectStorageEndpoint(objectStorage).length === 0) {
|
|
38
|
+
const origin = new URL(objectStorage.endpoint);
|
|
39
|
+
if (!selectsTcp(selected, origin.hostname, objectStorageOriginPort(origin))) {
|
|
40
|
+
refusals.push('objectstorage-endpoint-unselected');
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return refusals;
|
|
44
|
+
};
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZXN0b3JlZW5kcG9pbnRzZWxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9wbGF0Zm9ybS9jb3Jlc3RvcmVlbmRwb2ludHNlbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDOUQsT0FBTyxFQUFFLGdDQUFnQyxFQUFrQyxNQUFNLGVBQWUsQ0FBQztBQUNqRyxPQUFPLEVBQUUscUNBQXFDLEVBQXVDLE1BQU0sb0JBQW9CLENBQUM7QUEwQmhILE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxZQUF5QyxFQUF1QixFQUFFO0lBQ25HLElBQUksWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEtBQUssVUFBVTtRQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ3hELE1BQU0sV0FBVyxHQUFHLElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUN0RSxPQUFPLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDakcsQ0FBQyxDQUFDO0FBRUYsa0hBQWtIO0FBQ2xILE1BQU0sVUFBVSxHQUFHLENBQUMsWUFBaUMsRUFBRSxPQUFlLEVBQUUsT0FBZSxFQUFXLEVBQUUsQ0FBQyxDQUNuRyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLE9BQU8sS0FBSyxPQUFPO09BQ3ZGLFdBQVcsQ0FBQyxRQUFRLEtBQUssS0FBSyxJQUFJLFdBQVcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLENBQ3JFLENBQUM7QUFFRix5R0FBeUc7QUFDekcsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLFNBQWMsRUFBVSxFQUFFLENBQUMsQ0FDMUQsU0FBUyxDQUFDLElBQUksS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLFFBQVEsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQzlGLENBQUM7QUFFRjs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCxNQUFNLENBQUMsTUFBTSxnQ0FBZ0MsR0FBRyxDQUM5QyxZQUF5QyxFQUNILEVBQUU7SUFDeEMsTUFBTSxRQUFRLEdBQUcseUJBQXlCLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDekQsTUFBTSxRQUFRLEdBQXlDLEVBQUUsQ0FBQztJQUMxRCxNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDO0lBQ3ZDLElBQUksUUFBUSxLQUFLLElBQUksSUFBSSxnQ0FBZ0MsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQztXQUMzRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUN6RCxRQUFRLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUNELE1BQU0sYUFBYSxHQUFHLFlBQVksQ0FBQyxhQUFhLENBQUM7SUFDakQsSUFBSSxhQUFhLEtBQUssSUFBSSxJQUFJLHFDQUFxQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNoRyxNQUFNLE1BQU0sR0FBRyxJQUFJLEdBQUcsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDL0MsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDNUUsUUFBUSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO1FBQ3JELENBQUM7SUFDSCxDQUFDO0lBQ0QsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as ai from './ai.js';
|
|
2
2
|
import * as backup from './backup.js';
|
|
3
|
+
import * as corestoreendpointselection from './corestoreendpointselection.js';
|
|
3
4
|
import * as database from './database.js';
|
|
4
5
|
import * as email from './email.js';
|
|
5
6
|
import * as letter from './letter.js';
|
|
@@ -13,7 +14,8 @@ import * as sms from './sms.js';
|
|
|
13
14
|
import * as storage from './storage.js';
|
|
14
15
|
import * as storagemigration from './storagemigration.js';
|
|
15
16
|
import * as types from './types.js';
|
|
16
|
-
export { ai, backup, database, email, letter, logging, objectstorage, objectstorageenvironment, objectstorageretention, pushnotification, sip, sms, storage, storagemigration, types, };
|
|
17
|
+
export { ai, backup, corestoreendpointselection, database, email, letter, logging, objectstorage, objectstorageenvironment, objectstorageretention, pushnotification, sip, sms, storage, storagemigration, types, };
|
|
18
|
+
export * from './corestoreendpointselection.js';
|
|
17
19
|
export * from './database.js';
|
|
18
20
|
export * from './storage.js';
|
|
19
21
|
export * from './objectstorage.js';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as ai from './ai.js';
|
|
2
2
|
import * as backup from './backup.js';
|
|
3
|
+
import * as corestoreendpointselection from './corestoreendpointselection.js';
|
|
3
4
|
import * as database from './database.js';
|
|
4
5
|
import * as email from './email.js';
|
|
5
6
|
import * as letter from './letter.js';
|
|
@@ -13,7 +14,8 @@ import * as sms from './sms.js';
|
|
|
13
14
|
import * as storage from './storage.js';
|
|
14
15
|
import * as storagemigration from './storagemigration.js';
|
|
15
16
|
import * as types from './types.js';
|
|
16
|
-
export { ai, backup, database, email, letter, logging, objectstorage, objectstorageenvironment, objectstorageretention, pushnotification, sip, sms, storage, storagemigration, types, };
|
|
17
|
+
export { ai, backup, corestoreendpointselection, database, email, letter, logging, objectstorage, objectstorageenvironment, objectstorageretention, pushnotification, sip, sms, storage, storagemigration, types, };
|
|
18
|
+
export * from './corestoreendpointselection.js';
|
|
17
19
|
export * from './database.js';
|
|
18
20
|
export * from './storage.js';
|
|
19
21
|
export * from './objectstorage.js';
|
|
@@ -21,4 +23,4 @@ export * from './objectstorageenvironment.js';
|
|
|
21
23
|
export * from './objectstorageretention.js';
|
|
22
24
|
export * from './storagemigration.js';
|
|
23
25
|
export * from './types.js';
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9wbGF0Zm9ybS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUM5QixPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssMEJBQTBCLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLFFBQVEsTUFBTSxlQUFlLENBQUM7QUFDMUMsT0FBTyxLQUFLLEtBQUssTUFBTSxZQUFZLENBQUM7QUFDcEMsT0FBTyxLQUFLLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFDdEMsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFDeEMsT0FBTyxLQUFLLGFBQWEsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sK0JBQStCLENBQUM7QUFDMUUsT0FBTyxLQUFLLHNCQUFzQixNQUFNLDZCQUE2QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQztBQUNoQyxPQUFPLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQztBQUNoQyxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssZ0JBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEtBQUssTUFBTSxZQUFZLENBQUM7QUFFcEMsT0FBTyxFQUNMLEVBQUUsRUFDRixNQUFNLEVBQ04sMEJBQTBCLEVBQzFCLFFBQVEsRUFDUixLQUFLLEVBQ0wsTUFBTSxFQUNOLE9BQU8sRUFDUCxhQUFhLEVBQ2Isd0JBQXdCLEVBQ3hCLHNCQUFzQixFQUN0QixnQkFBZ0IsRUFDaEIsR0FBRyxFQUNILEdBQUcsRUFDSCxPQUFPLEVBQ1AsZ0JBQWdCLEVBQ2hCLEtBQUssR0FDTixDQUFDO0FBRUYsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsWUFBWSxDQUFDIn0=
|
|
@@ -63,6 +63,10 @@ export const validatePlatformObjectStorageEndpoint = (valueArg, pathArg = 'objec
|
|
|
63
63
|
errors.push(`${pathArg} endpoint must be a canonical origin without a path, query, `
|
|
64
64
|
+ 'fragment, trailing slash or default port');
|
|
65
65
|
}
|
|
66
|
+
// A URL parser refuses a port above 65535 but reads port 0 as stated; no workload dials it.
|
|
67
|
+
if (parsedEndpoint.port !== '' && Number(parsedEndpoint.port) < 1) {
|
|
68
|
+
errors.push(`${pathArg} endpoint port must be from 1 to 65535`);
|
|
69
|
+
}
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
if (typeof valueArg.region !== 'string'
|
|
@@ -153,4 +157,4 @@ export const validateObjectStorageEndpointEnvironment = (environmentArg, pathArg
|
|
|
153
157
|
}
|
|
154
158
|
return errors;
|
|
155
159
|
};
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0c3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsYXRmb3JtL29iamVjdHN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsTUFBTSxDQUFDLE1BQU0scUNBQXFDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNqRSxZQUFZLEVBQUUsQ0FBQztJQUNmLFlBQVksRUFBRSxFQUFFO0NBQ2pCLENBQUMsQ0FBQztBQUVILHNGQUFzRjtBQUN0RixNQUFNLENBQUMsTUFBTSx1Q0FBdUMsR0FBRyxDQUNyRCxhQUFzQixFQUN0QixPQUFPLEdBQUcsMEJBQTBCLEVBQzFCLEVBQUU7SUFDWixJQUFJLE9BQU8sYUFBYSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ3RDLE9BQU8sQ0FBQyxHQUFHLE9BQU8scUNBQXFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBQ0QsTUFBTSxTQUFTLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUMzRSxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxHQUFHLENBQ25ELENBQUMsQ0FBQztJQUNILElBQUksYUFBYSxDQUFDLE1BQU0sR0FBRyxxQ0FBcUMsQ0FBQyxZQUFZO1dBQ3hFLGFBQWEsQ0FBQyxNQUFNLEdBQUcscUNBQXFDLENBQUMsWUFBWTtXQUN6RSxDQUFDLCtCQUErQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUM7V0FDcEQsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7V0FDNUIsYUFBYSxFQUFFLENBQUM7UUFDbkIsT0FBTyxDQUFDLEdBQUcsT0FBTyxxQ0FBcUMsQ0FBQyxDQUFDO0lBQzNELENB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
|
|
@@ -82,6 +82,8 @@ export declare const networkRevision: (item: Record<string, unknown>) => {
|
|
|
82
82
|
export declare const networkHash: (domain: string, value: {
|
|
83
83
|
digest: TSha256Digest;
|
|
84
84
|
}) => Promise<TSha256Digest>;
|
|
85
|
+
/** A canonical dotted-quad IPv4 literal: four decimal octets, no leading zeros. */
|
|
86
|
+
export declare const isNetworkIpv4: (value: unknown) => value is string;
|
|
85
87
|
export declare const networkIpv4: (value: unknown) => string;
|
|
86
88
|
export declare const networkIpv4Number: (value: string) => number;
|
|
87
89
|
export declare const networkPrefixBounds: (value: string) => [number, number];
|
|
@@ -200,10 +200,15 @@ export const networkHash = async (domain, value) => {
|
|
|
200
200
|
const { digest: omitted, ...payload } = value;
|
|
201
201
|
return `sha256:${await createCanonicalJsonSha256Hex(networkCanonical({ domain, payload }), failNetwork)}`;
|
|
202
202
|
};
|
|
203
|
-
|
|
204
|
-
|
|
203
|
+
/** A canonical dotted-quad IPv4 literal: four decimal octets, no leading zeros. */
|
|
204
|
+
export const isNetworkIpv4 = (value) => {
|
|
205
|
+
if (typeof value !== 'string' || value.length > 15)
|
|
206
|
+
return false;
|
|
205
207
|
const parts = value.split('.');
|
|
206
|
-
|
|
208
|
+
return parts.length === 4 && parts.every(part => /^(?:0|[1-9][0-9]{0,2})$/.test(part) && Number(part) <= 255);
|
|
209
|
+
};
|
|
210
|
+
export const networkIpv4 = (value) => {
|
|
211
|
+
requireNetwork(isNetworkIpv4(value));
|
|
207
212
|
return value;
|
|
208
213
|
};
|
|
209
214
|
export const networkIpv4Number = (value) => value.split('.').reduce((sum, part) => sum * 256 + Number(part), 0);
|
|
@@ -233,4 +238,4 @@ export const networkOverlaps = (left, right) => {
|
|
|
233
238
|
const [a, b] = networkPrefixBounds(left), [c, d] = networkPrefixBounds(right);
|
|
234
239
|
return a <= d && c <= b;
|
|
235
240
|
};
|
|
236
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
241
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { IIdentity, IIdentityCredential } from '../data/user.js';
|
|
|
3
3
|
import type { IRuntimeNetworkAddressPlan, TRuntimeNetworkAddressPlanWritableData } from '../data/networkaddressplan.js';
|
|
4
4
|
import type { IRuntimeNetworkNodeReadiness, IRuntimeRouterIncarnation } from '../data/networknode.js';
|
|
5
5
|
import type { IPrivateNetwork, IServicePrivateNetworks, ISetServicePrivateNetworks, TPrivateNetworkMutation } from '../data/privatenetwork.js';
|
|
6
|
-
import type { IServicePublishedPorts, ISetServicePublishedPorts } from '../data/networkprojection.js';
|
|
6
|
+
import type { IServiceNetworkEgress, IServicePublishedPorts, ISetServiceNetworkEgress, ISetServicePublishedPorts } from '../data/networkprojection.js';
|
|
7
7
|
/** Current organization picker data. Entries are never cached authorization grants. */
|
|
8
8
|
export interface IReq_Cloudly_ListOwnedOrganizations extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_ListOwnedOrganizations> {
|
|
9
9
|
method: 'listOwnedOrganizations';
|
|
@@ -97,7 +97,7 @@ export interface IReq_Cloudly_SetServicePrivateNetworks extends plugins.typedreq
|
|
|
97
97
|
replayed: boolean;
|
|
98
98
|
};
|
|
99
99
|
}
|
|
100
|
-
/** null means the service has never had
|
|
100
|
+
/** null means the service has never had a policy document, neither published ports nor egress. */
|
|
101
101
|
export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_GetServicePublishedPorts> {
|
|
102
102
|
method: 'getServicePublishedPorts';
|
|
103
103
|
request: {
|
|
@@ -109,6 +109,17 @@ export interface IReq_Cloudly_GetServicePublishedPorts extends plugins.typedrequ
|
|
|
109
109
|
publishedPorts: IServicePublishedPorts | null;
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Writes the published-port half of one service's policy document, carrying its egress forward.
|
|
114
|
+
*
|
|
115
|
+
* One document per service holds its published ports and its egress under one `revision`. The
|
|
116
|
+
* first accepted write of either (`expectedRevision: null`) creates it: `setServicePublishedPorts`
|
|
117
|
+
* with egress `publicEgress: false` and `platformEndpointIds: []`, `setServiceNetworkEgress` with
|
|
118
|
+
* no published ports. From then on both reads return it, never null. It is an explicit policy: an
|
|
119
|
+
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
120
|
+
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
121
|
+
* document at all.
|
|
122
|
+
*/
|
|
112
123
|
export interface IReq_Cloudly_SetServicePublishedPorts extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_SetServicePublishedPorts> {
|
|
113
124
|
method: 'setServicePublishedPorts';
|
|
114
125
|
request: {
|
|
@@ -125,6 +136,53 @@ export interface IReq_Cloudly_SetServicePublishedPorts extends plugins.typedrequ
|
|
|
125
136
|
replayed: boolean;
|
|
126
137
|
};
|
|
127
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* The egress half of one service's policy document; null means the service has never had a policy
|
|
141
|
+
* document. Only a verified administrator reads it: platform endpoints are platform authority.
|
|
142
|
+
*/
|
|
143
|
+
export interface IReq_Admin_Cloudly_GetServiceNetworkEgress extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_GetServiceNetworkEgress> {
|
|
144
|
+
method: 'getServiceNetworkEgress';
|
|
145
|
+
request: {
|
|
146
|
+
identity: IIdentityCredential;
|
|
147
|
+
organizationId: string;
|
|
148
|
+
serviceId: string;
|
|
149
|
+
};
|
|
150
|
+
response: {
|
|
151
|
+
networkEgress: IServiceNetworkEgress | null;
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Writes the egress half of one service's policy document, carrying its published ports forward.
|
|
156
|
+
*
|
|
157
|
+
* Only a verified administrator writes it, as only an administrator writes the runtime spec whose
|
|
158
|
+
* attached network must state the same values. `expectedRevision` is the revision of the one
|
|
159
|
+
* document shared with the published ports; any other stored revision refuses the write, and an id
|
|
160
|
+
* that names no current platform endpoint refuses it. A retry of the exact body under the same
|
|
161
|
+
* `mutationId` answers the stored document with `replayed: true`.
|
|
162
|
+
*
|
|
163
|
+
* One document per service holds its published ports and its egress under one `revision`. The
|
|
164
|
+
* first accepted write of either (`expectedRevision: null`) creates it: `setServicePublishedPorts`
|
|
165
|
+
* with egress `publicEgress: false` and `platformEndpointIds: []`, `setServiceNetworkEgress` with
|
|
166
|
+
* no published ports. From then on both reads return it, never null. It is an explicit policy: an
|
|
167
|
+
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
168
|
+
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
169
|
+
* document at all.
|
|
170
|
+
*/
|
|
171
|
+
export interface IReq_Admin_Cloudly_SetServiceNetworkEgress extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Admin_Cloudly_SetServiceNetworkEgress> {
|
|
172
|
+
method: 'setServiceNetworkEgress';
|
|
173
|
+
request: {
|
|
174
|
+
identity: IIdentityCredential;
|
|
175
|
+
mutation: ISetServiceNetworkEgress;
|
|
176
|
+
};
|
|
177
|
+
/**
|
|
178
|
+
* The accepted document including its `revision`; historical on replay. Acceptance is neither an
|
|
179
|
+
* admitted workload nor applied packet state.
|
|
180
|
+
*/
|
|
181
|
+
response: {
|
|
182
|
+
networkEgress: IServiceNetworkEgress;
|
|
183
|
+
replayed: boolean;
|
|
184
|
+
};
|
|
185
|
+
}
|
|
128
186
|
export interface IRequest_Any_Cloudly_GetNetworkNodes {
|
|
129
187
|
method: 'getNetworkNodes';
|
|
130
188
|
request: {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.30.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@git.zone/tsbuild": "^5.0.0",
|
|
31
31
|
"@git.zone/tsdoc": "^2.2.2",
|
|
32
|
-
"@git.zone/tsrun": "^3.0.
|
|
33
|
-
"@git.zone/tstest": "6.3.
|
|
32
|
+
"@git.zone/tsrun": "^3.0.1",
|
|
33
|
+
"@git.zone/tstest": "6.3.2",
|
|
34
34
|
"@types/node": "26.6.2"
|
|
35
35
|
},
|
|
36
36
|
"files": [
|
package/readme.md
CHANGED
|
@@ -482,7 +482,7 @@ canonical bytes and digest; a present member is never an empty list, so
|
|
|
482
482
|
Operators author that authorization through `getServicePublishedPorts` and
|
|
483
483
|
`setServicePublishedPorts`, modelled on the private-network membership pair.
|
|
484
484
|
`IServicePublishedPorts` returns the current authorized list with its policy
|
|
485
|
-
`revision`, or null when a service never had
|
|
485
|
+
`revision`, or null when a service never had a policy document. `ISetServicePublishedPorts`
|
|
486
486
|
returns the accepted `IServicePublishedPorts` document with its new
|
|
487
487
|
`revision` and a `replayed` flag, and carries `expectedRevision` (null for the first document), a retained
|
|
488
488
|
`mutationId` for replay, and `IRuntimeNetworkPublishedPortRequest` entries of
|
|
@@ -493,6 +493,39 @@ policy meaning the service publishes nothing. Callers never supply an
|
|
|
493
493
|
from the accepted policy revision and digest, and node-level host-port placement
|
|
494
494
|
stays Cloudly's decision.
|
|
495
495
|
|
|
496
|
+
Every endpoint's `publicEgress` and `platformEndpointIds` come from the same
|
|
497
|
+
service policy document. A verified administrator authors them through
|
|
498
|
+
`getServiceNetworkEgress` and `setServiceNetworkEgress`
|
|
499
|
+
(`requests.network.IReq_Admin_Cloudly_GetServiceNetworkEgress` /
|
|
500
|
+
`IReq_Admin_Cloudly_SetServiceNetworkEgress`): platform endpoints are platform
|
|
501
|
+
authority, and only an administrator writes the runtime spec whose attached
|
|
502
|
+
network has to state the same values. `IServiceNetworkEgress` returns
|
|
503
|
+
`publicEgress` and the selected `platformEndpointIds` (sorted, unique, at most
|
|
504
|
+
`runtimeNetworkAuthorityContract.maximumPlatformEndpoints`) with the document's
|
|
505
|
+
`revision`, or null when a service never had a policy document.
|
|
506
|
+
`ISetServiceNetworkEgress` carries `expectedRevision` (null for the first
|
|
507
|
+
document), a retained `mutationId` for replay and the exact desired values, and
|
|
508
|
+
returns the accepted `IServiceNetworkEgress` with a `replayed` flag; Cloudly
|
|
509
|
+
carries the published ports forward unchanged, and refuses an id that names no
|
|
510
|
+
current platform endpoint. Published ports and egress are two halves of one
|
|
511
|
+
document with one `revision`, so `expectedRevision` of either request is the
|
|
512
|
+
revision the caller read from either answer, and an accepted write of either
|
|
513
|
+
advances it.
|
|
514
|
+
|
|
515
|
+
One document per service holds its published ports and its egress under one `revision`. The
|
|
516
|
+
first accepted write of either (`expectedRevision: null`) creates it: `setServicePublishedPorts`
|
|
517
|
+
with egress `publicEgress: false` and `platformEndpointIds: []`, `setServiceNetworkEgress` with
|
|
518
|
+
no published ports. From then on both reads return it, never null. It is an explicit policy: an
|
|
519
|
+
attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
520
|
+
no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
521
|
+
document at all.
|
|
522
|
+
|
|
523
|
+
`snapshotServiceNetworkEgress` and `snapshotSetServiceNetworkEgress`
|
|
524
|
+
check the shapes. An attached runtime spec is admitted only while it states the
|
|
525
|
+
document's values (`network-policy-mismatch`), and nothing else grants a
|
|
526
|
+
workload egress: a Corestore endpoint on the node's own host is delivered
|
|
527
|
+
locally, but only to a workload that selects it.
|
|
528
|
+
|
|
496
529
|
`getRuntimeNetworkProjectionPacketGrants` derives directed member connectivity
|
|
497
530
|
and explicit local public/platform egress independently of DNS readiness.
|
|
498
531
|
`composeRuntimeNetworkProjectionDnsViews` builds one union view per local
|
|
@@ -1454,19 +1487,39 @@ evidence has not arrived). `refused` carries a `TServiceRuntimeRefusal`:
|
|
|
1454
1487
|
`network-workload-pool-missing`, `network-workload-pool-exhausted`, `volume-driver-unsupported`,
|
|
1455
1488
|
`volume-options-unsupported`, `volume-shared-unsupported`, `volume-placement-unsupported`,
|
|
1456
1489
|
`volume-initialization-unknown`, `volume-ownership-unknown`, `objectstorage-endpoint-missing`,
|
|
1457
|
-
`objectstorage-binding-invalid
|
|
1490
|
+
`objectstorage-binding-invalid`, `objectstorage-environment-conflict`,
|
|
1491
|
+
`objectstorage-endpoint-unselected`, `database-endpoint-missing` or `database-endpoint-unselected`.
|
|
1492
|
+
The first four volume
|
|
1458
1493
|
refusals name what a local storage claim cannot express: a volume driver other than a node-local
|
|
1459
1494
|
directory, driver or mount options, one volume mounted by more than one replica or service, and a
|
|
1460
1495
|
placement that does not pin each volume to one node. The other two name what Cloudly will not guess,
|
|
1461
|
-
see [Service Volume Initialization](#service-volume-initialization).
|
|
1462
|
-
refusals
|
|
1463
|
-
|
|
1496
|
+
see [Service Volume Initialization](#service-volume-initialization). Of the four object-storage
|
|
1497
|
+
refusals, `objectstorage-endpoint-missing`, `objectstorage-binding-invalid` and
|
|
1498
|
+
`objectstorage-environment-conflict` name why a binding's environment cannot be composed, see
|
|
1499
|
+
[Object-Storage Binding Environment](#object-storage-binding-environment), and
|
|
1500
|
+
`objectstorage-endpoint-unselected`, like `database-endpoint-unselected`, names an endpoint the
|
|
1501
|
+
workload's network does not select (below). `ports-too-many` is a service declaring more target ports than the
|
|
1464
1502
|
`runtimeConfigContract.maximumTargetPorts` (64) a config carries, where `port-protocol-unsupported`
|
|
1465
1503
|
is about one port's protocol; `node-authority-unsupported` is a node whose session resolved fewer
|
|
1466
1504
|
workload authorities than the spec needs, refused at the admit step rather than handed to a node
|
|
1467
|
-
that would silently park it. An attached network requires an explicit service policy
|
|
1505
|
+
that would silently park it. An attached network requires an explicit service policy
|
|
1506
|
+
(`IServiceNetworkEgress`): its absence
|
|
1468
1507
|
is `network-policy-missing`, and a disagreement with the requested egress or platform endpoints is
|
|
1469
|
-
`network-policy-mismatch`. A
|
|
1508
|
+
`network-policy-mismatch`. A binding endpoint the workload's network does not select would leave its
|
|
1509
|
+
connection dark, so it is refused instead: `database-endpoint-unselected` for an enabled database
|
|
1510
|
+
binding whose node's valid `corestoreDatabase` is not selected, and `objectstorage-endpoint-unselected`
|
|
1511
|
+
for an enabled object-storage binding whose node's valid `corestoreObjectStorage` is not. An endpoint
|
|
1512
|
+
is selected when one of the spec's `platformEndpointIds` names a platform endpoint of the current
|
|
1513
|
+
protected authority with the endpoint's host as its `address`, `tcp` as its `protocol` and the
|
|
1514
|
+
endpoint's port as its `port` — for object storage the origin's port, or 80 for `http:` and 443 for
|
|
1515
|
+
`https:` when it states none. An `isolated` network selects nothing, and platform endpoints are
|
|
1516
|
+
IPv4, so a DNS-name or IPv6 host is never selected. Both are judged only for a valid endpoint: a node
|
|
1517
|
+
stating none, or an invalid one, stays `database-endpoint-missing` or `objectstorage-endpoint-missing`.
|
|
1518
|
+
`platform.findUnselectedCorestoreEndpoints({ database, objectStorage, platformEndpoints, network })`
|
|
1519
|
+
is that rule: given one node's `corestoreDatabase` and `corestoreObjectStorage` (each `null` when no
|
|
1520
|
+
enabled binding of that kind is placed on the node), the current protected authority's
|
|
1521
|
+
`platformEndpoints` and the spec's `network`, it returns the `TCorestoreEndpointSelectionRefusal`s
|
|
1522
|
+
that apply, sorted, or an empty list. A missing workload address pool in the current protected authority is
|
|
1470
1523
|
`network-workload-pool-missing`; existing eligible pools without a free workload subnet are
|
|
1471
1524
|
`network-workload-pool-exhausted`. Neither policy nor pool is silently defaulted. A refusal never
|
|
1472
1525
|
retires running slots.
|
|
@@ -3724,6 +3777,10 @@ object-storage endpoint. What they are addressed to is a fact about the node, ow
|
|
|
3724
3777
|
- `TServiceRuntimeRefusal` gains `database-endpoint-missing`: an enabled database binding placed on
|
|
3725
3778
|
a node that states no valid `corestoreDatabase` is neither granted nor published, and its workload
|
|
3726
3779
|
is refused rather than started with a guessed host.
|
|
3780
|
+
- A workload reaches that endpoint only when its attached network selects it as a platform endpoint;
|
|
3781
|
+
an unselected valid endpoint is refused as `database-endpoint-unselected` (see
|
|
3782
|
+
[Service Runtime Specs And Status](#service-runtime-specs-and-status) for the matching rule), as an object-storage endpoint is as
|
|
3783
|
+
`objectstorage-endpoint-unselected`.
|
|
3727
3784
|
|
|
3728
3785
|
### Launcher Environment Delivery
|
|
3729
3786
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { TSha256Digest } from './immutableimage.js';
|
|
|
2
2
|
import type { IRuntimeAssignmentReference, IRuntimeAuthorityReference, IRuntimeController } from './runtimeassignment.js';
|
|
3
3
|
import { isRuntimeReplicaId, snapshotRuntimeAssignment, validateRuntimeAssignment } from './runtimeassignment.js';
|
|
4
4
|
import type { IRuntimeNetworkHandoffLease, IRuntimeNetworkProtectedAuthority } from './networkauthority.js';
|
|
5
|
-
import { bindRuntimeNetworkHandoffLease, computeRuntimeNetworkProtectedAuthorityDigest,
|
|
5
|
+
import { bindRuntimeNetworkHandoffLease, computeRuntimeNetworkProtectedAuthorityDigest, runtimeNetworkAuthorityContract,
|
|
6
6
|
snapshotRuntimeNetworkHandoffLease, snapshotRuntimeNetworkProtectedAuthority } from './networkauthority.js';
|
|
7
7
|
import type { IPrivateNetwork, IServicePrivateNetworks, IServicePrivateNetworkDnsPolicy } from './privatenetwork.js';
|
|
8
8
|
import { routerPacketGrantsOf, snapshotRouterProjection,
|
|
@@ -95,7 +95,12 @@ export interface IRuntimeNetworkPublishedPortRequest {
|
|
|
95
95
|
targetPort: number;
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
/**
|
|
98
|
+
/**
|
|
99
|
+
* Current authorized published-port policy for one service.
|
|
100
|
+
*
|
|
101
|
+
* The published-port half of the service's one policy document; `IServiceNetworkEgress` reads the
|
|
102
|
+
* egress half of the same document, so both carry the same `revision`.
|
|
103
|
+
*/
|
|
99
104
|
export interface IServicePublishedPorts {
|
|
100
105
|
organizationId: string;
|
|
101
106
|
serviceId: string;
|
|
@@ -104,17 +109,82 @@ export interface IServicePublishedPorts {
|
|
|
104
109
|
publishedPorts: IRuntimeNetworkPublishedPortRequest[];
|
|
105
110
|
}
|
|
106
111
|
|
|
107
|
-
/**
|
|
112
|
+
/**
|
|
113
|
+
* Exact desired policy. Node-level host-port placement remains Cloudly's decision.
|
|
114
|
+
*
|
|
115
|
+
* One document per service holds its published ports and its egress under one `revision`. The
|
|
116
|
+
* first accepted write of either (`expectedRevision: null`) creates it: `setServicePublishedPorts`
|
|
117
|
+
* with egress `publicEgress: false` and `platformEndpointIds: []`, `setServiceNetworkEgress` with
|
|
118
|
+
* no published ports. From then on both reads return it, never null. It is an explicit policy: an
|
|
119
|
+
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
120
|
+
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
121
|
+
* document at all.
|
|
122
|
+
*/
|
|
108
123
|
export interface ISetServicePublishedPorts {
|
|
109
124
|
organizationId: string;
|
|
110
125
|
serviceId: string;
|
|
111
126
|
/** Retain the exact body and this identifier across retries. */
|
|
112
127
|
mutationId: string;
|
|
113
|
-
/**
|
|
128
|
+
/**
|
|
129
|
+
* The revision of the service's one policy document the caller read, shared with its egress: an
|
|
130
|
+
* accepted `ISetServiceNetworkEgress` advances it too. null means the service has never had a
|
|
131
|
+
* policy document, neither published ports nor egress; it is not an empty list.
|
|
132
|
+
*/
|
|
114
133
|
expectedRevision: number | null;
|
|
115
134
|
publishedPorts: IRuntimeNetworkPublishedPortRequest[];
|
|
116
135
|
}
|
|
117
136
|
|
|
137
|
+
/**
|
|
138
|
+
* Current authorized egress policy for one service: whether its attached workloads reach the public
|
|
139
|
+
* internet, and which platform endpoints of the protected authority they reach.
|
|
140
|
+
*
|
|
141
|
+
* The egress half of the service's one policy document; `IServicePublishedPorts` reads the
|
|
142
|
+
* published-port half of the same document, so both carry the same `revision`. Every projection
|
|
143
|
+
* endpoint of the service carries exactly these values (`IRuntimeNetworkEndpoint`), and an attached
|
|
144
|
+
* runtime spec (`TServiceRuntimeNetwork`) is admitted only while it states the same ones: its
|
|
145
|
+
* disagreement is `network-policy-mismatch`, a service without a document `network-policy-missing`.
|
|
146
|
+
* Nothing else grants a workload egress.
|
|
147
|
+
*/
|
|
148
|
+
export interface IServiceNetworkEgress {
|
|
149
|
+
organizationId: string;
|
|
150
|
+
serviceId: string;
|
|
151
|
+
revision: number;
|
|
152
|
+
/** TCP/UDP only; the complete protected union remains denied. */
|
|
153
|
+
publicEgress: boolean;
|
|
154
|
+
/**
|
|
155
|
+
* Ids of `IRuntimeNetworkProtectedAuthority.platformEndpoints`, sorted and unique, at most
|
|
156
|
+
* `runtimeNetworkAuthorityContract.maximumPlatformEndpoints`. Empty selects none.
|
|
157
|
+
*/
|
|
158
|
+
platformEndpointIds: string[];
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* Exact desired egress. The published ports of the same document are carried forward unchanged.
|
|
163
|
+
* Whether each id names a current platform endpoint is Cloudly's decision at acceptance.
|
|
164
|
+
*
|
|
165
|
+
* One document per service holds its published ports and its egress under one `revision`. The
|
|
166
|
+
* first accepted write of either (`expectedRevision: null`) creates it: `setServicePublishedPorts`
|
|
167
|
+
* with egress `publicEgress: false` and `platformEndpointIds: []`, `setServiceNetworkEgress` with
|
|
168
|
+
* no published ports. From then on both reads return it, never null. It is an explicit policy: an
|
|
169
|
+
* attached spec stating `publicEgress: false` and `platformEndpointIds: []` matches it and reaches
|
|
170
|
+
* no public address and no platform endpoint; `network-policy-missing` means the service has no
|
|
171
|
+
* document at all.
|
|
172
|
+
*/
|
|
173
|
+
export interface ISetServiceNetworkEgress {
|
|
174
|
+
organizationId: string;
|
|
175
|
+
serviceId: string;
|
|
176
|
+
/** Retain the exact body and this identifier across retries. */
|
|
177
|
+
mutationId: string;
|
|
178
|
+
/**
|
|
179
|
+
* The revision of the service's one policy document the caller read, shared with its published
|
|
180
|
+
* ports: an accepted `ISetServicePublishedPorts` advances it too. null means the service has
|
|
181
|
+
* never had a policy document, neither published ports nor egress.
|
|
182
|
+
*/
|
|
183
|
+
expectedRevision: number | null;
|
|
184
|
+
publicEgress: boolean;
|
|
185
|
+
platformEndpointIds: string[];
|
|
186
|
+
}
|
|
187
|
+
|
|
118
188
|
/** Controller-owned readiness evidence. A signature does not prove this evidence's provenance. */
|
|
119
189
|
export interface IRuntimeNetworkEndpoint {
|
|
120
190
|
lease: IRuntimeNetworkWorkloadLease;
|
|
@@ -313,6 +383,28 @@ export const snapshotSetServicePublishedPorts = (value: unknown): ISetServicePub
|
|
|
313
383
|
publishedPorts: publishedPortRequests(item.publishedPorts) };
|
|
314
384
|
});
|
|
315
385
|
|
|
386
|
+
const servicePlatformEndpointIds = (value: unknown): string[] => networkSorted(
|
|
387
|
+
networkList(value, runtimeNetworkAuthorityContract.maximumPlatformEndpoints, networkId), id => id);
|
|
388
|
+
const servicePublicEgress = (value: unknown): boolean => {
|
|
389
|
+
requireNetwork(typeof value === 'boolean'); return value;
|
|
390
|
+
};
|
|
391
|
+
|
|
392
|
+
/** Structural snapshot only; whether each id names a current platform endpoint remains Cloudly's decision. */
|
|
393
|
+
export const snapshotServiceNetworkEgress = (value: unknown): IServiceNetworkEgress => networkSafe(() => {
|
|
394
|
+
const item = networkRecord(value, ['organizationId', 'serviceId', 'revision', 'publicEgress', 'platformEndpointIds']);
|
|
395
|
+
return { organizationId: networkId(item.organizationId), serviceId: networkId(item.serviceId),
|
|
396
|
+
revision: networkCounter(item.revision), publicEgress: servicePublicEgress(item.publicEgress),
|
|
397
|
+
platformEndpointIds: servicePlatformEndpointIds(item.platformEndpointIds) };
|
|
398
|
+
});
|
|
399
|
+
|
|
400
|
+
export const snapshotSetServiceNetworkEgress = (value: unknown): ISetServiceNetworkEgress => networkSafe(() => {
|
|
401
|
+
const item = networkRecord(value, ['organizationId', 'serviceId', 'mutationId', 'expectedRevision', 'publicEgress',
|
|
402
|
+
'platformEndpointIds']);
|
|
403
|
+
return { organizationId: networkId(item.organizationId), serviceId: networkId(item.serviceId),
|
|
404
|
+
mutationId: networkId(item.mutationId), expectedRevision: item.expectedRevision === null ? null : networkCounter(item.expectedRevision),
|
|
405
|
+
publicEgress: servicePublicEgress(item.publicEgress), platformEndpointIds: servicePlatformEndpointIds(item.platformEndpointIds) };
|
|
406
|
+
});
|
|
407
|
+
|
|
316
408
|
const endpoint = (value: unknown): IRuntimeNetworkEndpoint => {
|
|
317
409
|
const hasPublishedPorts = value !== null && typeof value === 'object' && Object.hasOwn(value, 'publishedPorts');
|
|
318
410
|
const item = networkRecord(value, ['lease', 'ready', 'observation', 'publicEgress', 'platformEndpointIds',
|