@onekeyfe/hd-core 1.2.0 → 1.2.1

package/__tests__/firmware-update/firmware-update-v4-install-poll.test.ts

@@ -335,7 +335,97 @@ describe('FirmwareUpdateV4 install polling', () => {
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 
-  test('accepts stable finished BLE status after an actual install disconnect hides in-progress', async () => {
+  test.each([
+    {
+      component: 'boot',
+      targets: [{ target_id: 3, path: 'vol0:/bootloader.bin' }],
+    },
+    {
+      component: 'P1',
+      targets: [{ target_id: 4, path: 'vol0:/application_p1.bin' }],
+    },
+    {
+      component: 'P2',
+      targets: [{ target_id: 5, path: 'vol0:/application_p2.bin' }],
+    },
+    {
+      component: 'coprocessor',
+      targets: [{ target_id: 6, path: 'vol0:/coprocessor.bin' }],
+    },
+    {
+      component: 'SE',
+      targets: [
+        { target_id: 7, path: 'vol0:/se01.bin' },
+        { target_id: 8, path: 'vol0:/se02.bin' },
+        { target_id: 9, path: 'vol0:/se03.bin' },
+        { target_id: 10, path: 'vol0:/se04.bin' },
+      ],
+    },
+  ])(
+    'accepts stable finished BLE status for $component after an actual install disconnect hides in-progress',
+    async ({ targets }) => {
+      const method = new FirmwareUpdateV4({
+        id: 1,
+        payload: {
+          method: 'firmwareUpdateV4',
+          connectId: 'pro2-ble',
+        },
+      });
+      const finishedStatus = {
+        type: 'DeviceFirmwareUpdateStatus',
+        message: {
+          records: targets.map(target => ({
+            ...target,
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+          })),
+        },
+      };
+      const typedCall = jest
+        .fn()
+        .mockResolvedValueOnce(finishedStatus)
+        .mockImplementationOnce(() => {
+          expect(method.postProgressMessage).not.toHaveBeenCalled();
+          throw new Error('device was disconnected');
+        })
+        .mockResolvedValueOnce(finishedStatus)
+        .mockImplementationOnce(() => {
+          expect(method.postProgressMessage).toHaveBeenCalledTimes(1);
+          expect(method.postProgressMessage).toHaveBeenCalledWith(1, 'installingFirmware');
+          return finishedStatus;
+        })
+        .mockResolvedValueOnce(finishedStatus)
+        .mockResolvedValueOnce(finishedStatus)
+        .mockRejectedValueOnce(ERRORS.TypedError(HardwareErrorCode.ActionCancelled));
+      const reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
+
+      method.device = {
+        getCommands: () => ({ typedCall }),
+        setCancelableAction: jest.fn(),
+      } as unknown as Device;
+      method.postProgressMessage = jest.fn();
+
+      const firmwareUpdate = method as unknown as {
+        waitForProtocolV2FirmwareUpdateComplete: (
+          value: typeof targets,
+          requireCurrentInstallStatus: boolean
+        ) => Promise<void>;
+        reconnectProtocolV2Device: (options: { skipProtocolProbe: boolean }) => Promise<void>;
+      };
+      firmwareUpdate.reconnectProtocolV2Device = reconnectProtocolV2Device;
+      (method as any).isBleReconnect = jest.fn(() => true);
+
+      await firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+
+      expect(reconnectProtocolV2Device).toHaveBeenCalledWith({ skipProtocolProbe: true });
+      expect(typedCall).toHaveBeenCalledTimes(6);
+      expect(method.postProgressMessage).toHaveBeenNthCalledWith(1, 1, 'installingFirmware');
+      expect(method.postProgressMessage).toHaveBeenNthCalledWith(2, 100, 'installingFirmware');
+      expect(method.postProgressMessage).toHaveBeenCalledTimes(2);
+    },
+    10_000
+  );
+
+  test('uses a real BLE disconnect while writing the Request as install evidence', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -343,49 +433,41 @@ describe('FirmwareUpdateV4 install polling', () => {
         connectId: 'pro2-ble',
       },
     });
-    const targets = [{ target_id: 6, path: 'vol0:/coprocessor.bin' }];
+    const targets = [{ target_id: 3, path: 'vol0:/bootloader.bin' }];
     const finishedStatus = {
       type: 'DeviceFirmwareUpdateStatus',
       message: {
         records: [
           {
-            target_id: 6,
+            ...targets[0],
             status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
-            payload_version: 65_556,
-            path: 'vol0:/coprocessor.bin',
           },
         ],
       },
     };
     const typedCall = jest
       .fn()
+      .mockResolvedValueOnce({ type: 'Success', message: {} })
       .mockResolvedValueOnce(finishedStatus)
-      .mockImplementationOnce(() => {
-        expect(method.postProgressMessage).not.toHaveBeenCalled();
-        throw new Error('device was disconnected');
-      })
       .mockResolvedValueOnce(finishedStatus)
-      .mockImplementationOnce(() => {
-        expect(method.postProgressMessage).toHaveBeenCalledTimes(1);
-        expect(method.postProgressMessage).toHaveBeenCalledWith(1, 'installingFirmware');
-        return finishedStatus;
-      })
       .mockResolvedValueOnce(finishedStatus)
       .mockResolvedValueOnce(finishedStatus)
       .mockRejectedValueOnce(ERRORS.TypedError(HardwareErrorCode.ActionCancelled));
+    const call = jest.fn().mockRejectedValue(ERRORS.TypedError(HardwareErrorCode.BleTimeoutError));
     const reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
 
-    (method as any).params = {
-      expectedTargetVersions: { coprocessor: '1.0.20' },
-    };
-
     method.device = {
-      getCommands: () => ({ typedCall }),
+      getCommands: () => ({ typedCall, call, cancelDevice: jest.fn() }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2-ble' }),
       setCancelableAction: jest.fn(),
+      clearCancelableAction: jest.fn(),
     } as unknown as Device;
+    method.postMessage = jest.fn();
     method.postProgressMessage = jest.fn();
 
     const firmwareUpdate = method as unknown as {
+      protocolV2StartFirmwareUpdate: (params: { targets: typeof targets }) => Promise<void>;
       waitForProtocolV2FirmwareUpdateComplete: (
         value: typeof targets,
         requireCurrentInstallStatus: boolean
@@ -395,15 +477,234 @@ describe('FirmwareUpdateV4 install polling', () => {
     firmwareUpdate.reconnectProtocolV2Device = reconnectProtocolV2Device;
     (method as any).isBleReconnect = jest.fn(() => true);
 
+    await firmwareUpdate.protocolV2StartFirmwareUpdate({ targets });
     await firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true);
 
     expect(reconnectProtocolV2Device).toHaveBeenCalledWith({ skipProtocolProbe: true });
-    expect(typedCall).toHaveBeenCalledTimes(6);
     expect(method.postProgressMessage).toHaveBeenNthCalledWith(1, 1, 'installingFirmware');
     expect(method.postProgressMessage).toHaveBeenNthCalledWith(2, 100, 'installingFirmware');
-    expect(method.postProgressMessage).toHaveBeenCalledTimes(2);
+    expect(typedCall).toHaveBeenCalledTimes(5);
+  }, 10_000);
+
+  test('does not use a Request response timeout as BLE install evidence', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+        connectId: 'pro2-ble',
+      },
+    });
+    const targets = [{ target_id: 3, path: 'vol0:/bootloader.bin' }];
+    const finishedStatus = {
+      type: 'DeviceFirmwareUpdateStatus',
+      message: {
+        records: [
+          {
+            ...targets[0],
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+          },
+        ],
+      },
+    };
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce({ type: 'Success', message: {} })
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockRejectedValueOnce(ERRORS.TypedError(HardwareErrorCode.ActionCancelled));
+    const call = jest
+      .fn()
+      .mockRejectedValue(
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          'device was disconnected after Lowlevel response timeout'
+        )
+      );
+    const reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
+
+    method.device = {
+      getCommands: () => ({ typedCall, call, cancelDevice: jest.fn() }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2-ble' }),
+      setCancelableAction: jest.fn(),
+      clearCancelableAction: jest.fn(),
+    } as unknown as Device;
+    method.postMessage = jest.fn();
+    method.postProgressMessage = jest.fn();
+
+    const firmwareUpdate = method as unknown as {
+      protocolV2StartFirmwareUpdate: (params: { targets: typeof targets }) => Promise<void>;
+      waitForProtocolV2FirmwareUpdateComplete: (
+        value: typeof targets,
+        requireCurrentInstallStatus: boolean
+      ) => Promise<void>;
+      reconnectProtocolV2Device: (options: { skipProtocolProbe: boolean }) => Promise<void>;
+    };
+    firmwareUpdate.reconnectProtocolV2Device = reconnectProtocolV2Device;
+    (method as any).isBleReconnect = jest.fn(() => true);
+
+    await firmwareUpdate.protocolV2StartFirmwareUpdate({ targets });
+    await expect(
+      firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true)
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.ActionCancelled,
+    });
+
+    expect(reconnectProtocolV2Device).toHaveBeenCalledWith({ skipProtocolProbe: true });
+    expect(method.postProgressMessage).not.toHaveBeenCalled();
   }, 10_000);
 
