Commite77ea5a

committed

chore: handle waking from device sleep

1 parentd2ed4a9 commite77ea5aCopy full SHA for e77ea5a

File tree

+30

-6

lines changed

+30

-6

lines changed

Lines changed: 6 additions & 2 deletions

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{@MainActorin`
`64`		`- svc.onExtensionPeerUpdate(data)`
	`64`	`+if isState{`
	`65`	`+ svc.onExtensionPeerState(data)`
	`66`	`+}else{`
	`67`	`+ svc.onExtensionPeerUpdate(data)`
	`68`	`+}`
`65`	`69`	`}`
`66`	`70`	`}`
`67`	`71`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ actor Manager {`
`111`	`111`	`iflet conn= globalXPCListenerDelegate.conn{`
`112`	`112`	`do{`
`113`	`113`	`letdata=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()asyncthrows{`
	`223`	`+letstate=tryawaitgetPeerState().serializedData()`
	`224`	`+guardlet conn= globalXPCListenerDelegate.connelse{`
	`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`	`structManagerConfig{`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,14 +122,24 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`overridefunc sleep(completionHandler:@escaping()->Void){`
`125`		`- //Add code here toget ready tosleep.`
	`125`	`+ //Nothing we need todo onsleep right now`
`126`	`126`	`logger.debug("sleep called")`
`127`	`127`	`completionHandler()`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`overridefunc wake(){`
`131`		`- // Add code here to wake up.`
`132`	`131`	`logger.debug("wake called")`
	`132`	`+guardlet managerelse{`
	`133`	`+ logger.error("wake called with nil Manager")`
	`134`	`+return`
	`135`	`+}`
	`136`	`+Task{`
	`137`	`+do{`
	`138`	`+tryawait manager.forcePushPeerState()`
	`139`	`+}catch{`
	`140`	`+ logger.error("error pushing peer state:\(error, privacy:.public)")`
	`141`	`+}`
	`142`	`+}`
`133`	`143`	`}`
`134`	`144`
`135`	`145`	// Wrapper around `setTunnelNetworkSettings` that supports merging updates

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import Foundation`
`9`	`9`	`@preconcurrency`
`10`	`10`	`@objcpublicprotocolVPNXPCClientCallbackProtocol{`
`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`	`}`

Comments

(0)