@serve.zone/interfaces 31.1.0 → 31.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/changelog.md CHANGED
@@ -1,5 +1,51 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026-09-16 - 31.3.0
4
+
5
+ ### Features
6
+
7
+ - Add the cluster relay enable, disable and registration contracts. `enableClusterRelayV1` and
8
+ `disableClusterRelayV1` take only an identity and a cluster id and answer with the published
9
+ `IClusterRelayV1` block or an explicit `relay: null`: Cloudly derives the origin from the
10
+ cluster and its own public hostname and refuses when no DNS zone it manages matches the derived
11
+ name, so no caller can name a relay origin. `registerClusterRelayV1` is what the relay sends
12
+ over its own socket after `registerCloudlyClientSessionV1`, carrying
13
+ `IClusterRelayRegistrationV1 { schemaVersion: 1; relay: { version; nodeId; listenAddress;
14
+ listenPort }; registrationSequence }` and answered with
15
+ `IClusterRelayRegistrationResponseV1 { accepted: true; origin: string | null }` — the origin
16
+ Cloudly published, so the relay can check the certificate it holds against the name its nodes
17
+ are given, and `null` while the cluster carries no relay block.
18
+ `validateClusterRelayRegistrationV1(value, pathArg?)` returns one named reason per violation in
19
+ the package's value-free validator shape, and checks shape only: `listenAddress` must be a
20
+ unicast IPv4 literal, because Cloudly publishes it verbatim as an A record, and a loopback or
21
+ link-local address is refused by its own name because a relay that bound one can never serve
22
+ its cluster; `nodeId` follows the same rule a node's own runtime session registers under;
23
+ `registrationSequence` is a non-negative safe integer, so a relay process's first registration
24
+ at `0` is a registration. Which cluster a relay speaks for, whether its node belongs to that
25
+ cluster, and which of two live peers is the relay all stay Cloudly's decisions, made from the
26
+ verified identity on the socket and its own records. Additive only: the dotted-quad rule the
27
+ private network upstream validator already applied moved into one shared internal predicate
28
+ with unchanged semantics, and nothing was removed or renamed.
29
+
30
+ ## 2026-09-16 - 31.2.0
31
+
32
+ ### Features
33
+
34
+ - Add the optional `ICluster.data.relay` block, `IClusterRelayV1 { schemaVersion: 1; origin: string }`:
35
+ how cluster-side components reach this cluster's relay, absent on a cluster whose nodes still
36
+ target Cloudly directly, so its presence is what marks a cluster as relayed. `origin` is the
37
+ exact value a Pallet node stores as its `relayOrigin` — `https:`, an explicit port allowed, no
38
+ path, query, fragment, userinfo or trailing slash, so `new URL(origin).origin === origin`; a
39
+ default `:443` and a cased host are therefore not canonical, because `URL` drops the one and
40
+ lowercases the other. `validateClusterRelayV1(value, pathArg?)` returns one named reason per
41
+ violation and an empty array for a valid block, following the package's value-free validator
42
+ shape. The certificate subject is deliberately not a second field: every consumer derives it
43
+ from the origin with `clusterRelayCertificateDomainName(relay)`, which returns the origin's
44
+ hostname — the name Cloudly issues the certificate for and owns the A record for — so two
45
+ fields can never disagree. An origin naming an address literal consequently has no issuable
46
+ certificate. Additive only: a cluster document without `relay` is unchanged, and nothing was
47
+ removed or renamed.
48
+
3
49
  ## 2026-09-16 - 31.1.0
4
50
 
5
51
  ### Features
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/interfaces',
6
- version: '31.1.0',
6
+ version: '31.3.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
@@ -28,5 +28,90 @@ export interface ICluster {
28
28
  serverSecret: string;
29
29
  };
30
30
  sshKeys: plugins.tsclass.network.ISshKey[];
31
+ /**
32
+ * How cluster-side components reach this cluster's relay. Absent on a
33
+ * cluster whose nodes still target Cloudly directly.
34
+ */
35
+ relay?: IClusterRelayV1;
36
+ };
37
+ }
38
+ /**
39
+ * How cluster-side components reach this cluster's relay.
40
+ *
41
+ * `origin` is the exact value a Pallet node stores as its `relayOrigin`: an
42
+ * `https:` origin, an explicit port allowed, with no path, no query, no
43
+ * fragment, no userinfo and no trailing slash, so that
44
+ * `new URL(origin).origin === origin`. A default `:443` is therefore written
45
+ * implicitly, because `URL` drops it from the origin it computes.
46
+ */
47
+ export interface IClusterRelayV1 {
48
+ schemaVersion: 1;
49
+ origin: string;
50
+ }
51
+ /**
52
+ * What a cluster relay tells Cloudly about itself once its socket is authenticated.
53
+ *
54
+ * The relay sends this after `registerCloudlyClientSessionV1`, so the cluster it registers for
55
+ * is the one its verified machine identity names and is never a field here. `relay.nodeId` is
56
+ * the cluster node the relay process runs on, `listenAddress` and `listenPort` are the exact
57
+ * endpoint it bound for the Pallet nodes of its cluster, and `registrationSequence` counts up
58
+ * once per registration within one relay process, so Cloudly can tell a newer registration from
59
+ * a replayed older one while both peers are live.
60
+ */
61
+ export interface IClusterRelayRegistrationV1 {
62
+ schemaVersion: 1;
63
+ relay: {
64
+ /** The relay build that is registering; a bounded label for operators and logs. */
65
+ version: string;
66
+ nodeId: string;
67
+ /**
68
+ * The address the relay bound, as an IPv4 literal.
69
+ *
70
+ * Cloudly publishes this value verbatim as the A record of the relay's certificate domain
71
+ * name, so the contract admits exactly what that record can carry: a hostname would need a
72
+ * `CNAME` and an IPv6 address an `AAAA` record, and neither is published today. Admitting
73
+ * either is an additive change once Cloudly publishes it.
74
+ */
75
+ listenAddress: string;
76
+ listenPort: number;
31
77
  };
78
+ /** Monotonic within one relay process; it restarts at 0 when the process restarts. */
79
+ registrationSequence: number;
80
+ }
81
+ /**
82
+ * What Cloudly tells the relay back.
83
+ *
84
+ * `origin` is the origin Cloudly has published for this cluster, so a relay can check that the
85
+ * certificate it holds and the name its nodes are told to reach are the same one. It is `null`
86
+ * while the cluster carries no relay block, which a relay must treat as "not enabled yet"
87
+ * rather than as an origin it may invent.
88
+ */
89
+ export interface IClusterRelayRegistrationResponseV1 {
90
+ accepted: true;
91
+ origin: string | null;
32
92
  }
