playsocketjs 2.3.0 → 2.4.1

package/README.md

@@ -219,6 +219,7 @@ Creates a new PlaySocket Server instance with configuration options.
 - `clientRegistrationRequested`: Client requests to register (returns the client's ID `string`, customData `object`) – return `false` or a rejection reason `string` to block the registration
 - `clientDisconnected`: Client disconnected from the server (returns the client's ID `string`)
 - `clientJoinedRoom`: Client joined a room – note that clients can only leave by disconnecting (returns the client's ID `string`, room ID `string`)
+- `clientJoinRequested`: Client requests to join a room (returns the client's ID `string`, room ID `string`) – return `false` or a rejection reason `string` to block them from joining
 - `roomCreated`: Client created a room (returns room ID `string`)
 - `roomDestroyed`: Room was destroyed, this happens when all participants leave (returns room ID `string`)
 - `roomCreationRequested`: Room creation requested by client (returns `object` containing the client's ID `string`, room ID `string` and the initialStorage `object`) – if you return an `object` in the callback, it will take that as the initial storage instead. If you return `false`, the creation will be denied

package/dist/playsocket-client.js

@@ -2505,6 +2505,7 @@ class PlaySocket {
      * @param {*} updateValue - New value for update-matching
      */
     updateStorage(key, type, value, updateValue) {
+        if (!this.#inRoom) return this.#triggerEvent("error", "Cannot update storage when not in a room.");
         if (this.#debug) console.log(LOG_PREFIX + `Property update for key ${key}, operation ${type}, value ${value} and updateValue ${updateValue}.`);
         const propUpdate = this.#crdtManager.updateProperty(key, type, value, updateValue);
         this.#sendToServer({

package/dist/playsocket-server.js

@@ -2351,7 +2351,7 @@ function requireServer () {
 	                        if (data.sessionToken !== this.#clientTokens.get(data.id)) {
 	                            ws.send(encode({
 	                                type: 'reconnection_failed',
-	                                reason: "Session token does not match"
+	                                reason: "Session token does not match."
 	                            }), { binary: true });
 	                            return;
 	                        }
@@ -2378,7 +2378,7 @@ function requireServer () {
 
 	                        ws.send(encode({ type: 'reconnected', roomData }), { binary: true });
 	                    } else {
-	                        ws.send(encode({ type: 'reconnection_failed', reason: "Client unknown to server" }), { binary: true });
+	                        ws.send(encode({ type: 'reconnection_failed', reason: "Client unknown to server." }), { binary: true });
 	                    }
 	                    break;
 
@@ -2389,7 +2389,7 @@ function requireServer () {
 	                    if (this.#clientRooms.get(ws.clientId) || this.#rooms[newRoomId]) {
 	                        ws.send(encode({
 	                            type: 'room_creation_failed',
-	                            reason: this.#clientRooms.get(ws.clientId) ? 'Already in a room' : 'Room ID is taken'
+	                            reason: this.#clientRooms.get(ws.clientId) ? 'Already in a room.' : 'Room ID is taken.'
 	                        }), { binary: true });
 	                        return;
 	                    }
@@ -2440,17 +2440,17 @@ function requireServer () {
 	                    const roomId = data.roomId;
 	                    const room = this.#rooms[roomId];
 
-	                    if (!room ||
-	                        (room.participants.length >= room.maxSize) ||
-	                        this.#clientRooms.get(ws.clientId)) {
-	                        ws.send(encode({
-	                            type: 'join_rejected',
-	                            reason: !room ? 'Room not found' :
-	                                room.participants.length >= room.maxSize ? 'Room full' :
-	                                    'Already in a room'
-	                        }), { binary: true });
-	                        return;
-	                    }
+	                    const rejectJoin = (reason) => {
+	                        ws.send(encode({ type: 'join_rejected', reason }), { binary: true });
+	                    };
+
+	                    // Event callback
+	                    const joinAllowed = await this.#triggerEvent("clientJoinRequested", ws.clientId, roomId);
+	                    if (joinAllowed === false || typeof joinAllowed === 'string') return rejectJoin(typeof joinAllowed === 'string' ? joinAllowed : 'Denied.');
+
+	                    if (!room) return rejectJoin("Room not found.");
+	                    if (this.#clientRooms.get(ws.clientId)) return rejectJoin("Already in a room.");
+	                    if (room.participants.length >= room.maxSize) return rejectJoin("Room full.");
 
 	                    room.participants.push(ws.clientId);
 	                    this.#clientRooms.set(ws.clientId, roomId);
@@ -2628,7 +2628,7 @@ function requireServer () {
 	    #disconnectClient(ws) {
 	        this.#pendingDisconnects.delete(ws.clientId);
 	        this.#clientTokens.delete(ws.clientId);
-	        const roomId = this.#clientRooms.get(ws.clientId);
+	        let roomId = this.#clientRooms.get(ws.clientId);
 	        const room = this.#rooms[roomId];
 
 	        if (room) {
@@ -2640,6 +2640,7 @@ function requireServer () {
 	                this.#roomVersions.delete(roomId); // Delete room version
 	                this.#triggerEvent("roomDestroyed", roomId);
 	                if (this.#debug) console.log("Deleted room with id " + roomId + ".");
+	                roomId = null; // If room was destroyed, set roomId to null
 	            } else {
 	                // Notify remaining participants
 	                room.participants.forEach(p => {
@@ -2662,7 +2663,7 @@ function requireServer () {
 	     * @param {Function} callback - Callback function
 	     */
 	    onEvent(event, callback) {
-	        const validEvents = ["clientRegistered", "clientRegistrationRequested", "clientDisconnected", "clientJoinedRoom", "roomCreated", "roomCreationRequested", "requestReceived", "storageUpdated", "storageUpdateRequested", "roomDestroyed"];
+	        const validEvents = ["clientRegistered", "clientRegistrationRequested", "clientDisconnected", "clientJoinedRoom", "clientJoinRequested", "roomCreated", "roomCreationRequested", "requestReceived", "storageUpdated", "storageUpdateRequested", "roomDestroyed"];
 	        if (!validEvents.includes(event)) return console.warn(`Invalid PlaySocket event type "${event}"`);
 	        if (!this.#callbacks.has(event)) this.#callbacks.set(event, []);
 	        this.#callbacks.get(event).push(callback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playsocketjs",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "WebSocket wrapper for creating simple multiplayer systems with ease.",
   "module": "dist/playsocket-client.js",
   "exports": {