+  test('records a real BLE disconnect that occurs during install reconnect', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+        connectId: 'pro2-ble',
+      },
+    });
+    const targets = [{ target_id: 3, path: 'vol0:/bootloader.bin' }];
+    const finishedStatus = {
+      type: 'DeviceFirmwareUpdateStatus',
+      message: {
+        records: [
+          {
+            ...targets[0],
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+          },
+        ],
+      },
+    };
+    const typedCall = jest
+      .fn()
+      .mockRejectedValueOnce(
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          'Lowlevel response timeout after 15000ms for DeviceFirmwareUpdateStatusGet'
+        )
+      )
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus);
+    const reconnectProtocolV2Device = jest
+      .fn()
+      .mockRejectedValueOnce(ERRORS.TypedError(HardwareErrorCode.BleTimeoutError))
+      .mockResolvedValueOnce(undefined);
+    const setTimeoutSpy = jest.spyOn(global, 'setTimeout').mockImplementation(((
+      callback: () => void
+    ) => {
+      callback();
+      return 0 as any;
+    }) as typeof setTimeout);
+
+    method.device = {
+      getCommands: () => ({ typedCall, cancelDevice: jest.fn() }),
+      setCancelableAction: jest.fn(),
+    } as unknown as Device;
+    method.postProgressMessage = jest.fn();
+
+    const firmwareUpdate = method as unknown as {
+      waitForProtocolV2FirmwareUpdateComplete: (
+        value: typeof targets,
+        requireCurrentInstallStatus: boolean
+      ) => Promise<void>;
+      reconnectProtocolV2Device: (options: { skipProtocolProbe: boolean }) => Promise<void>;
+    };
+    firmwareUpdate.reconnectProtocolV2Device = reconnectProtocolV2Device;
+    (method as any).isBleReconnect = jest.fn(() => true);
+
+    try {
+      await firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+    } finally {
+      setTimeoutSpy.mockRestore();
+    }
+
+    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(2);
+    expect(method.postProgressMessage).toHaveBeenNthCalledWith(1, 1, 'installingFirmware');
+    expect(method.postProgressMessage).toHaveBeenNthCalledWith(2, 100, 'installingFirmware');
+  });
+
+  test('does not use a reconnect response timeout as BLE install evidence', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+        connectId: 'pro2-ble',
+      },
+    });
+    const targets = [{ target_id: 3, path: 'vol0:/bootloader.bin' }];
+    const finishedStatus = {
+      type: 'DeviceFirmwareUpdateStatus',
+      message: {
+        records: [
+          {
+            ...targets[0],
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+          },
+        ],
+      },
+    };
+    const typedCall = jest
+      .fn()
+      .mockRejectedValueOnce(
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          'Lowlevel response timeout after 15000ms for DeviceFirmwareUpdateStatusGet'
+        )
+      )
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockResolvedValueOnce(finishedStatus)
+      .mockRejectedValueOnce(ERRORS.TypedError(HardwareErrorCode.ActionCancelled));
+    const reconnectProtocolV2Device = jest
+      .fn()
+      .mockRejectedValueOnce(
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          'device was disconnected after Lowlevel response timeout'
+        )
+      )
+      .mockResolvedValueOnce(undefined);
+    const setTimeoutSpy = jest.spyOn(global, 'setTimeout').mockImplementation(((
+      callback: () => void
+    ) => {
+      callback();
+      return 0 as any;
+    }) as typeof setTimeout);
+
+    method.device = {
+      getCommands: () => ({ typedCall, cancelDevice: jest.fn() }),
+      setCancelableAction: jest.fn(),
+    } as unknown as Device;
+    method.postProgressMessage = jest.fn();
+
+    const firmwareUpdate = method as unknown as {
+      waitForProtocolV2FirmwareUpdateComplete: (
+        value: typeof targets,
+        requireCurrentInstallStatus: boolean
+      ) => Promise<void>;
+      reconnectProtocolV2Device: (options: { skipProtocolProbe: boolean }) => Promise<void>;
+    };
+    firmwareUpdate.reconnectProtocolV2Device = reconnectProtocolV2Device;
+    (method as any).isBleReconnect = jest.fn(() => true);
+
+    try {
+      await expect(
+        firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true)
+      ).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.ActionCancelled,
+      });
+    } finally {
+      setTimeoutSpy.mockRestore();
+    }
+
+    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(2);
+    expect(method.postProgressMessage).not.toHaveBeenCalled();
+  });
+
   test('rejects stable stale finished BLE status after a status response timeout', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,

package/__tests__/protocol-v2.test.ts

@@ -5686,6 +5686,7 @@ describe('Protocol V2 firmware update targets', () => {
     );
     expect(typedCall).not.toHaveBeenCalledWith('DeviceFirmwareUpdateRequest', 'Success', {});
     expect((method as any).protocolV2InstallNeedsReconnect).toBe(true);
+    expect((method as any).protocolV2InstallDisconnectObserved).toBe(true);
   });
 
   test.each([

package/dist/api/FirmwareUpdateV4.d.ts

@@ -18,6 +18,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private protocolV2LatestFinalDeviceInfo?;
     private protocolV2InstallBaselineVersions;
     private protocolV2InstallNeedsReconnect;
+    private protocolV2InstallDisconnectObserved;
     private protocolV2InstallTerminalSuccessObserved;
     private protocolV2LastRuntimeProbeFeatures?;
     private protocolV2LastTransferProgress?;

package/dist/api/FirmwareUpdateV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -52302,6 +52302,13 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
         message.includes('message handler not found') ||
         message.includes('unsupported message'));
 };
