feat(repeater): get rid of supporting web sockets

closes #196
NeuraLegion · May 16, 2024 · fd2e5cd · fd2e5cd
1 parent 92c6eca
commit fd2e5cd
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 433 deletions.
diff --git a/packages/repeater/src/api/ExecuteRequestEventHandler.spec.ts b/packages/repeater/src/api/ExecuteRequestEventHandler.spec.ts
@@ -1,8 +1,8 @@
 import 'reflect-metadata';
 import { ExecuteRequestEventHandler } from './ExecuteRequestEventHandler';
 import { Protocol } from '../models';
-import { Request, RequestRunner } from '../request-runner';
-import { anything, capture, instance, mock, reset, when } from 'ts-mockito';
+import { RequestRunner } from '../request-runner';
+import { anything, instance, mock, reset, when } from 'ts-mockito';
 
 describe('ExecuteRequestEventHandler', () => {
   const requestRunnerResponse = {
@@ -65,24 +65,5 @@ describe('ExecuteRequestEventHandler', () => {
 
       await expect(res).rejects.toThrow(`Unsupported protocol "http"`);
     });
-
-    it('`correlation_id_regex` should become `correlationIdRegex` in runner input', async () => {
-      const payload = {
-        protocol: Protocol.HTTP,
-        url: 'http://foo.bar/',
-        headers: {},
-        correlation_id_regex: 'baz'
-      };
-      const handler = new ExecuteRequestEventHandler([
-        instance(mockedRequestRunner)
-      ]);
-
-      await handler.handle(payload);
-
-      const [request]: [Request] = capture<Request>(
-        mockedRequestRunner.run
-      ).first();
-      expect(request.correlationIdRegex).toBeInstanceOf(RegExp);
-    });
   });
 });
diff --git a/packages/repeater/src/lib/RepeaterFactory.spec.ts b/packages/repeater/src/lib/RepeaterFactory.spec.ts
@@ -3,8 +3,7 @@ import { RepeaterFactory } from './RepeaterFactory';
 import {
   HttpRequestRunner,
   RequestRunner,
-  RequestRunnerOptions,
-  WsRequestRunner
+  RequestRunnerOptions
 } from '../request-runner';
 import { Repeater } from './Repeater';
 import { RepeatersManager } from '../api';
@@ -215,7 +214,7 @@ describe('RepeaterFactory', () => {
       const factory = new RepeaterFactory(configuration);
 
       await factory.createRepeater({
-        requestRunners: [HttpRequestRunner, WsRequestRunner]
+        requestRunners: [HttpRequestRunner]
       });
 
       verify(
@@ -229,17 +228,6 @@ describe('RepeaterFactory', () => {
           })
         )
       ).once();
-      verify(
-        mockedChildContainer.register(
-          RequestRunner,
-          deepEqual({
-            useClass: WsRequestRunner
-          }),
-          deepEqual({
-            lifecycle: Lifecycle.ContainerScoped
-          })
-        )
-      ).once();
     });
 
     it('should throw an error if name prefix is too long', async () => {
@@ -331,7 +319,7 @@ describe('RepeaterFactory', () => {
       const existingRepeaterId = '123';
 
       await factory.createRepeaterFromExisting(existingRepeaterId, {
-        requestRunners: [HttpRequestRunner, WsRequestRunner]
+        requestRunners: [HttpRequestRunner]
       });
 
       verify(
@@ -345,17 +333,6 @@ describe('RepeaterFactory', () => {
           })
         )
       ).once();
-      verify(
-        mockedChildContainer.register(
-          RequestRunner,
-          deepEqual({
-            useClass: WsRequestRunner
-          }),
-          deepEqual({
-            lifecycle: Lifecycle.ContainerScoped
-          })
-        )
-      ).once();
     });
   });
 });
diff --git a/packages/repeater/src/models/Protocol.ts b/packages/repeater/src/models/Protocol.ts
@@ -1,4 +1,3 @@
 export enum Protocol {
-  HTTP = 'http',
-  WS = 'ws'
+  HTTP = 'http'
 }
