Add MsgId to WebSocket communication

golangboy · Feb 28, 2024 · 6113889 · 6113889
1 parent 7518393
commit 6113889
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/client/main.go b/client/main.go
@@ -214,7 +214,7 @@ func handleConnection(clientConn net.Conn) {
 		clientConn.Write([]byte("HTTP/1.1 200 Connection Established\r\n\r\n"))
 	}
 	if false == isSocks5 && false == isHttps {
-		err = ws.Conn.WriteJSON(common.Proto{MsgType: common.ReqData, Data: buf[:nbytes]})
+		err = ws.Conn.WriteJSON(common.Proto{MsgType: common.ReqData, Data: buf[:nbytes], MsgId: msgId})
 		if err != nil {
 			log.Printf("[%s]Failed to send http data to WebSocket server: %v", msgId, err)
 		}
@@ -245,6 +245,7 @@ func handleConnection(clientConn net.Conn) {
 		err = ws.Conn.WriteJSON(common.Proto{
 			MsgType: common.ReqData,
 			Data:    buf[:n],
+			MsgId:   msgId,
 		})
 		ws.Unlock()
 		if err != nil {

diff --git a/server/main.go b/server/main.go
@@ -42,6 +42,7 @@ func main() {
 					}
 					err = ws.Conn.WriteJSON(common.Proto{
 						MsgType: common.ReqConnect,
+						MsgId:   msgId,
 					})
 					if err != nil {
 						log.Printf("[%s]Failed to send connection success message to the client: %v", msgId, err)
@@ -59,6 +60,7 @@ func main() {
 							err = ws.Conn.WriteJSON(common.Proto{
 								MsgType: common.ReqData,
 								Data:    buf[:n],
+								MsgId:   msgId,
 							})
 							ws.Unlock()
 							if err != nil {