93
+ /**
94
+ * Validates one cluster relay block and names every reason it is refused.
95
+ *
96
+ * A relay whose origin cannot be trusted verbatim must never reach a node's
97
+ * identity store: it is the transport authority the node's runtime session
98
+ * registers over.
99
+ */
100
+ export declare const validateClusterRelayV1: (valueArg: unknown, pathArg?: string) => string[];
101
+ /**
102
+ * Validates one cluster relay registration and names every reason it is refused.
103
+ *
104
+ * Shape only, exactly like every other validator here: which cluster the relay speaks for comes
105
+ * from the verified identity on its socket, whether `relay.nodeId` is a node of that cluster is
106
+ * Cloudly's to decide against its own records, and whether this registration supersedes a live
107
+ * one is Cloudly's comparison of `registrationSequence` between peers. A registration that
108
+ * passes here has claimed nothing.
109
+ */
110
+ export declare const validateClusterRelayRegistrationV1: (valueArg: unknown, pathArg?: string) => string[];
111
+ /**
112
+ * The name the relay's certificate is issued for, and the A record Cloudly
113
+ * owns for it. Derived from the origin so every consumer derives it
114
+ * identically; an origin that names an address literal instead of a domain
115
+ * therefore has no issuable certificate.
116
+ */
117
+ export declare const clusterRelayCertificateDomainName: (relayArg: IClusterRelayV1) => string;
@@ -1,3 +1,139 @@
1
1
  import * as plugins from '../plugins.js';
