From 9e902fc82f2a2afddcdde918f2ef38c70a05c2ae Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza.ahmadi@tzconnect.com>
Date: Fri, 24 Mar 2023 12:24:12 +0100
Subject: [PATCH] Add version and log

---
 web/controller/server.go               | 21 +++++++++---
 web/html/xui/index.html                | 37 +++++++++++++++++++-
 web/service/server.go                  | 47 ++++++++++++++++++++------
 web/service/tgbot.go                   |  1 +
 web/translation/translate.en_US.toml   |  4 +--
 web/translation/translate.fa_IR.toml   |  4 +--
 web/translation/translate.zh_Hans.toml |  4 +--
 7 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/web/controller/server.go b/web/controller/server.go
index 673a96d8..7b7239d5 100644
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -1,10 +1,11 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
 	"time"
 	"x-ui/web/global"
 	"x-ui/web/service"
+
+	"github.com/gin-gonic/gin"
 )
 
 type ServerController struct {
@@ -37,6 +38,7 @@ func (a *ServerController) initRouter(g *gin.RouterGroup) {
 	g.POST("/stopXrayService", a.stopXrayService)
 	g.POST("/restartXrayService", a.restartXrayService)
 	g.POST("/installXray/:version", a.installXray)
+	g.POST("/logs", a.getLogs)
 }
 
 func (a *ServerController) refreshStatus() {
@@ -87,13 +89,13 @@ func (a *ServerController) installXray(c *gin.Context) {
 }
 
 func (a *ServerController) stopXrayService(c *gin.Context) {
-        a.lastGetStatusTime = time.Now()
+	a.lastGetStatusTime = time.Now()
 	err := a.serverService.StopXrayService()
 	if err != nil {
 		jsonMsg(c, "", err)
 		return
 	}
-	jsonMsg(c, "Xray stoped",err)
+	jsonMsg(c, "Xray stoped", err)
 
 }
 func (a *ServerController) restartXrayService(c *gin.Context) {
@@ -102,6 +104,15 @@ func (a *ServerController) restartXrayService(c *gin.Context) {
 		jsonMsg(c, "", err)
 		return
 	}
-	jsonMsg(c, "Xray restarted",err)
+	jsonMsg(c, "Xray restarted", err)
 
-}
\ No newline at end of file
+}
+
+func (a *ServerController) getLogs(c *gin.Context) {
+	logs, err := a.serverService.GetLogs()
+	if err != nil {
+		jsonMsg(c, I18n(c, "getLogs"), err)
+		return
+	}
+	jsonObj(c, logs, nil)
+}
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index 8ac734eb..9a0f2cf4 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -92,6 +92,8 @@
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
+                            x-ui: <a-tag color="green">{{ .cur_ver }}</a-tag>
+                            <a-tag color="blue" style="cursor: pointer;" @click="openLogs">Logs</a-tag>
                             {{ i18n "pages.index.operationHours" }}:
                             <a-tag color="green">[[ formatSecond(status.uptime) ]]</a-tag>
                             <a-tooltip>
@@ -177,7 +179,7 @@
     <a-modal id="version-modal" v-model="versionModal.visible" title='{{ i18n "pages.index.xraySwitch" }}'
              :closable="true" @ok="() => versionModal.visible = false"
              :class="siderDrawer.isDarkTheme ? darkClass : ''"
-             ok-text='{{ i18n "confirm" }}' cancel-text='{{ i18n "cancel"}}'>
+             footer="">
         <h2>{{ i18n "pages.index.xraySwitchClick"}}</h2>
         <h2>{{ i18n "pages.index.xraySwitchClickDesk"}}</h2>
         <template v-for="version, index in versionModal.versions">
@@ -187,6 +189,17 @@
             </a-tag>
         </template>
     </a-modal>
+    <a-modal id="log-modal" v-model="logModal.visible" title="X-UI logs"
+             :closable="true" @ok="() => logModal.visible = false" @cancel="() => logModal.visible = false"
+             :class="siderDrawer.isDarkTheme ? darkClass : ''"
+             width="800px"
+             footer="">
+        <table style="margin: 0px; width: 100%; background-color: black; color: hsla(0,0%,100%,.65);">
+            <tr v-for="log , index in logModal.logs">
+                <td style="vertical-align: top;">[[ index ]]</td><td>[[ log ]]</td>
+            </tr>
+        </table>
+    </a-modal>
 </a-layout>
 {{template "js" .}}
 <script>
@@ -280,6 +293,18 @@
         },
     };
 
