Merge branch 'meta-dev' into meta

mrFq1 · mrFq1 · commit aaf1a6c3c8d2 · 2025-10-15T11:15:31.000+08:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       uses: robinraju/release-downloader@v1.12
       with:
         repository: 'MetaCubeX/mihomo'
-        tag: "v1.19.14"
+        tag: "v1.19.15"
         fileName: "mihomo-darwin-???64-v?.*.*.gz"
 
         # releaseId: "62870807"
diff --git a/ClashX/Dashboard/DashboardViewContoller.swift b/ClashX/Dashboard/DashboardViewContoller.swift
@@ -103,6 +103,7 @@ class DashboardViewContoller: NSViewController {
 			
 			var items = [NSToolbarItem.Identifier]()
 			items.append(.toggleSidebar)
+            items.append(.sidebarTrackingSeparator)
 			
 			switch item {
 			case .overview, .config:
diff --git a/ClashX/Dashboard/Views/ContentTabs/Providers/ProvidersView.swift b/ClashX/Dashboard/Views/ContentTabs/Providers/ProvidersView.swift
@@ -5,7 +5,7 @@
 //
 
 import SwiftUI
-import SwiftUIIntrospect
+@_spi(Advanced) import SwiftUIIntrospect
 
 struct ProvidersView: View {
 	@ObservedObject var providerStorage = DBProviderStorage()
@@ -86,7 +86,7 @@ struct ProvidersView: View {
                 }
             }
 		}
-		.introspect(.table, on: .macOS(.v12, .v13, .v14, .v15)) {
+		.introspect(.table, on: .macOS(.v12...)) {
 			$0.refusesFirstResponder = true
 			$0.doubleAction = nil
 		}
diff --git a/ClashX/Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift b/ClashX/Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift
@@ -5,7 +5,7 @@
 //
 
 import SwiftUI
-import SwiftUIIntrospect
+@_spi(Advanced) import SwiftUIIntrospect
 
 class ProxiesSearchString: ObservableObject, Identifiable {
 	let id = UUID().uuidString
@@ -26,7 +26,7 @@ struct ProxiesView: View {
             List(proxyStorage.groups.filter({ !$0.hidden }), id: \.id) { group in
 				ProxyGroupRowView(proxyGroup: group)
 			}
-			.introspect(.table, on: .macOS(.v12, .v13, .v14, .v15)) {
+			.introspect(.table, on: .macOS(.v12...)) {
 				$0.refusesFirstResponder = true
 				$0.doubleAction = nil
 			}
diff --git a/ClashX/Dashboard/Views/SidebarView/SidebarItem.swift b/ClashX/Dashboard/Views/SidebarView/SidebarItem.swift
@@ -7,12 +7,35 @@
 import Cocoa
 import SwiftUI
 
-enum SidebarItem: String {
+enum SidebarItem: String, Identifiable, CaseIterable {
+    var id: String {
+        self.rawValue
+    }
+    
 	case overview = "Overview"
 	case proxies = "Proxies"
 	case providers = "Providers"
 	case rules = "Rules"
 	case conns = "Conns"
 	case config = "Config"
 	case logs = "Logs"
+    
+    var icon: String {
+        switch self {
+        case .overview:
+            "chart.bar.xaxis"
+        case .proxies:
+            "globe.asia.australia"
+        case .providers:
+            "link.icloud"
+        case .rules:
+            "waveform.and.magnifyingglass"
+        case .conns:
+            "app.connected.to.app.below.fill"
+        case .config:
+            "slider.horizontal.3"
+        case .logs:
+            "wand.and.stars.inverse"
+        }
+    }
 }
diff --git a/ClashX/Dashboard/Views/SidebarView/SidebarLabel.swift b/ClashX/Dashboard/Views/SidebarView/SidebarLabel.swift
@@ -8,20 +8,19 @@ import SwiftUI
 
 struct SidebarLabel: View {
 	@State var item: SidebarItem
-	@State var iconName: String
 	
     var body: some View {
 		Label {
 			Text(item.rawValue)
 		} icon: {
-			Image(systemName: iconName)
+            Image(systemName: item.icon)
 				.foregroundColor(.accentColor)
 		}
     }
 }
 
 struct SidebarLabel_Previews: PreviewProvider {
     static var previews: some View {
-		SidebarLabel(item: .overview, iconName: "chart.bar.xaxis")
+		SidebarLabel(item: .overview)
     }
 }
diff --git a/ClashX/Dashboard/Views/SidebarView/SidebarListView.swift b/ClashX/Dashboard/Views/SidebarView/SidebarListView.swift
@@ -5,11 +5,11 @@
 //
 
 import SwiftUI
-import SwiftUIIntrospect
+@_spi(Advanced) import SwiftUIIntrospect
 
 struct SidebarListView: View {
 	
-	@Binding var selectionName: SidebarItem?
+	@Binding var selection: SidebarItem?
 	
 	@State private var reloadID = UUID().uuidString
 	
@@ -18,52 +18,52 @@ struct SidebarListView: View {
 		List {
 			NavigationLink(destination: OverviewView(),
 						   tag: SidebarItem.overview,
-						   selection: $selectionName) {
-				SidebarLabel(item: .overview, iconName: "chart.bar.xaxis")
+						   selection: $selection) {
+				SidebarLabel(item: .overview)
 			}
 			
 			NavigationLink(destination: ProxiesView(),
 						   tag: SidebarItem.proxies,
-						   selection: $selectionName) {
-				SidebarLabel(item: .proxies, iconName: "globe.asia.australia")
+						   selection: $selection) {
+				SidebarLabel(item: .proxies)
 			}
 			
 			NavigationLink(destination: ProvidersView(),
 						   tag: SidebarItem.providers,
-						   selection: $selectionName) {
-				SidebarLabel(item: .providers, iconName: "link.icloud")
+						   selection: $selection) {
+				SidebarLabel(item: .providers)
 			}
 			
 			NavigationLink(destination: RulesView(),
 						   tag: SidebarItem.rules,
-						   selection: $selectionName) {
-				SidebarLabel(item: .rules, iconName: "waveform.and.magnifyingglass")
+						   selection: $selection) {
+				SidebarLabel(item: .rules)
 			}
 			
 			NavigationLink(destination: ConnectionsView(),
 						   tag: SidebarItem.conns,
-						   selection: $selectionName) {
-				SidebarLabel(item: .conns, iconName: "app.connected.to.app.below.fill")
+						   selection: $selection) {
+				SidebarLabel(item: .conns)
 			}
 			
 			NavigationLink(destination: ConfigView(),
 						   tag: SidebarItem.config,
-						   selection: $selectionName) {
-				SidebarLabel(item: .config, iconName: "slider.horizontal.3")
+						   selection: $selection) {
+				SidebarLabel(item: .config)
 			}
 			
 			NavigationLink(destination: LogsView(),
 						   tag: SidebarItem.logs,
-						   selection: $selectionName) {
-				SidebarLabel(item: .logs, iconName: "wand.and.stars.inverse")
+						   selection: $selection) {
+				SidebarLabel(item: .logs)
 			}
 			
 		}
-		.introspect(.table, on: .macOS(.v12, .v13, .v14, .v15)) {
+		.introspect(.table, on: .macOS(.v12...)) {
 			$0.refusesFirstResponder = true
 			
-			if selectionName == nil {
-				selectionName = SidebarItem.overview
+			if selection == nil {
+				selection = SidebarItem.overview
 				$0.allowsEmptySelection = false
 				if $0.selectedRow == -1 {
 					$0.selectRowIndexes(.init(integer: 0), byExtendingSelection: false)
diff --git a/ClashX/Dashboard/Views/SidebarView/SidebarView.swift b/ClashX/Dashboard/Views/SidebarView/SidebarView.swift
@@ -17,7 +17,7 @@ struct SidebarView: View {
 	
     var body: some View {
 		Group {
-			SidebarListView(selectionName: $sidebarSelectionName)
+			SidebarListView(selection: $sidebarSelectionName)
 		}
 		.environmentObject(clashApiDatasStorage.overviewData)
 		.environmentObject(clashApiDatasStorage.logStorage)
diff --git a/ClashX/ViewControllers/ClashWebViewContoller.swift b/ClashX/ViewControllers/ClashWebViewContoller.swift
@@ -13,13 +13,14 @@ import WebKit
 
 enum WebCacheCleaner {
     static func clean() {
-        HTTPCookieStorage.shared.removeCookies(since: Date.distantPast)
-        Logger.log("[WebCacheCleaner] All cookies deleted")
-        WKWebsiteDataStore.default().fetchDataRecords(ofTypes: WKWebsiteDataStore.allWebsiteDataTypes()) { records in
-            records.forEach { record in
-                WKWebsiteDataStore.default().removeData(ofTypes: record.dataTypes, for: [record], completionHandler: {})
-                Logger.log("[WebCacheCleaner] Record \(record) deleted")
-            }
+        Task { @MainActor in
+            HTTPCookieStorage.shared.removeCookies(since: Date.distantPast)
+            Logger.log("[WebCacheCleaner] All cookies deleted")
+            
+            let types = WKWebsiteDataStore.allWebsiteDataTypes()
+            let records = await WKWebsiteDataStore.default().dataRecords(ofTypes: types)
+            await WKWebsiteDataStore.default().removeData(ofTypes: types, for: records)
+            Logger.log("[WebCacheCleaner] All records deleted")
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`//`
`6`	`6`
`7`	`7`	`import SwiftUI`
`8`		`-import SwiftUIIntrospect`
	`8`	`+@_spi(Advanced) import SwiftUIIntrospect`
`9`	`9`
`10`	`10`	`struct ProvidersView: View {`
`11`	`11`	`@ObservedObject var providerStorage = DBProviderStorage()`
`@@ -86,7 +86,7 @@ struct ProvidersView: View {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`		`- .introspect(.table, on: .macOS(.v12, .v13, .v14, .v15)) {`
	`89`	`+ .introspect(.table, on: .macOS(.v12...)) {`
`90`	`90`	`$0.refusesFirstResponder = true`
`91`	`91`	`$0.doubleAction = nil`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,19 @@ import SwiftUI`
`8`	`8`
`9`	`9`	`struct SidebarLabel: View {`
`10`	`10`	`@State var item: SidebarItem`
`11`		`- @State var iconName: String`
`12`	`11`
`13`	`12`	`var body: some View {`
`14`	`13`	`Label {`
`15`	`14`	`Text(item.rawValue)`
`16`	`15`	`} icon: {`
`17`		`- Image(systemName: iconName)`
	`16`	`+ Image(systemName: item.icon)`
`18`	`17`	`.foregroundColor(.accentColor)`
`19`	`18`	`}`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`struct SidebarLabel_Previews: PreviewProvider {`
`24`	`23`	`static var previews: some View {`
`25`		`- SidebarLabel(item: .overview, iconName: "chart.bar.xaxis")`
	`24`	`+ SidebarLabel(item: .overview)`
`26`	`25`	`}`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct SidebarView: View {`
`17`	`17`
`18`	`18`	`var body: some View {`
`19`	`19`	`Group {`
`20`		`- SidebarListView(selectionName: $sidebarSelectionName)`
	`20`	`+ SidebarListView(selection: $sidebarSelectionName)`
`21`	`21`	`}`
`22`	`22`	`.environmentObject(clashApiDatasStorage.overviewData)`
`23`	`23`	`.environmentObject(clashApiDatasStorage.logStorage)`