2
2
  import {} from '../data/docker.js';
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2x1c3Rlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvY2x1c3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUV6QyxPQUFPLEVBQTRCLE1BQU0sbUJBQW1CLENBQUMifQ==
3
+ import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
4
+ const maximumClusterRelayOriginLength = 2048;
5
+ const maximumClusterRelayVersionLength = 64;
6
+ const isRecord = (valueArg) => (Boolean(valueArg)
7
+ && typeof valueArg === 'object'
8
+ && !Array.isArray(valueArg)
9
+ && (Object.getPrototypeOf(valueArg) === Object.prototype
10
+ || Object.getPrototypeOf(valueArg) === null));
11
+ const hasExactKeys = (valueArg, keysArg) => {
12
+ const actualKeys = Object.keys(valueArg).sort();
13
+ const expectedKeys = [...keysArg].sort();
14
+ return actualKeys.length === expectedKeys.length
15
+ && actualKeys.every((keyArg, indexArg) => keyArg === expectedKeys[indexArg]);
16
+ };
17
+ const validateClusterRelayOrigin = (valueArg, pathArg) => {
18
+ if (typeof valueArg !== 'string'
19
+ || valueArg.length === 0
20
+ || valueArg.length > maximumClusterRelayOriginLength) {
21
+ return [`${pathArg} must be a string of 1 to ${maximumClusterRelayOriginLength} characters`];
22
+ }
23
+ let parsedOrigin;
24
+ try {
25
+ parsedOrigin = new URL(valueArg);
26
+ }
27
+ catch {
28
+ return [`${pathArg} must be a parsable URL`];
29
+ }
30
+ const errors = [];
31
+ if (parsedOrigin.protocol !== 'https:') {
32
+ errors.push(`${pathArg} must use the https scheme`);
33
+ }
34
+ if (parsedOrigin.username || parsedOrigin.password) {
35
+ errors.push(`${pathArg} must not carry userinfo`);
36
+ }
37
+ if (parsedOrigin.origin !== valueArg) {
38
+ errors.push(`${pathArg} must be the canonical origin ${parsedOrigin.origin}, `
39
+ + 'without a path, query, fragment, trailing slash or default port');
40
+ }
41
+ return errors;
42
+ };
43
+ /**
44
+ * Validates one cluster relay block and names every reason it is refused.
45
+ *
46
+ * A relay whose origin cannot be trusted verbatim must never reach a node's
47
+ * identity store: it is the transport authority the node's runtime session
48
+ * registers over.
49
+ */
50
+ export const validateClusterRelayV1 = (valueArg, pathArg = 'cluster relay') => {
51
+ if (!isRecord(valueArg) || !hasExactKeys(valueArg, ['schemaVersion', 'origin'])) {
52
+ return [`${pathArg} must use its exact schema`];
53
+ }
54
+ const errors = [];
55
+ if (valueArg.schemaVersion !== 1) {
56
+ errors.push(`${pathArg} schemaVersion must be 1`);
57
+ }
58
+ errors.push(...validateClusterRelayOrigin(valueArg.origin, `${pathArg} origin`));
59
+ return errors;
60
+ };
61
+ const validateClusterRelayVersion = (valueArg, pathArg) => (typeof valueArg === 'string'
62
+ && valueArg.length <= maximumClusterRelayVersionLength
63
+ && /^[0-9A-Za-z][0-9A-Za-z.+_-]*$/.test(valueArg)
64
+ ? []
65
+ : [`${pathArg} must be 1 to ${maximumClusterRelayVersionLength} characters of letters, `
66
+ + 'digits, dot, plus, underscore or hyphen, starting with a letter or digit']);
67
+ /** The same node id rule a node's own runtime session registers under. */
68
+ const validateClusterRelayNodeId = (valueArg, pathArg) => (typeof valueArg === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(valueArg)
69
+ ? []
70
+ : [`${pathArg} must be 1 to 128 characters of letters, digits, underscore or hyphen`]);
71
+ const validateClusterRelayListenAddress = (valueArg, pathArg) => {
72
+ if (!isPlausibleUnicastIpv4(valueArg)) {
73
+ return [`${pathArg} must be a unicast IPv4 literal`];
74
+ }
75
+ // A relay that bound one of these can never serve the nodes of its cluster, and publishing
76
+ // it would put an unreachable address into every node's relay origin.
77
+ if (valueArg.startsWith('127.')) {
78
+ return [`${pathArg} must not be a loopback address`];
79
+ }
80
+ if (valueArg.startsWith('169.254.')) {
81
+ return [`${pathArg} must not be a link-local address`];
82
+ }
83
+ return [];
84
+ };
85
+ const validateClusterRelayListenPort = (valueArg, pathArg) => (typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg >= 1 && valueArg <= 65535
86
+ ? []
87
+ : [`${pathArg} must be an integer from 1 to 65535`]);
88
+ const validateClusterRelayEndpoint = (valueArg, pathArg) => {
89
+ if (!isRecord(valueArg)
90
+ || !hasExactKeys(valueArg, ['version', 'nodeId', 'listenAddress', 'listenPort'])) {
91
+ return [`${pathArg} must use its exact schema`];
92
+ }
93
+ return [
94
+ ...validateClusterRelayVersion(valueArg.version, `${pathArg} version`),
95
+ ...validateClusterRelayNodeId(valueArg.nodeId, `${pathArg} nodeId`),
96
+ ...validateClusterRelayListenAddress(valueArg.listenAddress, `${pathArg} listenAddress`),
97
+ ...validateClusterRelayListenPort(valueArg.listenPort, `${pathArg} listenPort`),
98
+ ];
99
+ };
100
+ /**
101
+ * Validates one cluster relay registration and names every reason it is refused.
102
+ *
103
+ * Shape only, exactly like every other validator here: which cluster the relay speaks for comes
104
+ * from the verified identity on its socket, whether `relay.nodeId` is a node of that cluster is
105
+ * Cloudly's to decide against its own records, and whether this registration supersedes a live
106
+ * one is Cloudly's comparison of `registrationSequence` between peers. A registration that
107
+ * passes here has claimed nothing.
108
+ */
109
+ export const validateClusterRelayRegistrationV1 = (valueArg, pathArg = 'cluster relay registration') => {
110
+ if (!isRecord(valueArg)
111
+ || !hasExactKeys(valueArg, ['schemaVersion', 'relay', 'registrationSequence'])) {
112
+ return [`${pathArg} must use its exact schema`];
113
+ }
114
+ const errors = [];
115
+ if (valueArg.schemaVersion !== 1) {
116
+ errors.push(`${pathArg} schemaVersion must be 1`);
117
+ }
118
+ errors.push(...validateClusterRelayEndpoint(valueArg.relay, `${pathArg} relay`));
119
+ if (typeof valueArg.registrationSequence !== 'number'
120
+ || !Number.isSafeInteger(valueArg.registrationSequence)
121
+ || valueArg.registrationSequence < 0) {
122
+ errors.push(`${pathArg} registrationSequence must be a non-negative safe integer`);
123
+ }
124
+ return errors;
125
+ };
126
+ /**
127
+ * The name the relay's certificate is issued for, and the A record Cloudly
128
+ * owns for it. Derived from the origin so every consumer derives it
129
+ * identically; an origin that names an address literal instead of a domain
130
+ * therefore has no issuable certificate.
131
+ */
132
+ export const clusterRelayCertificateDomainName = (relayArg) => {
133
+ const errors = validateClusterRelayV1(relayArg);
134
+ if (errors.length > 0) {
135
+ throw new Error(errors[0]);
136
+ }
137
+ return new URL(relayArg.origin).hostname;
138
+ };
139
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2x1c3Rlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RhdGEvY2x1c3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUV6QyxPQUFPLEVBQTRCLE1BQU0sbUJBQW1CLENBQUM7QUFFN0QsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUF1RzVELE1BQU0sK0JBQStCLEdBQUcsSUFBSSxDQUFDO0FBQzdDLE1BQU0sZ0NBQWdDLEdBQUcsRUFBRSxDQUFDO0FBRTVDLE1BQU0sUUFBUSxHQUFHLENBQUMsUUFBaUIsRUFBdUMsRUFBRSxDQUFDLENBQzNFLE9BQU8sQ0FBQyxRQUFRLENBQUM7T0FDZCxPQUFPLFFBQVEsS0FBSyxRQUFRO09BQzVCLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7T0FDeEIsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxLQUFLLE1BQU0sQ0FBQyxTQUFTO1dBQ25ELE1BQU0sQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLEtBQUssSUFBSSxDQUFDLENBQy9DLENBQUM7QUFFRixNQUFNLFlBQVksR0FBRyxDQUNuQixRQUFpQyxFQUNqQyxPQUEwQixFQUNqQixFQUFFO0lBQ1gsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNoRCxNQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekMsT0FBTyxVQUFVLENBQUMsTUFBTSxLQUFLLFlBQVksQ0FBQyxNQUFNO1dBQzNDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEtBQUssWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7QUFDakYsQ0FBQyxDQUFDO0FBRUYsTUFBTSwwQkFBMEIsR0FBRyxDQUFDLFFBQWlCLEVBQUUsT0FBZSxFQUFZLEVBQUU7SUFDbEYsSUFBSSxPQUFPLFFBQVEsS0FBSyxRQUFRO1dBQzNCLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQztXQUNyQixRQUFRLENBQUMsTUFBTSxHQUFHLCtCQUErQixFQUFFLENBQUM7UUFDdkQsT0FBTyxDQUFDLEdBQUcsT0FBTyw2QkFBNkIsK0JBQStCLGFBQWEsQ0FBQyxDQUFDO0lBQy9GLENBQUM7SUFDRCxJQUFJLFlBQWlCLENBQUM7SUFDdEIsSUFBSSxDQUFDO1FBQ0gsWUFBWSxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLENBQUMsR0FBRyxPQUFPLHlCQUF5QixDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUNELE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztJQUM1QixJQUFJLFlBQVksQ0FBQyxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sNEJBQTRCLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBQ0QsSUFBSSxZQUFZLENBQUMsUUFBUSxJQUFJLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNuRCxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTywwQkFBMEIsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFDRCxJQUFJLFlBQVksQ0FBQyxNQUFNLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDckMsTUFBTSxDQUFDLElBQUksQ0FDVCxHQUFHLE9BQU8saUNBQWlDLFlBQVksQ0FBQyxNQUFNLElBQUk7Y0FDOUQsaUVBQWlFLENBQ3RFLENBQUM7SUFDSixDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDO0FBRUY7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FDcEMsUUFBaUIsRUFDakIsT0FBTyxHQUFHLGVBQWUsRUFDZixFQUFFO0lBQ1osSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ2hGLE9BQU8sQ0FBQyxHQUFHLE9BQU8sNEJBQTRCLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBQ0QsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO0lBQzVCLElBQUksUUFBUSxDQUFDLGFBQWEsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNqQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTywwQkFBMEIsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsMEJBQTBCLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxHQUFHLE9BQU8sU0FBUyxDQUFDLENBQUMsQ0FBQztJQUNqRixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUM7QUFFRixNQUFNLDJCQUEyQixHQUFHLENBQUMsUUFBaUIsRUFBRSxPQUFlLEVBQVksRUFBRSxDQUFDLENBQ3BGLE9BQU8sUUFBUSxLQUFLLFFBQVE7T0FDdkIsUUFBUSxDQUFDLE1BQU0sSUFBSSxnQ0FBZ0M7T0FDbkQsK0JBQStCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUNqRCxDQUFDLENBQUMsRUFBRTtJQUNKLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxpQkFBaUIsZ0NBQWdDLDBCQUEwQjtjQUNwRiwwRUFBMEUsQ0FBQyxDQUNsRixDQUFDO0FBRUYsMEVBQTBFO0FBQzFFLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxRQUFpQixFQUFFLE9BQWUsRUFBWSxFQUFFLENBQUMsQ0FDbkYsT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLHdCQUF3QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDckUsQ0FBQyxDQUFDLEVBQUU7SUFDSixDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sdUVBQXVFLENBQUMsQ0FDeEYsQ0FBQztBQUVGLE1BQU0saUNBQWlDLEdBQUcsQ0FBQyxRQUFpQixFQUFFLE9BQWUsRUFBWSxFQUFFO0lBQ3pGLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3RDLE9BQU8sQ0FBQyxHQUFHLE9BQU8saUNBQWlDLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBQ0QsMkZBQTJGO0lBQzNGLHNFQUFzRTtJQUN0RSxJQUFJLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUNoQyxPQUFPLENBQUMsR0FBRyxPQUFPLGlDQUFpQyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUNELElBQUksUUFBUSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLE9BQU8sbUNBQW1DLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBQ0QsT0FBTyxFQUFFLENBQUM7QUFDWixDQUFDLENBQUM7QUFFRixNQUFNLDhCQUE4QixHQUFHLENBQUMsUUFBaUIsRUFBRSxPQUFlLEVBQVksRUFBRSxDQUFDLENBQ3ZGLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsSUFBSSxDQUFDLElBQUksUUFBUSxJQUFJLEtBQUs7SUFDbEcsQ0FBQyxDQUFDLEVBQUU7SUFDSixDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8scUNBQXFDLENBQUMsQ0FDdEQsQ0FBQztBQUVGLE1BQU0sNEJBQTRCLEdBQUcsQ0FBQyxRQUFpQixFQUFFLE9BQWUsRUFBWSxFQUFFO0lBQ3BGLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO1dBQ2xCLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNuRixPQUFPLENBQUMsR0FBRyxPQUFPLDRCQUE0QixDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUNELE9BQU87UUFDTCxHQUFHLDJCQUEyQixDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsR0FBRyxPQUFPLFVBQVUsQ0FBQztRQUN0RSxHQUFHLDBCQUEwQixDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsR0FBRyxPQUFPLFNBQVMsQ0FBQztRQUNuRSxHQUFHLGlDQUFpQyxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsR0FBRyxPQUFPLGdCQUFnQixDQUFDO1FBQ3hGLEdBQUcsOEJBQThCLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxHQUFHLE9BQU8sYUFBYSxDQUFDO0tBQ2hGLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtDQUFrQyxHQUFHLENBQ2hELFFBQWlCLEVBQ2pCLE9BQU8sR0FBRyw0QkFBNEIsRUFDNUIsRUFBRTtJQUNaLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO1dBQ2xCLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLGVBQWUsRUFBRSxPQUFPLEVBQUUsc0JBQXNCLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDakYsT0FBTyxDQUFDLEdBQUcsT0FBTyw0QkFBNEIsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBYSxFQUFFLENBQUM7SUFDNUIsSUFBSSxRQUFRLENBQUMsYUFBYSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLDBCQUEwQixDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyw0QkFBNEIsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEdBQUcsT0FBTyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2pGLElBQUksT0FBTyxRQUFRLENBQUMsb0JBQW9CLEtBQUssUUFBUTtXQUNoRCxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDO1dBQ3BELFFBQVEsQ0FBQyxvQkFBb0IsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN2QyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTywyREFBMkQsQ0FBQyxDQUFDO0lBQ3JGLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLGlDQUFpQyxHQUFHLENBQUMsUUFBeUIsRUFBVSxFQUFFO0lBQ3JGLE1BQU0sTUFBTSxHQUFHLHNCQUFzQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2hELElBQUksTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFDRCxPQUFPLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUM7QUFDM0MsQ0FBQyxDQUFDIn0=
@@ -1,3 +1,4 @@
1
+ import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
1
2
  export const privateNetworkV1Contract = Object.freeze({
2
3
  privateRoot: 'internal.',
3
4
  maximumAttachments: 16,
@@ -71,10 +72,7 @@ const sorted = (values) => {
71
72
  return values;
72
73
  };
73
74
  const ipv4 = (value) => {
74
- requireValue(typeof value === 'string');
75
- const parts = value.split('.');
76
- requireValue(parts.length === 4 && parts.every(part => /^(?:0|[1-9][0-9]{0,2})$/.test(part) && Number(part) <= 255));
77
- requireValue(Number(parts[0]) > 0 && Number(parts[0]) < 224 && value !== '255.255.255.255');
75
+ requireValue(isPlausibleUnicastIpv4(value));
78
76
  return value;
79
77
  };
80
78
  const publicSuffix = (value) => {
@@ -221,4 +219,4 @@ export const composeServicePrivateNetworkDnsPolicyV1 = (membershipValue, network
221
219
  return { organizationId: member.organizationId, serviceId: member.serviceId, membershipRevision: member.revision,
222
220
  networkSuffixes, searchDomains, externalDns };
223
221
  });
224
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"privatenetwork.js","sourceRoot":"","sources":["../../ts/data/privatenetwork.ts"],"names":[],"mappings":"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"}
222
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"privatenetwork.js","sourceRoot":"","sources":["../../ts/data/privatenetwork.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ /**
2
+ * The dotted-quad IPv4 form every consumer of this package agrees on.
3
+ *
4
+ * Shape only: an address that passes here is still neither routable, owned, reachable nor
5
+ * authorized. The rule refuses what can never be a unicast host address — a quad that is not
6
+ * canonical, the `0.0.0.0/8` unspecified block, and everything from `224.0.0.0` up, which is
7
+ * multicast and reserved space and therefore also covers the all-ones broadcast address.
8
+ */
9
+ export declare const isPlausibleUnicastIpv4: (valueArg: unknown) => valueArg is string;
@@ -0,0 +1,23 @@
1
+ /**
2
+ * The dotted-quad IPv4 form every consumer of this package agrees on.
3
+ *
4
+ * Shape only: an address that passes here is still neither routable, owned, reachable nor
5
+ * authorized. The rule refuses what can never be a unicast host address — a quad that is not
6
+ * canonical, the `0.0.0.0/8` unspecified block, and everything from `224.0.0.0` up, which is
7
+ * multicast and reserved space and therefore also covers the all-ones broadcast address.
8
+ */
9
+ export const isPlausibleUnicastIpv4 = (valueArg) => {
10
+ if (typeof valueArg !== 'string') {
11
+ return false;
12
+ }
13
+ const octets = valueArg.split('.');
14
+ if (octets.length !== 4) {
15
+ return false;
16
+ }
17
+ if (!octets.every((octetArg) => (/^(?:0|[1-9][0-9]{0,2})$/.test(octetArg) && Number(octetArg) <= 255))) {
18
+ return false;
19
+ }
20
+ const leadingOctet = Number(octets[0]);
21
+ return leadingOctet > 0 && leadingOctet < 224;
22
+ };
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXB2NC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3ByaXZhdGUvaXB2NC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxRQUFpQixFQUFzQixFQUFFO0lBQzlFLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDakMsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBQ0QsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDeEIsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQzlCLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUNwRSxDQUFDLEVBQUUsQ0FBQztRQUNILE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2QyxPQUFPLFlBQVksR0FBRyxDQUFDLElBQUksWUFBWSxHQUFHLEdBQUcsQ0FBQztBQUNoRCxDQUFDLENBQUMifQ==
@@ -48,6 +48,53 @@ export interface IReq_Any_Cloudly_UpdateCluster extends plugins.typedrequestInte
48
48
  resultCluster: clusterInterfaces.ICluster;
49
49
  };
50
50
  }
