update 2023-02-09 23:37:54

luci-app-passwall/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=4.58
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm

@@ -25,7 +25,7 @@ local geosite_update = api.uci_get_type("global_rules", "geosite_update", "1") =
 			}
 		}
 		XHR.get('<%=api.url("update_rules")%>', {
-				update: checkBoxList
+				update: checkBoxList.join(",")
 			},
 			function(x, data) {
 				if(x && x.status == 200) {

luci-app-passwall/root/usr/share/passwall/rule_update.lua

@@ -49,16 +49,10 @@ local log = function(...)
     end
 end
 
--- trim
-local function trim(text)
-    if not text or text == "" then return "" end
-    return (string.gsub(text, "^%s*(.-)%s*$", "%1"))
-end
-
 -- curl
 local function curl(url, file, valifile)
 	local args = {
-		"-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3"
+		"-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3"
 	}
 	if file then
 		args[#args + 1] = "-o " .. file
@@ -241,8 +235,8 @@ end
 local function fetch_geoip()
 	--请求geoip
 	xpcall(function()
-		local json_str = api.curl_logic(geoip_api)
-		local json = jsonc.parse(json_str)
+		local return_code, content = api.curl_logic(geoip_api)
+		local json = jsonc.parse(content)
 		if json.tag_name and json.assets then
 			for _, v in ipairs(json.assets) do
 				if v.name and v.name == "geoip.dat.sha256sum" then
@@ -292,8 +286,8 @@ end
 local function fetch_geosite()
 	--请求geosite
 	xpcall(function()
-		local json_str = api.curl_logic(geosite_api)
-		local json = jsonc.parse(json_str)
+		local return_code, content = api.curl_logic(geosite_api)
+		local json = jsonc.parse(content)
 		if json.tag_name and json.assets then
 			for _, v in ipairs(json.assets) do
 				if v.name and v.name == "geosite.dat.sha256sum" then

luci-app-passwall2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
 PKG_VERSION:=1.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

luci-app-passwall2/luasrc/view/passwall2/rule/rule_version.htm

@@ -21,7 +21,7 @@ local geosite_update = api.uci_get_type("global_rules", "geosite_update", "1") =
 			}
 		}
 		XHR.get('<%=api.url("update_rules")%>', {
-				update: checkBoxList
+				update: checkBoxList.join(",")
 			},
 			function(x, data) {
 				if(x && x.status == 200) {

luci-app-passwall2/root/usr/share/passwall2/rule_update.lua

@@ -37,7 +37,7 @@ end
 -- curl
 local function curl(url, file)
 	local args = {
-		"-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3"
+		"-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3"
 	}
 	if file then
 		args[#args + 1] = "-o " .. file
@@ -50,8 +50,8 @@ end
 local function fetch_geoip()
 	--请求geoip
 	xpcall(function()
-		local json_str = api.curl_logic(geoip_api)
-		local json = jsonc.parse(json_str)
+		local return_code, content = api.curl_logic(geoip_api)
+		local json = jsonc.parse(content)
 		if json.tag_name and json.assets then
 			for _, v in ipairs(json.assets) do
 				if v.name and v.name == "geoip.dat.sha256sum" then
@@ -101,8 +101,8 @@ end
 local function fetch_geosite()
 	--请求geosite
 	xpcall(function()
-		local json_str = api.curl_logic(geosite_api)
-		local json = jsonc.parse(json_str)
+		local return_code, content = api.curl_logic(geosite_api)
+		local json = jsonc.parse(content)
 		if json.tag_name and json.assets then
 			for _, v in ipairs(json.assets) do
 				if v.name and v.name == "geosite.dat.sha256sum" then

luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=186
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \

luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua

@@ -147,7 +147,7 @@ o.rawhtml = true
 o.template = "shadowsocksr/ssrurl"
 o.value = sid
 
-o = s:option(ListValue, "type", translate("Server Node Type"))
+o = s:option(Value, "type", translate("Server Node Type"))
 if is_finded("xray") or is_finded("v2ray") then
 	o:value("v2ray", translate("V2Ray/XRay"))
 end
@@ -715,14 +715,20 @@ o.default = "0"
 if is_finded("xray") then
 	-- [[ uTLS ]]--
 	o = s:option(ListValue, "fingerprint", translate("Finger Print"))
-	o:value("disable", translate("disable"))
-	o:value("firefox", translate("firefox"))
+	o:value("", translate("disable"))
 	o:value("chrome", translate("chrome"))
+	o:value("firefox", translate("firefox"))
 	o:value("safari", translate("safari"))
+	o:value("ios", translate("ios"))
+	o:value("android", translate("android"))
+	o:value("edge", translate("edge"))
+	o:value("360", translate("360"))
+	o:value("qq", translate("qq"))
+	o:value("random", translate("random"))
 	o:value("randomized", translate("randomized"))
 	o:depends({type = "v2ray", tls = true})
 	o:depends({type = "v2ray", xtls = true})
-	o.default = "disable"
+	o.default = ""
 end
 
 o = s:option(Value, "tls_host", translate("TLS Host"))

luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm

@@ -315,6 +315,7 @@ function import_ssr_url(btn, urlname, sid) {
 					document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_flow')[0].value = params.get("flow") || "xtls-rprx-splice";
 					document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_flow')[0].dispatchEvent(event);
 				}
+				document.getElementsByName('cbid.shadowsocksr.' + sid + '.fingerprint')[0].value = params.get("fp") || "";
 				document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = params.get("sni") || "";
 			}
 			switch (params.get("type")) {

luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus

@@ -32,6 +32,7 @@ sed -i "s/option pdnsd_enable '3'/option pdnsd_enable '1'/g" /etc/config/shadows
 sed -i "s/option type 'vmess'/option type 'v2ray'\n\toption v2ray_protocol 'vmess'/g" /etc/config/shadowsocksr
 sed -i "s/option type 'vless'/option type 'v2ray'\n\toption v2ray_protocol 'vless'/g" /etc/config/shadowsocksr
 sed -i "s/option encrypt_method_v2ray_ss/option encrypt_method_ss/g" /etc/config/shadowsocksr
+sed -i "/option fingerprint 'disable'/d" /etc/config/shadowsocksr
 
 if [ -s "/etc/uwsgi/vassals/luci-webui.ini" ];then
 	limit=$(cat /etc/uwsgi/vassals/luci-webui.ini  | grep -Eo "limit-as.*"|grep -Eo "[0-9]+")

luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua

@@ -366,6 +366,7 @@ local function processData(szType, content)
 		result.tls_host = params.sni
 		result.xtls = params.security == "xtls" and "1" or nil
 		result.vless_flow = params.flow
+		result.fingerprint = params.fp
 		if result.transport == "ws" then
 			result.ws_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil
 			result.ws_path = params.path and UrlDecode(params.path) or "/"