@serve.zone/interfaces 32.5.0 → 32.7.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 +80 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/cluster.d.ts +4 -5
- package/dist_ts/data/cluster.js +4 -13
- package/dist_ts/data/clustervpn.d.ts +18 -1
- package/dist_ts/data/clustervpn.js +23 -7
- package/dist_ts/data/deploymentpreflight.d.ts +21 -0
- package/dist_ts/data/deploymentpreflight.js +19 -1
- package/dist_ts/data/networkaddressplan.d.ts +21 -15
- package/dist_ts/data/networkaddressplan.js +27 -20
- package/dist_ts/data/networkcredential.d.ts +1 -7
- package/dist_ts/data/networkcredential.js +7 -24
- package/dist_ts/private/networkcontract.d.ts +16 -0
- package/dist_ts/private/networkcontract.js +21 -1
- package/dist_ts/requests/service.d.ts +13 -0
- package/package.json +1 -1
- package/readme.md +58 -25
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +7 -20
- package/ts/data/clustervpn.ts +34 -9
- package/ts/data/deploymentpreflight.ts +38 -0
- package/ts/data/networkaddressplan.ts +32 -25
- package/ts/data/networkcredential.ts +9 -33
- package/ts/private/networkcontract.ts +20 -0
- package/ts/requests/service.ts +13 -0
|
@@ -8,38 +8,47 @@ export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
|
8
8
|
*/
|
|
9
9
|
maximumControlPrefixLength: 30,
|
|
10
10
|
/**
|
|
11
|
-
* Every transport a hub
|
|
11
|
+
* Every transport a managed hub serves, in the order a node prefers them.
|
|
12
12
|
*
|
|
13
13
|
* One row states all three facts that belong together: the transport a credential names, the
|
|
14
14
|
* suffix its platform endpoint id carries, and the protocol the endpoint is composed with. A hub
|
|
15
|
-
*
|
|
15
|
+
* contributes one endpoint of its address per row, so a transport added here is added once for
|
|
16
|
+
* the id derivation, the composition and the credential binder alike.
|
|
17
|
+
*
|
|
18
|
+
* QUIC is the one row: a managed hub terminates TLS on its QUIC listener alone, so no other
|
|
19
|
+
* transport of it can be dialled over a protected connection.
|
|
16
20
|
*/
|
|
17
21
|
hubTransports: Object.freeze([
|
|
18
22
|
Object.freeze({ transport: 'quic', endpointSuffix: 'quic', protocol: 'udp' }),
|
|
19
|
-
Object.freeze({ transport: 'websocket', endpointSuffix: 'ws', protocol: 'tcp' }),
|
|
20
23
|
]),
|
|
21
24
|
});
|
|
22
|
-
/**
|
|
23
|
-
|
|
25
|
+
/**
|
|
26
|
+
* The one reader for a managed VPN control prefix: a canonical private prefix no longer than
|
|
27
|
+
* `maximumControlPrefixLength`. The plan states it for the whole runtime network and a cluster's
|
|
28
|
+
* network repeats it for the hub that binds it, so both read it here and neither can admit a
|
|
29
|
+
* subnet the other would refuse.
|
|
30
|
+
*/
|
|
31
|
+
export const runtimeNetworkVpnControlPrefix = (value) => networkSafe(() => {
|
|
32
|
+
const prefix = networkPrivatePrefix(value);
|
|
33
|
+
requireNetwork(Number(prefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
34
|
+
return prefix;
|
|
35
|
+
});
|
|
36
|
+
/** The port a hub bound for one transport; one entry per row of the transport table. */
|
|
37
|
+
const hubPort = (hub, transport) => ({ quic: hub.quicPort })[transport];
|
|
24
38
|
const byEndpointId = (left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
|
|
25
39
|
const hubOf = (value) => {
|
|
26
|
-
const item = networkRecord(value, ['clusterId', 'address', 'quicPort'
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
quicPort: port(item.quicPort), websocketPort: port(item.websocketPort) };
|
|
30
|
-
// A hub that bound no transport is not reachable, so it is not a hub a node could be sent to.
|
|
31
|
-
requireNetwork(runtimeNetworkAddressPlanContract.hubTransports.some(row => hubPort(hub, row.transport) !== null));
|
|
32
|
-
return hub;
|
|
40
|
+
const item = networkRecord(value, ['clusterId', 'address', 'quicPort']);
|
|
41
|
+
return { clusterId: networkId(item.clusterId), address: networkIpv4(item.address),
|
|
42
|
+
quicPort: networkCounter(item.quicPort, 65535) };
|
|
33
43
|
};
|
|
34
44
|
/**
|
|
35
|
-
* The platform endpoints one hub contributes to a protected authority: one per transport
|
|
36
|
-
* in id order. Every reader derives the same ids from this one function — the composition
|
|
37
|
-
* the authority, and the router selection that names which of them a node may dial.
|
|
45
|
+
* The platform endpoints one hub contributes to a protected authority: one per transport a managed
|
|
46
|
+
* hub serves, in id order. Every reader derives the same ids from this one function — the composition
|
|
47
|
+
* that seals the authority, and the router selection that names which of them a node may dial.
|
|
38
48
|
*/
|
|
39
49
|
export const runtimeNetworkVpnHubEndpoints = (hubValue) => networkSafe(() => {
|
|
40
50
|
const hub = hubOf(captureNetwork(hubValue));
|
|
41
51
|
return runtimeNetworkAddressPlanContract.hubTransports
|
|
42
|
-
.filter(row => hubPort(hub, row.transport) !== null)
|
|
43
52
|
.map(row => ({ id: `${hub.clusterId}:${row.endpointSuffix}`, address: hub.address,
|
|
44
53
|
protocol: row.protocol, port: hubPort(hub, row.transport) }))
|
|
45
54
|
.sort(byEndpointId);
|
|
@@ -64,9 +73,7 @@ const setsWithHubs = (plan, hubs) => ({
|
|
|
64
73
|
});
|
|
65
74
|
const vpnOf = (value) => {
|
|
66
75
|
const item = networkRecord(value, ['controlPrefix', 'hubPrefix']);
|
|
67
|
-
|
|
68
|
-
requireNetwork(Number(controlPrefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
69
|
-
return { controlPrefix, hubPrefix: networkPrefix(item.hubPrefix) };
|
|
76
|
+
return { controlPrefix: runtimeNetworkVpnControlPrefix(item.controlPrefix), hubPrefix: networkPrefix(item.hubPrefix) };
|
|
70
77
|
};
|
|
71
78
|
/**
|
|
72
79
|
* Both VPN prefixes are protected, they hold none of the plan's own pools, resolvers or platform
|
|
@@ -155,4 +162,4 @@ export const admitRuntimeNetworkAddressPlanChange = (previousValue, nextValue) =
|
|
|
155
162
|
return { status: 'accepted', removed: { resolverIds: idsOf(removedOrChanged(previous.resolvers, next.resolvers)),
|
|
156
163
|
platformEndpointIds: idsOf(removedOrChanged(previous.platformEndpoints, next.platformEndpoints)) } };
|
|
157
164
|
});
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,7 @@ export interface IGetRuntimeManagedVpnCredentialResponse extends IGetRuntimeMana
|
|
|
16
16
|
address: string;
|
|
17
17
|
port: number;
|
|
18
18
|
};
|
|
19
|
-
/**
|
|
20
|
-
* The TLS name the hub's WebSocket transport is dialled under, present exactly when `transport`
|
|
21
|
-
* is `websocket` and absent otherwise: QUIC is dialled on the address alone. It is the hub
|
|
22
|
-
* relay's own origin hostname, which the node cross-checks against the relay origin it stores,
|
|
23
|
-
* so a name the node does not already trust ends the handshake before any native effect.
|
|
24
|
-
*/
|
|
25
|
-
serverName?: string;
|
|
19
|
+
/** The hub's managed authority, under the one bound the hub daemon holds for it. */
|
|
26
20
|
authorityId: string;
|
|
27
21
|
serverPublicKey: string;
|
|
28
22
|
clientPublicKey: string;
|
|
@@ -2,25 +2,11 @@ import { runtimeNetworkAddressPlanContract } from './networkaddressplan.js';
|
|
|
2
2
|
import { snapshotRuntimeSessionBinding } from './runtimesession.js';
|
|
3
3
|
import { validateRuntimeNetworkProjection } from './networkprojection.js';
|
|
4
4
|
import { snapshotRuntimeNetworkDnsLeaseRenewal, validateRuntimeNetworkDnsLeaseRenewal } from './networklease.js';
|
|
5
|
-
import { captureNetwork, failNetwork, networkCounter, networkEffectiveDnsWindow, networkEqual, networkId, networkIpv4, networkNoiseKey, networkRecord, networkReference, networkReferenceOf, networkSafe, networkSameScope, requireNetwork } from '../private/networkcontract.js';
|
|
5
|
+
import { captureNetwork, failNetwork, networkAuthorityId, networkCounter, networkEffectiveDnsWindow, networkEqual, networkId, networkIpv4, networkNoiseKey, networkRecord, networkReference, networkReferenceOf, networkSafe, networkSameScope, requireNetwork } from '../private/networkcontract.js';
|
|
6
6
|
export const snapshotGetRuntimeManagedVpnCredentialRequest = (value) => networkSafe(() => {
|
|
7
7
|
const item = networkRecord(captureNetwork(value), ['session', 'projection']);
|
|
8
8
|
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection) };
|
|
9
9
|
});
|
|
10
|
-
/**
|
|
11
|
-
* The TLS name a WebSocket hub is dialled under: a lower-case domain name of at least two labels,
|
|
12
|
-
* which is what a relay origin's hostname is and what a certificate can be issued for. An address
|
|
13
|
-
* literal is not one, so a node can never be sent to a name nothing vouches for.
|
|
14
|
-
*/
|
|
15
|
-
const serverName = (value) => {
|
|
16
|
-
requireNetwork(typeof value === 'string' && value.length <= 253);
|
|
17
|
-
const labels = value.split('.');
|
|
18
|
-
// The last label starts with a letter, which is what makes this a name and not an address
|
|
19
|
-
// literal: a hub reached by address is reached over QUIC, which needs no name at all.
|
|
20
|
-
requireNetwork(labels.length >= 2 && labels.every(label => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label))
|
|
21
|
-
&& /^[a-z]/.test(labels[labels.length - 1]));
|
|
22
|
-
return value;
|
|
23
|
-
};
|
|
24
10
|
const transportOf = (value) => {
|
|
25
11
|
const row = runtimeNetworkAddressPlanContract.hubTransports.find(candidate => candidate.transport === value);
|
|
26
12
|
requireNetwork(row);
|
|
@@ -28,15 +14,12 @@ const transportOf = (value) => {
|
|
|
28
14
|
};
|
|
29
15
|
export const snapshotGetRuntimeManagedVpnCredentialResponse = (value) => networkSafe(() => {
|
|
30
16
|
const item = networkRecord(captureNetwork(value), ['session', 'projection', 'transport', 'hub', 'authorityId',
|
|
31
|
-
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']
|
|
32
|
-
const hub = networkRecord(item.hub, ['id', 'address', 'port'])
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
requireNetwork(Object.hasOwn(item, 'serverName') === (transport === 'websocket'));
|
|
36
|
-
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection), transport,
|
|
17
|
+
'serverPublicKey', 'clientPublicKey', 'clientPrivateKey', 'expiresAt']);
|
|
18
|
+
const hub = networkRecord(item.hub, ['id', 'address', 'port']);
|
|
19
|
+
return { session: snapshotRuntimeSessionBinding(item.session), projection: networkReference(item.projection),
|
|
20
|
+
transport: transportOf(item.transport),
|
|
37
21
|
hub: { id: networkId(hub.id), address: networkIpv4(hub.address), port: networkCounter(hub.port, 65535) },
|
|
38
|
-
|
|
39
|
-
authorityId: networkId(item.authorityId), serverPublicKey: networkNoiseKey(item.serverPublicKey),
|
|
22
|
+
authorityId: networkAuthorityId(item.authorityId), serverPublicKey: networkNoiseKey(item.serverPublicKey),
|
|
40
23
|
clientPublicKey: networkNoiseKey(item.clientPublicKey), clientPrivateKey: networkNoiseKey(item.clientPrivateKey),
|
|
41
24
|
expiresAt: networkCounter(item.expiresAt) };
|
|
42
25
|
});
|
|
@@ -87,4 +70,4 @@ export const bindGetRuntimeManagedVpnCredentialResponse = async (value, requestV
|
|
|
87
70
|
return failNetwork();
|
|
88
71
|
}
|
|
89
72
|
};
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya2NyZWRlbnRpYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL25ldHdvcmtjcmVkZW50aWFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxpQ0FBaUMsRUFBb0MsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RyxPQUFPLEVBQUUsNkJBQTZCLEVBQStCLE1BQU0scUJBQXFCLENBQUM7QUFDakcsT0FBTyxFQUFFLGdDQUFnQyxFQUFrQyxNQUFNLHdCQUF3QixDQUFDO0FBQzFHLE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pILE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLGtCQUFrQixFQUFFLGNBQWMsRUFBRSx5QkFBeUIsRUFBRSxZQUFZLEVBQy9HLFNBQVMsRUFBRSxXQUFXLEVBQUUsZUFBZSxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQ3pHLGdCQUFnQixFQUFFLGNBQWMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBMEIxRSxNQUFNLENBQUMsTUFBTSw2Q0FBNkMsR0FBRyxDQUFDLEtBQWMsRUFBMEMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7SUFDeEksTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQzdFLE9BQU8sRUFBRSxPQUFPLEVBQUUsNkJBQTZCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztBQUNqSCxDQUFDLENBQUMsQ0FBQztBQUVILE1BQU0sV0FBVyxHQUFHLENBQUMsS0FBYyxFQUErQixFQUFFO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLGlDQUFpQyxDQUFD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
|
|
@@ -13,6 +13,22 @@ export declare const networkRecord: (value: unknown, keys: string[], optionalKey
|
|
|
13
13
|
export declare const networkList: <T>(value: unknown, maximum: number, read: (item: unknown) => T) => T[];
|
|
14
14
|
export declare const networkSorted: <T>(values: T[], key: (item: T) => string) => T[];
|
|
15
15
|
export declare const networkId: (value: unknown) => string;
|
|
16
|
+
/**
|
|
17
|
+
* The longest managed VPN authority id any contract of this package admits, in UTF-8 bytes.
|
|
18
|
+
*
|
|
19
|
+
* SmartVPN's managed registry refuses an authority id longer than 128 bytes, and it is the daemon
|
|
20
|
+
* that applies a pushed network, so an id between that bound and the generic identifier bound
|
|
21
|
+
* above would pass every contract on the way and be refused only at apply time, on the far side of
|
|
22
|
+
* a push, as a hub reporting `state: 'failed'`. Bounding it where the id is admitted moves that
|
|
23
|
+
* refusal to where Cloudly compiles the network, on its own stack, before anything is pushed.
|
|
24
|
+
*
|
|
25
|
+
* Bytes, because that is what the daemon counts. The identifier grammar admits ASCII alone, so a
|
|
26
|
+
* byte and a code point are the same thing for every id that gets this far; measuring bytes keeps
|
|
27
|
+
* the bound equal to the daemon's the day the grammar admits anything wider.
|
|
28
|
+
*/
|
|
29
|
+
export declare const networkMaximumAuthorityIdBytes = 128;
|
|
30
|
+
/** A managed VPN authority id: a canonical identifier the cluster's hub daemon also admits. */
|
|
31
|
+
export declare const networkAuthorityId: (value: unknown) => string;
|
|
16
32
|
/** A node id is read in the node vocabulary here as everywhere else, never in the canonical one. */
|
|
17
33
|
export declare const networkNodeId: (value: unknown) => string;
|
|
18
34
|
export declare const networkCounter: (value: unknown, maximum?: number) => number;
|
|
@@ -89,6 +89,26 @@ export const networkId = (value) => {
|
|
|
89
89
|
requireNetwork(typeof value === 'string' && /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/.test(value));
|
|
90
90
|
return value;
|
|
91
91
|
};
|
|
92
|
+
/**
|
|
93
|
+
* The longest managed VPN authority id any contract of this package admits, in UTF-8 bytes.
|
|
94
|
+
*
|
|
95
|
+
* SmartVPN's managed registry refuses an authority id longer than 128 bytes, and it is the daemon
|
|
96
|
+
* that applies a pushed network, so an id between that bound and the generic identifier bound
|
|
97
|
+
* above would pass every contract on the way and be refused only at apply time, on the far side of
|
|
98
|
+
* a push, as a hub reporting `state: 'failed'`. Bounding it where the id is admitted moves that
|
|
99
|
+
* refusal to where Cloudly compiles the network, on its own stack, before anything is pushed.
|
|
100
|
+
*
|
|
101
|
+
* Bytes, because that is what the daemon counts. The identifier grammar admits ASCII alone, so a
|
|
102
|
+
* byte and a code point are the same thing for every id that gets this far; measuring bytes keeps
|
|
103
|
+
* the bound equal to the daemon's the day the grammar admits anything wider.
|
|
104
|
+
*/
|
|
105
|
+
export const networkMaximumAuthorityIdBytes = 128;
|
|
106
|
+
/** A managed VPN authority id: a canonical identifier the cluster's hub daemon also admits. */
|
|
107
|
+
export const networkAuthorityId = (value) => {
|
|
108
|
+
const id = networkId(value);
|
|
109
|
+
requireNetwork(new TextEncoder().encode(id).length <= networkMaximumAuthorityIdBytes);
|
|
110
|
+
return id;
|
|
111
|
+
};
|
|
92
112
|
/** A node id is read in the node vocabulary here as everywhere else, never in the canonical one. */
|
|
93
113
|
export const networkNodeId = (value) => {
|
|
94
114
|
requireNetwork(isClusterNodeId(value));
|
|
@@ -196,4 +216,4 @@ export const networkOverlaps = (left, right) => {
|
|
|
196
216
|
const [a, b] = networkPrefixBounds(left), [c, d] = networkPrefixBounds(right);
|
|
197
217
|
return a <= d && c <= b;
|
|
198
218
|
};
|
|
199
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
219
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkcontract.js","sourceRoot":"","sources":["../../ts/private/networkcontract.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import type { IImageRelease } from '../data/immutableimage.js';
|
|
|
8
8
|
import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
|
|
9
9
|
import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
|
|
10
10
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
11
|
+
import type { IProtocolOffer } from '../protocol.js';
|
|
11
12
|
import type { IServiceRuntimeAssignmentView, IServiceRuntimeSpec, IServiceRuntimeStatus, TServiceRuntimeSpecWritableData } from '../data/serviceruntime.js';
|
|
12
13
|
import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionImagePromotionInput, IServiceDeploymentAdoptionImagePromotionResult, IServiceDeploymentAdoptionRolloutInput, IServiceDeploymentAdoptionRolloutResult, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
|
|
13
14
|
export interface IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout> {
|
|
@@ -61,6 +62,18 @@ export interface IRequest_Any_Cloudly_GetServiceById extends plugins.typedreques
|
|
|
61
62
|
request: {
|
|
62
63
|
identity: IIdentity;
|
|
63
64
|
serviceId: string;
|
|
65
|
+
/**
|
|
66
|
+
* The calling build's protocol offer, read and negotiated before the request is served.
|
|
67
|
+
*
|
|
68
|
+
* The read that opens a deployment adoption, and the only other deployment carrier that
|
|
69
|
+
* carries an offer: the mutating ones stay byte-exact because Cloudly derives a deployment
|
|
70
|
+
* operation's `requestDigest` from the whole request body, and an offer there would bind that
|
|
71
|
+
* operation's identity to the caller's interfaces release. Optional, because a peer of this
|
|
72
|
+
* release states nothing by offering and a caller that opens no deployment sends none —
|
|
73
|
+
* absence is a valid request. A stated offer is exact-key, judged by
|
|
74
|
+
* `protocol.readProtocolOffer` / `protocol.validateProtocolOfferOn` like every other offer.
|
|
75
|
+
*/
|
|
76
|
+
protocol?: IProtocolOffer;
|
|
64
77
|
};
|
|
65
78
|
response: {
|
|
66
79
|
service: IService;
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -519,11 +519,10 @@ uses `IGetRuntimeManagedVpnCredentialRequest` and
|
|
|
519
519
|
`IGetRuntimeManagedVpnCredentialResponse`. Its request carries the exact current
|
|
520
520
|
session and signed projection reference. The secret response repeats those
|
|
521
521
|
bindings and supplies the `hub` tuple the node dials, the `transport` it dials it
|
|
522
|
-
over (`quic
|
|
523
|
-
key, the client keypair and the expiry in Unix
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
`quic`, which is dialled on the address alone. The hub is the node's own cluster's
|
|
522
|
+
over (`quic`, the one transport a managed hub serves), the managed authority ID,
|
|
523
|
+
the Noise server public key, the client keypair and the expiry in Unix
|
|
524
|
+
milliseconds. The response states no TLS name: QUIC is dialled on the address
|
|
525
|
+
alone. The hub is the node's own cluster's
|
|
527
526
|
relay (see [Cluster VPN Hub And Network](#cluster-vpn-hub-and-network)). Keep the
|
|
528
527
|
response process-local; never persist, hash, log or embed it in a signed projection.
|
|
529
528
|
|
|
@@ -534,7 +533,7 @@ validates the complete projection digest and binds node, controller, namespace,
|
|
|
534
533
|
physical-session identity and projection reference. The response binder takes
|
|
535
534
|
`(response, request, projection, trustedSession, now, renewal = null)` and additionally requires the
|
|
536
535
|
hub's exact tuple to be selected in `router.platformEndpointIds`, carrying the protocol of the
|
|
537
|
-
credential's transport — `udp` for `quic
|
|
536
|
+
credential's transport — `udp` for `quic`, as
|
|
538
537
|
`runtimeNetworkAddressPlanContract.hubTransports` states. A relay therefore cannot name itself: the
|
|
539
538
|
endpoint has to be one the node's **signed** projection already selected.
|
|
540
539
|
Expiry must be after the caller-qualified time and no later than the referenced
|
|
@@ -702,12 +701,15 @@ other — control addresses live inside the tunnel, hub endpoints on the underla
|
|
|
702
701
|
additionally a private prefix no longer than /30
|
|
703
702
|
(`runtimeNetworkAddressPlanContract.maximumControlPrefixLength`); no minimum length is stated,
|
|
704
703
|
because the private-range rule already keeps it at /8 or longer.
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
`
|
|
709
|
-
|
|
710
|
-
`
|
|
704
|
+
`data.runtimeNetworkVpnControlPrefix(value)` is that reader on its own, exported because a
|
|
705
|
+
cluster's VPN network repeats the prefix its hub binds and has to read it exactly as the plan does.
|
|
706
|
+
|
|
707
|
+
`data.IRuntimeNetworkVpnHub { clusterId, address, quicPort }` is one cluster's hub as its relay
|
|
708
|
+
bound it. `runtimeNetworkVpnHubEndpoints(hub)` is the one derivation of what it contributes:
|
|
709
|
+
`<clusterId>:quic` on `udp`, one endpoint per row of
|
|
710
|
+
`runtimeNetworkAddressPlanContract.hubTransports`. That table has one row, because a managed hub
|
|
711
|
+
terminates TLS on its QUIC listener alone and no other transport of it can be dialled over a
|
|
712
|
+
protected connection. Every reader calls the derivation — the composition
|
|
711
713
|
that seals the authority and the router selection that names which endpoint a node may dial — so
|
|
712
714
|
two readers can never derive two ids for one hub.
|
|
713
715
|
`composeRuntimeNetworkProtectedAuthority(plan, frame, hubs)` is the composition itself: the producer
|
|
@@ -716,7 +718,7 @@ previous reference and egress authorities) and the hubs of the clusters that reg
|
|
|
716
718
|
receives the complete authority with its digest, so the validator and the protection producer can
|
|
717
719
|
never compose differently. Each hub's address must sit inside `vpn.hubPrefix` and one cluster is
|
|
718
720
|
named once; an empty `hubs` composes the authority of a runtime network whose clusters have no hub
|
|
719
|
-
yet. One hub costs
|
|
721
|
+
yet. One hub costs one of the authority's 64 platform endpoints, so 64 clusters fit one
|
|
720
722
|
authority.
|
|
721
723
|
|
|
722
724
|
`admitRuntimeNetworkAddressPlanChange(previous | null, next)` is the pure decision for a plan write at
|
|
@@ -1737,33 +1739,44 @@ Cloudly keeps every authority — it compiles the network and issues each node's
|
|
|
1737
1739
|
carries no packet.
|
|
1738
1740
|
|
|
1739
1741
|
A relay that bound a hub says so in its registration, in `relay.vpnHub`:
|
|
1740
|
-
`data.IClusterRelayVpnHub { publicKey, address, quicPort
|
|
1742
|
+
`data.IClusterRelayVpnHub { publicKey, address, quicPort }`. It reports what it
|
|
1741
1743
|
bound, exactly like `listenAddress` and `listenPort`: `address` is an IPv4 literal inside the
|
|
1742
|
-
address plan's `vpn.hubPrefix
|
|
1743
|
-
|
|
1744
|
+
address plan's `vpn.hubPrefix` and `quicPort` is the port it bound for the one transport a managed
|
|
1745
|
+
hub serves. `publicKey` is the hub's Noise public key in the one canonical 32-byte base64 encoding
|
|
1744
1746
|
every Noise key of this contract is read with — this advertisement, the managed VPN credential's
|
|
1745
|
-
keys and a cluster network's nodes all pass the same reader. A relay names no endpoint id
|
|
1746
|
-
|
|
1747
|
-
[Runtime Network Address Plan](#runtime-network-address-plan))
|
|
1748
|
-
origin it published for that relay. The member is optional — a relay that serves no hub registers
|
|
1747
|
+
keys and a cluster network's nodes all pass the same reader. A relay names no endpoint id of its
|
|
1748
|
+
own: Cloudly composes the endpoints with `runtimeNetworkVpnHubEndpoints` (see
|
|
1749
|
+
[Runtime Network Address Plan](#runtime-network-address-plan)). The member is optional — a relay that serves no hub registers
|
|
1749
1750
|
exactly as before, and Cloudly selects no hub for that cluster, stating `relay-vpn-hub-absent`.
|
|
1750
1751
|
`validateClusterRelayVpnHub(value, path?)` returns one named reason per violation.
|
|
1751
1752
|
|
|
1752
|
-
`data.IClusterVpnNetwork { authorityId, revision, nodes, grants }` is the whole
|
|
1753
|
-
cluster. It is never a patch: a node or a grant the network does not carry is
|
|
1754
|
-
membership is presence, so there is no enabled flag.
|
|
1753
|
+
`data.IClusterVpnNetwork { authorityId, controlPrefix, revision, nodes, grants }` is the whole
|
|
1754
|
+
managed VPN of one cluster. It is never a patch: a node or a grant the network does not carry is
|
|
1755
|
+
withdrawn, and membership is presence, so there is no enabled flag. `controlPrefix` is the subnet
|
|
1756
|
+
the cluster's hub serves its control plane on — the address plan's `vpn.controlPrefix`, read by the
|
|
1757
|
+
same `runtimeNetworkVpnControlPrefix` reader. A hub fixes that subnet when it binds and no other
|
|
1758
|
+
carrier hands a relay the address plan, so the network it is pushed states it; the plan contract
|
|
1759
|
+
never lets it change, which is why a network that moves the prefix under the same authority is
|
|
1760
|
+
refused as `vpn-network-authority-foreign` rather than by a name of its own. Each node states `{ nodeId, publicKey,
|
|
1755
1761
|
controlAddress, expiresAt, workloadPrefixes }`, where `expiresAt` is that node's credential expiry
|
|
1756
1762
|
in Unix milliseconds and each prefix is `{ cidr, policyDomain }`. Each grant is one directed
|
|
1757
1763
|
`{ sourceDomain, destinationDomain }` pair. `clusterVpnControlPolicyDomain(address)` and
|
|
1758
1764
|
`clusterVpnWorkloadPolicyDomain(leaseDigest)` state the domain names once for both sides.
|
|
1759
1765
|
|
|
1760
|
-
`snapshotClusterVpnNetwork` requires sorted, unique members, prefixes and grants,
|
|
1766
|
+
`snapshotClusterVpnNetwork` requires sorted, unique members, prefixes and grants, requires every
|
|
1767
|
+
control address to lie inside `controlPrefix` and every workload prefix to stay clear of it — the
|
|
1768
|
+
two rules the hub enforces against the subnet it bound — and requires
|
|
1761
1769
|
every grant to join two workload domains the network itself carries, on two different nodes. That
|
|
1762
1770
|
is what a per-cluster hub means: a grant whose other end sits on another cluster's hub cannot be
|
|
1763
1771
|
expressed at all, which is why Cloudly refuses it while it compiles, by name, with
|
|
1764
1772
|
`grant-cross-cluster-unsupported` from `data.clusterVpnNetworkSelectionRefusals`.
|
|
1765
1773
|
`clusterVpnNetworkContract` bounds a network at 256 nodes, 128 workload prefixes per node, 4096
|
|
1766
|
-
grants and 917 504 canonical bytes
|
|
1774
|
+
grants and 917 504 canonical bytes, and `authorityId` at
|
|
1775
|
+
`clusterVpnNetworkContract.maximumAuthorityIdBytes` — 128 UTF-8 bytes, the bound the hub daemon
|
|
1776
|
+
itself holds for the authority it binds. Bytes rather than code points, because that is what the
|
|
1777
|
+
daemon counts. The same bound is read wherever the id is admitted, `snapshotClusterVpnNetwork` and
|
|
1778
|
+
the managed VPN credential's `authorityId` alike, so an id no hub could take over is refused where
|
|
1779
|
+
the network is compiled instead of arriving back as a hub reporting `state: 'failed'`.
|
|
1767
1780
|
|
|
1768
1781
|
`applyClusterVpnNetwork { network }` is Cloudly's push over the relay's already registered session;
|
|
1769
1782
|
the relay answers `{ appliedRevision, state }`, where `state` is `idle`, `applying` or `failed` and
|
|
@@ -1972,6 +1985,26 @@ The immutable deployment workflow is:
|
|
|
1972
1985
|
|
|
1973
1986
|
`data.IServiceDeploymentOperation` is the durable revisioned compare-and-set fence for this workflow. Image promotion requires Cloudly-created trusted evidence that binds the operation, actor, repository, exact tag, root digest, and OCI index media type. The service request group also exposes deployment preflight, exact-digest rollback, retry, and cleanup contracts.
|
|
1974
1987
|
|
|
1988
|
+
Two of these carriers accept an optional `protocol` offer (`protocol.IProtocolOffer`, see
|
|
1989
|
+
[Protocol handshake](#protocol-handshake)): `getDeploymentPreflight`, through
|
|
1990
|
+
`data.IDeploymentPreflightRequestData.protocol`, and `getServiceById`. Those are the read-only
|
|
1991
|
+
requests that open a deployment and an adoption, and they are the only deployment carriers that
|
|
1992
|
+
take one. The mutating carriers stay byte-exact deliberately: Cloudly derives
|
|
1993
|
+
`reserveServiceDeployment`'s `requestDigest` from the whole request body, so an offer inside one of
|
|
1994
|
+
them would bind a durable operation's identity to whichever `@serve.zone/interfaces` release the
|
|
1995
|
+
deployer had installed, and an in-flight deployment would stop being resumable across a deployer
|
|
1996
|
+
upgrade. Stating the offer on the opening read names developer-machine skew before anything is
|
|
1997
|
+
reserved and leaves nothing durable behind.
|
|
1998
|
+
|
|
1999
|
+
The member is optional — a peer of this release states nothing by offering and an older deployer
|
|
2000
|
+
sends none, so absence is a valid request, not a refusal. A stated offer is exact-key like every
|
|
2001
|
+
other offer in this package: `validateDeploymentPreflightRequest` judges it with
|
|
2002
|
+
`protocol.validateProtocolOfferOn`, the naming twin of the `protocol.readProtocolOffer` a server
|
|
2003
|
+
negotiates from, and answers a malformed or accessor-backed offer with a single `INVALID_REQUEST`
|
|
2004
|
+
blocker naming the offer and its reasons. Whether two peers can serve one session is never a
|
|
2005
|
+
preflight blocker: that is `protocol.negotiateProtocol`'s decision, answered as an
|
|
2006
|
+
`IProtocolRefusal`.
|
|
2007
|
+
|
|
1975
2008
|
Gateway request contracts include `getGatewayClientRoutes` (`requests.gateway.IReq_GetGatewayClientRoutes`) for listing owned `IGatewayClientRoute[]` route views, and `syncGatewayClientRoute` for idempotently syncing or deleting hostname-owned, routeRef-owned, and combined hostname-plus-routeRef routes. A client can label canonical intent with `managedRouteKind: 'letsencrypt-http01-forward'` and set a higher `priority` for a path-specific HTTP-01 route while retaining a separate normal route for the same hostname. Mail request contracts include `syncMailAddressBinding`, `deleteMailAddressBinding`, `rotateMailCredential`, and `getMailDeliveryStatus`. `IReq_GetMailDeliveryStatus` looks up a delivery spool item by `spoolItemId`, returns `data.IMailDeliveryStatus`, and accepts `IMailSubmissionRequestAuth` so service-mail credentials can query their own accepted, queued, deferred, delivered, or failed status. Typed outbound messages may set `replyTo` to one bare ASCII mailbox address; arbitrary `Reply-To` values do not belong in the custom header bag. Invalid values and typed-field/custom-header conflicts return stable `TMailSubmissionErrorCode` values. `TMailAddressBindingSync.outboundEnabled` explicitly controls whether a gateway should maintain a managed outbound SMTP credential for an address binding. Binding credential metadata is public; `rotateMailCredential` returns the new secret only in its one-time `IMailCredentialOneTimeSecret` response.
|
|
1976
2009
|
|
|
1977
2010
|
### Web Push Contracts
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/data/cluster.ts
CHANGED
|
@@ -70,17 +70,16 @@ export interface IClusterRelay {
|
|
|
70
70
|
* The relay is its cluster's packet relay: every node of the cluster dials this hub and no
|
|
71
71
|
* inter-node packet leaves the cluster. It reports what it bound, exactly like `listenAddress` and
|
|
72
72
|
* `listenPort`, and Cloudly composes the platform endpoints from it — a relay names no endpoint id
|
|
73
|
-
*
|
|
73
|
+
* of its own. `publicKey` is the hub's Noise public key in the one canonical
|
|
74
74
|
* 32-byte base64 encoding every Noise key of this contract is read with; it is public material and
|
|
75
|
-
* authenticates nothing by itself.
|
|
76
|
-
*
|
|
75
|
+
* authenticates nothing by itself. `quicPort` is the port it bound for the one transport a managed
|
|
76
|
+
* hub serves, so a relay that advertises a hub advertises a reachable one.
|
|
77
77
|
*/
|
|
78
78
|
export interface IClusterRelayVpnHub {
|
|
79
79
|
publicKey: string;
|
|
80
80
|
/** The address the hub bound, as an IPv4 literal inside the address plan's `vpn.hubPrefix`. */
|
|
81
81
|
address: string;
|
|
82
|
-
quicPort: number
|
|
83
|
-
websocketPort: number | null;
|
|
82
|
+
quicPort: number;
|
|
84
83
|
}
|
|
85
84
|
|
|
86
85
|
/**
|
|
@@ -274,13 +273,6 @@ const validateClusterRelayVpnKey = (valueArg: unknown, pathArg: string): string[
|
|
|
274
273
|
}
|
|
275
274
|
};
|
|
276
275
|
|
|
277
|
-
/** A port the hub bound, or `null` for a transport it did not bind. */
|
|
278
|
-
const validateClusterRelayHubPort = (valueArg: unknown, pathArg: string): string[] => (
|
|
279
|
-
valueArg === null || validateClusterRelayListenPort(valueArg, pathArg).length === 0
|
|
280
|
-
? []
|
|
281
|
-
: [`${pathArg} must be null or an integer from 1 to 65535`]
|
|
282
|
-
);
|
|
283
|
-
|
|
284
276
|
/**
|
|
285
277
|
* Validates one hub advertisement and names every reason it is refused.
|
|
286
278
|
*
|
|
@@ -292,19 +284,14 @@ export const validateClusterRelayVpnHub = (
|
|
|
292
284
|
pathArg = 'cluster relay vpn hub',
|
|
293
285
|
): string[] => {
|
|
294
286
|
if (!isRecord(valueArg)
|
|
295
|
-
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'
|
|
287
|
+
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort'])) {
|
|
296
288
|
return [`${pathArg} must use its exact schema`];
|
|
297
289
|
}
|
|
298
|
-
|
|
290
|
+
return [
|
|
299
291
|
...validateClusterRelayVpnKey(valueArg.publicKey, `${pathArg} publicKey`),
|
|
300
292
|
...validateClusterRelayListenAddress(valueArg.address, `${pathArg} address`),
|
|
301
|
-
...
|
|
302
|
-
...validateClusterRelayHubPort(valueArg.websocketPort, `${pathArg} websocketPort`),
|
|
293
|
+
...validateClusterRelayListenPort(valueArg.quicPort, `${pathArg} quicPort`),
|
|
303
294
|
];
|
|
304
|
-
if (valueArg.quicPort === null && valueArg.websocketPort === null) {
|
|
305
|
-
errors.push(`${pathArg} must bind at least one of quicPort and websocketPort`);
|
|
306
|
-
}
|
|
307
|
-
return errors;
|
|
308
295
|
};
|
|
309
296
|
|
|
310
297
|
const validateClusterRelayEndpoint = (valueArg: unknown, pathArg: string): string[] => {
|