mv gmc_config to plugins

Author: lz1998

.gitignore

@@ -45,4 +45,5 @@ captcha.jpg
 /gmc_config.json
 cuberbot
 tmp
-dist/
+dist/
+plugins/

go.mod

@@ -44,7 +44,7 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
 	golang.org/x/text v0.3.6 // indirect
 )
 

go.sum

@@ -123,8 +123,9 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

pkg/bot/remote.go

@@ -35,15 +35,22 @@ var (
 
 type WsServer struct {
 	*safe_ws.SafeWebSocket        // 线程安全的ws
-	*config.ServerGroup           // 服务器组配置
+	*config.Plugin                // 服务器组配置
 	wsUrl                  string // 随机抽中的url
 	regexp                 *regexp.Regexp
 }
 
 func ConnectUniversal(cli *client.QQClient) {
 	botServers := map[string]*WsServer{}
 	RemoteServers.Store(cli.Uin, botServers)
-	for _, group := range config.Conf.ServerGroups {
+
+	plugins := make([]*config.Plugin, 0)
+	config.Plugins.Range(func(key string, value *config.Plugin) bool {
+		plugins = append(plugins, value)
+		return true
+	})
+
+	for _, group := range plugins {
 		if group.Disabled || group.Urls == nil || len(group.Urls) < 1 {
 			continue
 		}
@@ -79,7 +86,7 @@ func ConnectUniversal(cli *client.QQClient) {
 				})
 				botServers[serverGroup.Name] = &WsServer{
 					SafeWebSocket: safeWs,
-					ServerGroup:   &serverGroup,
+					Plugin:        &serverGroup,
 					wsUrl:         serverUrl,
 					regexp:        nil,
 				}

pkg/config/config.go

@@ -1,45 +1,39 @@
 package config
 
-import (
-	"encoding/json"
-
-	"github.com/pkg/errors"
-)
-
+//go:generate go run github.com/a8m/syncmap -o "gen_plugin_map.go" -pkg config -name PluginMap "map[string]*Plugin"
 var (
 	Fragment = false // 是否分片
 	Port     = "9000"
 	SMS      = false
 	Device   = ""
-	Conf     = &GmcConfig{
-		//SMS:  false,
-		//Port: "9000",
-		ServerGroups: []*ServerGroup{
-			{
-				Name:         "default",
-				Disabled:     false,
-				Json:         false,
-				Urls:         []string{"ws://localhost:8081/ws/cq/"},
-				EventFilter:  []int32{},
-				RegexFilter:  "",
-				RegexReplace: "",
-				ExtraHeader: map[string][]string{
-					"User-Agent": {"GMC"},
-				},
-			},
-		},
-	}
+	Plugins  = &PluginMap{}
 	HttpAuth = map[string]string{}
 )
 
-type GmcConfig struct {
-	//Port         string         `json:"port"`          // 管理端口
-	//SMS          bool           `json:"sms"`           // 设备锁是否优先使用短信认证
-	ServerGroups []*ServerGroup `json:"server_groups"` // 服务器组
+func init() {
+	Plugins.Store("default", &Plugin{
+		Name:         "default",
+		Disabled:     false,
+		Json:         false,
+		Urls:         []string{"ws://localhost:8081/ws/cq/"},
+		EventFilter:  []int32{},
+		RegexFilter:  "",
+		RegexReplace: "",
+		ExtraHeader: map[string][]string{
+			"User-Agent": {"GMC"},
+		},
+	})
 }
 
-type ServerGroup struct {
-	Name         string              `json:"name"`          // 功能名称
+func ClearPlugins(pluginMap *PluginMap) {
+	pluginMap.Range(func(key string, value *Plugin) bool {
+		pluginMap.Delete(key)
+		return true
+	})
+}
+
+type Plugin struct {
+	Name         string              `json:"-"`             // 功能名称
 	Disabled     bool                `json:"disabled"`      // 不填false默认启用
 	Json         bool                `json:"json"`          // json上报
 	Urls         []string            `json:"urls"`          // 服务器列表
@@ -49,17 +43,3 @@ type ServerGroup struct {
 	ExtraHeader  map[string][]string `json:"extra_header"`  // 自定义请求头
 	// TODO event filter, msg filter, regex filter, prefix filter, suffix filter
 }
-
-func (g *GmcConfig) ReadJson(d []byte) error {
-	var fileConfig GmcConfig
-	if err := json.Unmarshal(d, &fileConfig); err != nil {
-		return errors.Wrap(err, "failed to unmarshal json GmcConfig")
-	}
-	*g = fileConfig
-	return nil
-}
-
-func (g *GmcConfig) ToJson() []byte {
-	b, _ := json.MarshalIndent(g, "", "    ")
-	return b
-}