refactor: remove DI and the pub sub client from GW service (#84)

Author: didinele

libs/common/src/constants.ts

@@ -30,44 +30,3 @@ export const ENDPOINTS = {
 } as const;
 
 Object.freeze(ENDPOINTS);
-
-/**
- * Interface representing configuration for the gateway service
- */
-export interface GatewayServiceConfig {
-  auth: string;
-  amqpHost: string;
-  debug: boolean;
-  shardCount: number | 'auto';
-  startingShard: number;
-  totalShardCount: number | 'auto';
-  ws: {
-    compress: boolean;
-    encoding: 'json' | 'etf';
-    timeouts: {
-      open: number;
-      hello: number;
-      ready: number;
-      guild: number;
-      reconnect: number;
-    };
-    largeThreshold: number;
-    intents: string[];
-  };
-}
-
-/**
- * Injection tokens used by the gateway service
- */
-export const GATEWAY_INJECTION_TOKENS = {
-  kConfig: Symbol('parsed configuration options'),
-  amqp: {
-    kChannel: Symbol('amqp channel object'),
-    kConnection: Symbol('amqp connection object'),
-    kService: Symbol('RoutingServer instance for distributing the incoming packets'),
-    kCommandsServer: Symbol('"server" recieving payloads (called commands) to send to Discord')
-  },
-  kCluster: Symbol('Cluster instance')
-} as const;
-
-Object.freeze(GATEWAY_INJECTION_TOKENS);

pnpm-lock.yaml

@@ -22,20 +22,15 @@
   },
   "homepage": "https://github.com/cordis-lib/cordis#readme",
   "devDependencies": {
+    "@cordis/common": "workspace:^0.3.0",
     "@types/node": "^14.14.44",
     "@types/yargs": "^15.0.13",
-    "discord-api-types": "^0.12.1",
     "typescript": "^4.2.4"
   },
   "dependencies": {
     "@cordis/brokers": "workspace:^0.3.0",
-    "@cordis/common": "workspace:^0.3.0",
     "@cordis/gateway": "workspace:^0.3.0",
-    "erlpack": "github:discord/erlpack",
-    "reflect-metadata": "^0.1.13",
     "tslib": "^2.2.0",
-    "tsyringe": "^4.5.0",
-    "yargs": "^15.4.1",
-    "zlib-sync": "^0.1.7"
+    "yargs": "^15.4.1"
   }
 }

services/gateway/package.json

@@ -1,7 +1,29 @@
 import * as yargs from 'yargs';
+import type { IntentKeys } from '@cordis/gateway';
 
-export default yargs
-  .env('CORDIS')
+export interface GatewayServiceConfig {
+  auth: string;
+  amqpHost: string;
+  debug: boolean;
+  shardCount: number | 'auto';
+  startingShard: number;
+  totalShardCount: number | 'auto';
+  ws: {
+    compress: boolean;
+    encoding: 'json' | 'etf';
+    timeouts: {
+      open: number;
+      hello: number;
+      ready: number;
+      guild: number;
+      reconnect: number;
+    };
+    largeThreshold: number;
+    intents: IntentKeys[];
+  };
+}
+
+const { argv } = yargs
   .option('auth', {
     global: true,
     description: 'The token used to identify to Discord',
@@ -102,5 +124,28 @@ export default yargs
     'demandOption': false,
     'default': ['nonPrivileged']
   })
-  .help()
-  .argv;
+  .help();
+
+const config: GatewayServiceConfig = {
+  auth: argv.auth,
+  amqpHost: argv['amqp-host'],
+  debug: argv.debug,
+  shardCount: argv['shard-count'],
+  startingShard: argv['starting-shard'],
+  totalShardCount: argv['total-shard-count'],
+  ws: {
+    compress: argv['ws-compress'],
+    encoding: argv['ws-encoding'] as 'json' | 'etf',
+    timeouts: {
+      open: argv['ws-open-timeout'],
+      hello: argv['ws-hello-timeout'],
+      ready: argv['ws-ready-timeout'],
+      guild: argv['ws-guild-timeout'],
+      reconnect: argv['ws-reconnect-timeout']
+    },
+    largeThreshold: argv['ws-large-threshold'],
+    intents: argv['ws-intents'] as IntentKeys[]
+  }
+};
+
+export default config;