增加自动检查系统更新设置

internal/const/vars.go

@@ -4,9 +4,10 @@ package teaconst
 
 var (
 	IsRecoverMode = false
-)
 
-var (
 	IsDemoMode         = false
 	ErrorDemoOperation = "DEMO模式下无法进行创建、修改、删除等操作"
+
+	NewVersionCode        = "" // 有新的版本
+	NewVersionDownloadURL = "" // 新版本下载地址
 )

internal/goman/instance.go

@@ -0,0 +1,12 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import "time"
+
+type Instance struct {
+	Id          uint64
+	CreatedTime time.Time
+	File        string
+	Line        int
+}

internal/goman/lib.go

@@ -0,0 +1,81 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import (
+	"runtime"
+	"sync"
+	"time"
+)
+
+var locker = &sync.Mutex{}
+var instanceMap = map[uint64]*Instance{} // id => *Instance
+var instanceId = uint64(0)
+
+// New 新创建goroutine
+func New(f func()) {
+	_, file, line, _ := runtime.Caller(1)
+
+	go func() {
+		locker.Lock()
+		instanceId++
+
+		var instance = &Instance{
+			Id:          instanceId,
+			CreatedTime: time.Now(),
+		}
+
+		instance.File = file
+		instance.Line = line
+
+		instanceMap[instanceId] = instance
+		locker.Unlock()
+
+		// run function
+		f()
+
+		locker.Lock()
+		delete(instanceMap, instanceId)
+		locker.Unlock()
+	}()
+}
+
+// NewWithArgs 创建带有参数的goroutine
+func NewWithArgs(f func(args ...interface{}), args ...interface{}) {
+	_, file, line, _ := runtime.Caller(1)
+
+	go func() {
+		locker.Lock()
+		instanceId++
+
+		var instance = &Instance{
+			Id:          instanceId,
+			CreatedTime: time.Now(),
+		}
+
+		instance.File = file
+		instance.Line = line
+
+		instanceMap[instanceId] = instance
+		locker.Unlock()
+
+		// run function
+		f(args...)
+
+		locker.Lock()
+		delete(instanceMap, instanceId)
+		locker.Unlock()
+	}()
+}
+
+// List 列出所有正在运行goroutine
+func List() []*Instance {
+	locker.Lock()
+	defer locker.Unlock()
+
+	var result = []*Instance{}
+	for _, instance := range instanceMap {
+		result = append(result, instance)
+	}
+	return result
+}

internal/goman/lib_test.go

@@ -0,0 +1,28 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import (
+	"testing"
+	"time"
+)
+
+func TestNew(t *testing.T) {
+	New(func() {
+		t.Log("Hello")
+
+		t.Log(List())
+	})
+
+	time.Sleep(1 * time.Second)
+	t.Log(List())
+
+	time.Sleep(1 * time.Second)
+}
+
+func TestNewWithArgs(t *testing.T) {
+	NewWithArgs(func(args ...interface{}) {
+		t.Log(args[0], args[1])
+	}, 1, 2)
+	time.Sleep(1 * time.Second)
+}

internal/tasks/task_check_updates.go

@@ -0,0 +1,104 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package tasks
+
+import (
+	"encoding/json"
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/events"
+	"github.com/TeaOSLab/EdgeAdmin/internal/goman"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"io/ioutil"
+	"net/http"
+	"runtime"
+	"strings"
+	"time"
+)
+
+func init() {
+	events.On(events.EventStart, func() {
+		var task = NewCheckUpdatesTask()
+		goman.New(func() {
+			task.Start()
+		})
+	})
+}
+
+type CheckUpdatesTask struct {
+	ticker *time.Ticker
+}
+
+func NewCheckUpdatesTask() *CheckUpdatesTask {
+	return &CheckUpdatesTask{}
+}
+
+func (this *CheckUpdatesTask) Start() {
+	this.ticker = time.NewTicker(12 * time.Hour)
+	for range this.ticker.C {
+		err := this.Loop()
+		if err != nil {
+			logs.Println("[TASK][CHECK_UPDATES_TASK]" + err.Error())
+		}
+	}
+}
+
+func (this *CheckUpdatesTask) Loop() error {
+	type Response struct {
+		Code    int         `json:"code"`
+		Message string      `json:"message"`
+		Data    interface{} `json:"data"`
+	}
+
+	// 目前支持Linux
+	if runtime.GOOS != "linux" {
+		return nil
+	}
+
+	var apiURL = teaconst.UpdatesURL
+	apiURL = strings.ReplaceAll(apiURL, "${os}", runtime.GOOS)
+	apiURL = strings.ReplaceAll(apiURL, "${arch}", runtime.GOARCH)
+	resp, err := http.Get(apiURL)
+	if err != nil {
+		return errors.New("read api failed: " + err.Error())
+	}
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	data, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return errors.New("read api failed: " + err.Error())
+	}
+
+	var apiResponse = &Response{}
+	err = json.Unmarshal(data, apiResponse)
+	if err != nil {
+		return errors.New("decode version data failed: " + err.Error())
+	}
+
+	if apiResponse.Code != 200 {
+		return errors.New("invalid response: " + apiResponse.Message)
+	}
+
+	var m = maps.NewMap(apiResponse.Data)
+	var dlHost = m.GetString("host")
+	var versions = m.GetSlice("versions")
+	if len(versions) > 0 {
+		for _, version := range versions {
+			var vMap = maps.NewMap(version)
+			if vMap.GetString("code") == "admin" {
+				var latestVersion = vMap.GetString("version")
+				if stringutil.VersionCompare(teaconst.Version, latestVersion) < 0 {
+					teaconst.NewVersionCode = latestVersion
+					teaconst.NewVersionDownloadURL = dlHost + vMap.GetString("url")
+					return nil
+				}
+			}
+		}
+	}
+
+	return nil
+}

