update-01.04

luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua

@@ -279,30 +279,35 @@ function clone(org)
     return res
 end
 
+function get_bin_version_cache(file, cmd)
+    sys.call("mkdir -p /tmp/etc/passwall_tmp")
+    if fs.access(file) then
+        chmod_755(file)
+        local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
+            return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
+        else
+            local version = sys.exec(string.format("echo -n $(%s %s)", file, cmd))
+            sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
+            return version
+        end
+    end
+    return ""
+end
+
 function get_v2ray_path()
     local path = uci_get_type("global_app", "v2ray_file")
     return path
 end
 
 function get_v2ray_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_v2ray_path() end
-    chmod_755(file)
+    local cmd = "-version | awk '{print $2}' | sed -n 1P"
-    if fs.access(file) then
     if file == get_v2ray_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
-        end
-    end
-    return ""
 end
 
 function get_xray_path()
@@ -311,24 +316,13 @@ function get_xray_path()
 end
 
 function get_xray_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_xray_path() end
-    chmod_755(file)
+    local cmd = "-version | awk '{print $2}' | sed -n 1P"
-    if fs.access(file) then
     if file == get_xray_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
-        end
-    end
-    return ""
 end
 
 function get_trojan_go_path()
@@ -337,24 +331,13 @@ function get_trojan_go_path()
 end
 
 function get_trojan_go_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_trojan_go_path() end
-    chmod_755(file)
+    local cmd = "-version | awk '{print $2}' | sed -n 1P"
-    if fs.access(file) then
     if file == get_trojan_go_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -version | awk '{print $2}' | sed -n 1P)" % file)
-        end
-    end
-    return ""
 end
 
 function get_kcptun_path()
@@ -363,24 +346,13 @@ function get_kcptun_path()
 end
 
 function get_kcptun_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_kcptun_path() end
-    chmod_755(file)
+    local cmd = "-v | awk '{print $3}'"
-    if fs.access(file) then
     if file == get_kcptun_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
-        end
-    end
-    return ""
 end
 
 function get_brook_path()
@@ -389,24 +361,13 @@ function get_brook_path()
 end
 
 function get_brook_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_brook_path() end
-    chmod_755(file)
+    local cmd = "-v | awk '{print $3}'"
-    if fs.access(file) then
     if file == get_brook_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
-        end
-    end
-    return ""
 end
 
 function get_hysteria_path()
@@ -415,24 +376,13 @@ function get_hysteria_path()
 end
 
 function get_hysteria_version(file)
-    sys.call("mkdir -p /tmp/etc/passwall_tmp")
     if file == nil then file = get_hysteria_path() end
-    chmod_755(file)
+    local cmd = "-v | awk '{print $3}'"
-    if fs.access(file) then
     if file == get_hysteria_path() then
-            local md5 = sys.exec("echo -n $(md5sum " .. file .. " | awk '{print $1}')")
+        return get_bin_version_cache(file, cmd)
-            if fs.access("/tmp/etc/passwall_tmp/" .. md5) then
-                return sys.exec("echo -n $(cat /tmp/etc/passwall_tmp/%s)" % md5)
     else
-                local version = sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
+        return sys.exec(string.format("echo -n $(%s %s)", file, cmd))
-                sys.call("echo '" .. version .. "' > " .. "/tmp/etc/passwall_tmp/" .. md5)
-                return version
     end
-        else
-            return sys.exec("echo -n $(%s -v | awk '{print $3}')" % file)
-        end
-    end
-    return ""
 end
 
 function get_free_space(dir)

luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua

@@ -5,7 +5,9 @@ local sys = api.sys
 local util = api.util
 local i18n = api.i18n
 
-local brook_api = "https://api.github.com/repos/txthinking/brook/releases?per_page=1"
+local pre_release_url = "https://api.github.com/repos/txthinking/brook/releases?per_page=1"
+local release_url = "https://api.github.com/repos/txthinking/brook/releases/latest"
+local brook_api = release_url
 local app_path = api.get_brook_path() or ""
 
 function check_path()

luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua

@@ -201,9 +201,14 @@ function gen_outbound(node, tag, proxy_table)
                         port = tonumber(node.port),
                         method = node.method or nil,
                         flow = node.flow or nil,
+                        ivCheck = (node.iv_check == "1") and true or false,
                         password = node.password or "",
-                        users = (node.username and node.password) and
+                        users = (node.username and node.password) and {
-                            {{user = node.username, pass = node.password}} or nil
+                            {
+                                user = node.username,
+                                pass = node.password
+                            }
+                        } or nil
                     }
                 } or nil
             }
@@ -272,7 +277,7 @@ if node_section then
             protocol = "dokodemo-door",
             settings = {network = proto, followRedirect = true},
             streamSettings = {sockopt = {tproxy = proxy_way}},
