update

Author: kindevil

go.mod

@@ -4,6 +4,7 @@ go 1.15
 
 require (
 	github.com/gin-gonic/gin v1.6.3
+	github.com/gorilla/websocket v1.4.2
 	github.com/shirou/gopsutil/v3 v3.20.11
 	github.com/sirupsen/logrus v1.7.0
 	github.com/wonderivan/logger v1.0.0

go.sum

@@ -20,6 +20,8 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=

route/route.go

@@ -10,11 +10,13 @@ package route
 import (
 	"pi-monitor/api"
 	"pi-monitor/controller"
+	"pi-monitor/websocket"
 )
 
 func route() {
 	server.Gin.LoadHTMLGlob("views/**/*")
 	server.Gin.Static("static/", "static/")
 	server.Gin.GET("/", controller.Dashboard)
+	server.Gin.GET("/ws", websocket.HandleWebSocket)
 	server.Gin.GET("/api/get", api.Collect)
 }

service/cpu.go

@@ -23,14 +23,14 @@ type Freq struct {
 }
 
 type CPULoad struct {
-	Percent string
-	Idle    string
-	User    string
-	Sys     string
-	Nice    string
-	Iowait  string
-	Irq     string
-	Softirq string
+	Percent float64
+	Idle    float64
+	User    float64
+	Sys     float64
+	Nice    float64
+	Iowait  float64
+	Irq     float64
+	Softirq float64
 }
 
 var (
@@ -59,14 +59,14 @@ func cpuLoad() *CPULoad {
 	used_total := cur_total - last_total
 
 	cpuload := &CPULoad{
-		Percent: floatToString((1 - ((t.Idle - lastTimesStat.Idle) / used_total)) * 100),
-		Idle:    floatToString((t.Idle - lastTimesStat.Idle) / used_total * 100),
-		User:    floatToString((t.User - lastTimesStat.User) / used_total * 100),
-		Sys:     floatToString((t.System - lastTimesStat.System) / used_total * 100),
-		Nice:    floatToString((t.Nice - lastTimesStat.Nice) / used_total * 100),
-		Iowait:  floatToString((t.Iowait - lastTimesStat.Iowait) / used_total * 100),
-		Irq:     floatToString((t.Irq - lastTimesStat.Irq) / used_total * 100),
-		Softirq: floatToString((t.Softirq - lastTimesStat.Softirq) / used_total * 100),
+		Percent: (1 - ((t.Idle - lastTimesStat.Idle) / used_total)) * 100,
+		Idle:    (t.Idle - lastTimesStat.Idle) / used_total * 100,
+		User:    (t.User - lastTimesStat.User) / used_total * 100,
+		Sys:     (t.System - lastTimesStat.System) / used_total * 100,
+		Nice:    (t.Nice - lastTimesStat.Nice) / used_total * 100,
+		Iowait:  (t.Iowait - lastTimesStat.Iowait) / used_total * 100,
+		Irq:     (t.Irq - lastTimesStat.Irq) / used_total * 100,
+		Softirq: (t.Softirq - lastTimesStat.Softirq) / used_total * 100,
 	}
 	lastTimesStat = t
 	return cpuload

static/js/monitor.js

@@ -3,6 +3,38 @@ $(document).ready(function() {
     var memUsage = echarts.init(document.getElementById('mem-usage'));
     var swapUsage = echarts.init(document.getElementById('swap-usage'));
 
+    var ws = new WebSocket("ws://" + document.location.host + "/ws"); 
+    //连接打开时触发 
+    ws.onopen = function(evt) {  
+        console.log("Connection open ...");  
+        ws.send("Hello WebSockets!");  
+    };  
+    //接收到消息时触发  
+    ws.onmessage = function(evt) { 
+        var msg = JSON.parse(evt.data);
+
+        cpuUsageOption.series[0].data[0].value = msg.CPU.Load.Percent.toFixed(1)
+        memUsageOption.series[0].data[0].value = msg.Memory.UsedPercent.toFixed(1)
+
+        cpuUsage.setOption(cpuUsageOption, true);
+        memUsage.setOption(memUsageOption, true);
+
+        $("#temp").text(msg.CPU.Temp+" C°");
+        $("#freq").text(msg.CPU.Freq.Curfreq+" MHz");
+        $("#idle").text(msg.CPU.Load.Idle.toFixed(1)+"%");
+        $("#user").text(msg.CPU.Load.User.toFixed(1)+"%");
+        $("#sys").text(msg.CPU.Load.Sys.toFixed(1)+"%");
+        $("#nice").text(msg.CPU.Load.Nice.toFixed(1)+"%");
+        $("#iow").text(msg.CPU.Load.Iowait.toFixed(1)+"%");
+        $("#irq").text(msg.CPU.Load.Irq.toFixed(1)+"%");
+        //console.log("Received Message: " + evt);
+        console.log(msg);
+    };  
+    //连接关闭时触发  
+    ws.onclose = function(evt) {  
+        console.log("Connection closed.");  
+    }; 
+
     cpuUsageOption = {
         tooltip: {
             formatter: '{a} <br/>{b} : {c}%'