gracefully close connection fixes: #448

conn.go

@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net"
+	"reflect"
 	"strconv"
 	"sync"
 	"time"
@@ -219,7 +220,7 @@ var validReceivedCloseCodes = map[int]bool{
 	CloseTLSHandshake:            false,
 }
 
-func isValidReceivedCloseCode(code int) bool {
+func isValidCloseCode(code int) bool {
 	return validReceivedCloseCodes[code] || (code >= 3000 && code <= 4999)
 }
 
@@ -325,10 +326,53 @@ func (c *Conn) Subprotocol() string {
 	return c.subprotocol
 }
 
-// Close closes the underlying network connection without sending or waiting
+// Close sends close frame and waits for one in response
-// for a close message.
+// it expects two args. `closeCode int` and `closeMessage string` in order
-func (c *Conn) Close() error {
+// it uses variadic args to maintain backwards compatibility
-	return c.conn.Close()
+func (c *Conn) Close(args ...interface{}) error {
+	closeCode := CloseNoStatusReceived
+	message := ""
+	ok := false
+	if len(args) == 2 {
+		closeCode, ok = args[0].(int)
+		if !ok {
+			closeCode = CloseNoStatusReceived
+		}
+		message, ok = args[1].(string)
+		if !ok {
+			message = ""
+		}
+	}
+	err := c.Shutdown(closeCode, message)
+	if err != nil {
+		return err
+	}
+	c.conn.Close()
+	return nil
+}
+
+// Shutdown sends a close frame and waits for one in response
+func (c *Conn) Shutdown(closeCode int, closeMessage string) error {
+	if !isValidCloseCode(closeCode) {
+		// we do not shutdown connection
+		return errors.New("invalid close code received")
+	}
+	if !utf8.ValidString(closeMessage) {
+		return  errors.New("invalid utf8 payload for shutdown message")
+	}
+	message := FormatCloseMessage(closeCode, closeMessage)
+	err := c.WriteControl(CloseMessage, message, time.Now().Add(writeWait))
+	if err != nil {
+		return err
+	}
+	timeStart := time.Now()
+	c.conn.SetReadDeadline(time.Now().Add(time.Minute))
+	for _, _, err := c.ReadMessage(); reflect.TypeOf(err) != reflect.TypeOf(&CloseError{}) ; {
+		if timeStart.Sub(time.Now()) > time.Minute {
+			break
+		}
+	}
+	return nil
 }
 
 // LocalAddr returns the local network address.
@@ -496,6 +540,7 @@ func (c *Conn) beginMessage(mw *messageWriter, messageType int) error {
 // All message types (TextMessage, BinaryMessage, CloseMessage, PingMessage and
 // PongMessage) are supported.
 func (c *Conn) NextWriter(messageType int) (io.WriteCloser, error) {
+
 	var mw messageWriter
 	if err := c.beginMessage(&mw, messageType); err != nil {
 		return nil, err
@@ -902,7 +947,7 @@ func (c *Conn) advanceFrame() (int, error) {
 		closeText := ""
 		if len(payload) >= 2 {
 			closeCode = int(binary.BigEndian.Uint16(payload))
-			if !isValidReceivedCloseCode(closeCode) {
+			if !isValidCloseCode(closeCode) {
 				return noFrame, c.handleProtocolError("invalid close code")
 			}
 			closeText = string(payload[2:])