@onekeyfe/hd-core 1.2.0-alpha.37 → 1.2.0-alpha.39

package/__tests__/uiProgressThrottle.test.ts

@@ -0,0 +1,74 @@
+import { createUiMessage } from '../src/events';
+import { UI_REQUEST } from '../src/events/ui-request';
+import { createUiProgressMessageFilter } from '../src/utils/uiProgressThrottle';
+
+import type { KnownDevice } from '../src/types';
+
+describe('createUiProgressMessageFilter', () => {
+  let currentTime: number;
+  let shouldPostMessage: ReturnType<typeof createUiProgressMessageFilter>;
+
+  beforeEach(() => {
+    currentTime = 1_000;
+    shouldPostMessage = createUiProgressMessageFilter(250, () => currentTime);
+  });
+
+  const firmwareProgress = (
+    progress: number,
+    progressType: 'transferData' | 'installingFirmware' = 'transferData'
+  ) =>
+    createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
+      device: {} as KnownDevice,
+      progress,
+      progressType,
+    });
+
+  test('limits firmware progress to one event per interval', () => {
+    expect(shouldPostMessage(firmwareProgress(1))).toBe(true);
+
+    currentTime += 100;
+    expect(shouldPostMessage(firmwareProgress(1))).toBe(false);
+
+    currentTime += 150;
+    expect(shouldPostMessage(firmwareProgress(1))).toBe(true);
+  });
+
+  test('limits transfer and install progress independently', () => {
+    expect(shouldPostMessage(firmwareProgress(1, 'transferData'))).toBe(true);
+    expect(shouldPostMessage(firmwareProgress(1, 'installingFirmware'))).toBe(true);
+
+    currentTime += 10;
+    expect(shouldPostMessage(firmwareProgress(2, 'transferData'))).toBe(false);
+    expect(shouldPostMessage(firmwareProgress(2, 'installingFirmware'))).toBe(false);
+  });
+
+  test('emits phase boundaries immediately and suppresses duplicate boundaries', () => {
+    expect(shouldPostMessage(firmwareProgress(0))).toBe(true);
+    expect(shouldPostMessage(firmwareProgress(0))).toBe(false);
+
+    currentTime += 10;
+    expect(shouldPostMessage(firmwareProgress(50))).toBe(false);
+    expect(shouldPostMessage(firmwareProgress(100))).toBe(true);
+    expect(shouldPostMessage(firmwareProgress(100))).toBe(false);
+
+    expect(shouldPostMessage(firmwareProgress(0))).toBe(true);
+  });
+
+  test('treats decreasing progress as a new phase', () => {
+    expect(shouldPostMessage(firmwareProgress(80))).toBe(true);
+
+    currentTime += 10;
+    expect(shouldPostMessage(firmwareProgress(20))).toBe(true);
+  });
+
+  test('also limits device progress and leaves other UI events unchanged', () => {
+    const deviceProgress = (progress: number) =>
+      createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress });
+
+    expect(shouldPostMessage(deviceProgress(1))).toBe(true);
+    currentTime += 10;
+    expect(shouldPostMessage(deviceProgress(2))).toBe(false);
+
+    expect(shouldPostMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW))).toBe(true);
+  });
+});

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts

@@ -7,7 +7,6 @@ import type { Deferred } from '@onekeyfe/hd-shared';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     checkPromise: Deferred<any> | null;
-    private shouldPostFirmwareProgress;
     init(): void;
     run(): Promise<any>;
     isBleReconnect(): boolean;

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,0BAA0B,CAAoC;IAEtE,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAYhF;cAEc,qCAAqC;cAkBrC,uCAAuC;IAkBvD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YA0FvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}
+{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;cAEc,qCAAqC;cAkBrC,uCAAuC;IAkBvD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YA0FvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}

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;AA8BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAUxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA+D7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA+EvE,CAAC;AAg1BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AA6FF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAgKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAkExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,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;AA8BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAWxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA+D7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AAg1BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AA6FF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAgKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAkExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,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/index.js

@@ -47192,35 +47192,6 @@ class DeviceFullyUploadResource extends BaseMethod {
     }
 }
 
-const DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS = 250;
-const createFirmwareProgressThrottle = (intervalMs = DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS) => {
-    const stateByType = new Map();
-    return (progress, progressType) => {
-        if (progressType !== 'transferData') {
-            return true;
-        }
-        const normalizedProgress = Math.max(0, Math.min(100, Math.floor(progress)));
-        if (normalizedProgress === 0 || normalizedProgress === 100) {
-            stateByType.set(progressType, {
-                lastEmittedAt: Date.now(),
-                lastProgress: normalizedProgress,
-            });
-            return true;
-        }
-        const now = Date.now();
-        const state = stateByType.get(progressType);
-        if (state &&
-            (state.lastProgress === normalizedProgress || now - state.lastEmittedAt < intervalMs)) {
-            return false;
-        }
-        stateByType.set(progressType, {
-            lastEmittedAt: now,
-            lastProgress: normalizedProgress,
-        });
-        return true;
-    };
-};
-
 const Log$9 = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$1 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
