Browse Source

与MCU控制版的通信协议由于历史原因,比较驳杂,且不统一,目前需要兼容三种格式的信息:1,纯文本格式的消息;2,普通json格式的消息;3,json rpc 2.0格式的消息。搭建项目框架,使得代码能够同时兼容并处理这三种类型的报文消息

niujiuru 1 tháng trước cách đây
mục cha
commit
c9484c05e2

+ 25 - 5
mcu_ctrl_board/bridge.go

@@ -6,6 +6,7 @@ package mcu_ctrl_board
 import "C"
 
 import (
+	"encoding/json"
 	"fmt"
 	"unsafe"
 )
@@ -41,18 +42,37 @@ func McuCtrlBoard_Write(data []byte) (int, error) {
 	return ret, nil
 }
 
+// determine JSON msg type
+func detectJsonType(jsonStr string) string {
+	var obj map[string]json.RawMessage
+	if json.Unmarshal([]byte(jsonStr), &obj) != nil {
+		return "invalid"
+	}
+
+	if string(obj["jsonrpc"]) == `"2.0"` {
+		return "jsonrpc2"
+	}
+
+	return "jsondata"
+}
+
 //export go_handle_serial_json_info
 func go_handle_serial_json_info(jsonStr *C.char) *C.char {
 	s := C.GoString(jsonStr)
-	_ = s
 
-	return nil
+	t := detectJsonType(s)
+	switch t {
+	case "jsondata":
+		return processJson(s)
+	case "jsonrpc2":
+		return processRPC2(s)
+	default:
+		return nil
+	}
 }
 
 //export go_handle_serial_text_info
 func go_handle_serial_text_info(textStr *C.char) *C.char {
 	s := C.GoString(textStr)
-	_ = s
-
-	return nil
+	return processText(s)
 }

+ 1 - 1
mcu_ctrl_board/mcu_ctrl_board.c

@@ -176,7 +176,7 @@ drop_p: //enter DROP
   }
 
   // 2, JSON 流式解析
-  if(pComIO->recvMode != JSON) goto recv_p;
+  if(pComIO->recvMode != JSON) goto recv_p; //!!!
 
   ret = lwjson_stream_parse(&pComIO->parser, ch);
   switch(ret)

+ 21 - 1
mcu_ctrl_board/mcu_ctrl_board.go

