@serfab/cadre-core 0.9.0 → 0.11.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 +255 -253
- package/dist/bootstrap-peer-store-file.d.ts +13 -0
- package/dist/bootstrap-peer-store-file.js +42 -0
- package/dist/bootstrap-peer-store-file.js.map +1 -0
- package/dist/bootstrap-peer-store.d.ts +73 -0
- package/dist/bootstrap-peer-store.js +128 -0
- package/dist/bootstrap-peer-store.js.map +1 -0
- package/dist/cadre-node.d.ts +1121 -81
- package/dist/cadre-node.js +2276 -262
- package/dist/cadre-node.js.map +1 -1
- package/dist/control-authorization.d.ts +93 -0
- package/dist/control-authorization.js +57 -0
- package/dist/control-authorization.js.map +1 -0
- package/dist/control-cohort.d.ts +26 -0
- package/dist/control-cohort.js +26 -0
- package/dist/control-cohort.js.map +1 -1
- package/dist/control-database.d.ts +959 -54
- package/dist/control-database.js +1421 -148
- package/dist/control-database.js.map +1 -1
- package/dist/control-formation-recorder.d.ts +90 -10
- package/dist/control-formation-recorder.js +130 -14
- package/dist/control-formation-recorder.js.map +1 -1
- package/dist/control-schema.d.ts +1 -1
- package/dist/control-schema.js +651 -72
- package/dist/control-schema.js.map +1 -1
- package/dist/control-stream.d.ts +38 -4
- package/dist/control-stream.js +70 -4
- package/dist/control-stream.js.map +1 -1
- package/dist/control-write-retry.d.ts +161 -0
- package/dist/control-write-retry.js +412 -0
- package/dist/control-write-retry.js.map +1 -0
- package/dist/delegate-admission.d.ts +134 -0
- package/dist/delegate-admission.js +244 -0
- package/dist/delegate-admission.js.map +1 -0
- package/dist/device-token.d.ts +11 -11
- package/dist/device-token.js +14 -13
- package/dist/device-token.js.map +1 -1
- package/dist/ed25519-key.d.ts +26 -0
- package/dist/ed25519-key.js +56 -1
- package/dist/ed25519-key.js.map +1 -1
- package/dist/file-durable-slot.d.ts +20 -0
- package/dist/file-durable-slot.js +53 -0
- package/dist/file-durable-slot.js.map +1 -0
- package/dist/formation-approval.d.ts +157 -0
- package/dist/formation-approval.js +375 -0
- package/dist/formation-approval.js.map +1 -0
- package/dist/fs-atomic.d.ts +38 -0
- package/dist/fs-atomic.js +97 -0
- package/dist/fs-atomic.js.map +1 -0
- package/dist/identity-key.d.ts +49 -0
- package/dist/identity-key.js +81 -0
- package/dist/identity-key.js.map +1 -0
- package/dist/index.d.ts +17 -7
- package/dist/index.js +40 -6
- package/dist/index.js.map +1 -1
- package/dist/key-store-file.d.ts +2 -24
- package/dist/key-store-file.js +10 -77
- package/dist/key-store-file.js.map +1 -1
- package/dist/membership-connection-gater.d.ts +146 -0
- package/dist/membership-connection-gater.js +180 -0
- package/dist/membership-connection-gater.js.map +1 -0
- package/dist/node-local-snapshot.d.ts +109 -0
- package/dist/node-local-snapshot.js +182 -0
- package/dist/node-local-snapshot.js.map +1 -0
- package/dist/peer-addr-book.d.ts +92 -0
- package/dist/peer-addr-book.js +220 -0
- package/dist/peer-addr-book.js.map +1 -0
- package/dist/peer-authorization.d.ts +135 -18
- package/dist/peer-authorization.js +152 -21
- package/dist/peer-authorization.js.map +1 -1
- package/dist/peer-record.d.ts +21 -8
- package/dist/peer-record.js +26 -10
- package/dist/peer-record.js.map +1 -1
- package/dist/relay-addrs.d.ts +45 -0
- package/dist/relay-addrs.js +103 -0
- package/dist/relay-addrs.js.map +1 -0
- package/dist/relay-reservation.d.ts +266 -0
- package/dist/relay-reservation.js +613 -0
- package/dist/relay-reservation.js.map +1 -0
- package/dist/seed-bootstrap.d.ts +228 -56
- package/dist/seed-bootstrap.js +340 -198
- package/dist/seed-bootstrap.js.map +1 -1
- package/dist/seed-trust-policy.d.ts +47 -21
- package/dist/seed-trust-policy.js +24 -15
- package/dist/seed-trust-policy.js.map +1 -1
- package/dist/strand-addr-protocol.d.ts +42 -13
- package/dist/strand-addr-protocol.js +58 -52
- package/dist/strand-addr-protocol.js.map +1 -1
- package/dist/strand-backfill.d.ts +109 -0
- package/dist/strand-backfill.js +279 -0
- package/dist/strand-backfill.js.map +1 -0
- package/dist/strand-cohort.d.ts +4 -37
- package/dist/strand-cohort.js +4 -15
- package/dist/strand-cohort.js.map +1 -1
- package/dist/strand-database.d.ts +11 -16
- package/dist/strand-database.js +19 -7
- package/dist/strand-database.js.map +1 -1
- package/dist/strand-formation-manager.d.ts +36 -7
- package/dist/strand-formation-manager.js +115 -15
- package/dist/strand-formation-manager.js.map +1 -1
- package/dist/strand-formation-protocol.d.ts +103 -4
- package/dist/strand-formation-protocol.js +232 -4
- package/dist/strand-formation-protocol.js.map +1 -1
- package/dist/strand-instance-manager.d.ts +88 -19
- package/dist/strand-instance-manager.js +178 -34
- package/dist/strand-instance-manager.js.map +1 -1
- package/dist/strand-member-registry.d.ts +5 -5
- package/dist/strand-member-registry.js +18 -10
- package/dist/strand-member-registry.js.map +1 -1
- package/dist/strand-membership-writer.d.ts +484 -88
- package/dist/strand-membership-writer.js +751 -128
- package/dist/strand-membership-writer.js.map +1 -1
- package/dist/strand-solicitation.d.ts +99 -33
- package/dist/strand-solicitation.js +100 -52
- package/dist/strand-solicitation.js.map +1 -1
- package/dist/strand-transport-key.d.ts +40 -0
- package/dist/strand-transport-key.js +56 -0
- package/dist/strand-transport-key.js.map +1 -0
- package/dist/strand-wake-protocol.d.ts +9 -7
- package/dist/strand-wake-protocol.js +22 -46
- package/dist/strand-wake-protocol.js.map +1 -1
- package/dist/strand-watcher.d.ts +17 -2
- package/dist/strand-watcher.js +47 -3
- package/dist/strand-watcher.js.map +1 -1
- package/dist/trusted-owner-store-file.d.ts +12 -0
- package/dist/trusted-owner-store-file.js +39 -0
- package/dist/trusted-owner-store-file.js.map +1 -0
- package/dist/trusted-owner-store.d.ts +64 -0
- package/dist/trusted-owner-store.js +126 -0
- package/dist/trusted-owner-store.js.map +1 -0
- package/dist/types.d.ts +307 -44
- package/dist/types.js +13 -0
- package/dist/types.js.map +1 -1
- package/package.json +20 -8
- package/src/arachnode-stub.ts +159 -159
- package/src/bootstrap-peer-store-file.ts +44 -0
- package/src/bootstrap-peer-store.ts +172 -0
- package/src/cadre-node.ts +5158 -2981
- package/src/canonical-json.ts +30 -30
- package/src/control-authorization.ts +114 -0
- package/src/control-cohort.ts +130 -103
- package/src/control-database.ts +2406 -948
- package/src/control-formation-recorder.ts +305 -151
- package/src/control-schema.ts +651 -72
- package/src/control-stream.ts +205 -128
- package/src/control-write-retry.ts +483 -0
- package/src/delegate-admission.ts +302 -0
- package/src/device-token.ts +94 -89
- package/src/diagnostics/connection-path.ts +277 -277
- package/src/diagnostics/webrtc-turn-tracker.ts +222 -222
- package/src/ed25519-key.ts +66 -1
- package/src/enrollment.ts +199 -199
- package/src/file-durable-slot.ts +61 -0
- package/src/formation-approval.ts +604 -0
- package/src/fs-atomic.ts +107 -0
- package/src/hibernation-manager.ts +437 -437
- package/src/identity-key.ts +109 -0
- package/src/index.ts +137 -5
- package/src/key-store-file.ts +132 -203
- package/src/key-store.ts +99 -99
- package/src/membership-connection-gater.ts +204 -0
- package/src/node-local-snapshot.ts +260 -0
- package/src/peer-addr-book.ts +250 -0
- package/src/peer-authorization.ts +259 -81
- package/src/peer-record.ts +164 -146
- package/src/push-credentials.ts +84 -84
- package/src/push-node.ts +64 -64
- package/src/push-notifier-apns.ts +247 -247
- package/src/push-notifier-fcm.ts +220 -220
- package/src/push-notifier-shared.ts +28 -28
- package/src/push-notifier.ts +52 -52
- package/src/relay-addrs.ts +111 -0
- package/src/relay-reservation.ts +823 -0
- package/src/seed-bootstrap.ts +409 -209
- package/src/seed-trust-policy.ts +140 -107
- package/src/strand-addr-protocol.ts +441 -410
- package/src/strand-backfill.ts +366 -0
- package/src/strand-cohort.ts +38 -77
- package/src/strand-database.ts +202 -204
- package/src/strand-formation-manager.ts +491 -368
- package/src/strand-formation-protocol.ts +692 -391
- package/src/strand-instance-manager.ts +201 -46
- package/src/strand-member-key.ts +39 -39
- package/src/strand-member-registry.ts +182 -177
- package/src/strand-membership-writer.ts +938 -146
- package/src/strand-solicitation.ts +472 -407
- package/src/strand-transport-key.ts +58 -0
- package/src/strand-wake-payload.ts +32 -32
- package/src/strand-wake-protocol.ts +314 -331
- package/src/strand-watcher.ts +314 -251
- package/src/trusted-owner-store-file.ts +41 -0
- package/src/trusted-owner-store.ts +171 -0
- package/src/types.ts +1309 -1032
|
@@ -1,277 +1,277 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* connection-path.ts — classify each open libp2p connection as relayed
|
|
3
|
-
* (`/p2p-circuit`) vs direct, tag its transport, and summarise counts plus a
|
|
4
|
-
* "stuck on relay" condition.
|
|
5
|
-
*
|
|
6
|
-
* This is the **canonical** implementation. The web reference app keeps a
|
|
7
|
-
* deliberate, documented duplicate at
|
|
8
|
-
* `packages/reference-app-web/src/lib/connection-path.ts` (it does not depend on
|
|
9
|
-
* `@serfab/cadre-core`). Keep the function signatures and classification table
|
|
10
|
-
* identical across both copies so a future shared micro-package would be a
|
|
11
|
-
* drop-in.
|
|
12
|
-
*
|
|
13
|
-
* The whole signal is a pure function over `node.getConnections()` + a settle
|
|
14
|
-
* window + `Date.now()`. A connection's path is derivable from its `remoteAddr`
|
|
15
|
-
* multiaddr string alone — no I/O, no events, no stateful observer.
|
|
16
|
-
*/
|
|
17
|
-
|
|
18
|
-
export type ConnectionPathKind = 'relayed' | 'direct';
|
|
19
|
-
|
|
20
|
-
export type ConnectionTransport =
|
|
21
|
-
| 'circuit-relay'
|
|
22
|
-
| 'webrtc'
|
|
23
|
-
| 'webrtc-turn' // WebRTC session whose ICE selected a TURN relay candidate
|
|
24
|
-
| 'webrtc-direct'
|
|
25
|
-
| 'websocket'
|
|
26
|
-
| 'tcp'
|
|
27
|
-
| 'unknown';
|
|
28
|
-
|
|
29
|
-
export interface ConnectionPath {
|
|
30
|
-
/** remotePeer.toString() */
|
|
31
|
-
peerId: string;
|
|
32
|
-
remoteAddr: string;
|
|
33
|
-
kind: ConnectionPathKind;
|
|
34
|
-
transport: ConnectionTransport;
|
|
35
|
-
direction: 'inbound' | 'outbound';
|
|
36
|
-
/** connection.timeline.open ?? null */
|
|
37
|
-
openedAtMs: number | null;
|
|
38
|
-
/** now - openedAtMs */
|
|
39
|
-
ageMs: number | null;
|
|
40
|
-
/** relayed && age > settleWindow && no direct conn to same peer */
|
|
41
|
-
stuckOnRelay: boolean;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
export interface ConnectionPathSummary {
|
|
45
|
-
total: number;
|
|
46
|
-
relayed: number;
|
|
47
|
-
direct: number;
|
|
48
|
-
stuckOnRelay: number;
|
|
49
|
-
byTransport: Record<ConnectionTransport, number>;
|
|
50
|
-
/** best-effort; null when libp2p exposes no byte counter (see classifier docs) */
|
|
51
|
-
bytesOverRelay: number | null;
|
|
52
|
-
paths: ConnectionPath[];
|
|
53
|
-
settleWindowMs: number;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
/**
|
|
57
|
-
* The minimal connection shape the classifier needs. The stock libp2p
|
|
58
|
-
* `Connection` (from `@libp2p/interface`) satisfies this structurally, and
|
|
59
|
-
* tests can build small synthetic objects against it.
|
|
60
|
-
*/
|
|
61
|
-
export interface ConnectionLike {
|
|
62
|
-
remotePeer?: { toString(): string };
|
|
63
|
-
remoteAddr?: { toString(): string };
|
|
64
|
-
direction?: 'inbound' | 'outbound';
|
|
65
|
-
timeline?: { open?: number };
|
|
66
|
-
/**
|
|
67
|
-
* Set externally (by {@link CadreNode}, from a {@link TurnRelayTracker}
|
|
68
|
-
* observation) when ICE selected a TURN relay candidate for this `/webrtc`
|
|
69
|
-
* session. `undefined` = unknown (the multiaddr alone cannot reveal it). Only
|
|
70
|
-
* honoured for the `webrtc` transport — see {@link classifyConnectionPath}.
|
|
71
|
-
*/
|
|
72
|
-
turnRelayed?: boolean;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
export const DEFAULT_SETTLE_WINDOW_MS = 10_000;
|
|
76
|
-
|
|
77
|
-
const ALL_TRANSPORTS: readonly ConnectionTransport[] = [
|
|
78
|
-
'circuit-relay',
|
|
79
|
-
'webrtc',
|
|
80
|
-
'webrtc-turn',
|
|
81
|
-
'webrtc-direct',
|
|
82
|
-
'websocket',
|
|
83
|
-
'tcp',
|
|
84
|
-
'unknown',
|
|
85
|
-
];
|
|
86
|
-
|
|
87
|
-
interface TransportClass {
|
|
88
|
-
kind: ConnectionPathKind;
|
|
89
|
-
transport: ConnectionTransport;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
/**
|
|
93
|
-
* Classify a remote multiaddr string into a (kind, transport) pair. Order
|
|
94
|
-
* matters — first match wins:
|
|
95
|
-
*
|
|
96
|
-
* | multiaddr contains | kind | transport |
|
|
97
|
-
* |-------------------------------|---------|----------------|
|
|
98
|
-
* | `/webrtc-direct` | direct | webrtc-direct |
|
|
99
|
-
* | `/webrtc` | direct | webrtc |
|
|
100
|
-
* | `/p2p-circuit` (no webrtc) | relayed | circuit-relay |
|
|
101
|
-
* | `/ws` (or `/wss`) | direct | websocket |
|
|
102
|
-
* | `/tcp` (and none of the above)| direct | tcp |
|
|
103
|
-
* | _none_ | direct | unknown |
|
|
104
|
-
*
|
|
105
|
-
* Note the ordering: a browser-to-browser WebRTC connection is dialed *over* a
|
|
106
|
-
* relay for SDP signalling and js-libp2p keeps the circuit prefix in the
|
|
107
|
-
* connection's remoteAddr — a successful hole-punch reads as
|
|
108
|
-
* `…/p2p-circuit/webrtc/p2p/…`, i.e. it contains BOTH `/p2p-circuit` and
|
|
109
|
-
* `/webrtc`. Its data path is nevertheless **direct**, so the WebRTC checks
|
|
110
|
-
* must come *before* `/p2p-circuit`. Only a connection with no transport after
|
|
111
|
-
* `/p2p-circuit` (`…/p2p-circuit/p2p/…`) is genuinely relay-carried.
|
|
112
|
-
*/
|
|
113
|
-
export function classifyTransport(remoteAddr: string): TransportClass {
|
|
114
|
-
const addr = remoteAddr ?? '';
|
|
115
|
-
if (addr.includes('/webrtc-direct')) return { kind: 'direct', transport: 'webrtc-direct' };
|
|
116
|
-
if (addr.includes('/webrtc')) return { kind: 'direct', transport: 'webrtc' };
|
|
117
|
-
if (addr.includes('/p2p-circuit')) return { kind: 'relayed', transport: 'circuit-relay' };
|
|
118
|
-
if (addr.includes('/ws')) return { kind: 'direct', transport: 'websocket' };
|
|
119
|
-
if (addr.includes('/tcp')) return { kind: 'direct', transport: 'tcp' };
|
|
120
|
-
return { kind: 'direct', transport: 'unknown' };
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
/** Read a connection's remote address as a string, never throwing. */
|
|
124
|
-
function addrString(conn: ConnectionLike): string {
|
|
125
|
-
try {
|
|
126
|
-
return conn.remoteAddr?.toString?.() ?? '';
|
|
127
|
-
} catch {
|
|
128
|
-
return '';
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
/**
|
|
133
|
-
* Per-connection classifier. Starts from the pure multiaddr classification, then
|
|
134
|
-
* applies the TURN override: a `/webrtc` session whose ICE selected a TURN relay
|
|
135
|
-
* candidate (`conn.turnRelayed === true`, set externally — the multiaddr alone
|
|
136
|
-
* cannot reveal it) is reclassified `relayed`/`webrtc-turn`. The
|
|
137
|
-
* `transport === 'webrtc'` guard means a `webrtc-direct` connection is never
|
|
138
|
-
* promoted (it uses no ICE and so can never be TURN-relayed), and `undefined`
|
|
139
|
-
* (unknown) degrades safely to the multiaddr result — not relayed.
|
|
140
|
-
*/
|
|
141
|
-
export function classifyConnectionPath(conn: ConnectionLike): TransportClass {
|
|
142
|
-
const { kind, transport } = classifyTransport(addrString(conn));
|
|
143
|
-
if (transport === 'webrtc' && conn.turnRelayed === true) {
|
|
144
|
-
return { kind: 'relayed', transport: 'webrtc-turn' };
|
|
145
|
-
}
|
|
146
|
-
return { kind, transport };
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
/**
|
|
150
|
-
* Best-effort per-connection byte counter. The stock libp2p `Connection`
|
|
151
|
-
* interface carries no byte counter, so unless a metrics implementation is
|
|
152
|
-
* wired into the node this returns `null`. Never throws.
|
|
153
|
-
*/
|
|
154
|
-
function readConnectionBytes(conn: ConnectionLike): number | null {
|
|
155
|
-
try {
|
|
156
|
-
const metrics = (conn as { metrics?: { bytesReceived?: number; bytesSent?: number } }).metrics;
|
|
157
|
-
if (!metrics) return null;
|
|
158
|
-
const received = typeof metrics.bytesReceived === 'number' ? metrics.bytesReceived : 0;
|
|
159
|
-
const sent = typeof metrics.bytesSent === 'number' ? metrics.bytesSent : 0;
|
|
160
|
-
const total = received + sent;
|
|
161
|
-
return Number.isFinite(total) ? total : null;
|
|
162
|
-
} catch {
|
|
163
|
-
return null;
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
function zeroByTransport(): Record<ConnectionTransport, number> {
|
|
168
|
-
const out = {} as Record<ConnectionTransport, number>;
|
|
169
|
-
for (const t of ALL_TRANSPORTS) out[t] = 0;
|
|
170
|
-
return out;
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
/** An all-zero summary, used when no node/connections are available. */
|
|
174
|
-
export function emptyConnectionPathSummary(
|
|
175
|
-
settleWindowMs: number = DEFAULT_SETTLE_WINDOW_MS,
|
|
176
|
-
): ConnectionPathSummary {
|
|
177
|
-
return {
|
|
178
|
-
total: 0,
|
|
179
|
-
relayed: 0,
|
|
180
|
-
direct: 0,
|
|
181
|
-
stuckOnRelay: 0,
|
|
182
|
-
byTransport: zeroByTransport(),
|
|
183
|
-
bytesOverRelay: null,
|
|
184
|
-
paths: [],
|
|
185
|
-
settleWindowMs,
|
|
186
|
-
};
|
|
187
|
-
}
|
|
188
|
-
|
|
189
|
-
/**
|
|
190
|
-
* Build a {@link ConnectionPathSummary} from the node's current connections.
|
|
191
|
-
*
|
|
192
|
-
* `stuckOnRelay` per connection is `relayed && ageMs != null && ageMs >
|
|
193
|
-
* settleWindowMs && no direct connection to the same peer` — the relay-only
|
|
194
|
-
* silent-failure condition (WebRTC negotiation failed, the connection quietly
|
|
195
|
-
* stays on the relay). The direct-peer set is the set of `peerId`s that have at
|
|
196
|
-
* least one `direct` connection, so a peer mid-upgrade (a relayed circuit conn
|
|
197
|
-
* *and* a direct webrtc conn at once) is correctly not flagged.
|
|
198
|
-
*/
|
|
199
|
-
export function summarizeConnectionPaths(
|
|
200
|
-
conns: Iterable<ConnectionLike> | null | undefined,
|
|
201
|
-
settleWindowMs: number = DEFAULT_SETTLE_WINDOW_MS,
|
|
202
|
-
): ConnectionPathSummary {
|
|
203
|
-
const now = Date.now();
|
|
204
|
-
const list = conns ? Array.from(conns) : [];
|
|
205
|
-
|
|
206
|
-
// First pass: classify each connection and find the set of peers that have at
|
|
207
|
-
// least one direct connection.
|
|
208
|
-
const classified = list.map((conn) => {
|
|
209
|
-
const remoteAddr = addrString(conn);
|
|
210
|
-
// classifyConnectionPath (not classifyTransport) so the externally-set
|
|
211
|
-
// turnRelayed hint promotes webrtc → webrtc-turn (relayed).
|
|
212
|
-
const { kind, transport } = classifyConnectionPath(conn);
|
|
213
|
-
const openedAtMs = typeof conn.timeline?.open === 'number' ? conn.timeline.open : null;
|
|
214
|
-
const ageMs = openedAtMs != null ? Math.max(0, now - openedAtMs) : null;
|
|
215
|
-
const peerId = safePeerId(conn);
|
|
216
|
-
const direction: 'inbound' | 'outbound' = conn.direction === 'inbound' ? 'inbound' : 'outbound';
|
|
217
|
-
return { conn, peerId, remoteAddr, kind, transport, openedAtMs, ageMs, direction };
|
|
218
|
-
});
|
|
219
|
-
|
|
220
|
-
const directPeerSet = new Set(
|
|
221
|
-
classified.filter((c) => c.kind === 'direct').map((c) => c.peerId),
|
|
222
|
-
);
|
|
223
|
-
|
|
224
|
-
const byTransport = zeroByTransport();
|
|
225
|
-
let relayed = 0;
|
|
226
|
-
let direct = 0;
|
|
227
|
-
let stuckCount = 0;
|
|
228
|
-
let bytesOverRelay: number | null = null;
|
|
229
|
-
|
|
230
|
-
const paths: ConnectionPath[] = classified.map((c) => {
|
|
231
|
-
byTransport[c.transport] += 1;
|
|
232
|
-
if (c.kind === 'relayed') {
|
|
233
|
-
relayed += 1;
|
|
234
|
-
const bytes = readConnectionBytes(c.conn);
|
|
235
|
-
if (bytes != null) bytesOverRelay = (bytesOverRelay ?? 0) + bytes;
|
|
236
|
-
} else {
|
|
237
|
-
direct += 1;
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
const stuckOnRelay =
|
|
241
|
-
c.kind === 'relayed' &&
|
|
242
|
-
c.ageMs != null &&
|
|
243
|
-
c.ageMs > settleWindowMs &&
|
|
244
|
-
!directPeerSet.has(c.peerId);
|
|
245
|
-
if (stuckOnRelay) stuckCount += 1;
|
|
246
|
-
|
|
247
|
-
return {
|
|
248
|
-
peerId: c.peerId,
|
|
249
|
-
remoteAddr: c.remoteAddr,
|
|
250
|
-
kind: c.kind,
|
|
251
|
-
transport: c.transport,
|
|
252
|
-
direction: c.direction,
|
|
253
|
-
openedAtMs: c.openedAtMs,
|
|
254
|
-
ageMs: c.ageMs,
|
|
255
|
-
stuckOnRelay,
|
|
256
|
-
};
|
|
257
|
-
});
|
|
258
|
-
|
|
259
|
-
return {
|
|
260
|
-
total: list.length,
|
|
261
|
-
relayed,
|
|
262
|
-
direct,
|
|
263
|
-
stuckOnRelay: stuckCount,
|
|
264
|
-
byTransport,
|
|
265
|
-
bytesOverRelay,
|
|
266
|
-
paths,
|
|
267
|
-
settleWindowMs,
|
|
268
|
-
};
|
|
269
|
-
}
|
|
270
|
-
|
|
271
|
-
function safePeerId(conn: ConnectionLike): string {
|
|
272
|
-
try {
|
|
273
|
-
return conn.remotePeer?.toString?.() ?? '';
|
|
274
|
-
} catch {
|
|
275
|
-
return '';
|
|
276
|
-
}
|
|
277
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* connection-path.ts — classify each open libp2p connection as relayed
|
|
3
|
+
* (`/p2p-circuit`) vs direct, tag its transport, and summarise counts plus a
|
|
4
|
+
* "stuck on relay" condition.
|
|
5
|
+
*
|
|
6
|
+
* This is the **canonical** implementation. The web reference app keeps a
|
|
7
|
+
* deliberate, documented duplicate at
|
|
8
|
+
* `packages/reference-app-web/src/lib/connection-path.ts` (it does not depend on
|
|
9
|
+
* `@serfab/cadre-core`). Keep the function signatures and classification table
|
|
10
|
+
* identical across both copies so a future shared micro-package would be a
|
|
11
|
+
* drop-in.
|
|
12
|
+
*
|
|
13
|
+
* The whole signal is a pure function over `node.getConnections()` + a settle
|
|
14
|
+
* window + `Date.now()`. A connection's path is derivable from its `remoteAddr`
|
|
15
|
+
* multiaddr string alone — no I/O, no events, no stateful observer.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
export type ConnectionPathKind = 'relayed' | 'direct';
|
|
19
|
+
|
|
20
|
+
export type ConnectionTransport =
|
|
21
|
+
| 'circuit-relay'
|
|
22
|
+
| 'webrtc'
|
|
23
|
+
| 'webrtc-turn' // WebRTC session whose ICE selected a TURN relay candidate
|
|
24
|
+
| 'webrtc-direct'
|
|
25
|
+
| 'websocket'
|
|
26
|
+
| 'tcp'
|
|
27
|
+
| 'unknown';
|
|
28
|
+
|
|
29
|
+
export interface ConnectionPath {
|
|
30
|
+
/** remotePeer.toString() */
|
|
31
|
+
peerId: string;
|
|
32
|
+
remoteAddr: string;
|
|
33
|
+
kind: ConnectionPathKind;
|
|
34
|
+
transport: ConnectionTransport;
|
|
35
|
+
direction: 'inbound' | 'outbound';
|
|
36
|
+
/** connection.timeline.open ?? null */
|
|
37
|
+
openedAtMs: number | null;
|
|
38
|
+
/** now - openedAtMs */
|
|
39
|
+
ageMs: number | null;
|
|
40
|
+
/** relayed && age > settleWindow && no direct conn to same peer */
|
|
41
|
+
stuckOnRelay: boolean;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export interface ConnectionPathSummary {
|
|
45
|
+
total: number;
|
|
46
|
+
relayed: number;
|
|
47
|
+
direct: number;
|
|
48
|
+
stuckOnRelay: number;
|
|
49
|
+
byTransport: Record<ConnectionTransport, number>;
|
|
50
|
+
/** best-effort; null when libp2p exposes no byte counter (see classifier docs) */
|
|
51
|
+
bytesOverRelay: number | null;
|
|
52
|
+
paths: ConnectionPath[];
|
|
53
|
+
settleWindowMs: number;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* The minimal connection shape the classifier needs. The stock libp2p
|
|
58
|
+
* `Connection` (from `@libp2p/interface`) satisfies this structurally, and
|
|
59
|
+
* tests can build small synthetic objects against it.
|
|
60
|
+
*/
|
|
61
|
+
export interface ConnectionLike {
|
|
62
|
+
remotePeer?: { toString(): string };
|
|
63
|
+
remoteAddr?: { toString(): string };
|
|
64
|
+
direction?: 'inbound' | 'outbound';
|
|
65
|
+
timeline?: { open?: number };
|
|
66
|
+
/**
|
|
67
|
+
* Set externally (by {@link CadreNode}, from a {@link TurnRelayTracker}
|
|
68
|
+
* observation) when ICE selected a TURN relay candidate for this `/webrtc`
|
|
69
|
+
* session. `undefined` = unknown (the multiaddr alone cannot reveal it). Only
|
|
70
|
+
* honoured for the `webrtc` transport — see {@link classifyConnectionPath}.
|
|
71
|
+
*/
|
|
72
|
+
turnRelayed?: boolean;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export const DEFAULT_SETTLE_WINDOW_MS = 10_000;
|
|
76
|
+
|
|
77
|
+
const ALL_TRANSPORTS: readonly ConnectionTransport[] = [
|
|
78
|
+
'circuit-relay',
|
|
79
|
+
'webrtc',
|
|
80
|
+
'webrtc-turn',
|
|
81
|
+
'webrtc-direct',
|
|
82
|
+
'websocket',
|
|
83
|
+
'tcp',
|
|
84
|
+
'unknown',
|
|
85
|
+
];
|
|
86
|
+
|
|
87
|
+
interface TransportClass {
|
|
88
|
+
kind: ConnectionPathKind;
|
|
89
|
+
transport: ConnectionTransport;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Classify a remote multiaddr string into a (kind, transport) pair. Order
|
|
94
|
+
* matters — first match wins:
|
|
95
|
+
*
|
|
96
|
+
* | multiaddr contains | kind | transport |
|
|
97
|
+
* |-------------------------------|---------|----------------|
|
|
98
|
+
* | `/webrtc-direct` | direct | webrtc-direct |
|
|
99
|
+
* | `/webrtc` | direct | webrtc |
|
|
100
|
+
* | `/p2p-circuit` (no webrtc) | relayed | circuit-relay |
|
|
101
|
+
* | `/ws` (or `/wss`) | direct | websocket |
|
|
102
|
+
* | `/tcp` (and none of the above)| direct | tcp |
|
|
103
|
+
* | _none_ | direct | unknown |
|
|
104
|
+
*
|
|
105
|
+
* Note the ordering: a browser-to-browser WebRTC connection is dialed *over* a
|
|
106
|
+
* relay for SDP signalling and js-libp2p keeps the circuit prefix in the
|
|
107
|
+
* connection's remoteAddr — a successful hole-punch reads as
|
|
108
|
+
* `…/p2p-circuit/webrtc/p2p/…`, i.e. it contains BOTH `/p2p-circuit` and
|
|
109
|
+
* `/webrtc`. Its data path is nevertheless **direct**, so the WebRTC checks
|
|
110
|
+
* must come *before* `/p2p-circuit`. Only a connection with no transport after
|
|
111
|
+
* `/p2p-circuit` (`…/p2p-circuit/p2p/…`) is genuinely relay-carried.
|
|
112
|
+
*/
|
|
113
|
+
export function classifyTransport(remoteAddr: string): TransportClass {
|
|
114
|
+
const addr = remoteAddr ?? '';
|
|
115
|
+
if (addr.includes('/webrtc-direct')) return { kind: 'direct', transport: 'webrtc-direct' };
|
|
116
|
+
if (addr.includes('/webrtc')) return { kind: 'direct', transport: 'webrtc' };
|
|
117
|
+
if (addr.includes('/p2p-circuit')) return { kind: 'relayed', transport: 'circuit-relay' };
|
|
118
|
+
if (addr.includes('/ws')) return { kind: 'direct', transport: 'websocket' };
|
|
119
|
+
if (addr.includes('/tcp')) return { kind: 'direct', transport: 'tcp' };
|
|
120
|
+
return { kind: 'direct', transport: 'unknown' };
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/** Read a connection's remote address as a string, never throwing. */
|
|
124
|
+
function addrString(conn: ConnectionLike): string {
|
|
125
|
+
try {
|
|
126
|
+
return conn.remoteAddr?.toString?.() ?? '';
|
|
127
|
+
} catch {
|
|
128
|
+
return '';
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/**
|
|
133
|
+
* Per-connection classifier. Starts from the pure multiaddr classification, then
|
|
134
|
+
* applies the TURN override: a `/webrtc` session whose ICE selected a TURN relay
|
|
135
|
+
* candidate (`conn.turnRelayed === true`, set externally — the multiaddr alone
|
|
136
|
+
* cannot reveal it) is reclassified `relayed`/`webrtc-turn`. The
|
|
137
|
+
* `transport === 'webrtc'` guard means a `webrtc-direct` connection is never
|
|
138
|
+
* promoted (it uses no ICE and so can never be TURN-relayed), and `undefined`
|
|
139
|
+
* (unknown) degrades safely to the multiaddr result — not relayed.
|
|
140
|
+
*/
|
|
141
|
+
export function classifyConnectionPath(conn: ConnectionLike): TransportClass {
|
|
142
|
+
const { kind, transport } = classifyTransport(addrString(conn));
|
|
143
|
+
if (transport === 'webrtc' && conn.turnRelayed === true) {
|
|
144
|
+
return { kind: 'relayed', transport: 'webrtc-turn' };
|
|
145
|
+
}
|
|
146
|
+
return { kind, transport };
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Best-effort per-connection byte counter. The stock libp2p `Connection`
|
|
151
|
+
* interface carries no byte counter, so unless a metrics implementation is
|
|
152
|
+
* wired into the node this returns `null`. Never throws.
|
|
153
|
+
*/
|
|
154
|
+
function readConnectionBytes(conn: ConnectionLike): number | null {
|
|
155
|
+
try {
|
|
156
|
+
const metrics = (conn as { metrics?: { bytesReceived?: number; bytesSent?: number } }).metrics;
|
|
157
|
+
if (!metrics) return null;
|
|
158
|
+
const received = typeof metrics.bytesReceived === 'number' ? metrics.bytesReceived : 0;
|
|
159
|
+
const sent = typeof metrics.bytesSent === 'number' ? metrics.bytesSent : 0;
|
|
160
|
+
const total = received + sent;
|
|
161
|
+
return Number.isFinite(total) ? total : null;
|
|
162
|
+
} catch {
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
function zeroByTransport(): Record<ConnectionTransport, number> {
|
|
168
|
+
const out = {} as Record<ConnectionTransport, number>;
|
|
169
|
+
for (const t of ALL_TRANSPORTS) out[t] = 0;
|
|
170
|
+
return out;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/** An all-zero summary, used when no node/connections are available. */
|
|
174
|
+
export function emptyConnectionPathSummary(
|
|
175
|
+
settleWindowMs: number = DEFAULT_SETTLE_WINDOW_MS,
|
|
176
|
+
): ConnectionPathSummary {
|
|
177
|
+
return {
|
|
178
|
+
total: 0,
|
|
179
|
+
relayed: 0,
|
|
180
|
+
direct: 0,
|
|
181
|
+
stuckOnRelay: 0,
|
|
182
|
+
byTransport: zeroByTransport(),
|
|
183
|
+
bytesOverRelay: null,
|
|
184
|
+
paths: [],
|
|
185
|
+
settleWindowMs,
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* Build a {@link ConnectionPathSummary} from the node's current connections.
|
|
191
|
+
*
|
|
192
|
+
* `stuckOnRelay` per connection is `relayed && ageMs != null && ageMs >
|
|
193
|
+
* settleWindowMs && no direct connection to the same peer` — the relay-only
|
|
194
|
+
* silent-failure condition (WebRTC negotiation failed, the connection quietly
|
|
195
|
+
* stays on the relay). The direct-peer set is the set of `peerId`s that have at
|
|
196
|
+
* least one `direct` connection, so a peer mid-upgrade (a relayed circuit conn
|
|
197
|
+
* *and* a direct webrtc conn at once) is correctly not flagged.
|
|
198
|
+
*/
|
|
199
|
+
export function summarizeConnectionPaths(
|
|
200
|
+
conns: Iterable<ConnectionLike> | null | undefined,
|
|
201
|
+
settleWindowMs: number = DEFAULT_SETTLE_WINDOW_MS,
|
|
202
|
+
): ConnectionPathSummary {
|
|
203
|
+
const now = Date.now();
|
|
204
|
+
const list = conns ? Array.from(conns) : [];
|
|
205
|
+
|
|
206
|
+
// First pass: classify each connection and find the set of peers that have at
|
|
207
|
+
// least one direct connection.
|
|
208
|
+
const classified = list.map((conn) => {
|
|
209
|
+
const remoteAddr = addrString(conn);
|
|
210
|
+
// classifyConnectionPath (not classifyTransport) so the externally-set
|
|
211
|
+
// turnRelayed hint promotes webrtc → webrtc-turn (relayed).
|
|
212
|
+
const { kind, transport } = classifyConnectionPath(conn);
|
|
213
|
+
const openedAtMs = typeof conn.timeline?.open === 'number' ? conn.timeline.open : null;
|
|
214
|
+
const ageMs = openedAtMs != null ? Math.max(0, now - openedAtMs) : null;
|
|
215
|
+
const peerId = safePeerId(conn);
|
|
216
|
+
const direction: 'inbound' | 'outbound' = conn.direction === 'inbound' ? 'inbound' : 'outbound';
|
|
217
|
+
return { conn, peerId, remoteAddr, kind, transport, openedAtMs, ageMs, direction };
|
|
218
|
+
});
|
|
219
|
+
|
|
220
|
+
const directPeerSet = new Set(
|
|
221
|
+
classified.filter((c) => c.kind === 'direct').map((c) => c.peerId),
|
|
222
|
+
);
|
|
223
|
+
|
|
224
|
+
const byTransport = zeroByTransport();
|
|
225
|
+
let relayed = 0;
|
|
226
|
+
let direct = 0;
|
|
227
|
+
let stuckCount = 0;
|
|
228
|
+
let bytesOverRelay: number | null = null;
|
|
229
|
+
|
|
230
|
+
const paths: ConnectionPath[] = classified.map((c) => {
|
|
231
|
+
byTransport[c.transport] += 1;
|
|
232
|
+
if (c.kind === 'relayed') {
|
|
233
|
+
relayed += 1;
|
|
234
|
+
const bytes = readConnectionBytes(c.conn);
|
|
235
|
+
if (bytes != null) bytesOverRelay = (bytesOverRelay ?? 0) + bytes;
|
|
236
|
+
} else {
|
|
237
|
+
direct += 1;
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
const stuckOnRelay =
|
|
241
|
+
c.kind === 'relayed' &&
|
|
242
|
+
c.ageMs != null &&
|
|
243
|
+
c.ageMs > settleWindowMs &&
|
|
244
|
+
!directPeerSet.has(c.peerId);
|
|
245
|
+
if (stuckOnRelay) stuckCount += 1;
|
|
246
|
+
|
|
247
|
+
return {
|
|
248
|
+
peerId: c.peerId,
|
|
249
|
+
remoteAddr: c.remoteAddr,
|
|
250
|
+
kind: c.kind,
|
|
251
|
+
transport: c.transport,
|
|
252
|
+
direction: c.direction,
|
|
253
|
+
openedAtMs: c.openedAtMs,
|
|
254
|
+
ageMs: c.ageMs,
|
|
255
|
+
stuckOnRelay,
|
|
256
|
+
};
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
return {
|
|
260
|
+
total: list.length,
|
|
261
|
+
relayed,
|
|
262
|
+
direct,
|
|
263
|
+
stuckOnRelay: stuckCount,
|
|
264
|
+
byTransport,
|
|
265
|
+
bytesOverRelay,
|
|
266
|
+
paths,
|
|
267
|
+
settleWindowMs,
|
|
268
|
+
};
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
function safePeerId(conn: ConnectionLike): string {
|
|
272
|
+
try {
|
|
273
|
+
return conn.remotePeer?.toString?.() ?? '';
|
|
274
|
+
} catch {
|
|
275
|
+
return '';
|
|
276
|
+
}
|
|
277
|
+
}
|