remove unused code

lxzan · lxzan · commit 07d7a2278a83 · 2023-10-13T09:27:24.000+08:00
diff --git a/benchmark_test.go b/benchmark_test.go
@@ -151,7 +151,7 @@ func BenchmarkStdDeCompress(b *testing.B) {
 	src := bytes.NewBuffer(nil)
 	for i := 0; i < b.N; i++ {
 		internal.BufferReset(src, buffer.Bytes())
-		_, _ = src.Write(internal.FlateTail)
+		_, _ = src.Write(flateTail)
 		resetter := fr.(flate.Resetter)
 		_ = resetter.Reset(src, nil)
 		io.CopyBuffer(io.Discard, fr, p)
@@ -169,7 +169,7 @@ func BenchmarkKlauspostDeCompress(b *testing.B) {
 	src := bytes.NewBuffer(nil)
 	for i := 0; i < b.N; i++ {
 		internal.BufferReset(src, buffer.Bytes())
-		_, _ = src.Write(internal.FlateTail)
+		_, _ = src.Write(flateTail)
 		resetter := fr.(klauspost.Resetter)
 		_ = resetter.Reset(src, nil)
 		fr.(io.WriterTo).WriteTo(io.Discard)
diff --git a/compress.go b/compress.go
@@ -11,6 +11,10 @@ import (
 	"sync/atomic"
 )
 
+// FlateTail Add four bytes as specified in RFC
+// Add final block to squelch unexpected EOF error from flate reader.
+var flateTail = []byte{0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff}
+
 type compressors struct {
 	serial      uint64
 	size        uint64
@@ -109,7 +113,7 @@ func (c *decompressor) Decompress(src *bytes.Buffer) (*bytes.Buffer, int, error)
 	c.Lock()
 	defer c.Unlock()
 
-	_, _ = src.Write(internal.FlateTail)
+	_, _ = src.Write(flateTail)
 	c.reset(src)
 	if _, err := c.fr.(io.WriterTo).WriteTo(c.b); err != nil {
 		return nil, 0, err
diff --git a/internal/others.go b/internal/others.go
@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"io"
 	"math"
 	"net"
 )
@@ -23,10 +22,6 @@ var (
 	SecWebSocketProtocol   = Pair{"Sec-WebSocket-Protocol", ""}
 )
 
-// FlateTail Add four bytes as specified in RFC
-// Add final block to squelch unexpected EOF error from flate reader.
-var FlateTail = []byte{0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff}
-
 const MagicNumber = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
 
 const (
@@ -35,13 +30,6 @@ const (
 	ThresholdV3 = math.MaxUint64
 )
 
-type (
-	ReadLener interface {
-		io.Reader
-		Len() int
-	}
-
-	NetConn interface {
-		NetConn() net.Conn
-	}
-)
+type NetConn interface {
+	NetConn() net.Conn
+}
diff --git a/option.go b/option.go
@@ -75,8 +75,8 @@ type (
 		// Whether to check the text utf8 encoding, turn off the performance will be better
 		CheckUtf8Enabled bool
 
-		// &#24674;&#22797;&#31243;&#24207;
-		// Recovery program
+		// &#28040;&#24687;&#22238;&#35843;(OnMessage)&#30340;&#24674;&#22797;&#31243;&#24207;
+		// Message callback (OnMessage) recovery program
 		Recovery func(logger Logger)
 
 		// &#26085;&#24535;&#24037;&#20855;
diff --git a/protocol.go b/protocol.go
@@ -264,13 +264,3 @@ func (c *continuationFrame) reset() {
 	c.opcode = 0
 	c.buffer = nil
 }
-
-type bufferWrapper struct {
-	*bytes.Buffer
-	index int
-}
-
-func (c *bufferWrapper) Close() error {
-	binaryPool.Put(c.Buffer, c.index)
-	return nil
-}
diff --git a/reader.go b/reader.go
@@ -93,9 +93,9 @@ func (c *Conn) readMessage() error {
 	}
 
 	var fin = c.fh.GetFIN()
-	var buf, index = binaryPool.Get(contentLength)
+	var buf, index = binaryPool.Get(contentLength + len(flateTail))
 	var p = buf.Bytes()[:contentLength]
-	var closer = bufferWrapper{buf, index}
+	var closer = Message{Data: buf, index: index}
 	defer closer.Close()
 
 	if err := internal.ReadN(c.br, p); err != nil {
@@ -112,7 +112,7 @@ func (c *Conn) readMessage() error {
 	if fin && opcode != OpcodeContinuation {
 		*(*[]byte)(unsafe.Pointer(buf)) = p
 		if !compressed {
-			closer.Buffer, closer.index = nil, 0
+			closer.Data, closer.index = nil, 0
 		}
 		return c.emitMessage(&Message{index: index, Opcode: opcode, Data: buf, compressed: compressed})
 	}
diff --git a/writer_test.go b/writer_test.go
@@ -119,7 +119,7 @@ func TestConn_WriteAsyncError(t *testing.T) {
 		var clientOption = &ClientOption{}
 		server, client := newPeer(serverHandler, serverOption, clientHandler, clientOption)
 		go client.ReadLoop()
-		var err = server.WriteAsync(OpcodeText, internal.FlateTail)
+		var err = server.WriteAsync(OpcodeText, flateTail)
 		assert.Error(t, err)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ func (c *Conn) readMessage() error {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`var fin = c.fh.GetFIN()`
`96`		`- var buf, index = binaryPool.Get(contentLength)`
	`96`	`+ var buf, index = binaryPool.Get(contentLength + len(flateTail))`
`97`	`97`	`var p = buf.Bytes()[:contentLength]`
`98`		`- var closer = bufferWrapper{buf, index}`
	`98`	`+ var closer = Message{Data: buf, index: index}`
`99`	`99`	`defer closer.Close()`
`100`	`100`
`101`	`101`	`if err := internal.ReadN(c.br, p); err != nil {`
`@@ -112,7 +112,7 @@ func (c *Conn) readMessage() error {`
`112`	`112`	`if fin && opcode != OpcodeContinuation {`
`113`	`113`	`([]byte)(unsafe.Pointer(buf)) = p`
`114`	`114`	`if !compressed {`
`115`		`- closer.Buffer, closer.index = nil, 0`
	`115`	`+ closer.Data, closer.index = nil, 0`
`116`	`116`	`}`
`117`	`117`	`return c.emitMessage(&Message{index: index, Opcode: opcode, Data: buf, compressed: compressed})`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func TestConn_WriteAsyncError(t *testing.T) {`
`119`	`119`	`var clientOption = &ClientOption{}`
`120`	`120`	`server, client := newPeer(serverHandler, serverOption, clientHandler, clientOption)`
`121`	`121`	`go client.ReadLoop()`
`122`		`- var err = server.WriteAsync(OpcodeText, internal.FlateTail)`
	`122`	`+ var err = server.WriteAsync(OpcodeText, flateTail)`
`123`	`123`	`assert.Error(t, err)`
`124`	`124`	`})`
`125`	`125`	`}`