Remove ParentControlHub, since control hubs will always be parents

REVrobotics · May 30, 2023 · 27ffa13 · 27ffa13
1 parent 41ae6a3
commit 27ffa13
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/control-hub/package.json b/packages/control-hub/package.json
@@ -18,6 +18,7 @@
   "devDependencies": {
     "@types/node": "^16.18.18",
     "@types/semver": "^7.5.0",
+    "@types/node-forge": "^1.3.2",
     "typescript": "^5.0.2"
   },
   "scripts": {

diff --git a/packages/control-hub/src/ControlHub.ts b/packages/control-hub/src/ControlHub.ts
@@ -1,7 +1,3 @@
 import { ExpansionHub, ParentRevHub } from "@rev-robotics/expansion-hub";
 
-export interface ParentControlHub extends ParentRevHub, ControlHub {
-    readonly serialNumber: string;
-}
-
-export interface ControlHub extends ExpansionHub {}
+export interface ControlHub extends ExpansionHub, ParentRevHub {}
diff --git a/packages/control-hub/src/discovery.ts b/packages/control-hub/src/discovery.ts
@@ -49,7 +49,7 @@ async function isControlHub(deviceClient: DeviceClient): Promise<boolean> {
 }
 
 async function createWiFiControlHub(): Promise<ControlHub> {
-    let hub = new ControlHubInternal();
+    let hub = new ControlHubInternal("Placeholder");
 
     if (!(await hub.isWiFiConnected())) {
         throw new Error("Hub is not connected via WiFi");

diff --git a/packages/control-hub/src/internal/ControlHub.ts b/packages/control-hub/src/internal/ControlHub.ts
@@ -23,27 +23,28 @@ import axios from "axios";
 import semver from "semver";
 import WebSocket from "isomorphic-ws";
 import adb from "@u4/adbkit";
-import { ControlHub, ParentControlHub } from "../ControlHub.js";
+import { ControlHub } from "../ControlHub.js";
 
 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;
+    readonly serialNumber: string;
+    readonly children: ReadonlyArray<RevHub> = [];
 
     keyGenerator = 0;
     currentActiveCommands = new Map<
         any,
         (response: any | undefined, error: any | undefined) => void
     >();
 
-    constructor(serialNumber?: string) {
+    constructor(serialNumber: string) {
         this.serialNumber = serialNumber;
     }
 
-    isParent(): this is ParentControlHub {
+    isParent(): this is ParentRevHub {
         return this.serialNumber !== undefined;
     }
 
@@ -418,4 +419,12 @@ export class ControlHubInternal implements ControlHub {
             });
         });
     }
+
+    addChild(hub: RevHub): void {
+        throw new Error("not implemented");
+    }
+
+    addChildByAddress(moduleAddress: number): Promise<RevHub> {
+        throw new Error("not implemented");
+    }
 }
diff --git a/packages/sample/src/command/list.ts b/packages/sample/src/command/list.ts
@@ -5,11 +5,7 @@ import { openConnectedControlHub, openUsbControlHubs } from "@rev-robotics/contr
 export async function list() {
     let usbControlHubs = await openUsbControlHubs();
     for (const hub of usbControlHubs) {
-        if (hub.isParent()) {
-            console.log(`USB Control Hub: ${hub.serialNumber} ${hub.moduleAddress}\n\n`);
-        } else {
-            console.log(`\tUSB Control Hub: ${hub.moduleAddress}\n\n`);
-        }
+        console.log(`USB Control Hub: ${hub.serialNumber} ${hub.moduleAddress}\n\n`);
         hub.close();
     }