Commitab44e4a

authored

chore: improve vpn configuration errors (#208)

Some flakey OS operation has been reported by two different users after installation:<img width="215" height="415" alt="image" src="https://github.com/user-attachments/assets/e632071d-02a3-45d3-bbef-f1bce9139974" /><img width="247" height="191" alt="image" src="https://github.com/user-attachments/assets/dcd4b39b-5be4-4630-a4c8-dc45fe06bb77" />I don't know what's happening because the error handling here isn't very good. This PR fixes that by always including the operation that failed in the UI message.

1 parente2e49a0 commitab44e4aCopy full SHA for ab44e4a

File tree

3 files changed

+22

-13

lines changed

Coder-Desktop
- Coder-Desktop/VPN
  - NetworkExtension.swift
  - VPNService.swift
- project.yml

3 files changed

+22

-13

lines changed

`‎Coder-Desktop/Coder-Desktop/VPN/NetworkExtension.swift‎`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ enum NetworkExtensionState: Equatable {`
`16`	`16`	`case.disabled:`
`17`	`17`	`"NetworkExtension tunnel disabled"`
`18`	`18`	`caselet.failed(error):`
`19`		`-"NetworkExtension config failed:\(error)"`
	`19`	`+"NetworkExtension:\(error)"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
`@@ -44,7 +44,7 @@ extension CoderVPNService {`
`44`	`44`	`tryawaitremoveNetworkExtension()`
`45`	`45`	`}catch{`
`46`	`46`	`logger.error("remove tunnel failed:\(error)")`
`47`		`- neState=.failed(error.localizedDescription)`
	`47`	`+ neState=.failed("Failed to remove configuration:\(error.description)")`
`48`	`48`	`return`
`49`	`49`	`}`
`50`	`50`	`logger.debug("inserting new tunnel")`
`@@ -60,7 +60,9 @@ extension CoderVPNService {`
`60`	`60`	`}catch{`
`61`	`61`	`// This typically fails when the user declines the permission dialog`
`62`	`62`	`logger.error("save tunnel failed:\(error)")`
`63`		`- neState=.failed("Failed to save tunnel:\(error.localizedDescription). Try logging in and out again.")`
	`63`	`+ neState=.failed(`
	`64`	`+"Failed to save configuration:\(error.localizedDescription). Try logging in and out again."`
	`65`	`+)`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
`@@ -71,17 +73,24 @@ extension CoderVPNService {`
`71`	`73`	`tryawait tunnel.removeFromPreferences()`
`72`	`74`	`}`
`73`	`75`	`}catch{`
`74`		`-throw.internalError("couldn't remove tunnels:\(error)")`
	`76`	`+throw.internalError(error.localizedDescription)`
`75`	`77`	`}`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`func startTunnel()async{`
	`81`	`+lettm:NETunnelProviderManager`
	`82`	`+do{`
	`83`	`+ tm=tryawaitgetTunnelManager()`
	`84`	`+}catch{`
	`85`	`+ logger.error("get tunnel:\(error)")`
	`86`	`+ neState=.failed("Failed to get VPN configuration:\(error.description)")`
	`87`	`+return`
	`88`	`+}`
`79`	`89`	`do{`
`80`		`-lettm=tryawaitgetTunnelManager()`
`81`	`90`	`try tm.connection.startVPNTunnel()`
`82`	`91`	`}catch{`
`83`	`92`	`logger.error("start tunnel:\(error)")`
`84`		`- neState=.failed(error.localizedDescription)`
	`93`	`+ neState=.failed("Failed to start VPN tunnel:\(error.localizedDescription)")`
`85`	`94`	`return`
`86`	`95`	`}`
`87`	`96`	`logger.debug("started tunnel")`
`@@ -94,7 +103,7 @@ extension CoderVPNService {`
`94`	`103`	`tm.connection.stopVPNTunnel()`
`95`	`104`	`}catch{`
`96`	`105`	`logger.error("stop tunnel:\(error)")`
`97`		`- neState=.failed(error.localizedDescription)`
	`106`	`+ neState=.failed("Failed to stop VPN tunnel:\(error.localizedDescription)")`
`98`	`107`	`return`
`99`	`108`	`}`
`100`	`109`	`logger.debug("stopped tunnel")`

`‎Coder-Desktop/Coder-Desktop/VPN/VPNService.swift‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ enum VPNServiceError: Error, Equatable {`
`37`	`37`	`case systemExtensionError(SystemExtensionState)`
`38`	`38`	`case networkExtensionError(NetworkExtensionState)`
`39`	`39`
`40`		`-vardescription:String{`
	`40`	`+publicvardescription:String{`
`41`	`41`	`switchself{`
`42`	`42`	`caselet.internalError(description):`
`43`	`43`	`"Internal Error:\(description)"`
`@@ -48,7 +48,7 @@ enum VPNServiceError: Error, Equatable {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-varlocalizedDescription:String{ description}`
	`51`	`+publicvarlocalizedDescription:String{ description}`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@MainActor`
`@@ -126,13 +126,13 @@ final class CoderVPNService: NSObject, VPNService {`
`126`	`126`	`// this just configures the VPN, it doesn't enable it`
`127`	`127`	`tunnelState=.disabled`
`128`	`128`	`}else{`
`129`		`-do{`
	`129`	`+dothrows(VPNServiceError){`
`130`	`130`	`tryawaitremoveNetworkExtension()`
`131`	`131`	`neState=.unconfigured`
`132`	`132`	`tunnelState=.disabled`
`133`	`133`	`} catch{`
`134`		`- logger.error("failed to removenetwork extension:\(error)")`
`135`		`- neState=.failed(error.localizedDescription)`
	`134`	`+ logger.error("failed to removeconfiguration:\(error)")`
	`135`	`+ neState=.failed("Failed to remove configuration:\(error.description)")`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`

`‎Coder-Desktop/project.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ packages:`
`98`	`98`	`# - Set onAppear/disappear handlers.`
`99`	`99`	`# The upstream repo has a purposefully limited API`
`100`	`100`	`url:https://github.com/coder/fluid-menu-bar-extra`
`101`		`-revision:8e1d8b8`
	`101`	`+revision:b0d5438`
`102`	`102`	`KeychainAccess:`
`103`	`103`	`url:https://github.com/kishikawakatsumi/KeychainAccess`
`104`	`104`	`branch:e0c7eebc5a4465a3c4680764f26b7a61f567cdaf`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitab44e4a

File tree

3 files changed

3 files changed

`‎Coder-Desktop/Coder-Desktop/VPN/NetworkExtension.swift‎`

`‎Coder-Desktop/Coder-Desktop/VPN/VPNService.swift‎`

`‎Coder-Desktop/project.yml‎`

0 commit comments