From 6b0b19a1ae07d466a9dd27ef03b3d3eef40e658d Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sun, 16 Feb 2020 13:01:57 +0800
Subject: [PATCH] Merge Lean' source

---
 .../root/usr/share/adbyby/admem.sh            |  6 ++--
 .../root/usr/share/adbyby/adupdate.sh         |  6 ++--
 .../luasrc/view/shadowsocksr/server_list.htm  | 30 +++++++++----------
 .../luasrc/view/shadowsocksr/socket.htm       |  2 +-
 .../root/usr/share/shadowsocksr/subscribe.lua |  6 +++-
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh
index a7905d67b0..5d2f78f396 100755
--- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh
+++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh
@@ -8,11 +8,11 @@ if [ ! -f "/tmp/adbyby.updated" ];then
     wget-ssl --spider --quiet --tries=1 --timeout=3 www.baidu.com
     if [ "$?" == "0" ]; then
       wget_ok="1"
-      touch /tmp/lazy.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/lazy.txt https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/lazy.txt
-      touch /tmp/video.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/video.txt https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/video.txt
+      touch /tmp/lazy.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/lazy.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/lazy.txt
+      touch /tmp/video.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/video.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/video.txt
       
       touch /tmp/local-md5.json && md5sum /tmp/lazy.txt /tmp/video.txt > /tmp/local-md5.json
-      touch /tmp/md5.json && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/md5.json https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/md5.json
+      touch /tmp/md5.json && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/md5.json https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/md5.json
       
       lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
       video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')  
diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
index 743ccc0934..28125d4556 100755
--- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
+++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
@@ -3,7 +3,7 @@
 rm -f /usr/share/adbyby/data/*.bak
 
 touch /tmp/local-md5.json && md5sum /usr/share/adbyby/data/lazy.txt /usr/share/adbyby/data/video.txt > /tmp/local-md5.json
-touch /tmp/md5.json && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/md5.json https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/md5.json
+touch /tmp/md5.json && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/md5.json https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/md5.json
 
 lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
 video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')  
@@ -12,8 +12,8 @@ video_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '4
 
 if [ "$lazy_online"x != "$lazy_local"x -o "$video_online"x != "$video_local"x ]; then
     echo "MD5 not match! Need update!"
-    touch /tmp/lazy.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/lazy.txt https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/lazy.txt
-    touch /tmp/video.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/video.txt https://coding.net/u/adbyby/p/xwhyc-rules/git/raw/master/video.txt
+    touch /tmp/lazy.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/lazy.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/lazy.txt
+    touch /tmp/video.txt && wget-ssl --no-check-certificate -t 1 -T 10 -O /tmp/video.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/video.txt
     touch /tmp/local-md5.json && md5sum /tmp/lazy.txt /tmp/video.txt > /tmp/local-md5.json
     lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
     video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')
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
index 7318e38a8e..be523e600e 100644
--- 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
@@ -14,6 +14,8 @@ local dsp = require "luci.dispatcher"
 			const dom = doms[index];
 			const port = ports[index];
 			if (!dom) res()
+			port.innerHTML = '<font color="#0072c3">connecting...</font>';
+
 			XHR.get('<%=dsp.build_url("admin/services/shadowsocksr/ping")%>', {
 				index,
 				domain: dom.getAttribute("hint"),
@@ -28,24 +30,22 @@ local dsp = require "luci.dispatcher"
 				}
 				dom.innerHTML = `<font color="${col}">${(result.ping ? result.ping : "--") + " ms"}</font>`
 				if (result.socket) {
-					port.innerHTML = '<font color="#249400">ok</font>'
+					port.innerHTML = '<font color="#249400">ok</font>';
 				} else {
-					port.innerHTML = '<font color="#ff0000">fail</font>'
+					port.innerHTML = '<font color="#ff0000">fail</font>';
 				}
-				res()
+				res();
 			});
 		})
 	}
-	(async () => {
-		for (let group = 0; group < Math.ceil(doms.length / 5); group++) {
-			await Promise.all([
-				xhr(group * 5 + 0),
-				xhr(group * 5 + 1),
-				xhr(group * 5 + 2),
-				xhr(group * 5 + 3),
-				xhr(group * 5 + 4),
-			])
+	let task = -1;
+	const thread = () => {
+		task = task + 1
+		if (doms[task]) {
+			xhr(task).then(thread);
 		}
-	})()
-	//]]>
-</script>
+	}
+	for (let i = 0; i < 10; i++) {
+		thread()
+	}
+</script>
\ No newline at end of file
diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/socket.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/socket.htm
index 6cba5bc856..714fb56bf9 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/socket.htm
+++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/socket.htm
@@ -1,3 +1,3 @@
 <%+cbi/valueheader%>
-<span class="socket-connected" hint="<%=self:cfgvalue(section)%>">connecting</span>
+<span class="socket-connected" hint="<%=self:cfgvalue(section)%>">wait</span>
 <%+cbi/valuefooter%>
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
index 7f64aaf75e..96ca3dd5ff 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
@@ -105,7 +105,6 @@ local function processData(szType, content)
 -- 		kcp_port = 0,
 		kcp_param = '--nocomp'
 	}
-	result.hashkey = type(content) == 'string' and md5(content) or md5(jsonStringify(content))
 	if szType == 'ssr' then
 		local dat = split(content, "/\\?")
 		local hostInfo = split(dat[1], ':')
@@ -226,6 +225,11 @@ local function processData(szType, content)
 	if not result.alias then
 		result.alias = result.server .. ':' .. result.server_port
 	end
+	-- alias 不参与 hashkey 计算
+	local alias = result.alias
+	result.alias = nil
+	result.hashkey = md5(jsonStringify(result))
+	result.alias = alias
 	return result
 end
 -- wget