feat(plugins): bili链接解析模块新增、actionFunc增加返回是否发送消息的布尔值用于更好控制消息回复、plugin中支持调用wcfClient

Author: Clov614

go.mod

@@ -5,8 +5,9 @@ go 1.22
 toolchain go1.22.5
 
 require (
+	github.com/Clov614/bilibili v0.1.2
 	github.com/Clov614/logging v0.1.4
-	github.com/Clov614/wcf-rpc-sdk v0.4.1
+	github.com/Clov614/wcf-rpc-sdk v0.4.2
 	github.com/eatmoreapple/openwechat v1.4.10
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
@@ -17,7 +18,7 @@ require (
 )
 
 //replace github.com/eatmoreapple/openwechat => github.com/Clov614/openwechat v1.4.8
-//replace github.com/Clov614/wcf-rpc-sdk v0.4.1 => E:\Applications_Dev\Go_workspace\github.com\Clov614\wcf-rpc-sdk
+//replace github.com/Clov614/wcf-rpc-sdk v0.4.2 => E:\Applications_Dev\Go_workspace\github.com\Clov614\wcf-rpc-sdk
 
 require (
 	github.com/Microsoft/go-winio v0.5.2 // indirect

go.sum

@@ -1,7 +1,9 @@
+github.com/Clov614/bilibili v0.1.2 h1:vi1Ykn5+xgrwfpR/xLgdXvoNdulaZitXP9BOgdy0n+I=
+github.com/Clov614/bilibili v0.1.2/go.mod h1:th+qNf6jfSDH03oCM4s347a+i7IpCgZyNRIHY8AAXe8=
 github.com/Clov614/logging v0.1.4 h1:wvTJHIPg1KQdxv23khFcZk5I4rA1jhyCCeCC0UR43AQ=
 github.com/Clov614/logging v0.1.4/go.mod h1:Vxr9X5cvKXT17F/iBeBj8w6WSAuBQppsvtoCi0UXxe0=
-github.com/Clov614/wcf-rpc-sdk v0.4.1 h1:Vb2hJuy+rk1G2tW/Dz2dQf5gkXN3q38xNnWYHaRvHHw=
-github.com/Clov614/wcf-rpc-sdk v0.4.1/go.mod h1:ZBJKTyIs6Tkip9n81iE00lUg0eD+dLt7/vfvWcEiAX4=
+github.com/Clov614/wcf-rpc-sdk v0.4.2 h1:RCuPkd2xcAF5eDR83QUb0pbX4/cgeeJLxraiZlDHQLo=
+github.com/Clov614/wcf-rpc-sdk v0.4.2/go.mod h1:ZBJKTyIs6Tkip9n81iE00lUg0eD+dLt7/vfvWcEiAX4=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/antchfx/xmlquery v1.4.4 h1:mxMEkdYP3pjKSftxss4nUHfjBhnMk4imGoR96FRY2dg=

main.go

@@ -3,14 +3,18 @@ package main
 import (
 	"context"
 	"flag"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
 	"github.com/Clov614/logging"
 	"github.com/Clov614/rikka-bot-wechat/rikkabot"
 	"github.com/Clov614/rikka-bot-wechat/rikkabot/adapter"
 	"github.com/Clov614/rikka-bot-wechat/rikkabot/onebot/httpapi"
 	wcf "github.com/Clov614/wcf-rpc-sdk"
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog"
-	"time"
 )
 
 func main() {
@@ -84,6 +88,18 @@ func main() {
 		rbot.ExitWithErr(1101, "微信未登录或掉线")
 	}()
 
+	// 捕获 Ctrl + C 信号
+	sigCh := make(chan os.Signal, 1)
+	defer close(sigCh)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+
+	// 启动一个 goroutine 来处理信号
+	go func() {
+		<-sigCh // 阻塞，直到接收到信号
+		logging.Info("接收到退出信号 (Ctrl + C)，正在退出...")
+		rbot.Exit() // 优雅地退出 RikkaBot
+	}()
+
 	// 阻塞主goroutine, 直到发生异常或者用户主动退出
 	err := rbot.Block()
 	if err != nil {

rikkabot/adapter/adapter.go

@@ -223,6 +223,9 @@ func (a *Adapter) receiveMsg(msg *wcf.Message) {
 }
 
 func (a *Adapter) sendMsg(sendMsg *message.Message) error {
+	if sendMsg == nil {
+		return fmt.Errorf("sendMsg is nil")
+	}
 	if sendMsg.MetaData == nil {
 		logging.Debug("MetaData is nil", map[string]interface{}{"sendMsg": sendMsg})
 		return fmt.Errorf("can't send msg, sendMsg err: %w", ErrMetaDateNil)

rikkabot/plugins/admin/admin.go

@@ -71,20 +71,20 @@ func init() {
 	opMulAction.AsChild(delOp)
 	opMulAction.AsChild(opList)
 	opMulAction.AsChild(opPBase) // 插件管理父行动
-	opMulAction.AsChild(help.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	opMulAction.AsChild(help.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		recvMsg.Content = admin.help()
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	}))
 
 	opAddM := opM.And().N(atSomeOneM)
 	opAddByAt := plugins.DefaultActionHandler("op_add", true).AsMatcher(opAddM)
-	opAddByAt.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	opAddByAt.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		content, ok := admin.addOpByAt(recvMsg)
 		if !ok {
 			logging.Debug("艾特方式添加管理员失败了", map[string]interface{}{"msg": *recvMsg})
 		}
 		recvMsg.Content = content
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	})
 
 	// 绑定action
@@ -95,55 +95,55 @@ func init() {
 
 func PLFunc() *plugins.ActionHandler {
 	PLM := matcher.Default().And().N(matcher.PrefixMatcher{Prefix: "list", IsCut: true, IsCaseSensitive: false})
-	PL := plugins.DefaultActionHandler("op -p list", true).AsMatcher(PLM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	PL := plugins.DefaultActionHandler("op -p list", true).AsMatcher(PLM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		var buf bytes.Buffer
 		buf.WriteString("插件列表\n")
 		register := plugins.GetAutoRegister()
 		for i, p := range register.Plugins() {
-			buf.WriteString(fmt.Sprintf("【%d 插件名称: %s \n状态: %v\n等级: 第%d级 】", i+1, (*p).GetName(), (*p).GetPluginOpt().Enable, (*p).GetPluginOpt().Level))
+			buf.WriteString(fmt.Sprintf("【%d 插件名称: %s \n状态: %v\n等级: 第%d级 】\n", i+1, (*p).GetName(), (*p).GetPluginOpt().Enable, (*p).GetPluginOpt().Level))
 		}
 		recvMsg.Content = buf.String()
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	})
 	return PL
 }
 
 func onPFunc() *plugins.ActionHandler {
 	onPM := matcher.Default().And().N(matcher.PrefixMatcher{Prefix: "on", IsCut: true, IsCaseSensitive: false})
-	onP := plugins.DefaultActionHandler("op -p on", true).AsMatcher(onPM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	onP := plugins.DefaultActionHandler("op -p on", true).AsMatcher(onPM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		name := strings.TrimSpace(recvMsg.Content)
 		ar := plugins.GetAutoRegister()
 		if name == "admin" {
 			recvMsg.Content = "管理员插件禁止操作"
-			return *recvMsg, nil
+			return *recvMsg, true, nil
 		}
 		b := ar.EnableByName(name) // 启用某插件
 		if b {
 			recvMsg.Content = fmt.Sprintf("启用 %s 成功", name)
 		} else {
 			recvMsg.Content = fmt.Sprintf("启用 %s 失败", name)
 		}
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	})
 	return onP
 }
 
 func offPFunc() *plugins.ActionHandler {
 	offPM := matcher.Default().And().N(matcher.PrefixMatcher{Prefix: "off", IsCut: true, IsCaseSensitive: false})
-	offP := plugins.DefaultActionHandler("op -p on", true).AsMatcher(offPM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	offP := plugins.DefaultActionHandler("op -p on", true).AsMatcher(offPM).AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		name := strings.TrimSpace(recvMsg.Content)
 		ar := plugins.GetAutoRegister()
 		if name == "admin" {
 			recvMsg.Content = "管理员插件禁止操作"
-			return *recvMsg, nil
+			return *recvMsg, true, nil
 		}
 		b := ar.DisableByName(name) // 启用某插件
 		if b {
 			recvMsg.Content = fmt.Sprintf("禁用 %s 成功", name)
 		} else {
 			recvMsg.Content = fmt.Sprintf("禁用 %s 失败", name)
 		}
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	})
 	return offP
 }
@@ -157,13 +157,13 @@ func helpFunc(isSelfJudge matcher.BaseMatcher, adminJudge matcher.Custom) *plugi
 func delOpFunc(isSelfJudge matcher.BaseMatcher, adminJudge matcher.Custom, admin *Admin) *plugins.ActionHandler {
 	delM := matcher.Default().And().N(matcher.PrefixMatcher{Prefix: "-d", IsCaseSensitive: false, IsCut: true}, matcher.Default().Or().N(isSelfJudge, adminJudge))
 	delOp := plugins.DefaultActionHandler("op -d", true).AsMatcher(delM)
-	delOp.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	delOp.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		content, ok := admin.delOpByAt(recvMsg)
 		if !ok {
 			logging.Debug("艾特方式删除管理员失败了", map[string]interface{}{"msg": *recvMsg})
 		}
 		recvMsg.Content = content
-		return *recvMsg, nil
+		return *recvMsg, ok, nil
 	})
 	return delOp
 }
@@ -177,13 +177,13 @@ func opPluginFunc(isSelfJudge matcher.BaseMatcher, adminJudge matcher.Custom) (m
 func opListFunc(isSelfJudge matcher.BaseMatcher, adminJudge matcher.Custom, admin *Admin) *plugins.ActionHandler {
 	opListM := matcher.Default().And().N(matcher.PrefixMatcher{Prefix: "list", IsCaseSensitive: false, IsCut: true}, matcher.Default().Or().N(isSelfJudge, adminJudge))
 	opList := plugins.DefaultActionHandler("op list", true).AsMatcher(opListM)
-	opList.Action = func(ctx context.Context, recvMsg *message.Message) (reply message.Message, err error) {
+	opList.Action = func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
 		var buf bytes.Buffer
 		buf.WriteString("管理员列表\n")
 		idList := admin.cache.AdminIdList()
 		if idList == nil || len(idList) == 0 {
 			recvMsg.Content = "暂无管理员"
-			return *recvMsg, nil
+			return *recvMsg, true, nil
 		}
 		for _, wxid := range idList {
 			m := admin.Cli.GetMember(wxid, true)
@@ -192,7 +192,7 @@ func opListFunc(isSelfJudge matcher.BaseMatcher, adminJudge matcher.Custom, admi
 			}
 		}
 		recvMsg.Content = buf.String()
-		return *recvMsg, nil
+		return *recvMsg, true, nil
 	}
 	return opList
 }

rikkabot/plugins/biliDecoder/bilibili.go

@@ -0,0 +1,124 @@
+// Package biliDecoder
+// @Author Clover
+// @Data 2025/3/17 下午1:59:00
+// @Desc
+package biliDecoder
+
+import (
+	"bytes"
+	"context"
+	"encoding/xml"
+	"regexp"
+	"strconv"
+
+	"github.com/Clov614/bilibili"
+	"github.com/Clov614/rikka-bot-wechat/rikkabot/message"
+	"github.com/Clov614/rikka-bot-wechat/rikkabot/plugins"
+	"github.com/Clov614/rikka-bot-wechat/rikkabot/plugins/matcher"
+	"github.com/Clov614/rikka-bot-wechat/rikkabot/processor/cache"
+	"github.com/rs/zerolog/log"
+)
+
+type biliDecoder struct {
+	cache *cache.Cache
+	*plugins.Plugin
+}
+
+var baseM = matcher.Default().And().N(matcher.BaseMatcher{AllowMsgType: message.MsgTypeText | message.MsgTypeApp, Rules: matcher.IsGroupRule}) // 允许群聊 文本\转发xml消息
+
+func init() {
+	bili := &biliDecoder{
+		cache:  cache.GetCache(),
+		Plugin: plugins.DefaultPlugin("biliDecoder").AsLevel(plugins.MediumLevel).AsEnable(),
+	}
+	decoderM := baseM.And().N(matcher.Default().Or().N(matcher.RegexMatcher{Regex: regexp.MustCompile(`(BV[\w\d]+)`)},
+		matcher.RegexMatcher{Regex: regexp.MustCompile(`https:\/\/www\.biliDecoder\.com\/video\/(BV[\w\d]+)\/?`)},
+		matcher.RegexMatcher{Regex: regexp.MustCompile(`https:\/\/b23\.tv\/([\w\d]+)`)}))
+	decoderAction := plugins.DefaultActionHandler("url decoder", true).AsMatcher(decoderM)
+	decoderActionFunc(decoderAction, bili) // 关键逻辑
+
+	bili.AsAction(decoderAction)
+	plugins.GetAutoRegister().RegisterPlugin(bili) // 注册插件
+}
+
+func decoderActionFunc(decoderAction *plugins.ActionHandler, bili *biliDecoder) *plugins.ActionHandler {
+	return decoderAction.AsActionFunc(func(ctx context.Context, recvMsg *message.Message) (reply message.Message, ok bool, err error) {
+		reply = *recvMsg
+		switch recvMsg.Msgtype {
+		case message.MsgTypeApp:
+			var xmlMsg message.XMLMsg
+			err = xml.Unmarshal([]byte(recvMsg.Content), &xmlMsg)
+			if err != nil {
+				log.Err(err).Msg("xml.Unmarshal fail at biliPlugin")
+				return
+			}
+			// 解析链接
+			if xmlMsg.AppInfo.AppName == "哔哩哔哩" {
+				var videoInfo *bilibili.VideoInfo
+				videoInfo, err = bilibili.NewUrlDecoder().Parse(xmlMsg.AppMsg.URL)
+				if err != nil {
+					log.Err(err).Msg("bilibili.NewUrlDecoder fail at biliPlugin")
+					return
+				}
+				output := buildOutput(videoInfo)
+				recvMsg.Content = output
+				return
+			}
+		case message.MsgTypeText:
+			regexBV := regexp.MustCompile(`(BV[\w\d]+)`)
+			regexBilibili := regexp.MustCompile(`https:\/\/www\.bilibili\.com\/video\/(BV[\w\d]+)\/?`)
+			regexShort := regexp.MustCompile(`https:\/\/b23\.tv\/([\w\d]+)`)
+			var videoInfo *bilibili.VideoInfo
+			urlParser := bilibili.NewUrlDecoder()
+			if match := regexBV.FindStringSubmatch(recvMsg.Content); len(match) > 0 {
+				videoInfo, err = urlParser.ParseByBvid(match[1])
+				if err != nil {
+					log.Err(err).Msg("bilibili.urlParser.ParseByBvid fail at biliPlugin")
+					return
+				}
+			} else if match = regexBilibili.FindStringSubmatch(recvMsg.Content); len(match) > 0 {
+				videoInfo, err = urlParser.Parse(match[1])
+				if err != nil {
+					log.Err(err).Msg("bilibili.urlParser.ParseByBvid fail at biliPlugin")
+					return
+				}
+			} else if match = regexShort.FindStringSubmatch(recvMsg.Content); len(match) > 0 {
+				videoInfo, err = urlParser.Parse(match[1])
+				if err != nil {
+					log.Err(err).Msg("bilibili.urlParser.ParseByBvid fail at biliPlugin")
+					return
+				}
+			}
+			output := buildOutput(videoInfo)
+			sender := recvMsg.RoomId
+			if sender == "" {
+				sender = recvMsg.WxId
+			}
+			if nil != videoInfo {
+				_ = bili.Cli.SendImage(sender, videoInfo.Pic)
+			}
+			_ = bili.Cli.SendText(sender, output)
+		default:
+			// nothing to do !!
+		}
+		return *recvMsg, false, nil
+	})
+}
+
+func buildOutput(videoInfo *bilibili.VideoInfo) string {
+	// 构建输出视频信息
+	videoUrl := "https://www.bilibili.com/video/" + videoInfo.Bvid
+	var buf bytes.Buffer
+	buf.WriteString("🎬 标题:  " + videoInfo.Title + "\n")
+	buf.WriteString("📂 分区:  " + videoInfo.Tname + "\n\n")
+	buf.WriteString("📊 数据:\n")
+	buf.WriteString("  - 👀 播放量:  " + strconv.Itoa(videoInfo.View) + "\n")
+	buf.WriteString("  - 👍 点赞:  " + strconv.Itoa(videoInfo.Like) + "\n")
+	buf.WriteString("  - 🪙 投币:  " + strconv.Itoa(videoInfo.Coin) + "\n")
+	buf.WriteString("  - ⭐️ 收藏:  " + strconv.Itoa(videoInfo.Favorite) + "\n")
+	buf.WriteString("  - 📤 分享:  " + strconv.Itoa(videoInfo.Share) + "\n\n")
+	buf.WriteString("---\n")                // 分割线
+	buf.WriteString("  " + videoUrl + "\n") // 链接前空两格
+	buf.WriteString("---\n")                // 分割线
+	return buf.String()
+}

rikkabot/plugins/matcher/matcher.go

@@ -192,19 +192,14 @@ func (bm BaseMatcher) Match(ctx context.Context, msg *message.Message) bool {
 		return false
 	}
 	if bm.Rules != 0 {
-		switch {
-		case bm.Rules&IsGroupRule != 0:
-			if !msg.IsGroup {
-				return false
-			}
-		case bm.Rules&IsAtMeRule != 0:
-			if !msg.IsAtMe {
-				return false
-			}
-		case bm.Rules&IsSelf != 0:
-			if !msg.IsMySelf {
-				return false
-			}
+		if bm.Rules&IsGroupRule != 0 && !msg.IsGroup {
+			return false
+		}
+		if bm.Rules&IsAtMeRule != 0 && !msg.IsAtMe {
+			return false
+		}
+		if bm.Rules&IsSelf != 0 && !msg.IsMySelf {
+			return false
 		}
 	}
 	select {