@serve.zone/interfaces 31.0.0 → 31.1.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 +19 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/runtimesession.d.ts +14 -0
- package/dist_ts/data/runtimesession.js +22 -5
- package/dist_ts/requests/runtimesession.d.ts +5 -1
- package/package.json +1 -1
- package/readme.md +19 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/runtimesession.ts +32 -4
- package/ts/requests/runtimesession.ts +5 -1
package/changelog.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-16 - 31.1.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add the optional `nodeInstanceNonce` to `IRegisterPalletRuntimeSessionRequestV1`: a canonical
|
|
8
|
+
lowercase UUID, nil rejected, that a Pallet generates once per process start and sends on every
|
|
9
|
+
registration. It names the registering node process where the transport no longer can, because
|
|
10
|
+
one cluster relay socket carries the registrations of many nodes. The strict request snapshot
|
|
11
|
+
validates it when present and keeps it absent otherwise, so a controller can tell a legacy
|
|
12
|
+
sender from a stated nonce; every other field, key set and rejection is unchanged. The contract
|
|
13
|
+
now states the registration identity (node, credential generation, node instance nonce), that a
|
|
14
|
+
controller requires the nonce from a relaying peer and may accept its absence only from a
|
|
15
|
+
directly connected node, that a changed nonce or generation is a new registration with a new
|
|
16
|
+
binding and session epoch while an unchanged pair is a replay of the historical binding, and
|
|
17
|
+
that bearer rotation behind a relay is therefore expressed as a new registration on the same
|
|
18
|
+
live socket — no carrier reconnect, no disturbance of the other nodes that socket carries.
|
|
19
|
+
`runtimeSessionV1Contract` gains `nodeInstanceNonceFormat`, `registrationIdentity` and
|
|
20
|
+
`relayRegistrationRequiresNodeInstanceNonce`. Additive only; nothing was removed or renamed.
|
|
21
|
+
|
|
3
22
|
## 2026-09-16 - 31.0.0
|
|
4
23
|
|
|
5
24
|
### Breaking Changes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '31.
|
|
6
|
+
version: '31.1.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=
|
|
@@ -24,6 +24,15 @@ export interface IRegisterPalletRuntimeSessionRequestV1 {
|
|
|
24
24
|
credentialGeneration: number;
|
|
25
25
|
/** Sensitive ephemeral input; exclude the complete request from hooks and logs. */
|
|
26
26
|
bearer: string;
|
|
27
|
+
/**
|
|
28
|
+
* Canonical lowercase UUID a Pallet generates once per process start and sends on every
|
|
29
|
+
* registration. It proves which node process is registering when the transport cannot:
|
|
30
|
+
* one relay socket carries many nodes, so the physical peer no longer distinguishes a
|
|
31
|
+
* node restart from a replay. It is not a secret and it grants no authority; the bearer
|
|
32
|
+
* still authenticates. Absent only from legacy senders, which a controller may accept
|
|
33
|
+
* exclusively from a directly connected node.
|
|
34
|
+
*/
|
|
35
|
+
nodeInstanceNonce?: string;
|
|
27
36
|
}
|
|
28
37
|
export interface IApplyRuntimeAssignmentRequestV1 {
|
|
29
38
|
session: IRuntimeSessionBindingV1;
|
|
@@ -88,6 +97,11 @@ export declare const runtimeSessionV1Contract: Readonly<{
|
|
|
88
97
|
readonly maximumRegistryPasswordBytes: 8192;
|
|
89
98
|
readonly registerTransport: "pallet-initiated-wss-on-configured-cloudly-https-origin";
|
|
90
99
|
readonly historicalObservationAuthority: "durable-counter-and-ack-only";
|
|
100
|
+
readonly nodeInstanceNonceFormat: "canonical-lowercase-uuid-per-node-process";
|
|
101
|
+
/** The registration a controller must treat as one: a change in any part is a new session. */
|
|
102
|
+
readonly registrationIdentity: "node-id-and-credential-generation-and-node-instance-nonce";
|
|
103
|
+
/** A relay socket carries many nodes, so its transport cannot prove a node process. */
|
|
104
|
+
readonly relayRegistrationRequiresNodeInstanceNonce: true;
|
|
91
105
|
readonly error: "Runtime session contract rejected.";
|
|
92
106
|
}>;
|
|
93
107
|
/** Synchronous detached structural assertion only; never an authentication check. */
|
|
@@ -8,6 +8,11 @@ export const runtimeSessionV1Contract = Object.freeze({
|
|
|
8
8
|
maximumRegistryPasswordBytes: 8192,
|
|
9
9
|
registerTransport: 'pallet-initiated-wss-on-configured-cloudly-https-origin',
|
|
10
10
|
historicalObservationAuthority: 'durable-counter-and-ack-only',
|
|
11
|
+
nodeInstanceNonceFormat: 'canonical-lowercase-uuid-per-node-process',
|
|
12
|
+
/** The registration a controller must treat as one: a change in any part is a new session. */
|
|
13
|
+
registrationIdentity: 'node-id-and-credential-generation-and-node-instance-nonce',
|
|
14
|
+
/** A relay socket carries many nodes, so its transport cannot prove a node process. */
|
|
15
|
+
relayRegistrationRequiresNodeInstanceNonce: true,
|
|
11
16
|
error: 'Runtime session contract rejected.',
|
|
12
17
|
});
|
|
13
18
|
const fail = () => { throw new Error(runtimeSessionV1Contract.error); };
|
|
@@ -37,6 +42,13 @@ const nodeId = (valueArg) => {
|
|
|
37
42
|
requireValue(typeof valueArg === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(valueArg));
|
|
38
43
|
return valueArg;
|
|
39
44
|
};
|
|
45
|
+
/** One node process, in the same canonical form as the native boot UUID. */
|
|
46
|
+
const nodeInstanceNonce = (valueArg) => {
|
|
47
|
+
requireValue(typeof valueArg === 'string'
|
|
48
|
+
&& /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/.test(valueArg)
|
|
49
|
+
&& valueArg !== '00000000-0000-0000-0000-000000000000');
|
|
50
|
+
return valueArg;
|
|
51
|
+
};
|
|
40
52
|
/** Bound decoded JSON before canonicalization; copy data descriptors, never getters. */
|
|
41
53
|
const capture = (valueArg) => safe(() => {
|
|
42
54
|
let nodes = 0;
|
|
@@ -92,10 +104,11 @@ const capture = (valueArg) => safe(() => {
|
|
|
92
104
|
requireValue(encoder.encode(serialized).byteLength <= runtimeSessionV1Contract.maximumWireCanonicalBytes);
|
|
93
105
|
return JSON.parse(serialized);
|
|
94
106
|
});
|
|
95
|
-
const record = (valueArg, keysArg) => {
|
|
107
|
+
const record = (valueArg, keysArg, optionalKeysArg = []) => {
|
|
96
108
|
requireValue(valueArg !== null && typeof valueArg === 'object' && !Array.isArray(valueArg));
|
|
97
109
|
const keys = Object.keys(valueArg);
|
|
98
|
-
requireValue(
|
|
110
|
+
requireValue(keysArg.every((key) => keys.includes(key))
|
|
111
|
+
&& keys.every((key) => keysArg.includes(key) || optionalKeysArg.includes(key)));
|
|
99
112
|
return valueArg;
|
|
100
113
|
};
|
|
101
114
|
const reference = (valueArg) => {
|
|
@@ -124,11 +137,15 @@ const matchesAssignment = (sessionArg, assignmentArg) => sessionArg.nodeId === a
|
|
|
124
137
|
/** Synchronous detached structural assertion only; never an authentication check. */
|
|
125
138
|
export const snapshotRuntimeSessionBindingV1 = (valueArg) => safe(() => session(capture(valueArg)));
|
|
126
139
|
export const snapshotRegisterPalletRuntimeSessionRequestV1 = (valueArg) => safe(() => {
|
|
127
|
-
const value = record(capture(valueArg), ['schemaVersion', 'nodeId', 'credentialGeneration', 'bearer']);
|
|
140
|
+
const value = record(capture(valueArg), ['schemaVersion', 'nodeId', 'credentialGeneration', 'bearer'], ['nodeInstanceNonce']);
|
|
128
141
|
requireValue(value.schemaVersion === 1 && typeof value.bearer === 'string'
|
|
129
142
|
&& /^palletToken[0-9a-f]{64}$/.test(value.bearer));
|
|
130
|
-
|
|
143
|
+
const request = { schemaVersion: 1, nodeId: nodeId(value.nodeId),
|
|
131
144
|
credentialGeneration: positive(value.credentialGeneration), bearer: value.bearer };
|
|
145
|
+
// Absence stays absent: a controller distinguishes a legacy sender from a stated nonce.
|
|
146
|
+
if (Object.hasOwn(value, 'nodeInstanceNonce'))
|
|
147
|
+
request.nodeInstanceNonce = nodeInstanceNonce(value.nodeInstanceNonce);
|
|
148
|
+
return request;
|
|
132
149
|
});
|
|
133
150
|
export const snapshotApplyRuntimeAssignmentRequestV1 = (valueArg) => safe(() => {
|
|
134
151
|
const value = record(capture(valueArg), ['session', 'assignment', 'config', 'predecessor']);
|
|
@@ -285,4 +302,4 @@ export const bindGetRuntimeRegistryCredentialRequestV1 = async (valueArg, assign
|
|
|
285
302
|
return fail();
|
|
286
303
|
}
|
|
287
304
|
};
|
|
288
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimesession.js","sourceRoot":"","sources":["../../ts/data/runtimesession.ts"],"names":[],"mappings":"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"}
|
|
305
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimesession.js","sourceRoot":"","sources":["../../ts/data/runtimesession.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,11 @@ export interface IReq_Controller_Pallet_ApplyRuntimeNetworkProjectionV1 extends
|
|
|
28
28
|
request: network.IApplyRuntimeNetworkProjectionRequestV1;
|
|
29
29
|
response: network.IApplyRuntimeNetworkAuthorityResponseV1;
|
|
30
30
|
}
|
|
31
|
-
/**
|
|
31
|
+
/**
|
|
32
|
+
* WSS-only Pallet bootstrap. Derive physical peer/idempotency server-side; the registering
|
|
33
|
+
* node process is named by `request.nodeInstanceNonce`, because one relay socket may carry
|
|
34
|
+
* the registrations of every node in a cluster.
|
|
35
|
+
*/
|
|
32
36
|
export interface IReq_Pallet_Cloudly_RegisterPalletRuntimeSessionV1 extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Pallet_Cloudly_RegisterPalletRuntimeSessionV1> {
|
|
33
37
|
method: 'registerPalletRuntimeSessionV1';
|
|
34
38
|
request: data.IRegisterPalletRuntimeSessionRequestV1;
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -538,6 +538,25 @@ exact body; it cannot restore active readiness, routes or liveness. Those requir
|
|
|
538
538
|
a fresh observation from the current session. The contract helpers validate and
|
|
539
539
|
classify content; authentication and atomic receipt persistence remain server-owned.
|
|
540
540
|
|
|
541
|
+
A registration is identified by its node, its credential generation and
|
|
542
|
+
`nodeInstanceNonce`: a canonical lowercase UUID that Pallet generates once per
|
|
543
|
+
process start and sends on every registration. Version 31.1 adds that optional
|
|
544
|
+
field. One physical socket may carry the registrations of many nodes — a cluster
|
|
545
|
+
relay forwards a whole cluster — so the transport alone can no longer tell a
|
|
546
|
+
node restart from a replay. A controller must require the nonce whenever the
|
|
547
|
+
registering peer is such a relay, and may accept its absence only from a
|
|
548
|
+
directly connected node, whose own socket names its process. The nonce is not a
|
|
549
|
+
secret, is not authentication, and grants nothing on its own: the bearer still
|
|
550
|
+
authenticates every registration.
|
|
551
|
+
|
|
552
|
+
A changed nonce, or a changed credential generation, is a new registration: the
|
|
553
|
+
controller mints a new binding and a new session epoch and fences the node's
|
|
554
|
+
previous session. An unchanged nonce with an unchanged generation is a replay
|
|
555
|
+
and must return the exact historical binding. Bearer rotation therefore needs no
|
|
556
|
+
transport reconnect: a node that rotates behind a relay registers again with its
|
|
557
|
+
unchanged nonce and its new generation on the same live socket, and the other
|
|
558
|
+
nodes that socket carries are untouched.
|
|
559
|
+
|
|
541
560
|
`registerCloudlyClientSessionV1` separately authenticates a current human or
|
|
542
561
|
machine JWT on a physical TypedSocket so the server can own its identity tag.
|
|
543
562
|
Both registration methods reject HTTP transport. Sensitive requests and registry
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -36,6 +36,15 @@ export interface IRegisterPalletRuntimeSessionRequestV1 {
|
|
|
36
36
|
credentialGeneration: number;
|
|
37
37
|
/** Sensitive ephemeral input; exclude the complete request from hooks and logs. */
|
|
38
38
|
bearer: string;
|
|
39
|
+
/**
|
|
40
|
+
* Canonical lowercase UUID a Pallet generates once per process start and sends on every
|
|
41
|
+
* registration. It proves which node process is registering when the transport cannot:
|
|
42
|
+
* one relay socket carries many nodes, so the physical peer no longer distinguishes a
|
|
43
|
+
* node restart from a replay. It is not a secret and it grants no authority; the bearer
|
|
44
|
+
* still authenticates. Absent only from legacy senders, which a controller may accept
|
|
45
|
+
* exclusively from a directly connected node.
|
|
46
|
+
*/
|
|
47
|
+
nodeInstanceNonce?: string;
|
|
39
48
|
}
|
|
40
49
|
|
|
41
50
|
export interface IApplyRuntimeAssignmentRequestV1 {
|
|
@@ -111,6 +120,11 @@ export const runtimeSessionV1Contract = Object.freeze({
|
|
|
111
120
|
maximumRegistryPasswordBytes: 8192,
|
|
112
121
|
registerTransport: 'pallet-initiated-wss-on-configured-cloudly-https-origin',
|
|
113
122
|
historicalObservationAuthority: 'durable-counter-and-ack-only',
|
|
123
|
+
nodeInstanceNonceFormat: 'canonical-lowercase-uuid-per-node-process',
|
|
124
|
+
/** The registration a controller must treat as one: a change in any part is a new session. */
|
|
125
|
+
registrationIdentity: 'node-id-and-credential-generation-and-node-instance-nonce',
|
|
126
|
+
/** A relay socket carries many nodes, so its transport cannot prove a node process. */
|
|
127
|
+
relayRegistrationRequiresNodeInstanceNonce: true,
|
|
114
128
|
error: 'Runtime session contract rejected.',
|
|
115
129
|
} as const);
|
|
116
130
|
|
|
@@ -135,6 +149,13 @@ const nodeId = (valueArg: unknown): string => {
|
|
|
135
149
|
requireValue(typeof valueArg === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(valueArg));
|
|
136
150
|
return valueArg;
|
|
137
151
|
};
|
|
152
|
+
/** One node process, in the same canonical form as the native boot UUID. */
|
|
153
|
+
const nodeInstanceNonce = (valueArg: unknown): string => {
|
|
154
|
+
requireValue(typeof valueArg === 'string'
|
|
155
|
+
&& /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/.test(valueArg)
|
|
156
|
+
&& valueArg !== '00000000-0000-0000-0000-000000000000');
|
|
157
|
+
return valueArg;
|
|
158
|
+
};
|
|
138
159
|
|
|
139
160
|
/** Bound decoded JSON before canonicalization; copy data descriptors, never getters. */
|
|
140
161
|
const capture = (valueArg: unknown): unknown => safe(() => {
|
|
@@ -185,10 +206,13 @@ const capture = (valueArg: unknown): unknown => safe(() => {
|
|
|
185
206
|
return JSON.parse(serialized);
|
|
186
207
|
});
|
|
187
208
|
|
|
188
|
-
const record = (
|
|
209
|
+
const record = (
|
|
210
|
+
valueArg: unknown, keysArg: readonly string[], optionalKeysArg: readonly string[] = [],
|
|
211
|
+
): Record<string, unknown> => {
|
|
189
212
|
requireValue(valueArg !== null && typeof valueArg === 'object' && !Array.isArray(valueArg));
|
|
190
213
|
const keys = Object.keys(valueArg);
|
|
191
|
-
requireValue(
|
|
214
|
+
requireValue(keysArg.every((key) => keys.includes(key))
|
|
215
|
+
&& keys.every((key) => keysArg.includes(key) || optionalKeysArg.includes(key)));
|
|
192
216
|
return valueArg as Record<string, unknown>;
|
|
193
217
|
};
|
|
194
218
|
const reference = (valueArg: unknown): IRuntimeAssignmentReferenceV1 => {
|
|
@@ -225,11 +249,15 @@ export const snapshotRuntimeSessionBindingV1 = (valueArg: unknown): IRuntimeSess
|
|
|
225
249
|
export const snapshotRegisterPalletRuntimeSessionRequestV1 = (
|
|
226
250
|
valueArg: unknown,
|
|
227
251
|
): IRegisterPalletRuntimeSessionRequestV1 => safe(() => {
|
|
228
|
-
const value = record(capture(valueArg), ['schemaVersion', 'nodeId', 'credentialGeneration', 'bearer']
|
|
252
|
+
const value = record(capture(valueArg), ['schemaVersion', 'nodeId', 'credentialGeneration', 'bearer'],
|
|
253
|
+
['nodeInstanceNonce']);
|
|
229
254
|
requireValue(value.schemaVersion === 1 && typeof value.bearer === 'string'
|
|
230
255
|
&& /^palletToken[0-9a-f]{64}$/.test(value.bearer));
|
|
231
|
-
|
|
256
|
+
const request: IRegisterPalletRuntimeSessionRequestV1 = { schemaVersion: 1, nodeId: nodeId(value.nodeId),
|
|
232
257
|
credentialGeneration: positive(value.credentialGeneration), bearer: value.bearer };
|
|
258
|
+
// Absence stays absent: a controller distinguishes a legacy sender from a stated nonce.
|
|
259
|
+
if (Object.hasOwn(value, 'nodeInstanceNonce')) request.nodeInstanceNonce = nodeInstanceNonce(value.nodeInstanceNonce);
|
|
260
|
+
return request;
|
|
233
261
|
});
|
|
234
262
|
|
|
235
263
|
export const snapshotApplyRuntimeAssignmentRequestV1 = (
|
|
@@ -41,7 +41,11 @@ export interface IReq_Controller_Pallet_ApplyRuntimeNetworkProjectionV1 extends
|
|
|
41
41
|
response: network.IApplyRuntimeNetworkAuthorityResponseV1;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
/**
|
|
44
|
+
/**
|
|
45
|
+
* WSS-only Pallet bootstrap. Derive physical peer/idempotency server-side; the registering
|
|
46
|
+
* node process is named by `request.nodeInstanceNonce`, because one relay socket may carry
|
|
47
|
+
* the registrations of every node in a cluster.
|
|
48
|
+
*/
|
|
45
49
|
export interface IReq_Pallet_Cloudly_RegisterPalletRuntimeSessionV1 extends plugins.typedrequestInterfaces.implementsTR<
|
|
46
50
|
plugins.typedrequestInterfaces.ITypedRequest,
|
|
47
51
|
IReq_Pallet_Cloudly_RegisterPalletRuntimeSessionV1
|