fix: simplify USB device configuration checks and firmware error handling

Author: afarago

src/firmware/sagas.ts

@@ -1158,62 +1158,58 @@ function* handleFlashEV3(action: ReturnType<typeof firmwareFlashEV3>): Generator
             }
         });
 
-        try {
-            // Send the command
-            const dataBuffer = new Uint8Array((payload?.byteLength ?? 0) + 6);
-            const data = new DataView(dataBuffer.buffer);
-
-            data.setInt16(0, (payload?.byteLength ?? 0) + 4, true);
-            data.setInt16(2, 0, true); // TODO: reply number
-            data.setUint8(4, 0x01); // system command w/ reply
-            data.setUint8(5, command);
-            if (payload) {
-                dataBuffer.set(payload, 6);
-            }
-
-            const [, sendError] = yield* call(() =>
-                maybe(hidDevice.sendReport(0, data)),
-            );
+        // Send the command
+        const dataBuffer = new Uint8Array((payload?.byteLength ?? 0) + 6);
+        const data = new DataView(dataBuffer.buffer);
+
+        data.setInt16(0, (payload?.byteLength ?? 0) + 4, true);
+        data.setInt16(2, 0, true); // TODO: reply number
+        data.setUint8(4, 0x01); // system command w/ reply
+        data.setUint8(5, command);
+        if (payload) {
+            dataBuffer.set(payload, 6);
+        }
 
-            if (sendError) {
-                return [undefined, sendError];
-            }
+        const [, sendError] = yield* call(() => maybe(hidDevice.sendReport(0, data)));
 
-            const { reply, timeout } = yield* race({
-                reply: take(replyChannel),
-                timeout: delay(5000),
-            });
+        if (sendError) {
+            return [undefined, sendError];
+        }
 
-            if (timeout) {
-                return [undefined, new Error('Timeout waiting for EV3 reply')];
-            }
+        const { reply, timeout } = yield* race({
+            reply: take(replyChannel),
+            timeout: delay(5000),
+        });
 
-            defined(reply);
+        if (timeout) {
+            return [undefined, new Error('Timeout waiting for EV3 reply')];
+        }
 
-            if (reply.replyCommand !== command) {
-                return [
-                    undefined,
-                    new Error(
-                        `EV3 reply command mismatch: expected ${command}, got ${reply.replyCommand}`,
-                    ),
-                ];
-            }
+        defined(reply);
 
-            if (reply.status !== 0) {
-                return [
-                    undefined,
-                    new Error(
-                        `EV3 reply status error: ${reply.status} for command ${command}`,
-                    ),
-                ];
-            }
+        if (reply.replyCommand !== command) {
+            return [
+                undefined,
+                new Error(
+                    `EV3 reply command mismatch: expected ${command}, got ${reply.replyCommand}`,
+                ),
+            ];
+        }
 
-            return [new DataView(reply.payload), undefined];
-        } finally {
-            // Always clean up
-            yield* cancel(forwardTask);
-            yield* call(() => replyChannel.close());
+        if (reply.status !== 0) {
+            return [
+                undefined,
+                new Error(
+                    `EV3 reply status error: ${reply.status} for command ${command}`,
+                ),
+            ];
         }
+
+        // Clean up
+        yield* cancel(forwardTask);
+        yield* call(() => replyChannel.close());
+
+        return [new DataView(reply.payload), undefined];
     }
 
     const [version, versionError] = yield* sendCommand(0xf6); // get version

src/usb/sagas.ts

@@ -165,10 +165,7 @@ function* handleUsbConnectPybricks(hotPlugDevice?: USBDevice): Generator {
     // configuration and it is already selected and that it contains a Pybricks
     // interface.
 
-    if (
-        (usbDevice.configuration === undefined || usbDevice.configuration === null) &&
-        usbDevice.configurations.length > 0
-    ) {
+    if (!usbDevice.configuration && usbDevice.configurations.length > 0) {
         const [, selectErr] = yield* call(() =>
             maybe(
                 usbDevice.selectConfiguration(
@@ -186,10 +183,7 @@ function* handleUsbConnectPybricks(hotPlugDevice?: USBDevice): Generator {
         }
     }
 
-    assert(
-        usbDevice.configuration !== undefined && usbDevice.configuration !== null,
-        'USB device configuration is undefined',
-    );
+    assert(!!usbDevice.configuration, 'USB device configuration is undefined');
     assert(
         usbDevice.configuration.interfaces.length > 0,
         'USB device has no interfaces',