update VPN protocol version; fmt & lint

spikecurtis · spikecurtis · commit 9da59a0832c3 · 2025-03-27T10:34:35.000+04:00
diff --git a/Coder-Desktop/VPNLib/Speaker.swift b/Coder-Desktop/VPNLib/Speaker.swift
@@ -89,7 +89,9 @@ public actor Speaker<SendMsg: RPCMessage & Message, RecvMsg: RPCMessage & Messag
     /// Does the VPN Protocol handshake and validates the result
     public func handshake() async throws(HandshakeError) {
         let hndsh = Handshaker(writeFD: writeFD, dispatch: dispatch, queue: queue, role: role)
-        // ignore the version for now because we know it can only be 1.0
+        // ignore the version for now because we know it can only be 1.0 or 1.1.
+        // 1.1 adds support for telemetry to StartRequest, but since setting these
+        // fields won't adversely affect a 1.0 speaker, we set them regardless.
         try _ = await hndsh.handshake()
     }
 
@@ -178,7 +180,7 @@ actor Handshaker {
 
     init(writeFD: FileHandle, dispatch: DispatchIO, queue: DispatchQueue,
          role: ProtoRole,
-         versions: [ProtoVersion] = [.init(1, 0)])
+         versions: [ProtoVersion] = [.init(1, 1)])
     {
         self.writeFD = writeFD
         self.dispatch = dispatch
diff --git a/Coder-Desktop/VPNLib/TelemetryEnricher.swift b/Coder-Desktop/VPNLib/TelemetryEnricher.swift
@@ -23,8 +23,8 @@ public struct TelemetryEnricher {
         var req = original
         req.deviceOs = "macOS"
         req.deviceID = deviceID
-        if version != nil {
-            req.coderDesktopVersion = version!
+        if let version {
+            req.coderDesktopVersion = version
         }
         return req
     }
diff --git a/Coder-Desktop/VPNLibTests/SpeakerTests.swift b/Coder-Desktop/VPNLibTests/SpeakerTests.swift
@@ -36,7 +36,7 @@ struct SpeakerTests: Sendable {
     @Test func handshake() async throws {
         async let v = handshaker.handshake()
         try await uut.handshake()
-        #expect(try await v == ProtoVersion(1, 0))
+        #expect(try await v == ProtoVersion(1, 1))
     }
 
     @Test func handleSingleMessage() async throws {
diff --git a/Coder-Desktop/VPNLibTests/TelemetryEnricherTests.swift b/Coder-Desktop/VPNLibTests/TelemetryEnricherTests.swift
@@ -16,7 +16,7 @@ struct TelemetryEnricherTests {
         #expect(try enriched.coderDesktopVersion.contains(Regex(#"^\d+\.\d+\.\d+$"#)))
         let deviceID = enriched.deviceID
         #expect(!deviceID.isEmpty)
-        
+
         // check we get the same deviceID from a new enricher
         let enricher1 = TelemetryEnricher()
         enriched = enricher1.enrich(original)

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public struct TelemetryEnricher {`
`23`	`23`	`var req = original`
`24`	`24`	`req.deviceOs = "macOS"`
`25`	`25`	`req.deviceID = deviceID`
`26`		`- if version != nil {`
`27`		`- req.coderDesktopVersion = version!`
	`26`	`+ if let version {`
	`27`	`+ req.coderDesktopVersion = version`
`28`	`28`	`}`
`29`	`29`	`return req`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct SpeakerTests: Sendable {`
`36`	`36`	`@Test func handshake() async throws {`
`37`	`37`	`async let v = handshaker.handshake()`
`38`	`38`	`try await uut.handshake()`
`39`		`- #expect(try await v == ProtoVersion(1, 0))`
	`39`	`+ #expect(try await v == ProtoVersion(1, 1))`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Test func handleSingleMessage() async throws {`