Rename State component types for clarity

Author: acb-mv

ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift

@@ -84,7 +84,8 @@ extension PacketTunnelActor {
                 return nil
             }
 
-        case .disconnecting, .disconnected:
+        // Post quantum key exchange cannot enter the blocked state
+        case .disconnecting, .disconnected, .negotiatingPostQuantumKey:
             return nil
         }
     }

ios/PacketTunnelCore/Actor/PacketTunnelActor.swift

@@ -164,7 +164,8 @@ extension PacketTunnelActor {
     /// Stop the tunnel.
     private func stop() async {
         switch state {
-        case let .connected(connState), let .connecting(connState), let .reconnecting(connState):
+        case let .connected(connState), let .connecting(connState), let .reconnecting(connState),
+             let .negotiatingPostQuantumKey(connState):
             state = .disconnecting(connState)
             tunnelMonitor.stop()
 
@@ -199,6 +200,10 @@ extension PacketTunnelActor {
     private func reconnect(to nextRelay: NextRelay, reason: ReconnectReason) async {
         do {
             switch state {
+            case .negotiatingPostQuantumKey:
+                // There is no connection monitoring going on when exchanging keys.
+                // The procedure starts from scratch for each reconnection attempts.
+                try await tryStart(nextRelay: nextRelay, reason: reason)
             case .connecting, .connected, .reconnecting, .error:
                 switch reason {
                 case .connectionLoss:
@@ -326,7 +331,7 @@ extension PacketTunnelActor {
                 connectionState.incrementAttemptCount()
             }
             fallthrough
-        case var .connected(connectionState):
+        case var .connected(connectionState), var .negotiatingPostQuantumKey(connectionState):
             let selectedRelay = try callRelaySelector(
                 connectionState.selectedRelay,
                 connectionState.connectionAttemptCount

ios/PacketTunnelCore/Actor/State+Extensions.swift

@@ -23,7 +23,7 @@ extension State {
         case .initial:
             return .connecting
 
-        case .connecting:
+        case .connecting, .negotiatingPostQuantumKey:
             return .connecting
 
         case .connected, .reconnecting:
@@ -59,13 +59,15 @@ extension State {
         case let .error(blockedState):
             return "\(name): \(blockedState.reason)"
 
-        case .initial, .disconnecting, .disconnected:
+        case .initial, .disconnecting, .disconnected, .negotiatingPostQuantumKey:
             return name
         }
     }
 
     var name: String {
         switch self {
+        case .negotiatingPostQuantumKey:
+            "Negotiating Post Quantum Key"
         case .connected:
             "Connected"
         case .connecting:

ios/PacketTunnelCore/Actor/State.swift

@@ -58,6 +58,9 @@ enum State: Equatable {
     /// Initial state at the time when actor is initialized but before the first connection attempt.
     case initial
 
+    /// Establish a connection to the gateway, and exchange a post quantum key with the GRPC service that resides there.
+    case negotiatingPostQuantumKey(ConnectionData)
+
     /// Tunnel is attempting to connect.
     /// The actor should remain in this state until the very first connection is established, i.e determined by tunnel monitor.
     case connecting(ConnectionData)