+const isProtocolV2InstallResponseTimeout = (error) => {
+    if (!error || typeof error !== 'object')
+        return false;
+    const { code } = error;
+    return (code === 'response-timeout' ||
+        /\bresponse timeout\b/i.test(getProtocolV2UnknownErrorText(error)));
+};
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return hdShared.isBleStaleBondHardwareError(error) ||
@@ -52429,6 +52436,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2CompletedTargetIds = new Set();
         this.protocolV2InstallBaselineVersions = new Map();
         this.protocolV2InstallNeedsReconnect = false;
+        this.protocolV2InstallDisconnectObserved = false;
         this.protocolV2InstallTerminalSuccessObserved = false;
         this.protocolV2LastTransferProgressAt = 0;
     }
@@ -53899,15 +53907,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const expectedTargetIds = new Set(targets.map(target => target.target_id));
             const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
-            const isBleCoprocessorInstall = this.isBleReconnect() &&
-                expectedTargetIds.has(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR);
+            const isBleInstall = this.isBleReconnect();
             const startTime = Date.now();
             let lastError;
             let shouldReconnect = this.protocolV2InstallNeedsReconnect;
             this.protocolV2InstallNeedsReconnect = false;
             let deviceInfo;
             let bleInstallLinkReady = false;
-            let installStatusDisconnectObserved = false;
+            let installStatusDisconnectObserved = isBleInstall && this.protocolV2InstallDisconnectObserved;
+            this.protocolV2InstallDisconnectObserved = false;
             let installReconnectObserved = false;
             let finishedStatusSnapshotKey;
             let finishedStatusSnapshotPolls = 0;
