diff --git a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua index 9a5b31aa8e..3fc82abe03 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua @@ -132,7 +132,7 @@ function change_node() if sid ~= "" then uci:set("vssr", name, "global_server", sid) uci:commit("vssr") - luci.sys.call("uci commit vssr && /etc/init.d/vssr restart") + luci.sys.call("/etc/init.d/vssr restart") e.status = true end luci.http.prepare_content("application/json") @@ -271,13 +271,27 @@ if luci.sys.call("ps -w | grep trojan-server | grep -v grep >/dev/null") == 0 th end function act_ping() - local e={} - e.index=luci.http.formvalue("index") - e.ping=luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain")) + local e = {} + local domain = luci.http.formvalue("domain") + local port = luci.http.formvalue("port") + e.index = luci.http.formvalue("index") + local iret = luci.sys.call(" ipset add ss_spec_wan_ac " .. domain .. " 2>/dev/null") + local socket = nixio.socket("inet", "stream") + socket:setopt("socket", "rcvtimeo", 3) + socket:setopt("socket", "sndtimeo", 3) + e.socket = socket:connect(domain, port) + socket:close() + e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain) + if (iret == 0) then + luci.sys.call(" ipset del ss_spec_wan_ac " .. domain) + end luci.http.prepare_content("application/json") luci.http.write_json(e) end + + + function check_status() local set ="/usr/bin/ssr-check www." .. luci.http.formvalue("set") .. ".com 80 3 1" sret=luci.sys.call(set) diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua index 1bde3939fe..cd851d720f 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua @@ -104,6 +104,9 @@ function o.cfgvalue(...) return Value.cfgvalue(...) or "?" end +o = sec:option(DummyValue,"vmess_id",translate("ID")) +o.width="10%" + o = sec:option(DummyValue, "encrypt_method", translate("Encrypt Method")) o.width="10%" diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua index 6dceaf2e2c..5d08a9ebc6 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua @@ -55,18 +55,15 @@ function o.cfgvalue(...) return Value.cfgvalue(...) or "?" end -o = s:option(DummyValue, "encrypt_method", translate("Encrypt Method")) + +o = s:option(DummyValue,"security",translate("Encrypt Method")) o.width="10%" -o = s:option(DummyValue, "protocol", translate("Protocol")) -o.width="10%" -o = s:option(DummyValue, "obfs", translate("Obfs")) + +o = s:option(DummyValue, "server_port", translate("Socket Connected")) +o.template="vssr/socket" o.width="10%" -o = s:option(Flag, "switch_enable", translate("Enable Auto Switch")) -function o.cfgvalue(...) - return Value.cfgvalue(...) or "?" -end o = s:option(DummyValue,"server",translate("Ping Latency")) o.template="vssr/ping1" diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua index e6252ca610..f6a3b26f41 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua @@ -36,7 +36,8 @@ end o.default=2 o.rmempty = false -o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL")) +o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL"), + translate("Before subscribing please click below to delete all servers in the subscription")) o.rmempty = true o = s:option(Flag, "proxy", translate("Through proxy update")) diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/server_list.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/server_list.htm index 341d4c27db..ac62dbc38f 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/server_list.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/server_list.htm @@ -2,23 +2,50 @@ Copyright 2018-2019 Lienol Licensed to the public under the Apache License 2.0. -%> - <% local dsp = require "luci.dispatcher" -%> - \ No newline at end of file diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/socket.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/socket.htm new file mode 100644 index 0000000000..d075ff94b8 --- /dev/null +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/socket.htm @@ -0,0 +1,3 @@ +<%+cbi/valueheader%> +wait +<%+cbi/valuefooter%> \ No newline at end of file diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/subscribe.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/subscribe.htm new file mode 100644 index 0000000000..45cb43aa80 --- /dev/null +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/subscribe.htm @@ -0,0 +1,18 @@ +<%+cbi/valueheader%> + + + +<%+cbi/valuefooter%> diff --git a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po index 383f04fba3..5c3a2d11c4 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po @@ -764,6 +764,9 @@ msgstr "启用管理控制台" msgid "Service Port" msgstr "端口" +msgid "Socket Connected" +msgstr "连接测试" + msgid "Enable HTTP Proxy" msgstr "启用HTTP代理" @@ -771,5 +774,14 @@ msgstr "启用HTTP代理" msgid "HTTP Port" msgstr "HTTP代理端口" +msgid "plugin" +msgstr "插件" + +msgid "Plugin Opts" +msgstr "插件参数" + +msgid "Before subscribing please click below to delete all servers in the subscription" +msgstr "订阅前请点击下面的删除所有服务器在订阅" + diff --git a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css index 8ad39f9743..2a3443294b 100644 --- a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css +++ b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css @@ -312,7 +312,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md position: relative; background: #CCFFFF; margin: 10px; - padding: 8px 15px 10px 70px; + padding: 18px 18px 18px 88px; box-shadow: 0 0 1rem 0 rgba(136,152,170,.75); border-radius: .5rem; border: 0; @@ -464,10 +464,10 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md background-color: #336633 !important; border-color: #2e6da4 !important; font-size:12px; - padding:0.5rem 0.8rem; + padding:0.6rem 0.8rem; float:right; margin-right:10px; - margin-top:0rem; + margin-top:-0.3rem; }