@minip2p/react-native 0.6.0 → 0.7.0

package/src/generated/minip2p_ffi.ts

@@ -131,65 +131,51 @@ const stringConverter = (() => {
 const FfiConverterString = uniffiCreateFfiConverterString(stringConverter);
 
 /**
- * Signed-discovery configuration.
+ * State snapshot of the transport connection selected for a peer.
  */
-export type DiscoveryOptions = {
-    /**
-     * Pubsub topic carrying signed discovery beacons.
-     */
-    topic: string,
-    /**
-     * Milliseconds between local beacon announcements.
-     */
-    beaconIntervalMs: bigint,
+export type ConnectionInfo = {
     /**
-     * Milliseconds before a signed peer observation expires.
+     * Endpoint-local transport connection id.
      */
-    peerTtlMs: bigint,
+    connId: bigint,
     /**
-     * Whether accepted observations may trigger automatic dials.
+     * Remote transport address, when recorded.
      */
-    autoDial: boolean
+    remoteAddr?: string
 }
 
 /**
- * Generated factory for {@link DiscoveryOptions} record objects.
+ * Generated factory for {@link ConnectionInfo} record objects.
  */
-export const DiscoveryOptions = (() => {
+export const ConnectionInfo = (() => {
     const defaults = () => ({
     });
     const create = (() => {
-        return uniffiCreateRecord<DiscoveryOptions, ReturnType<typeof defaults>>(defaults);
+        return uniffiCreateRecord<ConnectionInfo, ReturnType<typeof defaults>>(defaults);
     })();
     return Object.freeze({
         create,
         new: create,
-        defaults: () => Object.freeze(defaults()) as Partial<DiscoveryOptions>,
+        defaults: () => Object.freeze(defaults()) as Partial<ConnectionInfo>,
     });
 })();
 
-const FfiConverterTypeDiscoveryOptions = (() => {
-    type TypeName = DiscoveryOptions;
+const FfiConverterTypeConnectionInfo = (() => {
+    type TypeName = ConnectionInfo;
     class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {
         readFromCursor(c: Cursor): TypeName {
             return {
-                topic: FfiConverterString.readFromCursor(c),
-                beaconIntervalMs: FfiConverterUInt64.readFromCursor(c),
-                peerTtlMs: FfiConverterUInt64.readFromCursor(c),
-                autoDial: FfiConverterBool.readFromCursor(c)
+                connId: FfiConverterUInt64.readFromCursor(c),
+                remoteAddr: FfiConverterOptionalString.readFromCursor(c)
             };
         }
         writeIntoCursor(value: TypeName, c: Cursor): void {
-            FfiConverterString.writeIntoCursor(value.topic, c);
-            FfiConverterUInt64.writeIntoCursor(value.beaconIntervalMs, c);
-            FfiConverterUInt64.writeIntoCursor(value.peerTtlMs, c);
-            FfiConverterBool.writeIntoCursor(value.autoDial, c);
+            FfiConverterUInt64.writeIntoCursor(value.connId, c);
+            FfiConverterOptionalString.writeIntoCursor(value.remoteAddr, c);
         }
         allocationSize(value: TypeName): number {
-            return FfiConverterString.allocationSize(value.topic) +
-             FfiConverterUInt64.allocationSize(value.beaconIntervalMs) +
-             FfiConverterUInt64.allocationSize(value.peerTtlMs) +
-             FfiConverterBool.allocationSize(value.autoDial);
+            return FfiConverterUInt64.allocationSize(value.connId) +
+             FfiConverterOptionalString.allocationSize(value.remoteAddr);
 
         }
     };
@@ -197,47 +183,65 @@ const FfiConverterTypeDiscoveryOptions = (() => {
 })();
 
 /**
- * One enabled transport and the addresses it should listen on.
+ * Signed-discovery configuration.
  */
-export type TransportOptions = {
+export type DiscoveryOptions = {
     /**
-     * Exact listen multiaddresses, or transport defaults when absent.
-     *
-     * An explicitly empty list is rejected: omit this field for defaults or
-     * disable the transport by omitting it from [`EndpointConfig`].
+     * Pubsub topic carrying signed discovery beacons.
+     */
+    topic: string,
+    /**
+     * Milliseconds between local beacon announcements.
+     */
+    beaconIntervalMs: bigint,
+    /**
+     * Milliseconds before a signed peer observation expires.
      */
-    listenAddrs?: Array<string>
+    peerTtlMs: bigint,
+    /**
+     * Whether accepted observations may trigger automatic dials.
+     */
+    autoDial: boolean
 }
 
 /**
- * Generated factory for {@link TransportOptions} record objects.
+ * Generated factory for {@link DiscoveryOptions} record objects.
  */
-export const TransportOptions = (() => {
+export const DiscoveryOptions = (() => {
     const defaults = () => ({
     });
     const create = (() => {
-        return uniffiCreateRecord<TransportOptions, ReturnType<typeof defaults>>(defaults);
+        return uniffiCreateRecord<DiscoveryOptions, ReturnType<typeof defaults>>(defaults);
     })();
     return Object.freeze({
         create,
         new: create,
-        defaults: () => Object.freeze(defaults()) as Partial<TransportOptions>,
+        defaults: () => Object.freeze(defaults()) as Partial<DiscoveryOptions>,
     });
 })();
 
-const FfiConverterTypeTransportOptions = (() => {
-    type TypeName = TransportOptions;
+const FfiConverterTypeDiscoveryOptions = (() => {
+    type TypeName = DiscoveryOptions;
     class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {
         readFromCursor(c: Cursor): TypeName {
             return {
-                listenAddrs: FfiConverterOptionalSequenceString.readFromCursor(c)
+                topic: FfiConverterString.readFromCursor(c),
+                beaconIntervalMs: FfiConverterUInt64.readFromCursor(c),
+                peerTtlMs: FfiConverterUInt64.readFromCursor(c),
+                autoDial: FfiConverterBool.readFromCursor(c)
             };
         }
         writeIntoCursor(value: TypeName, c: Cursor): void {
-            FfiConverterOptionalSequenceString.writeIntoCursor(value.listenAddrs, c);
+            FfiConverterString.writeIntoCursor(value.topic, c);
+            FfiConverterUInt64.writeIntoCursor(value.beaconIntervalMs, c);
+            FfiConverterUInt64.writeIntoCursor(value.peerTtlMs, c);
+            FfiConverterBool.writeIntoCursor(value.autoDial, c);
         }
         allocationSize(value: TypeName): number {
-            return FfiConverterOptionalSequenceString.allocationSize(value.listenAddrs);
+            return FfiConverterString.allocationSize(value.topic) +
+             FfiConverterUInt64.allocationSize(value.beaconIntervalMs) +
+             FfiConverterUInt64.allocationSize(value.peerTtlMs) +
+             FfiConverterBool.allocationSize(value.autoDial);
 
         }
     };
@@ -355,13 +359,10 @@ export type EndpointConfig = {
      */
     autonatServers: Array<string>,
     /**
-     * QUIC configuration, or no QUIC transport when absent.
-     */
-    quic?: TransportOptions,
-    /**
-     * TCP configuration, or no TCP transport when absent.
+     * Listen multiaddresses; each address's shape selects its transport.
+     * Absent binds the QUIC dual-stack defaults; an empty list is rejected.
      */
-    tcp?: TransportOptions,
+    listen?: Array<string>,
     /**
      * Whether connection attempts must remain relayed.
      */
@@ -408,8 +409,7 @@ const FfiConverterTypeEndpointConfig = (() => {
                 agentVersion: FfiConverterOptionalString.readFromCursor(c),
                 relays: FfiConverterSequenceString.readFromCursor(c),
                 autonatServers: FfiConverterSequenceString.readFromCursor(c),
-                quic: FfiConverterOptionalTypeTransportOptions.readFromCursor(c),
-                tcp: FfiConverterOptionalTypeTransportOptions.readFromCursor(c),
+                listen: FfiConverterOptionalSequenceString.readFromCursor(c),
                 forceRelay: FfiConverterBool.readFromCursor(c),
                 allowUnsigned: FfiConverterBool.readFromCursor(c),
                 protocols: FfiConverterSequenceString.readFromCursor(c),
@@ -421,8 +421,7 @@ const FfiConverterTypeEndpointConfig = (() => {
             FfiConverterOptionalString.writeIntoCursor(value.agentVersion, c);
             FfiConverterSequenceString.writeIntoCursor(value.relays, c);
             FfiConverterSequenceString.writeIntoCursor(value.autonatServers, c);
-            FfiConverterOptionalTypeTransportOptions.writeIntoCursor(value.quic, c);
-            FfiConverterOptionalTypeTransportOptions.writeIntoCursor(value.tcp, c);
+            FfiConverterOptionalSequenceString.writeIntoCursor(value.listen, c);
             FfiConverterBool.writeIntoCursor(value.forceRelay, c);
             FfiConverterBool.writeIntoCursor(value.allowUnsigned, c);
             FfiConverterSequenceString.writeIntoCursor(value.protocols, c);
@@ -433,8 +432,7 @@ const FfiConverterTypeEndpointConfig = (() => {
             return FfiConverterOptionalString.allocationSize(value.agentVersion) +
              FfiConverterSequenceString.allocationSize(value.relays) +
              FfiConverterSequenceString.allocationSize(value.autonatServers) +
-             FfiConverterOptionalTypeTransportOptions.allocationSize(value.quic) +
-             FfiConverterOptionalTypeTransportOptions.allocationSize(value.tcp) +
+             FfiConverterOptionalSequenceString.allocationSize(value.listen) +
              FfiConverterBool.allocationSize(value.forceRelay) +
              FfiConverterBool.allocationSize(value.allowUnsigned) +
              FfiConverterSequenceString.allocationSize(value.protocols) +
@@ -717,6 +715,160 @@ const FfiConverterTypeRelayReservationInfo = (() => {
     return new FFIConverter();
 })();
 
+
+// Enum: ConnectTarget
+export enum ConnectTarget_Tags {
+    Peer = "Peer",
+    Addresses = "Addresses"
+}
+/**
+ * What a foreign runtime supplies to start one Connection attempt.
+ *
+ * Validation lives in `minip2p-ffi-core`; this mirror only declares the shape.
+ */
+export const ConnectTarget = (() => {
+
+    type Peer__interface = {
+        tag: ConnectTarget_Tags.Peer;
+        inner:
+Readonly<{peerId: string}>
+    };
+    /**
+     * Peer ID only: the endpoint applies its discovery-book and relay
+     * policy.
+     */
+    class Peer_ extends UniffiEnum implements Peer__interface {
+        /**
+         * @private
+         * This field is private and should not be used, use `tag` instead.
+         */
+        readonly [uniffiTypeNameSymbol] = "ConnectTarget";
+        readonly tag = ConnectTarget_Tags.Peer;
+        readonly inner:
+Readonly<{peerId: string}>;
+        constructor(
+inner: {peerId: string }) {
+            super("ConnectTarget", "Peer");
+
+            this.inner = Object.freeze(inner);
+        }
+        static new(
+inner: {peerId: string }): Peer_ {
+            return new Peer_(inner);
+        }
+
+        static instanceOf(obj: any): obj is Peer_ {
+            return obj.tag === ConnectTarget_Tags.Peer;
+        }
+
+    }
+
+    type Addresses__interface = {
+        tag: ConnectTarget_Tags.Addresses;
+        inner:
+Readonly<{addresses: Array<string>}>
+    };
+    /**
+     * One or more complete direct peer addresses that all name the same
+     * peer. One address is the single-address form.
+     */
+    class Addresses_ extends UniffiEnum implements Addresses__interface {
+        /**
+         * @private
+         * This field is private and should not be used, use `tag` instead.
+         */
+        readonly [uniffiTypeNameSymbol] = "ConnectTarget";
+        readonly tag = ConnectTarget_Tags.Addresses;
+        readonly inner:
+Readonly<{addresses: Array<string>}>;
+        constructor(
+inner: {addresses: Array<string> }) {
+            super("ConnectTarget", "Addresses");
+
+            this.inner = Object.freeze(inner);
+        }
+        static new(
+inner: {addresses: Array<string> }): Addresses_ {
+            return new Addresses_(inner);
+        }
+
+        static instanceOf(obj: any): obj is Addresses_ {
+            return obj.tag === ConnectTarget_Tags.Addresses;
+        }
+
+    }
+
+    function instanceOf(obj: any): obj is ConnectTarget {
+        return obj[uniffiTypeNameSymbol] === "ConnectTarget";
+    }
+
+    return Object.freeze({
+        instanceOf,
+  Peer: Peer_,
+  Addresses: Addresses_
+    });
+
+})();
+/**
+ * What a foreign runtime supplies to start one Connection attempt.
+ *
+ * Validation lives in `minip2p-ffi-core`; this mirror only declares the shape.
+ */
+export type ConnectTarget = InstanceType<
+    typeof ConnectTarget['Peer' | 'Addresses']
+>;
+
+// FfiConverter for enum ConnectTarget
+const FfiConverterTypeConnectTarget = (() => {
+    type TypeName = ConnectTarget;
+    class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {
+        readFromCursor(c: Cursor): TypeName {
+            switch (c.readI32()) {
+                case 1: return new ConnectTarget.Peer({peerId: FfiConverterString.readFromCursor(c) });
+                case 2: return new ConnectTarget.Addresses({addresses: FfiConverterSequenceString.readFromCursor(c) });
+                default: throw new UniffiInternalError.UnexpectedEnumCase();
+            }
+        }
+        writeIntoCursor(value: TypeName, c: Cursor): void {
+            switch (value.tag) {
+                case ConnectTarget_Tags.Peer: {
+                    c.writeI32(1);
+                    const inner = value.inner;
+                    FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    return;
+                }
+                case ConnectTarget_Tags.Addresses: {
+                    c.writeI32(2);
+                    const inner = value.inner;
+                    FfiConverterSequenceString.writeIntoCursor(inner.addresses, c);
+                    return;
+                }
+                default:
+                    // Throwing from here means that ConnectTarget_Tags hasn't matched an ordinal.
+                    throw new UniffiInternalError.UnexpectedEnumCase();
+            }
+        }
+        allocationSize(value: TypeName): number {
+            switch (value.tag) {
+                case ConnectTarget_Tags.Peer: {
+                    const inner = value.inner;
+                    let size = 4;
+                    size += FfiConverterString.allocationSize(inner.peerId);
+                    return size;
+                }
+                case ConnectTarget_Tags.Addresses: {
+                    const inner = value.inner;
+                    let size = 4;
+                    size += FfiConverterSequenceString.allocationSize(inner.addresses);
+                    return size;
+                }
+                default: throw new UniffiInternalError.UnexpectedEnumCase();
+            }
+        }
+    }
+    return new FFIConverter();
+})();
+
 /**
  * Source that contributed a discovery observation.
  */
@@ -1894,8 +2046,8 @@ export enum P2pEvent_Tags {
     InboundPathEstablished = "InboundPathEstablished",
     PathUpgraded = "PathUpgraded",
     HolePunchFailed = "HolePunchFailed",
-    FellBackToRelay = "FellBackToRelay",
     ConnectFailed = "ConnectFailed",
+    ConnectCancelled = "ConnectCancelled",
     InboundDirectUpgrade = "InboundDirectUpgrade",
     Message = "Message",
     PeerSubscribed = "PeerSubscribed",
@@ -1916,7 +2068,7 @@ export const P2pEvent = (() => {
     type EventsDropped__interface = {
         tag: P2pEvent_Tags.EventsDropped;
         inner:
-Readonly<{dropped: bigint; totalDropped: bigint}>
+Readonly<{dropped: bigint; totalDropped: bigint; terminalConnectIds: Array<bigint>}>
     };
     /**
      * Native event carry overflow discarded source events.
@@ -1929,15 +2081,15 @@ Readonly<{dropped: bigint; totalDropped: bigint}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.EventsDropped;
         readonly inner:
-Readonly<{dropped: bigint; totalDropped: bigint}>;
+Readonly<{dropped: bigint; totalDropped: bigint; terminalConnectIds: Array<bigint>}>;
         constructor(
-inner: {dropped: bigint; totalDropped: bigint }) {
+inner: {dropped: bigint; totalDropped: bigint; terminalConnectIds: Array<bigint> }) {
             super("P2pEvent", "EventsDropped");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {dropped: bigint; totalDropped: bigint }): EventsDropped_ {
+inner: {dropped: bigint; totalDropped: bigint; terminalConnectIds: Array<bigint> }): EventsDropped_ {
             return new EventsDropped_(inner);
         }
 
@@ -2494,7 +2646,7 @@ inner: {relayPeerId: string }): RelayReservationLost_ {
     type PathEstablished__interface = {
         tag: P2pEvent_Tags.PathEstablished;
         inner:
-Readonly<{connectId: bigint; peerId: string; path: PathKind}>
+Readonly<{connectId: bigint; peerId: string; connId: bigint; path: PathKind}>
     };
     /**
      * The first usable path for an attempt became available.
@@ -2507,15 +2659,15 @@ Readonly<{connectId: bigint; peerId: string; path: PathKind}>
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
         readonly tag = P2pEvent_Tags.PathEstablished;
         readonly inner:
-Readonly<{connectId: bigint; peerId: string; path: PathKind}>;
+Readonly<{connectId: bigint; peerId: string; connId: bigint; path: PathKind}>;
         constructor(
-inner: {connectId: bigint; peerId: string; path: PathKind }) {
+inner: {connectId: bigint; peerId: string; connId: bigint; path: PathKind }) {
             super("P2pEvent", "PathEstablished");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {connectId: bigint; peerId: string; path: PathKind }): PathEstablished_ {
+inner: {connectId: bigint; peerId: string; connId: bigint; path: PathKind }): PathEstablished_ {
             return new PathEstablished_(inner);
         }
 
@@ -2627,70 +2779,71 @@ inner: {connectId: bigint; attempt: number; reason: string }): HolePunchFailed_
 
     }
 
-    type FellBackToRelay__interface = {
-        tag: P2pEvent_Tags.FellBackToRelay;
+    type ConnectFailed__interface = {
+        tag: P2pEvent_Tags.ConnectFailed;
         inner:
-Readonly<{connectId: bigint; peerId: string}>
+Readonly<{connectId: bigint; peerId: string; kind: NatErrorKind; detail: string}>
     };
     /**
-     * Direct upgrade attempts ended with the relay path retained.
+     * A connection attempt ended without a usable path.
      */
-    class FellBackToRelay_ extends UniffiEnum implements FellBackToRelay__interface {
+    class ConnectFailed_ extends UniffiEnum implements ConnectFailed__interface {
         /**
          * @private
          * This field is private and should not be used, use `tag` instead.
          */
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
-        readonly tag = P2pEvent_Tags.FellBackToRelay;
+        readonly tag = P2pEvent_Tags.ConnectFailed;
         readonly inner:
-Readonly<{connectId: bigint; peerId: string}>;
+Readonly<{connectId: bigint; peerId: string; kind: NatErrorKind; detail: string}>;
         constructor(
-inner: {connectId: bigint; peerId: string }) {
-            super("P2pEvent", "FellBackToRelay");
+inner: {connectId: bigint; peerId: string; kind: NatErrorKind; detail: string }) {
+            super("P2pEvent", "ConnectFailed");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {connectId: bigint; peerId: string }): FellBackToRelay_ {
-            return new FellBackToRelay_(inner);
+inner: {connectId: bigint; peerId: string; kind: NatErrorKind; detail: string }): ConnectFailed_ {
+            return new ConnectFailed_(inner);
         }
 
-        static instanceOf(obj: any): obj is FellBackToRelay_ {
-            return obj.tag === P2pEvent_Tags.FellBackToRelay;
+        static instanceOf(obj: any): obj is ConnectFailed_ {
+            return obj.tag === P2pEvent_Tags.ConnectFailed;
         }
 
     }
 
-    type ConnectFailed__interface = {
-        tag: P2pEvent_Tags.ConnectFailed;
+    type ConnectCancelled__interface = {
+        tag: P2pEvent_Tags.ConnectCancelled;
         inner:
-Readonly<{connectId: bigint; peerId: string; kind: NatErrorKind; detail: string}>
+Readonly<{connectId: bigint; peerId: string}>
     };
     /**
-     * A connection attempt ended without a usable path.
+     * A Connection attempt was cancelled by `cancel_connect` before it
+     * settled. Terminal for that Connect ID.
      */
-    class ConnectFailed_ extends UniffiEnum implements ConnectFailed__interface {
+    class ConnectCancelled_ extends UniffiEnum implements ConnectCancelled__interface {
         /**
          * @private
          * This field is private and should not be used, use `tag` instead.
          */
         readonly [uniffiTypeNameSymbol] = "P2pEvent";
-        readonly tag = P2pEvent_Tags.ConnectFailed;
+        readonly tag = P2pEvent_Tags.ConnectCancelled;
         readonly inner:
-Readonly<{connectId: bigint; peerId: string; kind: NatErrorKind; detail: string}>;
+Readonly<{connectId: bigint; peerId: string}>;
         constructor(
-inner: {connectId: bigint; peerId: string; kind: NatErrorKind; detail: string }) {
-            super("P2pEvent", "ConnectFailed");
+inner: {connectId: bigint; peerId: string }) {
+            super("P2pEvent", "ConnectCancelled");
 
             this.inner = Object.freeze(inner);
         }
         static new(
-inner: {connectId: bigint; peerId: string; kind: NatErrorKind; detail: string }): ConnectFailed_ {
-            return new ConnectFailed_(inner);
+inner: {connectId: bigint; peerId: string }): ConnectCancelled_ {
+            return new ConnectCancelled_(inner);
         }
 
-        static instanceOf(obj: any): obj is ConnectFailed_ {
-            return obj.tag === P2pEvent_Tags.ConnectFailed;
+        static instanceOf(obj: any): obj is ConnectCancelled_ {
+            return obj.tag === P2pEvent_Tags.ConnectCancelled;
         }
 
     }
@@ -3100,8 +3253,8 @@ inner: {peerId?: string; source: DiscoverySource; reason: string; suppressed: nu
   InboundPathEstablished: InboundPathEstablished_,
   PathUpgraded: PathUpgraded_,
   HolePunchFailed: HolePunchFailed_,
-  FellBackToRelay: FellBackToRelay_,
   ConnectFailed: ConnectFailed_,
+  ConnectCancelled: ConnectCancelled_,
   InboundDirectUpgrade: InboundDirectUpgrade_,
   Message: Message_,
   PeerSubscribed: PeerSubscribed_,
@@ -3120,7 +3273,7 @@ inner: {peerId?: string; source: DiscoverySource; reason: string; suppressed: nu
  * Event delivered by the native endpoint driver.
  */
 export type P2pEvent = InstanceType<
-    typeof P2pEvent['EventsDropped' | 'DriverFailed' | 'ConnectionEstablished' | 'ConnectionClosed' | 'PeerReady' | 'IdentifyReceived' | 'PingRttMeasured' | 'PingTimeout' | 'StreamReady' | 'StreamData' | 'StreamRemoteWriteClosed' | 'StreamClosed' | 'EndpointError' | 'ReachabilityChanged' | 'PublicAddressesChanged' | 'RelayReserved' | 'RelayReservationLost' | 'PathEstablished' | 'InboundPathEstablished' | 'PathUpgraded' | 'HolePunchFailed' | 'FellBackToRelay' | 'ConnectFailed' | 'InboundDirectUpgrade' | 'Message' | 'PeerSubscribed' | 'PeerUnsubscribed' | 'GossipsubOutboundFailure' | 'GossipsubProtocolViolation' | 'PeerDiscovered' | 'PeerUpdated' | 'PeerExpired' | 'DiscoveryDialFailed' | 'DiscoveryProtocolViolation']
+    typeof P2pEvent['EventsDropped' | 'DriverFailed' | 'ConnectionEstablished' | 'ConnectionClosed' | 'PeerReady' | 'IdentifyReceived' | 'PingRttMeasured' | 'PingTimeout' | 'StreamReady' | 'StreamData' | 'StreamRemoteWriteClosed' | 'StreamClosed' | 'EndpointError' | 'ReachabilityChanged' | 'PublicAddressesChanged' | 'RelayReserved' | 'RelayReservationLost' | 'PathEstablished' | 'InboundPathEstablished' | 'PathUpgraded' | 'HolePunchFailed' | 'ConnectFailed' | 'ConnectCancelled' | 'InboundDirectUpgrade' | 'Message' | 'PeerSubscribed' | 'PeerUnsubscribed' | 'GossipsubOutboundFailure' | 'GossipsubProtocolViolation' | 'PeerDiscovered' | 'PeerUpdated' | 'PeerExpired' | 'DiscoveryDialFailed' | 'DiscoveryProtocolViolation']
 >;
 
 // FfiConverter for enum P2pEvent
@@ -3129,7 +3282,7 @@ const FfiConverterTypeP2pEvent = (() => {
     class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {
         readFromCursor(c: Cursor): TypeName {
             switch (c.readI32()) {
-                case 1: return new P2pEvent.EventsDropped({dropped: FfiConverterUInt64.readFromCursor(c), totalDropped: FfiConverterUInt64.readFromCursor(c) });
+                case 1: return new P2pEvent.EventsDropped({dropped: FfiConverterUInt64.readFromCursor(c), totalDropped: FfiConverterUInt64.readFromCursor(c), terminalConnectIds: FfiConverterSequenceUInt64.readFromCursor(c) });
                 case 2: return new P2pEvent.DriverFailed({kind: FfiConverterTypeDriverFailureKind.readFromCursor(c), detail: FfiConverterString.readFromCursor(c) });
                 case 3: return new P2pEvent.ConnectionEstablished({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c) });
                 case 4: return new P2pEvent.ConnectionClosed({peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c) });
@@ -3146,12 +3299,12 @@ const FfiConverterTypeP2pEvent = (() => {
                 case 15: return new P2pEvent.PublicAddressesChanged({addrs: FfiConverterSequenceString.readFromCursor(c) });
                 case 16: return new P2pEvent.RelayReserved({relayPeerId: FfiConverterString.readFromCursor(c), expiresUnixSecs: FfiConverterOptionalUInt64.readFromCursor(c) });
                 case 17: return new P2pEvent.RelayReservationLost({relayPeerId: FfiConverterString.readFromCursor(c) });
-                case 18: return new P2pEvent.PathEstablished({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c) });
+                case 18: return new P2pEvent.PathEstablished({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), connId: FfiConverterUInt64.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c) });
                 case 19: return new P2pEvent.InboundPathEstablished({peerId: FfiConverterString.readFromCursor(c), path: FfiConverterTypePathKind.readFromCursor(c) });
                 case 20: return new P2pEvent.PathUpgraded({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), from: FfiConverterTypePathKind.readFromCursor(c), to: FfiConverterTypePathKind.readFromCursor(c) });
                 case 21: return new P2pEvent.HolePunchFailed({connectId: FfiConverterUInt64.readFromCursor(c), attempt: FfiConverterUInt32.readFromCursor(c), reason: FfiConverterString.readFromCursor(c) });
-                case 22: return new P2pEvent.FellBackToRelay({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c) });
-                case 23: return new P2pEvent.ConnectFailed({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), kind: FfiConverterTypeNatErrorKind.readFromCursor(c), detail: FfiConverterString.readFromCursor(c) });
+                case 22: return new P2pEvent.ConnectFailed({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c), kind: FfiConverterTypeNatErrorKind.readFromCursor(c), detail: FfiConverterString.readFromCursor(c) });
+                case 23: return new P2pEvent.ConnectCancelled({connectId: FfiConverterUInt64.readFromCursor(c), peerId: FfiConverterString.readFromCursor(c) });
                 case 24: return new P2pEvent.InboundDirectUpgrade({peerId: FfiConverterString.readFromCursor(c) });
                 case 25: 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 26: return new P2pEvent.PeerSubscribed({peerId: FfiConverterString.readFromCursor(c), topic: FfiConverterString.readFromCursor(c) });
@@ -3173,6 +3326,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     FfiConverterUInt64.writeIntoCursor(inner.dropped, c);
                     FfiConverterUInt64.writeIntoCursor(inner.totalDropped, c);
+                    FfiConverterSequenceUInt64.writeIntoCursor(inner.terminalConnectIds, c);
                     return;
                 }
                 case P2pEvent_Tags.DriverFailed: {
@@ -3300,6 +3454,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     const inner = value.inner;
                     FfiConverterUInt64.writeIntoCursor(inner.connectId, c);
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterUInt64.writeIntoCursor(inner.connId, c);
                     FfiConverterTypePathKind.writeIntoCursor(inner.path, c);
                     return;
                 }
@@ -3327,20 +3482,20 @@ const FfiConverterTypeP2pEvent = (() => {
                     FfiConverterString.writeIntoCursor(inner.reason, c);
                     return;
                 }
-                case P2pEvent_Tags.FellBackToRelay: {
+                case P2pEvent_Tags.ConnectFailed: {
                     c.writeI32(22);
                     const inner = value.inner;
                     FfiConverterUInt64.writeIntoCursor(inner.connectId, c);
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
+                    FfiConverterTypeNatErrorKind.writeIntoCursor(inner.kind, c);
+                    FfiConverterString.writeIntoCursor(inner.detail, c);
                     return;
                 }
-                case P2pEvent_Tags.ConnectFailed: {
+                case P2pEvent_Tags.ConnectCancelled: {
                     c.writeI32(23);
                     const inner = value.inner;
                     FfiConverterUInt64.writeIntoCursor(inner.connectId, c);
                     FfiConverterString.writeIntoCursor(inner.peerId, c);
-                    FfiConverterTypeNatErrorKind.writeIntoCursor(inner.kind, c);
-                    FfiConverterString.writeIntoCursor(inner.detail, c);
                     return;
                 }
                 case P2pEvent_Tags.InboundDirectUpgrade: {
@@ -3437,6 +3592,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     let size = 4;
                     size += FfiConverterUInt64.allocationSize(inner.dropped);
                     size += FfiConverterUInt64.allocationSize(inner.totalDropped);
+                    size += FfiConverterSequenceUInt64.allocationSize(inner.terminalConnectIds);
                     return size;
                 }
                 case P2pEvent_Tags.DriverFailed: {
@@ -3564,6 +3720,7 @@ const FfiConverterTypeP2pEvent = (() => {
                     let size = 4;
                     size += FfiConverterUInt64.allocationSize(inner.connectId);
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterUInt64.allocationSize(inner.connId);
                     size += FfiConverterTypePathKind.allocationSize(inner.path);
                     return size;
                 }
@@ -3591,20 +3748,20 @@ const FfiConverterTypeP2pEvent = (() => {
                     size += FfiConverterString.allocationSize(inner.reason);
                     return size;
                 }
-                case P2pEvent_Tags.FellBackToRelay: {
+                case P2pEvent_Tags.ConnectFailed: {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterUInt64.allocationSize(inner.connectId);
                     size += FfiConverterString.allocationSize(inner.peerId);
+                    size += FfiConverterTypeNatErrorKind.allocationSize(inner.kind);
+                    size += FfiConverterString.allocationSize(inner.detail);
                     return size;
                 }
-                case P2pEvent_Tags.ConnectFailed: {
+                case P2pEvent_Tags.ConnectCancelled: {
                     const inner = value.inner;
                     let size = 4;
                     size += FfiConverterUInt64.allocationSize(inner.connectId);
                     size += FfiConverterString.allocationSize(inner.peerId);
-                    size += FfiConverterTypeNatErrorKind.allocationSize(inner.kind);
-                    size += FfiConverterString.allocationSize(inner.detail);
                     return size;
                 }
                 case P2pEvent_Tags.InboundDirectUpgrade: {
@@ -3878,33 +4035,17 @@ export interface P2pEndpointLike {
  */
     closeStreamWrite(peerId: string, streamId: bigint) /*throws*/: void;
 /**
- * Starts a connection attempt.
- */
-    connect(peerId: string) /*throws*/: bigint;
-/**
- * Starts a direct-address connection attempt.
+ * Starts one Connection attempt and returns its Connect ID.
  */
-    connectAddr(address: string) /*throws*/: bigint;
-/**
- * Starts a connection attempt with explicit addresses.
- */
-    connectWithAddrs(peerId: string, addresses: Array<string>) /*throws*/: bigint;
+    connect(target: ConnectTarget) /*throws*/: bigint;
 /**
  * Returns connected peers.
  */
     connectedPeers() /*throws*/: Array<string>;
 /**
- * Dials on all applicable address families.
- */
-    dial(address: string) /*throws*/: Array<bigint>;
-/**
- * Dials using IPv4.
+ * Returns the transport connection selected for a peer.
  */
-    dialIp4(address: string) /*throws*/: bigint;
-/**
- * Dials using IPv6.
- */
-    dialIp6(address: string) /*throws*/: bigint;
+    connectionInfo(peerId: string) /*throws*/: ConnectionInfo | undefined;
 /**
  * Disconnects a peer.
  */
@@ -4110,48 +4251,15 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
     }
 
 /**
- * Starts a connection attempt.
+ * Starts one Connection attempt and returns its Connect ID.
  */
-    connect(peerId: string): bigint /*throws*/ {
+    connect(target: ConnectTarget): bigint /*throws*/ {
     return FfiConverterUInt64.lift(uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => {
                 return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connect(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
-                callStatus);
-            },
-            /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
-    ));
-    }
-
-/**
- * Starts a direct-address connection attempt.
- */
-    connectAddr(address: string): bigint /*throws*/ {
-    return FfiConverterUInt64.lift(uniffiCaller.rustCallWithError(
-            /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
-            /*caller:*/ (callStatus) => {
-                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connect_addr(
-                uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(address, nativeModule().rustbuffer_alloc),
-                callStatus);
-            },
-            /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
-    ));
-    }
-
-/**
- * Starts a connection attempt with explicit addresses.
- */
-    connectWithAddrs(peerId: string, addresses: Array<string>): bigint /*throws*/ {
-    return FfiConverterUInt64.lift(uniffiCaller.rustCallWithError(
-            /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
-            /*caller:*/ (callStatus) => {
-                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connect_with_addrs(
-                uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
-        FfiConverterSequenceString.lower(addresses, nativeModule().rustbuffer_alloc),
+        FfiConverterTypeConnectTarget.lower(target, nativeModule().rustbuffer_alloc),
                 callStatus);
             },
             /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
@@ -4179,58 +4287,26 @@ export class P2pEndpoint extends UniffiAbstractObject implements P2pEndpointLike
     }
 
 /**
- * Dials on all applicable address families.
+ * Returns the transport connection selected for a peer.
  */
-    dial(address: string): Array<bigint> /*throws*/ {
+    connectionInfo(peerId: string): ConnectionInfo | undefined /*throws*/ {
     const __rb: Uint8Array = uniffiCaller.rustCallWithError(
             /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
             /*caller:*/ (callStatus) => {
-                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_dial(
+                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_connection_info(
                 uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(address, nativeModule().rustbuffer_alloc),
+        FfiConverterString.lower(peerId, nativeModule().rustbuffer_alloc),
                 callStatus);
             },
             /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
     );
     try {
-        return FfiConverterSequenceUInt64.lift(__rb);
+        return FfiConverterOptionalTypeConnectionInfo.lift(__rb);
     } finally {
         nativeModule().rustbuffer_free(__rb);
     }
     }
 
-/**
- * Dials using IPv4.
- */
-    dialIp4(address: string): bigint /*throws*/ {
-    return FfiConverterUInt64.lift(uniffiCaller.rustCallWithError(
-            /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
-            /*caller:*/ (callStatus) => {
-                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_dial_ip4(
-                uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(address, nativeModule().rustbuffer_alloc),
-                callStatus);
-            },
-            /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
-    ));
-    }
-
-/**
- * Dials using IPv6.
- */
-    dialIp6(address: string): bigint /*throws*/ {
-    return FfiConverterUInt64.lift(uniffiCaller.rustCallWithError(
-            /*liftError:*/ FfiConverterTypeFfiError.lift.bind(FfiConverterTypeFfiError),
-            /*caller:*/ (callStatus) => {
-                return nativeModule().ubrn_uniffi_minip2p_ffi_fn_method_p2pendpoint_dial_ip6(
-                uniffiTypeP2pEndpointObjectFactory.clonePointer(this),
-        FfiConverterString.lower(address, nativeModule().rustbuffer_alloc),
-                callStatus);
-            },
-            /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
-    ));
-    }
-
 /**
  * Disconnects a peer.
  */
@@ -4682,9 +4758,6 @@ const FfiConverterSequenceString = new FfiConverterArray(FfiConverterString);
 // FfiConverter for Array<string> | undefined
 const FfiConverterOptionalSequenceString = new FfiConverterOptional(FfiConverterSequenceString);
 
-// FfiConverter for TransportOptions | undefined
-const FfiConverterOptionalTypeTransportOptions = new FfiConverterOptional(FfiConverterTypeTransportOptions);
-
 // FfiConverter for DiscoveryOptions | undefined
 const FfiConverterOptionalTypeDiscoveryOptions = new FfiConverterOptional(FfiConverterTypeDiscoveryOptions);
 
@@ -4697,11 +4770,14 @@ const FfiConverterOptionalBytes = new FfiConverterOptional(FfiConverterArrayBuff
 // FfiConverter for bigint | undefined
 const FfiConverterOptionalUInt64 = new FfiConverterOptional(FfiConverterUInt64);
 
+// FfiConverter for Array<bigint>
+const FfiConverterSequenceUInt64 = new FfiConverterArray(FfiConverterUInt64);
+
 // FfiConverter for RelayReservationInfo | undefined
 const FfiConverterOptionalTypeRelayReservationInfo = new FfiConverterOptional(FfiConverterTypeRelayReservationInfo);
 
-// FfiConverter for Array<bigint>
-const FfiConverterSequenceUInt64 = new FfiConverterArray(FfiConverterUInt64);
+// FfiConverter for ConnectionInfo | undefined
+const FfiConverterOptionalTypeConnectionInfo = new FfiConverterOptional(FfiConverterTypeConnectionInfo);
 
 // FfiConverter for Array<P2pEvent>
 const FfiConverterSequenceTypeP2pEvent = new FfiConverterArray(FfiConverterTypeP2pEvent);
@@ -4761,26 +4837,14 @@ function uniffiEnsureInitialized() {
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_close_stream_write() !== 17994) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_close_stream_write");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect() !== 42064) {
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect() !== 53603) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect_addr() !== 56611) {
-        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect_addr");
-    }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect_with_addrs() !== 2062) {
-        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_connect_with_addrs");
-    }
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connected_peers() !== 64148) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_connected_peers");
     }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial() !== 35216) {
-        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial");
-    }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial_ip4() !== 54241) {
-        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial_ip4");
-    }
-    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial_ip6() !== 3676) {
-        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_dial_ip6");
+    if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_connection_info() !== 24337) {
+        throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_connection_info");
     }
     if (nativeModule().ubrn_uniffi_minip2p_ffi_checksum_method_p2pendpoint_disconnect() !== 23975) {
         throw new UniffiInternalError.ApiChecksumMismatch("uniffi_minip2p_ffi_checksum_method_p2pendpoint_disconnect");
@@ -4858,6 +4922,8 @@ function uniffiEnsureInitialized() {
 export default Object.freeze({
   initialize: uniffiEnsureInitialized,
   converters: {
+    FfiConverterTypeConnectTarget,
+    FfiConverterTypeConnectionInfo,
     FfiConverterTypeDiscoveryOptions,
     FfiConverterTypeDiscoverySource,
     FfiConverterTypeDriverFailureKind,
@@ -4875,6 +4941,5 @@ export default Object.freeze({
     FfiConverterTypePathKind,
     FfiConverterTypeReachability,
     FfiConverterTypeRelayReservationInfo,
-    FfiConverterTypeTransportOptions,
   }
 });