@@ -53915,6 +53923,17 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let installEvidenceObserved = this.protocolV2InstallTerminalSuccessObserved;
             let currentInstallStatusObserved = false;
             const liveTargetIds = new Set();
+            const recordBleInstallDisconnect = (error) => {
+                if (!isBleInstall ||
+                    !isProtocolV2DeviceDisconnectedError(error) ||
+                    isProtocolV2InstallResponseTimeout(error)) {
+                    return;
+                }
+                installStatusDisconnectObserved = true;
+                installReconnectObserved = false;
+                finishedStatusSnapshotKey = undefined;
+                finishedStatusSnapshotPolls = 0;
+            };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 this.throwIfAborted();
                 try {
@@ -54101,13 +54120,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         else {
-                            if (isBleCoprocessorInstall &&
-                                isProtocolV2DeviceDisconnectedError(error) &&
-                                !isProtocolV2ResponseTimeout(error)) {
-                                installStatusDisconnectObserved = true;
-                                finishedStatusSnapshotKey = undefined;
-                                finishedStatusSnapshotPolls = 0;
-                            }
+                            recordBleInstallDisconnect(error);
                             shouldReconnect = true;
                             deviceInfo = undefined;
                             bleInstallLinkReady = false;
@@ -54128,6 +54141,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         ((_b = error.params) === null || _b === void 0 ? void 0 : _b.firmwareUpdateCode) === 'FirmwareInstallStatusUnavailable') {
                         throw error;
                     }
+                    recordBleInstallDisconnect(error);
                     shouldReconnect = true;
                     deviceInfo = undefined;
                     bleInstallLinkReady = false;
@@ -54377,6 +54391,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             this.protocolV2LastRuntimeProbeFeatures = undefined;
             this.protocolV2InstallNeedsReconnect = false;
+            this.protocolV2InstallDisconnectObserved = false;
             this.protocolV2InstallTerminalSuccessObserved = false;
             const commands = this.device.getCommands();
             yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
@@ -54404,6 +54419,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
                 Log$6.log('[FirmwareUpdateV4] transport released while writing install request; continue status polling');
                 this.protocolV2InstallNeedsReconnect = true;
+                this.protocolV2InstallDisconnectObserved = !isProtocolV2InstallResponseTimeout(error);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0",
-    "@onekeyfe/hd-transport": "1.2.0",
+    "@onekeyfe/hd-shared": "1.2.1",
+    "@onekeyfe/hd-transport": "1.2.1",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "cc51df0a415bead21304ad1d8bc92b5312c91344"
+  "gitHead": "43d2856e593a93fbf056fdb334e0fe407a79cdc0"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -374,6 +374,15 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error: unknown) => {
   );
 };
 
