Add optional chaining to prevent undefined platofmr access

particle-iot · Jan 8, 2025 · d1ac0d4 · d1ac0d4
1 parent 1914154
commit d1ac0d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/device-base.js b/src/device-base.js
@@ -742,10 +742,10 @@ async function getDevices({ types = [], includeDfu = true } = {}) {
 	const filters = [];
 	PLATFORMS.forEach((platform) => {
 		if (types.length === 0 || types.includes(platform.name)) {
-			if (platform.usb.vendorId) {
+			if (platform?.usb?.vendorId) {
 				filters.push(platform.usb);
 			}
-			if (includeDfu && platform.dfu.vendorId) {
+			if (includeDfu && platform?.dfu?.vendorId) {
 				filters.push(platform.dfu);
 			}
 		}
@@ -765,10 +765,10 @@ async function openDeviceById(id, options = null) {
 	const log = globalOptions.log;
 	const filters = [];
 	PLATFORMS.forEach((platform) => {
-		if (platform.usb.vendorId) {
+		if (platform?.usb?.vendorId) {
 			filters.push(Object.assign({ serialNumber: id }, platform.usb));
 		}
-		if (platform.dfu.vendorId) {
+		if (platform?.dfu?.vendorId) {
 			filters.push(Object.assign({ serialNumber: id }, platform.dfu));
 		}
 	});

diff --git a/test/support/fake-usb.js b/test/support/fake-usb.js
@@ -9,17 +9,17 @@ const USB_DEVICES = PLATFORMS.reduce((arr, platform) => {
 		arr.push({
 			type: platform.name,
 			platformId: platform.id,
-			vendorId: platform.usb.vendorId,
-			productId: platform.usb.productId,
+			vendorId: platform?.usb?.vendorId,
+			productId: platform?.usb?.productId,
 			dfu: false
 		});
 	}
 	if (platform.dfu) {
 		arr.push({
 			type: platform.name,
 			platformId: platform.id,
-			vendorId: platform.dfu.vendorId,
-			productId: platform.dfu.productId,
+			vendorId: platform?.dfu?.vendorId,
+			productId: platform?.dfu?.productId,
 			dfu: true
 		});
 	}