feat(repeater): preserve legacy rabbitmq flow (#435)

relates-to: #404
NeuraLegion · Aug 17, 2023 · 451d6e4 · 451d6e4
1 parent b577a95
commit 451d6e4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/src/Commands/RunRepeater.ts b/src/Commands/RunRepeater.ts
@@ -1,8 +1,15 @@
 import { Cert, RequestExecutorOptions } from '../RequestExecutor';
 import { Helpers, logger } from '../Utils';
 import { container } from '../Config';
-import { DefaultRepeaterServerOptions, RepeaterLauncher } from '../Repeater';
+import { RabbitMQBusOptions } from '../Bus';
+import {
+  DefaultRepeaterLauncher,
+  DefaultRepeaterServerOptions,
+  RepeaterLauncher,
+  ServerRepeaterLauncher
+} from '../Repeater';
 import { Arguments, Argv, CommandModule } from 'yargs';
+import { Lifecycle } from 'tsyringe';
 import { normalize } from 'path';
 
 export class RunRepeater implements CommandModule {
@@ -124,6 +131,11 @@ export class RunRepeater implements CommandModule {
         alias: ['rm', 'remove'],
         describe: 'Stop and remove repeater daemon'
       })
+      .option('legacy', {
+        boolean: true,
+        describe:
+          'Enable legacy mode, utilizing the RabbitMQ connection for communication.'
+      })
       .conflicts('remove-daemon', 'daemon')
       .conflicts('experimental-connection-reuse', 'proxy')
       .conflicts('experimental-connection-reuse', 'proxy-external')
@@ -149,7 +161,7 @@ export class RunRepeater implements CommandModule {
 
         return true;
       })
-      .middleware((args: Arguments) =>
+      .middleware((args: Arguments) => {
         container
           .register<RequestExecutorOptions>(RequestExecutorOptions, {
             useValue: {
@@ -177,6 +189,19 @@ export class RunRepeater implements CommandModule {
               ]
             }
           })
+          .register<RabbitMQBusOptions>(RabbitMQBusOptions, {
+            useValue: {
+              exchange: 'EventBus',
+              clientQueue: `agent:${args.id as string}`,
+              connectTimeout: 10000,
+              url: args.bus as string,
+              proxyUrl: (args.proxyExternal ?? args.proxy) as string,
+              credentials: {
+                username: 'bot',
+                password: args.token as string
+              }
+            }
+          })
           .register<DefaultRepeaterServerOptions>(
             DefaultRepeaterServerOptions,
             {
@@ -188,7 +213,16 @@ export class RunRepeater implements CommandModule {
               }
             }
           )
-      );
+          .register<RepeaterLauncher>(
+            RepeaterLauncher,
+            {
+              useClass: args.legacy
+                ? DefaultRepeaterLauncher
+                : ServerRepeaterLauncher
+            },
+            { lifecycle: Lifecycle.Singleton }
+          );
+      });
   }
 
   // eslint-disable-next-line complexity

diff --git a/src/Config/container.ts b/src/Config/container.ts
@@ -50,12 +50,7 @@ import { ConfigReader } from './ConfigReader';
 import { DefaultConfigReader } from './DefaultConfigReader';
 import { CliInfo } from './CliInfo';
 import { CliBuilder } from './CliBuilder';
-import {
-  ServerRepeaterLauncher,
-  RepeaterLauncher,
-  RepeaterServer,
-  DefaultRepeaterServer
-} from '../Repeater';
+import { RepeaterServer, DefaultRepeaterServer } from '../Repeater';
 import { container, Lifecycle } from 'tsyringe';
 
 container
@@ -209,11 +204,6 @@ container
     { useClass: DefaultConfigReader },
     { lifecycle: Lifecycle.Singleton }
   )
-  .register<RepeaterLauncher>(
-    RepeaterLauncher,
-    { useClass: ServerRepeaterLauncher },
-    { lifecycle: Lifecycle.Singleton }
-  )
   .register<CliBuilder>(CliBuilder, {
     useFactory: (deps) =>
       new CliBuilder({

diff --git a/src/Repeater/DefaultRepeaterLauncher.ts b/src/Repeater/DefaultRepeaterLauncher.ts
@@ -127,6 +127,9 @@ export class DefaultRepeaterLauncher implements RepeaterLauncher {
     }
 
     logger.log('Starting the Repeater (%s)...', this.info.version);
+    logger.warn(
+      'WARNING: You are using the legacy flow. Consider using the new repeater that utilizes standard ports.'
+    );
 
     this.repeaterId = repeaterId;