@@ -47234,7 +47205,6 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
     constructor() {
         super(...arguments);
         this.checkPromise = null;
-        this.shouldPostFirmwareProgress = createFirmwareProgressThrottle();
         this.postTipMessage = (message) => {
             this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_TIP, {
                 device: this.device.toMessageObject(),
@@ -47249,9 +47219,6 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }));
         };
         this.postProgressMessage = (progress, progressType) => {
-            if (!this.shouldPostFirmwareProgress(progress, progressType)) {
-                return;
-            }
             this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
                 device: this.device.toMessageObject(),
                 progress,
@@ -60644,6 +60611,44 @@ const getSynchronize = (mutex) => {
     return (action, lockId) => lock(lockId).then(unlock => Promise.resolve().then(action).finally(unlock));
 };
 
+const DEFAULT_UI_PROGRESS_INTERVAL_MS = 250;
+const normalizeProgress = (progress) => {
+    if (typeof progress !== 'number' || !Number.isFinite(progress)) {
+        return undefined;
+    }
+    return Math.max(0, Math.min(100, Math.floor(progress)));
+};
+const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL_MS, now = Date.now) => {
+    const stateByType = new Map();
+    return (message) => {
+        if (!('event' in message) ||
+            message.event !== UI_EVENT ||
+            (message.type !== UI_REQUEST.DEVICE_PROGRESS && message.type !== UI_REQUEST.FIRMWARE_PROGRESS)) {
+            return true;
+        }
+        const key = message.type === UI_REQUEST.FIRMWARE_PROGRESS
+            ? `${message.type}:${message.payload.progressType}`
+            : message.type;
+        const progress = normalizeProgress(message.payload.progress);
+        const currentTime = now();
+        const state = stateByType.get(key);
+        if (!state) {
+            stateByType.set(key, { lastEmittedAt: currentTime, lastProgress: progress });
+            return true;
+        }
+        const isBoundary = progress === 0 || progress === 100;
+        if (isBoundary && progress === state.lastProgress) {
+            return false;
+        }
+        const startsNewPhase = progress !== undefined && state.lastProgress !== undefined && progress < state.lastProgress;
+        if (!isBoundary && !startsNewPhase && currentTime - state.lastEmittedAt < intervalMs) {
+            return false;
+        }
+        stateByType.set(key, { lastEmittedAt: currentTime, lastProgress: progress });
+        return true;
+    };
+};
+
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
 const preWarmInflight = new Map();
