release

README.md

@@ -1,10 +1,14 @@
 # gws
 ### minimal websocket server
 
+#### Highlight
+- No dependency
+- Fully passes the WebSocket [autobahn-testsuite](https://github.com/crossbario/autobahn-testsuite)
+
 #### Attention
-- it's designed for api server, do not write big message
-- it's recommended not to enable data compression in the intranet
-- need to manage your own message handling coroutine
+- It's designed for api server, do not write big message
+- It's recommended not to enable data compression in the intranet
+- You need to manage your own message handling coroutine
 
 #### Quick Start
 ```go

example/testsuite/main.go

@@ -13,7 +13,7 @@ import (
 )
 
 func main() {
-	var upgrader = gws.Upgrader{}
+	var upgrader = gws.Upgrader{CompressEnabled: true, MaxContentLength: 32 * 1024 * 1024}
 	var handler = new(WebSocketHandler)
 	ctx, cancel := context.WithCancel(context.Background())
 

message.go

@@ -5,10 +5,11 @@ import (
 )
 
 type Message struct {
-	err    error
-	opcode Opcode
-	dbuf   *internal.Buffer // 数据缓冲
-	cbuf   *internal.Buffer // 解码器缓冲
+	err        error
+	opcode     Opcode
+	compressed bool
+	dbuf       *internal.Buffer // 数据缓冲
+	cbuf       *internal.Buffer // 解码器缓冲
 }
 
 func (c *Message) Read(p []byte) (n int, err error) {

protocol.go

@@ -22,6 +22,7 @@ type EventHandler interface {
 }
 
 var closeErrorMap = map[CloseCode]string{
+	0:                      "empty code",
 	CloseNormalClosure:     "close normal",
 	CloseGoingAway:         "client going away",
 	CloseProtocolError:     "protocol error",

reader.go

@@ -10,6 +10,12 @@ import (
 	"unicode/utf8"
 )
 
+var _pool *internal.BufferPool
+
+func init() {
+	_pool = internal.NewBufferPool()
+}
+
 func (c *Conn) ReadMessage() <-chan *Message {
 	return c.messageChan
 }
@@ -93,7 +99,7 @@ func (c *Conn) readMessage() error {
 	//      the negotiated extensions defines the meaning of such a nonzero
 	//      value, the receiving endpoint MUST _Fail the WebSocket
 	//      Connection_.
-	if c.fh.GetRSV1() != c.compressEnabled || c.fh.GetRSV2() || c.fh.GetRSV3() {
+	if !c.compressEnabled && (c.fh.GetRSV1() || c.fh.GetRSV2() || c.fh.GetRSV3()) {
 		return CloseProtocolError
 	}
 
@@ -103,6 +109,7 @@ func (c *Conn) readMessage() error {
 
 	// read control frame
 	var opcode = c.fh.GetOpcode()
+	var compressed = c.compressEnabled && c.fh.GetRSV1()
 	if !isDataFrame(opcode) {
 		return c.readControl()
 	}
@@ -161,7 +168,7 @@ func (c *Conn) readMessage() error {
 			return CloseMessageTooLarge
 		}
 		if fin {
-			msg := &Message{opcode: c.continuationOpcode, dbuf: c.continuationBuffer}
+			msg := &Message{opcode: c.continuationOpcode, dbuf: c.continuationBuffer, compressed: compressed}
 			c.continuationOpcode = 0
 			c.continuationBuffer = nil
 			return c.emitMessage(msg)
@@ -176,7 +183,7 @@ func (c *Conn) readMessage() error {
 
 	switch opcode {
 	case OpcodeText, OpcodeBinary:
-		return c.emitMessage(&Message{opcode: opcode, dbuf: buf})
+		return c.emitMessage(&Message{opcode: opcode, dbuf: buf, compressed: compressed})
 	default:
 		return errors.New("unexpected opcode: " + strconv.Itoa(int(opcode)))
 	}