Moving MullvadTransport into MullvadREST

mullvad · Dec 11, 2023 · fa4bc70 · fa4bc70
1 parent fef5f92
commit fa4bc70
Show file tree

Hide file tree

Showing 39 changed files with 76 additions and 575 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 resolver = "2"
 members = [
     "android/translations-converter",
-    "ios/MullvadTransport/shadowsocks-proxy",
+    "ios/MullvadREST/shadowsocks-proxy",
     "ios/TunnelObfuscation/tunnel-obfuscator-proxy",
     "mullvad-daemon",
     "mullvad-cli",

diff --git a/ios/RelaySelector/Haversine.swift → ios/MullvadREST/Haversine.swift b/ios/RelaySelector/Haversine.swift → ios/MullvadREST/Haversine.swift
diff --git a/ios/RelaySelector/Midpoint.swift → ios/MullvadREST/Midpoint.swift b/ios/RelaySelector/Midpoint.swift → ios/MullvadREST/Midpoint.swift
diff --git a/ios/RelaySelector/RelaySelector.swift → ios/MullvadREST/RelaySelector.swift b/ios/RelaySelector/RelaySelector.swift → ios/MullvadREST/RelaySelector.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MullvadREST
 import MullvadTypes
 
 private let defaultPort: UInt16 = 53

diff --git a/ios/MullvadTransport/ShadowSocksProxy.swift → ios/MullvadREST/ShadowSocksProxy.swift b/ios/MullvadTransport/ShadowSocksProxy.swift → ios/MullvadREST/ShadowSocksProxy.swift
diff --git a/...dTransport/ShadowsocksConfiguration.swift → ...ullvadREST/ShadowsocksConfiguration.swift b/...dTransport/ShadowsocksConfiguration.swift → ...ullvadREST/ShadowsocksConfiguration.swift
diff --git a/...sport/ShadowsocksConfigurationCache.swift → ...dREST/ShadowsocksConfigurationCache.swift b/...sport/ShadowsocksConfigurationCache.swift → ...dREST/ShadowsocksConfigurationCache.swift
diff --git a/ios/MullvadTransport/TransportProvider.swift → ios/MullvadREST/TransportProvider.swift b/ios/MullvadTransport/TransportProvider.swift → ios/MullvadREST/TransportProvider.swift
@@ -8,12 +8,10 @@
 
 import Foundation
 import Logging
-import MullvadREST
 import MullvadTypes
-import RelaySelector
 
 public final class TransportProvider: RESTTransportProvider {
-    private let urlSessionTransport: URLSessionTransport
+    private let urlSessionTransport: REST.URLSessionTransport
     private let relayCache: RelayCacheProtocol
     private let logger = Logger(label: "TransportProvider")
     private let addressCache: REST.AddressCache
@@ -26,7 +24,7 @@ public final class TransportProvider: RESTTransportProvider {
     private let constraintsUpdater: RelayConstraintsUpdater
 
     public init(
-        urlSessionTransport: URLSessionTransport,
+        urlSessionTransport: REST.URLSessionTransport,
         relayCache: RelayCacheProtocol,
         addressCache: REST.AddressCache,
         shadowsocksCache: ShadowsocksConfigurationCache,

diff --git a/...port/URLSessionShadowsocksTransport.swift → ...REST/URLSessionShadowsocksTransport.swift b/...port/URLSessionShadowsocksTransport.swift → ...REST/URLSessionShadowsocksTransport.swift
diff --git a/...MullvadTransport/module.private.modulemap → ios/MullvadREST/module.private.modulemap b/...MullvadTransport/module.private.modulemap → ios/MullvadREST/module.private.modulemap
diff --git a/...vadTransport/shadowsocks-proxy/.gitignore → ios/MullvadREST/shadowsocks-proxy/.gitignore b/...vadTransport/shadowsocks-proxy/.gitignore → ios/MullvadREST/shadowsocks-proxy/.gitignore
diff --git a/...vadTransport/shadowsocks-proxy/Cargo.toml → ios/MullvadREST/shadowsocks-proxy/Cargo.toml b/...vadTransport/shadowsocks-proxy/Cargo.toml → ios/MullvadREST/shadowsocks-proxy/Cargo.toml
diff --git a/...llvadTransport/shadowsocks-proxy/build.rs → ios/MullvadREST/shadowsocks-proxy/build.rs b/...llvadTransport/shadowsocks-proxy/build.rs → ios/MullvadREST/shadowsocks-proxy/build.rs
diff --git a/...t/shadowsocks-proxy/include/shadowsocks.h → ...T/shadowsocks-proxy/include/shadowsocks.h b/...t/shadowsocks-proxy/include/shadowsocks.h → ...T/shadowsocks-proxy/include/shadowsocks.h
diff --git a/...ransport/shadowsocks-proxy/src/bin/run.rs → ...lvadREST/shadowsocks-proxy/src/bin/run.rs b/...ransport/shadowsocks-proxy/src/bin/run.rs → ...lvadREST/shadowsocks-proxy/src/bin/run.rs
diff --git a/...t/shadowsocks-proxy/src/bin/run_unsafe.rs → ...T/shadowsocks-proxy/src/bin/run_unsafe.rs b/...t/shadowsocks-proxy/src/bin/run_unsafe.rs → ...T/shadowsocks-proxy/src/bin/run_unsafe.rs
diff --git a/...vadTransport/shadowsocks-proxy/src/ffi.rs → ios/MullvadREST/shadowsocks-proxy/src/ffi.rs b/...vadTransport/shadowsocks-proxy/src/ffi.rs → ios/MullvadREST/shadowsocks-proxy/src/ffi.rs
diff --git a/...vadTransport/shadowsocks-proxy/src/lib.rs → ios/MullvadREST/shadowsocks-proxy/src/lib.rs b/...vadTransport/shadowsocks-proxy/src/lib.rs → ios/MullvadREST/shadowsocks-proxy/src/lib.rs
diff --git a/ios/MullvadTransport/Info.plist b/ios/MullvadTransport/Info.plist
diff --git a/ios/MullvadTransport/MullvadTransport.h b/ios/MullvadTransport/MullvadTransport.h
diff --git a/ios/MullvadTransport/URLSessionTransport.swift b/ios/MullvadTransport/URLSessionTransport.swift
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme
diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
@@ -10,7 +10,6 @@ import BackgroundTasks
 import MullvadLogging
 import MullvadREST
 import MullvadSettings
-import MullvadTransport
 import MullvadTypes
 import Operations
 import StoreKit
@@ -84,7 +83,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             transactionLog: .default
         )
 
-        let urlSessionTransport = URLSessionTransport(urlSession: REST.makeURLSession())
+        let urlSessionTransport = REST.URLSessionTransport(urlSession: REST.makeURLSession())
         let shadowsocksCache = ShadowsocksConfigurationCache(cacheDirectory: containerURL)
 
         // This init cannot fail as long as the security group identifier is valid

diff --git a/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift
@@ -12,11 +12,9 @@ import Foundation
 import MullvadLogging
 import MullvadREST
 import MullvadSettings
-import MullvadTransport
 import MullvadTypes
 import NetworkExtension
 import PacketTunnelCore
-import RelaySelector
 
 final class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
     private var observedState: ObservedState = .disconnected

diff --git a/ios/MullvadVPN/TransportMonitor/PacketTunnelTransport.swift b/ios/MullvadVPN/TransportMonitor/PacketTunnelTransport.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import MullvadREST
-import MullvadTransport
 import MullvadTypes
 import Operations
 import PacketTunnelCore

diff --git a/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift b/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift
@@ -9,9 +9,7 @@
 import Foundation
 import MullvadLogging
 import MullvadREST
-import MullvadTransport
 import MullvadTypes
-import RelaySelector
 
 final class TransportMonitor: RESTTransportProvider {
     private let tunnelManager: TunnelManager

diff --git a/ios/MullvadVPN/TunnelManager/StartTunnelOperation.swift b/ios/MullvadVPN/TunnelManager/StartTunnelOperation.swift
@@ -12,7 +12,6 @@ import NetworkExtension
 import Operations
 import PacketTunnelCore
 import MullvadREST
-import RelaySelector
 
 class StartTunnelOperation: ResultOperation<Void> {
     typealias EncodeErrorHandler = (Error) -> Void

diff --git a/ios/MullvadVPN/TunnelManager/Tunnel+Messaging.swift b/ios/MullvadVPN/TunnelManager/Tunnel+Messaging.swift
@@ -11,7 +11,6 @@ import MullvadREST
 import MullvadTypes
 import Operations
 import PacketTunnelCore
-import RelaySelector
 
 /// Shared operation queue used for IPC requests.
 private let operationQueue = AsyncOperationQueue()

diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -14,7 +14,6 @@ import MullvadTypes
 import NetworkExtension
 import Operations
 import PacketTunnelCore
-import RelaySelector
 import StoreKit
 import UIKit
 import WireGuardKitTypes

diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift
@@ -8,7 +8,6 @@
 
 import MullvadREST
 import MullvadTypes
-import RelaySelector
 import UIKit
 
 protocol LocationDataSourceItemProtocol {

diff --git a/ios/MullvadVPNTests/CoordinatesTests.swift b/ios/MullvadVPNTests/CoordinatesTests.swift
@@ -7,7 +7,7 @@
 //
 
 import CoreLocation
-@testable import RelaySelector
+@testable import MullvadREST
 import XCTest
 
 final class CoordinatesTests: XCTestCase {

diff --git a/ios/MullvadVPNTests/RelayCacheTests.swift b/ios/MullvadVPNTests/RelayCacheTests.swift
@@ -7,7 +7,6 @@
 //
 
 @testable import MullvadREST
-import MullvadTransport
 import XCTest
 
 final class RelayCacheTests: XCTestCase {

diff --git a/ios/MullvadVPNTests/RelaySelectorTests.swift b/ios/MullvadVPNTests/RelaySelectorTests.swift
@@ -9,7 +9,6 @@
 @testable import MullvadREST
 import MullvadTypes
 import Network
-import RelaySelector
 import XCTest
 
 private let portRanges: [[UInt16]] = [[4000, 4001], [5000, 5001]]

diff --git a/ios/PacketTunnel/PacketTunnelProvider/BlockedStateErrorMapper.swift b/ios/PacketTunnel/PacketTunnelProvider/BlockedStateErrorMapper.swift
@@ -11,7 +11,6 @@ import MullvadREST
 import MullvadSettings
 import MullvadTypes
 import PacketTunnelCore
-import RelaySelector
 import WireGuardKit
 
 /**

diff --git a/ios/PacketTunnel/PacketTunnelProvider/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider/PacketTunnelProvider.swift
@@ -9,7 +9,6 @@
 import Foundation
 import MullvadLogging
 import MullvadREST
-import MullvadTransport
 import MullvadTypes
 import NetworkExtension
 import PacketTunnelCore
@@ -37,7 +36,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         let relayCache = RelayCache(cacheDirectory: containerURL)
 
         let urlSession = REST.makeURLSession()
-        let urlSessionTransport = URLSessionTransport(urlSession: urlSession)
+        let urlSessionTransport = REST.URLSessionTransport(urlSession: urlSession)
         let shadowsocksCache = ShadowsocksConfigurationCache(cacheDirectory: containerURL)
 
         // This init cannot fail as long as the security group identifier is valid

diff --git a/ios/PacketTunnel/PacketTunnelProvider/RelaySelectorWrapper.swift b/ios/PacketTunnel/PacketTunnelProvider/RelaySelectorWrapper.swift
@@ -10,7 +10,6 @@ import Foundation
 import MullvadTypes
 import PacketTunnelCore
 import MullvadREST
-import RelaySelector
 
 struct RelaySelectorWrapper: RelaySelectorProtocol {
     let relayCache: RelayCache

diff --git a/ios/PacketTunnelCoreTests/AppMessageHandlerTests.swift b/ios/PacketTunnelCoreTests/AppMessageHandlerTests.swift
@@ -10,7 +10,6 @@ import Combine
 @testable import MullvadREST
 import MullvadTypes
 import PacketTunnelCore
-import RelaySelector
 import XCTest
 
 final class AppMessageHandlerTests: XCTestCase {

diff --git a/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift b/ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift
@@ -11,7 +11,7 @@ import Combine
 import MullvadTypes
 import Network
 @testable import PacketTunnelCore
-@testable import RelaySelector
+@testable import MullvadREST
 import WireGuardKitTypes
 import XCTest