feat(repeater): address pr comments

closes #196
NeuraLegion · Jun 10, 2024 · 504ebfe · 504ebfe
1 parent 878e8ce
commit 504ebfe
Show file tree

Hide file tree

Showing 25 changed files with 768 additions and 398 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,11 @@
     "chalk": "^4.1.2",
     "ci-info": "^3.3.0",
     "content-type": "^1.0.4",
+    "fast-content-type-parse": "^1.1.0",
     "form-data": "^4.0.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.4",
+    "iconv-lite": "^0.6.3",
     "reflect-metadata": "^0.1.13",
     "semver": "^7.5.2",
     "socket.io-client": "^4.7.5",

diff --git a/packages/core/src/logger/Logger.ts b/packages/core/src/logger/Logger.ts
@@ -28,8 +28,8 @@ export class Logger {
     this._logLevel = logLevel;
   }
 
-  public error(errorOrMessage: string, ...args: any[]): void {
-    this.write(errorOrMessage, LogLevel.ERROR, ...args);
+  public error(message: string, ...args: any[]): void {
+    this.write(message, LogLevel.ERROR, ...args);
   }
 
   public warn(message: string, ...args: any[]): void {

diff --git a/packages/repeater/src/api/ExecuteRequestEventHandler.ts b/packages/repeater/src/api/ExecuteRequestEventHandler.ts
@@ -42,9 +42,7 @@ export class ExecuteRequestEventHandler
       throw new Error(`Unsupported protocol "${protocol}"`);
     }
 
-    const response: Response = await runner.run(
-      new Request({ ...event, correlationIdRegex: event.correlation_id_regex })
-    );
+    const response: Response = await runner.run(new Request({ ...event }));
 
     const { statusCode, message, errorCode, body, headers } = response;
 

diff --git a/packages/repeater/src/api/commands/CreateRepeaterRequest.ts b/packages/repeater/src/api/commands/CreateRepeaterRequest.ts
diff --git a/packages/repeater/src/api/commands/DeleteRepeaterRequest.ts b/packages/repeater/src/api/commands/DeleteRepeaterRequest.ts
diff --git a/packages/repeater/src/api/commands/RegisterRepeaterCommand.ts b/packages/repeater/src/api/commands/RegisterRepeaterCommand.ts
diff --git a/packages/repeater/src/api/commands/index.ts b/packages/repeater/src/api/commands/index.ts
diff --git a/packages/repeater/src/api/events/RepeaterStatusEvent.ts b/packages/repeater/src/api/events/RepeaterStatusEvent.ts
diff --git a/packages/repeater/src/api/events/index.ts b/packages/repeater/src/api/events/index.ts
diff --git a/packages/repeater/src/api/index.ts b/packages/repeater/src/api/index.ts
@@ -1,8 +1 @@
-export {
-  RepeaterRegisteringError,
-  RegisterRepeaterResult,
-  RegisterRepeaterCommandPayload,
-  RegisterRepeaterCommand
-} from './commands';
-export { RepeaterStatusEvent } from './events';
 export * from './ExecuteRequestEventHandler';
diff --git a/packages/repeater/src/bus/DefaultRepeaterBus.ts b/packages/repeater/src/bus/DefaultRepeaterBus.ts
@@ -45,7 +45,7 @@ export class DefaultRepeaterBus implements RepeaterBus {
 
     this.logger.log('Connecting the Bridges');
 
-    this.subscribeToEvents();
+    this.subscribeDiagnosticEvents();
 
     await this.repeaterServer.connect();
 
@@ -54,15 +54,23 @@ export class DefaultRepeaterBus implements RepeaterBus {
     await this.deploy();
 
     this.logger.log('The Repeater (%s) started', this.repeaterId);
+
+    this.subscribeRedeploymentEvent();
   }
 
   private async deploy() {
-    const response = await this.repeaterServer.deploy();
+    const { repeaterId } = await this.repeaterServer.deploy({
+      repeaterId: this.repeaterId
+    });
+
+    this._repeaterId = repeaterId;
+  }
 
-    this._repeaterId = response.repeaterId;
+  private subscribeRedeploymentEvent() {
+    this.repeaterServer.on(RepeaterServerEvents.CONNECTED, this.deploy);
   }
 
-  private subscribeToEvents() {
+  private subscribeDiagnosticEvents() {
     this.repeaterServer.on(RepeaterServerEvents.ERROR, this.handleError);
 
     this.repeaterServer.on(