update

Author: jxhczhl

core/api.go

@@ -3,6 +3,7 @@ package core
 import (
 	"JsRpc/config"
 	"JsRpc/utils"
+	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
@@ -23,10 +24,15 @@ var (
 
 // Message 请求和传递请求
 type Message struct {
-	Action string `json:"action"`
-	Param  string `json:"param"`
+	Action    string `json:"action"`
+	MessageId string `json:"message_id"`
+	Param     string `json:"param"`
+}
+type MessageResponse struct {
+	Action       string `json:"action"`
+	MessageId    string `json:"message_id"`
+	ResponseData string `json:"response_data"`
 }
-
 type ApiParam struct {
 	GroupName string `form:"group" json:"group"`
 	ClientId  string `form:"clientId" json:"clientId"`
@@ -39,7 +45,7 @@ type ApiParam struct {
 type Clients struct {
 	clientGroup string
 	clientId    string
-	actionData  map[string]chan string
+	actionData  map[string]map[string]chan string // {"action":{"消息id":消息管道}}
 	clientWs    *websocket.Conn
 }
 
@@ -48,7 +54,7 @@ func NewClient(group string, uid string, ws *websocket.Conn) *Clients {
 	return &Clients{
 		clientGroup: group,
 		clientId:    uid,
-		actionData:  make(map[string]chan string, 1), // action有消息后就保存到chan里
+		actionData:  make(map[string]map[string]chan string), // action有消息后就保存到chan里
 		clientWs:    ws,
 	}
 }
@@ -83,20 +89,21 @@ func ws(c *gin.Context) {
 		if err != nil {
 			break
 		}
-		msg := string(message)
-		check := []uint8{104, 108, 94, 95, 94}
-		strIndex := strings.Index(msg, string(check))
-		if strIndex >= 1 {
-			action := msg[:strIndex]
-			client.actionData[action] <- msg[strIndex+5:]
-			if len(msg) > 100 {
-				utils.LogPrint("get_message:", msg[strIndex+5:101]+"......")
-			} else {
-				utils.LogPrint("get_message:", msg[strIndex+5:])
-			}
-
+		// 将得到的数据转成结构体
+		messageStruct := MessageResponse{}
+		err = json.Unmarshal(message, &messageStruct)
+		if err != nil {
+			log.Error("接收到的消息不是设定的格式 不做处理", err)
+		}
+		action := messageStruct.Action
+		messageId := messageStruct.MessageId
+		msg := messageStruct.ResponseData
+		// 这里直接给管道塞数据，那么之前发送的时候要初始化好
+		client.actionData[action][messageId] <- msg
+		if len(msg) > 100 {
+			utils.LogPrint("get_message:", msg[:101]+"......")
 		} else {
-			log.Error(msg, "message error")
+			utils.LogPrint("get_message:", msg)
 		}
 
 	}

core/engine.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"JsRpc/config"
+	"JsRpc/utils"
 	"encoding/json"
 	"fmt"
 	"math/rand"
@@ -10,11 +11,16 @@ import (
 
 // GQueryFunc 发送请求到客户端
 func (c *Clients) GQueryFunc(funcName string, param string, resChan chan<- string) {
-	WriteData := Message{Param: param, Action: funcName}
+	MessageId := utils.GetUUID()
+	WriteData := Message{Param: param, MessageId: MessageId, Action: funcName}
 	data, _ := json.Marshal(WriteData)
 	clientWs := c.clientWs
+	// 先判断action是否需要初始化
 	if c.actionData[funcName] == nil {
-		c.actionData[funcName] = make(chan string, 1) //此次action初始化1个消息
+		c.actionData[funcName] = make(map[string]chan string)
+	}
+	if c.actionData[funcName][MessageId] == nil {
+		c.actionData[funcName][MessageId] = make(chan string, 1) //此次action初始化1个消息
 	}
 	gm.Lock()
 	err := clientWs.WriteMessage(1, data)
@@ -24,8 +30,8 @@ func (c *Clients) GQueryFunc(funcName string, param string, resChan chan<- strin
 	}
 	resultFlag := false
 	for i := 0; i < config.DefaultTimeout*10; i++ {
-		if len(c.actionData[funcName]) > 0 {
-			res := <-c.actionData[funcName]
+		if len(c.actionData[funcName][MessageId]) > 0 {
+			res := <-c.actionData[funcName][MessageId]
 			resChan <- res
 			resultFlag = true
 			break
@@ -38,6 +44,7 @@ func (c *Clients) GQueryFunc(funcName string, param string, resChan chan<- strin
 	}
 	defer func() {
 		close(resChan)
+		delete(c.actionData[funcName], MessageId)
 	}()
 }
 

go.mod

@@ -4,6 +4,7 @@ go 1.22.1
 
 require (
 	github.com/gin-gonic/gin v1.9.1
+	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/unrolled/secure v1.14.0
@@ -19,7 +20,6 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect

resouces/JsEnv_Dev.js

@@ -69,60 +69,49 @@ Hlclient.prototype.handlerRequest = function (requestJson) {
     try {
         var result = JSON.parse(requestJson)
     } catch (error) {
-        console.log("catch error", requestJson);
-        result = transjson(requestJson)
+        console.log("请求信息解析错误", requestJson);
+        return
     }
-    //console.log(result)
-    if (!result['action']) {
-        this.sendResult('', 'need request param {action}');
+    if (!result['action'] || !result["message_id"]) {
+        console.warn('没有方法或者消息id,不处理');
         return
     }
-    var action = result["action"]
+    var action = result["action"], message_id = result["message_id"]
     var theHandler = this.handlers[action];
     if (!theHandler) {
-        this.sendResult(action, 'action not found');
+        this.sendResult(action, message_id, 'action没找到');
         return
     }
     try {
         if (!result["param"]) {
             theHandler(function (response) {
-                _this.sendResult(action, response);
+                _this.sendResult(action, message_id, response);
             })
             return
         }
         var param = result["param"]
         try {
             param = JSON.parse(param)
-        } catch (e) {}
+        } catch (e) {
+        }
         theHandler(function (response) {
-            _this.sendResult(action, response);
+            _this.sendResult(action, message_id, response);
         }, param)
 
     } catch (e) {
         console.log("error: " + e);
-        _this.sendResult(action, e);
+        _this.sendResult(action, message_id, e);
     }
 }
 
-Hlclient.prototype.sendResult = function (action, e) {
+Hlclient.prototype.sendResult = function (action, message_id, e) {
     if (typeof e === 'object' && e !== null) {
         try {
             e = JSON.stringify(e)
         } catch (v) {
             console.log(v)//不是json无需操作
         }
     }
-    this.send(action + atob("aGxeX14") + e);
+    this.send(JSON.stringify({"action": action, "message_id": message_id, "response_data": e}));
 }
 
-function transjson(formdata) {
-    var regex = /"action":(?<actionName>.*?),/g
-    var actionName = regex.exec(formdata).groups.actionName
-    stringfystring = formdata.match(/{..data..:.*..\w+..:\s...*?..}/g).pop()
-    stringfystring = stringfystring.replace(/\\"/g, '"')
-    paramstring = JSON.parse(stringfystring)
-    tens = `{"action":` + actionName + `,"param":{}}`
-    tjson = JSON.parse(tens)
-    tjson.param = paramstring
-    return tjson
-}