+    const logModal = {
+        visible: false,
+        logs: '',
+        show(logs) {
+            this.visible = true;
+            this.logs = logs;
+        },
+        hide() {
+            this.visible = false;
+        },
+    };
+
     const app = new Vue({
         delimiters: ['[[', ']]'],
         el: '#app',
@@ -287,6 +312,7 @@
             siderDrawer,
             status: new Status(),
             versionModal,
+            logModal,
             spinning: false,
             loadingTip: '{{ i18n "loading"}}',
         },
@@ -346,6 +372,15 @@
                     return;
                 }
             },
+            async openLogs(){
+                this.loading(true);
+                const msg = await HttpUtil.post('server/logs');
+                this.loading(false);
+                if (!msg.success) {
+                    return;
+                }
+                logModal.show(msg.obj);
+            }
         },
         async mounted() {
             while (true) {
diff --git a/web/service/server.go b/web/service/server.go
index c0cff794..44e5a0a6 100644
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -9,7 +9,9 @@ import (
 	"io/fs"
 	"net/http"
 	"os"
+	"os/exec"
 	"runtime"
+	"strings"
 	"time"
 	"x-ui/logger"
 	"x-ui/util/sys"
@@ -200,24 +202,24 @@ func (s *ServerService) GetXrayVersions() ([]string, error) {
 
 func (s *ServerService) StopXrayService() (string error) {
 
-        err := s.xrayService.StopXray()
-                if err != nil {
-                        logger.Error("stop xray failed:", err)
-                        return err
-                }
+	err := s.xrayService.StopXray()
+	if err != nil {
+		logger.Error("stop xray failed:", err)
+		return err
+	}
 
 	return nil
 }
 
 func (s *ServerService) RestartXrayService() (string error) {
 
-        s.xrayService.StopXray()
-        defer func() {
-                err := s.xrayService.RestartXray(true)
-                if err != nil {
-                        logger.Error("start xray failed:", err)
+	s.xrayService.StopXray()
+	defer func() {
+		err := s.xrayService.RestartXray(true)
+		if err != nil {
+			logger.Error("start xray failed:", err)
 		}
-        }()
+	}()
 
 	return nil
 }
@@ -324,3 +326,26 @@ func (s *ServerService) UpdateXray(version string) error {
 	return nil
 
 }
+
+func (s *ServerService) GetLogs() ([]string, error) {
+	// Define the journalctl command and its arguments
+	var cmdArgs []string
+	if runtime.GOOS == "linux" {
+		cmdArgs = []string{"journalctl", "-u", "x-ui", "--no-pager", "-n", "100"}
+	} else {
+		return []string{"Unsupported operating system"}, nil
+	}
+
+	// Run the command
+	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(out.String(), "\n")
+
+	return lines, nil
+}
diff --git a/web/service/tgbot.go b/web/service/tgbot.go
index 0a981bd3..86097b0f 100644
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -276,6 +276,7 @@ func (t *Tgbot) getServerUsage() string {
 		name = ""
 	}
 	info = fmt.Sprintf("💻 Hostname: %s\r\n", name)
+	info += fmt.Sprintf("🚀X-UI Version: %s\r\n", config.GetVersion())
 	//get ip address
 	var ip string
 	var ipv6 string
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 7d341d23..c2f7cab4 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -69,8 +69,8 @@
 "memory" = "Memory"
 "hard" = "Hard disk"
 "xrayStatus" = "xray Status"
-"stopXray" = "Stop xray"
-"restartXray" = "Restart xray"
+"stopXray" = "Stop"
+"restartXray" = "Restart"
 "xraySwitch" = "Switch Version"
 "xraySwitchClick" = "Click on the version you want to switch"
 "xraySwitchClickDesk" = "Please choose carefully, older versions may have incompatible configurations"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 1296dc4d..07049098 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -69,8 +69,8 @@
 "memory" = "حافظه رم"
 "hard" = "حافظه دیسک"
 "xrayStatus" = "وضعیت Xray"
-"stopXray" = "توقف xray"
-"restartXray" = "شروع مجدد xray"
+"stopXray" = "توقف"
+"restartXray" = "شروع مجدد"
 "xraySwitch" = "تغییر ورژن"
 "xraySwitchClick" = "ورژن مورد نظر را انتخاب کنید"
 "xraySwitchClickDesk" = "لطفا با دقت انتخاب کنید ، در صورت انتخاب اشتباه امکان قطعی سیستم وجود دارد ."
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index 18c1e322..313d89ac 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -69,8 +69,8 @@
 "memory" = "内存"
 "hard" = "硬盘"
 "xrayStatus" = "xray 状态"
-"stopXray" = "停止 Xray"
-"restartXray" = "重启 Xray"
+"stopXray" = "停止"
+"restartXray" = "重启"
 "xraySwitch" = "切换版本"
 "xraySwitchClick" = "点击你想切换的版本"
 "xraySwitchClickDesk" = "请谨慎选择，旧版本可能配置不兼容"