@minip2p/node 0.8.3 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -14,7 +14,7 @@ console.log(endpoint.peerId(), endpoint.listenAddrs());
14
14
  endpoint.close();
15
15
  ```
16
16
 
17
- `Minip2p.create()` starts the endpoint. A running endpoint keeps the Node.js process alive until `close()` shuts it down. Promise-returning operations such as `connect()` and `openStream()` resolve as their network work completes.
17
+ `Minip2p.create()` starts the endpoint. A running endpoint keeps the Node.js process alive until `close()` shuts it down and its bounded drain (500 ms by default, `close(timeoutMs)` to choose) finishes. Promise-returning operations such as `connect()` and `openStream()` resolve as their network work completes.
18
18
 
19
19
  The Node binding accepts the same TCP, QUIC, circuit-relay, signed-discovery, and mDNS configuration as `@minip2p/react-native`.
20
20
 
@@ -1 +1 @@
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"}
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,EAGL,aAAa,EAGd,MAAM,eAAe,CAAC;AAoTvB,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,39 +1,65 @@
1
1
  /* oxlint-disable class-methods-use-this, func-style, max-classes-per-file, no-use-before-define -- The adapter keeps the contract-complete native endpoint, value conversion, and handle maps together at the binding boundary. */
2
2
  import { Minip2pBase, StreamClosedError } from "@minip2p/core";
3
- import { ConnectionIdMap, EventDrain, P2pEvent_Tags, resolveEndpointConfig, typedFfiError, u64ToNumber, } from "@minip2p/core/backend";
3
+ import { ConnectionIdMap, EventDrain, NativeCloseLatch, P2pEvent_Tags, SettleHandles, eventStream, resolveEndpointConfig, typedFfiError, u64ToNumber, unfinishedPeers, } from "@minip2p/core/backend";
4
4
  import { nativeBinding } from "./native.js";
5
5
  /** Native drain batch size. */
6
6
  const DRAIN_LIMIT = 256;
7
7
  class NodeBackend {
8
8
  #connectionIds = new ConnectionIdMap();
9
9
  #endpoint;
10
- #events;
11
10
  #streamIds = new StreamIdMap();
11
+ /** Native stream identities while their events are in flight (ADR 0012). */
12
+ #settleHandles = new SettleHandles();
13
+ #close = new NativeCloseLatch();
14
+ #started = false;
12
15
  constructor(config) {
13
16
  this.#endpoint = translateErrors(() => new nativeBinding.NodeEndpoint(toUint8Array(config.secretKey), resolveEndpointConfig(config)));
14
17
  }
15
18
  start(listener) {
16
19
  const events = new EventDrain((limit) => this.#endpoint.drainEvents(limit), (event) => {
17
- listener(normalizeEvent(event, this.#connectionIds, this.#streamIds));
20
+ if (event.tag === P2pEvent_Tags.EndpointClosed) {
21
+ events.stop();
22
+ this.#close.settle({
23
+ outcome: event.inner.outcome,
24
+ unfinished: unfinishedPeers(event.inner.unfinished),
25
+ });
26
+ return;
27
+ }
28
+ // The SDK has stopped listening; only `EndpointClosed` matters now.
29
+ if (this.#close.requested) {
30
+ return;
31
+ }
32
+ const normalized = normalizeEvent(event, this.#connectionIds, this.#streamIds);
33
+ const stream = eventStream(normalized);
34
+ const native = nativeStreamOf(event);
35
+ if (stream !== undefined && native !== undefined) {
36
+ this.#settleHandles.hold(stream.connId, stream.streamId, native);
37
+ }
38
+ listener(normalized);
18
39
  }, DRAIN_LIMIT,
19
40
  // One check-phase turn keeps native callbacks out of the caller's stack
20
41
  // without paying the timer granularity for every bounded batch.
21
42
  (task) => {
22
43
  setImmediate(task);
23
44
  });
24
- this.#events = events;
25
45
  translateErrors(() => {
26
46
  this.#endpoint.start(() => {
27
47
  events.ring();
28
48
  });
29
49
  });
50
+ this.#started = true;
30
51
  }
31
52
  eventHandled(event) {
32
53
  releaseTerminalIds(event, this.#streamIds);
54
+ const stream = eventStream(event);
55
+ if (stream !== undefined) {
56
+ this.#settleHandles.release(stream.connId, stream.streamId);
57
+ }
33
58
  }
34
- close() {
35
- this.#endpoint.close();
36
- this.#events?.stop();
59
+ close(timeoutMs) {
60
+ return this.#close.close(this.#started, () => {
61
+ this.#endpoint.close(timeoutMs);
62
+ });
37
63
  }
38
64
  peerId() {
39
65
  return this.#endpoint.peerId();
@@ -132,11 +158,11 @@ class NodeBackend {
132
158
  }
133
159
  abandonStream(connId, streamId) {
134
160
  translateErrors(() => {
135
- this.#endpoint.abandonStream(...this.#nativeStream(connId, streamId));
161
+ this.#endpoint.abandonStream(...this.#settleStream(connId, streamId));
136
162
  });
137
163
  }
138
164
  streamConsumer(connId, streamId) {
139
- const [nativeConn, nativeStream] = this.#nativeStream(connId, streamId);
165
+ const [nativeConn, nativeStream] = this.#settleStream(connId, streamId);
140
166
  return (bytes) => {
141
167
  translateErrors(() => {
142
168
  this.#endpoint.streamConsumed(nativeConn, nativeStream, bytes);
@@ -156,6 +182,24 @@ class NodeBackend {
156
182
  this.#streamIds.toNative(streamId),
157
183
  ];
158
184
  }
185
+ /**
186
+ * Native IDs for settling a stream: acknowledging or abandoning its bytes.
187
+ * Those still hold the native slot of a connection whose end this adapter
188
+ * already drained, so a stream with events in flight resolves through its
189
+ * settle handle once the live mapping is gone.
190
+ */
191
+ #settleStream(connId, streamId) {
192
+ try {
193
+ return this.#nativeStream(connId, streamId);
194
+ }
195
+ catch (error) {
196
+ const handle = this.#settleHandles.get(connId, streamId);
197
+ if (handle === undefined) {
198
+ throw error;
199
+ }
200
+ return handle;
201
+ }
202
+ }
159
203
  // Connect IDs are not mapped because they round-trip into native calls,
160
204
  // and native allocates them well inside the safe integer range.
161
205
  connect(target) {
@@ -196,15 +240,20 @@ export function circuitAddress(relayAddress, peerId) {
196
240
  }
197
241
  /**
198
242
  * Rethrows a native `FfiError` as its typed SDK error. The addon tags each
199
- * error with the variant name as `code` and its detail field as `detail`;
200
- * untyped variants are rethrown unchanged with both properties intact.
243
+ * error with the variant name as `code`, its detail field as `detail`, and
244
+ * an `InvalidConfig`'s capability name as `capability`; untyped variants are
245
+ * rethrown unchanged with those properties intact.
201
246
  */
202
247
  function translateErrors(operation) {
203
248
  try {
204
249
  return operation();
205
250
  }
206
251
  catch (error) {
207
- throw (typedFfiError(stringProperty(error, "code"), stringProperty(error, "detail")) ?? error);
252
+ throw (typedFfiError({
253
+ capability: stringProperty(error, "capability"),
254
+ detail: stringProperty(error, "detail"),
255
+ tag: stringProperty(error, "code"),
256
+ }) ?? error);
208
257
  }
209
258
  }
210
259
  function stringProperty(value, key) {
@@ -260,8 +309,9 @@ function normalizeNativeValue(value, maps, tag, key) {
260
309
  if (key !== undefined && CONNECTION_ID_KEYS.has(key)) {
261
310
  return maps.connectionIds.toPublicInEvent(tag, key, BigInt(value));
262
311
  }
263
- // A QUIC stop code is a 62-bit varint the remote picks: keep it whole.
264
- if (key === "errorCode") {
312
+ // QUIC stop and close codes are 62-bit varints the remote picks: keep
313
+ // them whole.
314
+ if (key === "errorCode" || key === "code") {
265
315
  return BigInt(value);
266
316
  }
267
317
  return key === "streamId" ? value : u64ToNumber(value, key ?? "native u64");
@@ -303,8 +353,8 @@ function normalizeEvent(event, connectionIds, streamIds) {
303
353
  }
304
354
  /**
305
355
  * Per-chunk and per-write events, and pubsub messages, convert field by
306
- * field. Identify snapshots go through the typed {@link identifyInfo}. The
307
- * rest share the generic walk: the addon's serde shape is the SDK shape with
356
+ * field. Identify snapshots go through the typed {@link identifyInfo}, and a
357
+ * field-less event passes through by tag. The rest share the generic walk: the addon's serde shape is the SDK shape with
308
358
  * napi-rs integers and buffers (see `native-shape.ts`).
309
359
  */
310
360
  function convertEvent(event, maps) {
@@ -346,6 +396,9 @@ function convertEvent(event, maps) {
346
396
  tag: event.tag,
347
397
  };
348
398
  }
399
+ case P2pEvent_Tags.MdnsRecovered: {
400
+ return { tag: event.tag };
401
+ }
349
402
  default: {
350
403
  return {
351
404
  inner: normalizeNativeValue(event.inner, maps, event.tag),
@@ -354,6 +407,22 @@ function convertEvent(event, maps) {
354
407
  }
355
408
  }
356
409
  }
410
+ /** The native identity of the stream a native stream event names. */
411
+ function nativeStreamOf(event) {
412
+ switch (event.tag) {
413
+ case P2pEvent_Tags.StreamReady:
414
+ case P2pEvent_Tags.StreamData:
415
+ case P2pEvent_Tags.StreamWriteAccepted:
416
+ case P2pEvent_Tags.StreamWriteStopped:
417
+ case P2pEvent_Tags.StreamRemoteWriteClosed:
418
+ case P2pEvent_Tags.StreamClosed: {
419
+ return [BigInt(event.inner.connId), BigInt(event.inner.streamId)];
420
+ }
421
+ default: {
422
+ return undefined;
423
+ }
424
+ }
425
+ }
357
426
  /** The public identity of the stream a native stream event names. */
358
427
  function streamRef(inner, maps) {
359
428
  const connId = maps.connectionIds.toPublic(BigInt(inner.connId));
@@ -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":"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"}
package/dist/addon.d.ts CHANGED
@@ -17,8 +17,12 @@ export declare class NodeEndpoint {
17
17
  constructor(secretKey: Uint8Array, config: NodeEndpointConfig)
18
18
  /** Starts the detached driver with a strong event-loop doorbell. */
19
19
  start(doorbell: () => void): void
20
- /** Requests shutdown without waiting for the driver thread. */
21
- close(): void
20
+ /**
21
+ * Requests shutdown without waiting for the driver thread, which drains
22
+ * for up to `timeoutMs` and then delivers `EndpointClosed` as its last
23
+ * event.
24
+ */
25
+ close(timeoutMs: number): void
22
26
  /** Returns the local peer ID. */
23
27
  peerId(): string
24
28
  /** Returns bound peer addresses. */
@@ -64,7 +68,9 @@ export declare class NodeEndpoint {
64
68
  abandonStream(connId: bigint, streamId: bigint): void
65
69
  /**
66
70
  * Acknowledges `bytes` of a stream's received data as consumed,
67
- * letting its sender continue. Every registered protocol needs this.
71
+ * letting its sender continue. Every registered protocol needs this,
72
+ * also after the stream's connection closed: unacknowledged bytes keep
73
+ * the ended connection's slot until they are acknowledged or abandoned.
68
74
  */
69
75
  streamConsumed(connId: bigint, streamId: bigint, bytes: number): void
70
76
  /**
@@ -76,9 +82,12 @@ export declare class NodeEndpoint {
76
82
  cancelConnect(id: bigint): void
77
83
  /** Disconnects one peer. */
78
84
  disconnect(peerId: string): void
79
- /** Returns the current path to a peer. */
85
+ /**
86
+ * Returns the path of a peer's established connection; `null` only
87
+ * while the peer is not connected.
88
+ */
80
89
  path(peerId: string): NativePathKind | null
81
- /** Returns the transport connection selected for a peer. */
90
+ /** Returns a snapshot of a peer's established connection. */
82
91
  connectionInfo(peerId: string): NativeConnectionInfo | null
83
92
  /** Returns the discovery address book. */
84
93
  knownPeers(): Array<NativeKnownPeerInfo>
@@ -7,8 +7,8 @@
7
7
  *
8
8
  * The generated `addon.d.ts` imports these names through its header.
9
9
  */
10
- import type { ConnectionInfo, IdentifyInfo, KnownPeerInfo, RelayReservationInfo } from "@minip2p/core";
11
- import type { BackendOpenStream, P2pEvent, PathKind } from "@minip2p/core/backend";
10
+ import type { IdentifyInfo, KnownPeerInfo, RelayReservationInfo } from "@minip2p/core";
11
+ import type { BackendConnectionInfo, BackendOpenStream, P2pEvent, PathKind } from "@minip2p/core/backend";
12
12
  /** One SDK backend value as the addon encodes it. */
13
13
  export type NativeShape<Value> = Value extends ArrayBuffer ? Uint8Array : Value extends number ? number | bigint : Value extends string | boolean ? Value : Value extends readonly (infer Item)[] ? readonly NativeShape<Item>[] : {
14
14
  readonly [Key in keyof Value]: NativeShape<Value[Key]>;
@@ -17,7 +17,7 @@ export type NativeEvent = NativeShape<P2pEvent>;
17
17
  export type NativeIdentifyInfo = NativeShape<IdentifyInfo>;
18
18
  export type NativeKnownPeerInfo = NativeShape<KnownPeerInfo>;
19
19
  export type NativeRelayReservationInfo = NativeShape<RelayReservationInfo>;
20
- export type NativeConnectionInfo = NativeShape<ConnectionInfo>;
20
+ export type NativeConnectionInfo = NativeShape<BackendConnectionInfo>;
21
21
  export type NativeOpenStream = NativeShape<BackendOpenStream>;
22
22
  export type NativePathKind = NativeShape<PathKind>;
23
23
  export type { Reachability } from "@minip2p/core";
@@ -1 +1 @@
1
- {"version":3,"file":"native-shape.d.ts","sourceRoot":"","sources":["../src/native-shape.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,iBAAiB,EACjB,QAAQ,EACR,QAAQ,EACT,MAAM,uBAAuB,CAAC;AAE/B,qDAAqD;AACrD,MAAM,MAAM,WAAW,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,GACtD,UAAU,GACV,KAAK,SAAS,MAAM,GAClB,MAAM,GAAG,MAAM,GACf,KAAK,SAAS,MAAM,GAAG,OAAO,GAC5B,KAAK,GACL,KAAK,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GACnC,SAAS,WAAW,CAAC,IAAI,CAAC,EAAE,GAC5B;IAAE,QAAQ,EAAE,GAAG,IAAI,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;CAAE,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAChD,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AAC3D,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;AAC7D,MAAM,MAAM,0BAA0B,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AAC/D,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AACnD,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"native-shape.d.ts","sourceRoot":"","sources":["../src/native-shape.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,QAAQ,EACR,QAAQ,EACT,MAAM,uBAAuB,CAAC;AAE/B,qDAAqD;AACrD,MAAM,MAAM,WAAW,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,GACtD,UAAU,GACV,KAAK,SAAS,MAAM,GAClB,MAAM,GAAG,MAAM,GACf,KAAK,SAAS,MAAM,GAAG,OAAO,GAC5B,KAAK,GACL,KAAK,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GACnC,SAAS,WAAW,CAAC,IAAI,CAAC,EAAE,GAC5B;IAAE,QAAQ,EAAE,GAAG,IAAI,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;CAAE,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAChD,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AAC3D,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;AAC7D,MAAM,MAAM,0BAA0B,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;AACtE,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AACnD,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@minip2p/node",
3
- "version": "0.8.3",
3
+ "version": "0.10.0",
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.8.3"
41
+ "@minip2p/core": "0.10.0"
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.8.3",
52
- "@minip2p/node-darwin-x64": "0.8.3",
53
- "@minip2p/node-linux-arm64-gnu": "0.8.3",
54
- "@minip2p/node-linux-arm64-musl": "0.8.3",
55
- "@minip2p/node-linux-x64-gnu": "0.8.3",
56
- "@minip2p/node-linux-x64-musl": "0.8.3",
57
- "@minip2p/node-win32-x64-msvc": "0.8.3"
51
+ "@minip2p/node-darwin-arm64": "0.10.0",
52
+ "@minip2p/node-darwin-x64": "0.10.0",
53
+ "@minip2p/node-linux-arm64-gnu": "0.10.0",
54
+ "@minip2p/node-linux-arm64-musl": "0.10.0",
55
+ "@minip2p/node-linux-x64-gnu": "0.10.0",
56
+ "@minip2p/node-linux-x64-musl": "0.10.0",
57
+ "@minip2p/node-win32-x64-msvc": "0.10.0"
58
58
  },
59
59
  "napi": {
60
60
  "binaryName": "minip2p",
package/src/adapter.ts CHANGED
@@ -3,7 +3,6 @@
3
3
  import { Minip2pBase, StreamClosedError } from "@minip2p/core";
4
4
  import type {
5
5
  Bytes,
6
- ConnectionInfo,
7
6
  IdentifyInfo,
8
7
  KnownPeerInfo,
9
8
  Minip2pConfig,
@@ -13,12 +12,18 @@ import type {
13
12
  import {
14
13
  ConnectionIdMap,
15
14
  EventDrain,
15
+ NativeCloseLatch,
16
16
  P2pEvent_Tags,
17
+ SettleHandles,
18
+ eventStream,
17
19
  resolveEndpointConfig,
18
20
  typedFfiError,
19
21
  u64ToNumber,
22
+ unfinishedPeers,
20
23
  } from "@minip2p/core/backend";
21
24
  import type {
25
+ BackendClosed,
26
+ BackendConnectionInfo,
22
27
  BackendConnectTarget,
23
28
  BackendOpenStream,
24
29
  Minip2pBackend,
@@ -41,8 +46,11 @@ const DRAIN_LIMIT = 256;
41
46
  class NodeBackend implements Minip2pBackend {
42
47
  readonly #connectionIds = new ConnectionIdMap();
43
48
  readonly #endpoint: NativeEndpoint;
44
- #events: EventDrain<NativeEvent> | undefined;
45
49
  readonly #streamIds = new StreamIdMap();
50
+ /** Native stream identities while their events are in flight (ADR 0012). */
51
+ readonly #settleHandles = new SettleHandles<[bigint, bigint]>();
52
+ readonly #close = new NativeCloseLatch();
53
+ #started = false;
46
54
 
47
55
  constructor(config: Minip2pConfig) {
48
56
  this.#endpoint = translateErrors(
@@ -58,7 +66,29 @@ class NodeBackend implements Minip2pBackend {
58
66
  const events = new EventDrain(
59
67
  (limit) => this.#endpoint.drainEvents(limit),
60
68
  (event: NativeEvent) => {
61
- listener(normalizeEvent(event, this.#connectionIds, this.#streamIds));
69
+ if (event.tag === P2pEvent_Tags.EndpointClosed) {
70
+ events.stop();
71
+ this.#close.settle({
72
+ outcome: event.inner.outcome,
73
+ unfinished: unfinishedPeers(event.inner.unfinished),
74
+ });
75
+ return;
76
+ }
77
+ // The SDK has stopped listening; only `EndpointClosed` matters now.
78
+ if (this.#close.requested) {
79
+ return;
80
+ }
81
+ const normalized = normalizeEvent(
82
+ event,
83
+ this.#connectionIds,
84
+ this.#streamIds
85
+ );
86
+ const stream = eventStream(normalized);
87
+ const native = nativeStreamOf(event);
88
+ if (stream !== undefined && native !== undefined) {
89
+ this.#settleHandles.hold(stream.connId, stream.streamId, native);
90
+ }
91
+ listener(normalized);
62
92
  },
63
93
  DRAIN_LIMIT,
64
94
  // One check-phase turn keeps native callbacks out of the caller's stack
@@ -67,21 +97,26 @@ class NodeBackend implements Minip2pBackend {
67
97
  setImmediate(task);
68
98
  }
69
99
  );
70
- this.#events = events;
71
100
  translateErrors(() => {
72
101
  this.#endpoint.start(() => {
73
102
  events.ring();
74
103
  });
75
104
  });
105
+ this.#started = true;
76
106
  }
77
107
 
78
108
  eventHandled(event: P2pEvent): void {
79
109
  releaseTerminalIds(event, this.#streamIds);
110
+ const stream = eventStream(event);
111
+ if (stream !== undefined) {
112
+ this.#settleHandles.release(stream.connId, stream.streamId);
113
+ }
80
114
  }
81
115
 
82
- close(): void {
83
- this.#endpoint.close();
84
- this.#events?.stop();
116
+ close(timeoutMs: number): Promise<BackendClosed> {
117
+ return this.#close.close(this.#started, () => {
118
+ this.#endpoint.close(timeoutMs);
119
+ });
85
120
  }
86
121
 
87
122
  peerId(): string {
@@ -129,7 +164,7 @@ class NodeBackend implements Minip2pBackend {
129
164
  return translateErrors(() => this.#endpoint.path(peerId)) ?? undefined;
130
165
  }
131
166
 
132
- connectionInfo(peerId: string): ConnectionInfo | undefined {
167
+ connectionInfo(peerId: string): BackendConnectionInfo | undefined {
133
168
  const info = translateErrors(() => this.#endpoint.connectionInfo(peerId));
134
169
  if (info === null) {
135
170
  return undefined;
@@ -210,12 +245,12 @@ class NodeBackend implements Minip2pBackend {
210
245
 
211
246
  abandonStream(connId: number, streamId: number): void {
212
247
  translateErrors(() => {
213
- this.#endpoint.abandonStream(...this.#nativeStream(connId, streamId));
248
+ this.#endpoint.abandonStream(...this.#settleStream(connId, streamId));
214
249
  });
215
250
  }
216
251
 
217
252
  streamConsumer(connId: number, streamId: number): (bytes: number) => void {
218
- const [nativeConn, nativeStream] = this.#nativeStream(connId, streamId);
253
+ const [nativeConn, nativeStream] = this.#settleStream(connId, streamId);
219
254
  return (bytes) => {
220
255
  translateErrors(() => {
221
256
  this.#endpoint.streamConsumed(nativeConn, nativeStream, bytes);
@@ -237,6 +272,24 @@ class NodeBackend implements Minip2pBackend {
237
272
  ];
238
273
  }
239
274
 
275
+ /**
276
+ * Native IDs for settling a stream: acknowledging or abandoning its bytes.
277
+ * Those still hold the native slot of a connection whose end this adapter
278
+ * already drained, so a stream with events in flight resolves through its
279
+ * settle handle once the live mapping is gone.
280
+ */
281
+ #settleStream(connId: number, streamId: number): [bigint, bigint] {
282
+ try {
283
+ return this.#nativeStream(connId, streamId);
284
+ } catch (error) {
285
+ const handle = this.#settleHandles.get(connId, streamId);
286
+ if (handle === undefined) {
287
+ throw error;
288
+ }
289
+ return handle;
290
+ }
291
+ }
292
+
240
293
  // Connect IDs are not mapped because they round-trip into native calls,
241
294
  // and native allocates them well inside the safe integer range.
242
295
  connect(target: BackendConnectTarget): number {
@@ -296,18 +349,20 @@ export function circuitAddress(relayAddress: string, peerId: string): string {
296
349
 
297
350
  /**
298
351
  * 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.
352
+ * error with the variant name as `code`, its detail field as `detail`, and
353
+ * an `InvalidConfig`'s capability name as `capability`; untyped variants are
354
+ * rethrown unchanged with those properties intact.
301
355
  */
302
356
  function translateErrors<T>(operation: () => T): T {
303
357
  try {
304
358
  return operation();
305
359
  } catch (error) {
306
360
  throw (
307
- typedFfiError(
308
- stringProperty(error, "code"),
309
- stringProperty(error, "detail")
310
- ) ?? error
361
+ typedFfiError({
362
+ capability: stringProperty(error, "capability"),
363
+ detail: stringProperty(error, "detail"),
364
+ tag: stringProperty(error, "code"),
365
+ }) ?? error
311
366
  );
312
367
  }
313
368
  }
@@ -389,8 +444,9 @@ function normalizeNativeValue(
389
444
  if (key !== undefined && CONNECTION_ID_KEYS.has(key)) {
390
445
  return maps.connectionIds.toPublicInEvent(tag, key, BigInt(value));
391
446
  }
392
- // A QUIC stop code is a 62-bit varint the remote picks: keep it whole.
393
- if (key === "errorCode") {
447
+ // QUIC stop and close codes are 62-bit varints the remote picks: keep
448
+ // them whole.
449
+ if (key === "errorCode" || key === "code") {
394
450
  return BigInt(value);
395
451
  }
396
452
  return key === "streamId" ? value : u64ToNumber(value, key ?? "native u64");
@@ -439,8 +495,8 @@ function normalizeEvent(
439
495
 
440
496
  /**
441
497
  * Per-chunk and per-write events, and pubsub messages, convert field by
442
- * field. Identify snapshots go through the typed {@link identifyInfo}. The
443
- * rest share the generic walk: the addon's serde shape is the SDK shape with
498
+ * field. Identify snapshots go through the typed {@link identifyInfo}, and a
499
+ * field-less event passes through by tag. The rest share the generic walk: the addon's serde shape is the SDK shape with
444
500
  * napi-rs integers and buffers (see `native-shape.ts`).
445
501
  */
446
502
  function convertEvent(event: NativeEvent, maps: NativeIdMaps): P2pEvent {
@@ -482,6 +538,9 @@ function convertEvent(event: NativeEvent, maps: NativeIdMaps): P2pEvent {
482
538
  tag: event.tag,
483
539
  };
484
540
  }
541
+ case P2pEvent_Tags.MdnsRecovered: {
542
+ return { tag: event.tag };
543
+ }
485
544
  default: {
486
545
  return {
487
546
  inner: normalizeNativeValue(event.inner, maps, event.tag),
@@ -491,6 +550,23 @@ function convertEvent(event: NativeEvent, maps: NativeIdMaps): P2pEvent {
491
550
  }
492
551
  }
493
552
 
553
+ /** The native identity of the stream a native stream event names. */
554
+ function nativeStreamOf(event: NativeEvent): [bigint, bigint] | undefined {
555
+ switch (event.tag) {
556
+ case P2pEvent_Tags.StreamReady:
557
+ case P2pEvent_Tags.StreamData:
558
+ case P2pEvent_Tags.StreamWriteAccepted:
559
+ case P2pEvent_Tags.StreamWriteStopped:
560
+ case P2pEvent_Tags.StreamRemoteWriteClosed:
561
+ case P2pEvent_Tags.StreamClosed: {
562
+ return [BigInt(event.inner.connId), BigInt(event.inner.streamId)];
563
+ }
564
+ default: {
565
+ return undefined;
566
+ }
567
+ }
568
+ }
569
+
494
570
  /** The public identity of the stream a native stream event names. */
495
571
  function streamRef(
496
572
  inner: {
package/src/addon.d.ts CHANGED
@@ -17,8 +17,12 @@ export declare class NodeEndpoint {
17
17
  constructor(secretKey: Uint8Array, config: NodeEndpointConfig)
18
18
  /** Starts the detached driver with a strong event-loop doorbell. */
19
19
  start(doorbell: () => void): void
20
- /** Requests shutdown without waiting for the driver thread. */
21
- close(): void
20
+ /**
21
+ * Requests shutdown without waiting for the driver thread, which drains
22
+ * for up to `timeoutMs` and then delivers `EndpointClosed` as its last
23
+ * event.
24
+ */
25
+ close(timeoutMs: number): void
22
26
  /** Returns the local peer ID. */
23
27
  peerId(): string
24
28
  /** Returns bound peer addresses. */
@@ -64,7 +68,9 @@ export declare class NodeEndpoint {
64
68
  abandonStream(connId: bigint, streamId: bigint): void
65
69
  /**
66
70
  * Acknowledges `bytes` of a stream's received data as consumed,
67
- * letting its sender continue. Every registered protocol needs this.
71
+ * letting its sender continue. Every registered protocol needs this,
72
+ * also after the stream's connection closed: unacknowledged bytes keep
73
+ * the ended connection's slot until they are acknowledged or abandoned.
68
74
  */
69
75
  streamConsumed(connId: bigint, streamId: bigint, bytes: number): void
70
76
  /**
@@ -76,9 +82,12 @@ export declare class NodeEndpoint {
76
82
  cancelConnect(id: bigint): void
77
83
  /** Disconnects one peer. */
78
84
  disconnect(peerId: string): void
79
- /** Returns the current path to a peer. */
85
+ /**
86
+ * Returns the path of a peer's established connection; `null` only
87
+ * while the peer is not connected.
88
+ */
80
89
  path(peerId: string): NativePathKind | null
81
- /** Returns the transport connection selected for a peer. */
90
+ /** Returns a snapshot of a peer's established connection. */
82
91
  connectionInfo(peerId: string): NativeConnectionInfo | null
83
92
  /** Returns the discovery address book. */
84
93
  knownPeers(): Array<NativeKnownPeerInfo>
@@ -9,12 +9,12 @@
9
9
  */
10
10
 
11
11
  import type {
12
- ConnectionInfo,
13
12
  IdentifyInfo,
14
13
  KnownPeerInfo,
15
14
  RelayReservationInfo,
16
15
  } from "@minip2p/core";
17
16
  import type {
17
+ BackendConnectionInfo,
18
18
  BackendOpenStream,
19
19
  P2pEvent,
20
20
  PathKind,
@@ -35,7 +35,7 @@ export type NativeEvent = NativeShape<P2pEvent>;
35
35
  export type NativeIdentifyInfo = NativeShape<IdentifyInfo>;
36
36
  export type NativeKnownPeerInfo = NativeShape<KnownPeerInfo>;
37
37
  export type NativeRelayReservationInfo = NativeShape<RelayReservationInfo>;
38
- export type NativeConnectionInfo = NativeShape<ConnectionInfo>;
38
+ export type NativeConnectionInfo = NativeShape<BackendConnectionInfo>;
39
39
  export type NativeOpenStream = NativeShape<BackendOpenStream>;
40
40
  export type NativePathKind = NativeShape<PathKind>;
41
41
  export type { Reachability } from "@minip2p/core";