Feature/sc 124322/protected error

package.json

@@ -102,7 +102,7 @@
     "sinon-chai": "^3.3.0"
   },
   "optionalDependencies": {
-    "particle-usb": "^2.5.0",
+    "particle-usb": "^2.5.1",
     "serialport": "^9.2.8"
   },
   "engines": {

src/cmd/keys.js

@@ -14,6 +14,7 @@ const { errors: { usageError } } = require('../app/command-processor');
 const UI = require('../lib/ui');
 const ParticleApi = require('./api');
 const { validateDFUSupport } = require('../lib/flash-helper');
+const { DeviceProtectionError } = require('../lib/require-optional')('particle-usb');
 
 /**
  * Commands for managing encryption keys.
@@ -501,16 +502,30 @@ module.exports = class KeysCommand {
 	}
 
 	async _dfuWrite(device, buffer, { altSetting, startAddr, leave, noErase }) {
-		await device.writeOverDfu(buffer, { altSetting, startAddr, leave, noErase });
+		try {
+			await device.writeOverDfu(buffer, { altSetting, startAddr, leave, noErase });
+		} catch (err) {
+			if (err instanceof DeviceProtectionError) {
+				throw new Error('Operation could not be completed due to device protection.');
+			}
+			throw new VError(ensureError(err), 'Writing over DFU failed');
+		}
 	}
 
 	async _dfuRead(device, { altSetting, startAddr, size }) {
 		let buf;
 		try {
 			buf = await device.readOverDfu({ altSetting, startAddr, size });
 		} catch (err) {
+			if (err instanceof DeviceProtectionError) {
+				throw new Error('Operation could not be completed due to device protection.');
+			}
 			// FIXME: First time read may fail so we retry
-			buf = await device.readOverDfu({ altSetting, startAddr, size });
+			try {
+				buf = await device.readOverDfu({ altSetting, startAddr, size });
+			} catch (err) {
+				throw new VError(ensureError(err), 'Reading over DFU failed');
+			}
 		}
 		return buf;
 	}

src/lib/flash-helper.js

@@ -1,19 +1,24 @@
 const _ = require('lodash');
 const usbUtils = require('../cmd/usb-util');
 const { delay } = require('./utilities');
+const VError = require('verror');
 const { PLATFORMS, platformForId } =require('./platform');
 const { moduleTypeFromNumber, sortBinariesByDependency } = require('./dependency-walker');
 const { HalModuleParser: ModuleParser, ModuleInfo } = require('binary-version-reader');
 const path = require('path');
 const fs = require('fs-extra');
 const os = require('os');
 const semver = require('semver');
+const { DeviceProtectionError } = require('../lib/require-optional')('particle-usb');
+const utilities = require('./utilities');
+const ensureError = utilities.ensureError;
 
 // Flashing an NCP firmware can take a few minutes
 const FLASH_TIMEOUT = 4 * 60000;
 
 async function flashFiles({ device, flashSteps, resetAfterFlash = true, ui }) {
 	const progress = _createFlashProgress({ flashSteps, ui });
+	let success = false;
 	try {
 		for (const step of flashSteps) {
 			device = await prepareDeviceForFlash({ device, mode: step.flashMode, progress });
@@ -25,8 +30,9 @@ async function flashFiles({ device, flashSteps, resetAfterFlash = true, ui }) {
 				device = await _flashDeviceInDfuMode(device, step.data, { name: step.name, altSetting: altSetting, startAddr: step.address, progress: progress });
 			}
 		}
+		success = true;
 	} finally {
-		progress({ event: 'finish' });
+		progress({ event: 'finish', success });
 		if (device.isOpen) {
 			if (resetAfterFlash) {
 				try {
@@ -59,7 +65,10 @@ async function _flashDeviceInNormalMode(device, data, { name, progress, checkSki
 			await device.updateFirmware(data, { progress, timeout: FLASH_TIMEOUT });
 			return device;
 		} catch (error) {
-			// ignore error from attempts to flash to external flash
+			// ignore other errors from attempts to flash to external flash
+			if (error instanceof DeviceProtectionError) {
+				throw new Error('Operation could not be completed due to device protection.');
+			}
 		}
 	}
 	throw new Error('Unable to flash device');
@@ -109,7 +118,15 @@ async function _flashDeviceInDfuMode(device, data, { name, altSetting, startAddr
 	if (progress) {
 		progress({ event: 'flash-file', filename: name });
 	}
-	await device.writeOverDfu(data, { altSetting, startAddr: startAddr, progress });
+
+	try {
+		await device.writeOverDfu(data, { altSetting, startAddr: startAddr, progress });
+	} catch (error) {
+		if (error instanceof DeviceProtectionError) {
+			throw new Error('Operation could not be completed due to device protection.');
+		}
+		throw new VError(ensureError(error), 'Writing over DFU failed');
+	}
 	return device;
 }
 
@@ -177,7 +194,7 @@ function _createFlashProgress({ flashSteps, ui }) {
 				}
 				break;
 			case 'finish':
-				description = 'Flash success!';
+				description = payload.success ? 'Flash success!' : 'Flash failed.';
 				if (isInteractive) {
 					progressBar.update({ description });
 					progressBar.stop();