-            sniffing = {enabled = true, destOverride = {"http", "tls"}}
+            sniffing = {enabled = true, destOverride = {"http", "tls"}, RouteOnly = true}
         })
     end
 

luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua

@@ -5,7 +5,9 @@ local sys = api.sys
 local util = api.util
 local i18n = api.i18n
 
-local kcptun_api = "https://api.github.com/repos/xtaci/kcptun/releases?per_page=1"
+local pre_release_url = "https://api.github.com/repos/xtaci/kcptun/releases?per_page=1"
+local release_url = "https://api.github.com/repos/xtaci/kcptun/releases/latest"
+local kcptun_api = release_url
 local app_path = api.get_kcptun_path() or ""
 
 function check_path()

luci-app-passwall/luasrc/model/cbi/passwall/api/trojan_go.lua

@@ -5,7 +5,9 @@ local sys = api.sys
 local util = api.util
 local i18n = api.i18n
 
-local trojan_go_api = "https://api.github.com/repos/p4gefau1t/trojan-go/releases?per_page=1"
+local pre_release_url = "https://api.github.com/repos/p4gefau1t/trojan-go/releases?per_page=1"
+local release_url = "https://api.github.com/repos/p4gefau1t/trojan-go/releases/latest"
+local trojan_go_api = release_url
 local app_path = api.get_trojan_go_path() or ""
 
 function check_path()

luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua

@@ -5,8 +5,9 @@ local sys = api.sys
 local util = api.util
 local i18n = api.i18n
 
-local v2ray_api = "https://api.github.com/repos/v2fly/v2ray-core/releases?per_page=1"
+local pre_release_url = "https://api.github.com/repos/v2fly/v2ray-core/releases?per_page=1"
-local is_armv7 = false
+local release_url = "https://api.github.com/repos/v2fly/v2ray-core/releases/latest"
+local v2ray_api = release_url
 local app_path = api.get_v2ray_path() or ""
 
 function check_path()

luci-app-passwall/luasrc/model/cbi/passwall/api/xray.lua

@@ -5,8 +5,9 @@ local sys = api.sys
 local util = api.util
 local i18n = api.i18n
 
-local xray_api = "https://api.github.com/repos/XTLS/Xray-core/releases?per_page=1"
+local pre_release_url = "https://api.github.com/repos/XTLS/Xray-core/releases?per_page=1"
-local is_armv7 = false
+local release_url = "https://api.github.com/repos/XTLS/Xray-core/releases/latest"
+local xray_api = release_url
 local app_path = api.get_xray_path() or ""
 
 function check_path()

luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua

@@ -420,6 +420,10 @@ function x_ss_encrypt_method.write(self, section, value)
 	m:set(section, "method", value)
 end
 
+iv_check = s:option(Flag, "iv_check", translate("IV Check"))
+iv_check:depends({ type = "V2ray", protocol = "shadowsocks" })
+iv_check:depends({ type = "Xray", protocol = "shadowsocks" })
+
 ssr_protocol = s:option(Value, "ssr_protocol", translate("Protocol"))
 for a, t in ipairs(ssr_protocol_list) do ssr_protocol:value(t) end
 ssr_protocol:depends("type", "SSR")

luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua

@@ -49,6 +49,7 @@ function gen_config(user)
         settings = {
             method = user.method,
             password = user.password,
+            ivCheck = ("1" == user.iv_check) and true or false,
             network = user.ss_network or "TCP,UDP"
         }
     elseif user.protocol == "trojan" then

luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua

@@ -243,6 +243,10 @@ function x_ss_encrypt_method.write(self, section, value)
 	m:set(section, "method", value)
 end
 
+iv_check = s:option(Flag, "iv_check", translate("IV Check"))
+iv_check:depends({ type = "V2ray", protocol = "shadowsocks" })
+iv_check:depends({ type = "Xray", protocol = "shadowsocks" })
+
 ss_network = s:option(ListValue, "ss_network", translate("Transport"))
 ss_network.default = "tcp,udp"
 ss_network:value("tcp", "TCP")

luci-app-passwall/po/zh-cn/passwall.po

@@ -1033,6 +1033,9 @@ msgstr "HAProxy不能和KCP一起使用"
 msgid "Password"
 msgstr "密码"
 
+msgid "IV Check"
+msgstr "IV 检查"
+
 msgid "Connection Timeout"
 msgstr "连接超时时间"
 
@@ -1051,9 +1054,6 @@ msgstr "插件"
 msgid "opts"
 msgstr "插件选项"
 
-msgid "Xray is currently directly compatible with V2ray and used."
-msgstr "Xray 目前可直接兼容 V2ray 并使用。"
-
 msgid "Protocol"
 msgstr "协议名称"