eliminate keyboard requirement for sustain share targets

release/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "super-controller",
   "productName": "SuperController",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "Give your MIDI devices super powers; take control of the lights, messages, and communications between controllers.",
   "main": "./dist/main/main.js",
   "author": {

src/main/port-service/index.ts

@@ -155,19 +155,22 @@ export class PortService {
 
   /**
    * Send sustain events from all devices shareWith on the same channel as their
-   * respective keyboards
+   * respective keyboards if exist, otherwise default channel
    *
    * @param msg The event from the device
    * @param The list of ids with which sustain events are being shared
    */
   #handleSustain = (msg: number[], shareWith: string[]) => {
+    let m = msg;
+
     shareWith.forEach((devId) => {
       const device = this.#project.getDevice(devId);
 
       if (device?.keyboardDriver !== undefined) {
-        const updated = setChannel(msg, device.keyboardDriver.channel);
-        this.#virtService.send(updated, devId);
+        m = setChannel(msg, device.keyboardDriver.channel);
       }
+
+      this.#virtService.send(m, devId);
     });
   };
 
@@ -187,7 +190,8 @@ export class PortService {
       const [toDevice, toPropagate] = device.handleMessage(msg);
 
       // send sustain events thru all virtual ports in config
-      if (isSustain(msg)) this.#handleSustain(msg, device.shareSustain);
+      if (toPropagate && isSustain(toPropagate))
+        this.#handleSustain(toPropagate, device.shareSustain);
 
       // propagate the msg thru virtual port to clients
       if (toPropagate) this.#virtService.send(toPropagate, device.id);

src/renderer/components/ConfigPanel/DeviceConfigPanel.tsx

@@ -7,6 +7,18 @@ import ShareSustainLine from './ShareSustainLine';
 
 const { ipcRenderer } = window;
 
+function disambiguatedNickname(
+  nickname: string,
+  name: string,
+  siblingIndex: number
+) {
+  if (nickname === name) {
+    return siblingIndex === 0 ? name : `${name} (${siblingIndex})`;
+  }
+
+  return nickname;
+}
+
 /**
  * List of all devices eligible to share sustain events
  *
@@ -18,21 +30,24 @@ const { ipcRenderer } = window;
 function ShareSustain(props: PropTypes) {
   const { config, project, setProject } = props;
 
-  // get all devices which are eligible for sharing sustain
+  // get all devices which aren't this device
   const shareableDevices = project.devices.filter(
-    (dev) => dev.id !== config.id && dev.keyboardDriver !== undefined
+    (dev) => dev.id !== config.id
   );
 
-  if (config.keyboardDriver === undefined || shareableDevices.length === 0)
-    return null;
+  if (shareableDevices.length === 0) return null;
 
   return (
     <>
       <h4>Share sustain:</h4>
       {shareableDevices.map((dev) => {
         return (
           <ShareSustainLine
-            name={dev.nickname}
+            name={disambiguatedNickname(
+              dev.nickname,
+              dev.name,
+              dev.siblingIndex
+            )}
             key={dev.id}
             value={config.sharingWith(dev.id)}
             onChange={(checked) => {