Merge branch 'meta-dev' into meta

MetaCubeX · Oct 4, 2024 · e9a8e7e · e9a8e7e
2 parents 1a62405 + 509ed01
commit e9a8e7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ClashX/Dashboard/Views/ClashApiDatasStorage.swift b/ClashX/Dashboard/Views/ClashApiDatasStorage.swift
@@ -16,8 +16,10 @@ class ClashApiDatasStorage: NSObject, ObservableObject {
 	@Published var connsStorage = ClashConnsStorage()
 
 	func resetStreamApi() {
-		ApiRequest.shared.delegate = self
-		ApiRequest.shared.resetStreamApis()
+		ApiRequest.shared.dashboardDelegate = self
+		if ApiRequest.shared.delegate == nil {
+			ApiRequest.shared.resetStreamApis()
+		}
 	}
 }
 

diff --git a/ClashX/General/ApiRequest.swift b/ClashX/General/ApiRequest.swift
@@ -81,6 +81,7 @@ class ApiRequest {
     }
 
     weak var delegate: ApiRequestStreamDelegate?
+	weak var dashboardDelegate: ApiRequestStreamDelegate?
 
 	private var trafficWebSocket: WebSocket?
 	private var loggingWebSocket: WebSocket?
@@ -640,6 +641,7 @@ extension ApiRequest: WebSocketDelegate {
 
 			ConfigManager.shared.isRunning = true
 			delegate?.streamStatusChanged()
+			dashboardDelegate?.streamStatusChanged()
 		case loggingWebSocket:
 			loggingWebSocketRetryDelay = 1
 			Logger.log("loggingWebSocket did Connect", level: .debug)
@@ -656,6 +658,7 @@ extension ApiRequest: WebSocketDelegate {
 		if (socket as? WebSocket) == trafficWebSocket {
 			ConfigManager.shared.isRunning = false
 			delegate?.streamStatusChanged()
+			dashboardDelegate?.streamStatusChanged()
 		}
 
 		guard let err = error else {
@@ -711,10 +714,13 @@ extension ApiRequest: WebSocketDelegate {
 		switch webSocket {
 		case trafficWebSocket:
 			delegate?.didUpdateTraffic(up: json["up"].intValue, down: json["down"].intValue)
+			dashboardDelegate?.didUpdateTraffic(up: json["up"].intValue, down: json["down"].intValue)
 		case loggingWebSocket:
 			delegate?.didGetLog(log: json["payload"].stringValue, level: json["type"].string ?? "info")
+			dashboardDelegate?.didGetLog(log: json["payload"].stringValue, level: json["type"].string ?? "info")
 		case memoryWebSocket:
 			delegate?.didUpdateMemory(memory: json["inuse"].int64Value)
+			dashboardDelegate?.didUpdateMemory(memory: json["inuse"].int64Value)
 		default:
 			return
 		}