comply with new template parser construct mockoon#83

packages/commons-server/src/libs/server/server.ts

@@ -758,9 +758,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 &&
@@ -796,7 +801,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
  });
 
@@ -828,7 +833,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
  });
  }
@@ -848,12 +853,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) {

packages/commons/test/migrations.spec.ts

@@ -458,45 +458,6 @@ describe('Migrations', () => {
  });
  });
 
- describe('migration n. 33', () => {
- it('should have set default websocket specifics to existing routes', () => {
- const environment0: any = {};
- const environment1: any = { routes: [{}] };
- const environment2: any = { routes: [{ uuid: 'abc' }, { uuid: 'abc2' }] };
-
- applyMigration(33, environment0);
- applyMigration(33, environment1);
- applyMigration(33, environment2);
-
- strictEqual(environment0.routes, undefined);
- notStrictEqual(environment1.routes[0], undefined);
- strictEqual(
- environment1.routes[0].streamingMode,
- RouteDefault.streamingMode
- );
- strictEqual(
- environment1.routes[0].streamingInterval,
- RouteDefault.streamingInterval
- );
- strictEqual(
- environment2.routes[0].streamingMode,
- RouteDefault.streamingMode
- );
- strictEqual(
- environment2.routes[0].streamingInterval,
- RouteDefault.streamingInterval
- );
- strictEqual(
- environment2.routes[1].streamingMode,
- RouteDefault.streamingMode
- );
- strictEqual(
- environment2.routes[1].streamingInterval,
- RouteDefault.streamingInterval
- );
- });
- });
-
  describe('migration n. 31', () => {
  it('should remove route toggling and return the list of disabled route uuids', () => {
  const environment1: any = {
@@ -596,4 +557,43 @@ describe('Migrations', () => {
  });
  });
  });
+
+ describe('migration n. 33', () => {
+ it('should have set default websocket specifics to existing routes', () => {
+ const environment0: any = {};
+ const environment1: any = { routes: [{}] };
+ const environment2: any = { routes: [{ uuid: 'abc' }, { uuid: 'abc2' }] };
+
+ applyMigration(33, environment0);
+ applyMigration(33, environment1);
+ applyMigration(33, environment2);
+
+ strictEqual(environment0.routes, undefined);
+ notStrictEqual(environment1.routes[0], undefined);
+ strictEqual(
+ environment1.routes[0].streamingMode,
+ RouteDefault.streamingMode
+ );
+ strictEqual(
+ environment1.routes[0].streamingInterval,
+ RouteDefault.streamingInterval
+ );
+ strictEqual(
+ environment2.routes[0].streamingMode,
+ RouteDefault.streamingMode
+ );
+ strictEqual(
+ environment2.routes[0].streamingInterval,
+ RouteDefault.streamingInterval
+ );
+ strictEqual(
+ environment2.routes[1].streamingMode,
+ RouteDefault.streamingMode
+ );
+ strictEqual(
+ environment2.routes[1].streamingInterval,
+ RouteDefault.streamingInterval
+ );
+ });
+ });
 });