playsocketjs 1.1.12 → 1.2.0

package/README.md

@@ -63,10 +63,11 @@ socket.destroy();
 ### Constructor
 
 ```javascript
-new PlaySocket(id: string, options: PlaySocketOptions)
+new PlaySocket(id?: string, options: PlaySocketOptions)
 ```
 
 Creates a new PlaySocket instance with a specified ID and configuration options.
+Note: With PlaySocket, the id can be set to `null` to let the server pick a unique one.
 
 #### Configuration options
 - `endpoint`: WebSocket server endpoint (e.g., 'wss://example.com/socket')
@@ -77,7 +78,7 @@ Creates a new PlaySocket instance with a specified ID and configuration options.
 
 #### Core
 
-- `init()`: Initialize the WebSocket connection – Returns Promise (async)
+- `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)
 - `joinRoom(hostId: string)`: Join an existing room – Returns Promise (async)
 - `destroy()`: Use this to leave a room and close the connection

package/dist/playsocket-client.js

@@ -2061,7 +2061,7 @@ class PlaySocket {
 
     // Room properties
     #roomHost;
-    #roomId; // ID of the host (client only)
+    #inRoom; // If the client is currently in  a room or not
     #connectionCount = 0;
     #crdtManager;
     #roomVersion = 0; // Update version (used to compare local vs. remote state to detect package loss)
@@ -2143,15 +2143,14 @@ class PlaySocket {
     async init() {
         if (this.#initialized) return Promise.reject(new Error("Already initialized"));
         if (!this.#endpoint) return Promise.reject(new Error("No websocket endpoint provided"));
-        if (!this.#id) return Promise.reject(new Error("No id provided"));
         this.#triggerEvent("status", "Initializing...");
 
         // Connect to WS server
         await this.#connect();
 
         // Register with server
-        await Promise.race([
-            new Promise(async (resolve, reject) => {
+        const id = await Promise.race([
+            new Promise((resolve, reject) => {
                 this.#pendingRegistration = { resolve, reject }; // Resolve or reject depending on answer to registration msg
 
                 // Register with server
@@ -2165,6 +2164,10 @@ class PlaySocket {
         ]).finally(() => {
             this.#pendingRegistration = null;
         });
+
+        // If the server sent out an id, store and return that
+        if (id) this.#id = id;
+        return this.#id;
     }
 
     /**
@@ -2202,6 +2205,7 @@ class PlaySocket {
                         // Connected to room
                         if (this.#pendingJoin) {
                             if (this.#debug) console.log(LOG_PREFIX + "State received for join:", message.state);
+                            this.#inRoom = true;
                             this.#crdtManager.importState(message.state);
                             this.#connectionCount = message.participantCount - 1; // Counted without the user themselves
                             this.#roomHost = message.host;
@@ -2232,7 +2236,7 @@ class PlaySocket {
                                 this.#connectionCount = message.roomData.participantCount - 1; // Counted without the user themselves
                                 this.#setHost(message.roomData.host); // Set host before in case there are .isHost checks in the storageUpdate fallback
                                 this.#triggerEvent("storageUpdated", this.getStorage);
-                            } else if (this.#roomId) {
+                            } else if (this.#inRoom) {
                                 // If no room data received, but client thinks they were in a room...
                                 this.#triggerEvent("error", "Reconnected, but room no longer exists.");
                                 return this.destroy();
@@ -2248,8 +2252,9 @@ class PlaySocket {
 
                     case 'room_created':
                         if (this.#pendingCreate) {
+                            this.#inRoom = true;
                             this.#triggerEvent("status", `Room created${this.#pendingCreate.maxSize ? ` with max size ${this.#pendingCreate.maxSize}.` : '.'}`);
-                            this.#pendingCreate.resolve(this.#roomId);
+                            this.#pendingCreate.resolve(this.#pendingCreate.id);
                         }
                         break;
 
@@ -2271,7 +2276,7 @@ class PlaySocket {
                         if (this.#pendingRegistration) {
                             this.#sessionToken = message.sessionToken;
                             this.#initialized = true;
-                            this.#pendingRegistration.resolve();
+                            this.#pendingRegistration.resolve(message.id);
                             this.#triggerEvent("status", "Connected to server.");
                         }
                         break;
@@ -2408,9 +2413,8 @@ class PlaySocket {
                 Object.entries(initialStorage)?.forEach(([key, value]) => {
                     this.#crdtManager.updateProperty(key, "set", value);
                 });
-                this.#roomId = this.#id; // Create room with your own ID as the room ID to mimic p2p
                 this.#roomHost = this.#id;
-                this.#pendingCreate = { maxSize, resolve, reject };
+                this.#pendingCreate = { maxSize, id: this.#id, resolve, reject };
                 this.#sendToServer({
                     type: 'create_room',
                     state: this.#crdtManager.getState,
@@ -2437,7 +2441,6 @@ class PlaySocket {
 
         return Promise.race([
             new Promise((resolve, reject) => {
-                this.#roomId = roomId;
                 this.#pendingJoin = { resolve, reject };
 
                 // Send connection request
@@ -2508,7 +2511,7 @@ class PlaySocket {
         // Reset state
         clearTimeout(this.#reconnectTimeout);
         this.#roomHost = null;
-        this.#roomId = null;
+        this.#inRoom = false;
         this.#connectionCount = 0;
         this.#isReconnecting = false;
         this.#reconnectCount = 0;

package/dist/playsocket-server.js

@@ -2273,17 +2273,35 @@ function requireServer () {
 
 	            switch (data.type) {
 	                case 'register':
-	                    // Register client ID
-	                    if (!data.id) return;
-	                    if (this.#clients.get(data.id)) {
+	                    // 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 });
 	                        return;
 	                    }
+
+	                    // Generate client ID if none provided
+	                    if (!data.id) {
+	                        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+	                        const maxAttempts = 50;
+	                        for (let i = 0; i < maxAttempts; i++) {
+	                            const id = Array.from({ length: 6 }, () => chars[Math.floor(Math.random() * chars.length)]).join('');
+	                            if (!this.#clients.get(id)) {
+	                                data.id = id;
+	                                break;
+	                            }
+	                        }
+	                        if (!data.id) {
+	                            ws.send(encode({ type: 'id_taken' }), { binary: true });
+	                            throw new Error('Failed to generate unique ID!');
+	                        }
+	                    }
+
+
 	                    ws.clientId = data.id; // Adds the provided id to the ws object as clientId
 	                    this.#clients.set(data.id, ws);
 	                    const sessionToken = this.#generateSessionToken();
 	                    this.#clientTokens.set(data.id, sessionToken); // Token is used when reconnecting to prevent impersonation attacks
-	                    ws.send(encode({ type: 'registered', sessionToken }), { binary: true });
+	                    ws.send(encode({ type: 'registered', id: data.id, sessionToken }), { binary: true });
 	                    this.#triggerEvent("clientRegistered", data.id, data.customData);
 	                    break;
 
@@ -2432,7 +2450,7 @@ function requireServer () {
 	                    break;
 	            }
 	        } catch (error) {
-	            console.error('Error processing message:', error);
+	            console.error('Error in message handler:', error);
 	        }
 	    }
 

package/package.json

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