Restructure Control Hub module to export interface and implement with internal class

Author: LandryNorris

packages/control-hub/src/ControlHub.ts

@@ -0,0 +1,7 @@
+import { ExpansionHub, ParentRevHub } from "@rev-robotics/expansion-hub";
+
+export interface ParentControlHub extends ParentRevHub, ControlHub {
+    readonly serialNumber: string;
+}
+
+export interface ControlHub extends ExpansionHub {}

packages/control-hub/src/discovery.ts

@@ -1,6 +1,7 @@
-import { ControlHub } from "./internal/ControlHub.js";
+import { ControlHubInternal } from "./internal/ControlHub.js";
 import { Adb, DeviceClient } from "@u4/adbkit";
 import getPort from "get-port";
+import { ControlHub } from "./ControlHub.js";
 
 export async function openConnectedControlHub(): Promise<ControlHub | undefined> {
     try {
@@ -20,8 +21,9 @@ export async function openUsbControlHubs(): Promise<ControlHub[]> {
         let isHub = await isControlHub(deviceClient);
         if (isHub) {
             let port = await configureHubTcp(deviceClient);
+            let serialNumber = device.id;
 
-            let hub = new ControlHub();
+            let hub = new ControlHubInternal(serialNumber);
             await hub.open("127.0.0.1", (port + 1).toString());
             controlHubs.push(hub);
         }
@@ -47,7 +49,7 @@ async function isControlHub(deviceClient: DeviceClient): Promise<boolean> {
 }
 
 async function createWiFiControlHub(): Promise<ControlHub> {
-    let hub = new ControlHub();
+    let hub = new ControlHubInternal();
 
     if (!(await hub.isWiFiConnected())) {
         throw new Error("Hub is not connected via WiFi");

packages/control-hub/src/index.ts

@@ -1 +1,2 @@
 export { openConnectedControlHub, openUsbControlHubs } from "./discovery.js";
+export * from "./ControlHub.js";

packages/control-hub/src/internal/ControlHub.ts

@@ -23,20 +23,30 @@ import axios from "axios";
 import semver from "semver";
 import WebSocket from "isomorphic-ws";
 import adb from "@u4/adbkit";
+import { ControlHub, ParentControlHub } from "../ControlHub.js";
 
-export class ControlHub implements ExpansionHub {
+export class ControlHubInternal implements ControlHub {
     readonly isOpen: boolean = true;
     moduleAddress: number = 0;
     responseTimeoutMs: number = 0;
     type: RevHubType = RevHubType.ControlHub;
     webSocketConnection!: WebSocket;
+    private readonly serialNumber?: string;
 
     keyGenerator = 0;
     currentActiveCommands = new Map<
         any,
         (response: any | undefined, error: any | undefined) => void
     >();
 
+    constructor(serialNumber?: string) {
+        this.serialNumber = serialNumber;
+    }
+
+    isParent(): this is ParentControlHub {
+        return this.serialNumber !== undefined;
+    }
+
     async open(ip: string = "192.168.43.1", port: string = "8081"): Promise<void> {
         this.webSocketConnection = new WebSocket(`ws://${ip}:${port}`);
 
@@ -209,10 +219,6 @@ export class ControlHub implements ExpansionHub {
         throw new Error("not implemented");
     }
 
-    isParent(): this is ParentRevHub {
-        throw new Error("not implemented");
-    }
-
     on(eventName: "error", listener: (error: Error) => void): RevHub {
         throw new Error("not implemented");
     }

packages/sample/src/command/list.ts

@@ -5,7 +5,11 @@ import { openConnectedControlHub, openUsbControlHubs } from "@rev-robotics/contr
 export async function list() {
     let usbControlHubs = await openUsbControlHubs();
     for (const hub of usbControlHubs) {
-        console.log(`USB Control Hub: ${hub.moduleAddress}\n\n`);
+        if (hub.isParent()) {
+            console.log(`USB Control Hub: ${hub.serialNumber} ${hub.moduleAddress}\n\n`);
+        } else {
+            console.log(`\tUSB Control Hub: ${hub.moduleAddress}\n\n`);
+        }
         hub.close();
     }