@onekeyfe/hd-core 1.2.0-alpha.13 → 1.2.0-alpha.15

package/__tests__/DeviceCommands.test.ts

@@ -11,6 +11,7 @@ const createCommands = () => {
   const commands = Object.create(DeviceCommands.prototype) as DeviceCommands;
   commands.device = {
     clearCancelableAction: jest.fn(),
+    isProtocolV2: jest.fn(() => true),
   } as any;
   return commands;
 };
@@ -41,6 +42,52 @@ describe('DeviceCommands failure mapping', () => {
     });
   });
 
+  it.each(['Device locked', 'Device is locked'])(
+    'maps legacy Protocol V2 locked message "%s" without a subcode',
+    async message => {
+      const commands = createCommands();
+
+      await expect(
+        commands._filterCommonTypes(
+          {
+            type: 'Failure',
+            message: {
+              code: 'Failure_ProcessError',
+              message,
+            },
+          } as any,
+          'PortfolioUpdate'
+        )
+      ).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.DeviceLocked,
+        params: {
+          failureCode: 'Failure_ProcessError',
+          firmwareMessage: message,
+        },
+      });
+    }
+  );
+
+  it('does not use the legacy locked-message fallback for Protocol V1', async () => {
+    const commands = createCommands();
+    (commands.device.isProtocolV2 as jest.Mock).mockReturnValue(false);
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'Failure',
+          message: {
+            code: 'Failure_ProcessError',
+            message: 'Device is locked',
+          },
+        } as any,
+        'ApplySettings'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.RuntimeError,
+    });
+  });
+
   it.each([
     ['ButtonAck', 'Not in Ethereum signing mode'],
     ['PinMatrixAck', 'Not in Conflux signing mode'],

package/__tests__/DeviceEventRegistration.test.ts

@@ -0,0 +1,35 @@
+import { DEVICE } from '../src/events';
+import { registerHardwareUiEventListeners } from '../src/core/deviceEventRegistration';
+
+const handlers = {
+  pin: jest.fn(),
+  button: jest.fn(),
+  passphrase: jest.fn(),
+  passphraseOnDevice: jest.fn(),
+};
+
+const createDevice = (protocolV2: boolean) => ({
+  isProtocolV2: jest.fn(() => protocolV2),
+  on: jest.fn(),
+});
+
+describe('hardware UI event registration', () => {
+  test('does not register hardware-originated UI events for Protocol V2 devices', () => {
+    const device = createDevice(true);
+
+    expect(registerHardwareUiEventListeners(device as any, handlers)).toBe(false);
+    expect(device.on).not.toHaveBeenCalled();
+  });
+
+  test('keeps the existing interactive event listeners for Protocol V1 devices', () => {
+    const device = createDevice(false);
+
+    expect(registerHardwareUiEventListeners(device as any, handlers)).toBe(true);
+    expect(device.on.mock.calls.map(([type]) => type)).toEqual([
+      DEVICE.PIN,
+      DEVICE.BUTTON,
+      DEVICE.PASSPHRASE,
+      DEVICE.PASSPHRASE_ON_DEVICE,
+    ]);
+  });
+});

package/__tests__/protocol-v2.test.ts

@@ -205,13 +205,14 @@ describe('UploadPortfolio', () => {
     method.init();
     const result = await method.run();
 
+    expect(method.unlockPolicy).toBe('retry-on-locked');
     expect(typedCall).toHaveBeenNthCalledWith(
       1,
       'FilesystemFileWrite',
       'FilesystemFile',
       {
         file: {
-          path: 'vol1:/portfolio/portfolio.pfol.pending',
+          path: 'vol1:/portfolio/portfolio.okpkg.pending',
           offset: 0,
           total_size: 3,
           data: packageBytes,
@@ -223,8 +224,9 @@ describe('UploadPortfolio', () => {
       { timeoutMs: undefined }
     );
     expect(typedCall).toHaveBeenNthCalledWith(2, 'PortfolioUpdate', 'Success', {});
+    expect(method.postMessage).not.toHaveBeenCalled();
     expect(result).toMatchObject({
-      path: 'vol1:/portfolio/portfolio.pfol.pending',
+      path: 'vol1:/portfolio/portfolio.okpkg.pending',
       processed_byte: 3,
       portfolioUpdated: true,
     });
@@ -802,7 +804,7 @@ describe('Protocol V2 feature adapter', () => {
     expect(device.getInternalState()).toBeUndefined();
   });
 
-  test('rejects DeviceSessionGet while cached Pro2 status is locked', async () => {
+  test('unlocks and retries DeviceSessionGet when the Pro2 wallet session is locked', async () => {
     const device = Device.fromDescriptor({
       id: 'cache-device-4',
       path: 'cache-path-4',
@@ -812,11 +814,23 @@ describe('Protocol V2 feature adapter', () => {
       { ...descriptor, protocolType: 'V2' } as any,
       { status: { device_id: 'stable-device-4', unlocked: false } }
     );
-    const typedCall = jest.fn();
+    const lockedError = Object.assign(new Error('Device is locked'), {
+      errorCode: HardwareErrorCode.DeviceLocked,
+    });
+    const typedCall = jest
+      .fn()
+      .mockRejectedValueOnce(lockedError)
+      .mockResolvedValueOnce({
+        message: { session_id: 'session-after-unlock', btc_test_address: '' },
+      });
     (device as any).commands = { typedCall };
+    const unlockDevice = jest.spyOn(device, 'unlockDevice').mockResolvedValue(undefined as any);
 
-    await expect(getProtocolV2WalletSession(device)).rejects.toThrow('Device is locked');
-    expect(typedCall).not.toHaveBeenCalled();
+    await expect(getProtocolV2WalletSession(device)).resolves.toMatchObject({
+      newSession: 'session-after-unlock',
+    });
+    expect(unlockDevice).toHaveBeenCalledTimes(1);
+    expect(typedCall).toHaveBeenCalledTimes(2);
   });
 
   test('does not request a Pro2 wallet session before features are initialized', async () => {

package/dist/api/FileWrite.d.ts

@@ -8,6 +8,7 @@ export type FileWriteParams = {
     chunkLen?: number;
     overwrite?: boolean;
     append?: boolean;
+    emitProgress?: boolean;
     uiPercentage?: number;
     timeoutMs?: number | string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"FileWrite.d.ts","sourceRoot":"","sources":["../../src/api/FileWrite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,UAAU,CAAC,eAAe,CAAC;IAChE,IAAI;IAsBE,GAAG;;;;;;;CAqBV"}
+{"version":3,"file":"FileWrite.d.ts","sourceRoot":"","sources":["../../src/api/FileWrite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,UAAU,CAAC,eAAe,CAAC;IAChE,IAAI;IAuBE,GAAG;;;;;;;CAqBV"}

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

@@ -1 +1 @@
-{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAeE,GAAG;;;;;;;;CASV"}
+{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAiBE,GAAG;;;;;;;;CASV"}

package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAI9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AAiMF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE,EACD,eAAe,EAAE,MAAM;IAoHzB,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAE9E,GAAG;CAuBV"}
+{"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgB3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAI9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AAiMF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE,EACD,eAAe,EAAE,MAAM;IAwHzB,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAE9E,GAAG;CAuBV"}

package/dist/core/deviceEventRegistration.d.ts

@@ -0,0 +1,11 @@
+import { DEVICE } from '../events';
+import type { Device, DeviceEvents } from '../device/Device';
+export type HardwareUiEventHandlers = {
+    pin: (...event: DeviceEvents[typeof DEVICE.PIN]) => void;
+    button: (...event: DeviceEvents[typeof DEVICE.BUTTON]) => void;
+    passphrase: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE]) => void;
+    passphraseOnDevice: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE_ON_DEVICE]) => void;
+};
+export declare const shouldRegisterHardwareUiEvents: (device: Pick<Device, 'isProtocolV2'>) => boolean;
+export declare function registerHardwareUiEventListeners(device: Pick<Device, 'isProtocolV2' | 'on'>, handlers: HardwareUiEventHandlers): boolean;
+//# sourceMappingURL=deviceEventRegistration.d.ts.map

package/dist/core/deviceEventRegistration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deviceEventRegistration.d.ts","sourceRoot":"","sources":["../../src/core/deviceEventRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACzD,MAAM,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAC/D,UAAU,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IACvE,kBAAkB,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC;CAC1F,CAAC;AAEF,eAAO,MAAM,8BAA8B,WAAY,KAAK,MAAM,EAAE,cAAc,CAAC,YAC3D,CAAC;AAEzB,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,EAC3C,QAAQ,EAAE,uBAAuB,WAWlC"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAoClC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAKxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AAW9F,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA+D7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA6EvE,CAAC;AAyzBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AAiFF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AA0GF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,eAAe,CAAC,WAAW,EAAE,MAAM;IAInC,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IA+DxC,OAAO;CASR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAoClC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AAW9F,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA+D7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA6EvE,CAAC;AA0zBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AAiFF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AA0GF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,eAAe,CAAC,WAAW,EAAE,MAAM;IAInC,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IA+DxC,OAAO;CASR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/device/DeviceCommands.d.ts.map

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

package/dist/index.js

@@ -39250,6 +39250,13 @@ const PROTOBUF_MESSAGE_CONFIG = {
     ],
 };
 
+function isDeviceLockedError(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'errorCode' in error &&
+        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
+}
+
 const getErrorText = (error) => {
     if (error instanceof Error)
         return `${error.name} ${error.message}`;
@@ -39277,24 +39284,39 @@ function refreshProtocolV2DeviceStatus(device) {
     });
 }
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        if (((_a = device.features) === null || _a === void 0 ? void 0 : _a.unlocked) === false) {
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device is locked');
-        }
         if (options === null || options === void 0 ? void 0 : options.initSession) {
             device.clearInternalState();
         }
-        const cachedSessionId = typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+        let sessionId = typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
         try {
             const requestDeviceSession = (sessionId) => device.commands.typedCall('DeviceSessionGet', 'DeviceSession', sessionId ? { session_id: sessionId } : {});
-            const { message } = yield requestDeviceSession(cachedSessionId).catch((error) => __awaiter(this, void 0, void 0, function* () {
-                if (!cachedSessionId || !isProtocolV2InvalidSessionError(error)) {
+            const requestWalletSession = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    return yield requestDeviceSession(sessionId);
+                }
+                catch (error) {
+                    if (!sessionId || !isProtocolV2InvalidSessionError(error)) {
+                        throw error;
+                    }
+                    device.clearInternalState();
+                    sessionId = undefined;
+                    return requestDeviceSession();
+                }
+            });
+            let response;
+            try {
+                response = yield requestWalletSession();
+            }
+            catch (error) {
+                if (!isDeviceLockedError(error)) {
                     throw error;
                 }
-                device.clearInternalState();
-                return requestDeviceSession();
-            }));
+                yield device.unlockDevice();
+                response = yield requestWalletSession();
+            }
+            const { message } = response;
             if ((options === null || options === void 0 ? void 0 : options.expectedPassphraseState) &&
                 options.expectedPassphraseState !== message.btc_test_address) {
                 device.clearInternalState();
@@ -39303,11 +39325,11 @@ function getProtocolV2WalletSession(device, options) {
             if (message.btc_test_address && device.getCurrentPassphraseProtection() !== true) {
                 yield refreshProtocolV2DeviceStatus(device);
             }
-            device.updateInternalState(((_b = device.getCurrentPassphraseProtection()) !== null && _b !== void 0 ? _b : false) || Boolean(message.btc_test_address), message.btc_test_address, device.getCurrentDeviceId(), message.session_id, (options === null || options === void 0 ? void 0 : options.initSession) ? null : (_c = device.features) === null || _c === void 0 ? void 0 : _c.sessionId);
+            device.updateInternalState(((_a = device.getCurrentPassphraseProtection()) !== null && _a !== void 0 ? _a : false) || Boolean(message.btc_test_address), message.btc_test_address, device.getCurrentDeviceId(), message.session_id, (options === null || options === void 0 ? void 0 : options.initSession) ? null : (_b = device.features) === null || _b === void 0 ? void 0 : _b.sessionId);
             return {
                 passphraseState: message.btc_test_address,
                 newSession: message.session_id,
-                unlockedAttachPin: (_e = (_d = device.features) === null || _d === void 0 ? void 0 : _d.unlockedAttachPin) !== null && _e !== void 0 ? _e : undefined,
+                unlockedAttachPin: (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.unlockedAttachPin) !== null && _d !== void 0 ? _d : undefined,
             };
         }
         catch (error) {
@@ -41112,6 +41134,7 @@ class DeviceCommands {
         });
     }
     _filterCommonTypes(res, callType, options) {
+        var _a;
         try {
             if (shouldReduceDebugForCall(callType)) {
             }
@@ -41161,7 +41184,8 @@ class DeviceCommands {
                 }
             }
             if (code === 'Failure_ProcessError') {
-                if (subcode === 9) {
+                const isLegacyProtocolV2LockedFailure = this.device.isProtocolV2() && /^device (?:is )?locked$/i.test((_a = message === null || message === void 0 ? void 0 : message.trim()) !== null && _a !== void 0 ? _a : '');
+                if (subcode === 9 || isLegacyProtocolV2LockedFailure) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceLocked, message, {
                         failureCode: code,
                         subcode,
@@ -48375,7 +48399,7 @@ class FileRead extends BaseMethod {
 
 class FileWrite extends BaseMethod {
     init() {
-        var _a, _b;
+        var _a, _b, _c;
         this.requireProtocolV2 = true;
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -48391,6 +48415,7 @@ class FileWrite extends BaseMethod {
             chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
             overwrite: (_a = this.payload.overwrite) !== null && _a !== void 0 ? _a : offset === 0,
             append: (_b = this.payload.append) !== null && _b !== void 0 ? _b : false,
+            emitProgress: (_c = this.payload.emitProgress) !== null && _c !== void 0 ? _c : true,
             uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
             timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
         };
@@ -48411,7 +48436,7 @@ class FileWrite extends BaseMethod {
                 timeoutMs: this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs),
                 throwIfAborted: () => this.throwIfAborted(),
                 onProgress: payload => {
-                    if (typeof this.postMessage === 'function') {
+                    if (this.params.emitProgress && typeof this.postMessage === 'function') {
                         this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
                     }
                 },
@@ -48515,13 +48540,14 @@ class PathInfo extends BaseMethod {
     }
 }
 
-const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.pfol.pending';
+const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
 class UploadPortfolio extends FileWrite {
     init() {
         const { packageBytes, timeoutMs } = this.payload;
-        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, timeoutMs });
+        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: false, timeoutMs });
         super.init();
+        this.unlockPolicy = 'retry-on-locked';
     }
     run() {
         const _super = Object.create(null, {
@@ -48584,6 +48610,18 @@ class CipherKeyValue extends BaseMethod {
     }
 }
 
+const shouldRegisterHardwareUiEvents = (device) => !device.isProtocolV2();
+function registerHardwareUiEventListeners(device, handlers) {
+    if (!shouldRegisterHardwareUiEvents(device)) {
+        return false;
+    }
+    device.on(DEVICE.PIN, handlers.pin);
+    device.on(DEVICE.BUTTON, handlers.button);
+    device.on(DEVICE.PASSPHRASE, handlers.passphrase);
+    device.on(DEVICE.PASSPHRASE_ON_DEVICE, handlers.passphraseOnDevice);
+    return true;
+}
+
 const Mainnet = 'mainnet';
 const networkAliases = {
     tbtc: { name: 'btc', coin: 'Testnet' },
@@ -48851,9 +48889,11 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         commandsInstanceId: (_c = this.device.commands) === null || _c === void 0 ? void 0 : _c.instanceId,
                     });
                 }
-                this.device.on(DEVICE.BUTTON, buttonListener);
-                this.device.on(DEVICE.PIN, onSignalAbort);
-                this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
+                if (shouldRegisterHardwareUiEvents(this.device)) {
+                    this.device.on(DEVICE.BUTTON, buttonListener);
+                    this.device.on(DEVICE.PIN, onSignalAbort);
+                    this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
+                }
                 preCheckDeviceSupport(this.device, method);
                 if (this.temporarySafetyCheckPrompted) {
                     method.temporarySafetyCheckPrompted = true;
@@ -48892,9 +48932,11 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 }
             }
             finally {
-                this.device.off(DEVICE.BUTTON, buttonListener);
-                this.device.off(DEVICE.PIN, onSignalAbort);
-                this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
+                if (shouldRegisterHardwareUiEvents(this.device)) {
+                    this.device.off(DEVICE.BUTTON, buttonListener);
+                    this.device.off(DEVICE.PIN, onSignalAbort);
+                    this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
+                }
             }
             return result;
         });
@@ -58166,12 +58208,6 @@ const getSynchronize = (mutex) => {
 };
 
 const Log$1 = getLogger(exports.LoggerNames.Core);
-function isDeviceLockedError(error) {
-    return (typeof error === 'object' &&
-        error !== null &&
-        'errorCode' in error &&
-        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
-}
 function runMethodWithUnlockRetry(method, device) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -58425,10 +58461,14 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     if (activeRequests.length > 0) {
         Log.warn(`[${method.instanceId}] Device ${device.instanceId} has ${activeRequests.length} active requests:`, activeRequests.map(formatRequestContext));
     }
-    device.on(DEVICE.PIN, onDevicePinHandler);
-    device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-    device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
-    device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
+    registerHardwareUiEventListeners(device, {
+        pin: onDevicePinHandler,
+        button: onDeviceButtonHandler,
+        passphrase: message.payload.useEmptyPassphrase
+            ? onEmptyPassphraseHandler
+            : onDevicePassphraseHandler,
+        passphraseOnDevice: onEnterPassphraseOnDeviceHandler,
+    });
     device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
     device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
     device.on(DEVICE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE, onSelectDeviceForSwitchFirmwareWebDeviceHandler);

package/dist/protocols/protocol-v2/lockedError.d.ts

@@ -0,0 +1,2 @@
+export declare function isDeviceLockedError(error: unknown): boolean;
+//# sourceMappingURL=lockedError.d.ts.map

package/dist/protocols/protocol-v2/lockedError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lockedError.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/lockedError.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAO3D"}

package/dist/protocols/protocol-v2/unlockRetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unlockRetry.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockRetry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,KAAK,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,cAAc,CAAC,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACnF,KAAK,gBAAgB,GAAG,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAAC,CAAC;AAWtE,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,gBAwB9F"}
+{"version":3,"file":"unlockRetry.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockRetry.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,KAAK,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,cAAc,CAAC,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACnF,KAAK,gBAAgB,GAAG,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAAC,CAAC;AAEtE,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,gBAwB9F"}

package/dist/protocols/protocol-v2/walletSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAclD,eAAO,MAAM,+BAA+B,UAAW,OAAO,YACQ,CAAC;AAEvE,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,8DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;CAAE;;;;GA4DtE"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAclD,eAAO,MAAM,+BAA+B,UAAW,OAAO,YACQ,CAAC;AAEvE,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,8DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;CAAE;;;;GAyEtE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.13",
+  "version": "1.2.0-alpha.15",
   "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.13",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.13",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.15",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.15",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "a907a7ec140123107f6188b37550a7143f1e0d91"
+  "gitHead": "06dd8f9cba892bb66242e5a51038a7103fb05f09"
 }

package/src/api/FileWrite.ts

@@ -18,6 +18,7 @@ export type FileWriteParams = {
   chunkLen?: number;
   overwrite?: boolean;
   append?: boolean;
+  emitProgress?: boolean;
   uiPercentage?: number;
   timeoutMs?: number | string;
 };
@@ -40,6 +41,7 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
       overwrite: this.payload.overwrite ?? offset === 0,
       append: this.payload.append ?? false,
+      emitProgress: this.payload.emitProgress ?? true,
       uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
       timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
     };
@@ -60,7 +62,7 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       timeoutMs: this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs),
       throwIfAborted: () => this.throwIfAborted(),
       onProgress: payload => {
-        if (typeof this.postMessage === 'function') {
+        if (this.params.emitProgress && typeof this.postMessage === 'function') {
           this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
         }
       },

package/src/api/UploadPortfolio.ts

@@ -6,7 +6,7 @@ export type UploadPortfolioParams = {
   timeoutMs?: number | string;
 };
 
-const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.pfol.pending';
+const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
 
 export default class UploadPortfolio extends FileWrite {
@@ -20,9 +20,11 @@ export default class UploadPortfolio extends FileWrite {
       chunkSize: PORTFOLIO_CHUNK_SIZE,
       overwrite: true,
       append: false,
+      emitProgress: false,
       timeoutMs,
     };
     super.init();
+    this.unlockPolicy = 'retry-on-locked';
   }
 
   async run() {

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -15,6 +15,7 @@ import { DEVICE, IFRAME, createUiMessage } from '../../events';
 import { isMethodVersionRangeUnsupported } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
+import { shouldRegisterHardwareUiEvents } from '../../core/deviceEventRegistration';
 import {
   completeRequestContext,
   createRequestContext,
@@ -364,11 +365,13 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
         });
       }
 
-      // pro pin event
-      this.device.on(DEVICE.BUTTON, buttonListener);
-      // classic pin event
-      this.device.on(DEVICE.PIN, onSignalAbort);
-      this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
+      if (shouldRegisterHardwareUiEvents(this.device)) {
+        // pro pin event
+        this.device.on(DEVICE.BUTTON, buttonListener);
+        // classic pin event
+        this.device.on(DEVICE.PIN, onSignalAbort);
+        this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
+      }
 
       preCheckDeviceSupport(this.device, method);
       if (this.temporarySafetyCheckPrompted) {
@@ -422,9 +425,11 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
         );
       }
     } finally {
-      this.device.off(DEVICE.BUTTON, buttonListener);
-      this.device.off(DEVICE.PIN, onSignalAbort);
-      this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
+      if (shouldRegisterHardwareUiEvents(this.device)) {
+        this.device.off(DEVICE.BUTTON, buttonListener);
+        this.device.off(DEVICE.PIN, onSignalAbort);
+        this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
+      }
     }
 
     return result;

package/src/core/deviceEventRegistration.ts

@@ -0,0 +1,28 @@
+import { DEVICE } from '../events';
+
+import type { Device, DeviceEvents } from '../device/Device';
+
+export type HardwareUiEventHandlers = {
+  pin: (...event: DeviceEvents[typeof DEVICE.PIN]) => void;
+  button: (...event: DeviceEvents[typeof DEVICE.BUTTON]) => void;
+  passphrase: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE]) => void;
+  passphraseOnDevice: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE_ON_DEVICE]) => void;
+};
+
+export const shouldRegisterHardwareUiEvents = (device: Pick<Device, 'isProtocolV2'>) =>
+  !device.isProtocolV2();
+
+export function registerHardwareUiEventListeners(
+  device: Pick<Device, 'isProtocolV2' | 'on'>,
+  handlers: HardwareUiEventHandlers
+) {
+  if (!shouldRegisterHardwareUiEvents(device)) {
+    return false;
+  }
+
+  device.on(DEVICE.PIN, handlers.pin);
+  device.on(DEVICE.BUTTON, handlers.button);
+  device.on(DEVICE.PASSPHRASE, handlers.passphrase);
+  device.on(DEVICE.PASSPHRASE_ON_DEVICE, handlers.passphraseOnDevice);
+  return true;
+}

package/src/core/index.ts

@@ -55,6 +55,7 @@ import {
 import TransportManager from '../data-manager/TransportManager';
 import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
+import { registerHardwareUiEventListeners } from './deviceEventRegistration';
 import { getSynchronize } from '../utils/getSynchronize';
 import { runMethodWithUnlockRetry } from '../protocols/protocol-v2/unlockRetry';
 
@@ -395,13 +396,14 @@ const onCallDevice = async (
     );
   }
 
-  device.on(DEVICE.PIN, onDevicePinHandler);
-  device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.on(
-    DEVICE.PASSPHRASE,
-    message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler
-  );
-  device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
+  registerHardwareUiEventListeners(device, {
+    pin: onDevicePinHandler,
+    button: onDeviceButtonHandler,
+    passphrase: message.payload.useEmptyPassphrase
+      ? onEmptyPassphraseHandler
+      : onDevicePassphraseHandler,
+    passphraseOnDevice: onEnterPassphraseOnDeviceHandler,
+  });
   device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
   device.on(
     DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE,

package/src/device/DeviceCommands.ts

@@ -578,7 +578,9 @@ export class DeviceCommands {
       }
 
       if (code === 'Failure_ProcessError') {
-        if (subcode === 9) {
+        const isLegacyProtocolV2LockedFailure =
+          this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(message?.trim() ?? '');
+        if (subcode === 9 || isLegacyProtocolV2LockedFailure) {
           error = ERRORS.TypedError(HardwareErrorCode.DeviceLocked, message, {
             failureCode: code,
             subcode,

package/src/protocols/protocol-v2/lockedError.ts

@@ -0,0 +1,10 @@
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+export function isDeviceLockedError(error: unknown): boolean {
+  return (
+    typeof error === 'object' &&
+    error !== null &&
+    'errorCode' in error &&
+    error.errorCode === HardwareErrorCode.DeviceLocked
+  );
+}

package/src/protocols/protocol-v2/unlockRetry.ts

@@ -1,6 +1,5 @@
-import { HardwareErrorCode } from '@onekeyfe/hd-shared';
-
 import { LoggerNames, getLogger } from '../../utils';
+import { isDeviceLockedError } from './lockedError';
 
 import type { BaseMethod } from '../../api/BaseMethod';
 import type { Device } from '../../device/Device';
@@ -10,15 +9,6 @@ const Log = getLogger(LoggerNames.Core);
 type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy'> & { name?: string };
 type UnlockableDevice = Pick<Device, 'isProtocolV2' | 'unlockDevice'>;
 
-function isDeviceLockedError(error: unknown): boolean {
-  return (
-    typeof error === 'object' &&
-    error !== null &&
-    'errorCode' in error &&
-    error.errorCode === HardwareErrorCode.DeviceLocked
-  );
-}
-
 export async function runMethodWithUnlockRetry(method: RunnableMethod, device: UnlockableDevice) {
   try {
     return await method.run();

package/src/protocols/protocol-v2/walletSession.ts

@@ -1,5 +1,7 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
+import { isDeviceLockedError } from './lockedError';
+
 import type { Device } from '../../device/Device';
 
 const getErrorText = (error: unknown) => {
@@ -31,15 +33,11 @@ export async function getProtocolV2WalletSession(
   device: Device,
   options?: { initSession?: boolean; expectedPassphraseState?: string }
 ) {
-  if (device.features?.unlocked === false) {
-    throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device is locked');
-  }
-
   if (options?.initSession) {
     device.clearInternalState();
   }
 
-  const cachedSessionId =
+  let sessionId =
     typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
 
   try {
@@ -50,13 +48,30 @@ export async function getProtocolV2WalletSession(
         sessionId ? { session_id: sessionId } : {}
       );
 
-    const { message } = await requestDeviceSession(cachedSessionId).catch(async error => {
-      if (!cachedSessionId || !isProtocolV2InvalidSessionError(error)) {
+    const requestWalletSession = async () => {
+      try {
+        return await requestDeviceSession(sessionId);
+      } catch (error) {
+        if (!sessionId || !isProtocolV2InvalidSessionError(error)) {
+          throw error;
+        }
+        device.clearInternalState();
+        sessionId = undefined;
+        return requestDeviceSession();
+      }
+    };
+
+    let response;
+    try {
+      response = await requestWalletSession();
+    } catch (error) {
+      if (!isDeviceLockedError(error)) {
         throw error;
       }
-      device.clearInternalState();
-      return requestDeviceSession();
-    });
+      await device.unlockDevice();
+      response = await requestWalletSession();
+    }
+    const { message } = response;
 
     if (
       options?.expectedPassphraseState &&