Improved ws error handling

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kras",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Efficient server proxying and mocking in Node.js.",
   "main": "dist/server/index.js",
   "types": "dist/server/index.d.ts",

src/server/core/webserver.ts

@@ -1,5 +1,6 @@
 import * as express from 'express';
 import * as expressWs from 'express-ws';
+import type { Server as WebSocketServer } from 'ws';
 import { Application, Request, Response } from 'express';
 import { createServer as createHttpServer, Server as HttpServer } from 'http';
 import { createServer as createHttpsServer, Server as HttpsServer } from 'https';
@@ -143,6 +144,15 @@ export class WebServer extends EventEmitter implements BaseKrasServer {
       this.sockets = expressWs(this.app, this.server, {
         wsOptions: this.wsOptions,
       });
+      const wsServer = (this.sockets.getWss() as WebSocketServer);
+      wsServer.on('connection', socket => {
+        socket.on('error', (err) => {
+          this.emit('error', `Problem with the WS socket connection: ${err}`);
+        });
+      });
+      wsServer.on('error', err => {
+        this.emit('error', `Error with WS server: ${err}`);
+      });
     }
   }
 

src/server/injectors/proxy-injector.ts

@@ -109,6 +109,7 @@ export default class ProxyInjector implements KrasInjector {
           rejectUnauthorized: false,
           headers,
         });
+        ws.on('error', err => core.emit('error', err));
         ws.on('open', () => {
           open = true;
 
@@ -136,7 +137,6 @@ export default class ProxyInjector implements KrasInjector {
             });
           }
         });
-        ws.on('error', err => core.emit('error', err));
         this.sessions[e.id] = ws;
       }
     });