refactor(server/socket): drop my 💩, add some log, rename Nps to Nsp (namespace)

Author: burgesQ

server.go

@@ -110,7 +110,6 @@ func (s *Io) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	header := r.Header
 	if slices.Contains(header["Connection"], "Upgrade") && header.Get("Upgrade") == "websocket" {
-		// if true {
 		log.Println("conection:upgrade")
 
 		upgrader.CheckOrigin = func(r *http.Request) bool { return true }
@@ -121,19 +120,13 @@ func (s *Io) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		defer c.Close()
 
-		// var id string
-
 		if r.URL.Query()["sid"] != nil {
-			log.Print("sid presented ! ")
-
 			return
-			// Still allows it ?
 		}
-		// log.Println("SID:", id)
 
 		socket := Socket{
 			Id:  s.randomUUID(),
-			Nps: "/",
+			Nsp: "/",
 			Conn: &Conn{
 				http:       c,
 				reqHeaders: r.Header.Clone(),
@@ -147,11 +140,7 @@ func (s *Io) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			pingTime: s.pingInterval,
 		}
 
-		defer func() {
-			log.Printf("socket %q closed", socket.Id)
-
-			socket.disconnect()
-		}()
+		defer socket.disconnect()
 
 		socket.dispose = append(socket.dispose, func() {
 			s.sockets.delete(socket.Id)
@@ -166,36 +155,29 @@ func (s *Io) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			Upgrades:     []string{"websocket"},
 		}.ToJson())
 
-		log.Printf("headers %q: %+v", socket.Id, socket.Conn.reqHeaders)
-		log.Printf("query %q: %+v", socket.Id, socket.Conn.reqQuery)
-
 		for {
+
 			messageType, message, err := c.ReadMessage()
 			if err != nil {
-				log.Printf("got error: %v\n", err)
+				log.Printf("[socket.io] input error: %v\n", err)
+
 				break
 			}
 
 			if messageType == websocket.TextMessage {
 				err := s.handlerMessage(&socket, string(message))
 				if err != nil {
-					log.Printf("got error: %v\n", err)
+					log.Printf("[socket.io] message handling error: %v\n", err)
 
 					return
 				}
 			}
 		}
 	} else if strings.HasPrefix(r.URL.Path, s.path) {
-
-		log.Println("conection:path match")
-
 		clientDistFs, _ := fs.Sub(staticFS, "client-dist")
 		fs := http.StripPrefix(s.path, http.FileServer(http.FS(clientDistFs)))
 		fs.ServeHTTP(w, r)
 	} else {
-
-		log.Printf("conection:not found: got [%q] want [%q]", r.URL.Path, s.path)
-
 		http.NotFound(w, r)
 	}
 }
@@ -338,7 +320,7 @@ func (s *Io) new() func(ctx *fiber.Ctx) error {
 
 		socket := Socket{
 			Id:  s.randomUUID(),
-			Nps: "/",
+			Nsp: "/",
 			Conn: &Conn{
 				fasthttp: c,
 			},
@@ -380,9 +362,14 @@ func (s *Io) new() func(ctx *fiber.Ctx) error {
 }
 
 func (s *Io) handlerMessage(socket *Socket, message string) error {
+	log.Printf("[socket.io] recv packet sid=%s ns=%s  data=%s\n",
+		socket.Id, socket.Nsp, message)
+
 	enginePacketType := string(message[0:1])
 	switch enginePacketType {
 	case engineio.MESSAGE.String():
+		// log.Println("[socket.io] string message")
+
 		mess := string(message)
 		packetType := string(message[1:2])
 		rawpayload := string(message[2:])
@@ -401,11 +388,9 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 		for {
 			nextSpecial3 := strings.Index(string(nextMess), ",")
 			if nextSpecial3 == -1 || (special1 != -1 && (tot+nextSpecial3) > special1) || (special2 != -1 && (tot+nextSpecial3) > special2) {
-				log.Printf("break reason: next: %d  spe1: %d spe2: %d", nextSpecial3, special1, special2)
 				break
 			}
 			nextMess = nextMess[nextSpecial3+1:]
-			log.Print("msg: " + nextMess)
 			special3 = nextSpecial3
 			tot += nextSpecial3
 		}
@@ -438,6 +423,8 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 
 		switch packetType {
 		case socket_protocol.DISCONNECT.String():
+			// log.Println("[socket.io] disconnect message")
+
 			socket_nps, err := s.Of(namespace).sockets.get(socket.Id)
 			if err != nil {
 				return err
@@ -452,11 +439,13 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 				})
 			}
 		case socket_protocol.CONNECT.String():
+			// log.Println("[socket.io] connect message")
+
 			socket_nps := socket
 			if namespace != "/" {
 				socketWithNamespace := Socket{
 					Id:   socket.Id,
-					Nps:  namespace,
+					Nsp:  namespace,
 					Conn: socket.Conn,
 					listeners: listeners{
 						list: make(map[string][]eventCallback),
@@ -475,6 +464,8 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 			}
 
 			if s.onAuthentication != nil {
+				// log.Printf("[socket.io] connect with auth")
+
 				dataJson := map[string]string{}
 				json.Unmarshal([]byte(rawpayload), &dataJson)
 				if !s.onAuthentication(dataJson) {
@@ -517,6 +508,7 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 			for _, callback := range s.Of(namespace).onConnection.get("connection") {
 				callback(socket_nps)
 			}
+
 		case socket_protocol.EVENT.String():
 			socket_nps, err := s.Of(namespace).sockets.get(socket.Id)
 			if err != nil {
@@ -545,7 +537,9 @@ func (s *Io) handlerMessage(socket *Socket, message string) error {
 			// case socket_protocol.BINARY_ACK.String():
 		}
 	case engineio.PONG.String():
-		// println("Client pong")
+		// println("[socket.io] client pong")
+	default:
+		log.Println("[socket.io] un-handled message")
 	}
 	return nil
 }

socket.go

@@ -3,6 +3,7 @@ package socketio
 import (
 	"errors"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"sync"
@@ -73,8 +74,9 @@ func (c *Conn) close() error {
 
 type Socket struct {
 	sync.RWMutex
+
 	Id        string
-	Nps       string
+	Nsp       string
 	Conn      *Conn
 	rooms     roomNames
 	listeners listeners
@@ -134,6 +136,8 @@ func (s *Socket) Rooms() []string {
 }
 
 func (s *Socket) disconnect() {
+	log.Printf("[socket.io] closing socket %q", s.Id)
+
 	s.Conn.close()
 	s.Conn = nil
 	// s.rooms = []string{}
@@ -163,9 +167,10 @@ func (s *Socket) writer(t socket_protocol.PacketType, arg ...interface{}) error
 		return err
 	}
 	nps := ""
-	if s.Nps != "/" {
-		nps = s.Nps + ","
+	if s.Nsp != "/" {
+		nps = s.Nsp + ","
 	}
+
 	if t == socket_protocol.ACK {
 		agrs := append([]interface{}{}, arg[0].([]interface{})[1:])
 		socket_protocol.WriteToWithAck(w, t, nps, arg[0].([]interface{})[0].(string), agrs...)