v.0.1.5

Added:
- io.To("room1").To("room2")
- socket.Rooms()
- io.Sockets()
- namespace.Sockets()

engineio/engine.go

@@ -18,6 +18,14 @@ const (
 	NOOP
 )
 
+// Code	Message
+// 0	"Transport unknown"
+// 1	"Session ID unknown"
+// 2	"Bad handshake method"
+// 3	"Bad request"
+// 4	"Forbidden"
+// 5	"Unsupported protocol version"
+
 func (id PacketType) String() string {
 	return strconv.Itoa(int(id))
 }

example/main.go

@@ -19,7 +19,7 @@ func socketIoRoute(app fiber.Router) {
 	io.OnConnection(func(socket *socketio.Socket) {
 		println("connect", socket.Nps, socket.Id)
 		socket.Join("demo")
-		io.To("demo").Emit("hello", socket.Id+" join us room...", "server message")
+		io.To("demo").Emit("test", socket.Id+" join us room...", "server message")
 
 		socket.On("test", func(event *socketio.EventPayload) {
 			socket.Emit("test", event.Data...)
@@ -31,13 +31,17 @@ func socketIoRoute(app fiber.Router) {
 			}
 		})
 
+		socket.On("to-room", func(event *socketio.EventPayload) {
+			socket.To("demo").To("demo2").Emit("test", "hello")
+		})
+
 		socket.On("leave-room", func(event *socketio.EventPayload) {
 			socket.Leave("demo")
-			io.To("demo").Emit("hello", socket.Id+" leave us room...", "server message")
+			socket.Join("demo2")
 		})
 
-		socket.On("room-emit", func(event *socketio.EventPayload) {
-			socket.To("demo").Emit("hello", socket.Id, event.Data)
+		socket.On("my-room", func(event *socketio.EventPayload) {
+			socket.Emit("my-room", socket.Rooms())
 		})
 
 		socket.On("disconnecting", func(event *socketio.EventPayload) {

make.cmd

@@ -15,4 +15,4 @@ IF %func%==public (
     echo Done
 )
 
-@REM make public v0.1.4
+@REM make public v0.1.5

namespace.go

@@ -5,15 +5,15 @@ import (
 )
 
 type Namespace struct {
-	name         string
+	Name         string
 	sockets      *connections
 	rooms        *rooms
 	onConnection connectionEvent
 }
 
 func newNamespace(name string) *Namespace {
 	return &Namespace{
-		name: name,
+		Name: name,
 		sockets: &connections{
 			conn: make(map[string]*Socket),
 		},
@@ -55,7 +55,11 @@ func (nps *Namespace) socketLeaveAllRooms(socket *Socket) {
 }
 
 func (nps *Namespace) To(room string) *Room {
-	return nps.rooms.create(room)
+	return nps.rooms.next(room)
+}
+
+func (nps *Namespace) Sockets() []*Socket {
+	return nps.sockets.all()
 }
 
 type namespaces struct {

room.go

@@ -5,26 +5,38 @@ import (
 )
 
 type Room struct {
-	name    string
-	sockets connections
+	Name           string
+	To             func(room string) *Room
+	sockets        connections
+	connectSockets []*Socket
 }
 
 func newRoom(name string) *Room {
 	return &Room{
-		name: name,
+		Name: name,
 		sockets: connections{
 			conn: make(map[string]*Socket),
 		},
 	}
 }
 
 func (room *Room) Emit(event string, agrs ...interface{}) error {
-	for _, socket := range room.sockets.all() {
-		socket.Emit(event, agrs...)
+	if len(room.connectSockets) > 0 {
+		for _, socket := range room.connectSockets {
+			socket.Emit(event, agrs...)
+		}
+	} else {
+		for _, socket := range room.sockets.all() {
+			socket.Emit(event, agrs...)
+		}
 	}
 	return nil
 }
 
+func (room *Room) Sockets() []*Socket {
+	return room.sockets.all()
+}
+
 type roomNames struct {
 	sync.RWMutex
 	list []string
@@ -81,6 +93,34 @@ func (n *rooms) create(name string) *Room {
 	return ret
 }
 
+func (n *rooms) next(name string, preRoom ...*Room) *Room {
+	n.Lock()
+	ret, ok := n.list[name]
+	if !ok {
+		ret = newRoom(name)
+		n.list[name] = ret
+	}
+	if len(preRoom) == 0 {
+		newRoom := newRoom(name)
+		newRoom.connectSockets = append(newRoom.connectSockets, ret.sockets.all()...)
+		ret.To = func(room string) *Room {
+			nextRoom := n.next(room, newRoom)
+			newRoom.Name += "_" + nextRoom.Name
+			newRoom.connectSockets = append(newRoom.connectSockets, nextRoom.sockets.all()...)
+			return newRoom
+		}
+	} else {
+		ret.To = func(room string) *Room {
+			nextRoom := n.next(room, preRoom[0])
+			preRoom[0].Name += "_" + nextRoom.Name
+			preRoom[0].connectSockets = append(preRoom[0].connectSockets, nextRoom.sockets.all()...)
+			return preRoom[0]
+		}
+	}
+	n.Unlock()
+	return ret
+}
+
 // func (n *rooms) get(name string) *Room {
 // 	n.RLock()
 // 	defer n.RUnlock()

server.go

@@ -90,6 +90,10 @@ func (s *Io) To(name string) *Room {
 	return s.Of("/").To(name)
 }
 
+func (s *Io) Sockets(name string) []*Socket {
+	return s.Of("/").Sockets()
+}
+
 func (s *Io) OnConnection(fn connectionEventCallback) {
 	s.Of("/").onConnection.set("connection", fn)
 }

socket.go

@@ -58,6 +58,10 @@ func (s *Socket) Disconnect() error {
 	return s.Conn.SetReadDeadline(time.Now())
 }
 
+func (s *Socket) Rooms() []string {
+	return s.rooms.all()
+}
+
 func (s *Socket) disconnect() {
 	s.Conn.Close()
 	s.Conn = nil