Merge branch 'dev'

.gitignore

@@ -18,4 +18,5 @@
 vendor/
 bin/
 examples/debug/
+examples/testsuite/config/*.json
 examples/testsuite/reports

compress.go

@@ -22,14 +22,17 @@ type compressor struct {
 	fw          *flate.Writer
 }
 
-// Compress 压缩
-func (c *compressor) Compress(content []byte) ([]byte, error) {
+func (c *compressor) reset() {
 	if c.writeBuffer.Cap() > internal.Lv4 {
 		c.writeBuffer = internal.NewBuffer(nil)
 	}
-
 	c.writeBuffer.Reset()
 	c.fw.Reset(c.writeBuffer)
+}
+
+// Compress 压缩
+func (c *compressor) Compress(content []byte) ([]byte, error) {
+	c.reset()
 	if err := writeN(c.fw, content, len(content)); err != nil {
 		return nil, err
 	}

writer.go

@@ -41,6 +41,9 @@ func (c *Conn) WriteMessage(opcode Opcode, payload []byte) {
 }
 
 func (c *Conn) writeMessage(opcode Opcode, payload []byte) error {
+	c.wmu.Lock()
+	defer c.wmu.Unlock()
+
 	var enableCompress = c.compressEnabled && opcode.IsDataFrame()
 	if enableCompress {
 		compressedContent, err := c.compressor.Compress(payload)
@@ -55,9 +58,6 @@ func (c *Conn) writeMessage(opcode Opcode, payload []byte) error {
 // 加锁是为了防止frame header和payload并发写入后乱序
 // write a websocket frame, content is prepared
 func (c *Conn) writeFrame(opcode Opcode, payload []byte, enableCompress bool) error {
-	c.wmu.Lock()
-	defer c.wmu.Unlock()
-
 	var header = frameHeader{}
 	var n = len(payload)
 	var headerLength = header.GenerateServerHeader(true, enableCompress, opcode, n)