51
+ /**
52
+ * Enables this cluster's relay.
53
+ *
54
+ * Cloudly derives the relay origin itself from the cluster and its own public hostname, so a
55
+ * caller cannot name one, and refuses the request when no managed DNS zone matches that name.
56
+ * The response carries the block Cloudly published, which is the same block every cluster-side
57
+ * component then reads from `ICluster.data.relay`.
58
+ */
59
+ export interface IReq_Any_Cloudly_EnableClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_EnableClusterRelayV1> {
60
+ method: 'enableClusterRelayV1';
61
+ request: {
62
+ identity: userInterfaces.IIdentity;
63
+ clusterId: string;
64
+ };
65
+ response: {
66
+ relay: clusterInterfaces.IClusterRelayV1;
67
+ };
68
+ }
69
+ /**
70
+ * Disables this cluster's relay, removing the block from the cluster document.
71
+ *
72
+ * The nodes of the cluster target Cloudly directly again, so `relay` is explicitly `null` in
73
+ * the response rather than absent: the caller learns that the block is gone, not that the
74
+ * response forgot it.
75
+ */
76
+ export interface IReq_Any_Cloudly_DisableClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Any_Cloudly_DisableClusterRelayV1> {
77
+ method: 'disableClusterRelayV1';
78
+ request: {
79
+ identity: userInterfaces.IIdentity;
80
+ clusterId: string;
81
+ };
82
+ response: {
83
+ relay: null;
84
+ };
85
+ }
86
+ /**
87
+ * The cluster relay tells Cloudly where it listens, over its own authenticated socket.
88
+ *
89
+ * Sent after `registerCloudlyClientSessionV1`, so the cluster is the one the verified machine
90
+ * identity on that socket names and is never a request field. `Relay` names the role, not a
91
+ * component: whichever process fills it for a cluster sends this.
92
+ */
93
+ export interface IReq_Relay_Cloudly_RegisterClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Relay_Cloudly_RegisterClusterRelayV1> {
94
+ method: 'registerClusterRelayV1';
95
+ request: clusterInterfaces.IClusterRelayRegistrationV1;
96
+ response: clusterInterfaces.IClusterRelayRegistrationResponseV1;
97
+ }
51
98
  /**
52
99
  * deletes a cluster
53
100
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serve.zone/interfaces",
3
- "version": "31.1.0",
3
+ "version": "31.3.0",
4
4
  "private": false,
5
5
  "description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
6
6
  "exports": {
package/readme.md CHANGED
@@ -523,7 +523,9 @@ Existing numeric configurations retain their exact meaning and digest.
523
523
  `requests.runtimesession` defines `registerPalletRuntimeSessionV1`,
524
524
  `applyRuntimeAssignmentV1`, `reportRuntimeAssignmentObservationV1`, and
525
525
  `getRuntimeRegistryCredentialV1`. Pallet initiates WSS through its configured
526
- Cloudly HTTPS origin. The receiver derives the physical peer, process instance
526
+ Cloudly HTTPS origin, or, on a relayed cluster, through the relay origin its
527
+ cluster publishes in [`ICluster.data.relay`](#cluster-relay-block) while Cloudly
528
+ remains the credential authority. The receiver derives the physical peer, process instance
527
529
  and registration idempotency; callers cannot supply those authorities. A serialized
528
530
  `IRuntimeSessionBindingV1` provides content to compare with authenticated peer
529
531
  state and does not itself authenticate a connection. Registry credentials are
@@ -1054,7 +1056,8 @@ const service: data.IService = {
1054
1056
 
1055
1057
  Common data contracts include:
1056
1058
 
1057
- - `ICluster` and `IClusterNode` for cluster membership and provisioning state.
1059
+ - `ICluster` and `IClusterNode` for cluster membership and provisioning state, including the
1060
+ optional `ICluster.data.relay` block described below.
1058
1061
  - `IService`, `IDeployment`, `IImage`, `IRegistryTarget`, and `IExternalRegistry` for workload delivery.
1059
1062
  - Service port contracts including `IServiceTargetPort`, `IServiceDomainRoute`, and `IServicePublicPortMapping` for canonical backend targets, domain target references, and edge/Coretraffic TCP/UDP public exposure.
1060
1063
  - `IDomain`, `IDnsEntry`, and traffic contracts for routing and DNS management.
@@ -1080,6 +1083,77 @@ Common data contracts include:
1080
1083
  - `IUser`, JWT-only `IIdentityCredential`, full `IIdentity`, and token-related contracts for authentication context. `IIdentity` extends `IIdentityCredential` with server-issued user metadata.
1081
1084
  - `ICloudlyConfig`, `ICloudlySettings`, status, server, bare-metal, BaseOS, backup, and task execution interfaces for control-plane state.
1082
1085
 
1086
+ ### Cluster Relay Block
1087
+
1088
+ `ICluster.data.relay` is the optional `IClusterRelayV1 { schemaVersion: 1; origin: string }`
1089
+ that states how cluster-side components reach this cluster's relay. It is absent on a cluster
1090
+ whose nodes still target Cloudly directly, so its presence is what marks a cluster as relayed.
1091
+
1092
+ `origin` is the exact value a Pallet node stores as its `relayOrigin` — the origin its runtime
1093
+ session registers over, as described in [Authenticated Runtime Sessions](#authenticated-runtime-sessions).
1094
+ It must be an `https:` origin with no path, query, fragment, userinfo or trailing slash, so that
1095
+ `new URL(origin).origin === origin`; an explicit port is allowed, and because `URL` drops a
1096
+ default port and lowercases the host, `https://relay.example:443` and `https://Relay.example`
1097
+ are not canonical origins. `validateClusterRelayV1(value, path?)` returns one named reason per
1098
+ violation and an empty array for a valid block.
1099
+
1100
+ The relay's certificate subject is not a second field: every consumer derives it from the origin
1101
+ with `clusterRelayCertificateDomainName(relay)`, which returns the origin's hostname — the name
1102
+ Cloudly issues the certificate for and owns the A record for. An origin naming an address literal
1103
+ therefore has no issuable certificate.
1104
+
1105
+ ```typescript
1106
+ const relay: data.IClusterRelayV1 = {
1107
+ schemaVersion: 1,
1108
+ origin: 'https://relay.cluster-a.serve.zone:8443',
1109
+ };
1110
+
1111
+ const reasons = data.validateClusterRelayV1(relay); // []
1112
+ const certificateDomainName = data.clusterRelayCertificateDomainName(relay);
1113
+ // 'relay.cluster-a.serve.zone'
1114
+ ```
1115
+
1116
+ Enabling a relay is one operator flip per cluster. `enableClusterRelayV1 { identity, clusterId }`
1117
+ answers with the block Cloudly published, and `disableClusterRelayV1` removes it and answers with
1118
+ an explicit `relay: null`. The caller names only the cluster: Cloudly derives the origin itself
1119
+ from that cluster and its own public hostname, and refuses the request when no DNS zone it
1120
+ manages matches the derived name, so a relay name that nothing can publish is never written.
1121
+
1122
+ Once its socket is authenticated with `registerCloudlyClientSessionV1`, the relay sends
1123
+ `registerClusterRelayV1` carrying `IClusterRelayRegistrationV1`: the relay build, the cluster node
1124
+ it runs on, the exact endpoint it bound for its cluster's Pallet nodes, and a
1125
+ `registrationSequence` that counts up once per registration within one relay process and restarts
1126
+ at `0` when that process restarts. `validateClusterRelayRegistrationV1(value, path?)` returns one
1127
+ named reason per violation, like every validator here, and checks shape only. `listenAddress` is
1128
+ an IPv4 literal because Cloudly publishes it verbatim as the A record of the relay's certificate
1129
+ domain name — a hostname would need a `CNAME` and an IPv6 address an `AAAA` record, so admitting
1130
+ either is an additive change once Cloudly publishes it. A loopback or link-local address is
1131
+ refused by its own name, because a relay that bound one can never serve the nodes of its cluster.
1132
+
1133
+ Authority stays with Cloudly, and none of it is a request field. The cluster is the one the
1134
+ verified machine identity on that socket names; whether `relay.nodeId` is a node of that cluster
1135
+ is decided against Cloudly's own records; and one cluster has one relay, so when two peers are
1136
+ live the one holding the highest accepted `registrationSequence` is the relay and the other is
1137
+ never selected. The response carries the origin Cloudly published, or `null` while the cluster
1138
+ carries no relay block, which a relay must read as "not enabled yet" rather than as licence to
1139
+ invent an origin: it is how the relay checks that the certificate it holds and the name its nodes
1140
+ are told to reach are the same one.
1141
+
1142
+ ```typescript
1143
+ const registration: data.IClusterRelayRegistrationV1 = {
1144
+ schemaVersion: 1,
1145
+ relay: {
1146
+ version: '4.0.0',
1147
+ nodeId: 'node-a',
1148
+ listenAddress: '10.0.4.7',
1149
+ listenPort: 8443,
1150
+ },
1151
+ registrationSequence: 0,
1152
+ };
1153
+
1154
+ const registrationReasons = data.validateClusterRelayRegistrationV1(registration); // []
1155
+ ```
1156
+
1083
1157
  Shared service port helpers are exported from `data` so Cloudly, App Store resolution, Coreflow, Coretraffic, Onebox, and dcrouter agree on the same normalization rules:
1084
1158
 
1085
1159
  ```typescript
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/interfaces',
6
- version: '31.1.0',
6
+ version: '31.3.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
8
8
  }
@@ -2,6 +2,7 @@ import * as plugins from '../plugins.js';
2
2
 
3
3
  import { type IDockerRegistryInfo } from '../data/docker.js';
4
4
  import type { IClusterNode } from './clusternode.js';
5
+ import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
5
6
 
6
7
  export interface ICluster {
7
8
  id: string;
@@ -37,5 +38,234 @@ export interface ICluster {
37
38
  };
38
39
 
39
40
  sshKeys: plugins.tsclass.network.ISshKey[];
41
+
42
+ /**
43
+ * How cluster-side components reach this cluster's relay. Absent on a
44
+ * cluster whose nodes still target Cloudly directly.
45
+ */
46
+ relay?: IClusterRelayV1;
47
+ };
48
+ }
49
+
50
+ /**
51
+ * How cluster-side components reach this cluster's relay.
52
+ *
53
+ * `origin` is the exact value a Pallet node stores as its `relayOrigin`: an
54
+ * `https:` origin, an explicit port allowed, with no path, no query, no
55
+ * fragment, no userinfo and no trailing slash, so that
56
+ * `new URL(origin).origin === origin`. A default `:443` is therefore written
57
+ * implicitly, because `URL` drops it from the origin it computes.
58
+ */
59
+ export interface IClusterRelayV1 {
60
+ schemaVersion: 1;
61
+ origin: string;
62
+ }
63
+
64
+ /**
65
+ * What a cluster relay tells Cloudly about itself once its socket is authenticated.
66
+ *
67
+ * The relay sends this after `registerCloudlyClientSessionV1`, so the cluster it registers for
68
+ * is the one its verified machine identity names and is never a field here. `relay.nodeId` is
69
+ * the cluster node the relay process runs on, `listenAddress` and `listenPort` are the exact
70
+ * endpoint it bound for the Pallet nodes of its cluster, and `registrationSequence` counts up
71
+ * once per registration within one relay process, so Cloudly can tell a newer registration from
72
+ * a replayed older one while both peers are live.
73
+ */
74
+ export interface IClusterRelayRegistrationV1 {
75
+ schemaVersion: 1;
76
+ relay: {
77
+ /** The relay build that is registering; a bounded label for operators and logs. */
78
+ version: string;
79
+ nodeId: string;
80
+ /**
81
+ * The address the relay bound, as an IPv4 literal.
82
+ *
83
+ * Cloudly publishes this value verbatim as the A record of the relay's certificate domain
84
+ * name, so the contract admits exactly what that record can carry: a hostname would need a
85
+ * `CNAME` and an IPv6 address an `AAAA` record, and neither is published today. Admitting
86
+ * either is an additive change once Cloudly publishes it.
87
+ */
88
+ listenAddress: string;
89
+ listenPort: number;
40
90
  };
91
+ /** Monotonic within one relay process; it restarts at 0 when the process restarts. */
92
+ registrationSequence: number;
93
+ }
94
+
95
+ /**
96
+ * What Cloudly tells the relay back.
97
+ *
98
+ * `origin` is the origin Cloudly has published for this cluster, so a relay can check that the
99
+ * certificate it holds and the name its nodes are told to reach are the same one. It is `null`
100
+ * while the cluster carries no relay block, which a relay must treat as "not enabled yet"
101
+ * rather than as an origin it may invent.
102
+ */
103
+ export interface IClusterRelayRegistrationResponseV1 {
104
+ accepted: true;
105
+ origin: string | null;
41
106
  }
