Commit 2baa5c26 authored by ginuerzh's avatar ginuerzh

fix websocket rw

parent 0eabf759
...@@ -20,23 +20,16 @@ func NewWSConn(conn *websocket.Conn) *WSConn { ...@@ -20,23 +20,16 @@ func NewWSConn(conn *websocket.Conn) *WSConn {
} }
func (conn *WSConn) Read(b []byte) (n int, err error) { func (conn *WSConn) Read(b []byte) (n int, err error) {
_, r, err := conn.NextReader() _, p, err := conn.ReadMessage()
if err != nil { copy(b, p)
return n = len(p)
}
n, err = r.Read(b)
log.Println("ws r:", n) log.Println("ws r:", n)
return return
} }
func (conn *WSConn) Write(b []byte) (n int, err error) { func (conn *WSConn) Write(b []byte) (n int, err error) {
w, err := conn.NextWriter(websocket.BinaryMessage) err = conn.WriteMessage(websocket.BinaryMessage, b)
if err != nil { n = len(b)
return
}
defer w.Close()
n, err = w.Write(b)
log.Println("ws w:", n) log.Println("ws w:", n)
return return
} }
......
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