diff --git a/packages/repeater/src/register.ts b/packages/repeater/src/register.ts
@@ -3,8 +3,7 @@ import { DefaultRepeatersManager, RepeatersManager } from './api';
 import {
   HttpRequestRunner,
   RequestRunner,
-  RequestRunnerOptions,
-  WsRequestRunner
+  RequestRunnerOptions
 } from './request-runner';
 import {
   container,
@@ -27,10 +26,6 @@ container.register(RequestRunner, {
   useClass: HttpRequestRunner
 });
 
-container.register(RequestRunner, {
-  useClass: WsRequestRunner
-});
-
 container.register(RequestRunnerOptions, {
   useValue: {
     timeout: 30000,

diff --git a/packages/repeater/src/request-runner/Request.spec.ts b/packages/repeater/src/request-runner/Request.spec.ts
@@ -34,17 +34,6 @@ describe('Request', () => {
       ).toThrow('Body must be string.');
     });
 
-    it('should throw Error on invalid correlationIdRegex', () => {
-      expect(
-        () =>
-          new Request({
-            url: 'http://foo.bar',
-            correlationIdRegex: '(',
-            protocol: Protocol.HTTP
-          })
-      ).toThrow('Correlation id must be regular expression.');
-    });
-
     it('should create an instance', () => {
       expect(
         () =>

diff --git a/packages/repeater/src/request-runner/Request.ts b/packages/repeater/src/request-runner/Request.ts
@@ -7,7 +7,6 @@ export interface RequestOptions {
   method?: string;
   headers?: Record<string, string | string[]>;
   body?: string;
-  correlationIdRegex?: string | RegExp;
 }
 
 export class Request {
@@ -30,7 +29,6 @@ export class Request {
   public readonly protocol: Protocol;
   public readonly url: string;
   public readonly body?: string;
-  public readonly correlationIdRegex?: RegExp;
 
   private readonly _method?: string;
 
@@ -48,20 +46,11 @@ export class Request {
     return this.url.startsWith('https');
   }
 
-  constructor({
-    protocol,
-    method,
-    url,
-    body,
-    correlationIdRegex,
-    headers = {}
-  }: RequestOptions) {
+  constructor({ protocol, method, url, body, headers = {} }: RequestOptions) {
     this.protocol = protocol;
     this._method = method?.toUpperCase() ?? 'GET';
     this.validateUrl(url);
     this.url = url;
-    this.correlationIdRegex =
-      this.normalizeCorrelationIdRegex(correlationIdRegex);
     this.setHeaders(headers);
     this.precheckBody(body);
     this.body = body;
@@ -99,16 +88,4 @@ export class Request {
       throw new Error('Body must be string.');
     }
   }
-
-  private normalizeCorrelationIdRegex(
-    correlationIdRegex: RegExp | string | undefined
-  ): RegExp | undefined {
-    if (correlationIdRegex) {
-      try {
-        return new RegExp(correlationIdRegex, 'i');
-      } catch {
-        throw new Error('Correlation id must be regular expression.');
-      }
-    }
-  }
 }
diff --git a/packages/repeater/src/request-runner/Response.spec.ts b/packages/repeater/src/request-runner/Response.spec.ts
@@ -5,7 +5,7 @@ describe('Response', () => {
   describe('constructor', () => {
     it('should create an instance having only protocol', () => {
       const responseOptions = {
-        protocol: Protocol.WS
+        protocol: Protocol.HTTP
       };
 
       const response = new Response(responseOptions);
@@ -15,7 +15,7 @@ describe('Response', () => {
 
     it('should create an instance with full fieldset', () => {
       const responseOptions = {
-        protocol: Protocol.WS,
+        protocol: Protocol.HTTP,
         statusCode: 200,
         headers: { 'x-key': ['x-value'] },
         body: '{}',

diff --git a/packages/repeater/src/request-runner/protocols/WsRequestRunner.spec.ts b/packages/repeater/src/request-runner/protocols/WsRequestRunner.spec.ts