@onekeyfe/hd-core 1.2.0-alpha.120 → 1.2.0-alpha.122

package/__tests__/device-settings.test.ts

@@ -77,7 +77,7 @@ describe('DeviceSettings protocol routing', () => {
     expect(method.unlockPolicy).toBe('unlock-before-run');
   });
 
-  it('uses ApplySettings and refreshes Protocol V1 settings from the device', async () => {
+  it('uses ApplySettings and commits the confirmed patch for Protocol V1', async () => {
     const { device, typedCall, updateState } = createDevice({ protocol: 'V1' });
     const method = new DeviceSettings({
       id: 1,
@@ -107,8 +107,13 @@ describe('DeviceSettings protocol routing', () => {
       use_ble: true,
       haptic_feedback: undefined,
     });
-    expect(device.getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
-    expect(updateState).not.toHaveBeenCalled();
+    expect(updateState).toHaveBeenCalledWith(
+      {
+        identity: { label: 'Shared Label' },
+        settings: { language: 'ja', bleEnabled: true },
+      },
+      'settings-write'
+    );
   });
 
   it('normalizes legacy Protocol V1 never values before ApplySettings', async () => {
@@ -133,33 +138,15 @@ describe('DeviceSettings protocol routing', () => {
         auto_shutdown_delay_ms: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
       })
     );
-    expect(device.getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
-    expect(updateState).not.toHaveBeenCalled();
-  });
-
-  it('refreshes Protocol V1 settings after the on-device brightness update completes', async () => {
-    const { device, typedCall, updateState, getDeviceState } = createDevice({ protocol: 'V1' });
-    const method = new DeviceSettings({
-      id: 3,
-      payload: {
-        method: 'deviceSettings',
-        changeBrightness: true,
+    expect(updateState).toHaveBeenCalledWith(
+      {
+        settings: {
+          autoLockDelayMs: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
+          autoShutdownDelayMs: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
+        },
       },
-    });
-    method.init();
-    (method as any).device = device;
-
-    await expect(method.run()).resolves.toEqual({ message: 'Success' });
-    expect(typedCall).toHaveBeenCalledWith(
-      'ApplySettings',
-      'Success',
-      expect.objectContaining({ change_brightness: true })
-    );
-    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
-    expect(typedCall.mock.invocationCallOrder[0]).toBeLessThan(
-      getDeviceState.mock.invocationCallOrder[0]
+      'settings-write'
     );
-    expect(updateState).not.toHaveBeenCalled();
   });
 
   it('uses DeviceSettingsSet and reloads Protocol V2 status and settings from the device', async () => {
@@ -338,7 +325,7 @@ describe('DeviceSettings protocol routing', () => {
       'Success',
       expect.objectContaining({ use_passphrase: true })
     );
-    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
+    expect(getDeviceState).not.toHaveBeenCalled();
   });
 
   it('rejects combining a Pro2 device-side toggle with direct settings', async () => {

package/__tests__/firmware-update/firmware-update-bootloader-poll.test.ts

@@ -203,6 +203,69 @@ describe.each([
   });
 });
 
+describe('FirmwareUpdateV2 WebUSB bootloader polling', () => {
+  beforeEach(() => {
+    jest.useFakeTimers({ doNotFake: ['setImmediate', 'performance'] });
+  });
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.useRealTimers();
+    jest.restoreAllMocks();
+  });
+
+  test('skips interval ticks while a bootloader probe is in flight and resumes afterward', async () => {
+    jest.spyOn(DataManager, 'getSettings').mockReturnValue('desktop' as never);
+    jest.spyOn(DataManager, 'isBleConnect').mockReturnValue(false);
+    jest.spyOn(DataManager, 'isBrowserWebUsb').mockReturnValue(false);
+
+    const method = new FirmwareUpdateV2({
+      id: 1,
+      payload: { method: 'firmwareUpdateV2', connectId: WEBUSB_ID },
+    });
+
+    let inFlight = 0;
+    let maxInFlight = 0;
+    const resolveProbes: Array<(found: boolean) => void> = [];
+    const probe = jest.spyOn(method as any, '_checkDeviceInBootloaderMode').mockImplementation(
+      () =>
+        new Promise<boolean>(resolve => {
+          inFlight += 1;
+          maxInFlight = Math.max(maxInFlight, inFlight);
+          resolveProbes.push(found => {
+            inFlight -= 1;
+            resolve(found);
+          });
+        })
+    );
+
+    method.device = {
+      getCurrentDeviceType: jest.fn(() => EDeviceType.Classic),
+    } as unknown as Device;
+
+    method.checkDeviceToBootloader(WEBUSB_ID);
+
+    for (let elapsed = 0; elapsed < 6500; elapsed += 500) {
+      jest.advanceTimersByTime(500);
+      // eslint-disable-next-line no-await-in-loop
+      await flush();
+    }
+
+    expect(probe).toHaveBeenCalled();
+    expect(maxInFlight).toBe(1);
+
+    resolveProbes[0]?.(false);
+    await flush();
+    jest.advanceTimersByTime(2000);
+    await flush();
+
+    expect(probe).toHaveBeenCalledTimes(2);
+    expect(maxInFlight).toBe(1);
+    resolveProbes[1]?.(false);
+    await flush();
+  });
+});
+
 describe.each([
   [
     'FirmwareUpdateV2',

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AA2B1C,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,UAAU,CAAC;AAEtD,OAAO,KAAK,EACV,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,KAAK,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,yBAAyB,CAAC;KACrC,CAAC,CAAC;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAkFF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAiGJ,cAAc,YAAa,MAAM,UAS/B;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAwJvC,4BAA4B;IAyB1C,qBAAqB;IAUrB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAc1C,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,YAAY,EAAE,aAAa;IAwBtF,GAAG;CAkRV"}
+{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AA2B1C,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,UAAU,CAAC;AAEtD,OAAO,KAAK,EACV,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,KAAK,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,yBAAyB,CAAC;KACrC,CAAC,CAAC;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAkFF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAiGJ,cAAc,YAAa,MAAM,UAS/B;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YA2JvC,4BAA4B;IAyB1C,qBAAqB;IAUrB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAc1C,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,YAAY,EAAE,aAAa;IAwBtF,GAAG;CAkRV"}

package/dist/api/device/DeviceSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceSettings.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceSettings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAa3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0D5D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,aAAa,CAAC;IACnE,qBAAqB;IAIrB,IAAI;IA0EJ,eAAe;;;;;;;IAWT,GAAG;CAyIV"}
+{"version":3,"file":"DeviceSettings.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceSettings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgB3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0D5D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,aAAa,CAAC;IACnE,qBAAqB;IAIrB,IAAI;IA0EJ,eAAe;;;;;;;IAWT,GAAG;CAyIV"}

package/dist/api/device/DeviceUploadResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EAA8B,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CAuDtC;IAEI,GAAG;CAiBV"}
+{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EAA8B,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CAuDtC;IAEI,GAAG;CAaV"}

package/dist/index.js

@@ -44617,6 +44617,22 @@ const mapProtocolV2DeviceStatusToState = (status) => {
         raw: { protocolV2DeviceStatus: status },
     });
 };
+const mapApplySettingsToState = (settings) => {
+    const identity = definedEntries({ label: settings.label });
+    const status = definedEntries({ passphraseProtection: settings.use_passphrase });
+    const stateSettings = definedEntries({
+        language: settings.language,
+        autoLockDelayMs: settings.auto_lock_delay_ms,
+        autoShutdownDelayMs: settings.auto_shutdown_delay_ms,
+        displayRotation: settings.display_rotation,
+        passphraseAlwaysOnDevice: settings.passphrase_always_on_device,
+        safetyChecks: normalizeSafetyCheckLevel(settings.safety_checks),
+        experimentalFeatures: settings.experimental_features,
+        hapticFeedback: settings.haptic_feedback,
+        bleEnabled: settings.use_ble,
+    });
+    return Object.assign(Object.assign(Object.assign({}, (Object.keys(identity).length ? { identity } : {})), (Object.keys(status).length ? { status } : {})), (Object.keys(stateSettings).length ? { settings: stateSettings } : {}));
+};
 const mapDeviceSettingsToState = (settings) => {
     const identity = definedEntries({ label: settings.label });
     const status = definedEntries({ passphraseProtection: settings.passphrase_enable });
@@ -48503,7 +48519,7 @@ class DeviceSettings extends BaseMethod {
                 }
                 const protocolV1Params = Object.assign(Object.assign({}, this.params), { auto_lock_delay_ms: normalizeProtocolV1DelayMs(this.params.auto_lock_delay_ms), auto_shutdown_delay_ms: normalizeProtocolV1DelayMs(this.params.auto_shutdown_delay_ms) });
                 const res = yield this.device.commands.typedCall('ApplySettings', 'Success', protocolV1Params);
-                yield this.device.getDeviceState({ refreshSections: ['settings'] });
+                this.device.updateState(mapApplySettingsToState(protocolV1Params), 'settings-write');
                 return res.message;
             }
             catch (error) {
@@ -48702,11 +48718,7 @@ class DeviceUploadResource extends BaseMethod {
                 this.checkUploadNFTSupport();
             }
             const res = yield this.device.commands.typedCall('ResourceUpload', ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'], this.params);
-            const result = yield this.processResourceRequest(res);
-            if (this.payload.resType === hdTransport.Messages.ResourceType.WallPaper) {
-                yield this.device.getDeviceState({ refreshSections: ['settings'] });
-            }
-            return result;
+            return this.processResourceRequest(res);
         });
     }
 }
@@ -50451,7 +50463,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         this.checkPromise = hdShared.createDeferred();
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
-        let bleProbeInFlight = false;
+        let probeInFlight = false;
         Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         let isFirstCheck = true;
         let checkCount = 0;
@@ -50483,8 +50495,9 @@ class FirmwareUpdateV2 extends BaseMethod {
         let startPolling = () => undefined;
         const pollForBootloader = () => __awaiter(this, void 0, void 0, function* () {
             var _b, _c, _d, _e;
-            if (isFinished || isPromptingWebDevice)
+            if (isFinished || isPromptingWebDevice || probeInFlight)
                 return;
+            probeInFlight = true;
             checkCount += 1;
             Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
@@ -50518,13 +50531,11 @@ class FirmwareUpdateV2 extends BaseMethod {
                 }
                 finally {
                     isPromptingWebDevice = false;
+                    probeInFlight = false;
                 }
                 return;
             }
             if (isBleReconnect) {
-                if (bleProbeInFlight)
-                    return;
-                bleProbeInFlight = true;
                 try {
                     yield ((_c = this.device.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.device.originalDescriptor.id, null, true, (_d = this.payload.connectProtocol) !== null && _d !== void 0 ? _d : this.device.originalDescriptor.protocolType));
                     yield this.device.initialize({ timeoutMs: BOOTLOADER_POLL_INITIALIZE_TIMEOUT_MS });
@@ -50538,11 +50549,16 @@ class FirmwareUpdateV2 extends BaseMethod {
                     Log$8.log('catch Bluetooth error when device is restarting: ', e);
                 }
                 finally {
-                    bleProbeInFlight = false;
+                    probeInFlight = false;
                 }
             }
             else {
-                yield checkForBootloader(true);
+                try {
+                    yield checkForBootloader(true);
+                }
+                finally {
+                    probeInFlight = false;
+                }
             }
         });
         startPolling = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.120",
+  "version": "1.2.0-alpha.122",
   "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.120",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.120",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.122",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.122",
     "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": "8aaff2584cedc5fcb5dc68e0ca19588e9965bb8a"
+  "gitHead": "f0a85119fe7f8607768bc77b0ac4eb527d55e1cc"
 }

package/src/api/FirmwareUpdateV2.ts

@@ -276,10 +276,9 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
     this.checkPromise = createDeferred();
     const env = DataManager.getSettings('env');
     const isBleReconnect = connectId && DataManager.isBleConnect(env);
-    // Tracks the in-flight BLE probe so interval ticks never overlap: a superseded
-    // Initialize left pending on the V1 transport is exactly what later times out
-    // and used to tear down the connection mid-firmware-upload.
-    let bleProbeInFlight = false;
+    // Bootloader probes can outlive the polling interval. Keep discovery and
+    // acquire serialized so concurrent ticks never race the same connection.
+    let probeInFlight = false;
 
     Log.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
 
@@ -321,7 +320,8 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
 
     let startPolling: () => void = () => undefined;
     const pollForBootloader = async () => {
-      if (isFinished || isPromptingWebDevice) return;
+      if (isFinished || isPromptingWebDevice || probeInFlight) return;
+      probeInFlight = true;
       checkCount += 1;
       Log.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
       if (isTouchOrProDevice && isFirstCheck) {
@@ -362,13 +362,12 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
           this.checkPromise?.reject(e);
         } finally {
           isPromptingWebDevice = false;
+          probeInFlight = false;
         }
         return;
       }
 
       if (isBleReconnect) {
-        if (bleProbeInFlight) return;
-        bleProbeInFlight = true;
         try {
           await this.device.deviceConnector?.acquire(
             this.device.originalDescriptor.id,
@@ -389,10 +388,14 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
           // ignore error because of device is not connected
           Log.log('catch Bluetooth error when device is restarting: ', e);
         } finally {
-          bleProbeInFlight = false;
+          probeInFlight = false;
         }
       } else {
-        await checkForBootloader(true);
+        try {
+          await checkForBootloader(true);
+        } finally {
+          probeInFlight = false;
+        }
       }
     };
 

package/src/api/device/DeviceSettings.ts

@@ -4,7 +4,10 @@ import { DeviceSessionPinType, DeviceSettingsPage } from '@onekeyfe/hd-transport
 import { BaseMethod } from '../BaseMethod';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { validateParams } from '../helpers/paramsValidator';
-import { mapCommonSettingsToProtocolV2 } from '../../device/DeviceStateMapper';
+import {
+  mapApplySettingsToState,
+  mapCommonSettingsToProtocolV2,
+} from '../../device/DeviceStateMapper';
 import { getProtocolV2SettingsBehavior } from '../../protocols/protocol-v2/settingsUnlockPolicy';
 import {
   DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
@@ -268,7 +271,7 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
         'Success',
         protocolV1Params
       );
-      await this.device.getDeviceState({ refreshSections: ['settings'] });
+      this.device.updateState(mapApplySettingsToState(protocolV1Params), 'settings-write');
       return res.message;
     } catch (error) {
       if (error.message?.toLowerCase().includes('no setting provided')) {

package/src/api/device/DeviceUploadResource.ts

@@ -198,10 +198,6 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       this.params
     );
 
-    const result = await this.processResourceRequest(res);
-    if (this.payload.resType === PROTO.ResourceType.WallPaper) {
-      await this.device.getDeviceState({ refreshSections: ['settings'] });
-    }
-    return result;
+    return this.processResourceRequest(res);
   }
 }

package/__tests__/device-upload-resource.test.ts

@@ -1,53 +0,0 @@
-import { EDeviceType } from '@onekeyfe/hd-shared';
-import { ResourceType } from '@onekeyfe/hd-transport';
-
-import DeviceUploadResource from '../src/api/device/DeviceUploadResource';
-
-jest.mock('../src/data/config', () => ({
-  DEFAULT_DOMAIN: 'https://example.com/',
-  getSDKVersion: () => '0.0.0-test',
-}));
-
-describe('DeviceUploadResource state refresh', () => {
-  it('refreshes Protocol V1 settings inside a wallpaper update', async () => {
-    const typedCall = jest.fn().mockResolvedValue({
-      type: 'Success',
-      message: { message: 'Success' },
-    });
-    const getDeviceState = jest.fn().mockResolvedValue({
-      settings: { language: 'en-US' },
-    });
-    const method = new DeviceUploadResource({
-      id: 1,
-      payload: {
-        method: 'deviceUploadResource',
-        suffix: 'jpg',
-        dataHex: '00',
-        thumbnailDataHex: '00',
-        blurDataHex: '00',
-        resType: ResourceType.WallPaper,
-      },
-    });
-    method.init();
-    (method as any).device = {
-      commands: { typedCall },
-      getCurrentDeviceType: () => EDeviceType.Pro,
-      getCurrentFirmwareVersionString: () => '4.21.0',
-      getDeviceState,
-    };
-
-    await expect(method.run()).resolves.toEqual({
-      message: 'Success',
-      applyScreen: false,
-    });
-    expect(typedCall).toHaveBeenCalledWith(
-      'ResourceUpload',
-      ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'],
-      expect.objectContaining({ res_type: ResourceType.WallPaper })
-    );
-    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
-    expect(typedCall.mock.invocationCallOrder[0]).toBeLessThan(
-      getDeviceState.mock.invocationCallOrder[0]
-    );
-  });
-});