remove supported from device configs, remove unnecessary config stu…

…b fields

src/main/port-service/index.ts

@@ -209,7 +209,7 @@ export class HardwarePortServiceSingleton {
 
     if (config) {
       // TODO: ensure that this driver is the correct target for adapter devices
-      const driver = getDriver(config?.driverName);
+      const driver = getDriver(config.driverName);
 
       if (driver) {
         pair.applyThrottle(driver.throttle); // apply throttle if exists

src/shared/hardware-config/adapter-device-config.ts

@@ -3,9 +3,6 @@ import { MidiArray } from '../midi-array';
 import { SupportedDeviceConfig } from './supported-device-config';
 import { ConfigStub } from './device-config';
 
-// TODO: Unclear if we really want to implement SupportedDeviceConfig or
-// extends DeviceConfig. Gut says extend DeviceConfig but needs research
-// TODO: yeah definitely don't want to implemenet Supported. Messes up instanceof checks downstream
 @Revivable.register
 export class AdapterDeviceConfig implements SupportedDeviceConfig {
   portName: string;
@@ -16,8 +13,6 @@ export class AdapterDeviceConfig implements SupportedDeviceConfig {
 
   nickname: string;
 
-  supported = true;
-
   siblingIndex: number;
 
   child?: SupportedDeviceConfig;
@@ -46,10 +41,6 @@ export class AdapterDeviceConfig implements SupportedDeviceConfig {
     this.child = config;
   }
 
-  get isSet() {
-    return this.child !== undefined;
-  }
-
   bindingAvailable(
     statusString: StatusString | 'noteon/noteoff',
     number: number,
@@ -72,46 +63,6 @@ export class AdapterDeviceConfig implements SupportedDeviceConfig {
     return msg;
   }
 
-  get inputs() {
-    if (this.child) {
-      return this.child!.inputs;
-    }
-    return [];
-  }
-
-  get shareSustain() {
-    if (this.child) {
-      return this.child.shareSustain;
-    }
-    return [];
-  }
-
-  set shareSustain(shareSustain: string[]) {
-    if (this.child) {
-      this.child.shareSustain = shareSustain;
-    }
-  }
-
-  get id() {
-    return `${this.portName} ${this.siblingIndex}`;
-  }
-
-  get stub(): ConfigStub {
-    return {
-      id: this.id,
-      portName: this.portName,
-      driverName: this.driverName,
-      nickname: this.nickname,
-      siblingIndex: this.siblingIndex,
-      isAdapter: true,
-      isSupported: true,
-      isAnonymous: false,
-      isAdapterChildSet: this.child !== undefined,
-      shareSustain: this.shareSustain,
-      child: this.child?.stub,
-    };
-  }
-
   shareWith(id: string) {
     if (this.child) {
       this.child!.shareWith(id);
@@ -154,4 +105,42 @@ export class AdapterDeviceConfig implements SupportedDeviceConfig {
     }
     return undefined;
   }
+
+  get inputs() {
+    if (this.child) {
+      return this.child!.inputs;
+    }
+    return [];
+  }
+
+  get shareSustain() {
+    if (this.child) {
+      return this.child.shareSustain;
+    }
+    return [];
+  }
+
+  set shareSustain(shareSustain: string[]) {
+    if (this.child) {
+      this.child.shareSustain = shareSustain;
+    }
+  }
+
+  get id() {
+    return `${this.portName} ${this.siblingIndex}`;
+  }
+
+  get stub(): ConfigStub {
+    return {
+      id: this.id,
+      portName: this.portName,
+      driverName: this.driverName,
+      nickname: this.nickname,
+      siblingIndex: this.siblingIndex,
+      isAdapter: true,
+      isAnonymous: false,
+      shareSustain: this.shareSustain,
+      child: this.child?.stub,
+    };
+  }
 }

src/shared/hardware-config/anonymous-device-config.ts

@@ -16,7 +16,7 @@ export class AnonymousDeviceConfig extends DeviceConfig {
     shareSustain: string[],
     nickname?: string
   ) {
-    super(portName, 'Anonymous', siblingIndex, false, shareSustain, nickname);
+    super(portName, 'Anonymous', siblingIndex, shareSustain, nickname);
 
     this.overrides = overrides;
   }
@@ -85,9 +85,7 @@ export class AnonymousDeviceConfig extends DeviceConfig {
       nickname: this.nickname,
       siblingIndex: this.siblingIndex,
       isAdapter: false,
-      isSupported: false,
       isAnonymous: true,
-      isAdapterChildSet: false,
       shareSustain: this.shareSustain,
     };
   }

src/shared/hardware-config/device-config.ts

@@ -8,9 +8,7 @@ export type ConfigStub = {
   driverName: string;
   nickname: string;
   isAdapter: boolean;
-  isSupported: boolean;
   isAnonymous: boolean;
-  isAdapterChildSet: boolean;
   shareSustain: string[];
   child?: ConfigStub;
 };
@@ -36,15 +34,6 @@ export abstract class DeviceConfig {
    */
   readonly driverName: string;
 
-  /**
-   * True if a driver exists for the given name. Right now, this only applies to OSX;
-   * driver names vary per-OS, and likely per-OS-MIDI-driver.
-   *
-   * TODO: now that we're allowing lazily-selecting the driver to use on linux,
-   * this description is either inaccurate or `supported` is a flawed concept
-   */
-  readonly supported: boolean;
-
   /* nth-occurence of this device. applicable if > 1 device of same model is connected/configured */
   readonly siblingIndex: number;
 
@@ -68,14 +57,12 @@ export abstract class DeviceConfig {
     portName: string,
     driverName: string,
     siblingIndex: number,
-    supported: boolean,
     shareSustain: string[],
     nickname?: string
   ) {
     this.portName = portName;
     this.driverName = driverName;
     this.siblingIndex = siblingIndex;
-    this.supported = supported;
     this.shareSustain = shareSustain;
     this.#nickname = nickname;
   }

src/shared/hardware-config/supported-device-config.ts

@@ -58,7 +58,7 @@ export class SupportedDeviceConfig extends DeviceConfig {
     nickname?: string,
     keyboardDriver?: KeyboardDriver
   ) {
-    super(name, driverName, siblingIndex, true, shareSustain, nickname);
+    super(name, driverName, siblingIndex, shareSustain, nickname);
     this.inputs = inputs;
     this.keyboardDriver = keyboardDriver;
   }
@@ -149,9 +149,7 @@ export class SupportedDeviceConfig extends DeviceConfig {
       nickname: this.nickname,
       siblingIndex: this.siblingIndex,
       isAdapter: false,
-      isSupported: true,
       isAnonymous: false,
-      isAdapterChildSet: false,
       shareSustain: this.shareSustain,
     };
   }