Mar 27, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 27, 2025 · Mar 27, 2025
diff --git a/Coder-Desktop/VPN/Manager.swift b/Coder-Desktop/VPN/Manager.swift
 actor Manager {
    let ptp: PacketTunnelProvider
    let cfg: ManagerConfig
    let telemetryEnricher: TelemetryEnricher

    let tunnelHandle: TunnelHandle
    let speaker: Speaker<Vpn_ManagerMessage, Vpn_TunnelMessage>
    init(with: PacketTunnelProvider, cfg: ManagerConfig) async throws(ManagerError) {
        ptp = with
        self.cfg = cfg
        telemetryEnricher = TelemetryEnricher()
        #if arch(arm64)
            let dylibPath = cfg.serverUrl.appending(path: "bin/coder-vpn-darwin-arm64.dylib")
        #elseif arch(x86_64)
                                req.value = header.value
                            }
                        }
                        req = telemetryEnricher.enrich(req)
                    }
                })
        } catch {
diff --git a/Coder-Desktop/VPNLib/Speaker.swift b/Coder-Desktop/VPNLib/Speaker.swift

    /// 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
        let hndsh = Handshaker(writeFD: writeFD, dispatch: dispatch, queue: queue, role: role,
                               versions: [ProtoVersion(1, 1)])
        // 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()
    }

diff --git a/Coder-Desktop/VPNLib/TelemetryEnricher.swift b/Coder-Desktop/VPNLib/TelemetryEnricher.swift
 import Foundation

 public struct TelemetryEnricher {
    private let deviceID: String
    private let version: String?

    public init() {
        version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String

        let userDefaults = UserDefaults.standard
        let key = "deviceID"

        if let existingID = userDefaults.string(forKey: key) {
            deviceID = existingID
        } else {
            let newID = UUID().uuidString
            userDefaults.set(newID, forKey: key)
            deviceID = newID
        }
    }

    public func enrich(_ original: Vpn_StartRequest) -> Vpn_StartRequest {
        var req = original
        req.deviceOs = "macOS"
        req.deviceID = deviceID
        if let version {
            req.coderDesktopVersion = version
        }
        return req
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@ import VPNLib
		actor Manager {
		let ptp: PacketTunnelProvider
		let cfg: ManagerConfig
		let telemetryEnricher: TelemetryEnricher

		let tunnelHandle: TunnelHandle
		let speaker: Speaker<Vpn_ManagerMessage, Vpn_TunnelMessage>
Expand All		@@ -19,6 +20,7 @@ actor Manager {
		init(with: PacketTunnelProvider, cfg: ManagerConfig) async throws(ManagerError) {
		ptp = with
		self.cfg = cfg
		telemetryEnricher = TelemetryEnricher()
		#if arch(arm64)
		let dylibPath = cfg.serverUrl.appending(path: "bin/coder-vpn-darwin-arm64.dylib")
		#elseif arch(x86_64)
Expand DownExpand Up		@@ -176,6 +178,7 @@ actor Manager {
		req.value = header.value
		}
		}
		req = telemetryEnricher.enrich(req)
		}
		})
		} catch {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,8 +88,11 @@ 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
		let hndsh = Handshaker(writeFD: writeFD, dispatch: dispatch, queue: queue, role: role,
		versions: [ProtoVersion(1, 1)])
		// 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()
		}

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,31 @@
		import Foundation

		public struct TelemetryEnricher {
		private let deviceID: String
		private let version: String?

		public init() {
		version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String

		let userDefaults = UserDefaults.standard
		let key = "deviceID"

		if let existingID = userDefaults.string(forKey: key) {
		deviceID = existingID
		} else {
		let newID = UUID().uuidString
		userDefaults.set(newID, forKey: key)
spikecurtis marked this conversation as resolved. Show resolvedHide resolved
		deviceID = newID
		}
		}

		public func enrich(_ original: Vpn_StartRequest) -> Vpn_StartRequest {
		var req = original
		req.deviceOs = "macOS"
		req.deviceID = deviceID
		if let version {
		req.coderDesktopVersion = version
		}
		return req
		}
		}