server context path applied correctly mockoon#83

isuru89 · Feb 1, 2024 · 3e8f0ba · 3e8f0ba
1 parent d2c8d39
commit 3e8f0ba
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/commons-server/src/libs/server/server.ts b/packages/commons-server/src/libs/server/server.ts
@@ -510,14 +510,15 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
  private createWSRoutes(wsRoutes: Route[]) {
  wsRoutes.forEach((wsRoute) => {
  const webSocketServer = new WebSocket.Server({
- noServer: true,
- path: this.environment.endpointPrefix
- ? `/${this.environment.endpointPrefix}/${wsRoute.endpoint}`
- : undefined
+ noServer: true
  });
 
  this.webSocketServers.push(webSocketServer);
 
+ const envPath = this.environment.endpointPrefix
+ ? `/${this.environment.endpointPrefix}`
+ : '';
+
  webSocketServer.on(
  'connection',
  this.createWebSocketConnectionHandler(webSocketServer, wsRoute)
@@ -526,7 +527,7 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
  this.serverInstance.on('upgrade', (req, socket, head) => {
  //
  const urlParsed = parseUrl(req.url || '', true);
- if (urlParsed.pathname === `/${wsRoute.endpoint}`) {
+ if (urlParsed.pathname === `${envPath}/${wsRoute.endpoint}`) {
  webSocketServer.handleUpgrade(req, socket, head, (client) => {
  webSocketServer.emit('connection', client, req);
  });