From 0db7b6c1b45854a2b581b35712aa75184e146725 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Wed, 9 Oct 2019 00:18:25 -0700
Subject: [PATCH] luci-ssr-plus: add Ping Latency detection support

---
 package/lean/luci-app-ssr-plus/Makefile       |   2 +-
 .../luasrc/controller/shadowsocksr.lua        | Bin 6666 -> 6513 bytes
 .../luasrc/model/cbi/shadowsocksr/servers.lua |   5 ++++
 .../luasrc/view/shadowsocksr/ping.htm         |   3 +++
 .../luasrc/view/shadowsocksr/server_list.htm  |  24 ++++++++++++++++++
 .../luci-app-ssr-plus/po/zh-cn/ssr-plus.po    |   3 +++
 6 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ping.htm
 create mode 100644 package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 05d3750ec..ce45a7949 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=1
-PKG_RELEASE:=100
+PKG_RELEASE:=101
 
 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
index ef3b53e676aa56e8deaccb653b8e9cb18141a901..f819c74f8c3e2fce81ab3037d5dcc7d7416c469b 100644
GIT binary patch
literal 6513
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
Y8F6%k9eG880Jflc@kL2b{p=z5A8|)&^#A|>

literal 6666
zcmb_g-ESMm5uZICB~g~`Hch0Yag#%8!!{C%iQ@!8;2L|fL<NbFq!9`Otpee6JW5wn
zJofG=*{B07QAkexo|hnf?Q8#lKJ;i?GSWWxrO0C++W(@z**zXfec1gXaJ;?Qo!Qyn
z%+Aj2%Qw5;Pf6IeJ!R9_&nkTn-(@_mB-&L(dzlpHq!Q;rn<PQ!L7$X(qi<5-o#CC~
zO#=NEy+VpAL}X9mZ!2naTLIZWLc7)V!+Aeyr*YJ31@U~c={2IAB=T=3G1*fX(eeD-
z-Ufy<YZ3%rt3~z%+F`p9+#&lEnx3DoC8?Ko6S7a^+uscQ+hdeCXvRUZxz_Mf&+wQr
zohVNA%D_b|wZ;u7|4;n!iYKI`2_?zRh|VbzKa@nXM2c55){m8**e_jj^Zr}P9r6RA
z4@rq05b8^dM9-pipt_sk8#Lis<bu`{CHh7wYhRWyrbORC5794SK4n$p;+JJDhpbUK
zE_l`@S-Z-nerAK8gyt9JL;Q~)9LwJ;8~&_J`;Z~Tgyt*vY;xTRIwwd#CK;VfpXh_G
zbvi+&m>lXPCx<%qCUc!8pTR$6_~jJ!)zpx`KV|qu<>~xxWjMd8jPO@-{^=n<jo4l?
z9kvH;mdfgQyr#$T>Q4{x5~s%Ta!;B0dZ0fIul}jwdTC~;uRD|T&pd;F#_-c=_}6Lr
zh6uYBetn$3^iB`QX3rQa&J4%OGtZElk7b)>7+d(^S+fTB?9<oKJ3E{!J8R~G-&N$}
z2fPQd91{-O;hiudyM*s1!T?7L&-a4_?U&H51*u;{plOC1wecYH@}b_1DB5TRYt8N&
z0u|y8$E`T<8qJV{)(pPhytBCEE-oxB)u+we0pizP)ASl!VcRezLA)J80~3?RC*@G%
zwL&k~)Nh55LAC|*8reU<Yeh%G6^?|TIiI$=$?H^^2HobrM$icm{=gy-utD(GL$aSo
zV|1F@KrF||m6gw&8~HRGxLSeNG!d5d3}R@)lD*iEw${TomioeBam7G}?3jtF24Az@
zm4Jmh9|OaLDy*6g=XtC@Mtae67Gqs)I_HKt8L09K^J}%k1UPZ48O2*<KZn+sDlI*L
zjka9B<=o`2$|dGzlGoVw+J4X=8!>#GZ`j2m-F%?45~OL^-oO&Bun=BHt((L(KvYYT
zxN0yNoK6hnF?JXXI)a<&C~zCtX+>LvD%W^QeeUIl+Yt*7PCXv9Vg^;}%*76-k2nLC
zuaC{6XCt4m`Ppd9HhxgDM`$VfoYZIS$hoOKuN7^O{e6rZw*phyF>j(#`4kQP6?d^W
z4xQNOJMw!Aly?oa#Fk<`mLySKWmL~H>XD#TM3P&wuTRqj^erG7R3s@gu8(njjI(G}
zk|=2MAx4p=ar9uh+AX128)nXZ3`vR6H@S;#!OmvzW3@VoQ{8dyIU8}%ao7W5M3&Bg
zP~A2i*K3VnyVmX^Sz*63LN?R1LpJA99WZ-wu*N>GH$DUCbvmuk_tG$G*M6BqIZ``u
zm<DV5n*|;Iy$8aAA=*F2Ti`hksh$+{g39}VOr3Hhfa0<ew1j64=*%ioF7l6MWzj6q
zbg87<g-rQ~da5*nDqG|cJ&?!+!1LRTzGTE1U0#&^BL2p9jCLSrXJ==A6m16C;KMfI
zy}j+Vx`;wHK9c}@o+B?(#VzN(H=Vbgw+wRv^p7)@0i8u*K$6DVwiZ6$G(i^Z|GgcI
zD`Vp0ev2S}Z8|1T!y3G>!$~A3gL4vzpn6{I0{Fem6??QGI0@tflKI&XJs9GCZipTX
z!R=l2?Wr4LFS{Waa2x>iSEPu{cVCuh7tb8IVwTRR(XoArBoKxvXlhXm5<^K$FH;7i
zv78r`dN4~<Lw-HBto!b(GISV@-AB8OWbr%j-O5PJW~FgHq}6&}H9`B?1Rc;5QAQFf
zg`#uV$7kJT>pRSkdFj5Kz;+g@rzTBXG6tqSrZ*w^lbB0gF8XJ)OKMJj0Nl=if9hDQ
z3XBFA>UEh!Qe!Z{PV(A^YczOFf|g^?eAw7po_ZD@);OO8A9UYkJTM2AOaJlum60*4
zUQ&P%8&A+d))xo#P;k+}w)h)#orOXBS%sd!PkIP;yrKJYT7U1O|3Ezw2iYT0Mv>vd
zk6v(v#k@~|11I)#)Q3HvQ*-no{7I-$9??UBi**z<^%zBoNqR92=w-7u$a^t^Kgk(2
zrYDl(LQgd!o8{yQ@)K1yI%AF89+k;Hv;@CnAG!tqpH=0dek=pYwbl<fmr<BZh-GUD
zJeZ1B1rlNGP0UYE;B)(st=Foop$y<6kbtucUV9%t$zwH!@JY=#z>wz?NXmIEW1RQz
zqJK|Hu_teezCr?z{(_d>6o1D2WfW82V#|Lk)z{q5fs>Cu8}RA!c=YTzAvT(5$NwA6
zoxH}Kz}Hi9Voq|3u)MPoq}3!rVa-8ykOKHy$dkGt47#0awH;M;{I2>zoQ6$4t^$YS
zcJh9$7JEDM8)3THUGE~X$<H<p*)^!ed0Fw^@{%-&2cPrloz$s*;?&Zu4%6n>-@Quq
z)qLi|J$gFK7T!($`F4=j(kN;rHI{D}8Mu?q1${l>Tp2l@b?#Ci!3R1tFqj8-0-x-2
z5Qk+J+O>lnt?)f($9Jm0jB!t+c6VzX$zSCks6aF+YBl_*%US*F0|{J%G};MP|Eqb-
z#A{vCdIPH_QixpOJ3PMQRGUZU)K$!h5=;g^a^M-w2FD-cvgM_lW^sNHA~)e9QCA%}
z7rAt*;$WP^JKj2OdXp=Ko!rI#fPw5Auu#>x$X)=mG}F$!*J+2wHo8^gEH$Z_b|Yv7
z8}OP&Rex7oXea4KXVfV79B=2gQ?0Mwb1v3ye7t%u>}+4HIlp!~ILOoHrPnSbwF`~a
z_G@oA=dZruynUsLEcDX(cP`iXedY3H=ZlNZb%UP28MeJOpv^`j`&H;%SaYmzh<`Cg
z*Nmh5!!d8LoS}`zC7EJ#l#y({JQzWBoPq2wax8fpp0v-fMXJSS3%ukm`%V@2W$jkv
zHIjL+vED+x*g>&4AH^HB!4N&y>w_=tyg4{tgT0x(k1Cuw+HdD-6r0X#=<X9XUEXVw
zsj*GuA$D-xU0^*BRCsw&m5=&!A@IV0_wb%MBIl4L2K`62N+FszwC)YtVLIO!>_`U}
zgsF$?KwadGm}(&L|B^E1*9oZ!4bbGs?{}d5$xvt56WK1VB>D}Seg5tti$|j_`c~b=
z)9YKSJw?5~pudQRmb7paxM0!Wd2i#m!yk4wk_=Z_``|n1JuDscAC`oLn?x4}_<-g<
zDorooW@UlyGo242F2!w@V2Z<Q>#<Y2ZvKzE)!+!jH@c?$<m(fJM;k;<n?%F!#z}-I
z$uf1}g-k#2e8eQKL`^xImt6mAwNzy3T7O9YJ)S?}DG8cb!Mje9evUV1+T8wt+nJ^6
zGN%*TDsM}nJ_PnS&5<=pT9+g~m8!=)OE6JgqNGwNI5T8o7$by5U*UgMk@x^WE+GS}
z%ZKRat6h{&N{MAyY6;Ir@)2?7&sV!Hu60+Xvc~Ah%*N>Iv7Te1C%Fi=mZeQgnN7QR
z^L%r(k1WMPA<VM(b*Z*U5RWY9G4vJvGW`tsAaqBzB9!i<3DbvcWYD(=z30>c@DXZ!
zjmYA$#;-CGtI{|M?<sxfFmkD7tZ8xz(_S;z2%MT+NZ!AY8`^k`4dS74o3Bfpu!HK)
z@fr;j+iOWD@Yi;{_L}EA#sNo<jr^_zA&`s0kpzhS5?5LvvJc`s3_M&N>2{Dt9nkrt
zjQ#C2+zKM9V80kr(ry@1;Y`|35ir|<pR=XW=mDF?T(t7sek)4Q<m-!TP1O00AGM<R
zCl_&X5VS8||Ao2c``r2Dqxow!9#Cwo=MS^QK|?dJtk0dLIF8~&Jgh(2BY<J+9RZBT
I{5!vY0oA}Cq5uE@

diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
index 2aedf4bf2..c2d8a70df 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
@@ -101,4 +101,9 @@ function o.cfgvalue(...)
 	return Value.cfgvalue(...) or "0"
 end
 
+o = s:option(DummyValue,"server",translate("Ping Latency"))
+o.template="shadowsocksr/ping"
+o.width="10%"
+
+m:append(Template("shadowsocksr/server_list"))
 return m
diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ping.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ping.htm
new file mode 100644
index 000000000..8c86aee74
--- /dev/null
+++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ping.htm
@@ -0,0 +1,3 @@
+<%+cbi/valueheader%>
+<span class="pingtime" hint="<%=self:cfgvalue(section)%>">-- ms</span>
+<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
new file mode 100644
index 000000000..9652837ef
--- /dev/null
+++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
@@ -0,0 +1,24 @@
+<%#
+ Copyright 2018-2019 Lienol <lawlienol@gmail.com>
+ Licensed to the public under the Apache License 2.0.
+-%>
+
+<%
+local dsp = require "luci.dispatcher"
+-%>
+
+<script type="text/javascript">
+	//<![CDATA[
+	var pings = document.getElementsByClassName('pingtime');
+	for(var i = 0; i < pings.length; i++) {
+		XHR.get('<%=dsp.build_url("admin/services/shadowsocksr/ping")%>', {
+				index: i,
+				domain: pings[i].getAttribute("hint")
+			},
+			function(x, result) {
+				pings[result.index].innerHTML = (result.ping ? result.ping : "--") + " ms";
+			}
+		);
+	}
+	//]]>
+</script>
\ No newline at end of file
diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
index ac7590ba4..506cf0265 100644
--- a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
+++ b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
@@ -508,3 +508,6 @@ msgstr "所有端口（默认）"
 
 msgid "Only Common Ports"
 msgstr "仅常用端口（不走P2P流量到代理）"
+
+msgid "Ping Latency"
+msgstr "Ping延迟"