@onekeyfe/hd-core 1.2.0-alpha.121 → 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/__tests__/get-device-state.test.ts

@@ -116,39 +116,6 @@ describe('getDeviceState', () => {
     expect(state).not.toHaveProperty('session');
   });
 
-  test('emits an authoritative Protocol V1 settings snapshot when the SDK cache is unchanged', async () => {
-    const typedCall = jest.fn().mockResolvedValue({
-      message: {
-        onekey_device_type: 'PRO',
-        initialized: true,
-        language: 'zh_hk',
-        brightness_prcent: 88,
-      },
-    });
-    const device = createV1Device(typedCall);
-    await device.getDeviceState({ refreshSections: ['settings'] });
-    const cachedRevision = device.state?.revision;
-    const onState = jest.fn();
-    device.on(DEVICE.STATE, onState);
-
-    const state = await device.getDeviceState({ refreshSections: ['settings'] });
-
-    expect(typedCall).toHaveBeenCalledTimes(2);
-    expect(typedCall).toHaveBeenLastCalledWith('GetFeatures', 'Features', {});
-    expect(state.settings.language).toBe('zh_hk');
-    expect(state.revision).toBe(cachedRevision);
-    expect(onState).toHaveBeenCalledWith(
-      device,
-      expect.objectContaining({
-        source: 'settings-read',
-        changedKeys: ['settings'],
-        state: expect.objectContaining({
-          settings: expect.objectContaining({ language: 'zh_hk', brightness: 88 }),
-        }),
-      })
-    );
-  });
-
   test('hydrates Protocol V2 with separate DeviceInfoGet and DeviceStatusGet', async () => {
     const typedCall = jest.fn().mockImplementation((requestType: string) => {
       if (requestType === 'DeviceInfoGet') {

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/device/Device.d.ts

@@ -146,18 +146,10 @@ export declare class Device extends EventEmitter {
     clearStandardInternalState(_deviceId?: string): void;
     initialize(options?: InitOptions): Promise<void>;
     private _initializeProtocolV2;
-    getFeatures(options?: {
-        source?: DeviceStateUpdateSource;
-        forceChangedKeys?: string[];
-    }): Promise<Features | undefined>;
+    getFeatures(): Promise<Features | undefined>;
     getDeviceState(params?: DeviceStateReadOptions): Promise<import("../types").DeviceState>;
-    _updateFeatures(protoFeatures: PROTO.Features | Features, initSession?: boolean, options?: {
-        source?: DeviceStateUpdateSource;
-        forceChangedKeys?: string[];
-    }): void;
-    updateState(patch: DeviceStatePatch, source: DeviceStateUpdateSource, options?: {
-        forceChangedKeys?: string[];
-    }): import("../types").DeviceState & {
+    _updateFeatures(protoFeatures: PROTO.Features | Features, initSession?: boolean): void;
+    updateState(patch: DeviceStatePatch, source: DeviceStateUpdateSource): import("../types").DeviceState & {
         raw?: import("../types").DeviceFeaturesRaw | undefined;
     };
     updateFeaturesPatch(patch: Partial<Features>, source: DeviceStateUpdateSource): Features | undefined;

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

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

package/dist/index.d.ts

@@ -925,18 +925,10 @@ declare class Device extends EventEmitter {
      * features state directly from DeviceInfoGet.
      */
     private _initializeProtocolV2;
-    getFeatures(options?: {
-        source?: DeviceStateUpdateSource;
-        forceChangedKeys?: string[];
-    }): Promise<Features | undefined>;
+    getFeatures(): Promise<Features | undefined>;
     getDeviceState(params?: DeviceStateReadOptions): Promise<DeviceState>;
-    _updateFeatures(protoFeatures: Messages.Features | Features, initSession?: boolean, options?: {
-        source?: DeviceStateUpdateSource;
-        forceChangedKeys?: string[];
-    }): void;
-    updateState(patch: DeviceStatePatch, source: DeviceStateUpdateSource, options?: {
-        forceChangedKeys?: string[];
-    }): DeviceState & {
+    _updateFeatures(protoFeatures: Messages.Features | Features, initSession?: boolean): void;
+    updateState(patch: DeviceStatePatch, source: DeviceStateUpdateSource): DeviceState & {
         raw?: DeviceFeaturesRaw | undefined;
     };
     updateFeaturesPatch(patch: Partial<Features>, source: DeviceStateUpdateSource): Features | undefined;

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 });
@@ -45624,7 +45640,7 @@ class Device extends events.exports {
             }
         });
     }
-    getFeatures(options) {
+    getFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isProtocolV2()) {
                 const deviceInfo = yield requestProtocolV2DeviceInfo({
@@ -45633,7 +45649,7 @@ class Device extends events.exports {
                 return this.probeProtocolV2RuntimeState(deviceInfo);
             }
             const { message } = yield this.commands.typedCall('GetFeatures', 'Features', {});
-            this._updateFeatures(message, undefined, options);
+            this._updateFeatures(message);
             return this.features;
         });
     }
@@ -45650,12 +45666,6 @@ class Device extends events.exports {
             };
             let initializedWithDeviceInfo = false;
             let refreshedDeviceInfo;
-            const protocolV1RefreshOptions = refresh.has('settings')
-                ? {
-                    source: 'settings-read',
-                    forceChangedKeys: ['settings'],
-                }
-                : undefined;
             if (!this.state) {
                 if (this.isProtocolV2()) {
                     const deviceInfo = yield requestProtocolV2DeviceInfo({
@@ -45667,11 +45677,11 @@ class Device extends events.exports {
                     initializedWithDeviceInfo = true;
                 }
                 else {
-                    yield this.getFeatures(protocolV1RefreshOptions);
+                    yield this.getFeatures();
                 }
             }
             else if (!this.isProtocolV2() && refresh.size > 0) {
-                yield this.getFeatures(protocolV1RefreshOptions);
+                yield this.getFeatures();
             }
             const supportsProtocolV1OnekeyFeatures = this.getCurrentDeviceType() === hdShared.EDeviceType.Touch ||
                 this.getCurrentDeviceType() === hdShared.EDeviceType.Pro;
@@ -45708,39 +45718,36 @@ class Device extends events.exports {
             return params.includeRaw ? cloneDeviceState(this.state) : createPublicDeviceState(this.state);
         });
     }
-    _updateFeatures(protoFeatures, initSession, options) {
-        var _a, _b;
+    _updateFeatures(protoFeatures, initSession) {
+        var _a;
         const previousDeviceId = this.getCurrentDeviceId();
         let feat = 'protocol' in protoFeatures
             ? protoFeatures
             : buildProtocolV1FeaturesPayload(protoFeatures, this.features);
         feat.unlocked = (_a = feat.unlocked) !== null && _a !== void 0 ? _a : true;
         feat = fixFeaturesFirmwareVersion(feat);
-        this.updateState(mapFeaturesToState(feat), (_b = options === null || options === void 0 ? void 0 : options.source) !== null && _b !== void 0 ? _b : 'initialize', {
-            forceChangedKeys: options === null || options === void 0 ? void 0 : options.forceChangedKeys,
-        });
+        this.updateState(mapFeaturesToState(feat), 'initialize');
         this.reconcileSessionCacheDeviceIdentity(previousDeviceId);
         if (feat.deviceId && feat.sessionId) {
             this.setInternalState(feat.sessionId, initSession);
         }
     }
-    updateState(patch, source, options) {
-        var _a, _b;
+    updateState(patch, source) {
+        var _a;
         const result = this.stateStore.update(patch, source);
-        const changedKeys = result.changedKeys.length > 0 ? result.changedKeys : (_a = options === null || options === void 0 ? void 0 : options.forceChangedKeys) !== null && _a !== void 0 ? _a : [];
-        if (changedKeys.length === 0)
+        if (result.changedKeys.length === 0)
             return result.state;
         const event = {
-            connectId: (_b = this.getConnectId()) !== null && _b !== void 0 ? _b : null,
+            connectId: (_a = this.getConnectId()) !== null && _a !== void 0 ? _a : null,
             state: createPublicDeviceState(result.state),
             revision: result.revision,
             source,
-            changedKeys,
+            changedKeys: result.changedKeys,
         };
         Log$g.debug('Device state updated', {
             source,
             revision: result.revision,
-            changedKeyCount: changedKeys.length,
+            changedKeyCount: result.changedKeys.length,
         });
         this.emit(DEVICE.STATE, this, event);
         if (result.state.protocol === 'V1') {
@@ -48512,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) {
@@ -48711,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);
         });
     }
 }
@@ -50460,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;
@@ -50492,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) {
@@ -50527,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 });
@@ -50547,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.121",
+  "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.121",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.121",
+    "@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": "916633f46e4d8e0599af2956a639474dd3cbd9ec"
+  "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/src/device/Device.ts

@@ -989,7 +989,7 @@ export class Device extends EventEmitter {
     }
   }
 
-  async getFeatures(options?: { source?: DeviceStateUpdateSource; forceChangedKeys?: string[] }) {
+  async getFeatures() {
     if (this.isProtocolV2()) {
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
@@ -998,7 +998,7 @@ export class Device extends EventEmitter {
     }
 
     const { message } = await this.commands.typedCall('GetFeatures', 'Features', {});
-    this._updateFeatures(message, undefined, options);
+    this._updateFeatures(message);
     return this.features;
   }
 
@@ -1012,13 +1012,6 @@ export class Device extends EventEmitter {
     let initializedWithDeviceInfo = false;
     let refreshedDeviceInfo: ProtocolV2DeviceInfo | undefined;
 
-    const protocolV1RefreshOptions = refresh.has('settings')
-      ? {
-          source: 'settings-read' as const,
-          forceChangedKeys: ['settings'],
-        }
-      : undefined;
-
     if (!this.state) {
       if (this.isProtocolV2()) {
         const deviceInfo = await requestProtocolV2DeviceInfo({
@@ -1029,10 +1022,10 @@ export class Device extends EventEmitter {
         refreshedDeviceInfo = deviceInfo;
         initializedWithDeviceInfo = true;
       } else {
-        await this.getFeatures(protocolV1RefreshOptions);
+        await this.getFeatures();
       }
     } else if (!this.isProtocolV2() && refresh.size > 0) {
-      await this.getFeatures(protocolV1RefreshOptions);
+      await this.getFeatures();
     }
 
     const supportsProtocolV1OnekeyFeatures =
@@ -1086,14 +1079,7 @@ export class Device extends EventEmitter {
     return params.includeRaw ? cloneDeviceState(this.state) : createPublicDeviceState(this.state);
   }
 
-  _updateFeatures(
-    protoFeatures: PROTO.Features | Features,
-    initSession?: boolean,
-    options?: {
-      source?: DeviceStateUpdateSource;
-      forceChangedKeys?: string[];
-    }
-  ) {
+  _updateFeatures(protoFeatures: PROTO.Features | Features, initSession?: boolean) {
     const previousDeviceId = this.getCurrentDeviceId();
     let feat =
       'protocol' in protoFeatures
@@ -1104,36 +1090,28 @@ export class Device extends EventEmitter {
 
     feat = fixFeaturesFirmwareVersion(feat);
 
-    this.updateState(mapFeaturesToState(feat), options?.source ?? 'initialize', {
-      forceChangedKeys: options?.forceChangedKeys,
-    });
+    this.updateState(mapFeaturesToState(feat), 'initialize');
     this.reconcileSessionCacheDeviceIdentity(previousDeviceId);
     if (feat.deviceId && feat.sessionId) {
       this.setInternalState(feat.sessionId, initSession);
     }
   }
 
-  updateState(
-    patch: DeviceStatePatch,
-    source: DeviceStateUpdateSource,
-    options?: { forceChangedKeys?: string[] }
-  ) {
+  updateState(patch: DeviceStatePatch, source: DeviceStateUpdateSource) {
     const result = this.stateStore.update(patch, source);
-    const changedKeys =
-      result.changedKeys.length > 0 ? result.changedKeys : options?.forceChangedKeys ?? [];
-    if (changedKeys.length === 0) return result.state;
+    if (result.changedKeys.length === 0) return result.state;
 
     const event: DeviceStateEvent = {
       connectId: this.getConnectId() ?? null,
       state: createPublicDeviceState(result.state),
       revision: result.revision,
       source,
-      changedKeys,
+      changedKeys: result.changedKeys,
     };
     Log.debug('Device state updated', {
       source,
       revision: result.revision,
-      changedKeyCount: changedKeys.length,
+      changedKeyCount: result.changedKeys.length,
     });
     this.emit(DEVICE.STATE, this, event);
     if (result.state.protocol === 'V1') {

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]
-    );
-  });
-});