107
+
108
+ const maximumClusterRelayOriginLength = 2048;
109
+ const maximumClusterRelayVersionLength = 64;
110
+
111
+ const isRecord = (valueArg: unknown): valueArg is Record<string, unknown> => (
112
+ Boolean(valueArg)
113
+ && typeof valueArg === 'object'
114
+ && !Array.isArray(valueArg)
115
+ && (Object.getPrototypeOf(valueArg) === Object.prototype
116
+ || Object.getPrototypeOf(valueArg) === null)
117
+ );
118
+
119
+ const hasExactKeys = (
120
+ valueArg: Record<string, unknown>,
121
+ keysArg: readonly string[],
122
+ ): boolean => {
123
+ const actualKeys = Object.keys(valueArg).sort();
124
+ const expectedKeys = [...keysArg].sort();
125
+ return actualKeys.length === expectedKeys.length
126
+ && actualKeys.every((keyArg, indexArg) => keyArg === expectedKeys[indexArg]);
127
+ };
128
+
129
+ const validateClusterRelayOrigin = (valueArg: unknown, pathArg: string): string[] => {
130
+ if (typeof valueArg !== 'string'
131
+ || valueArg.length === 0
132
+ || valueArg.length > maximumClusterRelayOriginLength) {
133
+ return [`${pathArg} must be a string of 1 to ${maximumClusterRelayOriginLength} characters`];
134
+ }
135
+ let parsedOrigin: URL;
136
+ try {
137
+ parsedOrigin = new URL(valueArg);
138
+ } catch {
139
+ return [`${pathArg} must be a parsable URL`];
140
+ }
141
+ const errors: string[] = [];
142
+ if (parsedOrigin.protocol !== 'https:') {
143
+ errors.push(`${pathArg} must use the https scheme`);
144
+ }
145
+ if (parsedOrigin.username || parsedOrigin.password) {
146
+ errors.push(`${pathArg} must not carry userinfo`);
147
+ }
148
+ if (parsedOrigin.origin !== valueArg) {
149
+ errors.push(
150
+ `${pathArg} must be the canonical origin ${parsedOrigin.origin}, `
151
+ + 'without a path, query, fragment, trailing slash or default port',
152
+ );
153
+ }
154
+ return errors;
155
+ };
156
+
157
+ /**
158
+ * Validates one cluster relay block and names every reason it is refused.
159
+ *
160
+ * A relay whose origin cannot be trusted verbatim must never reach a node's
161
+ * identity store: it is the transport authority the node's runtime session
162
+ * registers over.
163
+ */
164
+ export const validateClusterRelayV1 = (
165
+ valueArg: unknown,
166
+ pathArg = 'cluster relay',
167
+ ): string[] => {
168
+ if (!isRecord(valueArg) || !hasExactKeys(valueArg, ['schemaVersion', 'origin'])) {
169
+ return [`${pathArg} must use its exact schema`];
170
+ }
171
+ const errors: string[] = [];
172
+ if (valueArg.schemaVersion !== 1) {
173
+ errors.push(`${pathArg} schemaVersion must be 1`);
174
+ }
175
+ errors.push(...validateClusterRelayOrigin(valueArg.origin, `${pathArg} origin`));
176
+ return errors;
177
+ };
178
+
179
+ const validateClusterRelayVersion = (valueArg: unknown, pathArg: string): string[] => (
180
+ typeof valueArg === 'string'
181
+ && valueArg.length <= maximumClusterRelayVersionLength
182
+ && /^[0-9A-Za-z][0-9A-Za-z.+_-]*$/.test(valueArg)
183
+ ? []
184
+ : [`${pathArg} must be 1 to ${maximumClusterRelayVersionLength} characters of letters, `
185
+ + 'digits, dot, plus, underscore or hyphen, starting with a letter or digit']
186
+ );
187
+
188
+ /** The same node id rule a node's own runtime session registers under. */
189
+ const validateClusterRelayNodeId = (valueArg: unknown, pathArg: string): string[] => (
190
+ typeof valueArg === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(valueArg)
191
+ ? []
192
+ : [`${pathArg} must be 1 to 128 characters of letters, digits, underscore or hyphen`]
193
+ );
194
+
195
+ const validateClusterRelayListenAddress = (valueArg: unknown, pathArg: string): string[] => {
196
+ if (!isPlausibleUnicastIpv4(valueArg)) {
197
+ return [`${pathArg} must be a unicast IPv4 literal`];
198
+ }
199
+ // A relay that bound one of these can never serve the nodes of its cluster, and publishing
200
+ // it would put an unreachable address into every node's relay origin.
201
+ if (valueArg.startsWith('127.')) {
202
+ return [`${pathArg} must not be a loopback address`];
203
+ }
204
+ if (valueArg.startsWith('169.254.')) {
205
+ return [`${pathArg} must not be a link-local address`];
206
+ }
207
+ return [];
208
+ };
209
+
210
+ const validateClusterRelayListenPort = (valueArg: unknown, pathArg: string): string[] => (
211
+ typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg >= 1 && valueArg <= 65535
212
+ ? []
213
+ : [`${pathArg} must be an integer from 1 to 65535`]
214
+ );
215
+
216
+ const validateClusterRelayEndpoint = (valueArg: unknown, pathArg: string): string[] => {
217
+ if (!isRecord(valueArg)
218
+ || !hasExactKeys(valueArg, ['version', 'nodeId', 'listenAddress', 'listenPort'])) {
219
+ return [`${pathArg} must use its exact schema`];
220
+ }
221
+ return [
222
+ ...validateClusterRelayVersion(valueArg.version, `${pathArg} version`),
223
+ ...validateClusterRelayNodeId(valueArg.nodeId, `${pathArg} nodeId`),
224
+ ...validateClusterRelayListenAddress(valueArg.listenAddress, `${pathArg} listenAddress`),
225
+ ...validateClusterRelayListenPort(valueArg.listenPort, `${pathArg} listenPort`),
226
+ ];
227
+ };
228
+
229
+ /**
230
+ * Validates one cluster relay registration and names every reason it is refused.
231
+ *
232
+ * Shape only, exactly like every other validator here: which cluster the relay speaks for comes
233
+ * from the verified identity on its socket, whether `relay.nodeId` is a node of that cluster is
234
+ * Cloudly's to decide against its own records, and whether this registration supersedes a live
235
+ * one is Cloudly's comparison of `registrationSequence` between peers. A registration that
236
+ * passes here has claimed nothing.
237
+ */
238
+ export const validateClusterRelayRegistrationV1 = (
239
+ valueArg: unknown,
240
+ pathArg = 'cluster relay registration',
241
+ ): string[] => {
242
+ if (!isRecord(valueArg)
243
+ || !hasExactKeys(valueArg, ['schemaVersion', 'relay', 'registrationSequence'])) {
244
+ return [`${pathArg} must use its exact schema`];
245
+ }
246
+ const errors: string[] = [];
247
+ if (valueArg.schemaVersion !== 1) {
248
+ errors.push(`${pathArg} schemaVersion must be 1`);
249
+ }
250
+ errors.push(...validateClusterRelayEndpoint(valueArg.relay, `${pathArg} relay`));
251
+ if (typeof valueArg.registrationSequence !== 'number'
252
+ || !Number.isSafeInteger(valueArg.registrationSequence)
253
+ || valueArg.registrationSequence < 0) {
254
+ errors.push(`${pathArg} registrationSequence must be a non-negative safe integer`);
255
+ }
256
+ return errors;
257
+ };
258
+
259
+ /**
260
+ * The name the relay's certificate is issued for, and the A record Cloudly
261
+ * owns for it. Derived from the origin so every consumer derives it
262
+ * identically; an origin that names an address literal instead of a domain
263
+ * therefore has no issuable certificate.
264
+ */
265
+ export const clusterRelayCertificateDomainName = (relayArg: IClusterRelayV1): string => {
266
+ const errors = validateClusterRelayV1(relayArg);
267
+ if (errors.length > 0) {
268
+ throw new Error(errors[0]);
269
+ }
270
+ return new URL(relayArg.origin).hostname;
271
+ };
@@ -1,3 +1,5 @@
1
+ import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
2
+
1
3
  /** Cloudly owns these definitions. Membership never follows node placement. */
