fix(chat): concurrent map write

Author: fumiama

chat/agent.go

@@ -9,7 +9,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/RomiChan/syncx"
@@ -21,11 +20,17 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/FloatTech/floatbox/binary"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/vevent"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
+const (
+	StateKeyAgentHooked    = zero.StateKeyPrefixKeep + "_chat_ag_hooked__"
+	StateKeyAgentTriggered = zero.StateKeyPrefixKeep + "_chat_ag_triggered__"
+)
+
 // agentchar 将 char.yaml 内容嵌入为默认 agent 性格
 //
 //go:embed char.yaml
@@ -255,8 +260,6 @@ func truncatecopy(params map[string]any) map[string]any {
 	return cpp
 }
 
-var logevmu sync.Mutex
-
 func logev(ctx *zero.Ctx) {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
@@ -270,27 +273,23 @@ func logev(ctx *zero.Ctx) {
 	logrus.Debugln("[chat] agent", gid, "add ev:", binary.BytesToString(data))
 	AgentOf(ctx.Event.SelfID, "aichat").AddEvent(gid, ev)
 
-	logevmu.Lock()
-	if _, ok := ctx.State[zero.StateKeyPrefixKeep+"_chat_ag_hooked__"]; ok {
-		logevmu.Unlock()
+	mp := ctx.State[control.StateKeySyncxState].(*syncx.Map[string, any])
+
+	_, hasvalue := mp.LoadOrStore(StateKeyAgentHooked, struct{}{})
+	if hasvalue {
 		return
 	}
-	ctx.State[zero.StateKeyPrefixKeep+"_chat_ag_hooked__"] = struct{}{}
-	logevmu.Unlock()
 
 	vevent.HookCtxCaller(ctx, vevent.NewAPICallerReturnHook(
 		ctx, func(req zero.APIRequest, rsp zero.APIResponse, _ error) {
 			gid := ctx.Event.GroupID
 			if gid == 0 {
 				gid = -ctx.Event.UserID
 			}
-			logevmu.Lock()
-			if _, ok := ctx.State[zero.StateKeyPrefixKeep+"_chat_ag_triggered__"]; ok {
-				logevmu.Unlock()
+			if _, ok := mp.Load(StateKeyAgentTriggered); ok {
 				logrus.Debugln("[chat] agent", gid, "skip agent triggered requ:", &req)
 				return
 			}
-			logevmu.Unlock()
 			if req.Action != "send_private_msg" &&
 				req.Action != "send_group_msg" &&
 				req.Action != "delete_msg" {

control/ctx.go

@@ -0,0 +1,15 @@
+package control
+
+import (
+	"github.com/RomiChan/syncx"
+	zero "github.com/wdvxdr1123/ZeroBot"
+)
+
+const (
+	StateKeySyncxState = zero.StateKeyPrefixKeep + "_ctrl_syncx_state__"
+)
+
+func addsyncxstate(ctx *zero.Ctx) bool {
+	ctx.State[StateKeySyncxState] = &syncx.Map[string, any]{}
+	return true
+}

control/defaultengine.go

@@ -15,5 +15,6 @@ func init() {
 			// 防止自触发
 			return ctx.Event.UserID != ctx.Event.SelfID || ctx.Event.PostType != "message"
 		},
+		addsyncxstate,
 	)
 }

control/engine.go

@@ -40,6 +40,7 @@ func newengine(service string, prio int, o *ctrl.Options[*zero.Ctx]) (e *Engine)
 			return ctx.Event.UserID != ctx.Event.SelfID || ctx.Event.PostType != "message"
 		},
 		newctrl(service, o),
+		addsyncxstate,
 	)
 	e.prio = prio
 	e.service = service