feat(engine): WS server moved to HTTP port

Goodbye NODE_PORT (43595/43596)

src/app.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 
-import { startManagementWeb, startWeb } from '#/web.js';
+import { startManagementWeb, startWeb, web } from '#/web.js';
 
 import World from '#/engine/World.js';
 
@@ -42,18 +42,18 @@ if (Environment.EASY_STARTUP) {
 
 await World.start();
 
+const tcpServer = new TcpServer();
+tcpServer.start();
+
+const wsServer = new WSServer();
+wsServer.start(web);
+
 startWeb();
 startManagementWeb();
 
 register.setDefaultLabels({nodeId: Environment.NODE_ID});
 collectDefaultMetrics({register});
 
-const tcpServer = new TcpServer();
-tcpServer.start();
-
-const wsServer = new WSServer();
-wsServer.start();
-
 // unfortunately, tsx watch is not giving us a way to gracefully shut down in our dev mode:
 // https://github.com/privatenumber/tsx/issues/494
 let exiting = false;

src/appMaintenance.ts

@@ -1,11 +1,11 @@
 import TcpMaintenanceServer from '#/server/tcp/TcpMaintenanceServer.js';
 import WSMaintenanceServer from '#/server/ws/WSMaintenanceServer.js';
-import { startWeb } from '#/web.js';
+import { startWeb, web } from '#/web.js';
 
 startWeb();
 
 const tcpServer = new TcpMaintenanceServer();
 tcpServer.start();
 
 const wsServer = new WSMaintenanceServer();
-wsServer.start();
+wsServer.start(web);

src/server/ws/WSMaintenanceServer.ts

@@ -1,15 +1,16 @@
+import http from 'http';
 import { WebSocketServer, WebSocket } from 'ws';
 
 import Packet from '#/io/Packet.js';
 
-import Environment from '#/util/Environment.js';
-
 // todo: websocket keepalives
 export default class WSMaintenanceServer {
     wss: WebSocketServer | null = null;
 
-    start() {
-        this.wss = new WebSocketServer({ port: Environment.NODE_PORT + 1, host: '0.0.0.0' }, () => {
+    start(server: http.Server) {
+        this.wss = new WebSocketServer({
+            server,
+            perMessageDeflate: false
         });
 
         this.wss.on('connection', (ws: WebSocket) => {

src/server/ws/WSServer.ts

@@ -1,9 +1,8 @@
+import http, { IncomingMessage } from 'http';
 import { WebSocketServer, WebSocket } from 'ws';
-import { IncomingMessage } from 'http';
 
 import Packet from '#/io/Packet.js';
 
-import Environment from '#/util/Environment.js';
 import NullClientSocket from '#/server/NullClientSocket.js';
 import WSClientSocket from '#/server/ws/WSClientSocket.js';
 import World from '#/engine/World.js';
@@ -27,8 +26,10 @@ function getIp(req: IncomingMessage) {
 export default class WSServer {
     wss: WebSocketServer | null = null;
 
-    start() {
-        this.wss = new WebSocketServer({ port: Environment.NODE_PORT + 1, host: '0.0.0.0' }, () => {
+    start(server: http.Server) {
+        this.wss = new WebSocketServer({
+            server,
+            perMessageDeflate: false
         });
 
         this.wss.on('connection', (ws: WebSocket, req) => {

src/web.ts

@@ -19,7 +19,7 @@ MIME_TYPES.set('.wasm', 'application/wasm');
 MIME_TYPES.set('.sf2', 'application/octet-stream');
 
 // we don't need/want a full blown website or API on the game server
-const web = http.createServer(async (req, res) => {
+export const web = http.createServer(async (req, res) => {
     try {
         if (Environment.WEB_CORS) {
             res.setHeader('Access-Control-Allow-Origin', '*');