@onekeyfe/hd-core 1.2.0-alpha.185 → 1.2.0-alpha.186

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

@@ -125,7 +125,7 @@ describe('FirmwareUpdateV4 install polling', () => {
     expect(setCancelableAction).toHaveBeenCalledTimes(2);
   });
 
-  test('accepts finished USB status after the Request terminal Success arrives', async () => {
+  test('accepts path-less finished USB status after the Request terminal Success arrives', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -144,7 +144,6 @@ describe('FirmwareUpdateV4 install polling', () => {
             {
               target_id: 4,
               status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
-              path: 'vol0:/application_p1.bin',
             },
           ],
         },
@@ -336,87 +335,141 @@ describe('FirmwareUpdateV4 install polling', () => {
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 
-  test.each([
-    ['disconnect', new Error('device was disconnected')],
-    [
-      'response timeout',
-      ERRORS.TypedError(
-        HardwareErrorCode.BleTimeoutError,
-        'Lowlevel response timeout after 15000ms for DeviceFirmwareUpdateStatusGet'
-      ),
-    ],
-  ])(
-    'accepts stable finished BLE status after install %s hides in-progress',
-    async (_, error) => {
-      const method = new FirmwareUpdateV4({
-        id: 1,
-        payload: {
-          method: 'firmwareUpdateV4',
-          connectId: 'pro2-ble',
-        },
-      });
-      const targets = [{ target_id: 6, path: 'vol0:/coprocessor.bin' }];
-      const finishedStatus = {
-        type: 'DeviceFirmwareUpdateStatus',
-        message: {
-          records: [
-            {
-              target_id: 6,
-              status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
-              payload_version: 65_556,
-              path: 'vol0:/coprocessor.bin',
-            },
-          ],
-        },
-      };
-      const typedCall = jest
-        .fn()
-        .mockResolvedValueOnce(finishedStatus)
-        .mockImplementationOnce(() => {
-          expect(method.postProgressMessage).not.toHaveBeenCalled();
-          throw error;
-        })
-        .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 as any).params = {
-        expectedTargetVersions: { coprocessor: '1.0.20' },
-      };
-
-      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('accepts stable finished BLE status after an actual install disconnect hides in-progress', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+        connectId: 'pro2-ble',
+      },
+    });
+    const targets = [{ target_id: 6, path: 'vol0:/coprocessor.bin' }];
+    const finishedStatus = {
+      type: 'DeviceFirmwareUpdateStatus',
+      message: {
+        records: [
+          {
+            target_id: 6,
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+            payload_version: 65_556,
+            path: 'vol0:/coprocessor.bin',
+          },
+        ],
+      },
+    };
+    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 as any).params = {
+      expectedTargetVersions: { coprocessor: '1.0.20' },
+    };
+
+    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('rejects stable stale finished BLE status after a status response timeout', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+        connectId: 'pro2-ble',
+      },
+    });
+    const targets = [{ target_id: 6, path: 'vol0:/coprocessor.bin' }];
+    const finishedStatus = {
+      type: 'DeviceFirmwareUpdateStatus',
+      message: {
+        records: [
+          {
+            target_id: 6,
+            status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+            payload_version: 65_556,
+            path: 'vol0:/coprocessor.bin',
+          },
+        ],
+      },
+    };
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce(finishedStatus)
+      .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().mockResolvedValue(undefined);
+
+    (method as any).params = {
+      expectedTargetVersions: { coprocessor: '1.0.20' },
+    };
+    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 expect(
+      firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true)
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.ActionCancelled,
+    });
+
+    expect(reconnectProtocolV2Device).toHaveBeenCalledWith({ skipProtocolProbe: true });
+    expect(method.postProgressMessage).not.toHaveBeenCalled();
+  }, 10_000);
 
   test('confirms App mode when BLE status becomes empty after current install progress', async () => {
     const method = new FirmwareUpdateV4({

package/__tests__/protocol-v2.test.ts

@@ -5391,6 +5391,29 @@ describe('Protocol V2 firmware update targets', () => {
     });
   });
 
+  test('treats a typed BLE disconnect during Protocol V2 normal reboot as expected', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+      },
+    });
+    const typedCall = jest
+      .fn()
+      .mockRejectedValue(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
+
+    (method as any).device = stubDevice({
+      getCommands: () => ({ typedCall }),
+    });
+
+    await expect((method as any).protocolV2Reboot(DeviceRebootType.Normal)).resolves.toEqual({
+      message: 'Device rebooted successfully',
+    });
+    expect((method as any).device.markProtocolV2Reboot).toHaveBeenCalledWith(
+      DeviceRebootType.Normal
+    );
+  });
+
   test('uses a short timeout and continues after a BLE reboot response timeout', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,

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/api/protocol-v2/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,MAAM,OAAO,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACjC,oBAAoB,GACpB;IACE,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,gBAAgB,CAAC,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAaF,eAAO,MAAM,mCAAmC,EAAE,oBAEjD,CAAC;AAEF,eAAO,MAAM,0CAA0C,EAAE,CACrD,SAAS,GACT,4BAA4B,CAC/B,EAA8C,CAAC;AAEhD,eAAO,MAAM,6BAA6B,UAAW,OAAO,WA6B3D,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,YAsBjE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,gBAAgB,CAQxF;AAsCD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,0BAA0B,GACjC,oBAAoB,EAAE,CA0BxB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM1D,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,MAAM,OAAO,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACjC,oBAAoB,GACpB;IACE,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,gBAAgB,CAAC,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAaF,eAAO,MAAM,mCAAmC,EAAE,oBAEjD,CAAC;AAEF,eAAO,MAAM,0CAA0C,EAAE,CACrD,SAAS,GACT,4BAA4B,CAC/B,EAA8C,CAAC;AAEhD,eAAO,MAAM,6BAA6B,UAAW,OAAO,WA6B3D,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,YA6BjE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,gBAAgB,CAQxF;AAsCD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,0BAA0B,GACjC,oBAAoB,EAAE,CA0BxB"}

package/dist/index.js

@@ -51816,6 +51816,12 @@ const getProtocolV2UnknownErrorText = (error) => {
     return parts.filter(Boolean).join(' ');
 };
 const isProtocolV2DeviceDisconnectedError = (error) => {
+    var _a;
+    const errorCode = error && typeof error === 'object'
+        ? (_a = error.errorCode) !== null && _a !== void 0 ? _a : error.code
+        : undefined;
+    if (errorCode === hdShared.HardwareErrorCode.BleDeviceDisconnected)
+        return true;
     const message = getProtocolV2UnknownErrorText(error).toLowerCase();
     const compactMessage = message.replace(/\s+/g, '');
     return (message.includes('notfounderror') ||
@@ -52142,7 +52148,7 @@ const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
-const PROTOCOL_V2_INSTALL_FINISHED_AFTER_RECONNECT_POLLS = 4;
+const PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS = 4;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -53893,13 +53899,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 startTime = Date.now();
             let lastError;
             let shouldReconnect = this.protocolV2InstallNeedsReconnect;
-            let installTransportReleaseObserved = shouldReconnect;
             this.protocolV2InstallNeedsReconnect = false;
             let deviceInfo;
             let bleInstallLinkReady = false;
+            let installStatusDisconnectObserved = false;
             let installReconnectObserved = false;
             let finishedStatusSnapshotKey;
             let finishedStatusSnapshotPolls = 0;
@@ -53917,7 +53925,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         deviceInfo = isBleInstallReconnect
                             ? undefined
                             : yield this.verifyProtocolV2ReconnectIdentity();
-                        if (installTransportReleaseObserved) {
+                        if (isBleInstallReconnect && installStatusDisconnectObserved) {
                             installReconnectObserved = true;
                         }
                         shouldReconnect = false;
@@ -53956,6 +53964,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         const matchingFinishedTargetIds = new Set();
                         const matchingFinishedStatus = matchingStatusTargets
                             .map(target => {
+                            var _a;
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
                             const expectedPath = targetId === undefined ? undefined : expectedPaths.get(targetId);
                             const expectedVersion = targetId === undefined
@@ -53965,12 +53974,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             if (targetId === undefined ||
                                 matchingFinishedTargetIds.has(targetId) ||
                                 !isProtocolV2TargetStatusFinished(target.status) ||
-                                target.path !== expectedPath ||
-                                (expectedVersion !== undefined && payloadVersion !== expectedVersion)) {
+                                (Boolean(target.path) && Boolean(expectedPath) && target.path !== expectedPath) ||
+                                (expectedVersion !== undefined &&
+                                    payloadVersion !== undefined &&
+                                    payloadVersion !== expectedVersion)) {
                                 return undefined;
                             }
                             matchingFinishedTargetIds.add(targetId);
-                            return [targetId, target.path, payloadVersion !== null && payloadVersion !== void 0 ? payloadVersion : null];
+                            return [targetId, (_a = target.path) !== null && _a !== void 0 ? _a : null, payloadVersion !== null && payloadVersion !== void 0 ? payloadVersion : null];
                         })
                             .filter((target) => !!target)
                             .sort(([leftTargetId], [rightTargetId]) => leftTargetId - rightTargetId);
@@ -54002,10 +54013,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             this.postProgressMessage(1, 'installingFirmware');
                             fastFinishedInstallProgressReported = true;
                         }
-                        const finishedAfterReconnectObserved = finishedStatusSnapshotPolls >= PROTOCOL_V2_INSTALL_FINISHED_AFTER_RECONNECT_POLLS;
+                        const finishedAfterDisconnectObserved = finishedStatusSnapshotPolls >= PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS;
                         const hasCurrentInstallEvidence = currentInstallStatusObserved ||
                             this.protocolV2InstallTerminalSuccessObserved ||
-                            finishedAfterReconnectObserved;
+                            finishedAfterDisconnectObserved;
                         if (hasCurrentInstallEvidence) {
                             installEvidenceObserved = true;
                         }
@@ -54013,7 +54024,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (shouldVerifyTargetCompletion &&
                             this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths, requireCurrentInstallStatus &&
                                 !this.protocolV2InstallTerminalSuccessObserved &&
-                                !finishedAfterReconnectObserved
+                                !finishedAfterDisconnectObserved
                                 ? liveTargetIds
                                 : undefined)) {
                             return;
@@ -54090,8 +54101,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         else {
-                            if (isProtocolV2DeviceDisconnectedError(error) || isProtocolV2ResponseTimeout(error)) {
-                                installTransportReleaseObserved = true;
+                            if (isBleCoprocessorInstall &&
+                                isProtocolV2DeviceDisconnectedError(error) &&
+                                !isProtocolV2ResponseTimeout(error)) {
+                                installStatusDisconnectObserved = true;
                                 finishedStatusSnapshotKey = undefined;
                                 finishedStatusSnapshotPolls = 0;
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.185",
+  "version": "1.2.0-alpha.186",
   "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-alpha.185",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.185",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.186",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.186",
     "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": "dba45132513abeef33dc448824b4eaace74900ee"
+  "gitHead": "d4b7f8e0e308ed4b95b1d82e385e1ec4b3e0e3f6"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -93,7 +93,7 @@ const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
-const PROTOCOL_V2_INSTALL_FINISHED_AFTER_RECONNECT_POLLS = 4;
+const PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS = 4;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -2517,15 +2517,18 @@ 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 startTime = Date.now();
     let lastError: unknown;
     // The loader may release either USB or BLE as installation starts. Recovery reconnects
     // directly to status polling without generic Ping or DeviceInfo probes.
     let shouldReconnect = this.protocolV2InstallNeedsReconnect;
-    let installTransportReleaseObserved = shouldReconnect;
     this.protocolV2InstallNeedsReconnect = false;
     let deviceInfo: ProtocolV2DeviceInfo | undefined;
     let bleInstallLinkReady = false;
+    let installStatusDisconnectObserved = false;
     let installReconnectObserved = false;
     let finishedStatusSnapshotKey: string | undefined;
     let finishedStatusSnapshotPolls = 0;
@@ -2546,7 +2549,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           deviceInfo = isBleInstallReconnect
             ? undefined
             : await this.verifyProtocolV2ReconnectIdentity();
-          if (installTransportReleaseObserved) {
+          if (isBleInstallReconnect && installStatusDisconnectObserved) {
             installReconnectObserved = true;
           }
           shouldReconnect = false;
@@ -2604,15 +2607,17 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
                 targetId === undefined ||
                 matchingFinishedTargetIds.has(targetId) ||
                 !isProtocolV2TargetStatusFinished(target.status) ||
-                target.path !== expectedPath ||
-                (expectedVersion !== undefined && payloadVersion !== expectedVersion)
+                (Boolean(target.path) && Boolean(expectedPath) && target.path !== expectedPath) ||
+                (expectedVersion !== undefined &&
+                  payloadVersion !== undefined &&
+                  payloadVersion !== expectedVersion)
               ) {
                 return undefined;
               }
               matchingFinishedTargetIds.add(targetId);
-              return [targetId, target.path, payloadVersion ?? null] as const;
+              return [targetId, target.path ?? null, payloadVersion ?? null] as const;
             })
-            .filter((target): target is readonly [number, string, number | null] => !!target)
+            .filter((target): target is readonly [number, string | null, number | null] => !!target)
             .sort(([leftTargetId], [rightTargetId]) => leftTargetId - rightTargetId);
           const hasCompleteMatchingFinishedStatus =
             matchingFinishedStatus.length === expectedTargetIds.size &&
@@ -2642,18 +2647,17 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             !this.protocolV2InstallTerminalSuccessObserved &&
             !fastFinishedInstallProgressReported
           ) {
-            // A fast coprocessor install may finish while BLE is disconnected, so the
-            // host never observes IN_PROGRESS. Enter the install UI while the matching
-            // FINISHED snapshot is stabilized; completion still requires all polls.
+            // A fast BLE install may finish while disconnected, so IN_PROGRESS can be hidden.
+            // A status response timeout alone is not evidence that the install was accepted.
             this.postProgressMessage(1, 'installingFirmware');
             fastFinishedInstallProgressReported = true;
           }
-          const finishedAfterReconnectObserved =
-            finishedStatusSnapshotPolls >= PROTOCOL_V2_INSTALL_FINISHED_AFTER_RECONNECT_POLLS;
+          const finishedAfterDisconnectObserved =
+            finishedStatusSnapshotPolls >= PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS;
           const hasCurrentInstallEvidence =
             currentInstallStatusObserved ||
             this.protocolV2InstallTerminalSuccessObserved ||
-            finishedAfterReconnectObserved;
+            finishedAfterDisconnectObserved;
           if (hasCurrentInstallEvidence) {
             installEvidenceObserved = true;
           }
@@ -2667,7 +2671,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               expectedPaths,
               requireCurrentInstallStatus &&
                 !this.protocolV2InstallTerminalSuccessObserved &&
-                !finishedAfterReconnectObserved
+                !finishedAfterDisconnectObserved
                 ? liveTargetIds
                 : undefined
             )
@@ -2783,8 +2787,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               );
             }
           } else {
-            if (isProtocolV2DeviceDisconnectedError(error) || isProtocolV2ResponseTimeout(error)) {
-              installTransportReleaseObserved = true;
+            if (
+              isBleCoprocessorInstall &&
+              isProtocolV2DeviceDisconnectedError(error) &&
+              !isProtocolV2ResponseTimeout(error)
+            ) {
+              installStatusDisconnectObserved = true;
               finishedStatusSnapshotKey = undefined;
               finishedStatusSnapshotPolls = 0;
             }

package/src/api/protocol-v2/helpers.ts

@@ -1,4 +1,5 @@
 import { DeviceRebootType } from '@onekeyfe/hd-transport';
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { invalidParameter, validateNonEmptyString } from '../helpers/filesystemValidation';
 import { ProtocolV2FirmwareTargetType } from '../../protocols/protocol-v2/firmware';
@@ -103,6 +104,13 @@ export const getProtocolV2UnknownErrorText = (error: unknown) => {
 };
 
 export const isProtocolV2DeviceDisconnectedError = (error: unknown) => {
+  const errorCode =
+    error && typeof error === 'object'
+      ? (error as { errorCode?: number; code?: number }).errorCode ??
+        (error as { errorCode?: number; code?: number }).code
+      : undefined;
+  if (errorCode === HardwareErrorCode.BleDeviceDisconnected) return true;
+
   const message = getProtocolV2UnknownErrorText(error).toLowerCase();
   const compactMessage = message.replace(/\s+/g, '');
   return (