Hide connections page by default since unstable

Author: nekohasekai

ApplicationLibrary/Views/Connections/ConnectionListView.swift

@@ -8,7 +8,6 @@ public struct ConnectionListView: View {
     @State private var isLoading = true
     @StateObject private var commandClient = CommandClient(.connections)
     @State private var connections: [Connection] = []
-    @State private var selection: ConnectionListPage = .active
     @State private var searchText = ""
     @State private var alert: Alert?
 

ApplicationLibrary/Views/Connections/ConnectionView.swift

@@ -67,7 +67,7 @@ public struct ConnectionView: View {
                                 Spacer()
                                 VStack(alignment: .trailing) {
                                     Text(connection.inboundType + "/" + connection.inbound)
-                                    Text(connection.chain.reversed().joined(separator: "/"))
+                                    Text(connection.chain[0])
                                 }
                             }
                         }
@@ -111,7 +111,7 @@ public struct ConnectionView: View {
 
     private nonisolated func closeConnection() async {
         do {
-            try LibboxNewStandaloneCommandClient()!.closeConnection(connection.id)
+            try await LibboxNewStandaloneCommandClient()!.closeConnection(connection.id)
         } catch {
             await MainActor.run {
                 alert = Alert(error)

ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift

@@ -51,7 +51,7 @@ public struct ActiveDashboardView: View {
             #if os(iOS) || os(tvOS)
                 if ApplicationLibrary.inPreview || profile.status.isConnectedStrict {
                     Picker("Page", selection: $selection) {
-                        ForEach(DashboardPage.allCases) { page in
+                        ForEach(DashboardPage.enabledCases()) { page in
                             page.label
                         }
                     }
@@ -61,7 +61,7 @@ public struct ActiveDashboardView: View {
                         .navigationBarTitleDisplayMode(.inline)
                     #endif
                     TabView(selection: $selection) {
-                        ForEach(DashboardPage.enabledCases) { page in
+                        ForEach(DashboardPage.enabledCases()) { page in
                             page.contentView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled)
                                 .tag(page)
                         }

ApplicationLibrary/Views/Dashboard/DashboardPage.swift

@@ -13,18 +13,18 @@ public enum DashboardPage: Int, CaseIterable, Identifiable {
 }
 
 public extension DashboardPage {
-    #if !tvOS
-        static var enabledCases: [DashboardPage] = [
+    static func enabledCases() -> [DashboardPage] {
+        var cases: [DashboardPage] = [
             .overview,
             .groups,
-            .connections,
         ]
-    #else
-        static var enabledCases: [DashboardPage] = [
-            .overview,
-            .groups,
-        ]
-    #endif
+        #if !tvOS
+            if Variant.isBeta {
+                cases.append(.connections)
+            }
+        #endif
+        return cases
+    }
 }
 
 public extension DashboardPage {

ApplicationLibrary/Views/Profile/ImportProfileView.swift

@@ -75,10 +75,9 @@
         private func reset() {
             selected = false
             profiles = nil
-            if let connection = connection  {
+            if let connection {
                 connection.cancel()
                 self.connection = nil
-            
             }
         }
 
@@ -87,7 +86,7 @@
             self.connection = NWSocket(connection)
             connection.stateUpdateHandler = { state in
                 switch state {
-                case .failed(let error):
+                case let .failed(error):
                     DispatchQueue.main.async { [self] in
                         reset()
                         alert = Alert(error)

Library/Network/CommandClient.swift

@@ -22,7 +22,7 @@ public class CommandClient: ObservableObject {
     @Published public var clashModeList: [String]
     @Published public var clashMode: String
 
-    @Published public var connectionStateFilter = ConnectionStateFilter.all
+    @Published public var connectionStateFilter = ConnectionStateFilter.active
     @Published public var connectionSort = ConnectionSort.byDate
     @Published public var connections: [LibboxConnection]?
     public var rawConnections: LibboxConnections?

Library/Shared/Variant.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Libbox
 
 public enum Variant {
     #if os(macOS)
@@ -14,4 +15,6 @@ public enum Variant {
     #elseif os(tvOS)
         public static let applicationName = "SFT"
     #endif
+
+    public static var isBeta = LibboxVersion().contains("-")
 }

MacLibrary/SidebarView.swift

@@ -33,7 +33,9 @@ public struct SidebarView: View {
                                     .tint(.textColor)
                                     .tag(NavigationPage.dashboard)
                                 NavigationPage.groups.label.tag(NavigationPage.groups)
-                                NavigationPage.connections.label.tag(NavigationPage.connections)
+                                if Variant.isBeta {
+                                    NavigationPage.connections.label.tag(NavigationPage.connections)
+                                }
                             }
                             Divider()
                             ForEach(NavigationPage.macosDefaultPages, id: \.self) { it in

SFM.System/Application.swift

@@ -4,7 +4,7 @@ import SwiftUI
 
 @main
 struct Application: App {
-    @NSApplicationDelegateAdaptor private var appDelegate: IndependentApplicationDelegate
+    @NSApplicationDelegateAdaptor private var appDelegate: StandaloneApplicationDelegate
 
     var body: some Scene {
         MacApplication()

SFM.System/IndependentApplicationDelegate.swift renamed to SFM.System/StandaloneApplicationDelegate.swift

@@ -3,9 +3,10 @@ import Foundation
 import Library
 import MacLibrary
 
-class IndependentApplicationDelegate: ApplicationDelegate {
+class StandaloneApplicationDelegate: ApplicationDelegate {
     public func applicationWillFinishLaunching(_: Notification) {
         Variant.useSystemExtension = true
+        Variant.isBeta = false
         Task {
             await setupSystemExtension()
         }