-
-
-
-
<%:Not a subscription link!!!%>
+
+
<%:Add the node via the link%>
+
+
+
<%:Enter share links, one per line. Subscription links are not supported!%>
-
-
\ No newline at end of file
+
+
+
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
index 3f38e89bb..4e487a5e6 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_share_man.htm
@@ -487,22 +487,33 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
}
url += params;
} else if ((v_type === "Hysteria2") || (v_type === "sing-box" && opt.get(dom_prefix + "protocol").value === "hysteria2")) {
- protocol = "hysteria2";
+ protocol = "hysteria2"
var v_port = opt.get(dom_prefix + "port");
var params = "";
params += opt.query("sni", dom_prefix + "tls_serverName");
params += opt.query("insecure", dom_prefix + "tls_allowInsecure");
var v_password = null;
- params += opt.query("obfs", "salamander");
+
if (v_type === "Hysteria2") {
v_password = opt.get("hysteria2_auth_password");
- params += opt.query("obfs-password", "hysteria2_obfs");
params += opt.query("pinSHA256", "hysteria2_tls_pinSHA256");
+ var dom_obfs = opt.get("hysteria2_obfs");
+ if (dom_obfs && dom_obfs.value != "") {
+ params += "&obfs=" + "salamander";
+ params += opt.query("obfs-password", "hysteria2_obfs");
+ }
+ params += opt.query("mport", "hysteria2_hop");
} else {
v_password = opt.get(dom_prefix + "hysteria2_auth_password");
- params += opt.query("obfs-password", dom_prefix + "hysteria2_obfs_password");
+ var dom_obfs_type = opt.get(dom_prefix + "hysteria2_obfs_type");
+ if (dom_obfs_type && dom_obfs_type.value != "") {
+ params += opt.query("obfs", dom_prefix + "hysteria2_obfs_type");
+ params += opt.query("obfs-password", dom_prefix + "hysteria2_obfs_password");
+ }
+ params += opt.query("mport", dom_prefix + "hysteria2_hop");
}
+ params = params.replace(/^&/, "");
url =
_address + ":" +
v_port.value + "?" +
@@ -1289,6 +1300,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
opt.set(dom_prefix + 'hysteria2_obfs_type', "salamander");
opt.set(dom_prefix + 'hysteria2_obfs_password', queryParam["obfs-password"]);
}
+ opt.set(dom_prefix + 'hysteria2_hop', queryParam.mport || "");
} else if (has_hysteria2) {
opt.set('type', "Hysteria2");
dom_prefix = "hysteria2_"
@@ -1299,12 +1311,13 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
if (queryParam.pinSHA256) {
opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pinSHA256);
}
+ opt.set(dom_prefix + 'hop', queryParam.mport || "");
}
opt.set(dom_prefix + 'address', m.hostname);
opt.set(dom_prefix + 'port', m.port || "443");
- opt.set(dom_prefix + 'tls_serverName', queryParam.sni);
+ opt.set(dom_prefix + 'tls_serverName', queryParam.sni || "");
if (queryParam.insecure && queryParam.insecure == "1") {
opt.set(dom_prefix + 'tls_allowInsecure', true);
}
diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po
index 0708bb6fb..2b6784bea 100644
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@@ -265,11 +265,8 @@ msgstr "添加节点"
msgid "Add the node via the link"
msgstr "通过链接添加节点"
-msgid "Share Link"
-msgstr "分享链接"
-
-msgid "Not a subscription link!!!"
-msgstr "不是订阅链接！！！"
+msgid "Enter share links, one per line. Subscription links are not supported!"
+msgstr "输入分享链接，支持多个节点，每行一个。请勿输入订阅链接！"
msgid "Please enter the correct link."
msgstr "请输入正确的链接。"
@@ -1492,9 +1489,6 @@ msgstr "空闲超时 "
msgid "Hop Interval"
msgstr "端口跳跃时间 "
-msgid "Additional ports for hysteria hop"
-msgstr "端口跳跃额外端口"
-
msgid "HeartbeatPeriod(second)"
msgstr "心跳周期（单位：秒）"
@@ -1690,5 +1684,5 @@ msgstr "当选择的出站发生变化时中断现有连接。"
msgid "Port hopping range"
msgstr "端口跳跃范围"
-msgid "Format as 1000:2000 Multiple groups are separated by commas (,)."
-msgstr "格式为：1000:2000 多组时用逗号(,)隔开。"
+msgid "Format as 1000:2000 or 1000-2000 Multiple groups are separated by commas (,)."
+msgstr "格式为：1000:2000 或 1000-2000 多组时用逗号(,)隔开。"
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index 3b081e4f4..1b0dc810b 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -1222,13 +1222,8 @@ local function processData(szType, content, add_mode, add_from)
result.tls_allowInsecure = allowInsecure_default and "1" or "0"
end
result.hysteria2_tls_pinSHA256 = params.pinSHA256
+ result.hysteria2_hop = params.mport
- if has_hysteria2 then
- result.type = "Hysteria2"
- if params["obfs-password"] then
- result.hysteria2_obfs = params["obfs-password"]
- end
- end
if hysteria2_type_default == "sing-box" and has_singbox then
result.type = 'sing-box'
result.protocol = "hysteria2"
@@ -1236,6 +1231,11 @@ local function processData(szType, content, add_mode, add_from)
result.hysteria2_obfs_type = "salamander"
result.hysteria2_obfs_password = params["obfs-password"]
end
+ elseif has_hysteria2 then
+ result.type = "Hysteria2"
+ if params["obfs-password"] then
+ result.hysteria2_obfs = params["obfs-password"]
+ end
end
elseif szType == 'tuic' then
local alias = ""
@@ -1593,7 +1593,7 @@ local function parse_link(raw, add_mode, add_from, cfgid)
end
for _, v in ipairs(nodes) do
- if v then
+ if v and not string.match(v, "^%s*$") then
xpcall(function ()
local result
if szType == 'ssd' then
@@ -1771,12 +1771,9 @@ if arg[1] then
log('订阅完毕...')
elseif arg[1] == "add" then
local f = assert(io.open("/tmp/links.conf", 'r'))
- local content = f:read('*all')
+ local raw = f:read('*all')
f:close()
- local nodes = split(content:gsub(" ", "\n"), "\n")
- for _, raw in ipairs(nodes) do
- parse_link(raw, "1", "导入")
- end
+ parse_link(raw, "1", "导入")
update_node(1)
luci.sys.call("rm -f /tmp/links.conf")
elseif arg[1] == "truncate" then