🚀 dashboard v0.13.29 前端断开后自动重连

README.md

@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.28&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.6-brightgreen?style=for-the-badge&logo=linux">
+<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.29&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.6-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring: Self-hosted, lightweight server and website monitoring and O&M tool.</b></p>

resource/template/theme-daynight/home.html

@@ -256,8 +256,11 @@
             }
         })
         const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
+        let canShowError = true;
+        function connect() {
             const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws');
             ws.onopen = function (evt) {
+                canShowError = true;
                 Swal.fire({
                     position: 'top',
                     icon: 'success',
@@ -285,6 +288,8 @@
                 }
             }
             ws.onclose = function () {
+                if (canShowError) {
+                    canShowError = false;
                     Swal.fire({
                         position: 'top',
                         icon: 'error',
@@ -293,8 +298,16 @@
                         showConfirmButton: false,
                         timer: 2000
                     });
-
                 }
+                setTimeout(function () {
+                    connect()
+                }, 3000);
+            }
+            ws.onerror = function () {
+                ws.close()
+            }
+        }
+        connect();
     </script>
 </body>
 

resource/template/theme-default/home.html

@@ -262,9 +262,12 @@
     return dest;
   }
 
+  let canShowError = true;
+  function connect() {
     const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
     const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws');
     ws.onopen = function (evt) {
+      canShowError = true;
       $.suiAlert({
         title: '{{tr "RealtimeChannelEstablished"}}',
         description: '{{tr "GetTheLatestMonitoringDataInRealTime"}}',
@@ -292,6 +295,8 @@
       statusCards.groups = groupingData(statusCards.servers, "Tag")
     }
     ws.onclose = function () {
+      if (canShowError) {
+        canShowError = false;
         $.suiAlert({
           title: '{{tr "RealtimeChannelDisconnect"}}',
           description: '{{tr "CanNotGetTheLatestMonitoringDataInRealTime"}}',
@@ -300,8 +305,17 @@
           position: 'top-center',
         });
       }
-  $('.ui.accordion')
+      setTimeout(function () {
-    .accordion({ "exclusive": false })
+        connect()
-    ;
+      }, 3000);
+    }
+    ws.onerror = function () {
+      ws.close()
+    }
+  }
+
+  connect();
+
+  $('.ui.accordion').accordion({ "exclusive": false });
 </script>
 {{end}}

resource/template/theme-hotaru/home.html

@@ -243,8 +243,11 @@
         })
 
         const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
+        let canShowError = true;
+        function connect() {
             const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws');
             ws.onopen = function (evt) {
+                canShowError = true;
                 $.suiAlert({
                     title: '{{tr "RealtimeChannelEstablished"}}',
                     description: '{{tr "GetTheLatestMonitoringDataInRealTime"}}',
@@ -270,6 +273,8 @@
                 }
             }
             ws.onclose = function () {
+                if (canShowError) {
+                    canShowError = false;
                     $.suiAlert({
                         title: '{{tr "RealtimeChannelDisconnect"}}',
                         description: '{{tr "CanNotGetTheLatestMonitoringDataInRealTime"}}',
@@ -278,6 +283,15 @@
                         position: 'top-center',
                     });
                 }
+                setTimeout(function () {
+                    connect()
+                }, 3000);
+            }
+            ws.onerror = function () {
+                ws.close()
+            }
+        }
+        connect()
     </script>
 </body>
 

resource/template/theme-mdui/home.html

@@ -228,13 +228,16 @@
     })
 
     const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
+    let canShowError = true;
+    function connect() {
       const ws = new WebSocket(wsProtocol + '://' + window.location.host + '/ws');
       ws.onopen = function (evt) {
+        canShowError = true;
         mdui.snackbar({
           message: '{{tr "RealtimeChannelEstablished"}}',
           timeout: 2000,
           position: 'top',
-          onClosed: function(){
+          onClosed: function () {
             mdui.mutation();
           }
         });
@@ -275,19 +278,30 @@
                 else {
                   if (document.getElementById(`mem-${ns.ID}`)) memTooltip[ns.ID] = new mdui.Tooltip(`#mem-${ns.ID}`, {});
                 }
-                    } else {mdui.$('div').remove('.mdui-tooltip'); infoTooltip = {}; memTooltip = {};}
+              } else { mdui.$('div').remove('.mdui-tooltip'); infoTooltip = {}; memTooltip = {}; }
             }
           }
         }
         mdui.mutation();
       }
       ws.onclose = function () {
+        if (canShowError) {
+          canShowError = false;
           mdui.snackbar({
             message: '{{tr "RealtimeChannelDisconnect"}}',
             timeout: 2000,
             position: 'top',
           });
         }
+        setTimeout(function () {
+          connect()
+        }, 3000);
+      }
+      ws.onerror = function () {
+        ws.close()
+      }
+    }
+    connect();
   </script>
 </body>
 </html>

service/singleton/singleton.go

@@ -12,7 +12,7 @@ import (
 	"github.com/naiba/nezha/pkg/utils"
 )
 
-var Version = "v0.13.28" // ！！记得修改 README 中的 badge 版本！！
+var Version = "v0.13.29" // ！！记得修改 README 中的 badge 版本！！
 
 var (
 	Conf  *model.Config