Add boss server

DrewML · Dec 24, 2020 · f37daf4 · f37daf4
1 parent a55de7b
commit f37daf4
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/bin/aimserver b/bin/aimserver
@@ -2,9 +2,11 @@
 
 const authHost = process.env.AUTH_HOST;
 const authPort = process.env.AUTH_PORT;
+const bossHost = process.env.BOSS_HOST;
+const bossPort = process.env.BOSS_PORT;
 
 require('../dist/cli')
-    .cli({ authHost, authPort })
+    .cli({ authHost, authPort, bossHost, bossPort })
     .catch(err => {
         console.error(err);
         process.exit(1);

diff --git a/src/AIMAuthServer.ts b/src/AIMAuthServer.ts
@@ -101,7 +101,7 @@ export class AIMAuthServer extends OscarServer {
                         // persistence is added
                         email: 'DrewML@users.noreply.github.com',
                         // Point to BOSS host/port
-                        bosAddress: 'host.test:5190',
+                        bosAddress: 'host.test:5191',
                         // TODO: Stop hardcoding BOSS cookie
                         authCookie: '111111111',
                         latestBetaVersion: '8.1.4',

diff --git a/src/BossServer.ts b/src/BossServer.ts
@@ -0,0 +1,8 @@
+import assert from 'assert';
+import { OscarServer, OscarSocket } from './OscarServer';
+
+export class BossServer extends OscarServer {
+    onConnection(oscarSocket: OscarSocket) {
+        assert(false, 'onConnection not implemented in BossServer');
+    }
+}
diff --git a/src/OscarServer.ts b/src/OscarServer.ts
@@ -5,8 +5,8 @@ import { createServer, Socket, Server, AddressInfo } from 'net';
 import { MultiMap } from './MultiMap';
 
 interface OscarServerOpts {
-    port?: number;
-    host?: string;
+    port: number;
+    host: string;
 }
 
 export class OscarServer {
@@ -15,8 +15,8 @@ export class OscarServer {
     private port: number;
 
     constructor(opts: OscarServerOpts) {
-        this.host = opts.host ?? '0.0.0.0';
-        this.port = opts.port ?? 5190;
+        this.host = opts.host;
+        this.port = opts.port;
 
         this.server = createServer((socket) => {
             this.onConnection(new OscarSocket(socket));
@@ -92,6 +92,11 @@ export class OscarSocket {
 
     private onData(data: Buffer) {
         const flap = parseFlap(data);
+        assert(
+            this.channelListeners.has(flap.channel),
+            `Channel ${flap.channel} has no handler in OscarSocket}`,
+        );
+
         const listeners = this.channelListeners.get(flap.channel);
         for (const listener of listeners) {
             listener(flap);

diff --git a/src/cli.ts b/src/cli.ts
@@ -1,16 +1,29 @@
+import { BossServer } from './BossServer';
 import { AIMAuthServer } from './AIMAuthServer';
 
 interface CLIOpts {
     authHost?: string;
     authPort?: string;
+    bossHost?: string;
+    bossPort?: string;
 }
 
 export async function cli(opts: CLIOpts) {
     const authServer = new AIMAuthServer({
-        host: opts.authHost,
-        port: (opts.authPort && Number(opts.authPort)) || undefined,
+        host: opts.authHost || '0.0.0.0',
+        port: (opts.authPort && Number(opts.authPort)) || 5190,
     });
 
-    const { address, port } = await authServer.start();
-    console.log(`Auth Service listening on ${address}:${port}`);
+    const bossServer = new BossServer({
+        host: opts.bossHost || '0.0.0.0',
+        port: (opts.bossPort && Number(opts.bossPort)) || 5191,
+    });
+
+    const [auth, boss] = await Promise.all([
+        authServer.start(),
+        bossServer.start(),
+    ]);
+
+    console.log(`Auth Service listening on ${auth.address}:${auth.port}`);
+    console.log(`Boss Service listening on ${boss.address}: ${boss.port}`);
 }