新增NetConn接口 (#14)

* 新增NetConn接口

* 更新

Author: guonaihong

common_options_test.go

@@ -1555,6 +1555,7 @@ func Test_CommonOption(t *testing.T) {
 				t.Errorf("write message or read message fail:got:%s, need:hello\n", d)
 			}
 		case <-time.After(1000 * time.Millisecond):
+			t.Errorf("write message timeout\n")
 		}
 		if atomic.LoadInt32(&run) != 1 {
 			t.Error("not run server:method fail")

conn.go

@@ -93,6 +93,11 @@ func newConn(c net.Conn, client bool, conf *Config, fr fixedreader.FixedReader,
 	return con
 }
 
+// 返回标准库的net.Conn
+func (c *Conn) NetConn() net.Conn {
+	return c.c
+}
+
 func (c *Conn) writeErrAndOnClose(code StatusCode, userErr error) error {
 	defer c.Callback.OnClose(c, userErr)
 	if err := c.WriteTimeout(opcode.Close, statusCodeToBytes(code), 2*time.Second); err != nil {

conn_test.go

@@ -623,6 +623,43 @@ func Test_WriteControl(t *testing.T) {
 	})
 }
 
+func Test_API(t *testing.T) {
+	t.Run("NetConn", func(t *testing.T) {
+		var shandler testPingPongCloseHandler
+		shandler.data = make(chan string, 1)
+		upgrade := NewUpgrade(WithServerBufioParseMode(), WithServerCallback(&shandler))
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			c, err := upgrade.Upgrade(w, r)
+			if err != nil {
+				t.Error(err)
+			}
+			if c.NetConn() != c.c {
+				t.Error("server.not equal")
+			}
+			c.StartReadLoop()
+		}))
+
+		defer ts.Close()
+
+		url := strings.ReplaceAll(ts.URL, "http", "ws")
+		con, err := Dial(url, WithClientOnMessageFunc(func(c *Conn, mt Opcode, payload []byte) {
+		}))
+		if err != nil {
+			t.Error(err)
+		}
+		defer con.Close()
+		if con.NetConn() != con.c {
+			t.Error("client.not equal")
+		}
+
+		err = con.WriteControl(Close, bytes.Repeat([]byte{1}, 126))
+		// 这里必须要报错
+		if err == nil {
+			t.Error("not error")
+		}
+	})
+}
+
 // 测试ping pong close control信息
 func TestPingPongClose(t *testing.T) {
 	// 写一个超过maxControlFrameSize的消息