internal/tasks/task_sync_api_nodes.go

@@ -6,6 +6,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
+	"github.com/TeaOSLab/EdgeAdmin/internal/goman"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -23,7 +24,9 @@ import (
 func init() {
 	events.On(events.EventStart, func() {
 		task := NewSyncAPINodesTask()
-		go task.Start()
+		goman.New(func() {
+			task.Start()
+		})
 	})
 }
 

internal/tasks/task_sync_cluster.go

@@ -3,6 +3,7 @@ package tasks
 import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
+	"github.com/TeaOSLab/EdgeAdmin/internal/goman"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils"
@@ -17,7 +18,9 @@ import (
 func init() {
 	events.On(events.EventStart, func() {
 		task := NewSyncClusterTask()
-		go task.Start()
+		goman.New(func() {
+			task.Start()
+		})
 	})
 }
 

internal/web/actions/default/dashboard/index.go

@@ -40,6 +40,11 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}
 
+	// 版本更新
+	this.Data["currentVersionCode"] = teaconst.Version
+	this.Data["newVersionCode"] = teaconst.NewVersionCode
+	this.Data["newVersionDownloadURL"] = teaconst.NewVersionDownloadURL
+
 	this.Show()
 }
 

internal/web/actions/default/servers/components/waf/policy.go

@@ -49,7 +49,7 @@ func (this *PolicyAction) RunGet(params struct {
 
 	// 检查是否有升级
 	var templatePolicy = firewallconfigs.HTTPFirewallTemplate()
-	var upgradeItems = []string{}
+	var upgradeItems = []maps.Map{}
 	if templatePolicy.Inbound != nil {
 		for _, group := range templatePolicy.Inbound.Groups {
 			if len(group.Code) == 0 {
@@ -57,7 +57,10 @@ func (this *PolicyAction) RunGet(params struct {
 			}
 			var oldGroup = firewallPolicy.FindRuleGroupWithCode(group.Code)
 			if oldGroup == nil {
-				upgradeItems = append(upgradeItems, group.Name)
+				upgradeItems = append(upgradeItems, maps.Map{
+					"name": group.Name,
+					"isOn": group.IsOn,
+				})
 				continue
 			}
 			for _, set := range group.Sets {
@@ -66,7 +69,10 @@ func (this *PolicyAction) RunGet(params struct {
 				}
 				var oldSet = oldGroup.FindRuleSetWithCode(set.Code)
 				if oldSet == nil {
-					upgradeItems = append(upgradeItems, group.Name+" -- "+set.Name)
+					upgradeItems = append(upgradeItems, maps.Map{
+						"name": group.Name + " -- " + set.Name,
+						"isOn": set.IsOn,
+					})
 					continue
 				}
 			}

internal/web/actions/default/settings/updates/index.go

@@ -6,11 +6,14 @@ import (
 	"encoding/json"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
 	stringutil "github.com/iwind/TeaGo/utils/string"
 	"io/ioutil"
 	"net/http"
+	"runtime"
 	"strings"
 )
 
@@ -25,6 +28,22 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct{}) {
 	this.Data["version"] = teaconst.Version
 
+	valueResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeCheckUpdates})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var valueJSON = valueResp.ValueJSON
+	var config = &systemconfigs.CheckUpdatesConfig{AutoCheck: false}
+	if len(valueJSON) > 0 {
+		err = json.Unmarshal(valueJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["config"] = config
+
 	this.Show()
 }
 
@@ -37,8 +56,8 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	var apiURL = teaconst.UpdatesURL
-	apiURL = strings.ReplaceAll(apiURL, "${os}", "linux")   //runtime.GOOS)
-	apiURL = strings.ReplaceAll(apiURL, "${arch}", "amd64") // runtime.GOARCH)
+	apiURL = strings.ReplaceAll(apiURL, "${os}", runtime.GOOS)
+	apiURL = strings.ReplaceAll(apiURL, "${arch}", runtime.GOARCH)
 	resp, err := http.Get(apiURL)
 	if err != nil {
 		this.Data["result"] = maps.Map{
@@ -109,7 +128,6 @@ func (this *IndexAction) RunPost(params struct {
 		"isOk":    false,
 		"message": "找不到更新信息",
 	}
-	this.Success()
 
 	this.Success()
 }

internal/web/actions/default/settings/updates/init.go

@@ -14,6 +14,7 @@ func init() {
 			Helper(settingutils.NewHelper("updates")).
 			Prefix("/settings/updates").
 			GetPost("", new(IndexAction)).
+			Post("/update", new(UpdateAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/settings/updates/update.go

@@ -0,0 +1,52 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package updates
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	AutoCheck bool
+}) {
+	valueResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeCheckUpdates})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var valueJSON = valueResp.ValueJSON
+	var config = &systemconfigs.CheckUpdatesConfig{AutoCheck: false}
+	if len(valueJSON) > 0 {
+		err = json.Unmarshal(valueJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	config.AutoCheck = params.AutoCheck
+
+	configJSON, err := json.Marshal(config)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().SysSettingRPC().UpdateSysSetting(this.AdminContext(), &pb.UpdateSysSettingRequest{
+		Code:      systemconfigs.SettingCodeCheckUpdates,
+		ValueJSON: configJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}