2
4
  export interface IPrivateNetworkPolicyV1 {
3
5
  connectivity: 'member-full-mesh';
@@ -133,10 +135,7 @@ const sorted = (values: string[]): string[] => {
133
135
  return values;
134
136
  };
135
137
  const ipv4 = (value: unknown): string => {
136
- requireValue(typeof value === 'string');
137
- const parts = value.split('.');
138
- requireValue(parts.length === 4 && parts.every(part => /^(?:0|[1-9][0-9]{0,2})$/.test(part) && Number(part) <= 255));
139
- requireValue(Number(parts[0]) > 0 && Number(parts[0]) < 224 && value !== '255.255.255.255');
138
+ requireValue(isPlausibleUnicastIpv4(value));
140
139
  return value;
141
140
  };
142
141
  const publicSuffix = (value: unknown): string => {
@@ -0,0 +1,24 @@
1
+ /**
2
+ * The dotted-quad IPv4 form every consumer of this package agrees on.
3
+ *
4
+ * Shape only: an address that passes here is still neither routable, owned, reachable nor
5
+ * authorized. The rule refuses what can never be a unicast host address — a quad that is not
6
+ * canonical, the `0.0.0.0/8` unspecified block, and everything from `224.0.0.0` up, which is
7
+ * multicast and reserved space and therefore also covers the all-ones broadcast address.
8
+ */
9
+ export const isPlausibleUnicastIpv4 = (valueArg: unknown): valueArg is string => {
10
+ if (typeof valueArg !== 'string') {
11
+ return false;
12
+ }
13
+ const octets = valueArg.split('.');
14
+ if (octets.length !== 4) {
15
+ return false;
16
+ }
17
+ if (!octets.every((octetArg) => (
18
+ /^(?:0|[1-9][0-9]{0,2})$/.test(octetArg) && Number(octetArg) <= 255
19
+ ))) {
20
+ return false;
21
+ }
22
+ const leadingOctet = Number(octets[0]);
23
+ return leadingOctet > 0 && leadingOctet < 224;
24
+ };
@@ -66,6 +66,65 @@ export interface IReq_Any_Cloudly_UpdateCluster extends plugins.typedrequestInte
66
66
  };
67
67
  }
