Merge branch 'meta-dev' into meta

Author: mrFq1

ClashX.xcodeproj/project.pbxproj

@@ -599,7 +599,6 @@
 				49B445152457CDF000B27E3E /* ClashStatusTool.swift */,
 				49D223382A1DA5F10002FFCB /* SSIDSuspendTool.swift */,
 				49FEC6682AD9369C00BAD9F5 /* Command.swift */,
-				0114F0CE2E5B60CB007C7AAC /* LogRateLimiter.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -749,6 +748,7 @@
 			children = (
 				495A44D220D267D000888A0A /* LaunchAtLogin.swift */,
 				496BDEDF21196F1E00C5207F /* Logger.swift */,
+				0114F0CE2E5B60CB007C7AAC /* LogRateLimiter.swift */,
 				4905A2C92A20841B00AEDA2E /* NSView+Layout.swift */,
 				49B10869216A356D0064FFCE /* String+Extension.swift */,
 				49ABB748236B0F9E00535CD7 /* UnsafePointer+bridge.swift */,

ClashX/Basic/LogRateLimiter.swift

@@ -0,0 +1,62 @@
+import Foundation
+
+actor LogRateLimiter {
+    private let maxLogsCount: Int = 20000
+    private let timeDuration: TimeInterval = 5.0
+    private var logCount: Int = 0
+    private var startTime: TimeInterval = CFAbsoluteTimeGetCurrent()
+    private var lastTimeCheck: TimeInterval = CFAbsoluteTimeGetCurrent()
+    private var isBlocked = false
+    
+    private let onRateLimitTriggered: () -> Void
+    
+    init(onRateLimitTriggered: @escaping () -> Void) {
+        self.onRateLimitTriggered = onRateLimitTriggered
+    }
+    
+    // Returns true if log can be processed, false if rate limited
+    func processLog() -> Bool {
+        guard !isBlocked else { return false }
+        
+        let now = CFAbsoluteTimeGetCurrent()
+        
+        // Only check time and count every 1 second to reduce overhead
+        if now - lastTimeCheck >= 1.0 {
+            lastTimeCheck = now
+            
+            // Reset counter if time window has passed
+            if now - startTime >= timeDuration {
+                startTime = now
+                logCount = 0
+            }
+            
+            // Check if rate limit exceeded
+            if logCount >= maxLogsCount {
+                Task { await triggerRateLimit() }
+                return false
+            }
+        }
+        
+        logCount += 1
+        return true
+    }
+    
+    private func triggerRateLimit() async {
+        isBlocked = true
+        
+        // Execute callback on main actor
+        await MainActor.run {
+            onRateLimitTriggered()
+            Logger.log("⚠️ Rate limit triggered: >\(maxLogsCount) logs/\(timeDuration)sec, paused for 1min")
+        }
+        
+        // Resume after 60 seconds
+        try? await Task.sleep(nanoseconds: 60_000_000_000)
+        
+        isBlocked = false
+        
+        await MainActor.run {
+            Logger.log("✅ Rate limit resumed")
+        }
+    }
+}

ClashX/Basic/Logger.swift

@@ -21,6 +21,7 @@ class Logger {
         dataFormatter.setLocalizedDateFormatFromTemplate("YYYY/MM/dd HH:mm:ss:SSS")
         fileLogger.logFormatter = DDLogFileFormatterDefault(dateFormatter: dataFormatter)
         fileLogger.rollingFrequency = TimeInterval(60 * 60 * 24) // 24 hours
+        fileLogger.maximumFileSize = 5 * 1024 * 1024 // 5MB
         fileLogger.logFileManager.maximumNumberOfLogFiles = 3
         DDLog.add(fileLogger)
         dynamicLogLevel = ConfigManager.selectLoggingApiLevel.toDDLogLevel()

ClashX/General/ApiRequest.swift

@@ -780,9 +780,11 @@ extension ApiRequest: WebSocketDelegate {
 			delegate?.didUpdateTraffic(up: json["up"].intValue, down: json["down"].intValue)
 			dashboardDelegate?.didUpdateTraffic(up: json["up"].intValue, down: json["down"].intValue)
 		case loggingWebSocket:
-            guard logRateLimiter.processLog() else { return }
-			delegate?.didGetLog(log: json["payload"].stringValue, level: json["type"].string ?? "info")
-			dashboardDelegate?.didGetLog(log: json["payload"].stringValue, level: json["type"].string ?? "info")
+            Task {
+                guard await logRateLimiter.processLog() else { return }
+                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)