style: move global/config to internal/config

coolq/bot.go

@@ -24,8 +24,8 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/opt"
 
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -69,12 +69,12 @@ func (e *Event) JSONString() string {
 }
 
 // NewQQBot 初始化一个QQBot实例
-func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
+func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
 	enableLevelDB := false
-	node, ok := conf.Database["leveldb"]
+	node, ok := base.Database["leveldb"]
 	if ok {
 		lconf := new(config.LevelDBConfig)
 		_ = node.Decode(lconf)
@@ -96,7 +96,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	if conf.Message.ReportSelfMessage {
+	if base.ReportSelfMessage {
 		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
@@ -121,15 +121,11 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		i := conf.Heartbeat.Interval
+		if base.HeartbeatInterval == 0 {
-		if i < 0 || conf.Heartbeat.Disabled {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
-		if i == 0 {
+		t := time.NewTicker(base.HeartbeatInterval)
-			i = 5
-		}
-		t := time.NewTicker(time.Second * time.Duration(i))
 		for {
 			<-t.C
 			bot.dispatchEventMessage(global.MSG{
@@ -138,7 +134,7 @@ func NewQQBot(cli *client.QQClient, conf *config.Config) *CQBot {
 				"post_type":       "meta_event",
 				"meta_event_type": "heartbeat",
 				"status":          bot.CQGetStatus()["data"],
-				"interval":        1000 * i,
+				"interval":        base.HeartbeatInterval.Milliseconds(),
 			})
 		}
 	}()

internal/base/flag.go

@@ -6,8 +6,9 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
 
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 )
 
 // command flags
@@ -27,6 +28,7 @@ var (
 	SplitURL            bool // 是否分割URL
 	ForceFragmented     bool // 是否启用强制分片
 	SkipMimeScan        bool // 是否跳过Mime扫描
+	ReportSelfMessage   bool // 是否上报自身消息
 	UseSSOAddress       bool // 是否使用服务器下发的新地址进行重连
 	LogForceNew         bool // 是否在每次启动时强制创建全新的文件储存日志
 	FastStart           bool // 是否为快速启动
@@ -35,8 +37,14 @@ var (
 	Proxy             string                 // 存储 proxy_rewrite,用于设置代理
 	PasswordHash      [16]byte               // 存储QQ密码哈希供登录使用
 	AccountToken      []byte                 // 存储 AccountToken 供登录使用
+	Account           *config.Account        // 账户配置
 	Reconnect         *config.Reconnect      // 重连配置
+	LogLevel          string                 // 日志等级
 	LogAging          = time.Hour * 24 * 365 // 日志时效
+	HeartbeatInterval = time.Second * 5      // 心跳间隔
+
+	Servers  []map[string]yaml.Node // 连接服务列表
+	Database map[string]yaml.Node   // 数据库列表
 )
 
 // Parse parse flags
@@ -67,11 +75,16 @@ func Init() {
 		ExtraReplyData = conf.Message.ExtraReplyData
 		ForceFragmented = conf.Message.ForceFragment
 		SkipMimeScan = conf.Message.SkipMimeScan
+		ReportSelfMessage = conf.Message.ReportSelfMessage
 		UseSSOAddress = conf.Account.UseSSOAddress
 	}
 	{ // others
 		Proxy = conf.Message.ProxyRewrite
+		Account = conf.Account
 		Reconnect = conf.Account.ReLogin
+		Servers = conf.Servers
+		Database = conf.Database
+		LogLevel = conf.Output.LogLevel
 		if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
 			log.Warnf("post-format 配置错误, 将自动使用 string")
 			PostFormat = "string"
@@ -81,5 +94,11 @@ func Init() {
 		if conf.Output.LogAging > 0 {
 			LogAging = time.Hour * 24 * time.Duration(conf.Output.LogAging)
 		}
+		if conf.Heartbeat.Interval > 0 {
+			HeartbeatInterval = time.Second * time.Duration(conf.Heartbeat.Interval)
+		}
+		if conf.Heartbeat.Disabled || conf.Heartbeat.Interval < 0 {
+			HeartbeatInterval = 0
+		}
 	}
 }

internal/config/config.go

@@ -34,17 +34,19 @@ type Reconnect struct {
 	Interval int  `yaml:"interval"`
 }
 
-// Config 总配置文件
+// Account 账号配置
-type Config struct {
+type Account struct {
-	Account struct {
 	Uin           int64      `yaml:"uin"`
 	Password      string     `yaml:"password"`
 	Encrypt       bool       `yaml:"encrypt"`
 	Status        int        `yaml:"status"`
 	ReLogin       *Reconnect `yaml:"relogin"`
 	UseSSOAddress bool       `yaml:"use-sso-address"`
-	} `yaml:"account"`
+}
 
+// Config 总配置文件
+type Config struct {
+	Account   *Account `yaml:"account"`
 	Heartbeat struct {
 		Disabled bool `yaml:"disabled"`
 		Interval int  `yaml:"interval"`
@@ -52,10 +54,10 @@ type Config struct {
 
 	Message struct {
 		PostFormat          string `yaml:"post-format"`
+		ProxyRewrite        string `yaml:"proxy-rewrite"`
 		IgnoreInvalidCQCode bool   `yaml:"ignore-invalid-cqcode"`
 		ForceFragment       bool   `yaml:"force-fragment"`
 		FixURL              bool   `yaml:"fix-url"`
-		ProxyRewrite        string `yaml:"proxy-rewrite"`
 		ReportSelfMessage   bool   `yaml:"report-self-message"`
 		RemoveReplyAt       bool   `yaml:"remove-reply-at"`
 		ExtraReplyData      bool   `yaml:"extra-reply-data"`

main.go

@@ -28,9 +28,9 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
 	"github.com/Mrs4s/go-cqhttp/global/terminal"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
 	"github.com/Mrs4s/go-cqhttp/server"
 )
@@ -56,9 +56,6 @@ func main() {
 	}
 	base.Init()
 
-	// todo: do all config parse in internal/base?
-	conf := config.Get()
-
 	rotateOptions := []rotatelogs.Option{
 		rotatelogs.WithRotationTime(time.Hour * 24),
 	}
@@ -71,7 +68,7 @@ func main() {
 		log.Errorf("rotatelogs init err: %v", err)
 		panic(err)
 	}
-	log.AddHook(global.NewLocalHook(w, global.LogFormat{}, global.GetLogLevel(conf.Output.LogLevel)...))
+	log.AddHook(global.NewLocalHook(w, global.LogFormat{}, global.GetLogLevel(base.LogLevel)...))
 
 	mkCacheDir := func(path string, _type string) {
 		if !global.PathExists(path) {
@@ -117,7 +114,7 @@ func main() {
 		return
 	}
 
-	if (conf.Account.Uin == 0 || (conf.Account.Password == "" && !conf.Account.Encrypt)) && !global.PathExists("session.token") {
+	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
 		log.Warn("账号密码未配置, 将使用二维码登录.")
 		if !base.FastStart {
 			log.Warn("将在 5秒 后继续.")
@@ -145,22 +142,22 @@ func main() {
 		}
 	}
 
-	if conf.Account.Encrypt {
+	if base.Account.Encrypt {
 		if !global.PathExists("password.encrypt") {
-			if conf.Account.Password == "" {
+			if base.Account.Password == "" {
 				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
 				readLine()
 				os.Exit(0)
 			}
 			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
 			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			base.PasswordHash = md5.Sum([]byte(conf.Account.Password))
+			base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
 			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 			readLine()
 			os.Exit(0)
 		} else {
-			if conf.Account.Password != "" {
+			if base.Account.Password != "" {
 				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 				readLine()
 				os.Exit(0)
@@ -194,8 +191,8 @@ func main() {
 			}
 			copy(base.PasswordHash[:], ph)
 		}
-	} else if len(conf.Account.Password) > 0 {
+	} else if len(base.Account.Password) > 0 {
-		base.PasswordHash = md5.Sum([]byte(conf.Account.Password))
+		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 	}
 	if !base.FastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
@@ -218,7 +215,7 @@ func main() {
 		return "未知"
 	}())
 	cli = newClient()
-	isQRCodeLogin := (conf.Account.Uin == 0 || len(conf.Account.Password) == 0) && !conf.Account.Encrypt
+	isQRCodeLogin := (base.Account.Uin == 0 || len(base.Account.Password) == 0) && !base.Account.Encrypt
 	isTokenLogin := false
 	saveToken := func() {
 		base.AccountToken = cli.GenToken()
@@ -227,11 +224,11 @@ func main() {
 	if global.PathExists("session.token") {
 		token, err := os.ReadFile("session.token")
 		if err == nil {
-			if conf.Account.Uin != 0 {
+			if base.Account.Uin != 0 {
 				r := binary.NewReader(token)
 				cu := r.ReadInt64()
-				if cu != conf.Account.Uin {
+				if cu != base.Account.Uin {
-					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", conf.Account.Uin, cu)
+					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
 					log.Warnf("1. 使用会话缓存继续.")
 					log.Warnf("2. 删除会话缓存并重启.")
 					log.Warnf("请选择: (5秒后自动选1)")
@@ -255,8 +252,8 @@ func main() {
 			}
 		}
 	}
-	if conf.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
+	if base.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
-		cli.Uin = conf.Account.Uin
+		cli.Uin = base.Account.Uin
 		cli.PasswordMd5 = base.PasswordHash
 	}
 	if !isTokenLogin {
@@ -329,12 +326,12 @@ func main() {
 	log.Infof("开始加载群列表...")
 	global.Check(cli.ReloadGroupList(), true)
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if uint(conf.Account.Status) >= uint(len(allowStatus)) {
+	if uint(base.Account.Status) >= uint(len(allowStatus)) {
-		conf.Account.Status = 0
+		base.Account.Status = 0
 	}
-	cli.SetOnlineStatus(allowStatus[conf.Account.Status])
+	cli.SetOnlineStatus(allowStatus[base.Account.Status])
-	bot := coolq.NewQQBot(cli, conf)
+	bot := coolq.NewQQBot(cli)
-	for _, m := range conf.Servers {
+	for _, m := range base.Servers {
 		if h, ok := m["http"]; ok {
 			hc := new(config.HTTPServer)
 			if err := h.Decode(hc); err != nil {

server/http.go

@@ -21,7 +21,7 @@ import (
 	"github.com/tidwall/gjson"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 )
 
 type httpServer struct {

server/pprof.go

@@ -9,7 +9,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 )
 
 // RunPprofServer 启动 pprof 性能分析服务器

server/scf.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 )
 
 type lambdaClient struct {

server/websocket.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/config"
+	"github.com/Mrs4s/go-cqhttp/internal/config"
 
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gorilla/websocket"