Add system proxy toggle

Library/Network/ExtensionPlatformInterface.swift

@@ -2,14 +2,12 @@ import Foundation
 import Libbox
 import NetworkExtension
 
-public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol {
-    private let tunnel: NEPacketTunnelProvider
-    private let commandServer: LibboxCommandServer
+public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol, LibboxCommandServerHandlerProtocol {
+    private let tunnel: ExtensionProvider
     private var networkSettings: NEPacketTunnelNetworkSettings?
 
-    init(_ tunnel: NEPacketTunnelProvider, _ logServer: LibboxCommandServer) {
+    init(_ tunnel: ExtensionProvider) {
         self.tunnel = tunnel
-        commandServer = logServer
     }
 
     public func openTun(_ options: LibboxTunOptionsProtocol?, ret0_: UnsafeMutablePointer<Int32>?) throws {
@@ -82,10 +80,12 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
         if options.isHTTPProxyEnabled() {
             let proxySettings = NEProxySettings()
             let proxyServer = NEProxyServer(address: options.getHTTPProxyServer(), port: Int(options.getHTTPProxyServerPort()))
-            proxySettings.httpEnabled = true
             proxySettings.httpServer = proxyServer
-            proxySettings.httpsEnabled = true
             proxySettings.httpsServer = proxyServer
+            if SharedPreferences.systemProxyEnabled {
+                proxySettings.httpEnabled = true
+                proxySettings.httpsEnabled = true
+            }
             settings.proxySettings = proxySettings
         }
 
@@ -133,7 +133,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
         guard let message else {
             return
         }
-        commandServer.writeMessage(message)
+        tunnel.writeMessage(message)
     }
 
     public func usePlatformDefaultInterfaceMonitor() -> Bool {
@@ -167,4 +167,45 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
         }
         tunnel.reasserting = false
     }
+
+    public func serviceReload() throws {
+        tunnel.reloadService()
+    }
+
+    public func getSystemProxyStatus() -> LibboxSystemProxyStatus? {
+        let status = LibboxSystemProxyStatus()
+        guard let networkSettings else {
+            return status
+        }
+        guard let proxySettings = networkSettings.proxySettings else {
+            return status
+        }
+        if proxySettings.httpServer == nil {
+            return status
+        }
+        status.available = true
+        status.enabled = proxySettings.httpEnabled
+        return status
+    }
+
+    public func setSystemProxyEnabled(_ isEnabled: Bool) throws {
+        guard let networkSettings else {
+            return
+        }
+        guard let proxySettings = networkSettings.proxySettings else {
+            return
+        }
+        if proxySettings.httpServer == nil {
+            return
+        }
+        if proxySettings.httpEnabled == isEnabled {
+            return
+        }
+        proxySettings.httpEnabled = isEnabled
+        proxySettings.httpsEnabled = isEnabled
+        networkSettings.proxySettings = proxySettings
+        try runBlocking {
+            try await self.tunnel.setTunnelNetworkSettings(networkSettings)
+        }
+    }
 }

Library/Network/ExtensionProvider.swift

@@ -8,6 +8,9 @@ open class ExtensionProvider: NEPacketTunnelProvider {
     public var username: String? = nil
     private var commandServer: LibboxCommandServer!
     private var boxService: LibboxBoxService!
+    private var systemProxyAvailable = false
+    private var systemProxyEnabled = false
+    private var platformInterface: ExtensionPlatformInterface!
 
     override open func startTunnel(options _: [String: NSObject]?) async throws {
         NSLog("Here I am")
@@ -44,7 +47,10 @@ open class ExtensionProvider: NEPacketTunnelProvider {
 
         LibboxSetMemoryLimit(!SharedPreferences.disableMemoryLimit)
 
-        commandServer = LibboxNewCommandServer(serverInterface(self), Int32(SharedPreferences.maxLogLines))
+        if platformInterface == nil {
+            platformInterface = ExtensionPlatformInterface(self)
+        }
+        commandServer = LibboxNewCommandServer(platformInterface, Int32(SharedPreferences.maxLogLines))
         do {
             try commandServer.start()
         } catch {
@@ -56,7 +62,7 @@ open class ExtensionProvider: NEPacketTunnelProvider {
         startService()
     }
 
-    private func writeMessage(_ message: String) {
+    func writeMessage(_ message: String) {
         if let commandServer {
             commandServer.writeMessage(message)
         } else {
@@ -64,7 +70,7 @@ open class ExtensionProvider: NEPacketTunnelProvider {
         }
     }
 
-    private func writeError(_ message: String) {
+    func writeError(_ message: String) {
         writeMessage(message)
         try? message.write(to: ExtensionProvider.errorFile, atomically: true, encoding: .utf8)
     }
@@ -97,7 +103,7 @@ open class ExtensionProvider: NEPacketTunnelProvider {
             return
         }
         var error: NSError?
-        let service = LibboxNewService(configContent, ExtensionPlatformInterface(self, commandServer), &error)
+        let service = LibboxNewService(configContent, platformInterface, &error)
         if let error {
             writeError("(packet-tunnel) error: create service: \(error.localizedDescription)")
             return
@@ -132,7 +138,7 @@ open class ExtensionProvider: NEPacketTunnelProvider {
         }
     }
 
-    private func reloadService() {
+    func reloadService() {
         writeMessage("(packet-tunnel) reloading service")
         reasserting = true
         defer {
@@ -172,22 +178,4 @@ open class ExtensionProvider: NEPacketTunnelProvider {
             boxService.wake()
         }
     }
-
-    private class serverInterface: NSObject, LibboxCommandServerHandlerProtocol {
-        unowned let tunnel: ExtensionProvider
-
-        init(_ tunnel: ExtensionProvider) {
-            self.tunnel = tunnel
-            super.init()
-        }
-
-        func serviceReload() throws {
-            tunnel.reloadService()
-        }
-
-        func serviceStop() throws {
-            tunnel.stopService()
-            tunnel.writeMessage("(packet-tunnel) debug: service stopped")
-        }
-    }
 }