@minip2p/node 0.7.1 → 0.7.3

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.
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EACV,KAAK,EAIL,aAAa,EAGd,MAAM,eAAe,CAAC;AAuLvB,gEAAgE;AAChE,qBAAa,OAAQ,SAAQ,WAAW;IACtC,OAAO,eAEN;IAED,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAE5C;CACF;AAED,kDAAkD;AAClD,wBAAgB,iBAAiB,IAAI,UAAU,CAE9C;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAE5D;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3E"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAC/D,OAAO,KAAK,EACV,KAAK,EAIL,aAAa,EAGd,MAAM,eAAe,CAAC;AA8PvB,gEAAgE;AAChE,qBAAa,OAAQ,SAAQ,WAAW;IACtC,OAAO,eAEN;IAED,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAE5C;CACF;AAED,kDAAkD;AAClD,wBAAgB,iBAAiB,IAAI,UAAU,CAE9C;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAI5D;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAI3E"}
package/dist/adapter.js CHANGED
@@ -1,24 +1,26 @@
1
1
  /* oxlint-disable class-methods-use-this, func-style, max-classes-per-file, no-await-in-loop, no-use-before-define, prefer-destructuring, promise/avoid-new, unicorn/no-useless-undefined -- The adapter keeps the contract-complete native endpoint, value conversion, handle maps, and drain loop together at the binding boundary. */
2
- import { Minip2pBase } from "@minip2p/core";
3
- import { resolveEndpointConfig } from "@minip2p/core/backend";
2
+ import { Minip2pBase, StreamClosedError } from "@minip2p/core";
3
+ import { P2pEvent_Tags, resolveEndpointConfig, typedFfiError, } from "@minip2p/core/backend";
4
4
  import { nativeBinding } from "./native.js";
5
5
  class NodeBackend {
6
6
  #connectionIds = new IdMap();
7
7
  #endpoint;
8
8
  #events;
9
- #streamIds = new IdMap();
9
+ #streamIds = new StreamIdMap();
10
10
  constructor(config) {
11
- this.#endpoint = new nativeBinding.NodeEndpoint(toUint8Array(config.secretKey), resolveEndpointConfig(config));
11
+ this.#endpoint = translateErrors(() => new nativeBinding.NodeEndpoint(toUint8Array(config.secretKey), resolveEndpointConfig(config)));
12
12
  this.#events = new EventDrain(() => this.#endpoint.drainEvents(256), (event) => normalizeEvent(event, this.#connectionIds, this.#streamIds));
13
13
  }
14
14
  start(listener) {
15
15
  this.#events.start(listener);
16
- this.#endpoint.start(() => {
17
- this.#events.ring();
16
+ translateErrors(() => {
17
+ this.#endpoint.start(() => {
18
+ this.#events.ring();
19
+ });
18
20
  });
19
21
  }
