Uniquely identify a device is of type UsbDevice

particle-iot · Aug 9, 2024 · 421bc1b · 421bc1b
1 parent 86a7665
commit 421bc1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/cmd/keys.js b/src/cmd/keys.js
@@ -370,7 +370,6 @@ module.exports = class KeysCommand {
 
 		console.log();
 		console.log(url.format(result));
-		return result;
 	}
 
 	_getServerKeySegment({ protocol }){

diff --git a/src/cmd/usb-util.js b/src/cmd/usb-util.js
@@ -137,7 +137,10 @@ async function executeWithUsbDevice({ args, func, enterDfuMode = false, allowPro
 		}
 		newDeviceHandle = await func(device);
 		// Overwrite device handle if it is provided by the executed function
-		device = newDeviceHandle || device;
+		// FIXME: Perhaps a poor way to uniquely identify a device is of UsbDevice type
+		if (newDeviceHandle?._dev) {
+			device = newDeviceHandle;
+		}
 	} finally {
 		if (deviceIsProtected) {
 			try {

diff --git a/src/cmd/usb.js b/src/cmd/usb.js
@@ -207,7 +207,7 @@ module.exports = class UsbCommand extends CLICommandBase {
 
 	async _cloudStatus(device, until, timeout) {
 		let status = null;
-		
+
 		this.newSpin('Querying device...').start();
 		if (!until) {
 			status = await device.getCloudConnectionStatus();