@onekeyfe/hd-core 1.2.0-alpha.67 → 1.2.0-alpha.68

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/dist/protocols/protocol-v2/lockedError.d.ts

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

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

@@ -1 +0,0 @@
-{"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

@@ -1,10 +0,0 @@
-import type { BaseMethod } from '../../api/BaseMethod';
-import type { Device } from '../../device/Device';
-import type { ProtocolV2UiInteractionCoordinator } from './uiInteraction';
-type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy' | 'protocolV2UiInteraction' | 'protocolV2UiMode' | 'params' | 'payload' | 'useDevicePassphraseState'> & {
-    name?: string;
-};
-type UiInteractionCoordinator = Pick<ProtocolV2UiInteractionCoordinator, 'enterMethodInteraction' | 'enterUnlockInteraction' | 'resumeMethodInteraction'>;
-export declare function runMethodWithUnlockRetry(method: RunnableMethod, device: Device, uiCoordinator?: UiInteractionCoordinator): Promise<any>;
-export {};
-//# sourceMappingURL=unlockRetry.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"unlockRetry.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockRetry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,yBAAyB,GACzB,kBAAkB,GAClB,QAAQ,GACR,SAAS,GACT,0BAA0B,CAC7B,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACtB,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,GAAG,yBAAyB,CAChF,CAAC;AAkBF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,wBAAwB,gBA+DzC"}

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

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

@@ -1,10 +0,0 @@
-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,109 +0,0 @@
-import { LoggerNames, getLogger } from '../../utils';
-import { isDeviceLockedError } from './lockedError';
-import { isProtocolV2UiEnabled, resolveProtocolV2UiInteraction } from './uiInteraction';
-import { refreshProtocolV2DeviceStatus, restoreProtocolV2WalletSession } from './walletSession';
-
-import type { BaseMethod } from '../../api/BaseMethod';
-import type { Device } from '../../device/Device';
-import type { ProtocolV2UiInteractionCoordinator } from './uiInteraction';
-
-const Log = getLogger(LoggerNames.Core);
-
-type RunnableMethod = Pick<
-  BaseMethod,
-  | 'run'
-  | 'unlockPolicy'
-  | 'protocolV2UiInteraction'
-  | 'protocolV2UiMode'
-  | 'params'
-  | 'payload'
-  | 'useDevicePassphraseState'
-> & { name?: string };
-type UiInteractionCoordinator = Pick<
-  ProtocolV2UiInteractionCoordinator,
-  'enterMethodInteraction' | 'enterUnlockInteraction' | 'resumeMethodInteraction'
->;
-
-const restoreExpectedWalletSessionAfterUnlock = async (method: RunnableMethod, device: Device) => {
-  const expectedPassphraseState = method.payload?.useEmptyPassphrase
-    ? undefined
-    : method.payload?.passphraseState ?? device.passphraseState;
-  if (
-    !method.useDevicePassphraseState ||
-    typeof expectedPassphraseState !== 'string' ||
-    expectedPassphraseState.length === 0
-  ) {
-    return;
-  }
-
-  await restoreProtocolV2WalletSession(device, expectedPassphraseState);
-  Log.debug('Protocol V2 wallet session restored after unlock', { method: method.name });
-};
-
-export async function runMethodWithUnlockRetry(
-  method: RunnableMethod,
-  device: Device,
-  uiCoordinator?: UiInteractionCoordinator
-) {
-  const shouldEmitUi = isProtocolV2UiEnabled(method);
-  const isProtocolV2 = device.isProtocolV2();
-  const requiresFreshStatus =
-    isProtocolV2 &&
-    method.unlockPolicy === 'unlock-before-run' &&
-    !device.isBootloader?.() &&
-    !device.isRomloader?.();
-
-  if (requiresFreshStatus) {
-    await refreshProtocolV2DeviceStatus(device);
-  }
-
-  const shouldUnlockBeforeRun =
-    isProtocolV2 &&
-    method.unlockPolicy !== 'none' &&
-    !device.isBootloader?.() &&
-    !device.isRomloader?.() &&
-    device.features?.unlocked === false;
-
-  if (shouldUnlockBeforeRun) {
-    if (shouldEmitUi) {
-      uiCoordinator?.enterUnlockInteraction(method.name);
-    }
-    await device.unlockDevice();
-    Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
-    await restoreExpectedWalletSessionAfterUnlock(method, device);
-    if (shouldEmitUi) {
-      uiCoordinator?.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
-    }
-    return method.run();
-  }
-
-  if (shouldEmitUi) {
-    uiCoordinator?.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
-  }
-  try {
-    return await method.run();
-  } catch (error) {
-    if (!isProtocolV2 || method.unlockPolicy !== 'retry-on-locked' || !isDeviceLockedError(error)) {
-      throw error;
-    }
-
-    Log.debug('Protocol V2 unlock retry triggered', { method: method.name });
-    if (shouldEmitUi) {
-      uiCoordinator?.enterUnlockInteraction(method.name);
-    }
-    await device.unlockDevice();
-    Log.debug('Protocol V2 unlock completed', { method: method.name });
-    await restoreExpectedWalletSessionAfterUnlock(method, device);
-    if (shouldEmitUi) {
-      uiCoordinator?.resumeMethodInteraction();
-    }
-    try {
-      const response = await method.run();
-      Log.debug('Protocol V2 method retry completed', { method: method.name, success: true });
-      return response;
-    } catch (retryError) {
-      Log.debug('Protocol V2 method retry completed', { method: method.name, success: false });
-      throw retryError;
-    }
-  }
-}