20
22
  eventHandled(event) {
21
- releaseTerminalIds(event, this.#connectionIds, this.#streamIds);
23
+ releaseTerminalIds(event, this.#streamIds);
22
24
  }
23
25
  close() {
24
26
  this.#endpoint.close();
@@ -34,97 +36,132 @@ class NodeBackend {
34
36
  return this.#endpoint.isRunning();
35
37
  }
36
38
  connectedPeers() {
37
- return this.#endpoint.connectedPeers();
39
+ return translateErrors(() => this.#endpoint.connectedPeers());
38
40
  }
39
41
  isPeerReady(peerId) {
40
- return this.#endpoint.isPeerReady(peerId);
42
+ return translateErrors(() => this.#endpoint.isPeerReady(peerId));
41
43
  }
42
44
  peerInfo(peerId) {
43
- const info = this.#endpoint.peerInfo(peerId);
45
+ const info = translateErrors(() => this.#endpoint.peerInfo(peerId));
44
46
  return info === null || info === undefined
45
47
  ? undefined
46
48
  : normalizeIdentifyInfo(info);
47
49
  }
48
50
  knownPeers() {
49
- return this.#endpoint
50
- .knownPeers()
51
- .map((peer) => normalizeRecord(peer));
51
+ return translateErrors(() => this.#endpoint.knownPeers()).map((peer) => normalizeRecord(peer));
52
52
  }
53
53
  discoveryNowMs() {
54
- const value = this.#endpoint.discoveryNowMs();
54
+ const value = translateErrors(() => this.#endpoint.discoveryNowMs());
55
55
  return value === null || value === undefined
56
56
  ? undefined
57
57
  : bigintToNumber(value, "clock");
58
58
  }
59
59
  activeReservation() {
60
- return normalizeOptional(this.#endpoint.activeReservation());
60
+ return normalizeOptional(translateErrors(() => this.#endpoint.activeReservation()));
61
61
  }
62
62
  path(peerId) {
63
- return normalizeOptional(this.#endpoint.path(peerId));
63
+ return normalizeOptional(translateErrors(() => this.#endpoint.path(peerId)));
64
64
  }
65
65
  connectionInfo(peerId) {
66
- const info = this.#endpoint.connectionInfo(peerId);
66
+ const info = translateErrors(() => this.#endpoint.connectionInfo(peerId));
67
67
  if (info === null || info === undefined) {
68
68
  return undefined;
69
69
  }
70
- const connId = this.#connectionIds.toPublic(info.connId);
71
- return typeof info.remoteAddr === "string"
72
- ? { connId, remoteAddr: info.remoteAddr }
73
- : { connId };
70
+ return {
71
+ connId: this.#connectionIds.toPublic(info.connId),
72
+ ...(typeof info.remoteAddr === "string" && {
73
+ remoteAddr: info.remoteAddr,
74
+ }),
75
+ ...(Array.isArray(info.readyProtocols) && {
76
+ readyProtocols: info.readyProtocols,
77
+ }),
78
+ };
74
79
  }
75
80
  circuitAddress(relayAddress, peerId) {
76
- return nativeBinding.circuitAddress(relayAddress, peerId);
81
+ return circuitAddress(relayAddress, peerId);
77
82
  }
78
83
  reachability() {
79
- return this.#endpoint.reachability();
84
+ return translateErrors(() => this.#endpoint.reachability());
80
85
  }
81
86
  setActive(active) {
82
87
  this.#endpoint.setActive(active);
83
88
  }
84
89
  subscribe(topic) {
85
- return this.#endpoint.subscribe(topic);
90
+ return translateErrors(() => this.#endpoint.subscribe(topic));
86
91
  }
87
92
  unsubscribe(topic) {
88
- return this.#endpoint.unsubscribe(topic);
93
+ return translateErrors(() => this.#endpoint.unsubscribe(topic));
89
94
  }
90
95
  publish(topic, data) {
91
- this.#endpoint.publish(topic, data);
96
+ translateErrors(() => {
97
+ this.#endpoint.publish(topic, data);
98
+ });
92
99
  }
93
100
  ping(peerId) {
94
- this.#endpoint.ping(peerId);
101
+ translateErrors(() => {
102
+ this.#endpoint.ping(peerId);
103
+ });
95
104
  }
96
105
  addProtocol(protocolId) {
97
- this.#endpoint.addProtocol(protocolId);
106
+ translateErrors(() => {
107
+ this.#endpoint.addProtocol(protocolId);
108
+ });
98
109
  }
99
110
  openStream(peerId, protocolId) {
100
- const stream = this.#endpoint.openStream(peerId, protocolId);
111
+ const stream = translateErrors(() => this.#endpoint.openStream(peerId, protocolId));
112
+ const connId = this.#connectionIds.toPublic(stream.connId);
101
113
  return {
102
- connId: this.#connectionIds.toPublic(stream.connId),
103
- streamId: this.#streamIds.toPublic(stream.streamId),
114
+ connId,
115
+ streamId: this.#streamIds.toPublic(connId, stream.streamId),
104
116
  };
105
117
  }
106
- sendStream(peerId, streamId, data) {
107
- this.#endpoint.sendStream(peerId, this.#streamIds.toNative(streamId), data);
118
+ sendStream(peerId, connId, streamId, data) {
119
+ translateErrors(() => {
120
+ this.#endpoint.sendStream(peerId, ...this.#nativeStream(connId, streamId), data);
121
+ });
122
+ }
123
+ closeStreamWrite(peerId, connId, streamId) {
124
+ translateErrors(() => {
125
+ this.#endpoint.closeStreamWrite(peerId, ...this.#nativeStream(connId, streamId));
126
+ });
108
127
  }
109
- closeStreamWrite(peerId, streamId) {
110
- this.#endpoint.closeStreamWrite(peerId, this.#streamIds.toNative(streamId));
128
+ resetStream(peerId, connId, streamId) {
129
+ translateErrors(() => {
130
+ this.#endpoint.resetStream(peerId, ...this.#nativeStream(connId, streamId));
131
+ });
111
132
  }
112
- resetStream(peerId, streamId) {
113
- this.#endpoint.resetStream(peerId, this.#streamIds.toNative(streamId));
133
+ abandonStream(peerId, connId, streamId) {
134
+ translateErrors(() => {
135
+ this.#endpoint.abandonStream(peerId, ...this.#nativeStream(connId, streamId));
136
+ });
114
137
  }
115
- abandonStream(peerId, streamId) {
116
- this.#endpoint.abandonStream(peerId, this.#streamIds.toNative(streamId));
138
+ /**
139
+ * Native connection and stream IDs for a public stream. Native names the
140
+ * stream by both, so an operation for a connection that native already
141
+ * replaced fails there instead of reaching a stream on the new connection.
142
+ * A connection whose close or replacement this adapter has already drained
143
+ * has no native ID, so the operation throws `StreamClosedError`.
144
+ */
145
+ #nativeStream(connId, streamId) {
146
+ return [
147
+ this.#connectionIds.toNative(connId),
148
+ this.#streamIds.toNative(streamId),
149
+ ];
117
150
  }
118
151
  // Connect IDs are not mapped because they round-trip into native calls,
119
152
  // and native allocates them well inside the safe integer range.
120
153
  connect(target) {
121
- return bigintToNumber(this.#endpoint.connect(target.kind === "peer" ? target.peerId : [...target.addresses]), "connectId");
154
+ return bigintToNumber(translateErrors(() => this.#endpoint.connect(target.kind === "peer" ? target.peerId : [...target.addresses])), "connectId");
122
155
  }
123
156
  cancelConnect(id) {
124
- this.#endpoint.cancelConnect(BigInt(id));
157
+ translateErrors(() => {
158
+ this.#endpoint.cancelConnect(BigInt(id));
159
+ });
125
160
  }
126
161
  disconnect(peerId) {
127
- this.#endpoint.disconnect(peerId);
162
+ translateErrors(() => {
163
+ this.#endpoint.disconnect(peerId);
164
+ });
128
165
  }
129
166
  }
130
167
  /** High-level Node.js owner for one native minip2p endpoint. */
@@ -143,11 +180,31 @@ export function generateSecretKey() {
143
180
  }
144
181
  /** Derives a peer ID from raw Ed25519 secret key material. */
145
182
  export function peerIdFromSecretKey(secretKey) {
146
- return nativeBinding.peerIdFromSecretKey(toUint8Array(secretKey));
183
+ return translateErrors(() => nativeBinding.peerIdFromSecretKey(toUint8Array(secretKey)));
147
184
  }
148
185
  /** Builds a circuit multiaddress through a direct relay address. */
149
186
  export function circuitAddress(relayAddress, peerId) {
150
- return nativeBinding.circuitAddress(relayAddress, peerId);
187
+ return translateErrors(() => nativeBinding.circuitAddress(relayAddress, peerId));
188
+ }
189
+ /**
190
+ * Rethrows a native `FfiError` as its typed SDK error. The addon tags each
191
+ * error with the variant name as `code` and its detail field as `detail`;
192
+ * untyped variants are rethrown unchanged with both properties intact.
193
+ */
194
+ function translateErrors(operation) {
195
+ try {
196
+ return operation();
197
+ }
198
+ catch (error) {
199
+ throw (typedFfiError(stringProperty(error, "code"), stringProperty(error, "detail")) ?? error);
200
+ }
201
+ }
202
+ function stringProperty(value, key) {
203
+ if (value === null || typeof value !== "object") {
204
+ return undefined;
205
+ }
206
+ const property = Reflect.get(value, key);
207
+ return typeof property === "string" ? property : undefined;
151
208
  }
152
209
  function toUint8Array(value) {
153
210
  return value instanceof Uint8Array
@@ -183,22 +240,24 @@ function normalizeIdentifyInfo(value) {
183
240
  }
184
241
  throw new TypeError("The native addon returned an invalid Identify public key");
185
242
  }
243
+ /** Event fields carrying a native connection ID. */
244
+ const CONNECTION_ID_KEYS = new Set([
245
+ "connId",
246
+ "oldConnId",
247
+ "newConnId",
248
+ ]);
186
249
  function normalizeNativeValue(value, key, maps) {
187
- if (typeof value === "number" && maps !== undefined) {
188
- if (key === "connId") {
250
+ const isId = typeof value === "bigint" || typeof value === "number";
251
+ if (isId && maps !== undefined && key !== undefined) {
252
+ if (CONNECTION_ID_KEYS.has(key)) {
189
253
  return maps.connectionIds.toPublic(BigInt(value));
190
254
  }
191
255
  if (key === "streamId") {
192
- return maps.streamIds.toPublic(BigInt(value));
256
+ // Mapped with its connection once the whole record is normalized.
257
+ return value;
193
258
  }
194
259
  }
195
260
  if (typeof value === "bigint") {
196
- if (key === "connId" && maps !== undefined) {
197
- return maps.connectionIds.toPublic(value);
198
- }
199
- if (key === "streamId" && maps !== undefined) {
200
- return maps.streamIds.toPublic(value);
201
- }
202
261
  return bigintToNumber(value, "native value");
203
262
  }
204
263
  if (Array.isArray(value)) {
@@ -208,12 +267,28 @@ function normalizeNativeValue(value, key, maps) {
208
267
  return value;
209
268
  }
210
269
  if (value !== null && typeof value === "object") {
211
- return Object.fromEntries(Object.entries(value)
270
+ const record = Object.fromEntries(Object.entries(value)
212
271
  .filter(([, item]) => item !== null)
213
272
  .map(([itemKey, item]) => [
214
273
  itemKey,
215
274
  normalizeNativeValue(item, itemKey, maps),
216
275
  ]));
276
+ const { connId, streamId } = record;
277
+ if (maps !== undefined && streamId !== undefined) {
278
+ if ((typeof streamId !== "bigint" && typeof streamId !== "number") ||
279
+ (connId !== undefined && typeof connId !== "number")) {
280
+ throw new TypeError("The native addon returned an invalid stream ID");
281
+ }
282
+ // Public stream IDs are allocated per connection. A record without a
283
+ // connection (an endpoint error, say) cannot name a public stream.
284
+ if (typeof connId === "number") {
285
+ record.streamId = maps.streamIds.toPublic(connId, BigInt(streamId));
286
+ }
287
+ else {
288
+ delete record.streamId;
289
+ }
290
+ }
291
+ return record;
217
292
  }
218
293
  return value;
219
294
  }
@@ -230,30 +305,50 @@ function normalizeEvent(value, connectionIds, streamIds) {
230
305
  event.tag === "IdentifyReceived") {
231
306
  event.inner = normalizeEventBytes(event.tag, event.inner);
232
307
  }
233
- retireTerminalIds(event, connectionIds, streamIds);
234
- return event;
308
+ const normalized = event;
309
+ retireTerminalIds(normalized, connectionIds, streamIds);
310
+ return normalized;
235
311
  }
312
+ /**
313
+ * Stops new native events from reaching identifiers this event ends, so a
314
+ * reused native ID gets a fresh public number. An ended connection is
315
+ * released at once, so a stream operation queued behind its event throws
316
+ * `StreamClosedError` without reaching native; stream numbers stay resolvable
317
+ * until {@link releaseTerminalIds} runs after dispatch.
318
+ */
236
319
  function retireTerminalIds(event, connectionIds, streamIds) {
237
- visitTerminalIds(event, connectionIds, streamIds, (map, id) => {
238
- map.retirePublic(id);
239
- });
240
- }
241
- function releaseTerminalIds(event, connectionIds, streamIds) {
242
- visitTerminalIds(event, connectionIds, streamIds, (map, id) => {
243
- map.deletePublic(id);
244
- });
245
- }
246
- function visitTerminalIds(event, connectionIds, streamIds, visit) {
247
- if (event.inner === null || typeof event.inner !== "object") {
248
- return;
320
+ const connId = endedConnection(event);
321
+ if (connId !== undefined) {
322
+ connectionIds.deletePublic(connId);
323
+ streamIds.retireConnection(connId);
249
324
  }
250
- if (event.tag === "ConnectionClosed") {
251
- visit(connectionIds, Reflect.get(event.inner, "connId"));
325
+ if (event.tag === P2pEvent_Tags.StreamClosed) {
326
+ streamIds.retirePublic(event.inner.streamId);
252
327
  }
253
- if (event.tag === "StreamClosed") {
254
- visit(streamIds, Reflect.get(event.inner, "streamId"));
328
+ }
329
+ /** Frees stream identifiers this event ended, once the SDK dispatched it. */
330
+ function releaseTerminalIds(event, streamIds) {
331
+ const connId = endedConnection(event);
332
+ if (connId !== undefined) {
333
+ streamIds.deleteConnection(connId);
334
+ }
335
+ if (event.tag === P2pEvent_Tags.StreamClosed) {
336
+ streamIds.deletePublic(event.inner.streamId);
255
337
  }
256
338
  }
339
+ /**
340
+ * The connection this event ends. A closed or replaced connection reports no
341
+ * per-stream terminal events, so its streams end with it.
342
+ */
343
+ function endedConnection(event) {
344
+ if (event.tag === P2pEvent_Tags.ConnectionClosed) {
345
+ return event.inner.connId;
346
+ }
347
+ if (event.tag === P2pEvent_Tags.ConnectionReplaced) {
348
+ return event.inner.oldConnId;
349
+ }
350
+ return undefined;
351
+ }
257
352
  function normalizeEventBytes(tag, value) {
258
353
  if (value === null || typeof value !== "object") {
259
354
  return value;
@@ -372,33 +467,75 @@ class IdMap {
372
467
  this.#nativeByPublic.set(publicId, native);
373
468
  return publicId;
374
469
  }
470
+ /** The native ID of a live public connection; only stream ops ask. */
375
471
  toNative(publicId) {
376
472
  const native = this.#nativeByPublic.get(publicId);
377
473
  if (native === undefined) {
378
- throw new RangeError(`Unknown native identifier ${publicId}`);
474
+ throw new StreamClosedError("The stream's connection ended");
379
475
  }
380
476
  return native;
381
477
  }
382
- deletePublic(value) {
383
- if (typeof value !== "number") {
384
- return;
385
- }
386
- const native = this.#nativeByPublic.get(value);
478
+ deletePublic(publicId) {
479
+ const native = this.#nativeByPublic.get(publicId);
387
480
  if (native !== undefined) {
388
- this.#nativeByPublic.delete(value);
389
- if (this.#publicByNative.get(native) === value) {
390
- this.#publicByNative.delete(native);
391
- }
481
+ this.#nativeByPublic.delete(publicId);
482
+ this.#publicByNative.delete(native);
392
483
  }
393
484
  }
394
- retirePublic(value) {
395
- if (typeof value !== "number") {
396
- return;
485
+ }
486
+ /**
487
+ * Maps native stream IDs, which are unique only within their connection, to
488
+ * public numbers that never repeat. Each stream remembers its public
489
+ * connection, so a closed or replaced connection frees every stream on it.
490
+ */
491
+ class StreamIdMap {
492
+ #publicByKey = new Map();
493
+ #streams = new Map();
494
+ #next = 1;
495
+ toPublic(connId, native) {
496
+ const key = `${connId}:${native}`;
497
+ const existing = this.#publicByKey.get(key);
498
+ if (existing !== undefined) {
499
+ return existing;
397
500
  }
398
- const native = this.#nativeByPublic.get(value);
399
- if (native !== undefined && this.#publicByNative.get(native) === value) {
400
- this.#publicByNative.delete(native);
501
+ const publicId = this.#next;
502
+ this.#next += 1;
503
+ this.#publicByKey.set(key, publicId);
504
+ this.#streams.set(publicId, { connId, key, native });
505
+ return publicId;
506
+ }
507
+ toNative(publicId) {
508
+ const stream = this.#streams.get(publicId);
509
+ if (stream === undefined) {
510
+ throw new StreamClosedError("The stream closed");
401
511
  }
512
+ return stream.native;
513
+ }
514
+ deletePublic(publicId) {
515
+ this.retirePublic(publicId);
516
+ this.#streams.delete(publicId);
517
+ }
518
+ retirePublic(publicId) {
519
+ const stream = this.#streams.get(publicId);
520
+ if (stream !== undefined &&
521
+ this.#publicByKey.get(stream.key) === publicId) {
522
+ this.#publicByKey.delete(stream.key);
523
+ }
524
+ }
525
+ deleteConnection(connId) {
526
+ for (const publicId of this.#onConnection(connId)) {
527
+ this.deletePublic(publicId);
528
+ }
529
+ }
530
+ retireConnection(connId) {
531
+ for (const publicId of this.#onConnection(connId)) {
532
+ this.retirePublic(publicId);
533
+ }
534
+ }
535
+ #onConnection(connId) {
536
+ return [...this.#streams]
537
+ .filter(([, stream]) => stream.connId === connId)
538
+ .map(([publicId]) => publicId);
402
539
  }
403
540
  }
404
541
  //# sourceMappingURL=adapter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,wUAAwU;AAExU,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAU/D,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,aAAa,GACd,MAAM,uBAAuB,CAAC;AAS/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW;IACN,cAAc,GAAG,IAAI,KAAK,EAAE,CAAC;IAC7B,SAAS,CAAiB;IAC1B,OAAO,CAAa;IACpB,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC;IAExC,YAAY,MAAqB;QAC/B,IAAI,CAAC,SAAS,GAAG,eAAe,CAC9B,GAAG,EAAE,CACH,IAAI,aAAa,CAAC,YAAY,CAC5B,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAC9B,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CACJ,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EACrC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,CACvE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAmC;QACvC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7B,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,KAAe;QAC1B,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACtC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,cAAc;QACZ,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS;YACxC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,UAAU;QACR,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrE,eAAe,CAAgB,IAAI,CAAC,CACrC,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;QACrE,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;YAC1C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,iBAAiB;QACf,OAAO,iBAAiB,CACtB,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,CAC1D,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,OAAO,iBAAiB,CACtB,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CACnD,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,MAAc;QAC3B,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACjD,GAAG,CAAC,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI;gBACzC,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,CAAC;YACF,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI;gBACxC,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAC;SACH,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,YAAoB,EAAE,MAAc;QACjD,OAAO,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY;QACV,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAiB,CAAC;IAC9E,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,IAAgB;QACrC,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,UAAkB;QAC5B,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,MAAc,EAAE,UAAkB;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,CAClC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAC9C,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3D,OAAO;YACL,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC;SAC5D,CAAC;IACJ,CAAC;IAED,UAAU,CACR,MAAc,EACd,MAAc,EACd,QAAgB,EAChB,IAAgB;QAEhB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,UAAU,CACvB,MAAM,EACN,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,EACvC,IAAI,CACL,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,MAAc,EAAE,MAAc,EAAE,QAAgB;QAC/D,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAC7B,MAAM,EACN,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAc,EAAE,MAAc,EAAE,QAAgB;QAC1D,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,WAAW,CACxB,MAAM,EACN,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,MAAc,EAAE,QAAgB;QAC5D,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAC1B,MAAM,EACN,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,MAAc,EAAE,QAAgB;QAC5C,OAAO;YACL,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACnC,CAAC;IACJ,CAAC;IAED,wEAAwE;IACxE,gEAAgE;IAChE,OAAO,CAAC,MAA4B;QAClC,OAAO,cAAc,CACnB,eAAe,CAAC,GAAG,EAAE,CACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CACpB,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAC/D,CACF,EACD,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,EAAU;QACtB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,eAAe,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,gEAAgE;AAChE,MAAM,OAAO,OAAQ,SAAQ,WAAW;IACtC,YAAoB,OAAuB,EAAE,MAAyB;QACpE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAqB;QACjC,OAAO,IAAI,OAAO,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;CACF;AAED,kDAAkD;AAClD,MAAM,UAAU,iBAAiB;IAC/B,OAAO,aAAa,CAAC,iBAAiB,EAAE,CAAC;AAC3C,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,mBAAmB,CAAC,SAAgB;IAClD,OAAO,eAAe,CAAC,GAAG,EAAE,CAC1B,aAAa,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,cAAc,CAAC,YAAoB,EAAE,MAAc;IACjE,OAAO,eAAe,CAAC,GAAG,EAAE,CAC1B,aAAa,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CACnD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAI,SAAkB;IAC5C,IAAI,CAAC;QACH,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CACJ,aAAa,CACX,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,EAC7B,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAChC,IAAI,KAAK,CACX,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAc,EAAE,GAAW;IACjD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAY,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClD,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,YAAY,CAAC,KAAY;IAChC,OAAO,KAAK,YAAY,UAAU;QAChC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QACxB,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,IAAY;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,UAAU,CAAC,GAAG,IAAI,0CAA0C,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAQ,KAAc;IAC9C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAC1C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,eAAe,CAAQ,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,eAAe,CAAQ,KAAc;IAC5C,OAAO,oBAAoB,CAAC,KAAK,CAAU,CAAC;AAC9C,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc;IAC3C,MAAM,IAAI,GAAG,eAAe,CAA0B,KAAK,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,IAA+B,CAAC;IACzC,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,YAAY,UAAU,EAAE,CAAC;QAChE,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,wBAAwB,CAAC,SAAS,CAAC;SACpB,CAAC;IAC/B,CAAC;IACD,MAAM,IAAI,SAAS,CACjB,0DAA0D,CAC3D,CAAC;AACJ,CAAC;AAED,oDAAoD;AACpD,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CAAC;IACtD,QAAQ;IACR,WAAW;IACX,WAAW;CACZ,CAAC,CAAC;AAEH,SAAS,oBAAoB,CAC3B,KAAc,EACd,GAAY,EACZ,IAAmB;IAEnB,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;IACpE,IAAI,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpD,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YACvB,kEAAkE;YAClE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,MAAM,GAA4B,MAAM,CAAC,WAAW,CACxD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;aAClB,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACxB,OAAO;YACP,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC;SAC1C,CAAC,CACL,CAAC;QACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACjD,IACE,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,CAAC;gBAC9D,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,MAAM,KAAK,QAAQ,CAAC,EACpD,CAAC;gBACD,MAAM,IAAI,SAAS,CAAC,gDAAgD,CAAC,CAAC;YACxE,CAAC;YACD,qEAAqE;YACrE,mEAAmE;YACnE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,QAAQ,CAAC;YACzB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CACrB,KAAc,EACd,aAAoB,EACpB,SAAsB;IAEtB,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE;QACnD,aAAa;QACb,SAAS;KACV,CAAuC,CAAC;IACzC,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/D,MAAM,IAAI,SAAS,CAAC,4CAA4C,CAAC,CAAC;IACpE,CAAC;IACD,IACE,KAAK,CAAC,GAAG,KAAK,YAAY;QAC1B,KAAK,CAAC,GAAG,KAAK,SAAS;QACvB,KAAK,CAAC,GAAG,KAAK,kBAAkB,EAChC,CAAC;QACD,KAAK,CAAC,KAAK,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,UAAU,GAAG,KAAiB,CAAC;IACrC,iBAAiB,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACxD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CACxB,KAAe,EACf,aAAoB,EACpB,SAAsB;IAEtB,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC7C,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,SAAS,kBAAkB,CAAC,KAAe,EAAE,SAAsB;IACjE,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC7C,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,KAAe;IACtC,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,gBAAgB,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,aAAa,CAAC,kBAAkB,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;IAC/B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,KAAc;IACtD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC3B,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAU,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;gBACxD,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,GAAG,KAAK,kBAAkB,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,wBAAwB,CAAC,KAA4B;IAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACvC,CAAC;IACD,IACE,KAAK,CAAC,MAAM,YAAY,WAAW;QACnC,KAAK,CAAC,UAAU,KAAK,CAAC;QACtB,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,MAAM,CAAC,UAAU,EAC5C,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;AACvC,CAAC;AAED,MAAM,UAAU;IACL,MAAM,CAAkB;IACxB,UAAU,CAA+B;IAClD,SAAS,CAA0C;IACnD,QAAQ,GAAG,KAAK,CAAC;IACjB,QAAQ,GAAG,KAAK,CAAC;IACjB,QAAQ,GAAG,KAAK,CAAC;IAEjB,YAAY,KAAsB,EAAE,SAAuC;QACzE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAmC;QACvC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,wEAAwE;YACxE,gEAAgE;YAChE,YAAY,CAAC,GAAG,EAAE;gBAChB,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACvC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;wBAC3B,IAAI,CAAC;4BACH,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC3C,CAAC;wBAAC,MAAM,CAAC;4BACP,mEAAmE;wBACrE,CAAC;oBACH,CAAC;oBACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;wBAClC,YAAY,CAAC,OAAO,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAClB,MAAM;oBACR,CAAC;oBACD,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAOD,MAAM,KAAK;IACA,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;IACrD,KAAK,GAAG,CAAC,CAAC;IAEV,QAAQ,CAAC,MAAc;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,sEAAsE;IACtE,QAAQ,CAAC,QAAgB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,iBAAiB,CAAC,+BAA+B,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,WAAW;IACN,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,QAAQ,GAAG,IAAI,GAAG,EAGxB,CAAC;IACJ,KAAK,GAAG,CAAC,CAAC;IAEV,QAAQ,CAAC,MAAc,EAAE,MAAc;QACrC,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IACE,MAAM,KAAK,SAAS;YACpB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,EAC9C,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;aACtB,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC;aAChD,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CACF"}
package/dist/native.d.ts CHANGED
@@ -24,16 +24,17 @@ interface NativeEndpointConfig {
24
24
  readonly relays: string[];
25
25
  }
26
26
  export interface NativeEndpoint {
27
- abandonStream: (peerId: string, streamId: bigint) => void;
27
+ abandonStream: (peerId: string, connId: bigint, streamId: bigint) => void;
28
28
  activeReservation: () => unknown;
29
29
  addProtocol: (protocolId: string) => void;
30
30
  cancelConnect: (id: bigint) => void;
31
31
  close: () => void;
32
- closeStreamWrite: (peerId: string, streamId: bigint) => void;
32
+ closeStreamWrite: (peerId: string, connId: bigint, streamId: bigint) => void;
33
33
  connectedPeers: () => string[];
34
34
  connectionInfo: (peerId: string) => {
35
35
  readonly connId: bigint;
36
36
  readonly remoteAddr?: string | null;
37
+ readonly readyProtocols?: string[] | null;
37
38
  } | null | undefined;
38
39
  connect: (target: string | string[]) => bigint;
39
40
  disconnect: (peerId: string) => void;
@@ -53,8 +54,8 @@ export interface NativeEndpoint {
53
54
  ping: (peerId: string) => void;
54
55
  publish: (topic: string, data: Uint8Array) => void;
55
56
  reachability: () => number;
56
- resetStream: (peerId: string, streamId: bigint) => void;
57
- sendStream: (peerId: string, streamId: bigint, data: Uint8Array) => void;
57
+ resetStream: (peerId: string, connId: bigint, streamId: bigint) => void;
58
+ sendStream: (peerId: string, connId: bigint, streamId: bigint, data: Uint8Array) => void;
58
59
  setActive: (active: boolean) => void;
59
60
  start: (doorbell: () => void) => void;
60
61
  subscribe: (topic: string) => boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@minip2p/node",
3
- "version": "0.7.1",
3
+ "version": "0.7.3",
4
4
  "description": "Node.js bindings for minip2p",
5
5
  "keywords": [
6
6
  "libp2p",
@@ -38,7 +38,7 @@
38
38
  "registry": "https://registry.npmjs.org/"
39
39
  },
40
40
  "dependencies": {
41
- "@minip2p/core": "0.7.1"
41
+ "@minip2p/core": "0.7.3"
42
42
  },
43
43
  "devDependencies": {
44
44
  "@minip2p/test-fixtures": "0.0.0",
@@ -48,13 +48,13 @@
48
48
  "typescript": "7.0.2"
49
49
  },
50
50
  "optionalDependencies": {
51
- "@minip2p/node-darwin-arm64": "0.7.1",
52
- "@minip2p/node-darwin-x64": "0.7.1",
53
- "@minip2p/node-linux-arm64-gnu": "0.7.1",
54
- "@minip2p/node-linux-arm64-musl": "0.7.1",
55
- "@minip2p/node-linux-x64-gnu": "0.7.1",
56
- "@minip2p/node-linux-x64-musl": "0.7.1",
57
- "@minip2p/node-win32-x64-msvc": "0.7.1"
51
+ "@minip2p/node-darwin-arm64": "0.7.3",
52
+ "@minip2p/node-darwin-x64": "0.7.3",
53
+ "@minip2p/node-linux-arm64-gnu": "0.7.3",
54
+ "@minip2p/node-linux-arm64-musl": "0.7.3",
55
+ "@minip2p/node-linux-x64-gnu": "0.7.3",
56
+ "@minip2p/node-linux-x64-musl": "0.7.3",
57
+ "@minip2p/node-win32-x64-msvc": "0.7.3"
58
58
  },
59
59
  "napi": {
60
60
  "binaryName": "minip2p",
package/src/adapter.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /* oxlint-disable class-methods-use-this, func-style, max-classes-per-file, no-await-in-loop, no-use-before-define, prefer-destructuring, promise/avoid-new, unicorn/no-useless-undefined -- The adapter keeps the contract-complete native endpoint, value conversion, handle maps, and drain loop together at the binding boundary. */
2
2
 
3
- import { Minip2pBase } from "@minip2p/core";
3
+ import { Minip2pBase, StreamClosedError } from "@minip2p/core";
4
4
  import type {
5
5
  Bytes,
6
6
  ConnectionInfo,
@@ -10,7 +10,11 @@ import type {
10
10
  Reachability,
11
11
  RelayReservationInfo,
12
12
  } from "@minip2p/core";
13
- import { resolveEndpointConfig } from "@minip2p/core/backend";
13
+ import {
14
+ P2pEvent_Tags,
15
+ resolveEndpointConfig,
16
+ typedFfiError,
17
+ } from "@minip2p/core/backend";
14
18
  import type {
15
19
  BackendConnectTarget,
16
20
  BackendOpenStream,
@@ -26,12 +30,15 @@ class NodeBackend implements Minip2pBackend {
26
30
  readonly #connectionIds = new IdMap();
27
31
  readonly #endpoint: NativeEndpoint;
28
32
  readonly #events: EventDrain;
29
- readonly #streamIds = new IdMap();
33
+ readonly #streamIds = new StreamIdMap();
30
34
 
31
35
  constructor(config: Minip2pConfig) {
32
- this.#endpoint = new nativeBinding.NodeEndpoint(
33
- toUint8Array(config.secretKey),
34
- resolveEndpointConfig(config)
36
+ this.#endpoint = translateErrors(
37
+ () =>
38
+ new nativeBinding.NodeEndpoint(
39
+ toUint8Array(config.secretKey),
40
+ resolveEndpointConfig(config)
41
+ )
35
42
  );
36
43
  this.#events = new EventDrain(
37
44
  () => this.#endpoint.drainEvents(256),
@@ -41,13 +48,15 @@ class NodeBackend implements Minip2pBackend {
41
48
 
42
49
  start(listener: (event: P2pEvent) => void): void {
43
50
  this.#events.start(listener);
44
- this.#endpoint.start(() => {
45
- this.#events.ring();
51
+ translateErrors(() => {
52
+ this.#endpoint.start(() => {
53
+ this.#events.ring();
54
+ });
46
55
  });
47
56
  }
48
57
 
49
58
  eventHandled(event: P2pEvent): void {
50
- releaseTerminalIds(event, this.#connectionIds, this.#streamIds);
59
+ releaseTerminalIds(event, this.#streamIds);
51
60
  }
52
61
 
53
62
  close(): void {
@@ -68,28 +77,28 @@ class NodeBackend implements Minip2pBackend {
68
77
  }
69
78
 
70
79
  connectedPeers(): string[] {
71
- return this.#endpoint.connectedPeers();
80
+ return translateErrors(() => this.#endpoint.connectedPeers());
72
81
  }
73
82
 
74
83
  isPeerReady(peerId: string): boolean {
75
- return this.#endpoint.isPeerReady(peerId);
84
+ return translateErrors(() => this.#endpoint.isPeerReady(peerId));
76
85
  }
77
86
 
78
87
  peerInfo(peerId: string): IdentifyInfo | undefined {
79
- const info = this.#endpoint.peerInfo(peerId);
88
+ const info = translateErrors(() => this.#endpoint.peerInfo(peerId));
80
89
  return info === null || info === undefined
81
90
  ? undefined
82
91
  : normalizeIdentifyInfo(info);
83
92
  }
84
93
 
85
94
  knownPeers(): KnownPeerInfo[] {
86
- return this.#endpoint
87
- .knownPeers()
88
- .map((peer) => normalizeRecord<KnownPeerInfo>(peer));
95
+ return translateErrors(() => this.#endpoint.knownPeers()).map((peer) =>
96
+ normalizeRecord<KnownPeerInfo>(peer)
97
+ );
89
98
  }
90
99
 
91
100
  discoveryNowMs(): number | undefined {
92
- const value = this.#endpoint.discoveryNowMs();
101
+ const value = translateErrors(() => this.#endpoint.discoveryNowMs());
93
102
  return value === null || value === undefined
94
103
  ? undefined
95
104
  : bigintToNumber(value, "clock");
@@ -97,31 +106,38 @@ class NodeBackend implements Minip2pBackend {
97
106
 
98
107
  activeReservation(): RelayReservationInfo | undefined {
99
108
  return normalizeOptional<RelayReservationInfo>(
100
- this.#endpoint.activeReservation()
109
+ translateErrors(() => this.#endpoint.activeReservation())
101
110
  );
102
111
  }
103
112
 
104
113
  path(peerId: string): PathKind | undefined {
105
- return normalizeOptional<PathKind>(this.#endpoint.path(peerId));
114
+ return normalizeOptional<PathKind>(
115
+ translateErrors(() => this.#endpoint.path(peerId))
116
+ );
106
117
  }
107
118
 
108
119
  connectionInfo(peerId: string): ConnectionInfo | undefined {
109
- const info = this.#endpoint.connectionInfo(peerId);
120
+ const info = translateErrors(() => this.#endpoint.connectionInfo(peerId));
110
121
  if (info === null || info === undefined) {
111
122
  return undefined;
112
123
  }
113
- const connId = this.#connectionIds.toPublic(info.connId);
114
- return typeof info.remoteAddr === "string"
115
- ? { connId, remoteAddr: info.remoteAddr }
116
- : { connId };
124
+ return {
125
+ connId: this.#connectionIds.toPublic(info.connId),
126
+ ...(typeof info.remoteAddr === "string" && {
127
+ remoteAddr: info.remoteAddr,
128
+ }),
129
+ ...(Array.isArray(info.readyProtocols) && {
130
+ readyProtocols: info.readyProtocols,
131
+ }),
132
+ };
117
133
  }
118
134
 
119
135
  circuitAddress(relayAddress: string, peerId: string): string {
120
- return nativeBinding.circuitAddress(relayAddress, peerId);
136
+ return circuitAddress(relayAddress, peerId);
121
137
  }
122
138
 
123
139
  reachability(): Reachability {
124
- return this.#endpoint.reachability() as Reachability;
140
+ return translateErrors(() => this.#endpoint.reachability()) as Reachability;
125
141
  }
126
142
 
127
143
  setActive(active: boolean): void {
@@ -129,66 +145,121 @@ class NodeBackend implements Minip2pBackend {
129
145
  }
130
146
 
131
147
  subscribe(topic: string): boolean {
132
- return this.#endpoint.subscribe(topic);
148
+ return translateErrors(() => this.#endpoint.subscribe(topic));
133
149
  }
134
150
 
135
151
  unsubscribe(topic: string): boolean {
136
- return this.#endpoint.unsubscribe(topic);
152
+ return translateErrors(() => this.#endpoint.unsubscribe(topic));
137
153
  }
138
154
 
139
155
  publish(topic: string, data: Uint8Array): void {
140
- this.#endpoint.publish(topic, data);
156
+ translateErrors(() => {
157
+ this.#endpoint.publish(topic, data);
158
+ });
141
159
  }
142
160
 
143
161
  ping(peerId: string): void {
144
- this.#endpoint.ping(peerId);
162
+ translateErrors(() => {
163
+ this.#endpoint.ping(peerId);
164
+ });
145
165
  }
146
166
 
147
167
  addProtocol(protocolId: string): void {
148
- this.#endpoint.addProtocol(protocolId);
168
+ translateErrors(() => {
169
+ this.#endpoint.addProtocol(protocolId);
170
+ });
149
171
  }
150
172
 
151
173
  openStream(peerId: string, protocolId: string): BackendOpenStream {
152
- const stream = this.#endpoint.openStream(peerId, protocolId);
174
+ const stream = translateErrors(() =>
175
+ this.#endpoint.openStream(peerId, protocolId)
176
+ );
177
+ const connId = this.#connectionIds.toPublic(stream.connId);
153
178
  return {
154
- connId: this.#connectionIds.toPublic(stream.connId),
155
- streamId: this.#streamIds.toPublic(stream.streamId),
179
+ connId,
180
+ streamId: this.#streamIds.toPublic(connId, stream.streamId),
156
181
  };
157
182
  }
158
183
 
159
- sendStream(peerId: string, streamId: number, data: Uint8Array): void {
160
- this.#endpoint.sendStream(peerId, this.#streamIds.toNative(streamId), data);
184
+ sendStream(
185
+ peerId: string,
186
+ connId: number,
187
+ streamId: number,
188
+ data: Uint8Array
189
+ ): void {
190
+ translateErrors(() => {
191
+ this.#endpoint.sendStream(
192
+ peerId,
193
+ ...this.#nativeStream(connId, streamId),
194
+ data
195
+ );
196
+ });
161
197
  }
162
198
 
163
- closeStreamWrite(peerId: string, streamId: number): void {
164
- this.#endpoint.closeStreamWrite(peerId, this.#streamIds.toNative(streamId));
199
+ closeStreamWrite(peerId: string, connId: number, streamId: number): void {
200
+ translateErrors(() => {
201
+ this.#endpoint.closeStreamWrite(
202
+ peerId,
203
+ ...this.#nativeStream(connId, streamId)
204
+ );
205
+ });
165
206
  }
166
207
 
167
- resetStream(peerId: string, streamId: number): void {
168
- this.#endpoint.resetStream(peerId, this.#streamIds.toNative(streamId));
208
+ resetStream(peerId: string, connId: number, streamId: number): void {
209
+ translateErrors(() => {
210
+ this.#endpoint.resetStream(
211
+ peerId,
212
+ ...this.#nativeStream(connId, streamId)
213
+ );
214
+ });
169
215
  }
170
216
 
171
- abandonStream(peerId: string, streamId: number): void {
172
- this.#endpoint.abandonStream(peerId, this.#streamIds.toNative(streamId));
217
+ abandonStream(peerId: string, connId: number, streamId: number): void {
218
+ translateErrors(() => {
219
+ this.#endpoint.abandonStream(
220
+ peerId,
221
+ ...this.#nativeStream(connId, streamId)
222
+ );
223
+ });
224
+ }
225
+
226
+ /**
227
+ * Native connection and stream IDs for a public stream. Native names the
228
+ * stream by both, so an operation for a connection that native already
229
+ * replaced fails there instead of reaching a stream on the new connection.
230
+ * A connection whose close or replacement this adapter has already drained
231
+ * has no native ID, so the operation throws `StreamClosedError`.
232
+ */
233
+ #nativeStream(connId: number, streamId: number): [bigint, bigint] {
234
+ return [
235
+ this.#connectionIds.toNative(connId),
236
+ this.#streamIds.toNative(streamId),
237
+ ];
173
238
  }
174
239
 
175
240
  // Connect IDs are not mapped because they round-trip into native calls,
176
241
  // and native allocates them well inside the safe integer range.
177
242
  connect(target: BackendConnectTarget): number {
178
243
  return bigintToNumber(
179
- this.#endpoint.connect(
180
- target.kind === "peer" ? target.peerId : [...target.addresses]
244
+ translateErrors(() =>
245
+ this.#endpoint.connect(
246
+ target.kind === "peer" ? target.peerId : [...target.addresses]
247
+ )
181
248
  ),
182
249
  "connectId"
183
250
  );
184
251
  }
185
252
 
186
253
  cancelConnect(id: number): void {
187
- this.#endpoint.cancelConnect(BigInt(id));
254
+ translateErrors(() => {
255
+ this.#endpoint.cancelConnect(BigInt(id));
256
+ });
188
257
  }
189
258
 
190
259
  disconnect(peerId: string): void {
191
- this.#endpoint.disconnect(peerId);
260
+ translateErrors(() => {
261
+ this.#endpoint.disconnect(peerId);
262
+ });
192
263
  }
193
264
  }
194
265
 
@@ -211,12 +282,42 @@ export function generateSecretKey(): Uint8Array {
211
282
 
212
283
  /** Derives a peer ID from raw Ed25519 secret key material. */
213
284
  export function peerIdFromSecretKey(secretKey: Bytes): string {
214
- return nativeBinding.peerIdFromSecretKey(toUint8Array(secretKey));
285
+ return translateErrors(() =>
286
+ nativeBinding.peerIdFromSecretKey(toUint8Array(secretKey))
287
+ );
215
288
  }
216
289
 
217
290
  /** Builds a circuit multiaddress through a direct relay address. */
218
291
  export function circuitAddress(relayAddress: string, peerId: string): string {
219
- return nativeBinding.circuitAddress(relayAddress, peerId);
292
+ return translateErrors(() =>
293
+ nativeBinding.circuitAddress(relayAddress, peerId)
294
+ );
295
+ }
296
+
297
+ /**
298
+ * Rethrows a native `FfiError` as its typed SDK error. The addon tags each
299
+ * error with the variant name as `code` and its detail field as `detail`;
300
+ * untyped variants are rethrown unchanged with both properties intact.
301
+ */
302
+ function translateErrors<T>(operation: () => T): T {
303
+ try {
304
+ return operation();
305
+ } catch (error) {
306
+ throw (
307
+ typedFfiError(
308
+ stringProperty(error, "code"),
309
+ stringProperty(error, "detail")
310
+ ) ?? error
311
+ );
312
+ }
313
+ }
314
+
315
+ function stringProperty(value: unknown, key: string): string | undefined {
316
+ if (value === null || typeof value !== "object") {
317
+ return undefined;
318
+ }
319
+ const property: unknown = Reflect.get(value, key);
320
+ return typeof property === "string" ? property : undefined;
220
321
  }
221
322
 
222
323
  function toUint8Array(value: Bytes): Uint8Array {
@@ -260,26 +361,29 @@ function normalizeIdentifyInfo(value: unknown): IdentifyInfo {
260
361
  );
261
362
  }
262
363
 
364
+ /** Event fields carrying a native connection ID. */
365
+ const CONNECTION_ID_KEYS: ReadonlySet<string> = new Set([
366
+ "connId",
367
+ "oldConnId",
368
+ "newConnId",
369
+ ]);
370
+
263
371
  function normalizeNativeValue(
264
372
  value: unknown,
265
373
  key?: string,
266
374
  maps?: NativeIdMaps
267
375
  ): unknown {
268
- if (typeof value === "number" && maps !== undefined) {
269
- if (key === "connId") {
376
+ const isId = typeof value === "bigint" || typeof value === "number";
377
+ if (isId && maps !== undefined && key !== undefined) {
378
+ if (CONNECTION_ID_KEYS.has(key)) {
270
379
  return maps.connectionIds.toPublic(BigInt(value));
271
380
  }
272
381
  if (key === "streamId") {
273
- return maps.streamIds.toPublic(BigInt(value));
382
+ // Mapped with its connection once the whole record is normalized.
383
+ return value;
274
384
  }
275
385
  }
276
386
  if (typeof value === "bigint") {
277
- if (key === "connId" && maps !== undefined) {
278
- return maps.connectionIds.toPublic(value);
279
- }
280
- if (key === "streamId" && maps !== undefined) {
281
- return maps.streamIds.toPublic(value);
282
- }
283
387
  return bigintToNumber(value, "native value");
284
388
  }
285
389
  if (Array.isArray(value)) {
@@ -289,7 +393,7 @@ function normalizeNativeValue(
289
393
  return value;
290
394
  }
291
395
  if (value !== null && typeof value === "object") {
292
- return Object.fromEntries(
396
+ const record: Record<string, unknown> = Object.fromEntries(
293
397
  Object.entries(value)
294
398
  .filter(([, item]) => item !== null)
295
399
  .map(([itemKey, item]) => [
@@ -297,6 +401,23 @@ function normalizeNativeValue(
297
401
  normalizeNativeValue(item, itemKey, maps),
298
402
  ])
299
403
  );
404
+ const { connId, streamId } = record;
405
+ if (maps !== undefined && streamId !== undefined) {
406
+ if (
407
+ (typeof streamId !== "bigint" && typeof streamId !== "number") ||
408
+ (connId !== undefined && typeof connId !== "number")
409
+ ) {
410
+ throw new TypeError("The native addon returned an invalid stream ID");
411
+ }
412
+ // Public stream IDs are allocated per connection. A record without a
413
+ // connection (an endpoint error, say) cannot name a public stream.
414
+ if (typeof connId === "number") {
415
+ record.streamId = maps.streamIds.toPublic(connId, BigInt(streamId));
416
+ } else {
417
+ delete record.streamId;
418
+ }
419
+ }
420
+ return record;
300
421
  }
301
422
  return value;
302
423
  }
@@ -304,7 +425,7 @@ function normalizeNativeValue(
304
425
  function normalizeEvent(
305
426
  value: unknown,
306
427
  connectionIds: IdMap,
307
- streamIds: IdMap
428
+ streamIds: StreamIdMap
308
429
  ): P2pEvent {
309
430
  const event = normalizeNativeValue(value, undefined, {
310
431
  connectionIds,
@@ -320,45 +441,56 @@ function normalizeEvent(
320
441
  ) {
321
442
  event.inner = normalizeEventBytes(event.tag, event.inner);
322
443
  }
323
- retireTerminalIds(event, connectionIds, streamIds);
324
- return event as P2pEvent;
444
+ const normalized = event as P2pEvent;
445
+ retireTerminalIds(normalized, connectionIds, streamIds);
446
+ return normalized;
325
447
  }
326
448
 
449
+ /**
450
+ * Stops new native events from reaching identifiers this event ends, so a
451
+ * reused native ID gets a fresh public number. An ended connection is
452
+ * released at once, so a stream operation queued behind its event throws
453
+ * `StreamClosedError` without reaching native; stream numbers stay resolvable
454
+ * until {@link releaseTerminalIds} runs after dispatch.
455
+ */
327
456
  function retireTerminalIds(
328
- event: { readonly tag?: unknown; readonly inner?: unknown },
457
+ event: P2pEvent,
329
458
  connectionIds: IdMap,
330
- streamIds: IdMap
459
+ streamIds: StreamIdMap
331
460
  ): void {
332
- visitTerminalIds(event, connectionIds, streamIds, (map, id) => {
333
- map.retirePublic(id);
334
- });
461
+ const connId = endedConnection(event);
462
+ if (connId !== undefined) {
463
+ connectionIds.deletePublic(connId);
464
+ streamIds.retireConnection(connId);
465
+ }
466
+ if (event.tag === P2pEvent_Tags.StreamClosed) {
467
+ streamIds.retirePublic(event.inner.streamId);
468
+ }
335
469
  }
336
470
 
337
- function releaseTerminalIds(
338
- event: { readonly tag?: unknown; readonly inner?: unknown },
339
- connectionIds: IdMap,
340
- streamIds: IdMap
341
- ): void {
342
- visitTerminalIds(event, connectionIds, streamIds, (map, id) => {
343
- map.deletePublic(id);
344
- });
471
+ /** Frees stream identifiers this event ended, once the SDK dispatched it. */
472
+ function releaseTerminalIds(event: P2pEvent, streamIds: StreamIdMap): void {
473
+ const connId = endedConnection(event);
474
+ if (connId !== undefined) {
475
+ streamIds.deleteConnection(connId);
476
+ }
477
+ if (event.tag === P2pEvent_Tags.StreamClosed) {
478
+ streamIds.deletePublic(event.inner.streamId);
479
+ }
345
480
  }
346
481
 
347
- function visitTerminalIds(
348
- event: { readonly tag?: unknown; readonly inner?: unknown },
349
- connectionIds: IdMap,
350
- streamIds: IdMap,
351
- visit: (map: IdMap, value: unknown) => void
352
- ): void {
353
- if (event.inner === null || typeof event.inner !== "object") {
354
- return;
482
+ /**
483
+ * The connection this event ends. A closed or replaced connection reports no
484
+ * per-stream terminal events, so its streams end with it.
485
+ */
486
+ function endedConnection(event: P2pEvent): number | undefined {
487
+ if (event.tag === P2pEvent_Tags.ConnectionClosed) {
488
+ return event.inner.connId;
355
489
  }
356
- if (event.tag === "ConnectionClosed") {
357
- visit(connectionIds, Reflect.get(event.inner, "connId"));
358
- }
359
- if (event.tag === "StreamClosed") {
360
- visit(streamIds, Reflect.get(event.inner, "streamId"));
490
+ if (event.tag === P2pEvent_Tags.ConnectionReplaced) {
491
+ return event.inner.oldConnId;
361
492
  }
493
+ return undefined;
362
494
  }
363
495
 
364
496
  function normalizeEventBytes(tag: string, value: unknown): unknown {
@@ -474,7 +606,7 @@ class EventDrain {
474
606
 
475
607
  interface NativeIdMaps {
476
608
  readonly connectionIds: IdMap;
477
- readonly streamIds: IdMap;
609
+ readonly streamIds: StreamIdMap;
478
610
  }
479
611
 
480
612
  class IdMap {
@@ -494,34 +626,88 @@ class IdMap {
494
626
  return publicId;
495
627
  }
496
628
 
629
+ /** The native ID of a live public connection; only stream ops ask. */
497
630
  toNative(publicId: number): bigint {
498
631
  const native = this.#nativeByPublic.get(publicId);
499
632
  if (native === undefined) {
500
- throw new RangeError(`Unknown native identifier ${publicId}`);
633
+ throw new StreamClosedError("The stream's connection ended");
501
634
  }
502
635
  return native;
503
636
  }
504
637
 
505
- deletePublic(value: unknown): void {
506
- if (typeof value !== "number") {
507
- return;
508
- }
509
- const native = this.#nativeByPublic.get(value);
638
+ deletePublic(publicId: number): void {
639
+ const native = this.#nativeByPublic.get(publicId);
510
640
  if (native !== undefined) {
511
- this.#nativeByPublic.delete(value);
512
- if (this.#publicByNative.get(native) === value) {
513
- this.#publicByNative.delete(native);
514
- }
641
+ this.#nativeByPublic.delete(publicId);
642
+ this.#publicByNative.delete(native);
515
643
  }
516
644
  }
645
+ }
517
646
 
518
- retirePublic(value: unknown): void {
519
- if (typeof value !== "number") {
520
- return;
647
+ /**
648
+ * Maps native stream IDs, which are unique only within their connection, to
649
+ * public numbers that never repeat. Each stream remembers its public
650
+ * connection, so a closed or replaced connection frees every stream on it.
651
+ */
652
+ class StreamIdMap {
653
+ readonly #publicByKey = new Map<string, number>();
654
+ readonly #streams = new Map<
655
+ number,
656
+ { readonly connId: number; readonly key: string; readonly native: bigint }
657
+ >();
658
+ #next = 1;
659
+
660
+ toPublic(connId: number, native: bigint): number {
661
+ const key = `${connId}:${native}`;
662
+ const existing = this.#publicByKey.get(key);
663
+ if (existing !== undefined) {
664
+ return existing;
521
665
  }
522
- const native = this.#nativeByPublic.get(value);
523
- if (native !== undefined && this.#publicByNative.get(native) === value) {
524
- this.#publicByNative.delete(native);
666
+ const publicId = this.#next;
667
+ this.#next += 1;
668
+ this.#publicByKey.set(key, publicId);
669
+ this.#streams.set(publicId, { connId, key, native });
670
+ return publicId;
671
+ }
672
+
673
+ toNative(publicId: number): bigint {
674
+ const stream = this.#streams.get(publicId);
675
+ if (stream === undefined) {
676
+ throw new StreamClosedError("The stream closed");
677
+ }
678
+ return stream.native;
679
+ }
680
+
681
+ deletePublic(publicId: number): void {
682
+ this.retirePublic(publicId);
683
+ this.#streams.delete(publicId);
684
+ }
685
+
686
+ retirePublic(publicId: number): void {
687
+ const stream = this.#streams.get(publicId);
688
+ if (
689
+ stream !== undefined &&
690
+ this.#publicByKey.get(stream.key) === publicId
691
+ ) {
692
+ this.#publicByKey.delete(stream.key);
525
693
  }
526
694
  }
695
+
696
+ deleteConnection(connId: number): void {
697
+ for (const publicId of this.#onConnection(connId)) {
698
+ this.deletePublic(publicId);
699
+ }
700
+ }
701
+
702
+ retireConnection(connId: number): void {
703
+ for (const publicId of this.#onConnection(connId)) {
704
+ this.retirePublic(publicId);
705
+ }
706
+ }
707
+
708
+ #onConnection(connId: number): number[] {
709
+ return [...this.#streams]
710
+ .filter(([, stream]) => stream.connId === connId)
711
+ .map(([publicId]) => publicId);
712
+ }
527
713
  }
package/src/native.ts CHANGED
@@ -71,17 +71,18 @@ interface NativeEndpointConfig {
71
71
  }
72
72
 
73
73
  export interface NativeEndpoint {
74
- abandonStream: (peerId: string, streamId: bigint) => void;
74
+ abandonStream: (peerId: string, connId: bigint, streamId: bigint) => void;
75
75
  activeReservation: () => unknown;
76
76
  addProtocol: (protocolId: string) => void;
77
77
  cancelConnect: (id: bigint) => void;
78
78
  close: () => void;
79
- closeStreamWrite: (peerId: string, streamId: bigint) => void;
79
+ closeStreamWrite: (peerId: string, connId: bigint, streamId: bigint) => void;
80
80
  connectedPeers: () => string[];
81
81
  connectionInfo: (peerId: string) =>
82
82
  | {
83
83
  readonly connId: bigint;
84
84
  readonly remoteAddr?: string | null;
85
+ readonly readyProtocols?: string[] | null;
85
86
  }
86
87
  | null
87
88
  | undefined;
@@ -103,8 +104,13 @@ export interface NativeEndpoint {
103
104
  ping: (peerId: string) => void;
104
105
  publish: (topic: string, data: Uint8Array) => void;
105
106
  reachability: () => number;
106
- resetStream: (peerId: string, streamId: bigint) => void;
107
- sendStream: (peerId: string, streamId: bigint, data: Uint8Array) => void;
107
+ resetStream: (peerId: string, connId: bigint, streamId: bigint) => void;
108
+ sendStream: (
109
+ peerId: string,
110
+ connId: bigint,
111
+ streamId: bigint,
112
+ data: Uint8Array
113
+ ) => void;
108
114
  setActive: (active: boolean) => void;
109
115
  start: (doorbell: () => void) => void;
110
116
  subscribe: (topic: string) => boolean;