playsocketjs 1.0.1 → 1.0.3

package/README.md

@@ -131,6 +131,16 @@ const PlaySocketServer = require('playsocketjs/server');
 
 // Create and start the server
 const server = new PlaySocketServer();
+
+// Gracefully disconnect all clients and close the server (optional)
+function shutdown() {
+    server.stop();
+    process.exit(0);
+}
+
+// Handle both SIGINT (Ctrl+C) and SIGTERM (Docker stop)
+process.on('SIGINT', shutdown);
+process.on('SIGTERM', shutdown);
 ```
 
 ### With Express.js
@@ -155,6 +165,16 @@ const playSocketServer = new PlaySocketServer({
 httpServer.listen(port, () => {
   console.log('Server running on port 3000');
 });
+
+// Gracefully disconnect all clients and close the server (optional)
+function shutdown() {
+    server.stop();
+    process.exit(0);
+}
+
+// Handle both SIGINT (Ctrl+C) and SIGTERM (Docker stop)
+process.on('SIGINT', shutdown);
+process.on('SIGTERM', shutdown);
 ```
 
 ## API Reference
@@ -175,6 +195,7 @@ Creates a new PlaySocket Server instance with configuration options.
 
 ### Methods
 
+- `stop`: Closes all active client connections, the websocket server and the underlying http server if it's standalone
 - `onEvent(event: string, callback: Function)`: Register a server-side event callback
 
 ##### Event types

package/dist/playsocket-client.js

@@ -4,7 +4,7 @@
 
 const ERROR_PREFIX = "PlaySocket error: ";
 const WARNING_PREFIX = "PlaySocket warning: ";
-const TIMEOUT_MS = 3000; // 3 second timeout for operations
+const TIMEOUT_MS = 5000; // 5 second timeout for operations
 
 class PlaySocket {
     // Core properties
@@ -29,6 +29,9 @@ class PlaySocket {
     #pendingHost;
     #pendingInit;
 
+    // Timeouts or intervals
+    #reconnectTimeout;
+
     /**
      * Create a new PlaySocket instance
      * @param {string} id - Unique identifier for this client
@@ -227,10 +230,10 @@ class PlaySocket {
 
         // Handle socket close & attempt reconnect
         this.#socket.onclose = () => {
+            if (!this.#initialized) return;
             this.#triggerEvent("status", "Disconnected from server.");
 
-            setTimeout(async () => {
-                if (!this.#initialized || !this.#socket) return;
+            this.#reconnectTimeout = setTimeout(async () => {
                 try {
                     await this.#connect(); // Will set status to connected if successful
 
@@ -241,7 +244,6 @@ class PlaySocket {
                     }
                 } catch (error) {
                     this.#triggerEvent("error", "WebSocket connection permanently closed: " + error);
-                    this.#socket = null;
                     this.destroy();
                 }
             }, 1000);
@@ -400,6 +402,8 @@ class PlaySocket {
      * Destroy the PlaySocket instance and disconnect
      */
     destroy() {
+        this.#initialized = false; // Set this immediately to prevent automatic reconnection
+
         if (this.#socket) {
             this.#socket.close();
             this.#socket = null;
@@ -410,12 +414,12 @@ class PlaySocket {
         }
 
         // Reset state
-        this.#initialized = false;
         this.#isHost = false;
         this.#roomHost = null;
         this.#storage = {};
         this.#roomId = null;
         this.#connectionCount = 0;
+        clearTimeout(this.#reconnectTimeout);
     }
 
     // Public getters

package/dist/playsocket-server.js

@@ -21,12 +21,14 @@ function requireServer () {
 	 */
 	class PlaySocketServer {
 	    #server;
+	    #ownsServer = false;
 	    #wss;
 	    #clients = new Map(); // ClientId -> WebSocket instance
 	    #rooms = {};
 	    #clientRooms = new Map(); // ClientId -> RoomId
 	    #rateLimits = new Map(); // Rate limiting storage
 	    #callbacks = new Map();
+	    #heartbeatInterval;
 
 	    /**
 	     * Create a new PlaySocketServer instance
@@ -42,6 +44,7 @@ function requireServer () {
 	        if (server) {
 	            this.#server = server; // Use provided HTTP server
 	        } else {
+	            this.#ownsServer = true;
 	            this.#server = http.createServer(); // Create HTTP server and start it
 	            this.#server.listen(port, () => {
 	                console.log(`PlaySocket server running on port ${port}`);
@@ -56,11 +59,20 @@ function requireServer () {
 
 	        // Set up ws event handlers
 	        this.#wss.on('connection', ws => {
+	            ws.isAlive = true;
+	            ws.on('pong', () => { ws.isAlive = true; });
 	            ws.on('message', msg => this.#handleMessage(ws, msg));
 	            ws.on('close', () => this.#handleDisconnection(ws));
 	        });
 
-	        process.on('SIGINT', () => this.#stop()); // Graceful shutdown
+	        // Start heartbeat
+	        this.#heartbeatInterval = setInterval(() => {
+	            this.#wss.clients.forEach(ws => {
+	                if (!ws.isAlive) return ws.terminate();
+	                ws.isAlive = false;
+	                ws.ping();
+	            });
+	        }, 30000);
 	    }
 
 	    /**
@@ -320,16 +332,15 @@ function requireServer () {
 	    }
 
 	    /**
-	     * Stop the server
-	     * @private
+	     * Close all client connections, then close the websocket and http server
 	     */
-	    #stop() {
+	    stop() {
+	        clearInterval(this.#heartbeatInterval);
 	        if (this.#wss) {
 	            this.#wss.clients.forEach(client => client.close());
-	            this.#wss.close(); // TODO necessary?
+	            this.#wss.close();
 	        }
-
-	        if (this.#server) {
+	        if (this.#server && this.#ownsServer) {
 	            this.#server.close(() => {
 	                console.log('PlaySocket server stopped');
 	            });

package/package.json

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