@optimystic/db-core 1.9.0 → 1.10.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/dist/src/cohort-topic/addressing.d.ts +46 -6
- package/dist/src/cohort-topic/addressing.d.ts.map +1 -1
- package/dist/src/cohort-topic/addressing.js +58 -18
- package/dist/src/cohort-topic/addressing.js.map +1 -1
- package/dist/src/cohort-topic/member-engine.d.ts +21 -1
- package/dist/src/cohort-topic/member-engine.d.ts.map +1 -1
- package/dist/src/cohort-topic/member-engine.js +39 -9
- package/dist/src/cohort-topic/member-engine.js.map +1 -1
- package/dist/src/cohort-topic/membership/publisher.js +1 -1
- package/dist/src/cohort-topic/membership/publisher.js.map +1 -1
- package/dist/src/cohort-topic/membership/source.d.ts +4 -0
- package/dist/src/cohort-topic/membership/source.d.ts.map +1 -1
- package/dist/src/cohort-topic/membership/source.js +4 -0
- package/dist/src/cohort-topic/membership/source.js.map +1 -1
- package/dist/src/cohort-topic/membership/verifier.d.ts +51 -9
- package/dist/src/cohort-topic/membership/verifier.d.ts.map +1 -1
- package/dist/src/cohort-topic/membership/verifier.js +138 -46
- package/dist/src/cohort-topic/membership/verifier.js.map +1 -1
- package/dist/src/cohort-topic/ports.d.ts +85 -14
- package/dist/src/cohort-topic/ports.d.ts.map +1 -1
- package/dist/src/cohort-topic/ports.js +1 -1
- package/dist/src/cohort-topic/ports.js.map +1 -1
- package/dist/src/cohort-topic/registration/renewal.d.ts +26 -5
- package/dist/src/cohort-topic/registration/renewal.d.ts.map +1 -1
- package/dist/src/cohort-topic/registration/renewal.js +71 -21
- package/dist/src/cohort-topic/registration/renewal.js.map +1 -1
- package/dist/src/cohort-topic/service.d.ts +34 -2
- package/dist/src/cohort-topic/service.d.ts.map +1 -1
- package/dist/src/cohort-topic/service.js +86 -28
- package/dist/src/cohort-topic/service.js.map +1 -1
- package/dist/src/cohort-topic/sig/payloads.d.ts +5 -1
- package/dist/src/cohort-topic/sig/payloads.d.ts.map +1 -1
- package/dist/src/cohort-topic/sig/payloads.js +6 -1
- package/dist/src/cohort-topic/sig/payloads.js.map +1 -1
- package/dist/src/cohort-topic/sig/threshold.d.ts +29 -4
- package/dist/src/cohort-topic/sig/threshold.d.ts.map +1 -1
- package/dist/src/cohort-topic/sig/threshold.js +39 -7
- package/dist/src/cohort-topic/sig/threshold.js.map +1 -1
- package/dist/src/cohort-topic/walk.d.ts +19 -4
- package/dist/src/cohort-topic/walk.d.ts.map +1 -1
- package/dist/src/cohort-topic/walk.js +29 -6
- package/dist/src/cohort-topic/walk.js.map +1 -1
- package/dist/src/cohort-topic/willingness.d.ts +17 -1
- package/dist/src/cohort-topic/willingness.d.ts.map +1 -1
- package/dist/src/cohort-topic/willingness.js +18 -3
- package/dist/src/cohort-topic/willingness.js.map +1 -1
- package/dist/src/cohort-topic/wire/index.d.ts +1 -1
- package/dist/src/cohort-topic/wire/index.d.ts.map +1 -1
- package/dist/src/cohort-topic/wire/index.js +1 -1
- package/dist/src/cohort-topic/wire/index.js.map +1 -1
- package/dist/src/cohort-topic/wire/payloads.d.ts +14 -0
- package/dist/src/cohort-topic/wire/payloads.d.ts.map +1 -1
- package/dist/src/cohort-topic/wire/payloads.js +20 -0
- package/dist/src/cohort-topic/wire/payloads.js.map +1 -1
- package/dist/src/cohort-topic/wire/primitives.d.ts +8 -0
- package/dist/src/cohort-topic/wire/primitives.d.ts.map +1 -1
- package/dist/src/cohort-topic/wire/primitives.js +24 -4
- package/dist/src/cohort-topic/wire/primitives.js.map +1 -1
- package/dist/src/cohort-topic/wire/types.d.ts +37 -0
- package/dist/src/cohort-topic/wire/types.d.ts.map +1 -1
- package/dist/src/cohort-topic/wire/validate.d.ts +9 -1
- package/dist/src/cohort-topic/wire/validate.d.ts.map +1 -1
- package/dist/src/cohort-topic/wire/validate.js +23 -4
- package/dist/src/cohort-topic/wire/validate.js.map +1 -1
- package/dist/src/reactivity/config.d.ts +9 -10
- package/dist/src/reactivity/config.d.ts.map +1 -1
- package/dist/src/reactivity/config.js +9 -9
- package/dist/src/reactivity/config.js.map +1 -1
- package/dist/src/reactivity/index.d.ts +4 -3
- package/dist/src/reactivity/index.d.ts.map +1 -1
- package/dist/src/reactivity/index.js +4 -3
- package/dist/src/reactivity/index.js.map +1 -1
- package/dist/src/reactivity/rotation.d.ts +73 -57
- package/dist/src/reactivity/rotation.d.ts.map +1 -1
- package/dist/src/reactivity/rotation.js +54 -54
- package/dist/src/reactivity/rotation.js.map +1 -1
- package/dist/src/reactivity/subscription.d.ts +12 -9
- package/dist/src/reactivity/subscription.d.ts.map +1 -1
- package/dist/src/reactivity/subscription.js +9 -6
- package/dist/src/reactivity/subscription.js.map +1 -1
- package/dist/src/reactivity/topic-anchor.d.ts +36 -31
- package/dist/src/reactivity/topic-anchor.d.ts.map +1 -1
- package/dist/src/reactivity/topic-anchor.js +41 -39
- package/dist/src/reactivity/topic-anchor.js.map +1 -1
- package/dist/src/reactivity/verify.d.ts +26 -9
- package/dist/src/reactivity/verify.d.ts.map +1 -1
- package/dist/src/reactivity/verify.js +26 -11
- package/dist/src/reactivity/verify.js.map +1 -1
- package/dist/src/reactivity/wire.d.ts +1 -1
- package/dist/src/reactivity/wire.d.ts.map +1 -1
- package/dist/src/transactor/change-notifier.d.ts +1 -1
- package/package.json +1 -1
- package/src/cohort-topic/addressing.ts +83 -23
- package/src/cohort-topic/member-engine.ts +77 -8
- package/src/cohort-topic/membership/publisher.ts +1 -1
- package/src/cohort-topic/membership/source.ts +4 -0
- package/src/cohort-topic/membership/verifier.ts +169 -51
- package/src/cohort-topic/ports.ts +87 -15
- package/src/cohort-topic/registration/renewal.ts +87 -24
- package/src/cohort-topic/service.ts +157 -35
- package/src/cohort-topic/sig/payloads.ts +7 -2
- package/src/cohort-topic/sig/threshold.ts +41 -7
- package/src/cohort-topic/walk.ts +46 -9
- package/src/cohort-topic/willingness.ts +34 -3
- package/src/cohort-topic/wire/index.ts +1 -0
- package/src/cohort-topic/wire/payloads.ts +21 -0
- package/src/cohort-topic/wire/primitives.ts +26 -4
- package/src/cohort-topic/wire/types.ts +37 -0
- package/src/cohort-topic/wire/validate.ts +26 -3
- package/src/reactivity/config.ts +10 -10
- package/src/reactivity/index.ts +4 -3
- package/src/reactivity/rotation.ts +86 -78
- package/src/reactivity/subscription.ts +12 -9
- package/src/reactivity/topic-anchor.ts +42 -45
- package/src/reactivity/verify.ts +36 -17
- package/src/reactivity/wire.ts +1 -1
- package/src/transactor/change-notifier.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renewal.d.ts","sourceRoot":"","sources":["../../../../src/cohort-topic/registration/renewal.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"renewal.d.ts","sourceRoot":"","sources":["../../../../src/cohort-topic/registration/renewal.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,13 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Per `docs/cohort-topic.md` §TTL and renewal and §Failure modes:
|
|
5
5
|
*
|
|
6
|
-
* - Participant pings `primary` every `ttl/3`.
|
|
6
|
+
* - Participant pings `primary` every `ttl/3`. The four replies:
|
|
7
|
+
* - `ok` — the primary touched `lastPing` and gossips it; the failure count resets.
|
|
8
|
+
* - `primary_moved` — a rotation moved the slot; the participant adopts the named primary/backups/epoch
|
|
9
|
+
* and the failure count resets.
|
|
10
|
+
* - `unknown_registration` / `withdrawn` — the member holds no record for this participant (it restarted,
|
|
11
|
+
* the record expired, a stale withdraw removed it, or gossip has not reached it yet). Counted as a failed
|
|
12
|
+
* ping, exactly like no answer: an answer from a member that does not hold the record keeps nothing alive.
|
|
7
13
|
* - Three consecutive ping failures → participant promotes `backups[0]` via a re-attach RPC: a renew
|
|
8
14
|
* carrying a **signed `reattach` flag** (no full re-registration). The backup accepts when it holds
|
|
9
15
|
* the record locally *and* is a computed backup under the current epoch — re-stamping `primary` to
|
|
@@ -13,7 +19,11 @@
|
|
|
13
19
|
* payload instead of promoting the contacted backup (ignoring a reply that points back at the dead
|
|
14
20
|
* primary). **Resolved (GROUNDING):** the participant's `cohortEpoch` hint refreshes lazily — on the
|
|
15
21
|
* *next* ping/renewal after failover, not eagerly at failover time.
|
|
16
|
-
* - All of primary + backups fail → participant re-runs lookup from `d_max` (
|
|
22
|
+
* - All of primary + backups fail → participant re-runs lookup from `d_max` (injected) and adopts where the
|
|
23
|
+
* re-walk landed — primary, backups, epoch hint and the accepted register's correlation id. A walk that is
|
|
24
|
+
* not accepted keeps the old assignment. Either way the failure count resets, so the next re-walk is at
|
|
25
|
+
* least {@link MAX_PING_FAILURES} pings away: at most one per TTL, under the cohort's per-peer register
|
|
26
|
+
* rate limit, and a one-off `unknown_registration` from replication lag clears on the next ping.
|
|
17
27
|
* - Cohort-side: evict where `now − lastPing > ttl`; eviction is gossiped so members converge.
|
|
18
28
|
*
|
|
19
29
|
* Both sides take their transport/gossip by injection so storage + sharding + TTL stay unit-testable
|
|
@@ -28,10 +38,12 @@ class TtlRenewalParticipant {
|
|
|
28
38
|
consecutiveFailures = 0;
|
|
29
39
|
current;
|
|
30
40
|
epochHint;
|
|
41
|
+
correlationId;
|
|
31
42
|
constructor(initial, deps) {
|
|
32
43
|
this.deps = deps;
|
|
33
44
|
this.current = initial;
|
|
34
45
|
this.epochHint = deps.initialCohortEpoch;
|
|
46
|
+
this.correlationId = deps.correlationId;
|
|
35
47
|
}
|
|
36
48
|
get record() {
|
|
37
49
|
return this.current;
|
|
@@ -44,15 +56,10 @@ class TtlRenewalParticipant {
|
|
|
44
56
|
}
|
|
45
57
|
async pingLoop() {
|
|
46
58
|
const reply = await this.trySend(this.current.primary);
|
|
47
|
-
if (reply !== undefined) {
|
|
48
|
-
this.onPingSuccess(reply);
|
|
59
|
+
if (reply !== undefined && this.acceptPingReply(reply)) {
|
|
49
60
|
return;
|
|
50
61
|
}
|
|
51
|
-
this.
|
|
52
|
-
if (this.consecutiveFailures < MAX_PING_FAILURES) {
|
|
53
|
-
return;
|
|
54
|
-
}
|
|
55
|
-
await this.failover();
|
|
62
|
+
await this.strike();
|
|
56
63
|
}
|
|
57
64
|
async reattach(target) {
|
|
58
65
|
return this.deps.transport.send(target, await this.buildRenew({ reattach: true }));
|
|
@@ -77,11 +84,36 @@ class TtlRenewalParticipant {
|
|
|
77
84
|
return undefined;
|
|
78
85
|
}
|
|
79
86
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
87
|
+
/**
|
|
88
|
+
* Act on the primary's answer to a plain ping. Returns `false` when the answer says the member holds no
|
|
89
|
+
* record for this participant — a failed ping, which the caller counts as a strike.
|
|
90
|
+
*/
|
|
91
|
+
acceptPingReply(reply) {
|
|
92
|
+
switch (reply.result) {
|
|
93
|
+
case "ok": {
|
|
94
|
+
this.consecutiveFailures = 0;
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
case "primary_moved": {
|
|
98
|
+
this.consecutiveFailures = 0;
|
|
99
|
+
// Lazy cohortEpoch refresh lands here: a move discovered on a normal ping updates the hint.
|
|
100
|
+
this.applyPrimaryMoved(reply);
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
case "unknown_registration":
|
|
104
|
+
case "withdrawn":
|
|
105
|
+
return false;
|
|
106
|
+
default: {
|
|
107
|
+
const unexpected = reply.result;
|
|
108
|
+
throw new Error(`cohort-topic: unexpected renew result ${String(unexpected)}`);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/** Count a failed ping; the {@link MAX_PING_FAILURES}th in a row fails over. */
|
|
113
|
+
async strike() {
|
|
114
|
+
this.consecutiveFailures++;
|
|
115
|
+
if (this.consecutiveFailures >= MAX_PING_FAILURES) {
|
|
116
|
+
await this.failover();
|
|
85
117
|
}
|
|
86
118
|
}
|
|
87
119
|
/**
|
|
@@ -89,7 +121,7 @@ class TtlRenewalParticipant {
|
|
|
89
121
|
* backup accepted the crash-failover promotion → promote it locally. A `primary_moved` means a real
|
|
90
122
|
* rotation moved primary to a different live member → adopt that payload (not the contacted backup),
|
|
91
123
|
* **unless** it points back at the just-failed primary (the bounce guard) — then keep trying. All
|
|
92
|
-
* backups exhausted → re-run lookup from `d_max
|
|
124
|
+
* backups exhausted → re-run lookup from `d_max` and adopt where it landed.
|
|
93
125
|
*/
|
|
94
126
|
async failover() {
|
|
95
127
|
const failedPrimary = this.current.primary;
|
|
@@ -117,11 +149,29 @@ class TtlRenewalParticipant {
|
|
|
117
149
|
}
|
|
118
150
|
// unknown_registration (replication lag) or anything else: try the next backup.
|
|
119
151
|
}
|
|
120
|
-
|
|
121
|
-
//
|
|
122
|
-
//
|
|
123
|
-
|
|
124
|
-
|
|
152
|
+
// Reset the counter however the relookup ends — landed, not accepted, or thrown — so a registration
|
|
153
|
+
// that stays unreachable backs off to one d_max walk per MAX_PING_FAILURES pings rather than one per
|
|
154
|
+
// ping. A throw still propagates to the caller of `pingLoop`.
|
|
155
|
+
try {
|
|
156
|
+
const landing = await this.deps.transport.relookup();
|
|
157
|
+
if (landing !== undefined) {
|
|
158
|
+
this.adopt(landing);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
finally {
|
|
162
|
+
this.consecutiveFailures = 0;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
/** Take a re-walk's assignment as the registration: later pings go to its primary under its correlation id. */
|
|
166
|
+
adopt(landing) {
|
|
167
|
+
this.current = {
|
|
168
|
+
...this.current,
|
|
169
|
+
primary: landing.primary,
|
|
170
|
+
backups: [...landing.backups],
|
|
171
|
+
lastPing: this.deps.clock(),
|
|
172
|
+
};
|
|
173
|
+
this.epochHint = landing.cohortEpoch;
|
|
174
|
+
this.correlationId = landing.correlationId;
|
|
125
175
|
}
|
|
126
176
|
async tryReattach(target) {
|
|
127
177
|
try {
|
|
@@ -165,7 +215,7 @@ class TtlRenewalParticipant {
|
|
|
165
215
|
v: 1,
|
|
166
216
|
topicId: bytesKey(this.current.topicId),
|
|
167
217
|
participantId: bytesKey(this.current.participantId),
|
|
168
|
-
correlationId: this.
|
|
218
|
+
correlationId: this.correlationId,
|
|
169
219
|
timestamp: this.deps.clock(),
|
|
170
220
|
};
|
|
171
221
|
if (opts.reattach === true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renewal.js","sourceRoot":"","sources":["../../../../src/cohort-topic/registration/renewal.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renewal.js","sourceRoot":"","sources":["../../../../src/cohort-topic/registration/renewal.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,12 @@ import type { CollectionChangeEvent, CommitCert } from "../transactor/change-not
|
|
|
28
28
|
export interface CohortHint {
|
|
29
29
|
readonly topicId: Uint8Array;
|
|
30
30
|
readonly tier: Tier;
|
|
31
|
+
/**
|
|
32
|
+
* The tree tier `d` the walk landed at: `0` is the topic's root cohort, `d ≥ 1` a cohort below it. A
|
|
33
|
+
* root-placed topic's root can move while the tiers below it stay put, so a caller following a moved
|
|
34
|
+
* root reads this to choose between {@link CohortTopicService.moveRoot} and registering again.
|
|
35
|
+
*/
|
|
36
|
+
readonly treeTier: number;
|
|
31
37
|
/** Serving cohort member. */
|
|
32
38
|
readonly primary: Uint8Array;
|
|
33
39
|
/** Warm-failover cohort members (1..2). */
|
|
@@ -37,6 +43,13 @@ export interface CohortHint {
|
|
|
37
43
|
readonly cohortMembers: Uint8Array[];
|
|
38
44
|
/** Coarse traffic barometer, when the cohort attached one. */
|
|
39
45
|
readonly topicTraffic?: TopicTrafficV1;
|
|
46
|
+
/**
|
|
47
|
+
* The root key the topic was resolved under, when it is root-placed (its tier-0 cohort sits at
|
|
48
|
+
* `H(rootKey)`) — on a handle, the key {@link CohortTopicService.moveRoot} last named, which a handle at
|
|
49
|
+
* the root (`treeTier` 0) holds before it has registered there. Absent for the default addressing. A
|
|
50
|
+
* caller verifying a message signed by that root needs it to know the root's threshold rule applies.
|
|
51
|
+
*/
|
|
52
|
+
readonly rootKey?: Uint8Array;
|
|
40
53
|
}
|
|
41
54
|
/** A live registration: a {@link CohortHint} plus the participant-side renewal handle behind it. */
|
|
42
55
|
export interface RegistrationHandle extends CohortHint {
|
|
@@ -68,6 +81,13 @@ export interface RegisterRequest {
|
|
|
68
81
|
readonly ttl?: number;
|
|
69
82
|
/** Mark this a cold-root bootstrap request. */
|
|
70
83
|
readonly bootstrap?: boolean;
|
|
84
|
+
/**
|
|
85
|
+
* Place this topic's root at a routing key: raw key bytes (1..`MAX_ROOT_KEY_BYTES`), e.g. a block's
|
|
86
|
+
* routing key. The topic's tier-0 cohort is then the group responsible for that key, at `H(rootKey)`,
|
|
87
|
+
* instead of the cohort at `H(0x00 ‖ topicId)` (§Tier addressing → Root placement at a routing key).
|
|
88
|
+
* Every participant of one topic must name the same key. Absent → the default addressing.
|
|
89
|
+
*/
|
|
90
|
+
readonly rootKey?: Uint8Array;
|
|
71
91
|
}
|
|
72
92
|
/** The substrate's participant-facing contract. */
|
|
73
93
|
export interface CohortTopicService {
|
|
@@ -75,11 +95,23 @@ export interface CohortTopicService {
|
|
|
75
95
|
register(req: RegisterRequest): Promise<RegistrationHandle>;
|
|
76
96
|
/** Run one `ttl/3` renewal cycle for `handle` (handles `primary_moved` + crash-failover). */
|
|
77
97
|
renew(handle: RegistrationHandle): Promise<void>;
|
|
78
|
-
/**
|
|
79
|
-
|
|
98
|
+
/**
|
|
99
|
+
* Resolve the cohort for `topicId` at `tier` without keeping a live registration. `rootKey` names the
|
|
100
|
+
* root of a root-placed topic (see {@link RegisterRequest.rootKey}).
|
|
101
|
+
*/
|
|
102
|
+
lookup(topicId: Uint8Array, tier: Tier, rootKey?: Uint8Array): Promise<CohortHint>;
|
|
80
103
|
/** Stop renewing `handle` and send a best-effort signed withdraw tombstone so the cohort frees the
|
|
81
104
|
* record immediately (TTL expiry remains the fallback if the primary is unreachable). */
|
|
82
105
|
withdraw(handle: RegistrationHandle): Promise<void>;
|
|
106
|
+
/**
|
|
107
|
+
* The topic's root moved to `rootKey` (a root-placed topic only — a handle registered without a root key
|
|
108
|
+
* throws). Nothing is sent: a registration at a tier below the root stays where it is. A later re-walk of
|
|
109
|
+
* this registration (renewal failover) names the new key, so it lands at the new root rather than the old
|
|
110
|
+
* one. A registration AT the root (`handle.treeTier === 0`) is left at the old root by this call and must
|
|
111
|
+
* be re-registered instead — `register` with the new key displaces it (see the NOTE at `startRenewal`).
|
|
112
|
+
* A stale handle (no longer the live registration for its topic) is a no-op.
|
|
113
|
+
*/
|
|
114
|
+
moveRoot(handle: RegistrationHandle, rootKey: Uint8Array): void;
|
|
83
115
|
/** Origination hook the change-notifier bridge invokes per local member commit; see {@link LocalChangeHook}. */
|
|
84
116
|
onLocalCommit?: LocalChangeHook;
|
|
85
117
|
/** Cohort gossip bus — applications fold app state into the existing gossip. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/cohort-topic/service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/cohort-topic/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,10 +22,11 @@ import { createTierAddressing } from "./addressing.js";
|
|
|
22
22
|
import { makeDMaxComputer } from "./dmax.js";
|
|
23
23
|
import { DEFAULT_FANOUT } from "./addressing.js";
|
|
24
24
|
import { createWalkEngine } from "./walk.js";
|
|
25
|
-
import { createRenewalParticipant } from "./registration/renewal.js";
|
|
25
|
+
import { createRenewalParticipant, } from "./registration/renewal.js";
|
|
26
26
|
import { DEFAULT_TTL_MS } from "./registration/types.js";
|
|
27
27
|
import { recordKey } from "./registration/bytes.js";
|
|
28
28
|
import { bytesToB64url, b64urlToBytes, decodeRenewReplyV1, encodeCohortMessage } from "./wire/codec.js";
|
|
29
|
+
import { MAX_ROOT_KEY_BYTES } from "./wire/validate.js";
|
|
29
30
|
/** Thrown when the substrate cannot place a registration right now; carries the back-off delay. */
|
|
30
31
|
export class CohortBackoffError extends Error {
|
|
31
32
|
afterMs;
|
|
@@ -44,7 +45,7 @@ class WalkRegisterService {
|
|
|
44
45
|
clock;
|
|
45
46
|
ttl;
|
|
46
47
|
maxMessageBytes;
|
|
47
|
-
/** Live
|
|
48
|
+
/** Live renewals, keyed by `(topicId, participantId)` so renew/withdraw/moveRoot find their handle. */
|
|
48
49
|
renewals = new Map();
|
|
49
50
|
participantId;
|
|
50
51
|
constructor(deps) {
|
|
@@ -72,30 +73,45 @@ class WalkRegisterService {
|
|
|
72
73
|
});
|
|
73
74
|
}
|
|
74
75
|
async register(req) {
|
|
75
|
-
|
|
76
|
+
assertRootKey(req.rootKey);
|
|
77
|
+
const outcome = await this.walk.register(req.topicId, req.tier, req.appPayload, { rootKey: req.rootKey });
|
|
76
78
|
return this.handleFromOutcome(req, outcome);
|
|
77
79
|
}
|
|
78
|
-
async lookup(topicId, tier) {
|
|
80
|
+
async lookup(topicId, tier, rootKey) {
|
|
81
|
+
assertRootKey(rootKey);
|
|
79
82
|
// A read-only probe: it walks to the responsible cohort exactly as a register would and returns the
|
|
80
83
|
// same cohort snapshot, but admits NOTHING — no soft-state record, no arrival, no promotion trigger,
|
|
81
84
|
// no topic-budget touch, and never a cold-start instantiation. A topic served nowhere resolves to a
|
|
82
85
|
// `CohortBackoffError` (the probe never bootstraps a cold root), so a lookup leaves no throwaway
|
|
83
86
|
// registration behind to TTL-expire (§Application policies; the lookup-as-register interim is gone).
|
|
84
|
-
const outcome = await this.walk.register(topicId, tier, undefined, { probe: true });
|
|
87
|
+
const outcome = await this.walk.register(topicId, tier, undefined, { probe: true, rootKey });
|
|
85
88
|
if (outcome.kind !== "accepted") {
|
|
86
89
|
throw new CohortBackoffError(outcome.kind === "retry_later" ? outcome.afterMs : 0);
|
|
87
90
|
}
|
|
88
|
-
return this.hintFromReply(topicId, tier, outcome
|
|
91
|
+
return this.hintFromReply(topicId, tier, outcome, rootKey);
|
|
89
92
|
}
|
|
90
93
|
async renew(handle) {
|
|
91
94
|
// Act only if this handle is still the live entry. A stale handle (superseded by a second
|
|
92
95
|
// register() for the same pair) must not drive the new registration's ping loop, and a
|
|
93
96
|
// withdrawn handle must not silently re-start it.
|
|
94
|
-
|
|
97
|
+
const live = this.liveRenewal(handle);
|
|
98
|
+
if (live === undefined) {
|
|
95
99
|
return;
|
|
96
100
|
}
|
|
97
101
|
await handle.renewal.pingLoop();
|
|
98
|
-
this.syncHandle(handle);
|
|
102
|
+
this.syncHandle(handle, live.landing);
|
|
103
|
+
}
|
|
104
|
+
moveRoot(handle, rootKey) {
|
|
105
|
+
assertRootKey(rootKey);
|
|
106
|
+
if (handle.rootKey === undefined) {
|
|
107
|
+
throw new Error("cohort-topic: moveRoot needs a root-placed registration; this one was registered without a rootKey");
|
|
108
|
+
}
|
|
109
|
+
const live = this.liveRenewal(handle);
|
|
110
|
+
if (live === undefined) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
live.root.key = rootKey;
|
|
114
|
+
handle.rootKey = rootKey;
|
|
99
115
|
}
|
|
100
116
|
async withdraw(handle) {
|
|
101
117
|
// Two halves: (1) drop the handle from the live set so further renew() pings no-op (see renew()),
|
|
@@ -103,17 +119,16 @@ class WalkRegisterService {
|
|
|
103
119
|
// primary so the cohort frees the record immediately instead of holding it for up to a full TTL.
|
|
104
120
|
// The delete happens FIRST so a concurrent renew() already no-ops before the tombstone is sent. If
|
|
105
121
|
// the tombstone send fails (primary unreachable), the cohort soft-state TTL-expires as the
|
|
106
|
-
// fallback — withdraw never throws on a transport failure. Idempotent: a second withdraw finds
|
|
107
|
-
//
|
|
122
|
+
// fallback — withdraw never throws on a transport failure. Idempotent: a second withdraw finds no
|
|
123
|
+
// live entry for the handle and no-ops.
|
|
108
124
|
// Guard: act only if this handle is still the live entry. A stale handle must not evict the
|
|
109
125
|
// new registration or send a tombstone on its behalf.
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
if (renewal !== handle.renewal) {
|
|
126
|
+
const live = this.liveRenewal(handle);
|
|
127
|
+
if (live === undefined) {
|
|
113
128
|
return;
|
|
114
129
|
}
|
|
115
|
-
this.renewals.delete(
|
|
116
|
-
await renewal.withdraw();
|
|
130
|
+
this.renewals.delete(recordKey(handle.topicId, this.participantId));
|
|
131
|
+
await live.renewal.withdraw();
|
|
117
132
|
}
|
|
118
133
|
cohortGossip() {
|
|
119
134
|
return this.deps.gossipBus;
|
|
@@ -126,10 +141,15 @@ class WalkRegisterService {
|
|
|
126
141
|
if (outcome.kind !== "accepted") {
|
|
127
142
|
throw new CohortBackoffError(outcome.kind === "retry_later" ? outcome.afterMs : 0);
|
|
128
143
|
}
|
|
129
|
-
const hint = this.hintFromReply(req.topicId, req.tier, outcome.
|
|
144
|
+
const hint = this.hintFromReply(req.topicId, req.tier, outcome, req.rootKey);
|
|
130
145
|
const renewal = this.startRenewal(req, hint, outcome.correlationId);
|
|
131
146
|
return { ...hint, renewal };
|
|
132
147
|
}
|
|
148
|
+
/** The live renewal `handle` drives, or `undefined` when a later register displaced it or it was withdrawn. */
|
|
149
|
+
liveRenewal(handle) {
|
|
150
|
+
const live = this.renewals.get(recordKey(handle.topicId, this.participantId));
|
|
151
|
+
return live?.renewal === handle.renewal ? live : undefined;
|
|
152
|
+
}
|
|
133
153
|
startRenewal(req, hint, correlationId) {
|
|
134
154
|
const ttl = req.ttl ?? this.ttl;
|
|
135
155
|
const initial = {
|
|
@@ -143,7 +163,9 @@ class WalkRegisterService {
|
|
|
143
163
|
ttl,
|
|
144
164
|
appState: req.appPayload,
|
|
145
165
|
};
|
|
146
|
-
const
|
|
166
|
+
const root = { key: req.rootKey };
|
|
167
|
+
const landing = { treeTier: hint.treeTier, cohortMembers: hint.cohortMembers, topicTraffic: hint.topicTraffic };
|
|
168
|
+
const transport = this.renewalTransport(req, root, landing);
|
|
147
169
|
const renewal = createRenewalParticipant(initial, {
|
|
148
170
|
transport,
|
|
149
171
|
clock: this.clock,
|
|
@@ -158,41 +180,62 @@ class WalkRegisterService {
|
|
|
158
180
|
correlationId,
|
|
159
181
|
initialCohortEpoch: hint.cohortEpoch,
|
|
160
182
|
});
|
|
161
|
-
// NOTE: a second register() for the same (topicId, participantId)
|
|
162
|
-
//
|
|
163
|
-
//
|
|
164
|
-
//
|
|
165
|
-
//
|
|
166
|
-
|
|
183
|
+
// NOTE: accepted — a second register() for the same (topicId, participantId) displaces the first:
|
|
184
|
+
// renew()/withdraw()/moveRoot() on the displaced handle no-op (identity guard), and NO tombstone is
|
|
185
|
+
// sent for the displaced record, by design. A participant re-registers at a moved root while its old
|
|
186
|
+
// record still lives at the old one, and a machine in both roots' storage groups holds both; a
|
|
187
|
+
// tombstone resolves through the host's `findHolder`, which picks the newer record there, so it would
|
|
188
|
+
// evict the live registration. The displaced record expires by TTL at its cohort.
|
|
189
|
+
this.renewals.set(recordKey(req.topicId, this.participantId), { renewal, root, landing });
|
|
167
190
|
return renewal;
|
|
168
191
|
}
|
|
169
|
-
/**
|
|
170
|
-
|
|
192
|
+
/**
|
|
193
|
+
* Renewal transport: dial the cached primary directly; a full failure re-runs the register walk. The
|
|
194
|
+
* re-walk reads the root key from `root` when it runs, so after {@link CohortTopicService.moveRoot} it
|
|
195
|
+
* lands at the topic's current root rather than the one it registered under. An accepted re-walk records
|
|
196
|
+
* its tree tier, cohort and traffic in `landing` and hands its assignment to the participant to adopt.
|
|
197
|
+
*/
|
|
198
|
+
renewalTransport(req, root, landing) {
|
|
171
199
|
return {
|
|
172
200
|
send: async (target, msg) => {
|
|
173
201
|
const raw = await this.deps.router.dialMember({ id: target }, encodeCohortMessage(msg, this.maxMessageBytes));
|
|
174
202
|
return decodeRenewReplyV1(raw, this.maxMessageBytes);
|
|
175
203
|
},
|
|
176
204
|
relookup: async () => {
|
|
177
|
-
|
|
205
|
+
// NOTE: re-sends the first registration's `appPayload` (for a collection watch, its `tailIdAtAttach`
|
|
206
|
+
// and `lastKnownRev`). No cohort reads those fields off a held record today; if one ever does, the
|
|
207
|
+
// re-walk needs a fresh payload from the registering caller.
|
|
208
|
+
const outcome = await this.walk.register(req.topicId, req.tier, req.appPayload, { rootKey: root.key });
|
|
209
|
+
if (outcome.kind !== "accepted") {
|
|
210
|
+
return undefined;
|
|
211
|
+
}
|
|
212
|
+
const hint = this.hintFromReply(req.topicId, req.tier, outcome, root.key);
|
|
213
|
+
landing.treeTier = hint.treeTier;
|
|
214
|
+
landing.cohortMembers = hint.cohortMembers;
|
|
215
|
+
landing.topicTraffic = hint.topicTraffic;
|
|
216
|
+
return { primary: hint.primary, backups: hint.backups, cohortEpoch: hint.cohortEpoch, correlationId: outcome.correlationId };
|
|
178
217
|
},
|
|
179
218
|
};
|
|
180
219
|
}
|
|
181
|
-
hintFromReply(topicId, tier,
|
|
220
|
+
hintFromReply(topicId, tier, outcome, rootKey) {
|
|
221
|
+
const reply = outcome.reply;
|
|
182
222
|
if (reply.primary === undefined || reply.cohortEpoch === undefined) {
|
|
183
223
|
throw new CohortBackoffError(0);
|
|
184
224
|
}
|
|
185
225
|
return {
|
|
186
226
|
topicId,
|
|
187
227
|
tier,
|
|
228
|
+
treeTier: outcome.treeTier,
|
|
188
229
|
primary: b64urlToBytes(reply.primary),
|
|
189
230
|
backups: (reply.backups ?? []).map(b64urlToBytes),
|
|
190
231
|
cohortEpoch: b64urlToBytes(reply.cohortEpoch),
|
|
191
232
|
cohortMembers: (reply.cohortMembers ?? []).map(b64urlToBytes),
|
|
192
233
|
topicTraffic: reply.topicTraffic,
|
|
234
|
+
...(rootKey === undefined ? {} : { rootKey }),
|
|
193
235
|
};
|
|
194
236
|
}
|
|
195
|
-
|
|
237
|
+
/** Copy the registration's current placement onto `handle`: the participant's record, and the last walk's landing. */
|
|
238
|
+
syncHandle(handle, landing) {
|
|
196
239
|
const rec = handle.renewal.record;
|
|
197
240
|
handle.primary = rec.primary;
|
|
198
241
|
handle.backups = [...rec.backups];
|
|
@@ -200,6 +243,9 @@ class WalkRegisterService {
|
|
|
200
243
|
if (epoch !== undefined) {
|
|
201
244
|
handle.cohortEpoch = epoch;
|
|
202
245
|
}
|
|
246
|
+
handle.treeTier = landing.treeTier;
|
|
247
|
+
handle.cohortMembers = landing.cohortMembers;
|
|
248
|
+
handle.topicTraffic = landing.topicTraffic;
|
|
203
249
|
}
|
|
204
250
|
/** The per-probe `RegisterV1` builder: stamps participant coord/ttl/correlation and signs. */
|
|
205
251
|
messageFactory() {
|
|
@@ -246,6 +292,9 @@ class WalkRegisterService {
|
|
|
246
292
|
if (params.appPayload !== undefined) {
|
|
247
293
|
body.appPayload = bytesToB64url(params.appPayload);
|
|
248
294
|
}
|
|
295
|
+
if (params.rootKey !== undefined) {
|
|
296
|
+
body.rootKey = bytesToB64url(params.rootKey);
|
|
297
|
+
}
|
|
249
298
|
return { ...body, signature: await this.deps.signer.signRegister(body) };
|
|
250
299
|
},
|
|
251
300
|
};
|
|
@@ -256,6 +305,15 @@ class WalkRegisterService {
|
|
|
256
305
|
return bytesToB64url(randomBytes(16));
|
|
257
306
|
}
|
|
258
307
|
}
|
|
308
|
+
/**
|
|
309
|
+
* Reject a root key no cohort would accept. The wire validator refuses an empty or over-long `rootKey`,
|
|
310
|
+
* so sending one would only surface as a remote decode failure; it is a caller error, raised here.
|
|
311
|
+
*/
|
|
312
|
+
function assertRootKey(rootKey) {
|
|
313
|
+
if (rootKey !== undefined && (rootKey.length === 0 || rootKey.length > MAX_ROOT_KEY_BYTES)) {
|
|
314
|
+
throw new RangeError(`cohort-topic: rootKey must be 1..${MAX_ROOT_KEY_BYTES} bytes, got ${rootKey.length}`);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
259
317
|
/** Build the participant-facing {@link CohortTopicService} over the injected ports. */
|
|
260
318
|
export function createCohortTopicService(deps) {
|
|
261
319
|
return new WalkRegisterService(deps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/cohort-topic/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/cohort-topic/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,11 +31,15 @@ export type DemotionSignable = Pick<DemotionNoticeV1, "topicId" | "tier" | "pare
|
|
|
31
31
|
/** Canonical signed byte image of a demotion notice. `cohortEpoch` stays last (the `/sign` endorser reads it positionally). */
|
|
32
32
|
export declare function demotionNoticeSigningPayload(n: DemotionSignable): Uint8Array;
|
|
33
33
|
/** Fields of a `ChildLinkV1` covered by the child cohort's threshold signature. */
|
|
34
|
-
export type ChildLinkSignable = Pick<ChildLinkV1, "topicId" | "childCohortCoord" | "childParticipantCoord" | "childTier" | "tier" | "effectiveAt" | "cohortEpoch">;
|
|
34
|
+
export type ChildLinkSignable = Pick<ChildLinkV1, "topicId" | "childCohortCoord" | "childParticipantCoord" | "childTier" | "tier" | "effectiveAt" | "cohortEpoch" | "rootKey">;
|
|
35
35
|
/**
|
|
36
36
|
* Canonical signed byte image of a child-link frame. `cohortEpoch` stays **last** so the `/sign` endorser
|
|
37
37
|
* (`handleSignRequest`) reads the embedded epoch positionally as `image[image.length - 1]`, exactly as it
|
|
38
38
|
* does for a promotion / demotion notice.
|
|
39
|
+
*
|
|
40
|
+
* `rootKey` (a tier-1 child of a root-placed topic) is covered only when present, and is inserted **before**
|
|
41
|
+
* `cohortEpoch` for that same reason. A link without one keeps the eight-element image unchanged; one
|
|
42
|
+
* with it signs nine elements, so stripping or swapping the key fails verification.
|
|
39
43
|
*/
|
|
40
44
|
export declare function childLinkSigningPayload(n: ChildLinkSignable): Uint8Array;
|
|
41
45
|
//# sourceMappingURL=payloads.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/cohort-topic/sig/payloads.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;
|
|
1
|
+
{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/cohort-topic/sig/payloads.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI3G,gIAAgI;AAChI,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,GAAG,cAAc,CAAC,CAAC;AAExH,+DAA+D;AAC/D,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,sBAAsB,GAAG,UAAU,CAErF;AAED,0EAA0E;AAC1E,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,aAAa,GAAG,aAAa,GAAG,aAAa,CAAC,CAAC;AAE3I,gIAAgI;AAChI,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAE9E;AAED,yEAAyE;AACzE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,MAAM,GAAG,mBAAmB,GAAG,aAAa,GAAG,aAAa,GAAG,aAAa,CAAC,CAAC;AAEhJ,+HAA+H;AAC/H,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,gBAAgB,GAAG,UAAU,CAE5E;AAED,mFAAmF;AACnF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,kBAAkB,GAAG,uBAAuB,GAAG,WAAW,GAAG,MAAM,GAAG,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC,CAAC;AAE/K;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAExE"}
|