@@ -60709,7 +60714,12 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     try {
         method = findMethod(message);
         method.connector = _connector;
-        method.postMessage = postMessage;
+        const shouldPostMessage = createUiProgressMessageFilter();
+        method.postMessage = event => {
+            if (shouldPostMessage(event)) {
+                postMessage(event);
+            }
+        };
         (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, context);
         method.requestContext = createRequestContext(method.responseID, method.name, {
             sdkInstanceId: context.sdkInstanceId,

package/dist/utils/uiProgressThrottle.d.ts

@@ -0,0 +1,3 @@
+import type { CoreMessage } from '../events';
+export declare const createUiProgressMessageFilter: (intervalMs?: number, now?: () => number) => (message: CoreMessage) => boolean;
+//# sourceMappingURL=uiProgressThrottle.d.ts.map

package/dist/utils/uiProgressThrottle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uiProgressThrottle.d.ts","sourceRoot":"","sources":["../../src/utils/uiProgressThrottle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAiB7C,eAAO,MAAM,6BAA6B,yDAMvB,WAAW,YAqC7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.37",
+  "version": "1.2.0-alpha.39",
   "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.37",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.37",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.39",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.39",
     "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": "af7d87f4136ea4ce3cbec3546e4ad52a3f5c0e1f"
+  "gitHead": "2cb8f692689327fc7e77cb848223cbeaa740dcad"
 }

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -13,7 +13,6 @@ import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
 import { BaseMethod } from '../BaseMethod';
 import { DEVICE } from '../../events';
-import { createFirmwareProgressThrottle } from './progressThrottle';
 
 import type {
   IFirmwareUpdateProgressType,
@@ -41,8 +40,6 @@ const isDeviceDisconnectedError = (error: unknown) => {
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
-  private shouldPostFirmwareProgress = createFirmwareProgressThrottle();
-
   init(): void {}
 
   run(): Promise<any> {
@@ -86,10 +83,6 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    * @param progress Post the percentage of the progress
    */
   postProgressMessage = (progress: number, progressType: IFirmwareUpdateProgressType) => {
-    if (!this.shouldPostFirmwareProgress(progress, progressType)) {
-      return;
-    }
-
     this.postMessage(
       createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
         device: this.device.toMessageObject() as KnownDevice,

package/src/core/index.ts

@@ -60,6 +60,7 @@ import {
   ProtocolV2UiInteractionCoordinator,
   isProtocolV2UiEnabled,
 } from '../protocols/protocol-v2/uiInteraction';
+import { createUiProgressMessageFilter } from '../utils/uiProgressThrottle';
 
 import type { ConnectSettings, Features, KnownDevice } from '../types';
 import type { CoreMessage, IFrameCallMessage, UiPromise, UiPromiseResponse } from '../events';
@@ -154,7 +155,12 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
   try {
     method = findMethod(message as IFrameCallMessage);
     method.connector = _connector;
-    method.postMessage = postMessage;
+    const shouldPostMessage = createUiProgressMessageFilter();
+    method.postMessage = event => {
+      if (shouldPostMessage(event)) {
+        postMessage(event);
+      }
+    };
     method.setContext?.(context);
 
     method.requestContext = createRequestContext(method.responseID, method.name, {

package/src/utils/uiProgressThrottle.ts

@@ -0,0 +1,63 @@
+import { UI_EVENT, UI_REQUEST } from '../events/ui-request';
+
+import type { CoreMessage } from '../events';
+
+const DEFAULT_UI_PROGRESS_INTERVAL_MS = 250;
+
+type UiProgressThrottleState = {
+  lastEmittedAt: number;
+  lastProgress?: number;
+};
+
+const normalizeProgress = (progress: unknown) => {
+  if (typeof progress !== 'number' || !Number.isFinite(progress)) {
+    return undefined;
+  }
+
+  return Math.max(0, Math.min(100, Math.floor(progress)));
+};
+
+export const createUiProgressMessageFilter = (
+  intervalMs = DEFAULT_UI_PROGRESS_INTERVAL_MS,
+  now = Date.now
+) => {
+  const stateByType = new Map<string, UiProgressThrottleState>();
+
+  return (message: CoreMessage) => {
+    if (
+      !('event' in message) ||
+      message.event !== UI_EVENT ||
+      (message.type !== UI_REQUEST.DEVICE_PROGRESS && message.type !== UI_REQUEST.FIRMWARE_PROGRESS)
+    ) {
+      return true;
+    }
+
+    const key =
+      message.type === UI_REQUEST.FIRMWARE_PROGRESS
+        ? `${message.type}:${message.payload.progressType}`
+        : message.type;
+    const progress = normalizeProgress(message.payload.progress);
+    const currentTime = now();
+    const state = stateByType.get(key);
+
+    if (!state) {
+      stateByType.set(key, { lastEmittedAt: currentTime, lastProgress: progress });
+      return true;
+    }
+
+    const isBoundary = progress === 0 || progress === 100;
+    if (isBoundary && progress === state.lastProgress) {
+      return false;
+    }
+
+    const startsNewPhase =
+      progress !== undefined && state.lastProgress !== undefined && progress < state.lastProgress;
+
+    if (!isBoundary && !startsNewPhase && currentTime - state.lastEmittedAt < intervalMs) {
+      return false;
+    }
+
+    stateByType.set(key, { lastEmittedAt: currentTime, lastProgress: progress });
+    return true;
+  };
+};

package/dist/api/firmware/progressThrottle.d.ts

@@ -1,3 +0,0 @@
-import type { IFirmwareUpdateProgressType } from '../../events/ui-request';
-export declare const createFirmwareProgressThrottle: (intervalMs?: number) => (progress: number, progressType: IFirmwareUpdateProgressType) => boolean;
-//# sourceMappingURL=progressThrottle.d.ts.map

package/dist/api/firmware/progressThrottle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"progressThrottle.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/progressThrottle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAS3E,eAAO,MAAM,8BAA8B,sCAKvB,MAAM,gBAAgB,2BAA2B,YA6BpE,CAAC"}

package/src/api/firmware/progressThrottle.ts

@@ -1,44 +0,0 @@
-import type { IFirmwareUpdateProgressType } from '../../events/ui-request';
-
-const DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS = 250;
-
-type FirmwareProgressThrottleState = {
-  lastEmittedAt: number;
-  lastProgress?: number;
-};
-
-export const createFirmwareProgressThrottle = (
-  intervalMs = DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS
-) => {
-  const stateByType = new Map<IFirmwareUpdateProgressType, FirmwareProgressThrottleState>();
-
-  return (progress: number, progressType: IFirmwareUpdateProgressType) => {
-    if (progressType !== 'transferData') {
-      return true;
-    }
-
-    const normalizedProgress = Math.max(0, Math.min(100, Math.floor(progress)));
-    if (normalizedProgress === 0 || normalizedProgress === 100) {
-      stateByType.set(progressType, {
-        lastEmittedAt: Date.now(),
-        lastProgress: normalizedProgress,
-      });
-      return true;
-    }
-
-    const now = Date.now();
-    const state = stateByType.get(progressType);
-    if (
-      state &&
-      (state.lastProgress === normalizedProgress || now - state.lastEmittedAt < intervalMs)
-    ) {
-      return false;
-    }
-
-    stateByType.set(progressType, {
-      lastEmittedAt: now,
-      lastProgress: normalizedProgress,
-    });
-    return true;
-  };
-};