Merge branch 'master' of https://github.com/yanue/V2rayU

V2rayU/ConfigWindow.swift

@@ -78,6 +78,7 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
     @IBOutlet weak var trojanPort: NSTextField!
     @IBOutlet weak var trojanPass: NSTextField!
     @IBOutlet weak var trojanAlpn: NSTextField!
+    @IBOutlet weak var trojanSni: NSTextField!
 
     @IBOutlet weak var networkView: NSView!
 

V2rayU/Import.swift

@@ -294,7 +294,7 @@ class ImportUri {
 
     func importTrojanUri(uri: String) {
         if URL(string: uri) == nil {
-            self.error = "invalid ssr url"
+            self.error = "invalid trojan url"
             return
         }
         self.uri = uri
@@ -313,6 +313,7 @@ class ImportUri {
         svr.address = trojan.host
         svr.port = trojan.port
         svr.password = trojan.password
+        svr.sni = trojan.sni
         NSLog("\(svr)")
         v2ray.serverTrojan = svr
         v2ray.enableMux = false

V2rayU/Uri.swift

@@ -391,12 +391,19 @@ class TrojanUri {
     var port: Int = 443
     var password: String = ""
     var remark: String = ""
-
+    var sni: String = ""
+    var flow: String = ""
+    var security: String = ""
+    var alpn: String = ""
     var error: String = ""
 
-    // trojan://password@remote_host:remote_port
+    // trojan://pass@remote_host:443?flow=xtls-rprx-origin&security=xtls&sni=sni&host=remote_host#trojan
     func encode() -> String {
         let uri = self.password + "@" + self.host + ":" + String(self.port)
+        uri.queryItems = [
+            URLQueryItem(name: "flow", value: self.flow),
+            URLQueryItem(name: "sni", value: self.sni),
+        ]
         return "trojan://" + uri + "#" + self.remark
     }
 
@@ -416,6 +423,19 @@ class TrojanUri {
         self.host = host
         self.port = Int(port)
         self.password = password
+        let queryItems = url.queryParams()
+        for item in queryItems {
+            switch item.key {
+            case "sni":
+                self.sni = item.value as! String
+                break
+            case "flow":
+                self.flow = item.value as! String
+                break
+            default:
+                break
+            }
+        }
         self.remark = (url.fragment ?? "trojan").urlDecoded()
     }
 }

V2rayU/V2raySubscribe.swift

@@ -297,7 +297,7 @@ class V2raySubSync: NSObject {
         }
 
         if URL(string: uri) == nil {
-            logTip(title: "fail: ", uri: uri, informativeText: "no found ss://, ssr://, vmess://")
+            logTip(title: "fail: ", uri: uri, informativeText: "no found ss://, ssr://, vmess://, vless://, trojan://")
             return
         }
 

V2rayU/v2ray/v2rayOutbound.swift

@@ -290,4 +290,5 @@ struct V2rayOutboundTrojanServer: Codable {
     var password: String = ""
     var level: Int = 0
     var email: String = ""
+    var sni: String = ""
 }