public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 10:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

规则链结构优化

Browse Source
This commit is contained in:
XM-GO
2023-08-25 17:41:59 +08:00
parent fac575ac7b
commit e436f3b7ad
37 changed files with 254 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/rule_engine/nodes/script_engine.go
View File

@@ -8,7 +8,7 @@ import (
)
type ScriptEngine interface {
ScriptOnMessage() (message.Message, error)
ScriptOnMessage() (*message.Message, error)
ScriptOnSwitch() ([]string, error)
ScriptOnFilter() (bool, error)
ScriptToString() (string, error)
@@ -29,7 +29,7 @@ func NewScriptEngine(msg message.Message, fun string, script string) ScriptEngin
}
}
func (bse *baseScriptEngine) ScriptOnMessage() (message.Message, error) {
func (bse *baseScriptEngine) ScriptOnMessage() (*message.Message, error) {
msg := bse.Msg
vm := goja.New()
_, err := vm.RunString(bse.Script)
@@ -43,11 +43,11 @@ func (bse *baseScriptEngine) ScriptOnMessage() (message.Message, error) {
logrus.Info("Js函数映射到 Go 函数失败！")
return nil, err
}
datas := fn(msg.GetMsg(), msg.GetMetadata().GetValues(), msg.GetType())
msg.SetMsg(datas["msg"].(map[string]interface{}))
msg.SetMetadata(message.NewDefaultMetadata(datas["metadata"].(map[string]interface{})))
msg.SetType(datas["msgType"].(string))
return msg, nil
datas := fn(msg.Msg, msg.Metadata, msg.MsgType)
msg.Msg = datas["msg"].(map[string]interface{})
msg.Metadata = datas["metadata"].(map[string]interface{})
msg.MsgType = datas["msgType"].(string)
return &msg, nil
}
func (bse *baseScriptEngine) ScriptOnSwitch() ([]string, error) {
@@ -64,7 +64,7 @@ func (bse *baseScriptEngine) ScriptOnSwitch() ([]string, error) {
logrus.Info("Js函数映射到 Go 函数失败！")
return nil, err
}
datas := fn(msg.GetMsg(), msg.GetMetadata().GetValues(), msg.GetType())
datas := fn(msg.Msg, msg.Metadata, msg.MsgType)
return datas, nil
}
@@ -82,7 +82,7 @@ func (bse *baseScriptEngine) ScriptOnFilter() (bool, error) {
logrus.Info("Js函数映射到 Go 函数失败！")
return false, err
}
datas := fn(msg.GetMsg(), msg.GetMetadata().GetValues(), msg.GetType())
datas := fn(msg.Msg, msg.Metadata, msg.MsgType)
return datas, nil
}
@@ -100,7 +100,7 @@ func (bse *baseScriptEngine) ScriptToString() (string, error) {
logrus.Info("Js函数映射到 Go 函数失败！")
return "", err
}
data := fn(msg.GetMsg(), msg.GetMetadata().GetValues(), msg.GetType())
data := fn(msg.Msg, msg.Metadata, msg.MsgType)
return data, nil
}
@@ -118,6 +118,6 @@ func (bse *baseScriptEngine) ScriptGenerate() (map[string]interface{}, error) {
logrus.Info("Js函数映射到 Go 函数失败！")
return nil, err
}
datas := fn(msg.GetMsg(), msg.GetMetadata().GetValues(), msg.GetType())
datas := fn(msg.Msg, msg.Metadata, msg.MsgType)
return datas, nil
}