feat(gateway)!: switch handshake to req:connect (protocol v2)

apps/macos/Tests/ClawdisIPCTests/GatewayChannelRequestTests.swift

@@ -6,6 +6,7 @@ import Testing
 @Suite struct GatewayChannelRequestTests {
     private final class FakeWebSocketTask: WebSocketTasking, @unchecked Sendable {
         private let requestSendDelayMs: Int
+        private let connectRequestID = OSAllocatedUnfairLock<String?>(initialState: nil)
         private let pendingReceiveHandler =
             OSAllocatedUnfairLock<(@Sendable (Result<URLSessionWebSocketTask.Message, Error>) -> Void)?>(initialState: nil)
         private let sendCount = OSAllocatedUnfairLock(initialState: 0)
@@ -37,7 +38,22 @@ import Testing
                 return count
             }
 
-            // First send is the hello frame. Second send is the request frame.
+            // First send is the connect handshake. Second send is the request frame.
+            if currentSendCount == 0 {
+                let data: Data? = switch message {
+                case let .data(d): d
+                case let .string(s): s.data(using: .utf8)
+                @unknown default: nil
+                }
+                guard let data else { return }
+                if let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                   obj["type"] as? String == "req",
+                   obj["method"] as? String == "connect",
+                   let id = obj["id"] as? String
+                {
+                    self.connectRequestID.withLock { $0 = id }
+                }
+            }
             if currentSendCount == 1 {
                 try await Task.sleep(nanoseconds: UInt64(self.requestSendDelayMs) * 1_000_000)
                 throw URLError(.cannotConnectToHost)
@@ -45,7 +61,8 @@ import Testing
         }
 
         func receive() async throws -> URLSessionWebSocketTask.Message {
-            .data(Self.helloOkData())
+            let id = self.connectRequestID.withLock { $0 } ?? "connect"
+            return .data(Self.connectOkData(id: id))
         }
 
         func receive(
@@ -54,20 +71,25 @@ import Testing
             self.pendingReceiveHandler.withLock { $0 = completionHandler }
         }
 
-        private static func helloOkData() -> Data {
+        private static func connectOkData(id: String) -> Data {
             let json = """
             {
-              "type": "hello-ok",
-              "protocol": 1,
-              "server": { "version": "test", "connId": "test" },
-              "features": { "methods": [], "events": [] },
-              "snapshot": {
-                "presence": [ { "ts": 1 } ],
-                "health": {},
-                "stateVersion": { "presence": 0, "health": 0 },
-                "uptimeMs": 0
-              },
-              "policy": { "maxPayload": 1, "maxBufferedBytes": 1, "tickIntervalMs": 30000 }
+              "type": "res",
+              "id": "\(id)",
+              "ok": true,
+              "payload": {
+                "type": "hello-ok",
+                "protocol": 2,
+                "server": { "version": "test", "connId": "test" },
+                "features": { "methods": [], "events": [] },
+                "snapshot": {
+                  "presence": [ { "ts": 1 } ],
+                  "health": {},
+                  "stateVersion": { "presence": 0, "health": 0 },
+                  "uptimeMs": 0
+                },
+                "policy": { "maxPayload": 1, "maxBufferedBytes": 1, "tickIntervalMs": 30000 }
+              }
             }
             """
             return Data(json.utf8)