@onekeyfe/hd-core 1.2.0-alpha.12 → 1.2.0-alpha.13

package/src/data/messages/messages.json

@@ -7784,14 +7784,6 @@
         "passphrase_state": {
           "type": "string",
           "id": 1
-        },
-        "_only_main_pin": {
-          "type": "bool",
-          "id": 2
-        },
-        "allow_create_attach_pin": {
-          "type": "bool",
-          "id": 3
         }
       }
     },

package/src/device/Device.ts

@@ -67,7 +67,6 @@ import type { PassphrasePromptResponse } from './DeviceCommands';
 import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type {
   OneKeyDeviceInfo as DeviceDescriptor,
-  DeviceSessionPinResult,
   DeviceStatus,
   ProtocolV2DeviceInfo,
   Success,
@@ -1139,7 +1138,7 @@ export class Device extends EventEmitter {
     // both allow and require cases might generate single unexpected mode
     if (!this.isUnacquired()) {
       // allow cases
-      if (this.isBootloader() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
+      if (this.isBootloader() && !this.isProtocolV2() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
         return UI_REQUEST.BOOTLOADER;
       }
       if (!this.isInitialized() && !allow.includes(UI_REQUEST.NOT_INITIALIZE)) {
@@ -1190,12 +1189,8 @@ export class Device extends EventEmitter {
 
   async unlockDevice() {
     if (this.isProtocolV2()) {
-      let pinResult: DeviceSessionPinResult;
       try {
-        ({ message: pinResult } = await this.commands.typedCall(
-          'DeviceSessionAskPin',
-          'DeviceSessionPinResult'
-        ));
+        await this.commands.typedCall('DeviceSessionAskPin', 'Success');
       } catch (error) {
         const errorText =
           error instanceof Error
@@ -1207,16 +1202,11 @@ export class Device extends EventEmitter {
         throw error;
       }
 
-      const status: DeviceStatus = {};
-      if (pinResult.unlocked != null) {
-        status.unlocked = pinResult.unlocked;
-      }
-      if (pinResult.unlocked_attach_pin != null) {
-        status.unlocked_by_attach_to_pin = pinResult.unlocked_attach_pin;
-      }
-      if (pinResult.passphrase_protection != null) {
-        status.passphrase_enabled = pinResult.passphrase_protection;
-      }
+      const { message: status } = await this.commands.typedCall(
+        'DeviceStatusGet',
+        'DeviceStatus',
+        {}
+      );
       return this.updateProtocolV2Status(status);
     }
 

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -135,6 +135,7 @@ export const buildProtocolV1FeaturesPayload = (
   const sessionId = features.session_id ?? previous?.sessionId ?? null;
 
   return {
+    ...features,
     protocol: 'V1',
     protocolVersion: features.protocol_version ?? previous?.protocolVersion ?? 1,
     deviceType,
@@ -207,6 +208,7 @@ export const buildProtocolV1FeaturesPayload = (
       se04BootHash: features.onekey_se04_boot_hash,
     },
     sessionId,
+    session_id: sessionId ?? undefined,
     raw: {
       protocolV1Features,
     },
@@ -364,6 +366,12 @@ export const buildProtocolV2FeaturesPayload = (
       se04BootHash: getImageHash(info?.se4?.bootloader) ?? previous?.verify?.se04BootHash,
     },
     sessionId: previous?.sessionId ?? null,
+    device_id: deviceId ?? undefined,
+    session_id: previous?.sessionId ?? undefined,
+    ble_name: bleName ?? undefined,
+    onekey_device_type: 'PRO2',
+    passphrase_protection: passphraseProtection ?? undefined,
+    bootloader_mode: bootloaderMode,
     passphraseState: previous?.passphraseState,
     unlockedAttachPin,
     raw: {

package/src/inject.ts

@@ -207,8 +207,6 @@ export const createCoreApi = (
   filesystemPathInfoQuery: (connectId, params) =>
     call({ ...params, connectId, method: 'filesystemPathInfoQuery' }),
   filesystemFormat: connectId => call({ connectId, method: 'filesystemFormat' }),
-  filesystemDiskControl: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDiskControl' }),
   deviceRecovery: (connectId, params) => call({ ...params, connectId, method: 'deviceRecovery' }),
   deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
   deviceSettings: (connectId, params) => call({ ...params, connectId, method: 'deviceSettings' }),

package/src/types/api/index.ts

@@ -21,7 +21,6 @@ import type {
   filesystemDirList,
   filesystemDirMake,
   filesystemDirRemove,
-  filesystemDiskControl,
   filesystemFileDelete,
   filesystemFileRead,
   filesystemFileWrite,
@@ -294,7 +293,6 @@ export type CoreApi = {
   filesystemDirRemove: typeof filesystemDirRemove;
   filesystemPathInfoQuery: typeof filesystemPathInfoQuery;
   filesystemFormat: typeof filesystemFormat;
-  filesystemDiskControl: typeof filesystemDiskControl;
 
   /**
    * All network function

package/src/types/api/protocolV2.ts

@@ -237,9 +237,3 @@ export declare const filesystemDirRemove: typeof dirRemove;
 export declare const filesystemPathInfoQuery: typeof pathInfo;
 
 export declare function filesystemFormat(connectId: string): Response<Success>;
-
-export declare function filesystemDiskControl(
-  connectId: string,
-  // enable 收紧为 boolean | 0 | 1（兼容历史的 '0' / '1' 字符串输入，内部归一化为 0/1）
-  params: CommonParams & { enable: boolean | 0 | 1; timeoutMs?: number | string }
-): Response<Success>;

package/src/types/device.ts

@@ -129,7 +129,7 @@ export type DeviceFeaturesRaw = {
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
 };
 
-export type Features = {
+export type NormalizedFeatures = {
   protocol: DeviceFeaturesProtocol;
   protocolVersion?: number | null;
   deviceType: IDeviceType;
@@ -183,6 +183,10 @@ export type Features = {
   raw?: DeviceFeaturesRaw;
 };
 
+export type Features = NormalizedFeatures &
+  Partial<Omit<PROTO.Features, keyof NormalizedFeatures>> &
+  Partial<Omit<PROTO.OnekeyFeatures, keyof NormalizedFeatures | keyof PROTO.Features>>;
+
 export type OnekeyFeatures = PROTO.OnekeyFeatures;
 
 export type IDeviceType =

package/dist/api/protocol-v2/FilesystemDiskControl.d.ts

@@ -1,13 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export type FilesystemDiskControlParams = {
-    enable?: boolean | 0 | 1;
-    timeoutMs?: number | string;
-};
-export default class FilesystemDiskControl extends BaseMethod<{
-    enable: 0 | 1;
-    timeoutMs?: number;
-}> {
-    init(): void;
-    run(): Promise<any>;
-}
-//# sourceMappingURL=FilesystemDiskControl.d.ts.map

package/dist/api/protocol-v2/FilesystemDiskControl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FilesystemDiskControl.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/FilesystemDiskControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,MAAM,2BAA2B,GAAG;IAExC,MAAM,CAAC,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC;IAC5D,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;IACA,IAAI;IAWE,GAAG;CAcV"}

package/src/api/protocol-v2/FilesystemDiskControl.ts

@@ -1,50 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import {
-  invalidParameter,
-  validateOptionalNonNegativeInteger,
-} from '../helpers/filesystemValidation';
-
-export type FilesystemDiskControlParams = {
-  // 收紧为 boolean | 0 | 1；'0' / '1' 字符串仅作为历史输入向后兼容，内部归一化为 0/1
-  enable?: boolean | 0 | 1;
-  timeoutMs?: number | string;
-};
-
-function normalizeDiskControlEnable(value: unknown): 0 | 1 {
-  if (value === undefined || value === null) return 0;
-  if (typeof value === 'boolean') return value ? 1 : 0;
-  if (value === 0 || value === '0') return 0;
-  if (value === 1 || value === '1') return 1;
-  throw invalidParameter('Parameter [enable] must be a boolean or 0 | 1.');
-}
-
-export default class FilesystemDiskControl extends BaseMethod<{
-  enable: 0 | 1;
-  timeoutMs?: number;
-}> {
-  init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
-    this.skipForceUpdateCheck = true;
-    this.useDevicePassphraseState = false;
-    this.params = {
-      enable: normalizeDiskControlEnable(this.payload.enable),
-      timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
-    };
-  }
-
-  async run() {
-    const typedCall = this.device.commands.typedCall as any;
-    const res = await typedCall(
-      'FilesystemDiskControl',
-      'Success',
-      {
-        enable: this.params.enable,
-      },
-      {
-        timeoutMs: this.params.timeoutMs,
-      }
-    );
-    return Promise.resolve(res.message);
-  }
-}