chore: handle waking from device sleep

ethanndickson · ethanndickson · commit 8463ffe780fa · 2025-02-18T14:32:00.000+11:00
diff --git a/Coder Desktop/VPN/PacketTunnelProvider.swift b/Coder Desktop/VPN/PacketTunnelProvider.swift
@@ -47,6 +47,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
         options _: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void
     ) {
         logger.info("startTunnel called")
+        start(completionHandler)
+    }
+
+    // called by `startTunnel` and on `wake`
+    func start(_ completionHandler: @escaping (Error?) -> Void ) {
         guard manager == nil else {
             logger.error("startTunnel called with non-nil Manager")
             completionHandler(makeNSError(suffix: "PTP", desc: "Already running"))
@@ -95,8 +100,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
         with _: NEProviderStopReason, completionHandler: @escaping () -> Void
     ) {
         logger.debug("stopTunnel called")
+        teardown(completionHandler)
+    }
+
+    // called by `stopTunnel` and `sleep`
+    func teardown(_ completionHandler: @escaping () -> Void) {
         guard let manager else {
-            logger.error("stopTunnel called with nil Manager")
+            logger.error("teardown called with nil Manager")
             completionHandler()
             return
         }
@@ -121,15 +131,25 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
         }
     }
 
+    // sleep and wake reference: https://developer.apple.com/forums/thread/95988
     override func sleep(completionHandler: @escaping () -> Void) {
-        // Add code here to get ready to sleep.
         logger.debug("sleep called")
-        completionHandler()
+        teardown(completionHandler)
     }
 
     override func wake() {
-        // Add code here to wake up.
         logger.debug("wake called")
+        self.reasserting = true
+        self.currentSettings = .init(tunnelRemoteAddress: "127.0.0.1")
+        self.setTunnelNetworkSettings(nil)
+        start { error in
+            if let error {
+                self.logger.error("error starting tunnel after wake: \(error.localizedDescription)")
+                self.cancelTunnelWithError(error)
+            } else {
+                self.reasserting = false
+            }
+        }
     }
 
     // Wrapper around `setTunnelNetworkSettings` that supports merging updates
diff --git a/Coder Desktop/VPNLib/Download.swift b/Coder Desktop/VPNLib/Download.swift
@@ -109,10 +109,13 @@ public func download(src: URL, dest: URL) async throws(DownloadError) {
         }
     }
     // TODO: Add Content-Length headers to coderd, add download progress delegate
+    let sessionConfig = URLSessionConfiguration.default
+    sessionConfig.waitsForConnectivity = true
+    let session = URLSession(configuration: sessionConfig)
     let tempURL: URL
     let response: URLResponse
     do {
-        (tempURL, response) = try await URLSession.shared.download(for: req)
+        (tempURL, response) = try await session.download(for: req)
     } catch {
         throw .networkError(error)
     }

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,13 @@ public func download(src: URL, dest: URL) async throws(DownloadError) {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`// TODO: Add Content-Length headers to coderd, add download progress delegate`
	`112`	`+ let sessionConfig = URLSessionConfiguration.default`
	`113`	`+ sessionConfig.waitsForConnectivity = true`
	`114`	`+ let session = URLSession(configuration: sessionConfig)`
`112`	`115`	`let tempURL: URL`
`113`	`116`	`let response: URLResponse`
`114`	`117`	`do {`
`115`		`- (tempURL, response) = try await URLSession.shared.download(for: req)`
	`118`	`+ (tempURL, response) = try await session.download(for: req)`
`116`	`119`	`} catch {`
`117`	`120`	`throw .networkError(error)`
`118`	`121`	`}`