comply with new template parser construct mockoon#83

isuru89 · Apr 6, 2024 · 02435f2 · 02435f2
1 parent 4aa08f3
commit 02435f2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 67 deletions.
diff --git a/packages/commons-server/src/libs/server/server.ts b/packages/commons-server/src/libs/server/server.ts
@@ -749,9 +749,14 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
     route: Route,
     enabledRouteResponse: RouteResponse,
     request?: IncomingMessage,
-    data?: string
+    data?: string,
+    connectedRequest?: ServerRequest
   ): string | undefined {
     let content: any = enabledRouteResponse.body;
+    let finalRequest = connectedRequest;
+    if (!finalRequest) {
+      finalRequest = request ? fromWsRequest(request, data) : undefined;
+    }
 
     if (
       enabledRouteResponse.bodyType === BodyTypes.DATABUCKET &&
@@ -787,7 +792,7 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
           environment: this.environment,
           processedDatabuckets: this.processedDatabuckets,
           globalVariables: this.globalVariables,
-          request: request ? fromWsRequest(request, data) : undefined,
+          request: finalRequest,
           envVarsPrefix: this.options.envVarsPrefix
         });
 
@@ -819,7 +824,7 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
         environment: this.environment,
         processedDatabuckets: this.processedDatabuckets,
         globalVariables: this.globalVariables,
-        request: request ? fromWsRequest(request, data) : undefined,
+        request: finalRequest,
         envVarsPrefix: this.options.envVarsPrefix
       });
     }
@@ -839,12 +844,15 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<Serve
       _: number,
       enabledRouteResponse: RouteResponse
     ) => {
-      // todo
+      // todo: do we need to take params from initial connection at all?
       const content =
         this.deriveFinalResponseContentForWebSockets(
           socket,
           route,
-          enabledRouteResponse
+          enabledRouteResponse,
+          undefined,
+          undefined,
+          request
         ) || '';
 
       if (!content) {

diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json