Commit 6368e27a authored by Chunchi Che's avatar Chunchi Che

update proxy.go

parent 388dc2ed
...@@ -54,7 +54,7 @@ func wsProxy(ws *websocket.Conn, tcp *net.Conn, wg *sync.WaitGroup) { ...@@ -54,7 +54,7 @@ func wsProxy(ws *websocket.Conn, tcp *net.Conn, wg *sync.WaitGroup) {
writer := bufio.NewWriter(*tcp) writer := bufio.NewWriter(*tcp)
for { for {
messageType, buf, err := ws.ReadMessage() messageType, buffer, err := ws.ReadMessage()
if err != nil { if err != nil {
log.Println("websocket read message error: ", err) log.Println("websocket read message error: ", err)
break break
...@@ -65,9 +65,7 @@ func wsProxy(ws *websocket.Conn, tcp *net.Conn, wg *sync.WaitGroup) { ...@@ -65,9 +65,7 @@ func wsProxy(ws *websocket.Conn, tcp *net.Conn, wg *sync.WaitGroup) {
break break
} }
log.Println("websocket to tcp: " + string(buf)) buffer, err = darkneos.Transform(buffer, darkneos.ProtobufToRawBuf)
buffer, err := darkneos.Transform(buf, darkneos.ProtobufToRawBuf)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
break break
...@@ -98,10 +96,13 @@ func tcpProxy(tcp *net.Conn, ws *websocket.Conn, wg *sync.WaitGroup) { ...@@ -98,10 +96,13 @@ func tcpProxy(tcp *net.Conn, ws *websocket.Conn, wg *sync.WaitGroup) {
break break
} }
log.Println("tcp to websocket: " + string(buffer)) buffer, err = darkneos.Transform(buffer, darkneos.RawBufToProtobuf)
if err != nil {
log.Fatal(err)
break
}
// todo: convert buffer to pb err = ws.WriteMessage(websocket.BinaryMessage, buffer)
err = ws.WriteMessage(websocket.TextMessage, buffer) // temporary TextMessage, should be BinaryMessage in ygopro
if err != nil { if err != nil {
log.Fatal("tcp send message error: ", err) log.Fatal("tcp send message error: ", err)
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment