Add iOS 18 control widget

SagerNet · Jun 19, 2024 · d60b2b5 · d60b2b5
1 parent 75a79c9
commit d60b2b5
Show file tree

Hide file tree

Showing 13 changed files with 321 additions and 223 deletions.
diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
@@ -111,6 +111,7 @@ public struct ActiveDashboardView: View {
         }
     }
 
+    @available(iOS 16.0, *)
     @ViewBuilder
     private var content1: some View {
         TabView(selection: $selection) {

diff --git a/Library/Network/CommandClient.swift b/Library/Network/CommandClient.swift
@@ -107,7 +107,12 @@ public class CommandClient: ObservableObject {
         case .connections:
             clientOptions.command = LibboxCommandConnections
         }
-        clientOptions.statusInterval = Int64(2 * NSEC_PER_SEC)
+        switch connectionType {
+        case .log:
+            clientOptions.statusInterval = Int64(500 * NSEC_PER_MSEC)
+        default:
+            clientOptions.statusInterval = Int64(2 * NSEC_PER_SEC)
+        }
         let client = LibboxNewCommandClient(clientHandler(self), clientOptions)!
         do {
             for i in 0 ..< 10 {
@@ -152,21 +157,23 @@ public class CommandClient: ObservableObject {
             }
         }
 
-        func clearLog() {
+        func clearLogs() {
             DispatchQueue.main.async { [self] in
                 commandClient.logList.removeAll()
             }
         }
 
-        func writeLog(_ message: String?) {
-            guard let message else {
+        func writeLogs(_ messageList: (any LibboxStringIteratorProtocol)?) {
+            guard let messageList else {
                 return
             }
             DispatchQueue.main.async { [self] in
-                if commandClient.logList.count > commandClient.logMaxLines {
-                    commandClient.logList.removeFirst()
+                if commandClient.logList.count >= commandClient.logMaxLines {
+                    commandClient.logList.removeSubrange(0 ..< Int(messageList.len()))
+                }
+                while messageList.hasNext() {
+                    commandClient.logList.append(messageList.next())
                 }
-                commandClient.logList.append(message)
             }
         }
 

diff --git a/Library/Network/ExtensionProfile.swift b/Library/Network/ExtensionProfile.swift
@@ -3,6 +3,8 @@ import Libbox
 import NetworkExtension
 
 public class ExtensionProfile: ObservableObject {
+    public static let controlKind = "io.nekohasekai.sfa.widget.ServiceToggle"
+
     private let manager: NEVPNManager
     private var connection: NEVPNConnection
     private var observer: Any?

diff --git a/Library/Network/ExtensionProvider.swift b/Library/Network/ExtensionProvider.swift
@@ -1,6 +1,9 @@
 import Foundation
 import Libbox
 import NetworkExtension
+#if os(iOS)
+    import WidgetKit
+#endif
 
 open class ExtensionProvider: NEPacketTunnelProvider {
     public var username: String? = nil
@@ -48,13 +51,16 @@ open class ExtensionProvider: NEPacketTunnelProvider {
         }
         writeMessage("(packet-tunnel): Here I stand")
         await startService()
+        #if os(iOS)
+            if #available(iOS 18.0, *) {
+                ControlCenter.shared.reloadControls(ofKind: ExtensionProfile.controlKind)
+            }
+        #endif
     }
 
     func writeMessage(_ message: String) {
         if let commandServer {
             commandServer.writeMessage(message)
-        } else {
-            NSLog(message)
         }
     }
 
@@ -153,6 +159,11 @@ open class ExtensionProvider: NEPacketTunnelProvider {
                 await SharedPreferences.startedByUser.set(reason == .userInitiated)
             }
         #endif
+        #if os(iOS)
+            if #available(iOS 18.0, *) {
+                ControlCenter.shared.reloadControls(ofKind: ExtensionProfile.controlKind)
+            }
+        #endif
     }
 
     override open func handleAppMessage(_ messageData: Data) async -> Data? {

diff --git a/Library/Network/NEVPNStatus+isConnected.swift b/Library/Network/NEVPNStatus+isConnected.swift
@@ -4,7 +4,16 @@ import NetworkExtension
 public extension NEVPNStatus {
     var isEnabled: Bool {
         switch self {
-        case .connected, .disconnected, .reasserting:
+        case .connecting, .connected, .disconnected, .reasserting:
+            return true
+        default:
+            return false
+        }
+    }
+
+    var isStarted: Bool {
+        switch self {
+        case .connecting, .connected, .reasserting:
             return true
         default:
             return false

diff --git a/WidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json b/WidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -4,6 +4,28 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {

diff --git a/WidgetExtension/WidgetExtensionBundle.swift → WidgetExtension/ExtensionBundle.swift b/WidgetExtension/WidgetExtensionBundle.swift → WidgetExtension/ExtensionBundle.swift
@@ -2,8 +2,8 @@ import SwiftUI
 import WidgetKit
 
 @main
-struct WidgetExtensionBundle: WidgetBundle {
+struct ExtensionBundle: WidgetBundle {
     var body: some Widget {
-        WidgetExtension()
+        ServiceToggleControl()
     }
 }
diff --git a/WidgetExtension/Intents.swift b/WidgetExtension/Intents.swift
diff --git a/WidgetExtension/ServiceToggleControl.swift b/WidgetExtension/ServiceToggleControl.swift
@@ -0,0 +1,66 @@
+import AppIntents
+import Library
+import SwiftUI
+import WidgetKit
+
+struct ServiceToggleControl: ControlWidget {
+    var body: some ControlWidgetConfiguration {
+        StaticControlConfiguration(
+            kind: ExtensionProfile.controlKind,
+            provider: Provider()
+        ) { value in
+            ControlWidgetToggle(
+                "sing-box",
+                isOn: value,
+                action: ToggleServiceIntent()
+            ) { isOn in
+                Label(isOn ? "Running" : "Stopped", systemImage: "shippingbox.fill")
+            }
+            .tint(.init(red: CGFloat(Double(69) / 255), green: CGFloat(Double(90) / 255), blue: CGFloat(Double(100) / 255)))
+        }
+        .displayName("Toggle")
+        .description("Start or stop sing-box service.")
+    }
+}
+
+extension ServiceToggleControl {
+    struct Provider: ControlValueProvider {
+        var previewValue: Bool {
+            false
+        }
+
+        func currentValue() async throws -> Bool {
+            guard let extensionProfile = try await (ExtensionProfile.load()) else {
+                return false
+            }
+            return extensionProfile.status.isStarted
+        }
+    }
+}
+
+struct ToggleServiceIntent: SetValueIntent {
+    static var title: LocalizedStringResource = "Toggle sing-box"
+
+    static var description =
+        IntentDescription("Toggle sing-box service")
+
+    static var parameterSummary: some ParameterSummary {
+        Summary("Toggle sing-box service")
+    }
+
+    @Parameter(title: "Service status")
+    var value: Bool
+
+    func perform() async throws -> some IntentResult & ReturnsValue<Bool> {
+        guard let extensionProfile = try await (ExtensionProfile.load()) else {
+            return .result(value: false)
+        }
+        if value {
+            try await extensionProfile.start()
+            return .result(value: true)
+        } else {
+            try await extensionProfile.stop()
+            return .result(value: false)
+        }
+    }
+}
diff --git a/WidgetExtension/WidgetExtension.swift b/WidgetExtension/WidgetExtension.swift
diff --git a/WidgetExtension/WidgetExtension.entitlements → WidgetExtensionExtension.entitlements b/WidgetExtension/WidgetExtension.entitlements → WidgetExtensionExtension.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.sagernet.sfa</string>
+		<string>group.io.nekohasekai.sfa</string>
 	</array>
 </dict>
 </plist>