Update the SIO disconnect packet functionality (#40)

The functionality around disconnecting a SIO packet was broken. These changes fix that and allow namespaced and non-namespaced disconnects to happen.

Author: njones

Diff for: .gitignore

@@ -0,0 +1,2 @@
+protocol/socket.io-protocol
+testing

Diff for: callback/callback.go

@@ -15,6 +15,14 @@ func (fn ErrorWrap) Callback(data ...interface{}) error { return fn() }
 func (ErrorWrap) Serialize() (string, error)            { return "", ErrStubSerialize }
 func (ErrorWrap) Unserialize(string) error              { return ErrStubUnserialize }
 
+type FuncAny func(...interface{}) error
+
+func (fn FuncAny) Callback(v ...interface{}) error {
+	return fn(v...)
+}
+func (FuncAny) Serialize() (string, error) { return "", ErrStubSerialize }
+func (FuncAny) Unserialize(string) error   { return ErrStubUnserialize }
+
 type FuncString func(string)
 
 func (fn FuncString) Callback(v ...interface{}) error {

Diff for: serialize/serialize.go

@@ -50,6 +50,7 @@ func stringify(val interface{}) string {
 }
 
 var (
+	AnyParam  = _anyWrap{Any(nil)}
 	BinParam  = _binaryWrap{Binary(nil)}
 	ErrParam  = _errorWrap{Error(nil)}
 	F64Param  = _float64Param{Float64(0)}
@@ -59,6 +60,19 @@ var (
 	UintParam = _uintParam{Uinteger(0)}
 )
 
+type (
+	_any     struct{ a interface{} }
+	_anyWrap struct{ SerializableWrap }
+)
+
+func Any(v interface{}) *_any                      { return &_any{v} }
+func (x *_any) String() (str string)               { str, _ = x.Serialize(); return }
+func (x *_any) Serialize() (str string, err error) { return "", ErrSerializableBinary }
+func (x *_any) Unserialize(str string) (err error) { return ErrSerializableBinary }
+func (x *_any) Interface() (v interface{})         { return x.a }
+func (x _anyWrap) Unserialize(string) error        { return nil }
+func (x _anyWrap) String() string                  { return "" }
+
 type (
 	_binary     struct{ r io.Reader }
 	_binaryWrap struct{ SerializableWrap }

Diff for: server.v1.runback.go

@@ -1,6 +1,7 @@
 package socketio
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -57,6 +58,9 @@ func doV1(v1 *ServerV1, socketID SocketID, socket siot.Socket, req *Request) err
 		}
 	case siop.DisconnectPacket.Byte():
 		if err := v1.doDisconnectPacket(socketID, socket, req); err != nil {
+			if errors.Is(err, ErrBadOnDisconnectSocket) {
+				return nil
+			}
 			v1.tr().Send(socketID, serviceError(err), siop.WithType(siop.ErrorPacket.Byte()))
 		}
 	case siop.EventPacket.Byte():
@@ -100,6 +104,11 @@ func doDisconnectPacket(v1 *ServerV1) func(SocketID, siot.Socket, *Request) erro
 			v1.tr().Leave(socket.Namespace, socketID, socketIDPrefix+socketID.String())
 			return fn.Callback("client namespace disconnect")
 		}
+		// for any socket id at the io. (server) level...
+		if fn, ok := v1.events[socket.Namespace][OnDisconnectEvent][serverEvent]; ok {
+			v1.tr().Leave(socket.Namespace, socketID, socketIDPrefix+socketID.String())
+			return fn.Callback("client namespace disconnect")
+		}
 		return ErrBadOnDisconnectSocket
 	}
 }
@@ -112,20 +121,27 @@ func doEventPacket(v1 *ServerV1) func(SocketID, siot.Socket) error {
 			if !ok {
 				return ErrBadEventName
 			}
+			if socket.Type != siop.DisconnectPacket.Byte() {
+				data = data[1:]
+			}
 
 			if fn, ok := v1.events[socket.Namespace][event][socketID]; ok {
-				return fn.Callback(data[1:]...)
+				return fn.Callback(data...)
 			}
 			if fn, ok := v1.events[socket.Namespace][event][serverEvent]; ok {
-				return fn.Callback(data[1:]...)
+				return fn.Callback(data...)
 			}
 		case []string:
 			event := data[0]
+			if socket.Type != siop.DisconnectPacket.Byte() {
+				data = data[1:]
+			}
+
 			if fn, ok := v1.events[socket.Namespace][event][socketID]; ok {
-				return fn.Callback(stoi(data[1:])...)
+				return fn.Callback(stoi(data)...)
 			}
 			if fn, ok := v1.events[socket.Namespace][event][serverEvent]; ok {
-				return fn.Callback(stoi(data[1:])...)
+				return fn.Callback(stoi(data)...)
 			}
 		}
 		return ErrInvalidData.F(fmt.Sprintf("type %s", socket.Data)).KV("do", "eventPacket")