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

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

@@ -1 +1 @@
-{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,CAAC;AA8B7D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4D9D"}
+{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,CAAC;AA8BjE,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4E9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CAE9D"}

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.67",
+  "version": "1.2.0-alpha.68",
   "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.67",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.67",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.68",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.68",
     "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": "5fea66e8c65a1fab2ccc099b2811c8749b2487e0"
+  "gitHead": "6e8a931d08768980cfe7fa918bba447ed73e2724"
 }

package/src/api/BaseMethod.ts

@@ -16,16 +16,14 @@ import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/re
 import { LoggerNames, getLogger } from '../utils';
 import { generateInstanceId } from '../utils/tracing';
 import { DeviceModelToTypes } from '../types';
-import {
-  type UnlockPolicy,
-  getProtocolV2UnlockPolicy,
-} from '../protocols/protocol-v2/unlockPolicy';
 
 import type { Device } from '../device/Device';
 import type DeviceConnector from '../device/DeviceConnector';
 import type { DeviceFirmwareRange, KnownDevice } from '../types';
 import type { CoreMessage } from '../events';
+import type { UnlockPolicy } from '../protocols/protocol-v2/unlockPolicy';
 import type { ProtocolV2InteractionDescriptor } from '../protocols/protocol-v2/uiInteraction';
+import type { ProtocolV2UnlockContext } from '../protocols/protocol-v2/unlockPolicyRunner';
 import type { RequestContext } from '../utils/tracing';
 import type { CoreContext } from '../core';
 
@@ -128,9 +126,7 @@ export abstract class BaseMethod<Params = undefined> {
    */
   checkDeviceId = false;
 
-  /**
-   * 该方法是否需要校验 passphrase state
-   */
+  /** Whether the method requires wallet-session selection and Protocol V2 pre-unlock. */
   useDevicePassphraseState = true;
 
   /**
@@ -168,9 +164,12 @@ export abstract class BaseMethod<Params = undefined> {
    */
   strictCheckDeviceSupport = false;
 
-  /** Core unlocks and retries only explicitly replay-safe Protocol V2 methods. */
+  /** Non-wallet methods may explicitly require Protocol V2 pre-unlock. */
   unlockPolicy: UnlockPolicy = 'none';
 
+  /** Shared by composite methods so nested calls do not repeat the root preflight. */
+  protocolV2UnlockContext?: ProtocolV2UnlockContext;
+
   getSupportedProtocols(): readonly ProtocolType[] {
     return ['V1'];
   }
@@ -188,7 +187,7 @@ export abstract class BaseMethod<Params = undefined> {
   /** Non-blocking Protocol V2 interaction synthesized by the SDK. */
   protocolV2UiInteraction?: ProtocolV2InteractionDescriptor;
 
-  /** Special background methods may suppress all synthesized Protocol V2 UI events. */
+  /** Special background methods may suppress method-level Protocol V2 UI events. */
   protocolV2UiMode: ProtocolV2UiMode = 'auto';
 
   protected throwIfAborted() {
@@ -217,7 +216,6 @@ export abstract class BaseMethod<Params = undefined> {
     this.useDevice = true;
     this.allowDeviceMode = [UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
-    this.unlockPolicy = getProtocolV2UnlockPolicy(this.name);
   }
 
   abstract init(): void;

package/src/api/CheckAllFirmwareRelease.ts

@@ -1,4 +1,10 @@
-import { EFirmwareType, ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import {
+  EDeviceType,
+  EFirmwareType,
+  ERRORS,
+  HardwareError,
+  HardwareErrorCode,
+} from '@onekeyfe/hd-shared';
 import semver from 'semver';
 
 import { BaseMethod } from './BaseMethod';
@@ -14,6 +20,10 @@ import {
   validateFirmwareUpdatePlanForceTargets,
 } from './firmware/FirmwareUpdatePlan';
 import { getBridgeReleaseInfo } from '../utils/bridgeUpdate';
+import {
+  buildProtocolV2ResourceUpdatePlan,
+  readProtocolV2ResourceInventory,
+} from '../protocols/protocol-v2/resources';
 import {
   LoggerNames,
   getDeviceFirmwareVersion,
@@ -101,6 +111,7 @@ function buildComponentRelease({
   component,
   currentVersions,
   currentVerification,
+  checkFirmwareHash,
   remotePayloadHash,
   releaseRequired,
 }: {
@@ -108,6 +119,7 @@ function buildComponentRelease({
   component: IProtocolV2FirmwareComponent;
   currentVersions: DeviceStateVersions;
   currentVerification: Partial<DeviceFeaturesVerify>;
+  checkFirmwareHash: boolean;
   remotePayloadHash: string | null | undefined;
   releaseRequired: boolean;
 }): ProtocolV2FirmwareComponentRelease {
@@ -136,7 +148,7 @@ function buildComponentRelease({
       status = 'valid';
     } else {
       const currentHashKey = CURRENT_HASH_BY_COMPONENT_TARGET[componentTarget];
-      if (!currentHashKey) {
+      if (!checkFirmwareHash || !currentHashKey) {
         status = 'valid';
       } else {
         const currentHash = normalizeHex(currentVerification[currentHashKey]);
@@ -175,12 +187,14 @@ type ProtocolV2FirmwareReleasePlan = {
 export function buildProtocolV2FirmwareRelease({
   currentVersions,
   currentVerification = {},
+  checkFirmwareHash = false,
   remotePayloadHashes = {},
   firmwareType,
   release,
 }: {
   currentVersions: DeviceStateVersions;
   currentVerification?: Partial<DeviceFeaturesVerify>;
+  checkFirmwareHash?: boolean;
   remotePayloadHashes?: Readonly<Record<string, string | null>>;
   firmwareType: EFirmwareType;
   release: IFirmwareReleaseInfo | undefined;
@@ -204,6 +218,7 @@ export function buildProtocolV2FirmwareRelease({
       component,
       currentVersions,
       currentVerification,
+      checkFirmwareHash,
       remotePayloadHash: Object.prototype.hasOwnProperty.call(remotePayloadHashes, configKey)
         ? remotePayloadHashes[configKey]
         : normalizeHex(component.payloadHash),
@@ -230,9 +245,6 @@ export function buildProtocolV2FirmwareRelease({
   const targetsToUpdate = components.flatMap(component =>
     component.status === 'outdated' && component.updateTarget ? [component.updateTarget] : []
   );
-  if (targetsToUpdate.length > 0 && release.resourceBundles?.length) {
-    targetsToUpdate.push('resource');
-  }
   const uniqueTargetsToUpdate = Array.from(new Set(targetsToUpdate));
   const hasUpgrade = uniqueTargetsToUpdate.length > 0;
   const required = release.required && hasUpgrade;
@@ -358,13 +370,17 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
   }
 
   private async runProtocolV2(): Promise<AllFirmwareRelease> {
+    const { checkFirmwareHash = false, firmwareType: firmwareTypeParam } = this
+      .payload as CheckAllFirmwareReleaseParams;
     const state = await this.device.getDeviceState({
-      refreshSections: ['identity', 'versions', 'verification'],
+      refreshSections: checkFirmwareHash
+        ? ['identity', 'versions', 'verification']
+        : ['identity', 'versions'],
     });
-    if (state.identity.deviceType !== 'pro2') {
+    if (state.identity.deviceType !== 'pro2' && state.identity.deviceType !== 'neo') {
       throw ERRORS.TypedError(
         HardwareErrorCode.DeviceNotSupportMethod,
-        'checkAllFirmwareRelease requires a Pro2 device for Protocol V2'
+        'checkAllFirmwareRelease requires a Pro2 or Neo device for Protocol V2'
       );
     }
 
@@ -376,16 +392,47 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       );
     }
 
-    const { firmwareType: firmwareTypeParam } = this.payload as CheckAllFirmwareReleaseParams;
     const firmwareType =
       firmwareTypeParam ?? state.identity.firmwareType ?? EFirmwareType.Universal;
     const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
     const plan = buildProtocolV2FirmwareRelease({
       currentVersions: state.versions,
-      currentVerification: state.verification,
+      currentVerification: checkFirmwareHash ? state.verification : undefined,
+      checkFirmwareHash,
       firmwareType,
       release,
     });
+    const resourceDeviceType =
+      state.identity.deviceType === 'neo' ? EDeviceType.Neo : EDeviceType.Pro2;
+    const resources = DataManager.getProtocolV2Resources(resourceDeviceType);
+    let resourceStatus: 'valid' | 'outdated' | 'unknown' = 'unknown';
+    if (resources?.length) {
+      const loaderMode = state.status.mode === 'bootloader' || state.status.mode === 'romloader';
+      // Application mode rejects host access to vol0:/bundles. Resource inventory is
+      // resolved after FirmwareUpdateV4 enters a loader instead of probing here.
+      if (loaderMode) {
+        try {
+          const inventory = await readProtocolV2ResourceInventory({
+            commands: this.device.getCommands(),
+            resources,
+          });
+          resourceStatus = buildProtocolV2ResourceUpdatePlan({
+            resources,
+            inventory,
+            mode: 'bootloader-recovery',
+          }).status;
+        } catch {
+          resourceStatus = buildProtocolV2ResourceUpdatePlan({
+            resources,
+            mode: 'bootloader-recovery',
+          }).status;
+        }
+      }
+    }
+    const targetsToUpdate = [
+      ...plan.targetsToUpdate,
+      ...(resourceStatus === 'outdated' ? (['resource'] as const) : []),
+    ];
     const firmwareStatus = plan.status === 'unavailable' ? 'unknown' : plan.status;
     const emptyRelease = 'none' as const;
 
@@ -406,8 +453,11 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       },
       features,
       protocol: 'V2',
-      deviceType: 'pro2',
+      deviceType: state.identity.deviceType,
       ...plan,
+      resourceStatus,
+      hasUpgrade: plan.hasUpgrade || resourceStatus === 'outdated',
+      targetsToUpdate,
     };
   }
 }

package/src/api/DetectDeviceConnectProtocol.ts

@@ -0,0 +1,18 @@
+import { BaseMethod } from './BaseMethod';
+
+export default class DetectDeviceConnectProtocol extends BaseMethod {
+  init() {
+    this.payload.forceProtocolDetection = true;
+    this.useDevicePassphraseState = false;
+    this.skipForceUpdateCheck = true;
+    this.unlockPolicy = 'none';
+  }
+
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
+  run() {
+    return Promise.resolve(this.device.getProtocol());
+  }
+}

package/src/api/FirmwareUpdate.ts

@@ -96,7 +96,8 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
             await this.device.deviceConnector?.acquire(
               this.device.originalDescriptor.id,
               null,
-              true
+              true,
+              this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType
             );
             // Bound each probe so a request the rebooting device never received
             // frees the slot for the next tick instead of hanging into the
@@ -115,7 +116,10 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
         } else {
           const deviceDiff = await this.device.deviceConnector?.enumerate();
           const devicesDescriptor = deviceDiff?.descriptors ?? [];
-          const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId);
+          const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId, {
+            connectProtocol:
+              this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType,
+          });
 
           if (deviceList.length === 1 && deviceList[0]?.isBootloader()) {
             // should update current device from cache

package/src/api/FirmwareUpdateV2.ts

@@ -304,7 +304,8 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
             await this.device.deviceConnector?.acquire(
               this.device.originalDescriptor.id,
               null,
-              true
+              true,
+              this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType
             );
             // Bound each probe so a request the rebooting device never received
             // frees the slot for the next tick instead of hanging into the
@@ -343,7 +344,9 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
   ) {
     const deviceDiff = await this.device.deviceConnector?.enumerate();
     const devicesDescriptor = deviceDiff?.descriptors ?? [];
-    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId);
+    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId, {
+      connectProtocol: this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType,
+    });
 
     if (deviceList.length === 1 && deviceList[0]?.isBootloader()) {
       // should update current device from cache

package/src/api/FirmwareUpdateV3.ts

@@ -705,7 +705,8 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
             await this.device.deviceConnector?.acquire(
               this.device.originalDescriptor.id,
               null,
-              true
+              true,
+              this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType
             );
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
             await Promise.race([
@@ -742,7 +743,10 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
             webUsbCheckCount = 0;
           }
 
-          const { deviceList } = await DevicePool.getDevices(devicesDescriptor, this.connectId);
+          const { deviceList } = await DevicePool.getDevices(devicesDescriptor, this.connectId, {
+            connectProtocol:
+              this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType,
+          });
 
           if (deviceList.length === 1) {
             this.device.updateFromCache(deviceList[0]);