xray 1.6.5

sibalma · Dec 3, 2022 · 7752aea · 7752aea
1 parent 9af635c
commit 7752aea
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/app_xray/build.gradle.kts b/app_xray/build.gradle.kts
@@ -8,7 +8,7 @@ setupAll()
 android {
     defaultConfig {
         applicationId = "moe.matsuri.plugin.xray"
-        versionCode = 8
-        versionName = "v1.6.4-1"
+        versionCode = 9
+        versionName = "v1.6.5-1"
     }
 }
diff --git a/download.sh b/download.sh
@@ -23,7 +23,7 @@ unzip_singbox() {
 }
 
 download_xray() {
-  VERSION="v1.6.4"
+  VERSION="v1.6.5"
   mkdir_libs "app_xray/libs"
 
   curl -Lso xray.zip "https://github.com/XTLS/Xray-core/releases/download/$VERSION/Xray-android-arm64-v8a.zip"

diff --git a/js/plugin_xray/main.js b/js/plugin_xray/main.js
@@ -54,9 +54,9 @@ export function nekoProtocol(protocolId) {
 export function nekoAbout() {
     switch (LANG_TR()) {
         case "zh_CN":
-            return "这个插件是实验性的。如果在使用过程中遇到任何问题，请自行解决。"
+            return "使用 Xray 内核提供 VLESS 等协议的实验性支持，效果未知。\n如果在使用过程中遇到任何问题，请自行解决。"
         default:
-            return "This plugin is experimental. If you have any problems during use, please solve them yourself."
+            return "Experimental support for protocols such as VLESS using the Xray core, effects unknown. \nIf you have any problems during use, please solve them yourself."
     }
 }
 

diff --git a/js/plugin_xray/vless.js b/js/plugin_xray/vless.js
@@ -28,6 +28,7 @@ class vlessClass {
         this.defaultSharedStorage.serverSecurity = "none"
         this.defaultSharedStorage.grpcMultiMode = false
         // tls
+        this.defaultSharedStorage.utlsFingerprint = ""
         this.defaultSharedStorage.serverSNI = ""
         this.defaultSharedStorage.serverALPN = ""
         this.defaultSharedStorage.serverCertificates = ""
@@ -245,6 +246,17 @@ class vlessClass {
             {
                 "key": "serverSecurityCategory",
                 "preferences": [
+                    {
+                        "type": "SimpleMenuPreference",
+                        "key": "utlsFingerprint",
+                        "entries": {
+                            "": "",
+                            "chrome": "chrome",
+                            "firefox": "firefox",
+                            "safari": "safari",
+                            "randomized": "randomized",
+                        }
+                    },
                     {
                         "type": "EditTextPreference",
                         "key": "serverSNI",
@@ -396,13 +408,10 @@ class vlessClass {
                 neko.setPreferenceVisibility("serverSecurityCategory", false)
             } else {
                 neko.setPreferenceVisibility("serverSecurityCategory", true)
-                if (newValue == "tls") {
-                    neko.setPreferenceVisibility("serverFlow", false)
-                    neko.setPreferenceVisibility("serverFlowVision", true)
-                } else if (newValue == "xtls") {
-                    neko.setPreferenceVisibility("serverFlow", true)
-                    neko.setPreferenceVisibility("serverFlowVision", false)
-                }
+                let isXTLS = (newValue == "xtls")
+                neko.setPreferenceVisibility("serverFlow", isXTLS)
+                neko.setPreferenceVisibility("serverFlowVision", !isXTLS)
+                neko.setPreferenceVisibility("utlsFingerprint", !isXTLS)
             }
         }
     }
@@ -653,6 +662,7 @@ class vlessClass {
                         "serverName": ss.serverSNI,
                         "allowInsecure": ss.serverAllowInsecure,
                     }
+                    if (ss.utlsFingerprint.isNotBlank()) t2["fingerprint"] = ss.utlsFingerprint
                     if (ss.serverALPN.isNotBlank()) t2["alpn"] = ss.serverALPN.lines()
                     if (ss.serverCertificates.isNotBlank()) t2["certificates"] = { "certificate": ss.serverCertificates.lines() }
                     t0.outbounds[0].streamSettings["tlsSettings"] = t2