@onekeyfe/hd-core 1.2.0-alpha.132 → 1.2.0-alpha.133

package/__tests__/device-settings.test.ts

@@ -279,7 +279,7 @@ describe('DeviceSettings protocol routing', () => {
     );
   });
 
-  it('uses the Pro2 passphrase page as a device-side toggle and verifies the target state', async () => {
+  it('uses the Pro2 passphrase page and refreshes device state after the toggle', async () => {
     const { device, typedCall, getDeviceState } = createDevice({ protocol: 'V2' });
     getDeviceState
       .mockResolvedValueOnce({
@@ -403,6 +403,67 @@ describe('DeviceSettings protocol routing', () => {
     expect(updateState).not.toHaveBeenCalled();
   });
 
+  it('preserves confirmed Pro2 passphrase state when the post-toggle status is locked', async () => {
+    let statusReadCount = 0;
+    const typedCall = jest.fn().mockImplementation((requestType: string) => {
+      if (requestType === 'DeviceStatusGet') {
+        statusReadCount += 1;
+        return {
+          message:
+            statusReadCount === 1
+              ? { init_states: true, unlocked: true, passphrase_enabled: true }
+              : { init_states: true, unlocked: false, passphrase_enabled: false },
+        };
+      }
+      if (requestType === 'DeviceSettingsPageShow') {
+        return { message: { message: 'Success' } };
+      }
+      if (requestType === 'DeviceSettingsGet') {
+        return { message: { label: 'Pro 2' } };
+      }
+      throw new Error(`Unexpected request: ${requestType}`);
+    });
+    const device = Device.fromDescriptor({
+      id: 'pro2-passphrase',
+      path: 'pro2-passphrase',
+      protocolType: 'V2',
+    } as never);
+    (device as any).commands = { typedCall };
+    device.updateState(
+      {
+        protocol: 'V2',
+        identity: { deviceType: EDeviceType.Pro2 },
+        status: {
+          mode: 'normal',
+          unlocked: true,
+          passphraseProtection: true,
+        },
+        raw: {
+          protocolV2ProtocolInfo: {
+            version: 1,
+            supported_messages: [PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE],
+          },
+        },
+      },
+      'initialize'
+    );
+    const method = new DeviceSettings({
+      id: 6,
+      payload: {
+        method: 'deviceSettings',
+        usePassphrase: false,
+      },
+    });
+    method.init();
+    (method as any).device = device;
+
+    await expect(method.run()).resolves.toEqual({ message: 'Success' });
+    expect(device.state?.status).toMatchObject({
+      unlocked: false,
+      passphraseProtection: true,
+    });
+  });
+
   it('keeps Protocol V1 passphrase settings on ApplySettings', async () => {
     const { device, typedCall, getDeviceState } = createDevice({ protocol: 'V1' });
     const method = new DeviceSettings({

package/__tests__/protocol-v2.test.ts

@@ -265,6 +265,36 @@ describe('DeviceUploadWallpaper', () => {
     expect(typedCall.mock.calls.some(call => call[0] === 'DeviceSettingsSet')).toBe(false);
   });
 
+  test('returns success when wallpaper read-back fails after apply', async () => {
+    const typedCall = jest.fn().mockImplementation((request, _response, params) => {
+      if (request === 'FilesystemDirMake') return { message: {} };
+      if (request === 'FilesystemFileWrite') {
+        const file = params.file as { data: Uint8Array; offset: number };
+        return { message: { processed_byte: file.offset + file.data.byteLength } };
+      }
+      if (request === 'DeviceSettingsSet') {
+        return { message: { message: 'wallpaper applied' } };
+      }
+      throw new Error(`Unexpected request: ${request}`);
+    });
+    const method = new DeviceUploadWallpaper({
+      id: 1,
+      payload: {
+        method: 'deviceUploadWallpaper',
+        jpegBase64: createJpegBase64(604, 1024),
+      },
+    });
+    const device = stubWallpaperDevice({ commands: { typedCall } });
+    device.refreshProtocolV2SettingsAfterMutation.mockRejectedValueOnce(
+      new Error('settings read-back failed')
+    );
+    (method as any).device = device;
+    method.init();
+
+    await expect(method.run()).resolves.toMatchObject({ message: 'wallpaper applied' });
+    expect(device.refreshProtocolV2SettingsAfterMutation).toHaveBeenCalledTimes(1);
+  });
+
   test('rejects unsafe filenames before device communication', () => {
     const method = new DeviceUploadWallpaper({
       id: 1,

package/dist/api/protocol-v2/DeviceUploadWallpaper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadWallpaper.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadWallpaper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,OAAO,EAGL,KAAK,wBAAwB,EAE9B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAkBF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,2BAA2B,CAAC;IACxF,qBAAqB;IAIrB,OAAO,CAAC,OAAO,CAAC,CAA8D;IAE9E,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,IAAI,CAAM;IAElB,IAAI;YAwBU,kBAAkB;YAgBlB,eAAe;YAaf,MAAM;IAwBd,GAAG,IAAI,OAAO,CAAC,6BAA6B,CAAC;CAiBpD"}
+{"version":3,"file":"DeviceUploadWallpaper.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadWallpaper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,EAGL,KAAK,wBAAwB,EAE9B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAmBF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,2BAA2B,CAAC;IACxF,qBAAqB;IAIrB,OAAO,CAAC,OAAO,CAAC,CAA8D;IAE9E,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,IAAI,CAAM;IAElB,IAAI;YAwBU,kBAAkB;YAgBlB,eAAe;YAaf,MAAM;IAwBd,GAAG,IAAI,OAAO,CAAC,6BAA6B,CAAC;CAyBpD"}