@serve.zone/interfaces 32.3.0 → 32.5.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 +88 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/cluster.d.ts +30 -0
- package/dist_ts/data/cluster.js +48 -3
- package/dist_ts/data/clusteringress.js +9 -8
- package/dist_ts/data/clusternode.d.ts +6 -1
- package/dist_ts/data/clusternode.js +32 -5
- package/dist_ts/data/clustervpn.d.ts +135 -0
- package/dist_ts/data/clustervpn.js +147 -0
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/isolatedrestore.js +12 -4
- package/dist_ts/data/networkaddressplan.d.ts +54 -11
- package/dist_ts/data/networkaddressplan.js +67 -23
- package/dist_ts/data/networkauthority.js +9 -3
- package/dist_ts/data/networkcredential.d.ts +13 -4
- package/dist_ts/data/networkcredential.js +41 -23
- package/dist_ts/data/networklease.js +3 -3
- package/dist_ts/data/networknode.js +3 -3
- package/dist_ts/data/networkprojection.js +8 -3
- package/dist_ts/data/nodeenrollment.js +4 -2
- package/dist_ts/data/noderetirement.js +3 -3
- package/dist_ts/data/runtimeassignment.d.ts +35 -0
- package/dist_ts/data/runtimeassignment.js +70 -10
- package/dist_ts/data/runtimesession.js +3 -2
- package/dist_ts/data/serviceruntime.js +6 -5
- package/dist_ts/data/sparknodereport.js +6 -3
- package/dist_ts/private/networkcontract.d.ts +8 -0
- package/dist_ts/private/networkcontract.js +19 -2
- package/dist_ts/private/nodeidentifier.d.ts +22 -0
- package/dist_ts/private/nodeidentifier.js +23 -0
- package/dist_ts/requests/cluster.d.ts +27 -0
- package/dist_ts/requests/cluster.js +1 -1
- package/dist_ts/requests/corestore.js +4 -4
- package/dist_ts/runtime.js +7 -4
- package/package.json +1 -1
- package/readme.md +132 -21
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/cluster.ts +78 -2
- package/ts/data/clusteringress.ts +8 -7
- package/ts/data/clusternode.ts +32 -4
- package/ts/data/clustervpn.ts +248 -0
- package/ts/data/index.ts +1 -0
- package/ts/data/isolatedrestore.ts +12 -3
- package/ts/data/networkaddressplan.ts +103 -27
- package/ts/data/networkauthority.ts +8 -2
- package/ts/data/networkcredential.ts +52 -24
- package/ts/data/networklease.ts +2 -2
- package/ts/data/networknode.ts +2 -2
- package/ts/data/networkprojection.ts +6 -2
- package/ts/data/nodeenrollment.ts +4 -2
- package/ts/data/noderetirement.ts +2 -2
- package/ts/data/runtimeassignment.ts +84 -8
- package/ts/data/runtimesession.ts +3 -2
- package/ts/data/serviceruntime.ts +6 -5
- package/ts/data/sparknodereport.ts +7 -2
- package/ts/private/networkcontract.ts +17 -1
- package/ts/private/nodeidentifier.ts +25 -0
- package/ts/requests/cluster.ts +35 -0
- package/ts/requests/corestore.ts +3 -3
- package/ts/runtime.ts +6 -3
package/changelog.md
CHANGED
|
@@ -1,5 +1,93 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-19 - 32.5.0
|
|
4
|
+
|
|
5
|
+
### Fixes
|
|
6
|
+
|
|
7
|
+
- One vocabulary now judges a node id in every contract that carries one. These contracts
|
|
8
|
+
disagreed with themselves: enrollment, the runtime session registration and the Spark wire admit
|
|
9
|
+
a node id that begins with `-` or `_`, while the assignment, the runtime network scope, the protected authority's egress owners, the handoff lease, the DNS-lease renewal
|
|
10
|
+
run, the cluster VPN membership, the router incarnation, the node retirement, the service spec's
|
|
11
|
+
pinned nodes, the Spark and Swarm routes, the cluster ingress, the Corestore inventory and the
|
|
12
|
+
isolated-restore node controls read the same id in the canonical identifier vocabulary and refused
|
|
13
|
+
it. A node could enrol and register and then be refused an assignment and a runtime network, and
|
|
14
|
+
`composeRuntimeNetworkProtectedAuthority` refused a whole cluster's protection pass because one
|
|
15
|
+
egress owner was named that way. A controller now keeps the first character alphanumeric where it
|
|
16
|
+
mints a node id, so what this unification serves is the ids already stored under the members that
|
|
17
|
+
admit them. Every one of those members now reads the node vocabulary, `^[A-Za-z0-9_-]{1,128}$`.
|
|
18
|
+
The canonical identifier vocabulary is unchanged, and no member that names something other than a
|
|
19
|
+
node changed. Consequently a node id that only the canonical vocabulary admitted — one containing
|
|
20
|
+
`:` or `.`, or longer than 128 characters — is now refused by name wherever it was previously
|
|
21
|
+
accepted; no controller mints such an id. The assignment `replicaId` and the workload lease
|
|
22
|
+
`replicaId` narrow with it: a composed name whose node part only the canonical vocabulary admits
|
|
23
|
+
— `node:a.0`, `node-a.x.0`, or a node part longer than 128 characters — is now refused where it
|
|
24
|
+
was accepted, and no producer composes one. A name whose last dotted segment is not an index —
|
|
25
|
+
the zero-padded `node-a.01` among them — is not a composed name and is still read whole in the
|
|
26
|
+
canonical identifier vocabulary, exactly as before.
|
|
27
|
+
|
|
28
|
+
- `data.validateSparkSwarmNodeHeartbeatRequest` now refuses a heartbeat whose `runtimeInfo.nodeId`
|
|
29
|
+
differs from the body's `nodeId`, naming both members. The bearer authenticates the node the
|
|
30
|
+
envelope names, so a runtime info naming another node reported that node's Docker, Cloudly
|
|
31
|
+
connection and services under a credential it never held; the rule was Cloudly's alone, which
|
|
32
|
+
left a second reader of these bodies free to accept one. The metrics sample, the action result and
|
|
33
|
+
the Swarm observation carry no second node id of ours — their nested ids are Docker Swarm's — so
|
|
34
|
+
nothing else gained a binding.
|
|
35
|
+
|
|
36
|
+
### Features
|
|
37
|
+
|
|
38
|
+
- `data.isClusterNodeId(value)` is the exported reader for that vocabulary, so a service that stores
|
|
39
|
+
or forwards a node id judges it exactly as these contracts do.
|
|
40
|
+
- `data.isRuntimeReplicaId(value)` is the exported reader for a replica id. A producer names a
|
|
41
|
+
replica slot `<node id>.<index>` from zero, so a composed name is read by decomposition — the node
|
|
42
|
+
part in the node vocabulary, the index on its own and never zero-padded — and a name carrying no
|
|
43
|
+
such index stays an opaque slot name in the canonical identifier vocabulary.
|
|
44
|
+
|
|
45
|
+
## 2026-09-19 - 32.4.0
|
|
46
|
+
|
|
47
|
+
### Features
|
|
48
|
+
|
|
49
|
+
- This minor removes rather than deprecates `data.IRuntimeNetworkAddressPlan.vpn.relay`,
|
|
50
|
+
`data.runtimeNetworkAddressPlanContract.relayProtocol` and
|
|
51
|
+
`data.IGetRuntimeManagedVpnCredentialResponse.relay`, which stays a minor of the one common
|
|
52
|
+
major 32 because no shipped store holds an address-plan row and a peer that still speaks the old
|
|
53
|
+
shapes is fenced by the session handshake, each server raising its own `minimumPeerVersion` for
|
|
54
|
+
`clusterRelay` and `palletRuntime` in its own commit.
|
|
55
|
+
- The managed VPN moves from one platform-wide endpoint to a hub per cluster, carried by that
|
|
56
|
+
cluster's own relay. `data.IRuntimeNetworkAddressPlan.vpn` is now
|
|
57
|
+
`{ controlPrefix, hubPrefix }`: `hubPrefix` is the protected prefix every cluster hub binds
|
|
58
|
+
inside, and the endpoints are no longer administrator input. `runtimeNetworkAddressPlanContract`
|
|
59
|
+
replaces `relayProtocol` with `hubTransports`, the one table that states each transport's endpoint
|
|
60
|
+
id suffix and protocol, and `data.runtimeNetworkVpnHubEndpoints(hub)` is the one derivation of
|
|
61
|
+
what one `data.IRuntimeNetworkVpnHub { clusterId, address, quicPort, websocketPort }` contributes:
|
|
62
|
+
`<clusterId>:quic` on `udp` and `<clusterId>:ws` on `tcp`.
|
|
63
|
+
`composeRuntimeNetworkProtectedAuthority(plan, frame, hubs)` takes those hubs as its third
|
|
64
|
+
argument and requires each address inside `vpn.hubPrefix`, with one hub per cluster; 32 clusters
|
|
65
|
+
fit one authority's 64 platform endpoints. `plan-vpn-immutable` now guards both prefixes.
|
|
66
|
+
- `data.IGetRuntimeManagedVpnCredentialResponse` names the cluster hub it sends a node to: `relay`
|
|
67
|
+
becomes `hub`, `transport` widens to `'quic' | 'websocket'`, and the new optional `serverName` is
|
|
68
|
+
present exactly when the transport is `websocket` — the TLS name that hub is dialled under, which
|
|
69
|
+
the node cross-checks against the relay origin it stores. The binder requires the selected
|
|
70
|
+
endpoint to carry the protocol of the credential's transport, so a relay still cannot name itself.
|
|
71
|
+
- `data.IRegisterClusterRelayRequest.relay.vpnHub` is the optional
|
|
72
|
+
`data.IClusterRelayVpnHub { publicKey, address, quicPort, websocketPort }` a relay reports from its
|
|
73
|
+
own bind, validated by `data.validateClusterRelayVpnHub`. A relay that serves no hub registers
|
|
74
|
+
exactly as before, and Cloudly states `relay-vpn-hub-absent` for that cluster.
|
|
75
|
+
- Add `data.IClusterVpnNetwork { authorityId, revision, nodes, grants }`, the complete managed VPN of
|
|
76
|
+
one cluster, with `snapshotClusterVpnNetwork`, `admitClusterVpnNetwork(held | null, next)`,
|
|
77
|
+
`clusterVpnControlPolicyDomain`, `clusterVpnWorkloadPolicyDomain` and `clusterVpnNetworkContract`.
|
|
78
|
+
Every grant must join two workload domains the network itself carries, on two different nodes, so a
|
|
79
|
+
cross-cluster grant cannot be expressed; Cloudly refuses it by name while it compiles.
|
|
80
|
+
- Add the two carriers on the relay's own session: `requests.cluster.applyClusterVpnNetwork`
|
|
81
|
+
(`{ network }` → `{ appliedRevision, state }`, with `bindApplyClusterVpnNetworkResponse`) and
|
|
82
|
+
`requests.cluster.getClusterVpnNetwork` (no request body → `{ network }` or `{ network: null }`),
|
|
83
|
+
plus the refusal vocabularies `data.applyClusterVpnNetworkRefusals` and
|
|
84
|
+
`data.clusterVpnNetworkSelectionRefusals`.
|
|
85
|
+
- `data.IRuntimeAssignment.workload.pullEndpoint` is the optional `host[:port]` a node fetches the
|
|
86
|
+
image from instead of the publishing `registryHost`, and
|
|
87
|
+
`data.buildRuntimeAssignmentImageReference(workload)` is the one place that choice is made. The
|
|
88
|
+
reference stays digest-pinned, so the endpoint decides reachability and never content, and
|
|
89
|
+
`registryHost` keeps its publication identity.
|
|
90
|
+
|
|
3
91
|
## 2026-09-18 - 32.3.0
|
|
4
92
|
|
|
5
93
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.5.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=
|
|
@@ -48,6 +48,24 @@ export interface ICluster {
|
|
|
48
48
|
export interface IClusterRelay {
|
|
49
49
|
origin: string;
|
|
50
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* The managed VPN hub a cluster relay bound for its own cluster.
|
|
53
|
+
*
|
|
54
|
+
* The relay is its cluster's packet relay: every node of the cluster dials this hub and no
|
|
55
|
+
* inter-node packet leaves the cluster. It reports what it bound, exactly like `listenAddress` and
|
|
56
|
+
* `listenPort`, and Cloudly composes the platform endpoints from it — a relay names no endpoint id
|
|
57
|
+
* and no TLS name of its own. `publicKey` is the hub's Noise public key in the one canonical
|
|
58
|
+
* 32-byte base64 encoding every Noise key of this contract is read with; it is public material and
|
|
59
|
+
* authenticates nothing by itself. A hub that bound only one transport reports the other port as
|
|
60
|
+
* `null`.
|
|
61
|
+
*/
|
|
62
|
+
export interface IClusterRelayVpnHub {
|
|
63
|
+
publicKey: string;
|
|
64
|
+
/** The address the hub bound, as an IPv4 literal inside the address plan's `vpn.hubPrefix`. */
|
|
65
|
+
address: string;
|
|
66
|
+
quicPort: number | null;
|
|
67
|
+
websocketPort: number | null;
|
|
68
|
+
}
|
|
51
69
|
/**
|
|
52
70
|
* What a cluster relay tells Cloudly about itself once its socket is authenticated.
|
|
53
71
|
*
|
|
@@ -74,6 +92,11 @@ export interface IRegisterClusterRelayRequest {
|
|
|
74
92
|
*/
|
|
75
93
|
listenAddress: string;
|
|
76
94
|
listenPort: number;
|
|
95
|
+
/**
|
|
96
|
+
* Absent on a relay that serves no managed VPN hub, which registers exactly as it did before.
|
|
97
|
+
* Cloudly selects no hub for such a cluster and states `relay-vpn-hub-absent` instead.
|
|
98
|
+
*/
|
|
99
|
+
vpnHub?: IClusterRelayVpnHub;
|
|
77
100
|
};
|
|
78
101
|
/** Monotonic within one relay process; it restarts at 0 when the process restarts. */
|
|
79
102
|
registrationSequence: number;
|
|
@@ -118,6 +141,13 @@ export type TClusterRelayUndispatchedRefusal = typeof clusterRelayUndispatchedRe
|
|
|
118
141
|
* registers over.
|
|
119
142
|
*/
|
|
120
143
|
export declare const validateClusterRelay: (valueArg: unknown, pathArg?: string) => string[];
|
|
144
|
+
/**
|
|
145
|
+
* Validates one hub advertisement and names every reason it is refused.
|
|
146
|
+
*
|
|
147
|
+
* Shape only: whether the address sits inside the address plan's `vpn.hubPrefix` is Cloudly's to
|
|
148
|
+
* decide against the plan it stores, and the endpoints themselves are composed there.
|
|
149
|
+
*/
|
|
150
|
+
export declare const validateClusterRelayVpnHub: (valueArg: unknown, pathArg?: string) => string[];
|
|
121
151
|
/**
|
|
122
152
|
* Validates one cluster relay registration and names every reason it is refused.
|
|
123
153
|
*
|
package/dist_ts/data/cluster.js
CHANGED
|
@@ -3,6 +3,8 @@ import {} from '../data/docker.js';
|
|
|
3
3
|
import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
|
|
4
4
|
import { validateProtocolOfferOn } from '../protocol.js';
|
|
5
5
|
import { hasExactKeys } from '../private/dataproperties.js';
|
|
6
|
+
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
7
|
+
import { networkNoiseKey } from '../private/networkcontract.js';
|
|
6
8
|
/**
|
|
7
9
|
* The registration refusals that end a relay's custody of its cluster.
|
|
8
10
|
*
|
|
@@ -73,7 +75,7 @@ const validateClusterRelayVersion = (valueArg, pathArg) => (typeof valueArg ===
|
|
|
73
75
|
: [`${pathArg} must be 1 to ${maximumClusterRelayVersionLength} characters of letters, `
|
|
74
76
|
+ 'digits, dot, plus, underscore or hyphen, starting with a letter or digit']);
|
|
75
77
|
/** The same identifier rule a node's own runtime session registers under. */
|
|
76
|
-
const validateClusterRelayIdentifier = (valueArg, pathArg) => (
|
|
78
|
+
const validateClusterRelayIdentifier = (valueArg, pathArg) => (isClusterNodeId(valueArg)
|
|
77
79
|
? []
|
|
78
80
|
: [`${pathArg} must be 1 to 128 characters of letters, digits, underscore or hyphen`]);
|
|
79
81
|
const validateClusterRelayListenAddress = (valueArg, pathArg) => {
|
|
@@ -96,9 +98,49 @@ const validateClusterRelayListenPort = (valueArg, pathArg) => (typeof valueArg =
|
|
|
96
98
|
const validateClusterRelayNonNegativeInteger = (valueArg, pathArg) => (typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg >= 0
|
|
97
99
|
? []
|
|
98
100
|
: [`${pathArg} must be a non-negative safe integer`]);
|
|
101
|
+
/**
|
|
102
|
+
* The one canonical 32-byte base64 reading every Noise key of this contract passes, stated as a
|
|
103
|
+
* refusal this validator's callers can collect: a hub key is the same key material the managed VPN
|
|
104
|
+
* credential carries, so it is never read by a second rule that could drift from it.
|
|
105
|
+
*/
|
|
106
|
+
const validateClusterRelayVpnKey = (valueArg, pathArg) => {
|
|
107
|
+
try {
|
|
108
|
+
networkNoiseKey(valueArg);
|
|
109
|
+
return [];
|
|
110
|
+
}
|
|
111
|
+
catch {
|
|
112
|
+
return [`${pathArg} must be a canonical 32-byte base64 public key`];
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
/** A port the hub bound, or `null` for a transport it did not bind. */
|
|
116
|
+
const validateClusterRelayHubPort = (valueArg, pathArg) => (valueArg === null || validateClusterRelayListenPort(valueArg, pathArg).length === 0
|
|
117
|
+
? []
|
|
118
|
+
: [`${pathArg} must be null or an integer from 1 to 65535`]);
|
|
119
|
+
/**
|
|
120
|
+
* Validates one hub advertisement and names every reason it is refused.
|
|
121
|
+
*
|
|
122
|
+
* Shape only: whether the address sits inside the address plan's `vpn.hubPrefix` is Cloudly's to
|
|
123
|
+
* decide against the plan it stores, and the endpoints themselves are composed there.
|
|
124
|
+
*/
|
|
125
|
+
export const validateClusterRelayVpnHub = (valueArg, pathArg = 'cluster relay vpn hub') => {
|
|
126
|
+
if (!isRecord(valueArg)
|
|
127
|
+
|| !hasExactKeys(valueArg, ['publicKey', 'address', 'quicPort', 'websocketPort'])) {
|
|
128
|
+
return [`${pathArg} must use its exact schema`];
|
|
129
|
+
}
|
|
130
|
+
const errors = [
|
|
131
|
+
...validateClusterRelayVpnKey(valueArg.publicKey, `${pathArg} publicKey`),
|
|
132
|
+
...validateClusterRelayListenAddress(valueArg.address, `${pathArg} address`),
|
|
133
|
+
...validateClusterRelayHubPort(valueArg.quicPort, `${pathArg} quicPort`),
|
|
134
|
+
...validateClusterRelayHubPort(valueArg.websocketPort, `${pathArg} websocketPort`),
|
|
135
|
+
];
|
|
136
|
+
if (valueArg.quicPort === null && valueArg.websocketPort === null) {
|
|
137
|
+
errors.push(`${pathArg} must bind at least one of quicPort and websocketPort`);
|
|
138
|
+
}
|
|
139
|
+
return errors;
|
|
140
|
+
};
|
|
99
141
|
const validateClusterRelayEndpoint = (valueArg, pathArg) => {
|
|
100
142
|
if (!isRecord(valueArg)
|
|
101
|
-
|| !hasExactKeys(valueArg, ['version', 'nodeId', 'listenAddress', 'listenPort'])) {
|
|
143
|
+
|| !hasExactKeys(valueArg, ['version', 'nodeId', 'listenAddress', 'listenPort'], ['vpnHub'])) {
|
|
102
144
|
return [`${pathArg} must use its exact schema`];
|
|
103
145
|
}
|
|
104
146
|
return [
|
|
@@ -106,6 +148,9 @@ const validateClusterRelayEndpoint = (valueArg, pathArg) => {
|
|
|
106
148
|
...validateClusterRelayIdentifier(valueArg.nodeId, `${pathArg} nodeId`),
|
|
107
149
|
...validateClusterRelayListenAddress(valueArg.listenAddress, `${pathArg} listenAddress`),
|
|
108
150
|
...validateClusterRelayListenPort(valueArg.listenPort, `${pathArg} listenPort`),
|
|
151
|
+
...(Object.keys(valueArg).includes('vpnHub')
|
|
152
|
+
? validateClusterRelayVpnHub(valueArg.vpnHub, `${pathArg} vpnHub`)
|
|
153
|
+
: []),
|
|
109
154
|
];
|
|
110
155
|
};
|
|
111
156
|
/**
|
|
@@ -170,4 +215,4 @@ export const clusterRelayCertificateDomainName = (relayArg) => {
|
|
|
170
215
|
}
|
|
171
216
|
return new URL(relayArg.origin).hostname;
|
|
172
217
|
};
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
218
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../ts/data/cluster.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { isPlausibleUnicastIpv4 } from '../private/ipv4.js';
|
|
|
2
2
|
import { isUtcCalendarDay } from '../private/utccalendarday.js';
|
|
3
3
|
import { validateProtocolOfferOn } from '../protocol.js';
|
|
4
4
|
import { hasExactKeys } from '../private/dataproperties.js';
|
|
5
|
+
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
5
6
|
/**
|
|
6
7
|
* The cluster ingress contracts.
|
|
7
8
|
*
|
|
@@ -200,11 +201,11 @@ export const validateClusterTrafficStatistics = (valueArg, pathArg = 'cluster tr
|
|
|
200
201
|
return [`${pathArg} must use its exact schema`];
|
|
201
202
|
}
|
|
202
203
|
const errors = [];
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
}
|
|
204
|
+
if (typeof valueArg.serviceId !== 'string' || !identifierPattern.test(valueArg.serviceId)) {
|
|
205
|
+
errors.push(`${pathArg} serviceId must be a bounded identifier`);
|
|
206
|
+
}
|
|
207
|
+
if (!isClusterNodeId(valueArg.nodeId)) {
|
|
208
|
+
errors.push(`${pathArg} nodeId must be a node id`);
|
|
208
209
|
}
|
|
209
210
|
if (!isClusterIngressHostName(valueArg.hostName)) {
|
|
210
211
|
errors.push(`${pathArg} hostName must be a lowercase dotted hostname`);
|
|
@@ -292,8 +293,8 @@ export const validateClusterIngressRegistration = (valueArg, pathArg = 'cluster
|
|
|
292
293
|
if (typeof valueArg.version !== 'string' || !identifierPattern.test(valueArg.version)) {
|
|
293
294
|
errors.push(`${pathArg} version must be a bounded identifier`);
|
|
294
295
|
}
|
|
295
|
-
if (
|
|
296
|
-
errors.push(`${pathArg} nodeId must be a
|
|
296
|
+
if (!isClusterNodeId(valueArg.nodeId)) {
|
|
297
|
+
errors.push(`${pathArg} nodeId must be a node id`);
|
|
297
298
|
}
|
|
298
299
|
if (valueArg.capabilities !== undefined
|
|
299
300
|
&& (!Array.isArray(valueArg.capabilities)
|
|
@@ -304,4 +305,4 @@ export const validateClusterIngressRegistration = (valueArg, pathArg = 'cluster
|
|
|
304
305
|
}
|
|
305
306
|
return errors;
|
|
306
307
|
};
|
|
307
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusteringress.js","sourceRoot":"","sources":["../../ts/data/clusteringress.ts"],"names":[],"mappings":"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"}
|
|
308
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusteringress.js","sourceRoot":"","sources":["../../ts/data/clusteringress.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,12 @@ import * as plugins from '../plugins.js';
|
|
|
2
2
|
import type { TSha256Digest, TImmutableContainerPlatform } from './immutableimage.js';
|
|
3
3
|
import type { ISparkNodeReportRecord } from './sparknodereport.js';
|
|
4
4
|
import { type IProtocolOffer } from '../protocol.js';
|
|
5
|
+
import { isClusterNodeId } from '../private/nodeidentifier.js';
|
|
6
|
+
/**
|
|
7
|
+
* The vocabulary every node id in this package is read in, published here beside `IClusterNode`
|
|
8
|
+
* so a service that stores or forwards a node id judges it exactly as these contracts do.
|
|
9
|
+
*/
|
|
10
|
+
export { isClusterNodeId };
|
|
5
11
|
export interface IClusterNodeMetrics {
|
|
6
12
|
cpuUsagePercent: number;
|
|
7
13
|
memoryUsedMB: number;
|
|
@@ -436,4 +442,3 @@ export interface IClusterNodeCorestore {
|
|
|
436
442
|
* slash.
|
|
437
443
|
*/
|
|
438
444
|
export declare const validateClusterNodeCorestore: (valueArg: unknown, pathArg?: string) => string[];
|
|
439
|
-
export {};
|