redweb 0.1.7 → 0.1.9

package/SocketServer.js

@@ -1,6 +1,6 @@
 const http = require('http');
 const https = require('https');
-const socketIo = require('socket.io');
+const WebSocket = require('ws');
 const loadSslConfig = require('./sslConfig');
 
 /**
@@ -21,7 +21,7 @@ const SOCKET_OPTIONS = {
     connectionCloseCallback: undefined,
     messageCallback: undefined,
     messageHandlers: {
-        'ping': (socket) => socket.send('pong')
+        'ping': (socket) => socket.send(JSON.stringify({ type: 'pong' }))
     },
     ssl: null
 };
@@ -30,32 +30,30 @@ const SOCKET_OPTIONS = {
  * Base Socket Server
  * @param {Object} server - The HTTP or HTTPS server instance.
  * @param {SocketServerOptions} options - Configuration options for SocketServer.
- * @return {Object} Socket.IO server instance.
  */
 function BaseSocketServer(server, options = {}) {
-    this.io = socketIo(server);
+    this.wss = new WebSocket.Server({ server });
     Object.assign(this, { ...SOCKET_OPTIONS, ...options });
 
-    this.io.on('connection', socket => {
+    this.wss.on('connection', (socket) => {
         console.log('New client connected');
         if (this.connectionOpenCallback) this.connectionOpenCallback(socket);
 
         socket.on('message', (message) => {
             try {
+                if (this.messageCallback) this.messageCallback(socket, message);
                 const parsedMessage = JSON.parse(message);
                 const { type, data } = parsedMessage;
 
                 if (this.messageHandlers[type]) {
                     this.messageHandlers[type](socket, data);
                 }
-
-                if (this.messageCallback) this.messageCallback(socket, message);
             } catch (error) {
                 console.error('Error handling message:', error);
             }
         });
 
-        socket.on('disconnect', () => {
+        socket.on('close', () => {
             console.log('Client disconnected');
             if (this.connectionCloseCallback) this.connectionCloseCallback(socket);
         });
@@ -64,31 +62,33 @@ function BaseSocketServer(server, options = {}) {
             console.error('Socket error:', error);
         });
     });
+
+    return this;
 }
 
 /**
  * WebSocket Server
  * @param {SocketServerOptions} options - Configuration options for SocketServer.
- * @return {Object} Socket.IO server instance.
+ * @return {Object} WebSocket server instance.
  */
 function SocketServer(options = {}) {
     const server = http.createServer();
     BaseSocketServer.call(this, server, options);
     server.listen(this.port, () => console.log(`RedWeb SocketServer listening on port ${this.port}`));
-    return this.io;
+    return this;
 }
 
 /**
  * Secure WebSocket Server
  * @param {SocketServerOptions} options - Configuration options for SecureSocketServer.
- * @return {Object} Socket.IO server instance.
+ * @return {Object} WebSocket server instance.
  */
 function SecureSocketServer(options = {}) {
     const sslOptions = loadSslConfig(options.ssl);
     const server = https.createServer(sslOptions);
     BaseSocketServer.call(this, server, options);
     server.listen(this.port, () => console.log(`RedWeb SecureSocketServer listening on port ${this.port}`));
-    return this.io;
+    return this;
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redweb",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "A way to quickly set up an express server",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "license": "ISC",
   "dependencies": {
     "express": "^4.19.2",
-    "socket.io": "^4.7.5"
+    "ws": "^8.17.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",