support frp's websocket

go.sum

@@ -1,7 +1,6 @@
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

server.go

@@ -50,22 +50,6 @@ func (s *server) CloneWithNewAddress(bindAddress string) Server {
 	}
 }
 
-func isWsUpgrade(header http.Header) bool {
-	if v := header.Get("Connection"); len(v) == 0 {
-		return false
-	}
-	if v := header.Get("Upgrade"); len(v) == 0 {
-		return false
-	}
-	if v := header.Get("Sec-Websocket-Version"); len(v) == 0 {
-		return false
-	}
-	if v := header.Get("Sec-Websocket-Key"); len(v) == 0 {
-		return false
-	}
-	return true
-}
-
 var replacer = strings.NewReplacer("+", "-", "/", "_", "=", "")
 
 func decodeEd(s string) ([]byte, error) {
@@ -100,7 +84,7 @@ func (s *normalServerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 	go func() {
 		defer close(ch)
-		if !isWsUpgrade(r.Header) {
+		if !websocket.IsWebSocketUpgrade(r) {
 			return
 		}
 		tcp, err := net.Dial("tcp", s.DestAddress)
@@ -160,7 +144,7 @@ func (s *internalServerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 
 	go func() {
 		defer close(ch)
-		if !isWsUpgrade(r.Header) {
+		if !websocket.IsWebSocketUpgrade(r) {
 			return
 		}
 		// send inHeader to client for Xray's 0rtt ws

tunnel.go

@@ -45,7 +45,7 @@ func WsToTcp(ws *websocket.Conn, tcp net.Conn) (err error) {
 			if err != nil {
 				break
 			}
-			if msgType != websocket.BinaryMessage {
+			if msgType != websocket.BinaryMessage && msgType != websocket.TextMessage {
 				log.Println("unknown msgType")
 			}
 		}