Hardcode UniqueID in streams keys (#308)

keeshux · web-flow · commit 0cd79e1c1ca5 · 2026-03-01T08:00:56.000+01:00
Now that Foundation is ubiquitous, we can use UniqueID/UUID directly.
Fixes a weird runtime crash in a missing Hashable witness table (OID →
RandomlyInitialized → Hashable).
diff --git a/Sources/MiniFoundation/Streams/CurrentValueStream.swift b/Sources/MiniFoundation/Streams/CurrentValueStream.swift
@@ -5,12 +5,12 @@
 import Dispatch
 
 /// Replacement for `CurrentValueSubject`.
-public final class CurrentValueStream<OID, T>: @unchecked Sendable where OID: RandomlyInitialized, T: Sendable {
+public final class CurrentValueStream<T>: @unchecked Sendable where T: Sendable {
     let queue = DispatchQueue(label: "CurrentValueStream")
 
-    var observers: [OID: AsyncStream<T>.Continuation] = [:]
+    var observers: [UniqueID: AsyncStream<T>.Continuation] = [:]
 
-    var throwingObservers: [OID: AsyncThrowingStream<T, Error>.Continuation] = [:]
+    var throwingObservers: [UniqueID: AsyncThrowingStream<T, Error>.Continuation] = [:]
 
     var isFinished = false
 
@@ -30,7 +30,7 @@ public final class CurrentValueStream<OID, T>: @unchecked Sendable where OID: Ra
     }
 
     public func subscribe() -> AsyncStream<T> {
-        let id = OID() // best-effort, assume nonexistent observer id
+        let id = UniqueID() // Best-effort, assume nonexistent observer id
         return AsyncStream { [weak self] continuation in
             guard let self else {
                 return
@@ -48,7 +48,7 @@ public final class CurrentValueStream<OID, T>: @unchecked Sendable where OID: Ra
     }
 
     public func subscribeThrowing() -> AsyncThrowingStream<T, Error> {
-        let id = OID() // Best-effort, assume nonexistent observer id
+        let id = UniqueID() // Best-effort, assume nonexistent observer id
         return AsyncThrowingStream { [weak self] continuation in
             guard let self else {
                 return
diff --git a/Sources/MiniFoundation/Streams/PassthroughStream.swift b/Sources/MiniFoundation/Streams/PassthroughStream.swift
@@ -5,12 +5,12 @@
 import Dispatch
 
 /// Replacement for `PassthroughSubject`.
-public final class PassthroughStream<OID, T>: @unchecked Sendable where OID: RandomlyInitialized, T: Sendable {
+public final class PassthroughStream<T>: @unchecked Sendable where T: Sendable {
     let queue = DispatchQueue(label: "PassthroughStream")
 
-    var observers: [OID: AsyncStream<T>.Continuation] = [:]
+    var observers: [UniqueID: AsyncStream<T>.Continuation] = [:]
 
-    var throwingObservers: [OID: AsyncThrowingStream<T, Error>.Continuation] = [:]
+    var throwingObservers: [UniqueID: AsyncThrowingStream<T, Error>.Continuation] = [:]
 
     var isFinished = false
 
@@ -27,7 +27,7 @@ public final class PassthroughStream<OID, T>: @unchecked Sendable where OID: Ran
     }
 
     public func subscribe() -> AsyncStream<T> {
-        let id = OID() // Best-effort, assume nonexistent observer id
+        let id = UniqueID() // Best-effort, assume nonexistent observer id
         return AsyncStream { [weak self] continuation in
             guard let self else {
                 return
@@ -44,7 +44,7 @@ public final class PassthroughStream<OID, T>: @unchecked Sendable where OID: Ran
     }
 
     public func subscribeThrowing() -> AsyncThrowingStream<T, Error> {
-        let id = OID() // Best-effort, assume nonexistent observer id
+        let id = UniqueID() // Best-effort, assume nonexistent observer id
         return AsyncThrowingStream { [weak self] continuation in
             guard let self else {
                 return
diff --git a/Sources/PartoutCore/Connection/AutoUpgradingLink.swift b/Sources/PartoutCore/Connection/AutoUpgradingLink.swift
@@ -14,7 +14,7 @@ public final class AutoUpgradingLink: LinkInterface {
 
     private let io: SocketIOInterface
 
-    private let betterPathStream: PassthroughStream<UniqueID, Void>
+    private let betterPathStream: PassthroughStream<Void>
 
     public init(
         endpoint: ExtendedEndpoint,
diff --git a/Sources/PartoutCore/Connection/BetterPathBlock.swift b/Sources/PartoutCore/Connection/BetterPathBlock.swift
@@ -3,4 +3,4 @@
 // SPDX-License-Identifier: GPL-3.0
 
 /// Returns a stream to observe events about better network paths.
-public typealias BetterPathBlock = @Sendable () throws -> PassthroughStream<UniqueID, Void>
+public typealias BetterPathBlock = @Sendable () throws -> PassthroughStream<Void>
diff --git a/Sources/PartoutCore/Connection/CyclingConnection.swift b/Sources/PartoutCore/Connection/CyclingConnection.swift
@@ -66,7 +66,7 @@ public actor CyclingConnection {
 
     private let endpoints: [ExtendedEndpoint]
 
-    private nonisolated let statusSubject: CurrentValueStream<UniqueID, ConnectionStatus>
+    private nonisolated let statusSubject: CurrentValueStream<ConnectionStatus>
 
     private var hooks: Hooks
 
diff --git a/Sources/PartoutCore/Connection/NetworkObserver.swift b/Sources/PartoutCore/Connection/NetworkObserver.swift
@@ -8,12 +8,12 @@ public final class NetworkObserver: @unchecked Sendable {
 
     private let state: AtomicState
 
-    private let signalSubject: CurrentValueStream<UniqueID, Bool>
+    private let signalSubject: CurrentValueStream<Bool>
 
     private let isStatusReady: (ConnectionStatus) -> Bool
 
     /// Publishes when the network state is ready for reconnection.
-    public let onReady: PassthroughStream<UniqueID, Void>
+    public let onReady: PassthroughStream<Void>
 
     private var subscriptions: [Task<Void, Never>]
 
diff --git a/Sources/PartoutCore/Tunnel/FakeTunnelStrategy.swift b/Sources/PartoutCore/Tunnel/FakeTunnelStrategy.swift
@@ -4,7 +4,7 @@
 
 /// Implementation of ``TunnelObservableStrategy`` to fake VPN operation on simulators.
 public actor FakeTunnelStrategy: TunnelObservableStrategy, Sendable {
-    private nonisolated let activeProfileSubject: CurrentValueStream<UniqueID, TunnelActiveProfile?>
+    private nonisolated let activeProfileSubject: CurrentValueStream<TunnelActiveProfile?>
 
     private var status: TunnelStatus {
         get {
diff --git a/Sources/PartoutCore/Tunnel/Tunnel.swift b/Sources/PartoutCore/Tunnel/Tunnel.swift
@@ -16,7 +16,7 @@ public final class Tunnel {
 
     private let strategy: TunnelObservableStrategy
 
-    private let activeProfilesSubject: CurrentValueStream<UniqueID, [Profile.ID: TunnelActiveProfile]>
+    private let activeProfilesSubject: CurrentValueStream<[Profile.ID: TunnelActiveProfile]>
 
     private let environmentFactory: (Profile.ID) -> TunnelEnvironmentReader
 
diff --git a/Sources/PartoutOS/AppleNE/App/NETunnelStrategy.swift b/Sources/PartoutOS/AppleNE/App/NETunnelStrategy.swift
@@ -18,7 +18,7 @@ public actor NETunnelStrategy {
 
     private let options: Set<Option>
 
-    private nonisolated let managersSubject: CurrentValueStream<UniqueID, [Profile.ID: NETunnelProviderManager]>
+    private nonisolated let managersSubject: CurrentValueStream<[Profile.ID: NETunnelProviderManager]>
 
     private var allManagers: [Profile.ID: NETunnelProviderManager] {
         didSet {
diff --git a/Sources/PartoutOS/AppleNE/AppExtension/NEObservablePath.swift b/Sources/PartoutOS/AppleNE/AppExtension/NEObservablePath.swift
@@ -10,7 +10,7 @@ public final class NEObservablePath: ReachabilityObserver {
 
     private let monitor: NWPathMonitor
 
-    private nonisolated let subject: CurrentValueStream<UniqueID, NWPath>
+    private nonisolated let subject: CurrentValueStream<NWPath>
 
     public init(_ ctx: PartoutLoggerContext) {
         self.ctx = ctx
diff --git a/Sources/PartoutOS/AppleNE/Connection/NESocket.swift b/Sources/PartoutOS/AppleNE/Connection/NESocket.swift
@@ -134,7 +134,7 @@ private actor NESocket: LinkInterface {
 
     let remoteProtocol: EndpointProtocol
 
-    private let betterPathStream: PassthroughStream<UniqueID, Void>
+    private let betterPathStream: PassthroughStream<Void>
 
     private var writeBlock: (@Sendable ([Data]) async throws -> Void)?
 
diff --git a/Sources/PartoutOpenVPNConnection/Internal/TLSWrapper+Native.swift b/Sources/PartoutOpenVPNConnection/Internal/TLSWrapper+Native.swift
@@ -24,7 +24,7 @@ private final class NativeTLSWrapper: TLSProtocol {
 
     private let caURL: URL
 
-    private let didFailVerification: PassthroughStream<UniqueID, Void>
+    private let didFailVerification: PassthroughStream<Void>
 
     private var verificationObserver: Task<Void, Never>?
 
@@ -50,7 +50,7 @@ private final class NativeTLSWrapper: TLSProtocol {
             pp_free(hostname)
         }
 
-        let didFailVerification = PassthroughStream<UniqueID, Void>()
+        let didFailVerification = PassthroughStream<Void>()
         let options = pp_tls_options_create(
             Int32(securityLevel ?? Constants.defaultSecurityLevel),
             Constants.bufferLength,
@@ -63,7 +63,7 @@ private final class NativeTLSWrapper: TLSProtocol {
             Unmanaged.passUnretained(didFailVerification).toOpaque(),
             { ctx in
                 guard let ctx else { return }
-                let stream = Unmanaged<PassthroughStream<UniqueID, Void>>
+                let stream = Unmanaged<PassthroughStream<Void>>
                     .fromOpaque(ctx)
                     .takeUnretainedValue()
                 stream.send()
diff --git a/Sources/PartoutWireGuardConnection/WireGuardConnection.swift b/Sources/PartoutWireGuardConnection/WireGuardConnection.swift
@@ -16,7 +16,7 @@
 public actor WireGuardConnection: Connection {
     private let ctx: PartoutLoggerContext
 
-    private let statusSubject: CurrentValueStream<UniqueID, ConnectionStatus>
+    private let statusSubject: CurrentValueStream<ConnectionStatus>
 
     private let moduleId: UniqueID
 
diff --git a/Tests/PartoutCoreTests/AsyncStreamTests.swift b/Tests/PartoutCoreTests/AsyncStreamTests.swift
@@ -8,7 +8,7 @@ import Testing
 struct AsyncStreamTests {
     @Test
     func givenPassthrough_whenEmit_thenMatches() async throws {
-        let sut = PassthroughStream<UniqueID, Int>()
+        let sut = PassthroughStream<Int>()
         let expected = [5, 7, 67]
         let stream = sut.subscribe()
         Task {
@@ -29,7 +29,7 @@ struct AsyncStreamTests {
 
     @Test
     func givenCurrentValue_whenEmit_thenMatches() async throws {
-        let sut = CurrentValueStream<UniqueID, Int>(100)
+        let sut = CurrentValueStream<Int>(100)
         let sequence = [5, 7, 67]
         let expected = [100] + sequence
         let stream = sut.subscribe()
diff --git a/Tests/PartoutCoreTests/CyclingConnectionTests.swift b/Tests/PartoutCoreTests/CyclingConnectionTests.swift
@@ -149,7 +149,7 @@ struct CyclingConnectionTests {
 
     @Test
     func givenLink_whenStartThenGetsBetterLink_thenReconnects() async throws {
-        let hasBetterPath = PassthroughStream<UniqueID, Void>()
+        let hasBetterPath = PassthroughStream<Void>()
         let factory = MockNetworkInterfaceFactory()
         factory.linkBlock = {
             $0.hasBetterPath = hasBetterPath.subscribe()
diff --git a/Tests/PartoutCoreTests/NetworkObserverTests.swift b/Tests/PartoutCoreTests/NetworkObserverTests.swift
@@ -8,8 +8,8 @@ import Testing
 struct NetworkObserverTests {
     @Test
     func givenUnboundStatus_whenAnyStatus_thenObserverFires() async throws {
-        let reachability = PassthroughStream<UniqueID, Bool>()
-        let status = PassthroughStream<UniqueID, ConnectionStatus>()
+        let reachability = PassthroughStream<Bool>()
+        let status = PassthroughStream<ConnectionStatus>()
 
         let sut = NetworkObserver(
             .global,
@@ -35,8 +35,8 @@ struct NetworkObserverTests {
 
     @Test
     func givenBoundStatus_whenStatusMatches_thenObserverFires() async throws {
-        let reachability = PassthroughStream<UniqueID, Bool>()
-        let status = PassthroughStream<UniqueID, ConnectionStatus>()
+        let reachability = PassthroughStream<Bool>()
+        let status = PassthroughStream<ConnectionStatus>()
 
         let sut = NetworkObserver(
             .global,
@@ -72,8 +72,8 @@ struct NetworkObserverTests {
 
     @Test
     func givenBoundStatus_whenStatusMatches_thenObserverFiresAfterEnabling() async {
-        let reachability = PassthroughStream<UniqueID, Bool>()
-        let status = PassthroughStream<UniqueID, ConnectionStatus>()
+        let reachability = PassthroughStream<Bool>()
+        let status = PassthroughStream<ConnectionStatus>()
         let reachabilityStream = reachability.subscribe()
         let statusStream = status.subscribe()
 
diff --git a/Tests/PartoutCoreTests/SimpleConnectionDaemonTests.swift b/Tests/PartoutCoreTests/SimpleConnectionDaemonTests.swift
@@ -207,7 +207,7 @@ private extension SimpleConnectionDaemonTests {
 }
 
 private final class MockReachabilityObserver: ReachabilityObserver, @unchecked Sendable {
-    private nonisolated let isReachableSubject = PassthroughStream<UniqueID, Bool>()
+    private nonisolated let isReachableSubject = PassthroughStream<Bool>()
 
     func startObserving() {
         isReachable = true
@@ -248,7 +248,7 @@ private final class MockConnection: Connection {
 
     let options: Options
 
-    private let statusSubject = CurrentValueStream<UniqueID, ConnectionStatus>(.disconnected)
+    private let statusSubject = CurrentValueStream<ConnectionStatus>(.disconnected)
 
     var statusStream: AsyncThrowingStream<ConnectionStatus, Error> {
         statusSubject.subscribeThrowing()
diff --git a/Tests/PartoutOpenVPNTests/OpenVPNConnectionTests.swift b/Tests/PartoutOpenVPNTests/OpenVPNConnectionTests.swift
@@ -237,7 +237,7 @@ struct OpenVPNConnectionTests {
     func givenStartedConnection_whenUpgraded_thenDisconnectsWithNetworkChanged() async throws {
         let session = MockOpenVPNSession()
         var status: ConnectionStatus
-        let hasBetterPath = PassthroughStream<UniqueID, Void>()
+        let hasBetterPath = PassthroughStream<Void>()
         let factory = MockNetworkInterfaceFactory()
         factory.linkBlock = {
             $0.hasBetterPath = hasBetterPath.subscribe()
