@minip2p/react-native 0.8.0 → 0.8.3

package/src/adapter.ts

@@ -229,15 +229,9 @@ class ReactNativeBackend implements Minip2pBackend {
     };
   }
 
-  sendStream(
-    peerId: string,
-    connId: number,
-    streamId: number,
-    data: Uint8Array
-  ): boolean {
+  sendStream(connId: number, streamId: number, data: Uint8Array): boolean {
     return translateErrors(() =>
       this.#endpoint.sendStream(
-        peerId,
         this.#connectionIds.toNative(connId),
         numberToU64(streamId, "streamId"),
         toArrayBuffer(data)
@@ -245,30 +239,27 @@ class ReactNativeBackend implements Minip2pBackend {
     );
   }
 
-  closeStreamWrite(peerId: string, connId: number, streamId: number): void {
+  closeStreamWrite(connId: number, streamId: number): void {
     translateErrors(() => {
       this.#endpoint.closeStreamWrite(
-        peerId,
         this.#connectionIds.toNative(connId),
         numberToU64(streamId, "streamId")
       );
     });
   }
 
-  resetStream(peerId: string, connId: number, streamId: number): void {
+  resetStream(connId: number, streamId: number): void {
     translateErrors(() => {
       this.#endpoint.resetStream(
-        peerId,
         this.#connectionIds.toNative(connId),
         numberToU64(streamId, "streamId")
       );
     });
   }
 
-  abandonStream(peerId: string, connId: number, streamId: number): void {
+  abandonStream(connId: number, streamId: number): void {
     translateErrors(() => {
       this.#endpoint.abandonStream(
-        peerId,
         this.#connectionIds.toNative(connId),
         numberToU64(streamId, "streamId")
       );
@@ -453,7 +444,10 @@ function normalizeGenericEvent(
   event: NativeP2pEvent,
   connectionIds: ConnectionIdMap
 ): P2pEvent {
-  const inner = normalizeBigInts(event.inner, connectionIds);
+  const inner = normalizeBigInts(event.inner, {
+    connectionIds,
+    tag: event.tag,
+  });
   if (inner === null || typeof inner !== "object") {
     throw new TypeError("The native endpoint returned an invalid event");
   }
@@ -501,14 +495,20 @@ const CONNECTION_ID_KEYS: ReadonlySet<string> = new Set([
   "newConnId",
 ]);
 
+/** The endpoint's connection map and the native event a value belongs to. */
+interface EventIds {
+  readonly connectionIds: ConnectionIdMap;
+  readonly tag: string;
+}
+
 /**
- * Converts native `bigint` fields to numbers. Connection ID fields go through
- * the endpoint's connection map when one is supplied; every other `u64` keeps
- * the checked conversion.
+ * Converts native `bigint` fields to numbers. Connection ID fields of an
+ * event go through the endpoint's connection map; every other `u64` keeps the
+ * checked conversion.
  */
 function normalizeBigInts(
   value: unknown,
-  connectionIds?: ConnectionIdMap,
+  event?: EventIds,
   key?: string
 ): unknown {
   if (typeof value === "bigint") {
@@ -516,23 +516,22 @@ function normalizeBigInts(
     if (key === "errorCode") {
       return value;
     }
-    return key !== undefined &&
-      CONNECTION_ID_KEYS.has(key) &&
-      connectionIds !== undefined
-      ? connectionIds.toPublic(value)
-      : u64ToNumber(value, "native u64");
+    if (key === undefined || !CONNECTION_ID_KEYS.has(key) || !event) {
+      return u64ToNumber(value, "native u64");
+    }
+    return event.connectionIds.toPublicInEvent(event.tag, key, value);
   }
   if (value instanceof ArrayBuffer) {
     return value;
   }
   if (Array.isArray(value)) {
-    return value.map((item) => normalizeBigInts(item, connectionIds));
+    return value.map((item) => normalizeBigInts(item, event));
   }
   if (value !== null && typeof value === "object") {
     return Object.fromEntries(
       Object.entries(value).map(([itemKey, item]) => [
         itemKey,
-        normalizeBigInts(item, connectionIds, itemKey),
+        normalizeBigInts(item, event, itemKey),
       ])
     );
   }

package/src/generated/minip2p_ffi-ffi.ts

@@ -76,11 +76,11 @@ interface NativeModuleInterface {
     ubrn_uniffi_minip2p_ffi_fn_func_generate_secret_key(uniffi_out_err: UniffiRustCallStatus): Uint8Array;
     ubrn_uniffi_minip2p_ffi_fn_func_peer_id_from_secret_key(secretKey: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
     ubrn_uniffi_minip2p_ffi_fn_constructor_p2pendpoint_new(secretKey: Uint8Array, config: Uint8Array, uniffi_out_err: UniffiRustCallStatus): bigint;
-    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_abandon_stream(uniffiSelf: bigint, peerId: Uint8Array, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
+    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_abandon_stream(uniffiSelf: bigint, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_active_reservation(uniffiSelf: bigint, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_add_protocol(uniffiSelf: bigint, protocolId: Uint8Array, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_cancel_connect(uniffiSelf: bigint, id: bigint, uniffi_out_err: UniffiRustCallStatus): void;
-    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_close_stream_write(uniffiSelf: bigint, peerId: Uint8Array, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
+    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_close_stream_write(uniffiSelf: bigint, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connect(uniffiSelf: bigint, target: Uint8Array, uniffi_out_err: UniffiRustCallStatus): bigint;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connected_peers(uniffiSelf: bigint, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connection_info(uniffiSelf: bigint, peerId: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
@@ -98,8 +98,8 @@ interface NativeModuleInterface {
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_ping(uniffiSelf: bigint, peerId: Uint8Array, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_publish(uniffiSelf: bigint, topic: Uint8Array, data: Uint8Array, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_reachability(uniffiSelf: bigint, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
-    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_reset_stream(uniffiSelf: bigint, peerId: Uint8Array, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
-    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_send_stream(uniffiSelf: bigint, peerId: Uint8Array, connId: bigint, streamId: bigint, data: Uint8Array, uniffi_out_err: UniffiRustCallStatus): number;
+    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_reset_stream(uniffiSelf: bigint, connId: bigint, streamId: bigint, uniffi_out_err: UniffiRustCallStatus): void;
+    ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_send_stream(uniffiSelf: bigint, connId: bigint, streamId: bigint, data: Uint8Array, uniffi_out_err: UniffiRustCallStatus): number;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_set_active(uniffiSelf: bigint, active: number, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_start(uniffiSelf: bigint, doorbell: bigint, uniffi_out_err: UniffiRustCallStatus): void;
     ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_stop(uniffiSelf: bigint, uniffi_out_err: UniffiRustCallStatus): void;

package/src/generated/minip2p_ffi.ts

@@ -298,7 +298,7 @@ export interface P2pEndpointLike {
 /**
  * Forgets a stream.
  */
-    abandonStream(peerId: string, connId: bigint, streamId: bigint) /*throws*/: void;
+    abandonStream(connId: bigint, streamId: bigint) /*throws*/: void;
 /**
  * Returns the active relay reservation.
  */
@@ -314,7 +314,7 @@ export interface P2pEndpointLike {
 /**
  * Half-closes a stream's write side.
  */
-    closeStreamWrite(peerId: string, connId: bigint, streamId: bigint) /*throws*/: void;
+    closeStreamWrite(connId: bigint, streamId: bigint) /*throws*/: void;
 /**
  * Starts one Connection attempt and returns its Connect ID.
  */
@@ -386,7 +386,7 @@ export interface P2pEndpointLike {
 /**
  * Resets a stream.
  */
-    resetStream(peerId: string, connId: bigint, streamId: bigint) /*throws*/: void;
+    resetStream(connId: bigint, streamId: bigint) /*throws*/: void;
 /**
  * Sends bytes on a stream, named by its connection and stream ids.
  *
@@ -395,7 +395,7 @@ export interface P2pEndpointLike {
  * write side ends first (`StreamWriteStopped`, `StreamClosed`, a reset,
  * or the connection closing or being replaced), which drops the tail.
  */
-    sendStream(peerId: string, connId: bigint, streamId: bigint, data: ArrayBuffer) /*throws*/: boolean;
+    sendStream(connId: bigint, streamId: bigint, data: ArrayBuffer) /*throws*/: boolean;
 /**
  * Accepted for compatibility; has no effect, since the driver sleeps until the endpoint's next deadline.
  */
@@ -466,11 +466,10 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
 /**
  * Forgets a stream.
  */
-    abandonStream(peerId: string, connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
+    abandonStream(connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => { nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_abandon_stream(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(connId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(streamId, nativeModule().rustbuffer_alloc),
                 callStatus);
@@ -530,11 +529,10 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
 /**
  * Half-closes a stream's write side.
  */
-    closeStreamWrite(peerId: string, connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
+    closeStreamWrite(connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => { nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_close_stream_write(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(connId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(streamId, nativeModule().rustbuffer_alloc),
                 callStatus);
@@ -858,11 +856,10 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
 /**
  * Resets a stream.
  */
-    resetStream(peerId: string, connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
+    resetStream(connId: bigint, streamId: bigint): void /*throws*/ {uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => { nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_reset_stream(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(connId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(streamId, nativeModule().rustbuffer_alloc),
                 callStatus);
@@ -879,13 +876,12 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
  * write side ends first (`StreamWriteStopped`, `StreamClosed`, a reset,
  * or the connection closing or being replaced), which drops the tail.
  */
-    sendStream(peerId: string, connId: bigint, streamId: bigint, data: ArrayBuffer): boolean /*throws*/ {
+    sendStream(connId: bigint, streamId: bigint, data: ArrayBuffer): boolean /*throws*/ {
     return FfiConverterBool.lift(uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => {
                 return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_send_stream(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(connId, nativeModule().rustbuffer_alloc),
         FfiConverterUInt64.lower(streamId, nativeModule().rustbuffer_alloc),
         FfiConverterArrayBuffer.lower(data, nativeModule().rustbuffer_alloc),
@@ -1123,7 +1119,7 @@ function uniffiEnsureInitialized() {
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_constructor_p2pendpoint_new() !== 40346) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_constructor_p2pendpoint_new");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_abandon_stream() !== 39078) {
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_abandon_stream() !== 3134) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_abandon_stream");
     }
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_active_reservation() !== 7490) {
@@ -1135,7 +1131,7 @@ function uniffiEnsureInitialized() {
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_cancel_connect() !== 21146) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_cancel_connect");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_close_stream_write() !== 32688) {
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_close_stream_write() !== 63517) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_close_stream_write");
     }
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect() !== 21790) {
@@ -1189,10 +1185,10 @@ function uniffiEnsureInitialized() {
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_reachability() !== 4853) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_reachability");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_reset_stream() !== 50205) {
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_reset_stream() !== 8949) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_reset_stream");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_send_stream() !== 41451) {
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_send_stream() !== 31876) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_send_stream");
     }
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_set_active() !== 10522) {

package/src/generated/minip2p_ffi_core.ts

@@ -227,10 +227,6 @@ export type MdnsOptions = {
      * Interface re-enumeration interval, in milliseconds.
      */
     interfaceRefreshMs: bigint,
-    /**
-     * Maximum blocking wait before polling mDNS sockets again.
-     */
-    socketPollIntervalMs: bigint,
     /**
      * Whether accepted mDNS observations may trigger automatic dials.
      */
@@ -264,7 +260,6 @@ const FfiConverterTypeMdnsOptions = (() => {
                 maxPacketBytes: FfiConverterUInt32.readFromCursor(c),
                 maxAnnouncedAddrs: FfiConverterUInt32.readFromCursor(c),
                 interfaceRefreshMs: FfiConverterUInt64.readFromCursor(c),
-                socketPollIntervalMs: FfiConverterUInt64.readFromCursor(c),
                 autoDial: FfiConverterBool.readFromCursor(c)
             };
         }
@@ -275,7 +270,6 @@ const FfiConverterTypeMdnsOptions = (() => {
             FfiConverterUInt32.writeIntoCursor(value.maxPacketBytes, c);
             FfiConverterUInt32.writeIntoCursor(value.maxAnnouncedAddrs, c);
             FfiConverterUInt64.writeIntoCursor(value.interfaceRefreshMs, c);
-            FfiConverterUInt64.writeIntoCursor(value.socketPollIntervalMs, c);
             FfiConverterBool.writeIntoCursor(value.autoDial, c);
         }
         allocationSize(value: TypeName): number {
@@ -285,7 +279,6 @@ const FfiConverterTypeMdnsOptions = (() => {
              FfiConverterUInt32.allocationSize(value.maxPacketBytes) +
              FfiConverterUInt32.allocationSize(value.maxAnnouncedAddrs) +
              FfiConverterUInt64.allocationSize(value.interfaceRefreshMs) +
-             FfiConverterUInt64.allocationSize(value.socketPollIntervalMs) +
              FfiConverterBool.allocationSize(value.autoDial);
 
         }
@@ -2236,7 +2229,7 @@ inner: {peerId: string; connId: bigint; protocols: Array<string> }): PeerReady_
     type IdentifyReceived__interface = {
         tag: P2pEvent_Tags.IdentifyReceived;
         inner:
-Readonly<{peerId: string; info: IdentifyInfo}>
+Readonly<{peerId: string; connId: bigint; info: IdentifyInfo}>
     };
     /**
      * A peer supplied a new Identify snapshot.
@@ -2249,15 +2242,15 @@ Readonly<{peerId: string; info: IdentifyInfo}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.IdentifyReceived;
         readonly inner:
-Readonly<{peerId: string; info: IdentifyInfo}>;
+Readonly<{peerId: string; connId: bigint; info: IdentifyInfo}>;
         constructor(
-inner: {peerId: string; info: IdentifyInfo }) {
+inner: {peerId: string; connId: bigint; info: IdentifyInfo }) {
             super("P2pEvent", "IdentifyReceived");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {peerId: string; info: IdentifyInfo }): IdentifyReceived_ {
+inner: {peerId: string; connId: bigint; info: IdentifyInfo }): IdentifyReceived_ {
             return new IdentifyReceived_(inner);
         }
 
@@ -2270,7 +2263,7 @@ inner: {peerId: string; info: IdentifyInfo }): IdentifyReceived_ {
     type PingRttMeasured__interface = {
         tag: P2pEvent_Tags.PingRttMeasured;
         inner:
-Readonly<{peerId: string; rttMs: bigint}>
+Readonly<{peerId: string; connId: bigint; rttMs: bigint}>
     };
     /**
      * A ping round-trip measurement completed.
@@ -2283,15 +2276,15 @@ Readonly<{peerId: string; rttMs: bigint}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.PingRttMeasured;
         readonly inner:
-Readonly<{peerId: string; rttMs: bigint}>;
+Readonly<{peerId: string; connId: bigint; rttMs: bigint}>;
         constructor(
-inner: {peerId: string; rttMs: bigint }) {
+inner: {peerId: string; connId: bigint; rttMs: bigint }) {
             super("P2pEvent", "PingRttMeasured");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {peerId: string; rttMs: bigint }): PingRttMeasured_ {
+inner: {peerId: string; connId: bigint; rttMs: bigint }): PingRttMeasured_ {
             return new PingRttMeasured_(inner);
         }
 
@@ -2304,7 +2297,7 @@ inner: {peerId: string; rttMs: bigint }): PingRttMeasured_ {
     type PingTimeout__interface = {
         tag: P2pEvent_Tags.PingTimeout;
         inner:
-Readonly<{peerId: string}>
+Readonly<{peerId: string; connId: bigint}>
     };
     /**
      * A ping timed out.
@@ -2317,15 +2310,15 @@ Readonly<{peerId: string}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.PingTimeout;
         readonly inner:
-Readonly<{peerId: string}>;
+Readonly<{peerId: string; connId: bigint}>;
         constructor(
-inner: {peerId: string }) {
+inner: {peerId: string; connId: bigint }) {
             super("P2pEvent", "PingTimeout");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {peerId: string }): PingTimeout_ {
+inner: {peerId: string; connId: bigint }): PingTimeout_ {
             return new PingTimeout_(inner);
         }
 
@@ -2748,7 +2741,7 @@ inner: {connectId: bigint; peerId: string; connId: bigint; path: PathKind }): Pa
     type InboundPathEstablished__interface = {
         tag: P2pEvent_Tags.InboundPathEstablished;
         inner:
-Readonly<{peerId: string; path: PathKind}>
+Readonly<{peerId: string; path: PathKind; connId: bigint}>
     };
     /**
      * An inbound relay circuit became a usable path.
@@ -2761,15 +2754,15 @@ Readonly<{peerId: string; path: PathKind}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.InboundPathEstablished;
         readonly inner:
-Readonly<{peerId: string; path: PathKind}>;
+Readonly<{peerId: string; path: PathKind; connId: bigint}>;
         constructor(
-inner: {peerId: string; path: PathKind }) {
+inner: {peerId: string; path: PathKind; connId: bigint }) {
             super("P2pEvent", "InboundPathEstablished");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {peerId: string; path: PathKind }): InboundPathEstablished_ {
+inner: {peerId: string; path: PathKind; connId: bigint }): InboundPathEstablished_ {
             return new InboundPathEstablished_(inner);
         }
 
@@ -2782,7 +2775,7 @@ inner: {peerId: string; path: PathKind }): InboundPathEstablished_ {
     type PathUpgraded__interface = {
         tag: P2pEvent_Tags.PathUpgraded;
         inner:
-Readonly<{connectId: bigint; peerId: string; from: PathKind; to: PathKind}>
+Readonly<{connectId: bigint; peerId: string; from: PathKind; to: PathKind; oldConnId: bigint; newConnId: bigint}>
     };
     /**
      * A better path replaced an earlier path.
@@ -2795,15 +2788,15 @@ Readonly<{connectId: bigint; peerId: string; from: PathKind; to: PathKind}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.PathUpgraded;
         readonly inner:
-Readonly<{connectId: bigint; peerId: string; from: PathKind; to: PathKind}>;
+Readonly<{connectId: bigint; peerId: string; from: PathKind; to: PathKind; oldConnId: bigint; newConnId: bigint}>;
         constructor(
-inner: {connectId: bigint; peerId: string; from: PathKind; to: PathKind }) {
+inner: {connectId: bigint; peerId: string; from: PathKind; to: PathKind; oldConnId: bigint; newConnId: bigint }) {
             super("P2pEvent", "PathUpgraded");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {connectId: bigint; peerId: string; from: PathKind; to: PathKind }): PathUpgraded_ {
+inner: {connectId: bigint; peerId: string; from: PathKind; to: PathKind; oldConnId: bigint; newConnId: bigint }): PathUpgraded_ {
             return new PathUpgraded_(inner);
         }
 
@@ -2819,7 +2812,8 @@ inner: {connectId: bigint; peerId: string; from: PathKind; to: PathKind }): Path
 Readonly<{connectId: bigint; attempt: number; reason: string}>
     };
     /**
-     * One hole-punch window failed.
+     * One DCUtR hole-punch round failed; the relay holder may start the
+     * next one.
      */
     class HolePunchFailed_ extends UniffiEnum implements HolePunchFailed__interface {
         /**
@@ -2919,7 +2913,7 @@ inner: {connectId: bigint; peerId: string }): ConnectCancelled_ {
     type InboundDirectUpgrade__interface = {
         tag: P2pEvent_Tags.InboundDirectUpgrade;
         inner:
-Readonly<{peerId: string}>
+Readonly<{peerId: string; oldConnId: bigint; newConnId: bigint}>
     };
     /**
      * An inbound circuit upgraded to a direct connection.
@@ -2932,15 +2926,15 @@ Readonly<{peerId: string}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.InboundDirectUpgrade;
         readonly inner:
-Readonly<{peerId: string}>;
+Readonly<{peerId: string; oldConnId: bigint; newConnId: bigint}>;
         constructor(
-inner: {peerId: string }) {
+inner: {peerId: string; oldConnId: bigint; newConnId: bigint }) {
             super("P2pEvent", "InboundDirectUpgrade");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {peerId: string }): InboundDirectUpgrade_ {
+inner: {peerId: string; oldConnId: bigint; newConnId: bigint }): InboundDirectUpgrade_ {
             return new InboundDirectUpgrade_(inner);
         }
 
@@ -3359,9 +3353,9 @@ const FfiConverterTypeP2pEvent = (() => {
                 case 4: return new P2pEvent.ConnectionClosed({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c) });
                 case 5: return new P2pEvent.ConnectionReplaced({peerId: FfiConverterString.readFromCursor(c), oldConnId: FfiConverterUInt64.readFromCursor(c), newConnId: FfiConverterUInt64.readFromCursor(c) });
                 case 6: return new P2pEvent.PeerReady({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), protocols: FfiConverterSequenceString.readFromCursor(c) });
-                case 7: return new P2pEvent.IdentifyReceived({peerId: FfiConverterString.readFromCursor(c), info: FfiConverterTypeIdentifyInfo.readFromCursor(c) });
-                case 8: return new P2pEvent.PingRttMeasured({peerId: FfiConverterString.readFromCursor(c), rttMs: FfiConverterUInt64.readFromCursor(c) });
-                case 9: return new P2pEvent.PingTimeout({peerId: FfiConverterString.readFromCursor(c) });
+                case 7: return new P2pEvent.IdentifyReceived({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), info: FfiConverterTypeIdentifyInfo.readFromCursor(c) });
+                case 8: return new P2pEvent.PingRttMeasured({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), rttMs: FfiConverterUInt64.readFromCursor(c) });
+                case 9: return new P2pEvent.PingTimeout({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c) });
                 case 10: return new P2pEvent.StreamReady({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), streamId: FfiConverterUInt64.readFromCursor(c), protocolId: FfiConverterString.readFromCursor(c), initiatedLocally: FfiConverterBool.readFromCursor(c) });
                 case 11: return new P2pEvent.StreamData({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), streamId: FfiConverterUInt64.readFromCursor(c), data: FfiConverterArrayBuffer.readFromCursor(c) });
                 case 12: return new P2pEvent.StreamWriteAccepted({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), streamId: FfiConverterUInt64.readFromCursor(c) });
@@ -3374,12 +3368,12 @@ const FfiConverterTypeP2pEvent = (() => {
                 case 19: return new P2pEvent.RelayReserved({relayPeerId: FfiConverterString.readFromCursor(c), expiresUnixSecs: FfiConverterOptionalUInt64.readFromCursor(c) });
                 case 20: return new P2pEvent.RelayReservationLost({relayPeerId: FfiConverterString.readFromCursor(c) });
                 case 21: return new P2pEvent.PathEstablished({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c) });
-                case 22: return new P2pEvent.InboundPathEstablished({peerId: FfiConverterString.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c) });
-                case 23: return new P2pEvent.PathUpgraded({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), from: FfiConverterTypePathKind.readFromCursor(c), to: FfiConverterTypePathKind.readFromCursor(c) });
+                case 22: return new P2pEvent.InboundPathEstablished({peerId: FfiConverterString.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c) });
+                case 23: return new P2pEvent.PathUpgraded({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), from: FfiConverterTypePathKind.readFromCursor(c), to: FfiConverterTypePathKind.readFromCursor(c), oldConnId: FfiConverterUInt64.readFromCursor(c), newConnId: FfiConverterUInt64.readFromCursor(c) });
                 case 24: return new P2pEvent.HolePunchFailed({connectId: FfiConverterUInt64.readFromCursor(c), attempt: FfiConverterUInt32.readFromCursor(c), reason: FfiConverterString.readFromCursor(c) });
                 case 25: return new P2pEvent.ConnectFailed({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), kind: FfiConverterTypeNatErrorKind.readFromCursor(c), detail: FfiConverterString.readFromCursor(c) });
                 case 26: return new P2pEvent.ConnectCancelled({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c) });
-                case 27: return new P2pEvent.InboundDirectUpgrade({peerId: FfiConverterString.readFromCursor(c) });
+                case 27: return new P2pEvent.InboundDirectUpgrade({peerId: FfiConverterString.readFromCursor(c), oldConnId: FfiConverterUInt64.readFromCursor(c), newConnId: FfiConverterUInt64.readFromCursor(c) });
                 case 28: return new P2pEvent.Message({fromPeerId: FfiConverterString.readFromCursor(c), topics: FfiConverterSequenceString.readFromCursor(c), data: FfiConverterArrayBuffer.readFromCursor(c), seqno: FfiConverterArrayBuffer.readFromCursor(c), signed: FfiConverterBool.readFromCursor(c) });
                 case 29: return new P2pEvent.PeerSubscribed({peerId: FfiConverterString.readFromCursor(c), topic: FfiConverterString.readFromCursor(c) });
                 case 30: return new P2pEvent.PeerUnsubscribed({peerId: FfiConverterString.readFromCursor(c), topic: FfiConverterString.readFromCursor(c) });
@@ -3444,6 +3438,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     c.writeI32(7);
                     const inner = value.inner;
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.connId, c);
                     FfiConverterTypeIdentifyInfo.writeIntoCursor(inner.info, c);
                     return;
                 }
@@ -3451,6 +3446,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     c.writeI32(8);
                     const inner = value.inner;
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.connId, c);
                     FfiConverterUInt64.writeIntoCursor(inner.rttMs, c);
                     return;
                 }
@@ -3458,6 +3454,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     c.writeI32(9);
                     const inner = value.inner;
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.connId, c);
                     return;
                 }
                 case P2pEvent_Tags.StreamReady: {
@@ -3563,6 +3560,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
                     FfiConverterTypePathKind.writeIntoCursor(inner.path, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.connId, c);
                     return;
                 }
                 case P2pEvent_Tags.PathUpgraded: {
@@ -3572,6 +3570,8 @@ const FfiConverterTypeP2pEvent = (() => {
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
                     FfiConverterTypePathKind.writeIntoCursor(inner.from, c);
                     FfiConverterTypePathKind.writeIntoCursor(inner.to, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.oldConnId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.newConnId, c);
                     return;
                 }
                 case P2pEvent_Tags.HolePunchFailed: {
@@ -3602,6 +3602,8 @@ const FfiConverterTypeP2pEvent = (() => {
                     c.writeI32(27);
                     const inner = value.inner;
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.oldConnId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.newConnId, c);
                     return;
                 }
                 case P2pEvent_Tags.Message: {
@@ -3736,6 +3738,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterUInt64.allocationSize(inner.connId);
                     size += FfiConverterTypeIdentifyInfo.allocationSize(inner.info);
                     return size;
                 }
@@ -3743,6 +3746,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterUInt64.allocationSize(inner.connId);
                     size += FfiConverterUInt64.allocationSize(inner.rttMs);
                     return size;
                 }
@@ -3750,6 +3754,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterUInt64.allocationSize(inner.connId);
                     return size;
                 }
                 case P2pEvent_Tags.StreamReady: {
@@ -3855,6 +3860,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     let size = 4;
                     size += FfiConverterString.allocationSize(inner.peerId);
                     size += FfiConverterTypePathKind.allocationSize(inner.path);
+                    size += FfiConverterUInt64.allocationSize(inner.connId);
                     return size;
                 }
                 case P2pEvent_Tags.PathUpgraded: {
@@ -3864,6 +3870,8 @@ const FfiConverterTypeP2pEvent = (() => {
                     size += FfiConverterString.allocationSize(inner.peerId);
                     size += FfiConverterTypePathKind.allocationSize(inner.from);
                     size += FfiConverterTypePathKind.allocationSize(inner.to);
+                    size += FfiConverterUInt64.allocationSize(inner.oldConnId);
+                    size += FfiConverterUInt64.allocationSize(inner.newConnId);
                     return size;
                 }
                 case P2pEvent_Tags.HolePunchFailed: {
@@ -3894,6 +3902,8 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterUInt64.allocationSize(inner.oldConnId);
+                    size += FfiConverterUInt64.allocationSize(inner.newConnId);
                     return size;
                 }
                 case P2pEvent_Tags.Message: {