angelia.io 2.3.68 → 2.4.69

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "angelia.io",
-	"version": "2.3.68",
+	"version": "2.4.69",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {

package/server/Server.js

@@ -141,7 +141,11 @@ class ServerSingleton {
 			process.on(m, () => {
 				if (!io.closing) {
 					io.closing = true
-					console.log('Server Shutting Down\n', this)
+					if (options.debug) {
+						console.log('Server Shutting Down\n', this)
+					} else {
+						console.log('Server Shutting Down\n')
+					}
 					io.close()
 					if (options.debug) {
 						process.exit()
@@ -150,7 +154,7 @@ class ServerSingleton {
 			})
 		}
 
-		console.log('Server Started Listening On Port ' + this.port)
+		console.log('Socket Server Started Listening On Port ', this.port)
 		this.events.listen && this.events.listen()
 
 		return this

package/server/rooms/Room.js

@@ -1,90 +1,96 @@
 'use strict'
 
-const { join, leave, parent } = require('./constants.js')
+const { join, leave, parent, add, remove } = require('./constants.js')
 
 class Room {
 	constructor() {
-		this.users = []
+		this.sockets = new Set()
 	}
 	has(socket) {
-		return this.users.indexOf(socket) !== -1
+		return this.sockets.has(socket)
 	}
 	[join](roomList, socket) {
 		// add to list of room list
 		if (!this[parent]) {
 			this[parent] = roomList
-			this[parent].add(this)
+			this[parent][add](this)
 		}
 
 		// add user
-		this.users.push(socket)
+		this.sockets.add(socket)
 
-		// to be able to list rooms for socket
+		// to be able to list rooms for a socket
 		socket.rooms.add(this)
 
-		if (this.users.length === 1) {
+		// if the room has the property "persistent"
+		// then maybe the room is old and someone just joined
+		// for this reason we dont dispatch onCreate for persistent rooms
+		// as that would be misleading
+		if (!this.persistent && this.sockets.size === 1) {
 			// dispatch create
-			this.create && this.create(socket)
+			this.onCreate && this.onCreate(socket)
 		}
 
 		// dispatch join
-		this.join && this.join(socket)
+		this.onJoin && this.onJoin(socket)
 	}
 	[leave](socket) {
 		// remove user
-		let index = this.users.indexOf(socket)
-		if (index !== -1) this.users.splice(index, 1)
+		this.sockets.delete(socket)
 
 		// to be able to list rooms for socket
 		socket.rooms.delete(this)
 
-		// check removal
-		if (this.users.length === 0 && !this.persistent) {
+		// check room deletion
+		if (!this.persistent && this.sockets.size === 0) {
 			// remove room from list
-			this[parent].delete(this)
+			this[parent][remove](this)
 
 			// dispatch leave
-			this.leave && this.leave(socket)
+			this.onLeave && this.onLeave(socket)
 
 			// dispatch that the room has been deleted
-			this.delete && this.delete(socket)
+			this.onDelete && this.onDelete(socket)
 		} else {
 			// dispatch leave
-			this.leave && this.leave(socket)
+			this.onLeave && this.onLeave(socket)
 		}
 	}
 
 	emit(k, v) {
 		let d = [k, v]
 
-		for (let socket of this.users) {
+		for (let socket of this.sockets) {
 			socket.emit(d)
 		}
 	}
 	once(k, v) {
 		let d = [k, v]
 
-		for (let socket of this.users) {
+		for (let socket of this.sockets) {
 			socket.once(d)
 		}
 	}
 	broadcast(me, k, v) {
 		let d = [k, v]
 
-		for (let socket of this.users) {
+		for (let socket of this.sockets) {
 			if (me != socket) socket.emit(d)
 		}
 	}
 	broadcastOnce(me, k, v) {
 		let d = [k, v]
 
-		for (let socket of this.users) {
+		for (let socket of this.sockets) {
 			if (me != socket) socket.once(d)
 		}
 	}
 
+	toJSON() {
+		return this.sockets
+	}
 	[Symbol.iterator]() {
-		return this.users
+		return this.sockets
 	}
 }
 

package/server/rooms/Rooms.js

@@ -1,83 +1,35 @@
 'use strict'
 
-const { parent } = require('./constants.js')
+const { add, remove } = require('./constants.js')
 
 class Rooms {
 	constructor(path) {
 		Object.assign(this, {
 			path: path,
-			rooms: [],
+			rooms: new Set(),
 			roomsById: new Map(),
 		})
 	}
 
-	has(room) {
-		return this.rooms.indexOf(room) !== -1
-	}
-
 	get(id) {
 		return this.roomsById.get(id)
 	}
 
-	add(room) {
-		if (!this.has(room)) {
-			this.rooms.push(room)
+	// private
+	[add](room) {
+		if (!this.rooms.has(room)) {
+			this.rooms.add(room)
 			this.roomsById.set(room.id, room)
 		}
 	}
-	delete(room) {
-		if (!room.persistent) {
-			let index = this.rooms.indexOf(room)
-			if (index !== -1) this.rooms.splice(index, 1)
-			this.roomsById.delete(room.id)
-		}
-	}
-
-	emit(k, v) {
-		let d = [k, v]
-
-		for (let room of this.rooms) {
-			for (let socket of room.users) {
-				socket.emit(d)
-			}
-		}
-	}
-	once(k, v) {
-		let d = [k, v]
-
-		for (let room of this.rooms) {
-			for (let socket of room.users) {
-				socket.once(d)
-			}
-		}
-	}
-	broadcast(me, k, v) {
-		let d = [k, v]
-
-		for (let room of this.rooms) {
-			for (let socket of room.users) {
-				if (me != socket) {
-					socket.emit(d)
-				}
-			}
-		}
-	}
-	broadcastOnce(me, k, v) {
-		let d = [k, v]
-
-		for (let room of this.rooms) {
-			for (let socket of room.users) {
-				if (me != socket) {
-					socket.once(d)
-				}
-			}
-		}
+	[remove](room) {
+		this.rooms.delete(room)
+		this.roomsById.delete(room.id)
 	}
 
 	toJSON() {
 		return this.rooms
 	}
-
 	[Symbol.iterator]() {
 		return this.rooms
 	}

package/server/rooms/constants.js

@@ -2,8 +2,16 @@ const join = Symbol.for('Room.join')
 const leave = Symbol.for('Room.leave')
 const parent = Symbol.for('Room.parent')
 
+const add = Symbol.for('Rooms.add')
+const remove = Symbol.for('Rooms.remove')
+
 module.exports = {
+	// Room
 	join,
 	leave,
 	parent,
+
+	// Rooms
+	add,
+	remove,
 }