Revert to concrete-only managers
Abstraction was overcomplicated. Strategy pattern is enough.
This commit is contained in:
Davide De Rosa
parent
ac0f994997
commit
4c4b3ee0c9
|
|
@ -29,7 +29,7 @@ import PassepartoutLibrary
|
|||
protocol ProviderProfileAvailability {
|
||||
var profile: Profile { get }
|
||||
|
||||
var providerManager: Impl.ProviderManager { get }
|
||||
var providerManager: ProviderManager { get }
|
||||
}
|
||||
|
||||
extension ProviderProfileAvailability {
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@ class DefaultLightProfile: LightProfile {
|
|||
}
|
||||
|
||||
class DefaultLightProfileManager: LightProfileManager {
|
||||
private let profileManager = Impl.ProfileManager.shared
|
||||
private let profileManager = ProfileManager.shared
|
||||
|
||||
private let providerManager = Impl.ProviderManager.shared
|
||||
private let providerManager = ProviderManager.shared
|
||||
|
||||
private var subscriptions: Set<AnyCancellable> = []
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class DefaultLightProviderServer: LightProviderServer {
|
|||
}
|
||||
|
||||
class DefaultLightProviderManager: LightProviderManager {
|
||||
private let providerManager = Impl.ProviderManager.shared
|
||||
private let providerManager = ProviderManager.shared
|
||||
|
||||
private var subscriptions: Set<AnyCancellable> = []
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
import Combine
|
||||
|
||||
class DefaultLightVPNManager: LightVPNManager {
|
||||
private let vpnManager = Impl.VPNManager.shared
|
||||
private let vpnManager = VPNManager.shared
|
||||
|
||||
private var subscriptions: Set<AnyCancellable> = []
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import SwiftUI
|
|||
import PassepartoutLibrary
|
||||
|
||||
struct AccountView: View {
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
private let providerName: ProviderName?
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import TunnelKitWireGuard
|
|||
|
||||
extension AddHostView {
|
||||
struct NameView: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
private let url: URL
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ enum AddProfileView {
|
|||
}
|
||||
|
||||
struct AccountWrapperView: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@Binding private var profile: Profile
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension AddProviderView {
|
||||
struct NameView: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@Binding private var profile: Profile
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import SwiftUI
|
|||
import PassepartoutLibrary
|
||||
|
||||
struct AddProviderView: View {
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var productManager: ProductManager
|
||||
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ extension DiagnosticsView {
|
|||
}
|
||||
}
|
||||
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var vpnManager: Impl.VPNManager
|
||||
@ObservedObject private var vpnManager: VPNManager
|
||||
|
||||
@ObservedObject private var currentVPNState: ObservableVPNState
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import TunnelKitWireGuard
|
|||
|
||||
extension DiagnosticsView {
|
||||
struct WireGuardView: View {
|
||||
@ObservedObject private var vpnManager: Impl.VPNManager
|
||||
@ObservedObject private var vpnManager: VPNManager
|
||||
|
||||
private let providerName: ProviderName?
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ extension EndpointView {
|
|||
struct OpenVPNView: View {
|
||||
@Environment(\.presentationMode) private var presentationMode
|
||||
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ extension EndpointView {
|
|||
|
||||
// XXX: do not escape mutating 'self', use constant providerManager
|
||||
init(currentProfile: ObservableProfile) {
|
||||
let providerManager: Impl.ProviderManager = .shared
|
||||
let providerManager: ProviderManager = .shared
|
||||
|
||||
self.providerManager = providerManager
|
||||
self.currentProfile = currentProfile
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import TunnelKitWireGuard
|
|||
|
||||
extension EndpointView {
|
||||
struct WireGuardView: View {
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ extension EndpointView {
|
|||
|
||||
// XXX: do not escape mutating 'self', use constant providerManager
|
||||
init(currentProfile: ObservableProfile, isReadonly: Bool) {
|
||||
let providerManager: Impl.ProviderManager = .shared
|
||||
let providerManager: ProviderManager = .shared
|
||||
|
||||
self.providerManager = providerManager
|
||||
self.currentProfile = currentProfile
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension OrganizerView {
|
||||
struct ProfilesList: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
init() {
|
||||
profileManager = .shared
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ extension OrganizerView {
|
|||
struct SceneView: View {
|
||||
@Environment(\.scenePhase) private var scenePhase
|
||||
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@ObservedObject private var vpnManager: Impl.VPNManager
|
||||
@ObservedObject private var vpnManager: VPNManager
|
||||
|
||||
@ObservedObject private var productManager: ProductManager
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ struct OrganizerView: View {
|
|||
.themePrimaryView()
|
||||
|
||||
// VPN configuration error publisher (no need to observe VPNManager)
|
||||
.onReceive(Impl.VPNManager.shared.configurationError) {
|
||||
.onReceive(VPNManager.shared.configurationError) {
|
||||
alertType = .error($0.profile.header.name, $0.error.localizedAppDescription)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension ProfileView {
|
||||
struct DiagnosticsSection: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ extension ProfileView {
|
|||
}
|
||||
}
|
||||
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@ObservedObject private var vpnManager: Impl.VPNManager
|
||||
@ObservedObject private var vpnManager: VPNManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
@ -200,7 +200,7 @@ extension ProfileView {
|
|||
}
|
||||
|
||||
struct DuplicateButton: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
private let header: Profile.Header
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension ProfileView {
|
||||
struct ProviderSection: View, ProviderProfileAvailability {
|
||||
@ObservedObject var providerManager: Impl.ProviderManager
|
||||
@ObservedObject var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ extension ProfileView {
|
|||
struct RenameView: View {
|
||||
@Environment(\.presentationMode) private var presentationMode
|
||||
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension ProfileView {
|
||||
struct VPNSection: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
private let profileId: UUID
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ struct ProfileView: View {
|
|||
@State private var modalType: ModalType?
|
||||
|
||||
init() {
|
||||
currentProfile = Impl.ProfileManager.shared.currentProfile
|
||||
currentProfile = ProfileManager.shared.currentProfile
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import SwiftUI
|
|||
import PassepartoutLibrary
|
||||
|
||||
struct ProviderLocationView: View, ProviderProfileAvailability {
|
||||
@ObservedObject var providerManager: Impl.ProviderManager
|
||||
@ObservedObject var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ struct ProviderLocationView: View, ProviderProfileAvailability {
|
|||
|
||||
// XXX: do not escape mutating 'self', use constant providerManager
|
||||
init(currentProfile: ObservableProfile, isEditable: Bool, isPresented: Binding<Bool>) {
|
||||
let providerManager: Impl.ProviderManager = .shared
|
||||
let providerManager: ProviderManager = .shared
|
||||
|
||||
self.providerManager = providerManager
|
||||
self.currentProfile = currentProfile
|
||||
|
|
@ -268,7 +268,7 @@ extension ProviderLocationView {
|
|||
}
|
||||
|
||||
struct ServerListView: View {
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
private let location: ProviderLocation
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import PassepartoutLibrary
|
|||
struct ProviderPresetView: View {
|
||||
@Environment(\.presentationMode) private var presentationMode
|
||||
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@ObservedObject private var currentProfile: ObservableProfile
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ struct ProviderPresetView: View {
|
|||
|
||||
// XXX: do not escape mutating 'self', use constant providerManager
|
||||
init(currentProfile: ObservableProfile) {
|
||||
let providerManager: Impl.ProviderManager = .shared
|
||||
let providerManager: ProviderManager = .shared
|
||||
|
||||
self.providerManager = providerManager
|
||||
self.currentProfile = currentProfile
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import PassepartoutLibrary
|
|||
|
||||
extension ShortcutsView {
|
||||
struct AddView: View {
|
||||
@ObservedObject private var providerManager: Impl.ProviderManager
|
||||
@ObservedObject private var providerManager: ProviderManager
|
||||
|
||||
@StateObject private var pendingProfile = ObservableProfile()
|
||||
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ import SwiftUI
|
|||
import PassepartoutLibrary
|
||||
|
||||
struct VPNToggle: View {
|
||||
@ObservedObject private var profileManager: Impl.ProfileManager
|
||||
@ObservedObject private var profileManager: ProfileManager
|
||||
|
||||
@ObservedObject private var vpnManager: Impl.VPNManager
|
||||
@ObservedObject private var vpnManager: VPNManager
|
||||
|
||||
@ObservedObject private var currentVPNState: ObservableVPNState
|
||||
|
||||
|
|
@ -113,7 +113,7 @@ struct VPNToggle: View {
|
|||
IntentDispatcher.donateDisableVPN()
|
||||
IntentDispatcher.donateConnection(
|
||||
with: profile,
|
||||
providerManager: Impl.ProviderManager.shared
|
||||
providerManager: ProviderManager.shared
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,15 +36,15 @@ extension UpgradeManager {
|
|||
static let shared = CoreContext.shared.upgradeManager
|
||||
}
|
||||
|
||||
extension Impl.ProfileManager {
|
||||
extension ProfileManager {
|
||||
static let shared = CoreContext.shared.profileManager
|
||||
}
|
||||
|
||||
extension Impl.ProviderManager {
|
||||
extension ProviderManager {
|
||||
static let shared = CoreContext.shared.providerManager
|
||||
}
|
||||
|
||||
extension Impl.VPNManager {
|
||||
extension VPNManager {
|
||||
static let shared = CoreContext.shared.vpnManager
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,14 +27,6 @@ import Foundation
|
|||
import Combine
|
||||
import PassepartoutLibrary
|
||||
|
||||
enum Impl {
|
||||
typealias ProfileManager = DefaultProfileManager
|
||||
|
||||
typealias ProviderManager = DefaultProviderManager
|
||||
|
||||
typealias VPNManager = DefaultVPNManager<DefaultProfileManager>
|
||||
}
|
||||
|
||||
class CoreContext {
|
||||
let store: KeyValueStore
|
||||
|
||||
|
|
@ -52,11 +44,11 @@ class CoreContext {
|
|||
|
||||
let upgradeManager: UpgradeManager
|
||||
|
||||
let providerManager: Impl.ProviderManager
|
||||
let providerManager: ProviderManager
|
||||
|
||||
let profileManager: Impl.ProfileManager
|
||||
let profileManager: ProfileManager
|
||||
|
||||
let vpnManager: Impl.VPNManager
|
||||
let vpnManager: VPNManager
|
||||
|
||||
private var cancellables: Set<AnyCancellable> = []
|
||||
|
||||
|
|
@ -74,7 +66,7 @@ class CoreContext {
|
|||
|
||||
upgradeManager = UpgradeManager(store: store)
|
||||
|
||||
providerManager = DefaultProviderManager(
|
||||
providerManager = ProviderManager(
|
||||
appBuild: Constants.Global.appBuildNumber,
|
||||
bundleServices: DefaultWebServices.bundledServices(
|
||||
withVersion: Constants.Services.version
|
||||
|
|
@ -87,7 +79,7 @@ class CoreContext {
|
|||
persistence: providersPersistence
|
||||
)
|
||||
|
||||
profileManager = DefaultProfileManager(
|
||||
profileManager = ProfileManager(
|
||||
store: store,
|
||||
providerManager: providerManager,
|
||||
appGroup: Constants.App.appGroupId,
|
||||
|
|
@ -105,7 +97,7 @@ class CoreContext {
|
|||
tunnelBundleIdentifier: Constants.App.tunnelBundleId
|
||||
)
|
||||
#endif
|
||||
vpnManager = DefaultVPNManager(
|
||||
vpnManager = VPNManager(
|
||||
appGroup: Constants.App.appGroupId,
|
||||
store: store,
|
||||
profileManager: profileManager,
|
||||
|
|
|
|||
|
|
@ -45,13 +45,6 @@ extension Profile {
|
|||
provider?.name
|
||||
}
|
||||
|
||||
public func providerServer(_ providerManager: ProviderManager) -> ProviderServer? {
|
||||
guard let serverId = provider?.vpnSettings[currentVPNProtocol]?.serverId else {
|
||||
return nil
|
||||
}
|
||||
return providerManager.server(withId: serverId)
|
||||
}
|
||||
|
||||
public func providerServerId() -> String? {
|
||||
return provider?.vpnSettings[currentVPNProtocol]?.serverId
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
//
|
||||
// CurrentProfileProviding.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/22/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public protocol CurrentProfileProviding {
|
||||
associatedtype WrappedType: WrappedProfile
|
||||
|
||||
var currentProfile: WrappedType { get }
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
//
|
||||
// CurrentVPNStateProviding.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/22/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public protocol CurrentVPNStateProviding {
|
||||
associatedtype WrappedType: WrappedVPNState
|
||||
|
||||
var currentState: WrappedType { get }
|
||||
}
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
//
|
||||
// ProfileManager.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/20/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
public protocol ProfileManager {
|
||||
typealias ProfileEx = (profile: Profile, isReady: Bool)
|
||||
|
||||
var activeProfileId: UUID? { get }
|
||||
|
||||
var currentProfileId: UUID? { get set }
|
||||
|
||||
var didUpdateProfiles: PassthroughSubject<Void, Never> { get }
|
||||
|
||||
var didUpdateActiveProfile: PassthroughSubject<UUID?, Never> { get }
|
||||
|
||||
var didCreateProfile: PassthroughSubject<Profile, Never> { get }
|
||||
|
||||
var headers: [Profile.Header] { get }
|
||||
|
||||
var profiles: [Profile] { get }
|
||||
|
||||
func isExistingProfile(withId id: UUID) -> Bool
|
||||
|
||||
func isExistingProfile(withName name: String) -> Bool
|
||||
|
||||
func liveProfileEx(withId id: UUID) throws -> ProfileEx
|
||||
|
||||
func makeProfileReady(_ profile: Profile) async throws
|
||||
|
||||
func saveProfile(_ profile: Profile, isActive: Bool?, updateIfCurrent: Bool)
|
||||
|
||||
func savePassword(forProfile profile: Profile)
|
||||
|
||||
func passwordReference(forProfile profile: Profile) -> Data?
|
||||
|
||||
func removeProfiles(withIds ids: [UUID])
|
||||
|
||||
@available(*, deprecated, message: "only use for testing")
|
||||
func removeAllProfiles()
|
||||
|
||||
func duplicateProfile(withId id: UUID, setAsCurrent: Bool)
|
||||
|
||||
func profile(withHeader header: Profile.Header, fromContents contents: String, originalURL: URL?, passphrase: String?) throws -> Profile
|
||||
|
||||
func persist()
|
||||
|
||||
func observeUpdates()
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
//
|
||||
// ProfileManagerWithCurrentProfile.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/22/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public protocol ProfileManagerWithCurrentProfile: ProfileManager, CurrentProfileProviding {
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
//
|
||||
// ProviderManager.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/19/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
public protocol ProviderManager {
|
||||
var didUpdateProviders: PassthroughSubject<Void, Never> { get }
|
||||
|
||||
func allProviders() -> [ProviderMetadata]
|
||||
|
||||
func provider(withName name: ProviderName) -> ProviderMetadata?
|
||||
|
||||
func isAvailable(_ name: ProviderName, vpnProtocol: VPNProtocolType) -> Bool
|
||||
|
||||
func defaultUsername(_ name: ProviderName, vpnProtocol: VPNProtocolType) -> String?
|
||||
|
||||
func lastUpdate(_ name: ProviderName, vpnProtocol: VPNProtocolType) -> Date?
|
||||
|
||||
func categories(_ name: ProviderName, vpnProtocol: VPNProtocolType) -> [ProviderCategory]
|
||||
|
||||
func servers(forLocation location: ProviderLocation) -> [ProviderServer]
|
||||
|
||||
func server(_ name: ProviderName, vpnProtocol: VPNProtocolType, apiId: String) -> ProviderServer?
|
||||
|
||||
func anyDefaultServer(_ name: ProviderName, vpnProtocol: VPNProtocolType) -> ProviderServer?
|
||||
|
||||
func server(withId id: String) -> ProviderServer?
|
||||
|
||||
func fetchProvidersIndexPublisher(priority: ProviderManagerFetchPriority) -> AnyPublisher<Void, Error>
|
||||
|
||||
func fetchProviderPublisher(
|
||||
withName providerName: ProviderName,
|
||||
vpnProtocol: VPNProtocolType,
|
||||
priority: ProviderManagerFetchPriority
|
||||
) -> AnyPublisher<Void, Error>
|
||||
|
||||
func reset()
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
//
|
||||
// VPNManager.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/22/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
public protocol VPNManager {
|
||||
var lastError: Error? { get }
|
||||
|
||||
var configurationError: PassthroughSubject<VPNConfigurationError, Never> { get }
|
||||
|
||||
var tunnelLogPath: String? { get set }
|
||||
|
||||
var tunnelLogFormat: String? { get set }
|
||||
|
||||
var masksPrivateData: Bool { get set }
|
||||
|
||||
func connectWithActiveProfile(toServer newServerId: String?) async throws
|
||||
|
||||
@discardableResult
|
||||
func connect(with profileId: UUID) async throws -> Profile
|
||||
|
||||
@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
|
||||
|
||||
func uninstall() async
|
||||
|
||||
func serverConfiguration(forProtocol vpnProtocol: VPNProtocolType) -> Any?
|
||||
|
||||
func debugLogURL(forProtocol vpnProtocol: VPNProtocolType) -> URL?
|
||||
|
||||
func observeUpdates()
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
//
|
||||
// VPNManagerWithCurrentState.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 6/22/22.
|
||||
// Copyright (c) 2022 Davide De Rosa. All rights reserved.
|
||||
//
|
||||
// https://github.com/passepartoutvpn
|
||||
//
|
||||
// This file is part of Passepartout.
|
||||
//
|
||||
// Passepartout is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Passepartout is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public protocol VPNManagerWithCurrentState: VPNManager, CurrentVPNStateProviding {
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ import SwiftyBeaver
|
|||
import PassepartoutCore
|
||||
import PassepartoutUtils
|
||||
|
||||
public class UpgradeManager: ObservableObject {
|
||||
public final class UpgradeManager: ObservableObject {
|
||||
|
||||
// MARK: Initialization
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@ extension Profile {
|
|||
}
|
||||
|
||||
extension Profile {
|
||||
public func providerServer(_ providerManager: ProviderManager) -> ProviderServer? {
|
||||
guard let serverId = providerServerId() else {
|
||||
return nil
|
||||
}
|
||||
return providerManager.server(withId: serverId)
|
||||
}
|
||||
|
||||
public func providerOpenVPNSettings(withManager providerManager: ProviderManager) throws -> Profile.OpenVPNSettings {
|
||||
guard isProvider else {
|
||||
fatalError("Not a provider")
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ extension ProfileManager {
|
|||
}
|
||||
}
|
||||
|
||||
extension ProfileManagerWithCurrentProfile {
|
||||
extension ProfileManager {
|
||||
public func isCurrentProfileActive() -> Bool {
|
||||
currentProfile.value.id == activeProfileId
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
import Foundation
|
||||
import Combine
|
||||
import PassepartoutCore
|
||||
import PassepartoutProviders
|
||||
|
||||
extension ProviderManager {
|
||||
public func fetchRemoteProviderPublisher(forProfile profile: Profile) -> AnyPublisher<Void, Error> {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import CoreData
|
|||
import PassepartoutCore
|
||||
import PassepartoutUtils
|
||||
|
||||
public class PersistenceManager {
|
||||
public final class PersistenceManager {
|
||||
private let store: KeyValueStore
|
||||
|
||||
public init(store: KeyValueStore) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultProfileManager+Keychain.swift
|
||||
// ProfileManager+Keychain.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 4/8/22.
|
||||
|
|
@ -28,7 +28,7 @@ import TunnelKitManager
|
|||
import PassepartoutCore
|
||||
import PassepartoutUtils
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
public func savePassword(forProfile profile: Profile) {
|
||||
guard !profile.isPlaceholder else {
|
||||
assertionFailure("Placeholder")
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultProfileManager+Processing.swift
|
||||
// ProfileManager+Processing.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 4/7/22.
|
||||
|
|
@ -28,7 +28,7 @@ import TunnelKitOpenVPN
|
|||
import TunnelKitWireGuard
|
||||
import PassepartoutCore
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
public func profile(withHeader header: Profile.Header, fromContents contents: String, originalURL: URL?, passphrase: String?) throws -> Profile {
|
||||
do {
|
||||
let ovpn = try OpenVPN.ConfigurationParser.parsed(fromContents: contents, passphrase: passphrase, originalURL: originalURL)
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultProfileManager.swift
|
||||
// ProfileManager.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 2/25/22.
|
||||
|
|
@ -27,11 +27,12 @@ import Foundation
|
|||
import Combine
|
||||
import TunnelKitManager
|
||||
import PassepartoutCore
|
||||
import PassepartoutCore
|
||||
import PassepartoutUtils
|
||||
import PassepartoutProviders
|
||||
|
||||
public final class ProfileManager: ObservableObject {
|
||||
public typealias ProfileEx = (profile: Profile, isReady: Bool)
|
||||
|
||||
public class DefaultProfileManager: ProfileManagerWithCurrentProfile, ObservableObject {
|
||||
|
||||
// MARK: Initialization
|
||||
|
||||
private let store: KeyValueStore
|
||||
|
|
@ -46,7 +47,7 @@ public class DefaultProfileManager: ProfileManagerWithCurrentProfile, Observable
|
|||
|
||||
private let strategy: ProfileManagerStrategy
|
||||
|
||||
// MARK: Observables
|
||||
// MARK: State
|
||||
|
||||
@Published private var internalActiveProfileId: UUID? {
|
||||
willSet {
|
||||
|
|
@ -110,7 +111,7 @@ public class DefaultProfileManager: ProfileManagerWithCurrentProfile, Observable
|
|||
|
||||
// MARK: Index
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
private var allHeaders: [UUID: Profile.Header] {
|
||||
strategy.allHeaders
|
||||
}
|
||||
|
|
@ -136,7 +137,7 @@ extension DefaultProfileManager {
|
|||
|
||||
// MARK: Profiles
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
public func liveProfileEx(withId id: UUID) throws -> ProfileEx {
|
||||
guard let profile = liveProfile(withId: id) else {
|
||||
pp_log.error("Profile not found: \(id)")
|
||||
|
|
@ -249,7 +250,7 @@ extension DefaultProfileManager {
|
|||
|
||||
// MARK: Observation
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
private func setCurrentProfile(_ profile: Profile) {
|
||||
guard !currentProfile.isLoading else {
|
||||
pp_log.warning("Already loading another profile")
|
||||
|
|
@ -300,7 +301,7 @@ extension DefaultProfileManager {
|
|||
}
|
||||
}
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
public func observeUpdates() {
|
||||
$internalActiveProfileId
|
||||
.sink {
|
||||
|
|
@ -393,7 +394,7 @@ extension DefaultProfileManager {
|
|||
|
||||
// MARK: Readiness
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
private func isProfileReady(_ profile: Profile) -> Bool {
|
||||
isProfileProviderAvailable(profile)
|
||||
}
|
||||
|
|
@ -433,7 +434,7 @@ extension DefaultProfileManager {
|
|||
|
||||
// MARK: KeyValueStore
|
||||
|
||||
extension DefaultProfileManager {
|
||||
extension ProfileManager {
|
||||
public private(set) var activeProfileId: UUID? {
|
||||
get {
|
||||
guard let idString: String = store.value(forLocation: StoreKey.activeProfileId) else {
|
||||
|
|
@ -459,7 +460,7 @@ extension DefaultProfileManager {
|
|||
}
|
||||
}
|
||||
|
||||
private extension DefaultProfileManager {
|
||||
private extension ProfileManager {
|
||||
private enum StoreKey: String, KeyStoreDomainLocation {
|
||||
case activeProfileId
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ import PassepartoutCore
|
|||
import PassepartoutServices
|
||||
import PassepartoutUtils
|
||||
|
||||
public class DefaultProviderManager: ProviderManager, ObservableObject, RateLimited {
|
||||
public final class ProviderManager: ObservableObject, RateLimited {
|
||||
private let appBuild: Int
|
||||
|
||||
private let bundleServices: WebServices
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultVPNManager+Actions.swift
|
||||
// VPNManager+Actions.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 3/30/22.
|
||||
|
|
@ -31,7 +31,7 @@ import PassepartoutUtils
|
|||
// current profile, this must be updated too. this is done in
|
||||
// ProfileManager.activateProfile()
|
||||
|
||||
extension DefaultVPNManager {
|
||||
extension VPNManager {
|
||||
public func connectWithActiveProfile(toServer newServerId: String?) async throws {
|
||||
guard currentState.vpnStatus != .connected else {
|
||||
pp_log.warning("VPN is already connected")
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultVPNManager+Configuration.swift
|
||||
// VPNManager+Configuration.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 3/12/22.
|
||||
|
|
@ -27,7 +27,7 @@ import Foundation
|
|||
import PassepartoutCore
|
||||
import PassepartoutUtils
|
||||
|
||||
extension DefaultVPNManager {
|
||||
extension VPNManager {
|
||||
private var vpnPreferences: VPNPreferences {
|
||||
DefaultVPNPreferences(
|
||||
tunnelLogPath: tunnelLogPath,
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// DefaultVPNManager.swift
|
||||
// VPNManager.swift
|
||||
// Passepartout
|
||||
//
|
||||
// Created by Davide De Rosa on 2/9/22.
|
||||
|
|
@ -29,9 +29,10 @@ import TunnelKitCore
|
|||
import TunnelKitManager
|
||||
import PassepartoutCore
|
||||
import PassepartoutProfiles
|
||||
import PassepartoutProviders
|
||||
import PassepartoutUtils
|
||||
|
||||
public class DefaultVPNManager<ProfileManagerType: ProfileManagerWithCurrentProfile>: VPNManagerWithCurrentState, ObservableObject where ProfileManagerType.WrappedType == ObservableProfile {
|
||||
public final class VPNManager: ObservableObject {
|
||||
|
||||
// MARK: Initialization
|
||||
|
||||
|
|
@ -39,7 +40,7 @@ public class DefaultVPNManager<ProfileManagerType: ProfileManagerWithCurrentProf
|
|||
|
||||
private let store: KeyValueStore
|
||||
|
||||
let profileManager: ProfileManagerType
|
||||
let profileManager: ProfileManager
|
||||
|
||||
let providerManager: ProviderManager
|
||||
|
||||
|
|
@ -73,7 +74,7 @@ public class DefaultVPNManager<ProfileManagerType: ProfileManagerWithCurrentProf
|
|||
public init(
|
||||
appGroup: String,
|
||||
store: KeyValueStore,
|
||||
profileManager: ProfileManagerType,
|
||||
profileManager: ProfileManager,
|
||||
providerManager: ProviderManager,
|
||||
strategy: VPNManagerStrategy
|
||||
) {
|
||||
|
|
@ -138,7 +139,7 @@ public class DefaultVPNManager<ProfileManagerType: ProfileManagerWithCurrentProf
|
|||
|
||||
// MARK: Observation
|
||||
|
||||
extension DefaultVPNManager {
|
||||
extension VPNManager {
|
||||
public func observeUpdates() {
|
||||
observeStrategy()
|
||||
observeProfileManager()
|
||||
|
|
@ -252,7 +253,7 @@ extension DefaultVPNManager {
|
|||
|
||||
// MARK: KeyValueStore
|
||||
|
||||
extension DefaultVPNManager {
|
||||
extension VPNManager {
|
||||
public var tunnelLogPath: String? {
|
||||
get {
|
||||
store.value(forLocation: StoreKey.tunnelLogPath)
|
||||
|
|
@ -283,7 +284,7 @@ extension DefaultVPNManager {
|
|||
}
|
||||
}
|
||||
|
||||
private extension DefaultVPNManager {
|
||||
private extension VPNManager {
|
||||
private enum StoreKey: String, KeyStoreDomainLocation {
|
||||
case tunnelLogPath
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ class ProvidersTests: XCTestCase {
|
|||
override func setUp() {
|
||||
pp_log.addDestination(ConsoleDestination())
|
||||
|
||||
manager = DefaultProviderManager(
|
||||
manager = ProviderManager(
|
||||
appBuild: 10000,
|
||||
bundleServices: DefaultWebServices.bundledServices(withVersion: "v5"),
|
||||
webServices: DefaultWebServices("v5", URL(string: "https://passepartoutvpn.app/api/")!, timeout: nil),
|
||||
|
|
@ -133,7 +133,7 @@ class ProvidersTests: XCTestCase {
|
|||
vpnProtocol: .openVPN,
|
||||
categoryName: "",
|
||||
countryCode: "ES",
|
||||
onlyServer: nil
|
||||
servers: nil
|
||||
)
|
||||
|
||||
let servers = manager.servers(forLocation: location)
|
||||
|
|
|
|||
Loading…
Reference in New Issue