chore: handle waking from device sleep

ethanndickson · ethanndickson · commit e77ea5a562f8 · 2025-02-14T17:22:05.000+11:00
diff --git a/Coder Desktop/Coder Desktop/XPCInterface.swift b/Coder Desktop/Coder Desktop/XPCInterface.swift
@@ -59,9 +59,13 @@ import VPNLib
         }
     }
 
-    func onPeerUpdate(_ data: Data) {
+    func onPeerUpdate(_ data: Data, isState: Bool) {
         Task { @MainActor in
-            svc.onExtensionPeerUpdate(data)
+            if isState {
+                svc.onExtensionPeerState(data)
+            } else {
+                svc.onExtensionPeerUpdate(data)
+            }
         }
     }
 
diff --git a/Coder Desktop/VPN/Manager.swift b/Coder Desktop/VPN/Manager.swift
@@ -111,7 +111,7 @@ actor Manager {
             if let conn = globalXPCListenerDelegate.conn {
                 do {
                     let data = try msg.peerUpdate.serializedData()
-                    conn.onPeerUpdate(data)
+                    conn.onPeerUpdate(data, isState: false)
                 } catch {
                     logger.error("failed to send peer update to client: \(error)")
                 }
@@ -218,6 +218,15 @@ actor Manager {
         }
         return resp.peerUpdate
     }
+
+    func forcePushPeerState() async throws {
+        let state = try await getPeerState().serializedData()
+        guard let conn = globalXPCListenerDelegate.conn else {
+            logger.info("app was not running on wake, not pushing state")
+            return
+        }
+        conn.onPeerUpdate(state, isState: true)
+    }
 }
 
 struct ManagerConfig {
diff --git a/Coder Desktop/VPN/PacketTunnelProvider.swift b/Coder Desktop/VPN/PacketTunnelProvider.swift
@@ -122,14 +122,24 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
     }
 
     override func sleep(completionHandler: @escaping () -> Void) {
-        // Add code here to get ready to sleep.
+        // Nothing we need to do on sleep right now
         logger.debug("sleep called")
         completionHandler()
     }
 
     override func wake() {
-        // Add code here to wake up.
         logger.debug("wake called")
+        guard let manager else {
+            logger.error("wake called with nil Manager")
+            return
+        }
+        Task {
+            do {
+                try await manager.forcePushPeerState()
+            } catch {
+                logger.error("error pushing peer state: \(error, privacy: .public)")
+            }
+        }
     }
 
     // Wrapper around `setTunnelNetworkSettings` that supports merging updates
diff --git a/Coder Desktop/VPNLib/XPC.swift b/Coder Desktop/VPNLib/XPC.swift
@@ -9,6 +9,7 @@ import Foundation
 @preconcurrency
 @objc public protocol VPNXPCClientCallbackProtocol {
     // data is a serialized `Vpn_PeerUpdate`
-    func onPeerUpdate(_ data: Data)
+    // If `isState` is true, the update should replace the current state.
+    func onPeerUpdate(_ data: Data, isState: Bool)
     func removeQuarantine(path: String, reply: @escaping (Bool) -> Void)
 }

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,13 @@ import VPNLib`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- func onPeerUpdate(_ data: Data) {`
	`62`	`+ func onPeerUpdate(_ data: Data, isState: Bool) {`
`63`	`63`	`Task { @MainActor in`
`64`		`- svc.onExtensionPeerUpdate(data)`
	`64`	`+ if isState {`
	`65`	`+ svc.onExtensionPeerState(data)`
	`66`	`+ } else {`
	`67`	`+ svc.onExtensionPeerUpdate(data)`
	`68`	`+ }`
`65`	`69`	`}`
`66`	`70`	`}`
`67`	`71`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ actor Manager {`
`111`	`111`	`if let conn = globalXPCListenerDelegate.conn {`
`112`	`112`	`do {`
`113`	`113`	`let data = try msg.peerUpdate.serializedData()`
`114`		`- conn.onPeerUpdate(data)`
	`114`	`+ conn.onPeerUpdate(data, isState: false)`
`115`	`115`	`} catch {`
`116`	`116`	`logger.error("failed to send peer update to client: \(error)")`
`117`	`117`	`}`
`@@ -218,6 +218,15 @@ actor Manager {`
`218`	`218`	`}`
`219`	`219`	`return resp.peerUpdate`
`220`	`220`	`}`
	`221`	`+`
	`222`	`+ func forcePushPeerState() async throws {`
	`223`	`+ let state = try await getPeerState().serializedData()`
	`224`	`+ guard let conn = globalXPCListenerDelegate.conn else {`
	`225`	`+ logger.info("app was not running on wake, not pushing state")`
	`226`	`+ return`
	`227`	`+ }`
	`228`	`+ conn.onPeerUpdate(state, isState: true)`
	`229`	`+ }`
`221`	`230`	`}`
`222`	`231`
`223`	`232`	`struct ManagerConfig {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import Foundation`
`9`	`9`	`@preconcurrency`
`10`	`10`	`@objc public protocol VPNXPCClientCallbackProtocol {`
`11`	`11`	// data is a serialized `Vpn_PeerUpdate`
`12`		`- func onPeerUpdate(_ data: Data)`
	`12`	+ // If `isState` is true, the update should replace the current state.
	`13`	`+ func onPeerUpdate(_ data: Data, isState: Bool)`
`13`	`14`	`func removeQuarantine(path: String, reply: @escaping (Bool) -> Void)`
`14`	`15`	`}`