From e4087ab694295402668ece4b379f75ec9dad8dfc Mon Sep 17 00:00:00 2001
From: Windy_CI <windy@windycloud.cn>
Date: Sun, 1 Sep 2024 13:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=83=A8=E5=88=86=E7=9A=84frpc=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 luci-app-frpc/luasrc/controller/frpc.lua      |  1 +
 luci-app-frpc/luasrc/view/frp/frp_status.htm  | 22 ---------------
 .../luasrc/view/frpc/frpc_status.htm          | 27 +++++++++++++++++++
 3 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 luci-app-frpc/luasrc/view/frp/frp_status.htm
 create mode 100644 luci-app-frpc/luasrc/view/frpc/frpc_status.htm

diff --git a/luci-app-frpc/luasrc/controller/frpc.lua b/luci-app-frpc/luasrc/controller/frpc.lua
index 5e0050c..7c7ad06 100644
--- a/luci-app-frpc/luasrc/controller/frpc.lua
+++ b/luci-app-frpc/luasrc/controller/frpc.lua
@@ -13,6 +13,7 @@ end
 function act_status()
 	local e = {}
 	e.running = luci.sys.call("pidof frpc > /dev/null") == 0
+	e.bin_version = luci.sys.exec("frpc -v")
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(e)
 end
diff --git a/luci-app-frpc/luasrc/view/frp/frp_status.htm b/luci-app-frpc/luasrc/view/frp/frp_status.htm
deleted file mode 100644
index 96c8734..0000000
--- a/luci-app-frpc/luasrc/view/frp/frp_status.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[frpc]], [[status]])%>', null,
-	function(x, data) {
-		var tb = document.getElementById('frpc_status');
-		if (data && tb) {
-			if (data.running) {
-				var links = '<em><b><font color=green>Frpc <%:RUNNING%></font></b></em>';
-				tb.innerHTML = links;
-			} else {
-				tb.innerHTML = '<em><b><font color=red>Frpc <%:NOT RUNNING%></font></b></em>';
-			}
-		}
-	}
-);
-//]]>
-</script>
-<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<p id="frpc_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
diff --git a/luci-app-frpc/luasrc/view/frpc/frpc_status.htm b/luci-app-frpc/luasrc/view/frpc/frpc_status.htm
new file mode 100644
index 0000000..53ab856
--- /dev/null
+++ b/luci-app-frpc/luasrc/view/frpc/frpc_status.htm
@@ -0,0 +1,27 @@
+<script type="text/javascript">//<![CDATA[
+XHR.poll(3, '<%=url([[admin]], [[services]], [[frpc]], [[status]])%>', null,
+	function(x, data) {
+		var tb = document.getElementById('frpc_status');
+		if (data && tb) {
+			if (data.running) {
+				tb.innerHTML = '<em><b><font color=green> <%:Frpc%> ' + data.bin_version + '<%:RUNNING%></font></b></em><input class="btn cbi-button mar-10" type="button" value="<%:Open Frpc page%>" onclick="openwebui();" />';
+			} else {
+				tb.innerHTML = '<em><b><font color=red> <%:Frpc%> ' + data.bin_version + '<%:NOT RUNNING%></font></b></em>';
+			}
+		}
+	}
+);
+
+function openwebui(){
+	var url = window.location.host+":<%=luci.sys.exec("uci -q get frpc.common.transport_webServer_port"):gsub("^%s*(.-)%s*$", "%1")%>";
+	window.open('http://'+url,'target','');
+}
+
+//]]>
+</script>
+<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
+<fieldset class="cbi-section">
+	<p id="frpc_status">
+		<em><%:Collecting data...%></em>
+	</p>
+</fieldset>