68
68
 
69
+ /**
70
+ * Enables this cluster's relay.
71
+ *
72
+ * Cloudly derives the relay origin itself from the cluster and its own public hostname, so a
73
+ * caller cannot name one, and refuses the request when no managed DNS zone matches that name.
74
+ * The response carries the block Cloudly published, which is the same block every cluster-side
75
+ * component then reads from `ICluster.data.relay`.
76
+ */
77
+ export interface IReq_Any_Cloudly_EnableClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<
78
+ plugins.typedrequestInterfaces.ITypedRequest,
79
+ IReq_Any_Cloudly_EnableClusterRelayV1
80
+ > {
81
+ method: 'enableClusterRelayV1';
82
+ request: {
83
+ identity: userInterfaces.IIdentity;
84
+ clusterId: string;
85
+ };
86
+ response: {
87
+ relay: clusterInterfaces.IClusterRelayV1;
88
+ };
89
+ }
90
+
91
+ /**
92
+ * Disables this cluster's relay, removing the block from the cluster document.
93
+ *
94
+ * The nodes of the cluster target Cloudly directly again, so `relay` is explicitly `null` in
95
+ * the response rather than absent: the caller learns that the block is gone, not that the
96
+ * response forgot it.
97
+ */
98
+ export interface IReq_Any_Cloudly_DisableClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<
99
+ plugins.typedrequestInterfaces.ITypedRequest,
100
+ IReq_Any_Cloudly_DisableClusterRelayV1
101
+ > {
102
+ method: 'disableClusterRelayV1';
103
+ request: {
104
+ identity: userInterfaces.IIdentity;
105
+ clusterId: string;
106
+ };
107
+ response: {
108
+ relay: null;
109
+ };
110
+ }
111
+
112
+ /**
113
+ * The cluster relay tells Cloudly where it listens, over its own authenticated socket.
114
+ *
115
+ * Sent after `registerCloudlyClientSessionV1`, so the cluster is the one the verified machine
116
+ * identity on that socket names and is never a request field. `Relay` names the role, not a
117
+ * component: whichever process fills it for a cluster sends this.
118
+ */
119
+ export interface IReq_Relay_Cloudly_RegisterClusterRelayV1 extends plugins.typedrequestInterfaces.implementsTR<
120
+ plugins.typedrequestInterfaces.ITypedRequest,
121
+ IReq_Relay_Cloudly_RegisterClusterRelayV1
122
+ > {
123
+ method: 'registerClusterRelayV1';
124
+ request: clusterInterfaces.IClusterRelayRegistrationV1;
125
+ response: clusterInterfaces.IClusterRelayRegistrationResponseV1;
126
+ }
127
+
69
128
  /**
70
129
  * deletes a cluster
71
130
  */