Add remote control

Author: nekohasekai

ApplicationLibrary/Views/Abstract/GlobalChecksModifier.swift

@@ -72,6 +72,13 @@ public struct GlobalChecksModifier: ViewModifier {
             .onChangeCompat(of: importRemoteProfile.wrappedValue) { _ in
                 Task { @MainActor in handleImportRemoteProfile() }
             }
+            .onReceive(environments.$remoteControlAlert) { alertState in
+                guard let alertState else { return }
+                Task { @MainActor in
+                    environments.remoteControlAlert = nil
+                    alert = alertState
+                }
+            }
             .background {
                 if let profile = environments.extensionProfile {
                     ProfileStatusObserver(profile: profile, onChange: handleStatusChange)

ApplicationLibrary/Views/Connections/ConnectionListViewModel.swift

@@ -88,7 +88,7 @@ public class ConnectionListViewModel: BaseViewModel {
 
     public func closeAllConnections() {
         do {
-            try LibboxNewStandaloneCommandClient()!.closeConnections()
+            try CommandTarget.standaloneClient().closeConnections()
         } catch {
             alert = AlertState(action: "close all connections", error: error)
         }

ApplicationLibrary/Views/Connections/ConnectionView.swift

@@ -1,4 +1,5 @@
 import Libbox
+import Library
 import SwiftUI
 
 @MainActor
@@ -119,7 +120,7 @@ public struct ConnectionView: View {
 
     private nonisolated func closeConnection() async {
         do {
-            try await LibboxNewStandaloneCommandClient()!.closeConnection(connection.id)
+            try await CommandTarget.standaloneClient().closeConnection(connection.id)
         } catch {
             await MainActor.run {
                 alert = AlertState(action: "close connection", error: error)

ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift

@@ -8,21 +8,17 @@ import SwiftUI
     @EnvironmentObject private var environments: ExtensionEnvironments
     @EnvironmentObject private var profile: ExtensionProfile
     @ObservedObject private var coordinator: DashboardViewModel
-    @StateObject private var cardConfiguration = DashboardCardConfiguration()
-    #if os(iOS) || os(tvOS)
-        @State private var showCardManagement = false
-    #endif
+    @ObservedObject private var cardConfiguration: DashboardCardConfiguration
     #if os(tvOS)
+        @State private var showCardManagement = false
         @State private var showGroups = false
         @State private var showConnections = false
         @State private var buttonState = ButtonVisibilityState()
     #endif
-    #if os(macOS)
-        @Environment(\.cardConfigurationVersion) private var cardConfigurationVersion
-    #endif
 
-    public init(coordinator: DashboardViewModel) {
+    public init(coordinator: DashboardViewModel, cardConfiguration: DashboardCardConfiguration) {
         _coordinator = ObservedObject(wrappedValue: coordinator)
+        _cardConfiguration = ObservedObject(wrappedValue: cardConfiguration)
     }
 
     public var body: some View {
@@ -62,11 +58,20 @@ import SwiftUI
         Group {
             overviewPage
         }
-        #if os(iOS) || os(tvOS)
+        #if os(tvOS)
         .toolbar {
-            toolbar
+            ToolbarItemGroup(placement: .topBarLeading) {
+                navigationButtons
+            }
+            ToolbarItemGroup(placement: .topBarTrailing) {
+                Button {
+                    showCardManagement = true
+                } label: {
+                    Image(systemName: "square.grid.2x2")
+                }
+                StartStopButton()
+            }
         }
-            #if os(tvOS)
         .navigationDestination(isPresented: $showGroups) {
             GroupListView()
                 .navigationTitle("Groups")
@@ -96,58 +101,42 @@ import SwiftUI
                 }
             }
         }
-            #else
-        .sheet(isPresented: $showCardManagement, onDismiss: {
-                        Task { await cardConfiguration.reload() }
-                    }, content: {
-                        if #available(iOS 16.0, *) {
-                            CardManagementSheet().presentationDetents([.large]).presentationDragIndicator(.visible)
-                        } else {
-                            CardManagementSheet()
-                        }
-                    })
-            #endif
         #endif
         .onAppear {
-                environments.connect()
-            }.onChangeCompat(of: scenePhase) { phase in
-                guard phase == .active else {
-                    return
-                }
-                environments.connect()
-            }.onChangeCompat(of: profile.status) { status in
-                guard status.isConnected else {
-                    return
-                }
-                environments.connect()
-            }.onReceive(environments.profileUpdate) { _ in
-                Task {
-                    await coordinator.reload()
-                }
-            }.onReceive(environments.selectedProfileUpdate) { _ in
-                Task {
-                    await coordinator.updateSelectedProfile()
-                    if profile.status.isConnected {
-                        await coordinator.reloadSystemProxy()
-                    }
+            environments.connect()
+        }.onChangeCompat(of: scenePhase) { phase in
+            guard phase == .active else {
+                return
+            }
+            environments.connect()
+        }.onChangeCompat(of: profile.status) { status in
+            guard status.isConnected else {
+                return
+            }
+            environments.connect()
+        }.onReceive(environments.profileUpdate) { _ in
+            Task {
+                await coordinator.reload()
+            }
+        }.onReceive(environments.selectedProfileUpdate) { _ in
+            Task {
+                await coordinator.updateSelectedProfile()
+                if profile.status.isConnected {
+                    await coordinator.reloadSystemProxy()
                 }
             }
+        }
         #if os(tvOS)
-            .onReceive(environments.commandClient.$groups) { _ in
-                Task { @MainActor in
-                    updateButtonVisibility()
-                }
-            }.onReceive(profile.$status) { _ in
-                Task { @MainActor in
-                    updateButtonVisibility()
-                }
-            }.onAppear {
+        .onReceive(environments.commandClient.$groups) { _ in
+            Task { @MainActor in
                 updateButtonVisibility()
             }
-        #endif
-        #if os(macOS)
-            .onChangeCompat(of: cardConfigurationVersion) { _ in
-                Task { await cardConfiguration.reload() }
+        }.onReceive(profile.$status) { _ in
+            Task { @MainActor in
+                updateButtonVisibility()
+            }
+        }.onAppear {
+            updateButtonVisibility()
         }
         #endif
     }
@@ -166,62 +155,20 @@ import SwiftUI
         private func updateButtonVisibility() {
             buttonState.update(profile: profile, commandClient: environments.commandClient)
         }
-    #endif
 
-    #if os(iOS) || os(tvOS)
-        @ToolbarContentBuilder private var toolbar: some ToolbarContent {
-            #if os(tvOS)
-                ToolbarItemGroup(placement: .topBarLeading) {
-                    navigationButtons
-                }
-            #endif
-            ToolbarItemGroup(placement: .topBarTrailing) {
-                if #available(iOS 16.0, tvOS 17.0, *) {
-                    cardManagementButton
-                }
-                #if os(tvOS)
-                    StartStopButton()
-                #endif
-            }
-        }
-
-        #if os(tvOS)
-            private var navigationButtons: some View {
-                NavigationButtonsView(
-                    showGroupsButton: buttonState.showGroupsButton,
-                    showConnectionsButton: buttonState.showConnectionsButton,
-                    groupsCount: buttonState.groupsCount,
-                    connectionsCount: buttonState.connectionsCount,
-                    onGroupsTap: {
-                        showGroups = true
-                    },
-                    onConnectionsTap: {
-                        showConnections = true
-                    }
-                )
-            }
-        #endif
-    #endif
-
-    #if os(iOS) || os(tvOS)
-        @available(iOS 16.0, *) @ViewBuilder private var cardManagementButton: some View {
-            #if os(iOS)
-                Menu {
-                    Button {
-                        showCardManagement = true
-                    } label: {
-                        Label("Dashboard Items", systemImage: "square.grid.2x2")
-                    }
-                } label: {
-                    Label("Others", systemImage: "line.3.horizontal.circle")
-                }
-            #elseif os(tvOS)
-                Button {
-                    showCardManagement = true
-                } label: {
-                    Image(systemName: "square.grid.2x2")
-                }
-            #endif
+        private var navigationButtons: some View {
+            NavigationButtonsView(
+                showGroupsButton: buttonState.showGroupsButton,
+                showConnectionsButton: buttonState.showConnectionsButton,
+                groupsCount: buttonState.groupsCount,
+                connectionsCount: buttonState.connectionsCount,
+                onGroupsTap: {
+                    showGroups = true
+                },
+                onConnectionsTap: {
+                    showConnections = true
+                }
+            )
         }
     #endif
 }

ApplicationLibrary/Views/Dashboard/ButtonVisibilityState.swift

@@ -2,7 +2,7 @@ import Foundation
 import Library
 
 @MainActor
-public struct ButtonVisibilityState {
+public struct ButtonVisibilityState: Equatable {
     public var showGroupsButton = false
     public var showConnectionsButton = false
     public var groupsCount = 0
@@ -34,6 +34,13 @@ public struct ButtonVisibilityState {
         showGroupsButton = isConnected && hasGroups
     }
 
+    public mutating func update(remoteClient commandClient: CommandClient) {
+        groupsCount = commandClient.groups?.count ?? 0
+        connectionsCount = Int(commandClient.status?.connectionsIn ?? 0)
+        showConnectionsButton = commandClient.isConnected
+        showGroupsButton = commandClient.isConnected && groupsCount > 0
+    }
+
     private mutating func reset() {
         showGroupsButton = false
         showConnectionsButton = false

ApplicationLibrary/Views/Dashboard/Cards/ClashModeCard.swift

@@ -192,7 +192,7 @@ public struct ClashModeCard: View {
 
     private nonisolated func setClashMode(_ newMode: String) async {
         do {
-            try LibboxNewStandaloneCommandClient()!.setClashMode(newMode)
+            try CommandTarget.standaloneClient().setClashMode(newMode)
         } catch {
             await MainActor.run {
                 alert = AlertState(action: "set clash mode", error: error)

ApplicationLibrary/Views/Dashboard/DashboardView.swift

@@ -6,9 +6,16 @@ import SwiftUI
 public struct DashboardView: View {
     @EnvironmentObject private var environments: ExtensionEnvironments
     @StateObject private var coordinator = DashboardViewModel()
+    @StateObject private var cardConfiguration = DashboardCardConfiguration()
+
+    #if os(iOS)
+        @State private var showCardManagement = false
+        @State private var remoteServers: [RemoteServer] = []
+    #endif
 
     #if os(macOS)
         @Environment(\.controlActiveState) private var controlActiveState
+        @Environment(\.cardConfigurationVersion) private var cardConfigurationVersion
     #endif
 
     public init() {}
@@ -22,6 +29,28 @@ public struct DashboardView: View {
                     Task { await coordinator.reload() }
                 #endif
             }
+        #if os(iOS)
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) {
+                    othersMenu
+                }
+            }
+            .onAppear {
+                Task { await reloadRemoteServers() }
+            }
+            .onReceive(NotificationCenter.default.publisher(for: .remoteServersUpdated)) { _ in
+                Task { await reloadRemoteServers() }
+            }
+            .sheet(isPresented: $showCardManagement, onDismiss: {
+                Task { await cardConfiguration.reload() }
+            }, content: {
+                if #available(iOS 16.0, *) {
+                    CardManagementSheet().presentationDetents([.large]).presentationDragIndicator(.visible)
+                } else {
+                    CardManagementSheet()
+                }
+            })
+        #endif
         #if os(tvOS)
             .navigationDestination(item: $environments.pendingImportRemoteProfile) { request in
                 NewProfileView(.init(name: request.name, url: request.url))
@@ -34,9 +63,9 @@ public struct DashboardView: View {
                             BackButton()
                         }
                     }
-            }
+        }
         #else
-            .sheet(item: $environments.pendingImportRemoteProfile) { request in
+        .sheet(item: $environments.pendingImportRemoteProfile) { request in
                     importRemoteProfileSheet(for: request)
                 }
         #endif
@@ -45,9 +74,31 @@ public struct DashboardView: View {
                 guard state != .inactive, Variant.useSystemExtension, !coordinator.isLoading else { return }
                 Task { await coordinator.reload() }
         }
+        .onChangeCompat(of: cardConfigurationVersion) { _ in
+            Task { await cardConfiguration.reload() }
+        }
         #endif
     }
 
+    #if os(iOS)
+        private var othersMenu: some View {
+            Menu {
+                Button {
+                    showCardManagement = true
+                } label: {
+                    Label("Dashboard Items", systemImage: "square.grid.2x2")
+                }
+                RemoteControlMenuItems(servers: remoteServers)
+            } label: {
+                Label("Others", systemImage: "line.3.horizontal.circle")
+            }
+        }
+
+        private func reloadRemoteServers() async {
+            remoteServers = await (try? RemoteServerManager.list()) ?? []
+        }
+    #endif
+
     private func importRemoteProfileSheet(for request: ImportRemoteProfileRequest) -> some View {
         NavigationSheet(title: "Import Profile", onDismiss: {
             environments.profileUpdate.send()
@@ -76,7 +127,9 @@ public struct DashboardView: View {
 
     @ViewBuilder
     private var mainContent: some View {
-        if environments.extensionProfileLoading {
+        if environments.remoteServer != nil {
+            RemoteDashboardView(commandClient: environments.commandClient, cardConfiguration: cardConfiguration)
+        } else if environments.extensionProfileLoading {
             ProgressView()
         } else if let profile = environments.extensionProfile {
             activeDashboardView
@@ -99,6 +152,6 @@ public struct DashboardView: View {
     }
 
     private var activeDashboardView: some View {
-        ActiveDashboardView(coordinator: coordinator)
+        ActiveDashboardView(coordinator: coordinator, cardConfiguration: cardConfiguration)
     }
 }