x

2023-07-18 22:01:48 +08:00
parent f1551af77e
commit f94012bd9d
7 changed files with 62 additions and 32 deletions
@@ -319,7 +319,7 @@ func (f *Factory) Destroy() {
 	}()
 }

-func (f *Factory) Push(msg map[string]string) (string, error) {
+func (f *Factory) Push(msg map[string]string) map[string]string {
 	var demo = *f.demo
 	var sender = &demo
 	fsps := &common.FakerSenderParams{
@@ -327,7 +327,12 @@ func (f *Factory) Push(msg map[string]string) (string, error) {
 		ChatID: msg[CHAT_ID],
 	}
 	sender.SetFsps(fsps)
-	return sender.Reply(msg[CONETNT], PUSH(""))
+
+	message_id, err := sender.Reply(msg[CONETNT], PUSH(""))
+	return map[string]string{
+		"message_id": message_id,
+		"error":      ErrStr(err),
+	}
 }

 func (f *Factory) SetReplyHandler(function func(map[string]interface{}) string) {
@@ -525,12 +530,26 @@ func (f *Factory) SetIsAdmin(function func(string) bool) {
 	}
 }

-func (f *Factory) Sender() *CustomSender {
+func (f *Factory) Sender2() *CustomSender {
 	var demo = *f.demo
 	sender := &demo
 	return sender
 }

+func (f *Factory) Sender() interface{} {
+	var demo = *f.demo
+	sender := &demo
+	return &SenderJsIplm{
+		Message:    sender,
+		Vm:         f.vm,
+		Private:    "private",
+		Group:      "group",
+		Routine:    "routine",
+		Persistent: "persistent",
+		UUID:       f.uuid,
+	}
+}
+
 func (f *Factory) Receive(wt interface{}) *CustomSender {
 	var demo = *f.demo
 	sender := &demo
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/admin/umi.9e8057c6.js"></script>
+<script src="/admin/umi.4cb92728.js"></script>

 </body></html>
@@ -63,7 +63,7 @@ func initCarry() {
 							q := value.(*Queue)
 							for _, qm := range q.GetValues() {
 								if qm.From != nil && qm.From.GetMessageID() == event["message_id"] {
-									qm.To.Sender().RecallMessage(qm.MessageID)
+									qm.To.Sender2().RecallMessage(qm.MessageID)
 								}
 							}
 							return true
@@ -247,12 +247,12 @@ func initCarry() {
 								To:      adapter,
 							}
 							_ = q.Enqueue(qm)
-							message_id, err := adapter.Push(map[string]string{
+							v := adapter.Push(map[string]string{
 								CONETNT: content,
 								CHAT_ID: chat_id,
 							})
-							if err == nil {
-								qm.MessageID = message_id
+							if v["error"] == "" {
+								qm.MessageID = v["message_id"]
 							}
 						}
 					}
@@ -211,7 +211,9 @@ func Init() {
 					time.Sleep(time.Second)
 					utils.Daemon("ready")
 				}()
-				return nil
+				return &storage.Final{
+					Message: "1秒重启升级！",
+				}
 			} else {
 				console.Debug("正在删除旧程序错误...")
 				if err = os.RemoveAll(filename); err != nil {
@@ -246,7 +248,7 @@ func Init() {
 				utils.Daemon()
 			}()
 			return &storage.Final{
-				Message: "马上重启！",
+				Message: "1秒重启！",
 			}
 		}
 		return nil
@@ -5,6 +5,13 @@ import (
 	"github.com/dop251/goja"
 )

+func ErrStr(err error) string {
+	if err == nil {
+		return ""
+	}
+	return err.Error()
+}
+
 func MakeBucketObject(vm *goja.Runtime, uuid string, on_start bool, bucket storage.Bucket) *goja.Object {
 	obj := vm.NewObject()
 	obj.Set("get", func(v ...interface{}) interface{} {
@@ -19,25 +26,27 @@ func MakeBucketObject(vm *goja.Runtime, uuid string, on_start bool, bucket stora
 		return rt
 	})
 	obj.Set("set", func(key, value interface{}) interface{} {
-		msg, _, err := SetBucketKeyValue(bucket, key, value)
-		if err != nil {
-			panic(Error(vm, err))
+		msg, changed, err := SetBucketKeyValue(bucket, key, value)
+		return map[string]interface{}{
+			"message": msg,
+			"error":   ErrStr(err),
+			"changed": changed,
 		}
-		return msg
 	})
 	obj.Set("set2", func(key, value interface{}) interface{} {
-		msg, _, err := SetBucketKeyValue2(bucket, key, value)
-		if err != nil {
-			panic(Error(vm, err))
+		msg, changed, err := SetBucketKeyValue2(bucket, key, value)
+		return map[string]interface{}{
+			"message": msg,
+			"error":   ErrStr(err),
+			"changed": changed,
 		}
-		return msg
 	})
-	obj.Set("delete", func(key interface{}) error {
+	obj.Set("delete", func(key interface{}) string {
 		_, _, err := bucket.Set(key, "")
-		return err
+		return ErrStr(err)
 	})
-	obj.Set("deleteAll", func() error {
-		return bucket.Delete()
+	obj.Set("deleteAll", func() string {
+		return ErrStr(bucket.Delete())
 	})
 	obj.Set("keys", func() []string {
 		keys, err := bucket.Keys()
@@ -55,7 +55,7 @@ func RegistTasks(pt *Tasks) {
 		for _, meta := range pt.Senders {
 			adapter, _ := GetAdapter(meta.Platfrom, meta.BotID)
 			if adapter != nil {
-				sender := adapter.Sender()
+				sender := adapter.Sender2()
 				sender.SetFsps(&common.FakerSenderParams{
 					Content: content,
 					ChatID:  meta.ChatID,