🎉 ✨ job增加注入指令结果

plugin/job/main.go

@@ -2,8 +2,10 @@
 package job
 
 import (
+	"encoding/json"
 	"hash/crc64"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -30,7 +32,7 @@ var (
 func init() {
 	en := control.Register("job", order.AcquirePrio(), &control.Options{
 		DisableOnDefault:  false,
-		Help:              "定时指令触发器\n- 记录在\"cron\"触发的指令\n- 取消在\"cron\"触发的指令\n- 查看所有触发指令\n- 查看在\"cron\"触发的指令",
+		Help:              "定时指令触发器\n- 记录在\"cron\"触发的指令\n- 取消在\"cron\"触发的指令\n- 查看所有触发指令\n- 查看在\"cron\"触发的指令\n- 注入指令结果：任意指令",
 		PrivateDataFolder: "job",
 	})
 	db.DBPath = en.DataFolder() + "job.db"
@@ -144,6 +146,34 @@ func init() {
 		}
 		ctx.SendChain(message.Text(lst))
 	})
+	en.OnPrefix("注入指令结果：", ctxext.UserOrGrpAdmin, islonotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		command := ctx.State["args"].(string)
+		if command != "" {
+			vevent.NewLoopOf(vevent.NewAPICallerHook(ctx, func(rsp zero.APIResponse, err error) {
+				if err == nil {
+					logrus.Debugln("[job] CallerHook returned")
+					id := message.NewMessageID(rsp.Data.Get("message_id").String())
+					msg := ctx.GetMessage(id)
+					ctx.Event.NativeMessage = json.RawMessage("\"" + msg.Elements.String() + "\"")
+					ctx.Event.RawMessageID = json.RawMessage(msg.MessageId.String())
+					ctx.Event.RawMessage = msg.Elements.String()
+					time.Sleep(time.Second * 5) // 防止风控
+					ctx.Event.Time = time.Now().Unix()
+					vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
+						err = json.NewEncoder(w).Encode(ctx.Event)
+					})
+					if err != nil {
+						cl()
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
+					}
+					logrus.Debugln("[job] inject:", binary.BytesToString(vev))
+					inject(ctx.Event.SelfID, vev)()
+					cl()
+				}
+			})).Echo([]byte(strings.ReplaceAll(ctx.Event.RawEvent.Raw, "\"注入指令结果：", "\"")))
+		}
+	})
 }
 
 func islonotnil(ctx *zero.Ctx) bool {

plugin/runcode/code_runner.go

@@ -104,9 +104,10 @@ func init() {
 			"JavaScript || TypeScript || PHP || Shell \n" +
 			"Kotlin  || Rust || Erlang || Ruby || Swift \n" +
 			"R || VB || Py2 || Perl || Pascal || Scala",
-	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^>runcode\s(.+?)\s([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).
+	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^>runcode(raw)?\s(.+?)\s([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			language := ctx.State["regex_matched"].([]string)[1]
+			israw := ctx.State["regex_matched"].([]string)[1] != ""
+			language := ctx.State["regex_matched"].([]string)[2]
 			language = strings.ToLower(language)
 			if runType, exist := table[language]; !exist {
 				// 不支持语言
@@ -116,10 +117,9 @@ func init() {
 				)
 			} else {
 				// 执行运行
-				block := ctx.State["regex_matched"].([]string)[2]
-				block = message.UnescapeCQCodeText(block)
-				if block == "help" {
-					// 输出模板
+				block := message.UnescapeCQCodeText(ctx.State["regex_matched"].([]string)[3])
+				switch block {
+				case "help":
 					ctx.SendChain(
 						message.Text("> ", ctx.Event.Sender.NickName, "  ", language, "-template:\n"),
 						message.Text(
@@ -127,7 +127,7 @@ func init() {
 							templates[language],
 						),
 					)
-				} else {
+				default:
 					if output, err := runCode(block, runType); err != nil {
 						// 运行失败
 						ctx.SendChain(
@@ -136,10 +136,14 @@ func init() {
 						)
 					} else {
 						// 运行成功
-						ctx.SendChain(
-							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-							message.Text(output),
-						)
+						if israw {
+							ctx.SendChain(message.Text(output))
+						} else {
+							ctx.SendChain(
+								message.Text("> ", ctx.Event.Sender.NickName, "\n"),
+								message.Text(output),
+							)
+						}
 					}
 				}
 			}