@serfab/cadre-core 0.11.0 → 0.13.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/README.md +3 -2
- package/dist/announce-addrs.d.ts +49 -0
- package/dist/announce-addrs.js +78 -0
- package/dist/announce-addrs.js.map +1 -0
- package/dist/cadre-node.d.ts +607 -53
- package/dist/cadre-node.js +1268 -157
- package/dist/cadre-node.js.map +1 -1
- package/dist/control-database.d.ts +174 -23
- package/dist/control-database.js +317 -107
- package/dist/control-database.js.map +1 -1
- package/dist/control-read-retry.d.ts +103 -0
- package/dist/control-read-retry.js +145 -0
- package/dist/control-read-retry.js.map +1 -0
- package/dist/control-retry.d.ts +101 -0
- package/dist/control-retry.js +108 -0
- package/dist/control-retry.js.map +1 -0
- package/dist/control-schema.d.ts +1 -1
- package/dist/control-schema.js +50 -6
- package/dist/control-schema.js.map +1 -1
- package/dist/control-write-retry.d.ts +59 -35
- package/dist/control-write-retry.js +21 -92
- package/dist/control-write-retry.js.map +1 -1
- package/dist/delegate-admission.d.ts +17 -15
- package/dist/delegate-admission.js +17 -15
- package/dist/delegate-admission.js.map +1 -1
- package/dist/enrolled-machine-store-file.d.ts +13 -0
- package/dist/enrolled-machine-store-file.js +41 -0
- package/dist/enrolled-machine-store-file.js.map +1 -0
- package/dist/enrolled-machine-store.d.ts +81 -0
- package/dist/enrolled-machine-store.js +225 -0
- package/dist/enrolled-machine-store.js.map +1 -0
- package/dist/file-durable-slot.js +5 -3
- package/dist/file-durable-slot.js.map +1 -1
- package/dist/index.d.ts +10 -6
- package/dist/index.js +39 -12
- package/dist/index.js.map +1 -1
- package/dist/membership-connection-gater.d.ts +226 -26
- package/dist/membership-connection-gater.js +316 -30
- package/dist/membership-connection-gater.js.map +1 -1
- package/dist/node-local-snapshot.d.ts +6 -0
- package/dist/node-local-snapshot.js +7 -1
- package/dist/node-local-snapshot.js.map +1 -1
- package/dist/{strand-backfill.d.ts → peer-join-backfill.d.ts} +49 -20
- package/dist/{strand-backfill.js → peer-join-backfill.js} +146 -56
- package/dist/peer-join-backfill.js.map +1 -0
- package/dist/peer-record.d.ts +26 -0
- package/dist/peer-record.js +32 -0
- package/dist/peer-record.js.map +1 -1
- package/dist/relay-addrs.d.ts +145 -22
- package/dist/relay-addrs.js +314 -31
- package/dist/relay-addrs.js.map +1 -1
- package/dist/relay-reservation.d.ts +20 -15
- package/dist/relay-reservation.js +18 -14
- package/dist/relay-reservation.js.map +1 -1
- package/dist/strand-addr-protocol.js +16 -0
- package/dist/strand-addr-protocol.js.map +1 -1
- package/dist/strand-database.d.ts +12 -0
- package/dist/strand-database.js +16 -0
- package/dist/strand-database.js.map +1 -1
- package/dist/strand-formation-manager.d.ts +22 -9
- package/dist/strand-formation-manager.js +20 -12
- package/dist/strand-formation-manager.js.map +1 -1
- package/dist/strand-formation-protocol.d.ts +83 -9
- package/dist/strand-formation-protocol.js +86 -10
- package/dist/strand-formation-protocol.js.map +1 -1
- package/dist/strand-instance-manager.d.ts +151 -17
- package/dist/strand-instance-manager.js +237 -32
- package/dist/strand-instance-manager.js.map +1 -1
- package/dist/strand-membership-writer.d.ts +118 -14
- package/dist/strand-membership-writer.js +203 -15
- package/dist/strand-membership-writer.js.map +1 -1
- package/dist/strand-network-config.d.ts +84 -0
- package/dist/strand-network-config.js +136 -0
- package/dist/strand-network-config.js.map +1 -0
- package/dist/strand-revocation-enforcer.d.ts +392 -0
- package/dist/strand-revocation-enforcer.js +533 -0
- package/dist/strand-revocation-enforcer.js.map +1 -0
- package/dist/strand-solicitation.d.ts +10 -3
- package/dist/strand-solicitation.js +12 -7
- package/dist/strand-solicitation.js.map +1 -1
- package/dist/strand-wake-protocol.d.ts +47 -2
- package/dist/strand-wake-protocol.js +76 -6
- package/dist/strand-wake-protocol.js.map +1 -1
- package/dist/strand-watcher.js +6 -1
- package/dist/strand-watcher.js.map +1 -1
- package/dist/types.d.ts +282 -43
- package/dist/types.js +7 -1
- package/dist/types.js.map +1 -1
- package/package.json +16 -8
- package/src/announce-addrs.ts +93 -0
- package/src/cadre-node.ts +1366 -171
- package/src/control-database.ts +2628 -2406
- package/src/control-read-retry.ts +167 -0
- package/src/control-retry.ts +190 -0
- package/src/control-schema.ts +50 -6
- package/src/control-write-retry.ts +30 -130
- package/src/delegate-admission.ts +17 -15
- package/src/enrolled-machine-store-file.ts +43 -0
- package/src/enrolled-machine-store.ts +280 -0
- package/src/file-durable-slot.ts +5 -3
- package/src/index.ts +477 -407
- package/src/membership-connection-gater.ts +539 -204
- package/src/node-local-snapshot.ts +13 -1
- package/src/peer-addr-book.ts +251 -250
- package/src/{strand-backfill.ts → peer-join-backfill.ts} +187 -75
- package/src/peer-record.ts +33 -0
- package/src/relay-addrs.ts +436 -111
- package/src/relay-reservation.ts +828 -823
- package/src/strand-addr-protocol.ts +17 -0
- package/src/strand-database.ts +17 -0
- package/src/strand-formation-manager.ts +511 -491
- package/src/strand-formation-protocol.ts +808 -692
- package/src/strand-instance-manager.ts +899 -611
- package/src/strand-membership-writer.ts +232 -15
- package/src/strand-network-config.ts +172 -0
- package/src/strand-revocation-enforcer.ts +653 -0
- package/src/strand-solicitation.ts +484 -472
- package/src/strand-wake-protocol.ts +94 -8
- package/src/strand-watcher.ts +319 -314
- package/src/types.ts +1554 -1309
- package/dist/strand-backfill.js.map +0 -1
|
@@ -1,36 +1,59 @@
|
|
|
1
1
|
import debug from 'debug';
|
|
2
2
|
import { BlockTransferClient } from '@optimystic/db-p2p';
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
//
|
|
3
|
+
// Peer-join whole-store block catch-up, shared by the STRAND networks and the CONTROL
|
|
4
|
+
// network. On `connection:open` (debounced) it pushes every committed, materialized block
|
|
5
|
+
// in the local raw store to the new peer, so a machine that joined after blocks were
|
|
6
|
+
// committed still ends up physically holding them. Optimystic has no cohort-join catch-up
|
|
7
|
+
// of its own; a block committed while its writer was alone has exactly one holder forever
|
|
8
|
+
// without this (named collection-header blocks are written once, at collection creation,
|
|
9
|
+
// and their revision never moves again — so no later commit ever carries them anywhere).
|
|
10
|
+
//
|
|
11
|
+
// NOTE: this copies the WHOLE local store to every newly connected peer, which is right
|
|
12
|
+
// while a network is one party's handful of machines (see docs/architecture.md →
|
|
13
|
+
// Replication cluster size — the control network replicates to the whole party by intent,
|
|
14
|
+
// and "On a strand, the machine count is not a party count"). If these meshes ever get
|
|
15
|
+
// large, filter the pushed set by FRET cohort responsibility for each block id instead of
|
|
16
|
+
// pushing everything.
|
|
8
17
|
//
|
|
9
18
|
// NOTE: this lives in cadre-core only because `../optimystic` is read-only from this repo.
|
|
10
19
|
// If Optimystic ever grows a cohort-join catch-up of its own, delete this module rather
|
|
11
20
|
// than running two.
|
|
12
21
|
//
|
|
13
|
-
// Membership
|
|
14
|
-
//
|
|
15
|
-
//
|
|
16
|
-
//
|
|
17
|
-
//
|
|
18
|
-
//
|
|
19
|
-
//
|
|
22
|
+
// Membership — the one place the two networks differ, expressed as the optional
|
|
23
|
+
// `authorizePeer` dep:
|
|
24
|
+
//
|
|
25
|
+
// - STRAND networks pass none. Anything connected on a strand's own libp2p network already
|
|
26
|
+
// receives cohort replicas of new commits, so pushing older blocks to it exposes nothing
|
|
27
|
+
// new; adding a gate would diverge from what ordinary replication already does there. A
|
|
28
|
+
// peer that does NOT speak the strand's block-transfer protocol (a bare circuit relay or
|
|
29
|
+
// bootstrap node the strand node also connects to) cannot receive anything: the protocol
|
|
30
|
+
// id is namespaced per strand, so the dial fails and the push is dropped.
|
|
31
|
+
// - The CONTROL network MUST pass one, because that argument does not carry over: its
|
|
32
|
+
// inbound connection gate deliberately admits non-members in several states (an
|
|
33
|
+
// un-enrolled node taking its seed, an open enrollment window, an outstanding
|
|
34
|
+
// invitation, configured bootstrap/relay peers — see docs/architecture.md, the
|
|
35
|
+
// control-network inbound connection gate). Pushing the whole control store to such a
|
|
36
|
+
// peer would hand a stranger the party's entire membership, addresses and strand list.
|
|
37
|
+
// `CadreNode` passes `isAuthorizedMember`; the gate is consulted at PUSH time, not at
|
|
38
|
+
// schedule time, and fails closed on a thrown check. A denied run is not memoized, so
|
|
39
|
+
// the peer is retried on its next `connection:open` — or sooner, via
|
|
40
|
+
// `scheduleConnectedPeers()` on a membership change (the production join order is
|
|
41
|
+
// connect-then-authorize, so the denial at dial time is the expected first pass).
|
|
20
42
|
//
|
|
21
|
-
// NOTE:
|
|
22
|
-
// is never memoized (only clean runs are). Bounded today by the
|
|
23
|
-
// unreachable-peer bail in `runCatchUp` — one dial per event, not one
|
|
24
|
-
// node ever holds many
|
|
25
|
-
// gets expensive, pre-check `libp2p.peerStore` for this
|
|
26
|
-
// before enumerating.
|
|
43
|
+
// NOTE: a failing dial to a non-speaking peer costs one dial timeout per connection:open
|
|
44
|
+
// from such a peer, and is never memoized (only clean runs are). Bounded today by the
|
|
45
|
+
// debounce plus the unreachable-peer bail in `runCatchUp` — one dial per event, not one
|
|
46
|
+
// per chunk. If a node ever holds many such connections, or the enumeration ahead of the
|
|
47
|
+
// first chunk gets expensive, pre-check `libp2p.peerStore` for this network's
|
|
48
|
+
// block-transfer protocol before enumerating.
|
|
27
49
|
//
|
|
28
|
-
// NOTE: a run that fails is retried only when that peer next opens a connection
|
|
29
|
-
//
|
|
30
|
-
//
|
|
31
|
-
//
|
|
32
|
-
//
|
|
33
|
-
|
|
50
|
+
// NOTE: a run that fails is retried only when that peer next opens a connection (or, with
|
|
51
|
+
// an `authorizePeer` gate wired, when `scheduleConnectedPeers()` is driven). Over a stable
|
|
52
|
+
// connection a transient push failure therefore leaves the peer partially copied until the
|
|
53
|
+
// next reconnect (read repair still covers reads meanwhile). If these meshes ever hold
|
|
54
|
+
// long-lived connections where that matters, re-arm the debounce timer with a backoff on a
|
|
55
|
+
// non-clean run instead of waiting for connection:open.
|
|
56
|
+
const log = debug('sereus:cadre:peer-join-backfill');
|
|
34
57
|
/**
|
|
35
58
|
* The block-transfer protocol's hard cap on one length-prefixed message. Mirrors
|
|
36
59
|
* `MAX_BLOCK_MESSAGE_BYTES` in `@optimystic/db-p2p`'s `protocol-limits.ts` (8 MiB), which
|
|
@@ -38,8 +61,8 @@ const log = debug('sereus:cadre:strand-backfill');
|
|
|
38
61
|
* changes it or starts exporting it.
|
|
39
62
|
*/
|
|
40
63
|
export const MAX_BLOCK_MESSAGE_BYTES = 8 * 1024 * 1024;
|
|
41
|
-
/** The resolved defaults every {@link
|
|
42
|
-
export const
|
|
64
|
+
/** The resolved defaults every {@link PeerJoinBackfill} starts from. */
|
|
65
|
+
export const DEFAULT_PEER_JOIN_BACKFILL = {
|
|
43
66
|
enabled: true,
|
|
44
67
|
debounceMs: 1000,
|
|
45
68
|
maxBlocks: 10000,
|
|
@@ -49,7 +72,7 @@ export const DEFAULT_STRAND_BACKFILL = {
|
|
|
49
72
|
responseTimeoutMs: 10000
|
|
50
73
|
};
|
|
51
74
|
function emptyResult() {
|
|
52
|
-
return { offered: 0, accepted: 0, rejected: [], uncommitted: 0, unmaterialized: 0, capped: 0, oversized: [] };
|
|
75
|
+
return { offered: 0, accepted: 0, rejected: [], uncommitted: 0, unmaterialized: 0, capped: 0, oversized: [], denied: false };
|
|
53
76
|
}
|
|
54
77
|
/**
|
|
55
78
|
* Base64 wire size of a raw buffer — `pushBlocks` base64-encodes each block into the JSON
|
|
@@ -59,17 +82,17 @@ function base64WireBytes(rawBytes) {
|
|
|
59
82
|
return Math.ceil(rawBytes / 3) * 4;
|
|
60
83
|
}
|
|
61
84
|
/**
|
|
62
|
-
* Copies every block in one
|
|
63
|
-
* to, so a peer that joined the
|
|
85
|
+
* Copies every block in one network's own raw store to each peer its libp2p node connects
|
|
86
|
+
* to, so a peer that joined the network after blocks were committed still ends up holding
|
|
64
87
|
* them physically (the receiver persists each push via `saveReplicatedBlock`, which is
|
|
65
88
|
* monotonic and idempotent — crossing pushes from both ends cannot regress a revision).
|
|
66
89
|
*
|
|
67
|
-
* Best-effort throughout: nothing here throws into a libp2p event handler or into
|
|
68
|
-
*
|
|
90
|
+
* Best-effort throughout: nothing here throws into a libp2p event handler or into a
|
|
91
|
+
* runtime bring-up; a failed chunk is logged and the run continues. A peer is marked
|
|
69
92
|
* fully caught up ONLY after a run with no thrown chunk and an empty `missing` list, so
|
|
70
93
|
* the next `connection:open` from a peer whose catch-up failed retries it.
|
|
71
94
|
*/
|
|
72
|
-
export class
|
|
95
|
+
export class PeerJoinBackfill {
|
|
73
96
|
constructor(deps, config) {
|
|
74
97
|
this.deps = deps;
|
|
75
98
|
this.started = false;
|
|
@@ -78,10 +101,19 @@ export class StrandBackfill {
|
|
|
78
101
|
this.done = new Set();
|
|
79
102
|
/** Peers with a catch-up currently running (suppresses concurrent duplicates). */
|
|
80
103
|
this.inFlight = new Set();
|
|
104
|
+
/**
|
|
105
|
+
* Peers whose (re-)schedule arrived while their OWN run was in flight, replayed once
|
|
106
|
+
* that run finishes. Load-bearing for the gated path: the gate's authorization check is
|
|
107
|
+
* a control-database read, so the window between it and the run's end is wide enough for
|
|
108
|
+
* the very membership commit that would have authorized the peer to land inside it —
|
|
109
|
+
* dropping that schedule (rather than deferring it) leaves the denied peer waiting for a
|
|
110
|
+
* reconnect, which is exactly what the re-arm exists to avoid.
|
|
111
|
+
*/
|
|
112
|
+
this.rearmAfterFlight = new Set();
|
|
81
113
|
/** Pending per-peer debounce timers, cleared on stop. */
|
|
82
114
|
this.timers = new Map();
|
|
83
115
|
this.loggedNoListBlockIds = false;
|
|
84
|
-
this.config = { ...
|
|
116
|
+
this.config = { ...DEFAULT_PEER_JOIN_BACKFILL, ...config };
|
|
85
117
|
this.createPushClient = deps.createPushClient
|
|
86
118
|
?? ((peerId) => new BlockTransferClient(peerId, deps.peerNetwork, deps.protocolPrefix));
|
|
87
119
|
this.onConnectionOpen = (evt) => this.schedulePeer(evt.detail.remotePeer);
|
|
@@ -94,11 +126,8 @@ export class StrandBackfill {
|
|
|
94
126
|
this.deps.libp2p.addEventListener('connection:open', this.onConnectionOpen);
|
|
95
127
|
// A runtime rebuilt over live connections (resumeStrand) never sees their
|
|
96
128
|
// connection:open, so walk what is already connected once.
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
this.schedulePeer(connection.remotePeer);
|
|
100
|
-
}
|
|
101
|
-
log('[%s] started (%d peer(s) already connected)', this.deps.strandId, existing.length);
|
|
129
|
+
const scheduled = this.scheduleConnectedPeers();
|
|
130
|
+
log('[%s] started (%d peer(s) already connected)', this.deps.label, scheduled);
|
|
102
131
|
}
|
|
103
132
|
/** Unsubscribe, clear timers; in-flight runs observe the stopped flag and bail. */
|
|
104
133
|
stop() {
|
|
@@ -112,13 +141,43 @@ export class StrandBackfill {
|
|
|
112
141
|
clearTimeout(timer);
|
|
113
142
|
}
|
|
114
143
|
this.timers.clear();
|
|
115
|
-
|
|
144
|
+
this.rearmAfterFlight.clear();
|
|
145
|
+
log('[%s] stopped', this.deps.label);
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* (Re-)schedule a debounced catch-up for every currently-connected peer not yet caught
|
|
149
|
+
* up. Idempotent and cheap (caught-up peers are skipped before any timer is set, and a
|
|
150
|
+
* peer whose run is in flight is deferred to the end of that run rather than dropped).
|
|
151
|
+
* Driven by {@link start}, and — on a gated network — by the embedder whenever
|
|
152
|
+
* membership changes, so a peer whose first pass was denied (connected before it was
|
|
153
|
+
* authorized: the production join order) is retried without waiting for a reconnect.
|
|
154
|
+
* Returns how many distinct peers were considered (for the start() log) — a peer holding
|
|
155
|
+
* several connections is one peer, and is scheduled once.
|
|
156
|
+
*/
|
|
157
|
+
scheduleConnectedPeers() {
|
|
158
|
+
if (this.stopped)
|
|
159
|
+
return 0;
|
|
160
|
+
const peers = new Set();
|
|
161
|
+
for (const connection of this.deps.libp2p.getConnections()) {
|
|
162
|
+
const key = connection.remotePeer.toString();
|
|
163
|
+
if (peers.has(key))
|
|
164
|
+
continue;
|
|
165
|
+
peers.add(key);
|
|
166
|
+
this.schedulePeer(connection.remotePeer);
|
|
167
|
+
}
|
|
168
|
+
return peers.size;
|
|
116
169
|
}
|
|
117
170
|
/** Debounced entry point for connection churn: one run per peer per settle window. */
|
|
118
171
|
schedulePeer(peerId) {
|
|
119
172
|
const key = peerId.toString();
|
|
120
|
-
if (this.stopped || this.done.has(key)
|
|
173
|
+
if (this.stopped || this.done.has(key))
|
|
174
|
+
return;
|
|
175
|
+
if (this.inFlight.has(key)) {
|
|
176
|
+
// Defer rather than drop: the running pass may already be past its gate check (or
|
|
177
|
+
// past the block this schedule was meant to carry), so replay it when that pass ends.
|
|
178
|
+
this.rearmAfterFlight.add(key);
|
|
121
179
|
return;
|
|
180
|
+
}
|
|
122
181
|
const existing = this.timers.get(key);
|
|
123
182
|
if (existing)
|
|
124
183
|
clearTimeout(existing);
|
|
@@ -143,38 +202,60 @@ export class StrandBackfill {
|
|
|
143
202
|
// NOTE: a run that hit `maxBlocks` is still "clean" and still memoizes the peer, so
|
|
144
203
|
// the tail past the ceiling never reaches it. Deliberate: enumeration is not
|
|
145
204
|
// resumable, so not memoizing would re-push the same prefix on every reconnect
|
|
146
|
-
// without ever advancing. Loud in the log below (capped > 0). If a
|
|
205
|
+
// without ever advancing. Loud in the log below (capped > 0). If a store can
|
|
147
206
|
// realistically exceed maxBlocks, the fix is a resumable cursor, not either policy.
|
|
148
207
|
if (clean && !this.stopped) {
|
|
149
208
|
this.done.add(key);
|
|
150
209
|
}
|
|
151
|
-
log('[%s] catch-up peer=%s offered=%d accepted=%d rejected=%d uncommitted=%d unmaterialized=%d capped=%d oversized=%d done=%s', this.deps.
|
|
210
|
+
log('[%s] catch-up peer=%s offered=%d accepted=%d rejected=%d uncommitted=%d unmaterialized=%d capped=%d oversized=%d denied=%s done=%s', this.deps.label, key, result.offered, result.accepted, result.rejected.length, result.uncommitted, result.unmaterialized, result.capped, result.oversized.length, result.denied, clean);
|
|
152
211
|
return result;
|
|
153
212
|
}
|
|
154
213
|
catch (error) {
|
|
155
214
|
// runCatchUp already contains a per-chunk catch; this guards the enumeration and
|
|
156
215
|
// metadata reads too — a backfill fault must never surface through a libp2p event.
|
|
157
|
-
log('[%s] catch-up peer=%s failed: %o', this.deps.
|
|
216
|
+
log('[%s] catch-up peer=%s failed: %o', this.deps.label, key, error);
|
|
158
217
|
return emptyResult();
|
|
159
218
|
}
|
|
160
219
|
finally {
|
|
161
220
|
this.inFlight.delete(key);
|
|
221
|
+
// Replay a schedule that arrived mid-run. `schedulePeer` re-checks `done`, so a run
|
|
222
|
+
// that finished clean re-arms nothing; a denied or failed one gets its retry.
|
|
223
|
+
if (this.rearmAfterFlight.delete(key)) {
|
|
224
|
+
this.schedulePeer(peerId);
|
|
225
|
+
}
|
|
162
226
|
}
|
|
163
227
|
}
|
|
164
228
|
/** The actual copy. `clean` = every chunk pushed and the remote persisted every block. */
|
|
165
229
|
async runCatchUp(peerId) {
|
|
166
230
|
const result = emptyResult();
|
|
167
231
|
const { storage } = this.deps;
|
|
232
|
+
// The membership gate, judged at push time (never at schedule time — authorization can
|
|
233
|
+
// change during the debounce window in either direction). Fails CLOSED on a throw: a
|
|
234
|
+
// gate that cannot answer must not leak the store. A denied run is not clean, so the
|
|
235
|
+
// peer is retried later rather than memoized as caught up.
|
|
236
|
+
if (this.deps.authorizePeer) {
|
|
237
|
+
let authorized = false;
|
|
238
|
+
try {
|
|
239
|
+
authorized = await this.deps.authorizePeer(peerId.toString());
|
|
240
|
+
}
|
|
241
|
+
catch (error) {
|
|
242
|
+
log('[%s] authorizePeer(%s) threw — treating as denied: %o', this.deps.label, peerId.toString(), error);
|
|
243
|
+
}
|
|
244
|
+
if (!authorized) {
|
|
245
|
+
result.denied = true;
|
|
246
|
+
return { result, clean: false };
|
|
247
|
+
}
|
|
248
|
+
}
|
|
168
249
|
if (!storage.listBlockIds) {
|
|
169
250
|
if (!this.loggedNoListBlockIds) {
|
|
170
251
|
this.loggedNoListBlockIds = true;
|
|
171
|
-
log('[%s] raw storage does not implement listBlockIds(); backfill is inert', this.deps.
|
|
252
|
+
log('[%s] raw storage does not implement listBlockIds(); backfill is inert', this.deps.label);
|
|
172
253
|
}
|
|
173
254
|
return { result, clean: false };
|
|
174
255
|
}
|
|
175
256
|
const client = this.createPushClient(peerId);
|
|
176
257
|
const encoder = new TextEncoder();
|
|
177
|
-
let chunk = { ids: [], buffers: [], meta: {}, bytes: 0 };
|
|
258
|
+
let chunk = { ids: [], buffers: [], meta: {}, proofs: {}, bytes: 0 };
|
|
178
259
|
let chunkFailed = false;
|
|
179
260
|
let anyChunkDelivered = false;
|
|
180
261
|
/**
|
|
@@ -187,10 +268,12 @@ export class StrandBackfill {
|
|
|
187
268
|
const flush = async () => {
|
|
188
269
|
if (chunk.ids.length === 0)
|
|
189
270
|
return;
|
|
190
|
-
const { ids, buffers, meta } = chunk;
|
|
191
|
-
chunk = { ids: [], buffers: [], meta: {}, bytes: 0 };
|
|
271
|
+
const { ids, buffers, meta, proofs } = chunk;
|
|
272
|
+
chunk = { ids: [], buffers: [], meta: {}, proofs: {}, bytes: 0 };
|
|
192
273
|
try {
|
|
193
|
-
|
|
274
|
+
// ONE certification value rather than two arguments, so a caller cannot pair a proof
|
|
275
|
+
// for one revision with meta for another — both were written from the same `latest`.
|
|
276
|
+
const response = await client.pushBlocks(ids, buffers, 'replication', { blockMeta: meta, blockProofs: proofs }, {
|
|
194
277
|
dialTimeoutMs: this.config.dialTimeoutMs,
|
|
195
278
|
responseTimeoutMs: this.config.responseTimeoutMs
|
|
196
279
|
});
|
|
@@ -205,12 +288,12 @@ export class StrandBackfill {
|
|
|
205
288
|
}
|
|
206
289
|
}
|
|
207
290
|
if (response.missing.length > 0) {
|
|
208
|
-
log('[%s] peer=%s rejected %d block(s): %o', this.deps.
|
|
291
|
+
log('[%s] peer=%s rejected %d block(s): %o', this.deps.label, peerId.toString(), response.missing.length, response.missing);
|
|
209
292
|
}
|
|
210
293
|
}
|
|
211
294
|
catch (error) {
|
|
212
295
|
chunkFailed = true;
|
|
213
|
-
log('[%s] push to peer=%s failed for %d block(s): %s', this.deps.
|
|
296
|
+
log('[%s] push to peer=%s failed for %d block(s): %s', this.deps.label, peerId.toString(), ids.length, error.message);
|
|
214
297
|
}
|
|
215
298
|
};
|
|
216
299
|
for await (const blockId of storage.listBlockIds()) {
|
|
@@ -237,7 +320,7 @@ export class StrandBackfill {
|
|
|
237
320
|
const block = await storage.getMaterializedBlock(blockId, latest.actionId);
|
|
238
321
|
if (!block) {
|
|
239
322
|
result.unmaterialized += 1;
|
|
240
|
-
log('[%s] block=%s has latest rev %d but no materialized content; skipped', this.deps.
|
|
323
|
+
log('[%s] block=%s has latest rev %d but no materialized content; skipped', this.deps.label, blockId, latest.rev);
|
|
241
324
|
continue;
|
|
242
325
|
}
|
|
243
326
|
const buffer = encoder.encode(JSON.stringify(block));
|
|
@@ -245,11 +328,11 @@ export class StrandBackfill {
|
|
|
245
328
|
// this test ignores the request envelope (ids array, blockMeta, JSON punctuation).
|
|
246
329
|
// A lone block within a few KiB of the cap therefore still ships and is rejected by
|
|
247
330
|
// the receiver's length-prefix decoder — a permanent chunk failure for that peer. No
|
|
248
|
-
// block
|
|
249
|
-
//
|
|
331
|
+
// block comes close today; if one ever can, subtract a measured envelope allowance
|
|
332
|
+
// here rather than raising the cap.
|
|
250
333
|
if (base64WireBytes(buffer.length) >= MAX_BLOCK_MESSAGE_BYTES) {
|
|
251
334
|
result.oversized.push(blockId);
|
|
252
|
-
log('[%s] block=%s is %d bytes (%d on the wire) — exceeds the %d-byte protocol cap alone; skipped', this.deps.
|
|
335
|
+
log('[%s] block=%s is %d bytes (%d on the wire) — exceeds the %d-byte protocol cap alone; skipped', this.deps.label, blockId, buffer.length, base64WireBytes(buffer.length), MAX_BLOCK_MESSAGE_BYTES);
|
|
253
336
|
continue;
|
|
254
337
|
}
|
|
255
338
|
// Flush before adding when this block would overflow either budget. A single block
|
|
@@ -263,6 +346,13 @@ export class StrandBackfill {
|
|
|
263
346
|
chunk.ids.push(blockId);
|
|
264
347
|
chunk.buffers.push(buffer);
|
|
265
348
|
chunk.meta[blockId] = { rev: latest.rev, actionId: latest.actionId };
|
|
349
|
+
// Read the proof for EXACTLY the revision being pushed, from the same `latest` the meta
|
|
350
|
+
// above was written from. Absent is normal (nothing retained a proof for that revision);
|
|
351
|
+
// the block still ships with its meta and the receiver decides.
|
|
352
|
+
const proof = await storage.getBlockProof(blockId, latest.rev);
|
|
353
|
+
if (proof) {
|
|
354
|
+
chunk.proofs[blockId] = proof;
|
|
355
|
+
}
|
|
266
356
|
chunk.bytes += buffer.length;
|
|
267
357
|
result.offered += 1;
|
|
268
358
|
}
|
|
@@ -270,10 +360,10 @@ export class StrandBackfill {
|
|
|
270
360
|
await flush();
|
|
271
361
|
}
|
|
272
362
|
if (result.capped > 0) {
|
|
273
|
-
log('[%s] peer=%s catch-up CAPPED at %d blocks; %d block id(s) not attempted', this.deps.
|
|
363
|
+
log('[%s] peer=%s catch-up CAPPED at %d blocks; %d block id(s) not attempted', this.deps.label, peerId.toString(), this.config.maxBlocks, result.capped);
|
|
274
364
|
}
|
|
275
365
|
const clean = !chunkFailed && result.rejected.length === 0;
|
|
276
366
|
return { result, clean };
|
|
277
367
|
}
|
|
278
368
|
}
|
|
279
|
-
//# sourceMappingURL=
|
|
369
|
+
//# sourceMappingURL=peer-join-backfill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"peer-join-backfill.js","sourceRoot":"","sources":["../src/peer-join-backfill.ts"],"names":[],"mappings":"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"}
|
package/dist/peer-record.d.ts
CHANGED
|
@@ -84,6 +84,32 @@ export declare function isSignalingAddr(addr: string): boolean;
|
|
|
84
84
|
* cannot express that distinction.
|
|
85
85
|
*/
|
|
86
86
|
export declare function trailingPeerId(addr: Multiaddr): string | null;
|
|
87
|
+
/**
|
|
88
|
+
* `addr` guaranteed to terminate in `/p2p/<peerId>` — the shape every dial path
|
|
89
|
+
* needs — or `null` when it cannot, because the address already terminates in a
|
|
90
|
+
* DIFFERENT peer id and therefore does not reach `peerId` at all.
|
|
91
|
+
*
|
|
92
|
+
* Three input shapes, matching what a `CadrePeer` record can legitimately carry:
|
|
93
|
+
*
|
|
94
|
+
* - no `/p2p/` component (`/ip4/1.2.3.4/tcp/4001`) — the suffix is appended;
|
|
95
|
+
* - a relay hop with the destination missing (`…/p2p/<relay>/p2p-circuit`) — the
|
|
96
|
+
* last component is the circuit, not a peer id, so the suffix is appended and
|
|
97
|
+
* the address becomes the full `…/p2p/<relay>/p2p-circuit/p2p/<peerId>`;
|
|
98
|
+
* - already terminating in `/p2p/<X>` — returned untouched when `X` is `peerId`,
|
|
99
|
+
* dropped otherwise.
|
|
100
|
+
*
|
|
101
|
+
* This is deliberately the same rule libp2p applies internally in
|
|
102
|
+
* `calculateMultiaddrs` (append when the LAST component is not `p2p`) followed by
|
|
103
|
+
* its wrong-peer-id filter, so a normalized list matches what libp2p would have
|
|
104
|
+
* built anyway. Normalizing before the dial is what keeps a list from mixing
|
|
105
|
+
* suffixed and unsuffixed entries, which `getPeerAddress` rejects outright
|
|
106
|
+
* ("Multiaddrs must all have the same peer id or have no peer id") — taking the
|
|
107
|
+
* whole peer down with it, not just the odd address.
|
|
108
|
+
*
|
|
109
|
+
* Never use before signature verification: verification runs against the
|
|
110
|
+
* original on-record strings.
|
|
111
|
+
*/
|
|
112
|
+
export declare function withTrailingPeerId(addr: Multiaddr, peerId: string): Multiaddr | null;
|
|
87
113
|
/**
|
|
88
114
|
* Return `addrs` with signaling (`/p2p-circuit`) addrs first, otherwise stable.
|
|
89
115
|
* Used to present the WebRTC dial input ahead of direct addrs. Does NOT mutate
|
package/dist/peer-record.js
CHANGED
|
@@ -104,6 +104,38 @@ export function trailingPeerId(addr) {
|
|
|
104
104
|
const p2p = addr.getComponents().filter((c) => c.name === 'p2p');
|
|
105
105
|
return p2p.length > 0 ? (p2p[p2p.length - 1].value ?? null) : null;
|
|
106
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* `addr` guaranteed to terminate in `/p2p/<peerId>` — the shape every dial path
|
|
109
|
+
* needs — or `null` when it cannot, because the address already terminates in a
|
|
110
|
+
* DIFFERENT peer id and therefore does not reach `peerId` at all.
|
|
111
|
+
*
|
|
112
|
+
* Three input shapes, matching what a `CadrePeer` record can legitimately carry:
|
|
113
|
+
*
|
|
114
|
+
* - no `/p2p/` component (`/ip4/1.2.3.4/tcp/4001`) — the suffix is appended;
|
|
115
|
+
* - a relay hop with the destination missing (`…/p2p/<relay>/p2p-circuit`) — the
|
|
116
|
+
* last component is the circuit, not a peer id, so the suffix is appended and
|
|
117
|
+
* the address becomes the full `…/p2p/<relay>/p2p-circuit/p2p/<peerId>`;
|
|
118
|
+
* - already terminating in `/p2p/<X>` — returned untouched when `X` is `peerId`,
|
|
119
|
+
* dropped otherwise.
|
|
120
|
+
*
|
|
121
|
+
* This is deliberately the same rule libp2p applies internally in
|
|
122
|
+
* `calculateMultiaddrs` (append when the LAST component is not `p2p`) followed by
|
|
123
|
+
* its wrong-peer-id filter, so a normalized list matches what libp2p would have
|
|
124
|
+
* built anyway. Normalizing before the dial is what keeps a list from mixing
|
|
125
|
+
* suffixed and unsuffixed entries, which `getPeerAddress` rejects outright
|
|
126
|
+
* ("Multiaddrs must all have the same peer id or have no peer id") — taking the
|
|
127
|
+
* whole peer down with it, not just the odd address.
|
|
128
|
+
*
|
|
129
|
+
* Never use before signature verification: verification runs against the
|
|
130
|
+
* original on-record strings.
|
|
131
|
+
*/
|
|
132
|
+
export function withTrailingPeerId(addr, peerId) {
|
|
133
|
+
const components = addr.getComponents();
|
|
134
|
+
if (components[components.length - 1]?.name !== 'p2p') {
|
|
135
|
+
return addr.encapsulate(`/p2p/${peerId}`);
|
|
136
|
+
}
|
|
137
|
+
return trailingPeerId(addr) === peerId ? addr : null;
|
|
138
|
+
}
|
|
107
139
|
/**
|
|
108
140
|
* Return `addrs` with signaling (`/p2p-circuit`) addrs first, otherwise stable.
|
|
109
141
|
* Used to present the WebRTC dial input ahead of direct addrs. Does NOT mutate
|
package/dist/peer-record.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peer-record.js","sourceRoot":"","sources":["../src/peer-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAGxE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE7D;;;GAGG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,8BAA8B,GAAG,CAAC,CAAC;AAEnF,+EAA+E;AAC/E,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAExC;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc,EAAE,SAAiB,EAAE,SAAiB;IAC1F,MAAM,MAAM,GAAG,0BAA0B,CAAC,wBAAwB,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvH,OAAO,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAW,CAAC;AACzD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAiF,EACjF,aAAqB;IAErB,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACvG,MAAM,GAAG,GAAG,IAAI,CACd,aAAa,EACb,aAAa,EACb,SAAS,EACT,WAAW,EACX,WAAW,EACX,WAAW,CACF,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC;AAC5H,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAyB;IACjE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACvG,OAAO,MAAM,CACX,aAAa,EACb,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,SAAS,EAChB,SAAS,EACT,WAAW,EACX,WAAW,EACX,WAAW,CACZ,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,QAAgB,EAAE,GAAW;IAChF,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,GAAG,GAAG,SAAS,IAAI,QAAQ,CAAC;AACrC,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,IAAe;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACjE,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAe;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;AACjC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO;QACL,QAAQ;YACN,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"peer-record.js","sourceRoot":"","sources":["../src/peer-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAGxE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE7D;;;GAGG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,8BAA8B,GAAG,CAAC,CAAC;AAEnF,+EAA+E;AAC/E,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAExC;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc,EAAE,SAAiB,EAAE,SAAiB;IAC1F,MAAM,MAAM,GAAG,0BAA0B,CAAC,wBAAwB,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvH,OAAO,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAW,CAAC;AACzD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAiF,EACjF,aAAqB;IAErB,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACvG,MAAM,GAAG,GAAG,IAAI,CACd,aAAa,EACb,aAAa,EACb,SAAS,EACT,WAAW,EACX,WAAW,EACX,WAAW,CACF,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC;AAC5H,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAyB;IACjE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACvG,OAAO,MAAM,CACX,aAAa,EACb,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,SAAS,EAChB,SAAS,EACT,WAAW,EACX,WAAW,EACX,WAAW,CACZ,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,QAAgB,EAAE,GAAW;IAChF,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,GAAG,GAAG,SAAS,IAAI,QAAQ,CAAC;AACrC,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,IAAe;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACjE,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAe,EAAE,MAAc;IAChE,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACxC,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAe;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;AACjC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO;QACL,QAAQ;YACN,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC"}
|