fix(websocket): fix redial

Change-Id: I926011f98c6d805f509bc0a4e88ed6c5eb29459b

mixer/websocket/client.go

@@ -82,7 +82,7 @@ func (*clientPlugin) Name() string {
 	return "websocket"
 }
 
-func (c *clientPlugin) PostDial(sess tp.PreSession, isRedial bool) *tp.Status {
+func (c *clientPlugin) PostDial(sess tp.PreSession, isRedial bool) (stat *tp.Status) {
 	var location, origin string
 	if sess.Peer().TLSConfig() == nil {
 		location = "ws://" + sess.RemoteAddr().String() + c.rootPath
@@ -95,13 +95,15 @@ func (c *clientPlugin) PostDial(sess tp.PreSession, isRedial bool) *tp.Status {
 	if err != nil {
 		return tp.NewStatus(tp.CodeDialFailed, "upgrade to websocket failed", err.Error())
 	}
-	var stat *tp.Status
 	sess.ModifySocket(func(conn net.Conn) (net.Conn, tp.ProtoFunc) {
 		conn, err := ws.NewClient(cfg, conn)
 		if err != nil {
 			stat = tp.NewStatus(tp.CodeDialFailed, "upgrade to websocket failed", err.Error())
 			return nil, nil
 		}
+		if isRedial {
+			return conn, sess.GetProtoFunc()
+		}
 		return conn, NewWsProtoFunc(sess.GetProtoFunc())
 	})
 	return stat

mixer/websocket/proto.go

@@ -31,13 +31,13 @@ func NewWsProtoFunc(subProto ...tp.ProtoFunc) tp.ProtoFunc {
 	return func(rw tp.IOWithReadBuffer) socket.Proto {
 		// When called, the lock of the external socket.Socket is already locked,
 		// so it is concurrent security.
-		conn, ok := rw.(socket.UnsafeSocket).RawLocked().(*ws.Conn)
+		connIface := rw.(socket.UnsafeSocket).RawLocked()
+		conn, ok := connIface.(*ws.Conn)
 		if !ok {
-			tp.Warnf("connection does not support websocket protocol")
 			if len(subProto) > 0 {
 				return subProto[0](rw)
 			}
-			return socket.DefaultProtoFunc()(rw)
+			return defaultProto(rw)
 		}
 		subConn := newVirtualConn()
 		p := &wsProto{