Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify the generic helper that takes care of Protected Devices #759

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Simplify the generic helper that takes care of Protected Devices #759

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ebcd6c
Expect device to be ready to run a control request after CLI op finishes
keeramis Jul 31, 2024
e5da90e
lint fix
keeramis Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions src/cmd/usb-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,29 @@ class UsbPermissionsError extends Error {
async function executeWithUsbDevice({ args, func, dfuMode = false } = {}) {
let device = await getOneUsbDevice(args, { dfuMode });
let deviceIsProtected = false;
try {
const s = await deviceProtectionHelper.getProtectionStatus(device);
deviceIsProtected = s.protected && !s.overrridden;
} catch (err) {
if (err.message === 'Not supported') {
// Device Protection is not supported on certain platforms and versions.
// It means that the device is not protected.
}
throw err;
}
if (deviceIsProtected) {
const deviceWasInDfuMode = device.isInDfuMode;
if (deviceWasInDfuMode) {
device = await _putDeviceInSafeMode(device);

const platform = platformForId(device.platformId);
if (platform.generation > 2) { // Skipping device protection check for Gen2 platforms
try {
const s = await deviceProtectionHelper.getProtectionStatus(device);
deviceIsProtected = s.protected && !s.overrridden;
} catch (err) {
if (err.message === 'Not supported') {
// Device Protection is not supported on certain platforms and versions.
// It means that the device is not protected.
} else {
throw err;
}
}
await deviceProtectionHelper.disableDeviceProtection(device);
if (deviceWasInDfuMode) {
device = await reopenInDfuMode(device);
if (deviceIsProtected) {
const deviceWasInDfuMode = device.isInDfuMode;
if (deviceWasInDfuMode) {
device = await _putDeviceInSafeMode(device);
}
await deviceProtectionHelper.disableDeviceProtection(device);
if (deviceWasInDfuMode) {
device = await reopenInDfuMode(device);
}
}
}

Expand All @@ -123,15 +128,11 @@ async function executeWithUsbDevice({ args, func, dfuMode = false } = {}) {
res = await func(device);
} finally {
if (deviceIsProtected) {
device = await reopenDevice(device);
if (!device.isInDfuMode) {
device = await waitForDeviceToReboot(device);
}
try {
// Only works for 6.1.2 and later
// 'device' has finished the CLI command and is now ready to run this command
await deviceProtectionHelper.turnOffServiceMode(device);
} catch (error) {
// FIXME: ignore errors
// Ignore error. At most, device is left in Service Mode
}
}
if (device && device.isOpen) {
Expand All @@ -147,9 +148,9 @@ async function executeWithUsbDevice({ args, func, dfuMode = false } = {}) {
* @param {*} deviceId
* @returns
*/
async function waitForDeviceToReboot(device) {
async function waitForDeviceToRespond(device) {
const deviceId = device.id;
const REBOOT_TIME_MSEC = 60000;
const REBOOT_TIME_MSEC = 20000;
const REBOOT_INTERVAL_MSEC = 1000;
const start = Date.now();
if (device.isOpen) {
Expand Down Expand Up @@ -550,5 +551,5 @@ module.exports = {
forEachUsbDevice,
openUsbDevices,
executeWithUsbDevice,
waitForDeviceToReboot
waitForDeviceToRespond
};
Loading