+const isProtocolV2InstallResponseTimeout = (error: unknown) => {
+  if (!error || typeof error !== 'object') return false;
+  const { code } = error as { code?: number | string };
+  return (
+    code === 'response-timeout' ||
+    /\bresponse timeout\b/i.test(getProtocolV2UnknownErrorText(error))
+  );
+};
+
 const isProtocolV2TerminalInstallStatusError = (error: unknown) =>
   isBleStaleBondHardwareError(error) ||
   (error instanceof HardwareError &&
@@ -565,6 +574,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private protocolV2InstallNeedsReconnect = false;
 
+  private protocolV2InstallDisconnectObserved = false;
+
   private protocolV2InstallTerminalSuccessObserved = false;
 
   private protocolV2LastRuntimeProbeFeatures?: Features;
@@ -2517,9 +2528,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   ) {
     const expectedTargetIds = new Set(targets.map(target => target.target_id));
     const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
-    const isBleCoprocessorInstall =
-      this.isBleReconnect() &&
-      expectedTargetIds.has(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR);
+    const isBleInstall = this.isBleReconnect();
     const startTime = Date.now();
     let lastError: unknown;
     // The loader may release either USB or BLE as installation starts. Recovery reconnects
@@ -2528,7 +2537,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.protocolV2InstallNeedsReconnect = false;
     let deviceInfo: ProtocolV2DeviceInfo | undefined;
     let bleInstallLinkReady = false;
-    let installStatusDisconnectObserved = false;
+    let installStatusDisconnectObserved = isBleInstall && this.protocolV2InstallDisconnectObserved;
+    this.protocolV2InstallDisconnectObserved = false;
     let installReconnectObserved = false;
     let finishedStatusSnapshotKey: string | undefined;
     let finishedStatusSnapshotPolls = 0;
@@ -2536,6 +2546,19 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     let installEvidenceObserved = this.protocolV2InstallTerminalSuccessObserved;
     let currentInstallStatusObserved = false;
     const liveTargetIds = new Set<number>();
+    const recordBleInstallDisconnect = (error: unknown) => {
+      if (
+        !isBleInstall ||
+        !isProtocolV2DeviceDisconnectedError(error) ||
+        isProtocolV2InstallResponseTimeout(error)
+      ) {
+        return;
+      }
+      installStatusDisconnectObserved = true;
+      installReconnectObserved = false;
+      finishedStatusSnapshotKey = undefined;
+      finishedStatusSnapshotPolls = 0;
+    };
 
     while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
       // A transport release caused by an explicit workflow cancellation must not
@@ -2787,15 +2810,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               );
             }
           } else {
-            if (
-              isBleCoprocessorInstall &&
-              isProtocolV2DeviceDisconnectedError(error) &&
-              !isProtocolV2ResponseTimeout(error)
-            ) {
-              installStatusDisconnectObserved = true;
-              finishedStatusSnapshotKey = undefined;
-              finishedStatusSnapshotPolls = 0;
-            }
+            recordBleInstallDisconnect(error);
             shouldReconnect = true;
             deviceInfo = undefined;
             bleInstallLinkReady = false;
@@ -2820,6 +2835,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         ) {
           throw error;
         }
+        recordBleInstallDisconnect(error);
         shouldReconnect = true;
         deviceInfo = undefined;
         bleInstallLinkReady = false;
@@ -3154,6 +3170,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }) {
     this.protocolV2LastRuntimeProbeFeatures = undefined;
     this.protocolV2InstallNeedsReconnect = false;
+    this.protocolV2InstallDisconnectObserved = false;
     this.protocolV2InstallTerminalSuccessObserved = false;
     const commands = this.device.getCommands();
     await commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
@@ -3196,6 +3213,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         '[FirmwareUpdateV4] transport released while writing install request; continue status polling'
       );
       this.protocolV2InstallNeedsReconnect = true;
+      this.protocolV2InstallDisconnectObserved = !isProtocolV2InstallResponseTimeout(error);
     }
   }