Reconnect VPN without disabling it
Retain on-demand flag to avoid leaks during reconnection.
This commit is contained in:
parent
1c64253a1f
commit
92ffc382cb
|
@ -51,7 +51,7 @@
|
|||
"repositoryURL": "https://github.com/passepartoutvpn/tunnelkit",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "36ed23ccc4e6083d671b6b823f50787b018f2844",
|
||||
"revision": "e2aaffc06f1d59a96e55e77d2a70d15c7f58b585",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
|
|
|
@ -24,7 +24,7 @@ let package = Package(
|
|||
// Dependencies declare other packages that this package depends on.
|
||||
// .package(url: /* package url */, from: "1.0.0"),
|
||||
// .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", from: "4.1.0"),
|
||||
.package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("36ed23ccc4e6083d671b6b823f50787b018f2844")),
|
||||
.package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("e2aaffc06f1d59a96e55e77d2a70d15c7f58b585")),
|
||||
// .package(name: "TunnelKit", path: "../../tunnelkit"),
|
||||
.package(url: "https://github.com/zoul/generic-json-swift", from: "2.0.0"),
|
||||
.package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "1.9.0")
|
||||
|
|
|
@ -45,6 +45,8 @@ public protocol VPNManager {
|
|||
@discardableResult
|
||||
func connect(with profileId: UUID, toServer newServerId: String) async throws -> Profile
|
||||
|
||||
func reconnect() async
|
||||
|
||||
func modifyActiveProfile(_ block: (inout Profile) -> Void) async throws
|
||||
|
||||
func disable() async
|
||||
|
|
|
@ -97,11 +97,17 @@ public class DefaultVPNManager<ProfileManagerType: ProfileManagerWithCurrentProf
|
|||
}
|
||||
|
||||
func reconnect(_ configuration: VPNConfiguration) async {
|
||||
pp_log.info("Reconnecting VPN")
|
||||
pp_log.info("Reconnecting VPN (with new configuration)")
|
||||
clearLastError()
|
||||
await strategy.connect(configuration: configuration)
|
||||
}
|
||||
|
||||
public func reconnect() async {
|
||||
pp_log.info("Reconnecting VPN")
|
||||
clearLastError()
|
||||
await strategy.reconnect()
|
||||
}
|
||||
|
||||
public func disable() async {
|
||||
pp_log.info("Disabling VPN")
|
||||
clearLastError()
|
||||
|
|
|
@ -59,6 +59,23 @@ public class MockVPNManagerStrategy: VPNManagerStrategy {
|
|||
}
|
||||
}
|
||||
|
||||
@MainActor
|
||||
public func reconnect() async {
|
||||
guard currentState?.vpnStatus == .connected else {
|
||||
return
|
||||
}
|
||||
Task {
|
||||
currentState?.vpnStatus = .disconnecting
|
||||
await Task.maybeWait(forMilliseconds: 1000)
|
||||
currentState?.vpnStatus = .disconnected
|
||||
await Task.maybeWait(forMilliseconds: 1000)
|
||||
currentState?.vpnStatus = .connecting
|
||||
await Task.maybeWait(forMilliseconds: 1000)
|
||||
currentState?.vpnStatus = .connected
|
||||
currentState?.dataCount = nil
|
||||
}
|
||||
}
|
||||
|
||||
@MainActor
|
||||
public func disconnect() {
|
||||
stopCountingData()
|
||||
|
|
|
@ -44,6 +44,8 @@ public class TunnelKitVPNManagerStrategy: VPNManagerStrategy {
|
|||
}
|
||||
}
|
||||
|
||||
private static let reconnectionSeconds = 2
|
||||
|
||||
private let appGroup: String
|
||||
|
||||
private let tunnelBundleIdentifier: (VPNProtocolType) -> String
|
||||
|
@ -149,13 +151,19 @@ public class TunnelKitVPNManagerStrategy: VPNManagerStrategy {
|
|||
bundleIdentifier,
|
||||
configuration: configuration.neConfiguration,
|
||||
extra: configuration.neExtra,
|
||||
after: .seconds(2)
|
||||
after: .seconds(Self.reconnectionSeconds)
|
||||
)
|
||||
} catch {
|
||||
pp_log.error("Unable to connect: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
public func reconnect() async {
|
||||
try? await vpn.reconnect(
|
||||
after: .seconds(Self.reconnectionSeconds)
|
||||
)
|
||||
}
|
||||
|
||||
public func disconnect() async {
|
||||
await vpn.disconnect()
|
||||
}
|
||||
|
|
|
@ -34,6 +34,8 @@ public protocol VPNManagerStrategy {
|
|||
|
||||
func connect(configuration: VPNConfiguration) async
|
||||
|
||||
func reconnect() async
|
||||
|
||||
func disconnect() async
|
||||
|
||||
func removeConfigurations() async
|
||||
|
|
Loading…
Reference in New Issue