1.28.0

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "schat2-clive",
-  "version": "1.27.3",
+  "version": "1.28.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "schat2-clive",
-      "version": "1.27.3",
+      "version": "1.28.0",
       "license": "ISC",
       "dependencies": {
         "better-sqlite3": "^8.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schat2-clive",
-  "version": "1.27.3",
+  "version": "1.28.0",
   "description": "Game host for SChat 2-powered chat sites",
   "main": "src/app.js",
   "scripts": {

src/schat.js

@@ -3,8 +3,7 @@
 const config = require('config');
 const { setTimeout: delay } = require('timers/promises');
 const bhttp = require('bhttp');
-// const WebSocket = require('ws');
+const WebSocket = require('ws');
-const io = require('socket.io-client');
 const logger = require('simple-node-logger').createSimpleLogger();
 const { argv } = require('yargs');
 
@@ -144,29 +143,13 @@ async function connect(bot, games) {
 
 			logger.info(`Attempting to connect to ${config.socket}`);
 
-			const { origin, pathname } = new URL(config.socket);
+			socket.ws = new WebSocket(`${config.socket}?${new URLSearchParams({ v: wsCreds.wsId, t: wsCreds.timestamp }).toString()}`, [], {
-
+				headers: {
-			socket.io = io(origin, {
-				transports: ['websocket'],
-				path: pathname,
-				query: {
-					v: wsCreds.wsId,
-					t: wsCreds.timestamp,
-				},
-				extraHeaders: {
 					cookie: sessionCookie,
 				},
 			});
 
-			socket.io.on('connect', () => {
+			socket.ws.on('message', async (msg) => {
-				logger.info(`Connected to ${config.socket}`);
-			});
-
-			socket.io.on('connect_error', (error) => {
-				logger.info(`Failed to connect to ${config.socket}: ${error}`);
-			});
-
-			socket.io.on('_', async (msg) => {
 				const [domain, data] = JSON.parse(msg);
 
 				logger.debug(`Received ${domain}: ${JSON.stringify(data)}`);
@@ -180,14 +163,18 @@ async function connect(bot, games) {
 				}
 			});
 
-			/* reconnect logic handled by SocketIO
+			socket.ws.on('close', async (info) => {
-			socket.io.on('disconnect', async (info) => {
 				logger.error(`WebSocket closed, reconnecting in ${config.reconnectDelay} seconds: ${info}`);
 
 				await delay(config.reconnectDelay * 1000);
 				socket.connect();
 			});
-			*/
+
+			socket.ws.on('error', async (error) => {
+				logger.error(`WebSocket error: ${error.message}`);
+			});
+
+			logger.info(`Connected to ${config.socket}`);
 		} catch (error) {
 			logger.error(`Failed to connect, retrying in ${config.reconnectDelay} seconds: ${error.message}`);
 
@@ -197,7 +184,7 @@ async function connect(bot, games) {
 	};
 
 	socket.transmit = (domain, data) => {
-		socket.io.emit('_', JSON.stringify([domain, data]));
+		socket.ws.send(JSON.stringify([domain, data]));
 	};
 
 	socket.connect();