playsocketjs 2.1.1 → 2.2.1

package/README.md

@@ -72,6 +72,11 @@ socket.updateStorage('players', 'array-add-unique', { username: 'Player4', level
 socket.updateStorage('latestPlayer', 'set', 'Player4'); // Regular synced storage update
 ```
 
+Sending traditional requests to the server:
+```javascript
+socket.sendRequest('chosen-request-name', { fact: "You can build server-authoritative logic using this!" })
+```
+
 ## API Reference
 
 ### Constructor
@@ -91,10 +96,11 @@ new PlaySocket(id?: string, options: PlaySocketOptions)
 ### Methods
 
 - `init()`: Initialize the WebSocket connection – Returns Promise (async) which resolves with the client's ID
-- `createRoom(initialStorage?: object, maxSize?: number)`: Create a new room and become host – Returns Promise (async) which resolves with the room ID (matches the creator's ID)
+- `createRoom(initialStorage?: object, maxSize?: number)`: Create a new room and become host – Returns Promise (async) which resolves with the room ID (matches the creator's ID). The absolute client maximum is 100
 - `joinRoom(hostId: string)`: Join an existing room – Returns Promise (async)
 - `destroy()`: Use this to leave a room and close the connection
-- `updateStorage(key: string, type: 'set' | 'array-add' | 'array-add-unique' | 'array-remove-matching' | 'array-update-matching', value: any, updateValue?: any)`: Update the shared storage. Safely update arrays in storage by adding, removing, or updating items. UpdateValue is only required for the 'array-update-matching' operation type
+- `updateStorage(key: string, type: 'set' | 'array-add' | 'array-add-unique' | 'array-remove-matching' | 'array-update-matching', value: any, updateValue?: any)`: Update the shared storage (max. 100 keys). Safely update arrays in storage by adding, removing, or updating items. UpdateValue is only required for the 'array-update-matching' operation type
+- `sendRequest(name: string, data?: any)`: Send requests to the server with optional custom data (handle these in the `requestReceived` server event)
 - `onEvent(event: string, callback: Function)`: Register an event callback
 
 #### Event types
@@ -111,7 +117,7 @@ new PlaySocket(id?: string, options: PlaySocketOptions)
 
 - `id`: Client's unique identifier on the WebSocket server
 - `isHost`: If this user is currently assigned the host role
-- `connectionCount`: Number of active client connections in room (without you)
+- `connectionCount`: Number of active client connections in room (without yourself)
 - `getStorage`: Retrieve storage object
 
  
@@ -210,12 +216,14 @@ Creates a new PlaySocket Server instance with configuration options.
 #### Event types
 
 - `clientRegistered`: Client registered with the server (returns the client's ID `string`, customData `object`)
+- `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`)
 - `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
 - `storageUpdateRequested`: Room storage property update requested by client (returns `object` containing the client's ID `string`, room ID `string` and the update `object`) – if you return `false` in the callback, the update will be blocked
+- `requestReceived`: Request from client was received by the server (returns `object` containing client's ID `string`, if in room – room ID `string`, request name `string` and optional passed data of type `any`)
 
 ### Properties (Read-only)
 

package/dist/playsocket-client.js

@@ -1758,9 +1758,11 @@ function requireCrdtManager () {
 	            const operation = this.#sanitizeValue(rawOperation);
 	            if (this.#debug) console.log(CONSOLE_PREFIX + "Importing update:", data); // Debug
 
+	            // Check key limit to afeguard against too many keys
+	            if (this.#keyOperations.size >= 100 && !this.#keyOperations.has(key)) throw new Error('Key limit exceeded!');
+
 	            // Get COPY of current ops (or empty array if none yet)
 	            const currentOps = [...(this.#keyOperations.get(key) || [])];
-
 	            // Merge vector clocks (always take max value)
 	            for (const [id, counter] of vectorClock) {
 	                if (!this.#vectorClock.has(id) || this.#vectorClock.get(id) < counter) {
@@ -1768,7 +1770,7 @@ function requireCrdtManager () {
 	                }
 	            }
 
-	            // Saveguard
+	            // Safeguard against massive vector clocks
 	            if (this.#vectorClock.size > 1000) this.#vectorClock = new Map([...this.#vectorClock].slice(-100));
 
 	            // Add new operation if it's not already added
@@ -2019,11 +2021,15 @@ function requireCrdtManager () {
 	    }
 
 	    /**
-	     * Remove HTML to prevent XSS
-	     * @param {Object} obj 
+	     * Remove HTML to prevent XSS and enforce size limits
+	     * @param {Object} obj
 	     * @returns {Object} - Sanitized object
 	     */
 	    #sanitizeValue(obj) {
+	        // Check total serialized size
+	        const jsonString = JSON.stringify(obj);
+	        if (jsonString?.length > 50000) throw new Error('Value too large!'); // 50KB limit
+
 	        if (typeof obj === 'string') return (obj.includes('<') || obj.includes('>')) ? obj.replace(/[<>]/g, '') : obj;
 	        if (Array.isArray(obj)) return obj.map(item => this.#sanitizeValue(item));
 	        if (obj && typeof obj === 'object') return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, this.#sanitizeValue(v)]));
@@ -2227,6 +2233,22 @@ class PlaySocket {
                 if (!message.type) return;
 
                 switch (message.type) {
+                    case 'registration_failed':
+                        if (this.#pendingRegistration) {
+                            this.#pendingRegistration.reject(new Error("Failed to register: " + message.reason));
+                            this.#triggerEvent("error", "Failed to register: " + message.reason);
+                        }
+                        break;
+
+                    case 'registered':
+                        if (this.#pendingRegistration) {
+                            this.#sessionToken = message.sessionToken;
+                            this.#initialized = true;
+                            this.#pendingRegistration.resolve(message.id);
+                            this.#triggerEvent("status", "Connected to server.");
+                        }
+                        break;
+
                     case 'join_accepted':
                         // Connected to room
                         if (this.#pendingJoin) {
@@ -2293,22 +2315,6 @@ class PlaySocket {
                         }
                         break;
 
-                    case 'id_taken':
-                        if (this.#pendingRegistration) {
-                            this.#pendingRegistration.reject(new Error("This id is already in use"));
-                            this.#triggerEvent("error", "This id is taken.");
-                        }
-                        break;
-
-                    case 'registered':
-                        if (this.#pendingRegistration) {
-                            this.#sessionToken = message.sessionToken;
-                            this.#initialized = true;
-                            this.#pendingRegistration.resolve(message.id);
-                            this.#triggerEvent("status", "Connected to server.");
-                        }
-                        break;
-
                     case 'property_updated':
                         this.#roomVersion++; // Increment room version
                         if (this.#debug) console.log(LOG_PREFIX + "Property update received:", message.update);

package/dist/playsocket-server.js

@@ -1884,9 +1884,11 @@ function requireCrdtManager () {
 	            const operation = this.#sanitizeValue(rawOperation);
 	            if (this.#debug) console.log(CONSOLE_PREFIX + "Importing update:", data); // Debug
 
+	            // Check key limit to afeguard against too many keys
+	            if (this.#keyOperations.size >= 100 && !this.#keyOperations.has(key)) throw new Error('Key limit exceeded!');
+
 	            // Get COPY of current ops (or empty array if none yet)
 	            const currentOps = [...(this.#keyOperations.get(key) || [])];
-
 	            // Merge vector clocks (always take max value)
 	            for (const [id, counter] of vectorClock) {
 	                if (!this.#vectorClock.has(id) || this.#vectorClock.get(id) < counter) {
@@ -1894,7 +1896,7 @@ function requireCrdtManager () {
 	                }
 	            }
 
-	            // Saveguard
+	            // Safeguard against massive vector clocks
 	            if (this.#vectorClock.size > 1000) this.#vectorClock = new Map([...this.#vectorClock].slice(-100));
 
 	            // Add new operation if it's not already added
@@ -2145,11 +2147,15 @@ function requireCrdtManager () {
 	    }
 
 	    /**
-	     * Remove HTML to prevent XSS
-	     * @param {Object} obj 
+	     * Remove HTML to prevent XSS and enforce size limits
+	     * @param {Object} obj
 	     * @returns {Object} - Sanitized object
 	     */
 	    #sanitizeValue(obj) {
+	        // Check total serialized size
+	        const jsonString = JSON.stringify(obj);
+	        if (jsonString?.length > 50000) throw new Error('Value too large!'); // 50KB limit
+
 	        if (typeof obj === 'string') return (obj.includes('<') || obj.includes('>')) ? obj.replace(/[<>]/g, '') : obj;
 	        if (Array.isArray(obj)) return obj.map(item => this.#sanitizeValue(item));
 	        if (obj && typeof obj === 'object') return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, this.#sanitizeValue(v)]));
@@ -2299,7 +2305,7 @@ function requireServer () {
 	                case 'register':
 	                    // Register client ID if provided & check for a duplicate
 	                    if (data.id && this.#clients.get(data.id)) {
-	                        ws.send(encode({ type: 'id_taken' }), { binary: true });
+	                        ws.send(encode({ type: 'registration_failed', reason: 'ID is taken.' }), { binary: true });
 	                        return;
 	                    }
 
@@ -2315,11 +2321,20 @@ function requireServer () {
 	                            }
 	                        }
 	                        if (!data.id) {
-	                            ws.send(encode({ type: 'id_taken' }), { binary: true });
+	                            ws.send(encode({ type: 'registration_failed', reason: 'No available ID found.' }), { binary: true });
 	                            throw new Error('Failed to generate unique ID!');
 	                        }
 	                    }
 
+	                    // Event callback
+	                    const registrationAllowed = await this.#triggerEvent("clientRegistrationRequested", data.id, data.customData);
+	                    if (registrationAllowed === false || typeof registrationAllowed === 'string') {
+	                        ws.send(encode({
+	                            type: 'registration_failed',
+	                            reason: typeof registrationAllowed === 'string' ? registrationAllowed : 'Denied.'
+	                        }), { binary: true });
+	                        return;
+	                    }
 
 	                    ws.clientId = data.id; // Adds the provided id to the ws object as clientId
 	                    this.#clients.set(data.id, ws);
@@ -2403,7 +2418,7 @@ function requireServer () {
 	                    this.#rooms[newRoomId] = {
 	                        participants: [ws.clientId],
 	                        host: ws.clientId,
-	                        maxSize: data.size || null,
+	                        maxSize: Math.min(Number(data.size), 100) || 100, // Max. limit is 100 clients / room
 	                        crdtManager: roomCrdtManager
 	                    };
 	                    this.#clientRooms.set(ws.clientId, newRoomId); // Add client to the room
@@ -2419,12 +2434,12 @@ function requireServer () {
 	                    const room = this.#rooms[roomId];
 
 	                    if (!room ||
-	                        (room.maxSize && room.participants.length >= room.maxSize) ||
+	                        (room.participants.length >= room.maxSize) ||
 	                        this.#clientRooms.get(ws.clientId)) {
 	                        ws.send(encode({
 	                            type: 'join_rejected',
 	                            reason: !room ? 'Room not found' :
-	                                room.maxSize && room.participants.length >= room.maxSize ? 'Room full' :
+	                                room.participants.length >= room.maxSize ? 'Room full' :
 	                                    'Already in a room'
 	                        }), { binary: true });
 	                        return;
@@ -2464,8 +2479,8 @@ function requireServer () {
 
 	                    if (updateRoom && data.update) {
 	                        // Check if update is allowed via event callback (provide clone to ensure update integrity)
-	                        const allowed = await this.#triggerEvent("storageUpdateRequested", { roomId: updateRoomId, clientId: ws.clientId, update: structuredClone(data.update) });
-	                        if (allowed === false) {
+	                        const updateAllowed = await this.#triggerEvent("storageUpdateRequested", { roomId: updateRoomId, clientId: ws.clientId, update: structuredClone(data.update) });
+	                        if (updateAllowed === false) {
 	                            ws.send(encode({
 	                                type: 'property_update_rejected',
 	                                state: updateRoom.crdtManager.getState
@@ -2638,7 +2653,7 @@ function requireServer () {
 	     * @param {Function} callback - Callback function
 	     */
 	    onEvent(event, callback) {
-	        const validEvents = ["clientRegistered", "clientDisconnected", "clientJoinedRoom", "roomCreationRequested", "requestReceived", "roomCreated", "storageUpdateRequested", "roomDestroyed"];
+	        const validEvents = ["clientRegistered", "clientRegistrationRequested", "clientDisconnected", "clientJoinedRoom", "roomCreationRequested", "requestReceived", "roomCreated", "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);
@@ -2669,8 +2684,7 @@ function requireServer () {
 	        for (const callback of callbacks) {
 	            try {
 	                const result = await callback(...args);
-	                if (result === false) return false; // False = block (in supported events)
-	                if (typeof result === 'object') return result; // If response object is provided -> pass on
+	                if (result != null) return result; // Return any non-null/undefined result
 	            } catch (error) {
 	                console.error(`PlaySocket ${event} callback error:`, error);
 	            }

package/package.json

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