@@ -1,6 +1,7 @@
 package mcu_ctrl_board
 
 import (
+	"sync"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -8,11 +9,30 @@ import (
 
 const MODULE_NAME = "MCUCtrlBoard"
 
+var (
+	Board *MCUCtrlBoard
+	once  sync.Once
+)
+
+// MCU 控制板对象
+type MCUCtrlBoard struct {
+	SerialToMqttCh chan []byte   // 串口数据转发给MQTT
+	MqttToSerialCh chan []byte   // MQTT数据转发给串口
+	RequestPhotoCh chan struct{} // 请求相机开始拍照//
+}
+
 // 初始化控制板通信串口
 func ModuleInit() bool {
+	once.Do(func() { /////// 只允许创建单一实例
+		Board = &MCUCtrlBoard{
+			SerialToMqttCh: make(chan []byte),   // chan
+			MqttToSerialCh: make(chan []byte),   // chan
+			RequestPhotoCh: make(chan struct{}), // chan
+		}
+	})
+
 	var ret int
 	var err error
-
 	for range 5 {
 		if baseapp.IsExit1() {
 			return false

+ 14 - 0
mcu_ctrl_board/proc_json.go

@@ -0,0 +1,14 @@
+package mcu_ctrl_board
+
+/*
+#include "mcu_ctrl_board.h"
+*/
+import "C"
+
+// 处理JSON报文 支持老版协议
+func processJson(jsonStr string) *C.char {
+	s := jsonStr
+	_ = s
+
+	return nil
+}

+ 189 - 0
mcu_ctrl_board/proc_rpc2.go

@@ -0,0 +1,189 @@
+package mcu_ctrl_board
+
+/*
+#include "mcu_ctrl_board.h"
+*/
+import "C"
+
+import (
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/utils/jsonrpc2"
+)
+
+var (
+	// 存储所有待处理的JSON RPC 2.0请求ID和对应的应答通道
+	pendingRequests sync.Map
+)
+
+// 判断报文的角色是什么
+func detectRPC2Role(jsonStr string) string {
+	var obj map[string]json.RawMessage
+	if json.Unmarshal([]byte(jsonStr), &obj) != nil {
+		return "invalid"
+	}
+
+	if string(obj["jsonrpc"]) != `"2.0"` {
+		return "unknown"
+	}
+
+	switch {
+	case obj["method"] != nil:
+		return "request"
+	case obj["result"] != nil || obj["error"] != nil:
+		return "response"
+	default:
+		return "unknown"
+	}
+}
+
+// 发送通知, 不用等应答
+func SendRPC2Notify(req *jsonrpc2.Request) error {
+	if req == nil || req.ID != nil {
+		return fmt.Errorf("invalid notify request")
+	}
+
+	jsonStr, err := req.String()
+	if err != nil {
+		return err
+	}
+
+	_, err = McuCtrlBoard_Write([]byte(jsonStr))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// 发送请求, 并等待应答
+func SendRPC2Request(req *jsonrpc2.Request, timeout int /*单位: ms*/) (*jsonrpc2.Response, error) {
+	if req == nil || req.ID == nil {
+		return nil, fmt.Errorf("invalid request or request ID")
+	}
+
+	id := *req.ID
+	ch := make(chan *jsonrpc2.Response, 1)
+	pendingRequests.Store(id, ch)
+	defer pendingRequests.Delete(id)
+
+	jsonStr, err := req.String()
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = McuCtrlBoard_Write([]byte(jsonStr))
+	if err != nil {
+		return nil, err
+	}
+
+	timer := time.NewTimer(time.Duration(timeout) * time.Millisecond)
+	defer timer.Stop()
+
+	select {
+	case resp := <-ch:
+		return resp, nil
+	case <-timer.C:
+		return nil, fmt.Errorf("request %v timed out after %d ms", id, timeout)
+	}
+}
+
+// 主动发出请求的应答
+func handleRPC2Response(jsonStr string) error {
+	w, err := jsonrpc2.ParseResponse(jsonStr)
+	if err != nil {
+		return fmt.Errorf("an error occurred while parsing JSON-RPC response: %v", err)
+	}
+
+	if w.ID == nil {
+		return nil
+	}
+
+	id := *w.ID
+
+	v, ok := pendingRequests.Load(id)
+	if !ok {
+		return fmt.Errorf("orphan response id=%d, no pending request", id)
+	}
+
+	ch, ok := v.(chan *jsonrpc2.Response)
+	if !ok {
+		return fmt.Errorf("invalid response channel for id=%d", id)
+	}
+
+	select {
+	case ch <- w:
+		return nil
+	default:
+		return fmt.Errorf("response dropped for id=%d, channel not receiving", id)
+	}
+}
+
+// 处理JSONRPC 2.0报文
+func processRPC2(jsonStr string) *C.char {
+	s := jsonStr
+	role := detectRPC2Role(s)
+
+	var w *jsonrpc2.Response
+
+	wret := func() *C.char {
+		if w == nil { // 无应答
+			return nil
+		}
+		// 下面由C.CString()分配的堆内存由C侧释放
+		b, err := w.String()
+		if err != nil {
+			return C.CString(fmt.Sprintf("an error occurred while calling the String() method of jsonrpc2.Response: %v", err))
+		}
+		return C.CString(b)
+	}
+
+	if role == "response" {
+		err := handleRPC2Response(s)
+		if err != nil {
+			baseapp.Logger.Errorf("[%s] 解析控制板返回的应答时发生错误: %v", MODULE_NAME, err)
+		}
+		return nil
+	}
+
+	if role != "request" {
+		w = jsonrpc2.BuildError(nil, jsonrpc2.ErrInvalidRequest, "")
+		return wret()
+	}
+
+	r, err := jsonrpc2.ParseRequest(s)
+
+	call := func(f func(*jsonrpc2.Request) (*jsonrpc2.Response, error)) *jsonrpc2.Response {
+		w, e := f(r)
+		if e != nil { // 调用本地RPC处理函数时发生错误
+			return jsonrpc2.BuildError(r, jsonrpc2.ErrInternal, "")
+		}
+		return w
+	}
+
+	if err != nil {
+		w = jsonrpc2.BuildError(nil, jsonrpc2.ErrParse, "")
+	} else {
+		switch r.Method {
+		case "echo":
+			w = call(test_echo)
+		default:
+			w = jsonrpc2.BuildError(r, jsonrpc2.ErrMethodNotFound, "")
+		}
+	}
+
+	return wret()
+}
+
+// 文本回显本地测试方法
+func test_echo(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
+	if r.Params == nil {
+		return jsonrpc2.BuildError(r, jsonrpc2.ErrInvalidParams, ""), nil
+	}
+
+	return jsonrpc2.BuildResult(r, r.Params)
+}

+ 14 - 0
mcu_ctrl_board/proc_text.go

@@ -0,0 +1,14 @@
+package mcu_ctrl_board
+
+/*
+#include "mcu_ctrl_board.h"
+*/
+import "C"
+
+// 处理JSON报文 支持老版协议
+func processText(jsonStr string) *C.char {
+	s := jsonStr
+	_ = s
+
+	return nil
+}