Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: handle waking from device sleep#50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ethanndickson merged 3 commits intomainfromethan/handle-wake
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletionCoder Desktop/Coder Desktop/VPNMenuState.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ struct VPNMenuState {

mutating func upsertWorkspace(_ workspace: Vpn_Workspace) {
guard let wsID = UUID(uuidData: workspace.id) else { return }
workspaces[wsID] = Workspace(id: wsID, name: workspace.name, agents: [])
// Workspace names are unique & case-insensitive, and we want to show offline workspaces
// with a valid hostname (lowercase).
workspaces[wsID] = Workspace(id: wsID, name: workspace.name.lowercased(), agents: [])
// Check if we can associate any invalid agents with this workspace
invalidAgents.filter { agent in
agent.workspaceID == workspace.id
Expand Down
1 change: 1 addition & 0 deletionsCoder Desktop/Coder Desktop/VPNService.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,7 @@ final class CoderVPNService: NSObject, VPNService {
return
}

menuState.clear()
await startTunnel()
logger.debug("network extension enabled")
}
Expand Down
21 changes: 2 additions & 19 deletionsCoder Desktop/Coder Desktop/Views/VPNMenu.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,6 @@ struct VPNMenu<VPN: VPNService>: View {
@EnvironmentObject var state: AppState
@Environment(\.openSettings) private var openSettings

// There appears to be a race between the VPN service reporting itself as disconnected,
// and the system extension process exiting. When the VPN is toggled off and on quickly,
// an error is shown: "The VPN session failed because an internal error occurred".
// This forces the user to wait a few seconds before they can toggle the VPN back on.
@State private var waitCleanup = false
private var waitCleanupDuration: Duration = .seconds(6)

let inspection = Inspection<Self>()

var body: some View {
Expand All@@ -23,7 +16,7 @@ struct VPNMenu<VPN: VPNService>: View {
Toggle(isOn: Binding(
get: { vpn.state == .connected || vpn.state == .connecting },
set: { isOn in Task {
if isOn { await vpn.start() } else { await stop() }
if isOn { await vpn.start() } else { awaitvpn.stop() }
}
}
)) {
Expand DownExpand Up@@ -93,21 +86,11 @@ struct VPNMenu<VPN: VPNService>: View {
}

private var vpnDisabled: Bool {
waitCleanup ||
!state.hasSession ||
!state.hasSession ||
vpn.state == .connecting ||
vpn.state == .disconnecting ||
vpn.state == .failed(.systemExtensionError(.needsUserApproval))
}

private func stop() async {
await vpn.stop()
waitCleanup = true
Task {
try? await Task.sleep(for: waitCleanupDuration)
waitCleanup = false
}
}
}

func openSystemExtensionSettings() {
Expand Down
5 changes: 4 additions & 1 deletionCoder Desktop/VPN/Manager.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,10 @@ actor Manager {
fatalError("unknown architecture")
#endif
do {
try await download(src: dylibPath, dest: dest)
let sessionConfig = URLSessionConfiguration.default
// The tunnel might be asked to start before the network interfaces have woken up from sleep
sessionConfig.waitsForConnectivity = true
try await download(src: dylibPath, dest: dest, urlSession: URLSession(configuration: sessionConfig))
} catch {
throw .download(error)
}
Expand Down
28 changes: 24 additions & 4 deletionsCoder Desktop/VPN/PacketTunnelProvider.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,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"))
Expand DownExpand Up@@ -99,8 +104,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
}
Expand All@@ -125,15 +135,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")
reasserting = true
currentSettings = .init(tunnelRemoteAddress: "127.0.0.1")
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
Expand Down
4 changes: 2 additions & 2 deletionsCoder Desktop/VPNLib/Download.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class SignatureValidator {
}
}

public func download(src: URL, dest: URL) async throws(DownloadError) {
public func download(src: URL, dest: URL, urlSession: URLSession) async throws(DownloadError) {
var req = URLRequest(url: src)
if FileManager.default.fileExists(atPath: dest.path) {
if let existingFileData = try? Data(contentsOf: dest, options: .mappedIfSafe) {
Expand All@@ -112,7 +112,7 @@ public func download(src: URL, dest: URL) async throws(DownloadError) {
let tempURL: URL
let response: URLResponse
do {
(tempURL, response) = try awaitURLSession.shared.download(for: req)
(tempURL, response) = try awaiturlSession.download(for: req)
} catch {
throw .networkError(error)
}
Expand Down
10 changes: 5 additions & 5 deletionsCoder Desktop/VPNLibTests/DownloadTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ struct DownloadTests {
let fileURL = URL(string: "http://example.com/test1.txt")!
Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: testData]).register()

try await download(src: fileURL, dest: destinationURL)
try await download(src: fileURL, dest: destinationURL, urlSession: URLSession.shared)

try #require(FileManager.default.fileExists(atPath: destinationURL.path))
defer { try? FileManager.default.removeItem(at: destinationURL) }
Expand All@@ -32,7 +32,7 @@ struct DownloadTests {

Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: testData]).register()

try await download(src: fileURL, dest: destinationURL)
try await download(src: fileURL, dest: destinationURL, urlSession: URLSession.shared)
try #require(FileManager.default.fileExists(atPath: destinationURL.path))
let downloadedData = try Data(contentsOf: destinationURL)
#expect(downloadedData == testData)
Expand All@@ -44,7 +44,7 @@ struct DownloadTests {
}
mock.register()

try await download(src: fileURL, dest: destinationURL)
try await download(src: fileURL, dest: destinationURL, urlSession: URLSession.shared)
let unchangedData = try Data(contentsOf: destinationURL)
#expect(unchangedData == testData)
#expect(etagIncluded)
Expand All@@ -61,7 +61,7 @@ struct DownloadTests {

Mock(url: fileURL, contentType: .html, statusCode: 200, data: [.get: ogData]).register()

try await download(src: fileURL, dest: destinationURL)
try await download(src: fileURL, dest: destinationURL, urlSession: URLSession.shared)
try #require(FileManager.default.fileExists(atPath: destinationURL.path))
var downloadedData = try Data(contentsOf: destinationURL)
#expect(downloadedData == ogData)
Expand All@@ -73,7 +73,7 @@ struct DownloadTests {
}
mock.register()

try await download(src: fileURL, dest: destinationURL)
try await download(src: fileURL, dest: destinationURL, urlSession: URLSession.shared)
downloadedData = try Data(contentsOf: destinationURL)
#expect(downloadedData == newData)
#expect(etagIncluded)
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp