Feature: Support log api

Author: yichengchen

ClashX.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		495A44D320D267D000888A0A /* LaunchAtLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495A44D220D267D000888A0A /* LaunchAtLogin.swift */; };
 		4966E9E32118153A00A391FB /* NSUserNotificationCenter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4966E9E22118153A00A391FB /* NSUserNotificationCenter+Extension.swift */; };
 		4966E9E6211824F300A391FB /* NSImage+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4966E9E5211824F300A391FB /* NSImage+extension.swift */; };
+		496BDEE021196F1E00C5207F /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 496BDEDF21196F1E00C5207F /* Logger.swift */; };
 		497F0DF320DE2FE50077AD41 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 497F0DF220DE2FE50077AD41 /* Icon.icns */; };
 		4989F98020D01C8F0001E564 /* clash.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4989F97E20D01C8F0001E564 /* clash.a */; };
 		4989F98420D02D200001E564 /* Country.mmdb in Resources */ = {isa = PBXBuildFile; fileRef = 4989F98320D02D200001E564 /* Country.mmdb */; };
@@ -90,6 +91,7 @@
 		495A44D220D267D000888A0A /* LaunchAtLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchAtLogin.swift; sourceTree = "<group>"; };
 		4966E9E22118153A00A391FB /* NSUserNotificationCenter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUserNotificationCenter+Extension.swift"; sourceTree = "<group>"; };
 		4966E9E5211824F300A391FB /* NSImage+extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+extension.swift"; sourceTree = "<group>"; };
+		496BDEDF21196F1E00C5207F /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
 		497F0DF220DE2FE50077AD41 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
 		4989F97E20D01C8F0001E564 /* clash.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = clash.a; sourceTree = "<group>"; };
 		4989F97F20D01C8F0001E564 /* clash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clash.h; sourceTree = "<group>"; };
@@ -193,6 +195,7 @@
 				495A44D220D267D000888A0A /* LaunchAtLogin.swift */,
 				4966E9E22118153A00A391FB /* NSUserNotificationCenter+Extension.swift */,
 				4966E9E5211824F300A391FB /* NSImage+extension.swift */,
+				496BDEDF21196F1E00C5207F /* Logger.swift */,
 			);
 			path = Basic;
 			sourceTree = "<group>";
@@ -530,6 +533,7 @@
 				495A44D320D267D000888A0A /* LaunchAtLogin.swift in Sources */,
 				49CF3B2120CD7463001EBF94 /* AppDelegate.swift in Sources */,
 				4952C3CB2116E952004A4FA8 /* PreferencesWindowController.swift in Sources */,
+				496BDEE021196F1E00C5207F /* Logger.swift in Sources */,
 				4913C82321157D0200F6B87C /* Notification.swift in Sources */,
 				492C4871210EF62E004554A0 /* ClashConfig.swift in Sources */,
 				492C4869210EE6B9004554A0 /* ApiRequest.swift in Sources */,

ClashX/AppDelegate.swift

@@ -45,7 +45,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             self.updateProxyList()
         }
         setupData()
-        
+//        os_log(<#T##message: StaticString##StaticString#>, <#T##args: CVarArg...##CVarArg#>)
     }
 
 
@@ -59,7 +59,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NotificationCenter.default.rx.notification(kShouldUpDateConfig).bind {
             [unowned self] (note)  in
             self.syncConfig(){
-                self.resetTrafficMonitor()
+                self.resetStreamApi()
             }
             }.disposed(by: disposeBag)
 
@@ -81,9 +81,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 en in
                 let enable = en ?? false
                 self.proxySettingMenuItem.state = enable ? .on : .off
-                let image =
-                    NSImage(named: NSImage.Name(rawValue: "menu_icon"))!.tint(color: enable ? NSColor.black : NSColor.gray)
-                ((self.statusItem.view) as! StatusItemView).imageView.image = image
             }.disposed(by: disposeBag)
 
         ConfigManager.shared
@@ -175,7 +172,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         syncConfig(){
             self.selectProxyGroupWithMemory()
             DispatchQueue.main.asyncAfter(deadline:DispatchTime.now() + 1, execute: {
-                self.resetTrafficMonitor()
+                self.resetStreamApi()
             })
         }
     }
@@ -188,11 +185,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    func resetTrafficMonitor() {
+    func resetStreamApi() {
         ApiRequest.shared.requestTrafficInfo(){ [weak self] up,down in
             guard let `self` = self else {return}
             ((self.statusItem.view) as! StatusItemView).updateSpeedLabel(up: up, down: down)
         }
+        
+        ApiRequest.shared.requestLog { (type, msg) in
+            Logger.log(msg: msg)
+        }
     }
 
 
@@ -249,7 +250,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBAction func actionUpdateConfig(_ sender: Any) {
         ApiRequest.requestConfigUpdate() { [unowned self] success in
             if (success) {
-                self.syncConfig(){self.resetTrafficMonitor()}
+                self.syncConfig(){self.resetStreamApi()}
                 NSUserNotificationCenter
                     .default
                     .post(title: "Reload Config Succeed", info: "succees")

ClashX/Basic/Logger.swift

@@ -0,0 +1,29 @@
+//
+//  Logger.swift
+//  ClashX
+//
+//  Created by CYC on 2018/8/7.
+//  Copyright © 2018年 west2online. All rights reserved.
+//
+
+import Foundation
+import os
+
+class Logger {
+    static let shared = Logger()
+    var logger:OSLog?
+    private init() {
+        if #available(OSX 10.12, *) {
+            self.logger = OSLog(subsystem: "com.clashX", category: "clashX")
+        } else {
+        }
+    }
+    
+    static func log(msg:String) {
+        if #available(OSX 10.12, *) {
+            os_log("%@", log: shared.logger!, type: .default, msg)
+        } else {
+            NSLog("%@", msg)
+        }
+    }
+}

ClashX/General/ApiRequest.swift

@@ -15,7 +15,8 @@ class ApiRequest{
     static let shared = ApiRequest()
 
     var trafficReq:DataRequest? = nil
-    
+    var logReq:DataRequest? = nil
+
     static func requestConfig(completeHandler:@escaping ((ClashConfig)->())){
         request(ConfigManager.apiUrl + "/configs", method: .get).responseData{
             res in
@@ -36,6 +37,19 @@ class ApiRequest{
         }
     }
 
+    func requestLog(callback:@escaping ((String,String)->()) ){
+        self.logReq?.cancel()
+        
+        self.logReq =
+            request(ConfigManager.apiUrl + "/logs").stream {(data) in
+                if let jsonData = try? JSONSerialization.jsonObject(with: data) as? [String:String] {
+                    let type = jsonData!["type"] ?? "info"
+                    let payload = jsonData!["payload"] ?? ""
+                    callback(type,payload)
+                }
+        }
+    }
+    
     static func requestConfigUpdate(callback:@escaping ((Bool)->())){
         let success = updateAllConfig()
         callback(success==0)