@onekeyfe/hd-core 1.1.34-alpha.3 → 1.1.34-alpha.4

package/src/events/device.ts

@@ -1,11 +1,6 @@
 import type { MessageFactoryFn } from './utils';
 import type { PROTO } from '../constants';
-import type {
-  KnownDevice as Device,
-  DeviceStateEvent,
-  Features,
-  SupportFeatures,
-} from '../types/device';
+import type { KnownDevice as Device, Features, SupportFeatures } from '../types/device';
 
 export const DEVICE_EVENT = 'DEVICE_EVENT';
 export const DEVICE = {
@@ -28,14 +23,12 @@ export const DEVICE = {
   PIN: 'pin',
   PASSPHRASE: 'passphrase',
   PASSPHRASE_ON_DEVICE: 'passphrase_on_device',
-  ATTACH_PIN_ON_DEVICE: 'attach_pin_on_device',
   WORD: 'word',
   SUPPORT_FEATURES: 'support_features',
   SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE: 'select_device_in_bootloader_for_web_device',
   SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE: 'select_device_for_switch_firmware_web_device',
 
   FEATURES: 'features',
-  STATE: 'state',
 } as const;
 
 export interface DeviceConnnectRequest {
@@ -54,9 +47,6 @@ export interface DeviceButtonRequestPayload extends Omit<PROTO.ButtonRequest, 'c
 
 export type PassphraseRequestPayload = {
   existsAttachPinUser?: boolean;
-  source?: 'wallet-session-coordinator';
-  reason?: 'open-wallet' | 'session-recovery';
-  expectedPassphraseState?: string;
 };
 
 export interface DeviceButtonRequest {
@@ -71,11 +61,6 @@ export interface DeviceSendFeatures {
   payload: DeviceFeaturesPayload;
 }
 
-export interface DeviceSendState {
-  type: typeof DEVICE.STATE;
-  payload: DeviceStateEvent;
-}
-
 export type DeviceSupportFeaturesPayload = SupportFeatures & { device: Device | null };
 export interface DeviceSendSupportFeatures {
   type: typeof DEVICE.SUPPORT_FEATURES;
@@ -84,7 +69,6 @@ export interface DeviceSendSupportFeatures {
 
 export type DeviceEvent =
   | DeviceButtonRequest
-  | DeviceSendState
   | DeviceSendFeatures
   | DeviceSendSupportFeatures
   | DeviceDisconnnectRequest

package/src/events/iframe.ts

@@ -8,7 +8,6 @@ export const IFRAME = {
   INIT_BRIDGE: 'iframe-init-bridge',
   CALL: 'iframe-call',
   CANCEL: 'iframe-cancel',
-  CANCEL_OPERATION: 'iframe-cancel-operation',
   SWITCH_TRANSPORT: 'iframe-switch-transport',
   CALLBACK: 'iframe-callback',
 } as const;

package/src/events/logBlockEvent.ts

@@ -4,33 +4,3 @@ export const LogBlockEvent: Set<string> = new Set([
   UI_RESPONSE.RECEIVE_PIN,
   UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
-
-const LogBlockMethod: Set<string> = new Set([
-  'evmSignTypedData',
-  'deviceSessionOpen',
-  'deviceUploadWallpaper',
-  'uploadPortfolio',
-  'fileWrite',
-  'fileRead',
-]);
-
-export function getLogBlockLabel(message: unknown): string | undefined {
-  if (!message || typeof message !== 'object') return undefined;
-
-  const { type, payload, method } = message as {
-    type?: string;
-    payload?: { method?: string };
-    method?: string;
-  };
-
-  if (type && LogBlockEvent.has(type)) {
-    return type;
-  }
-
-  const methodName = method ?? payload?.method;
-  if (methodName && LogBlockMethod.has(methodName)) {
-    return methodName;
-  }
-
-  return undefined;
-}

package/src/events/ui-request.ts

@@ -49,23 +49,6 @@ export const UI_REQUEST = {
   NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device',
 } as const;
 
-export type ProtocolV2UiEventSource =
-  | 'unlock-coordinator'
-  | 'wallet-session-coordinator'
-  | 'method-lifecycle';
-
-export type ProtocolV2UiCompletion = 'page-accepted' | 'operation-completed';
-
-export type ProtocolV2UiEventMetadata = {
-  source?: ProtocolV2UiEventSource;
-  reason?: string;
-  deviceOnly?: boolean;
-  completion?: ProtocolV2UiCompletion;
-  method?: string;
-  page?: string | number;
-  operation?: string;
-};
-
 export interface UiRequestWithoutPayload {
   type:
     | typeof UI_REQUEST.CLOSE_UI_WINDOW
@@ -90,7 +73,7 @@ export interface UiRequestFirmwareProgressing {
 
 export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
-  payload: ProtocolV2UiEventMetadata & {
+  payload: {
     device: Device;
     type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry' | 'ButtonRequest_AttachPin';
   };
@@ -98,7 +81,7 @@ export type UiRequestDeviceAction = {
 
 export interface UiRequestButton {
   type: typeof UI_REQUEST.REQUEST_BUTTON;
-  payload: DeviceButtonRequest['payload'] & ProtocolV2UiEventMetadata;
+  payload: DeviceButtonRequest['payload'];
 }
 
 export interface UiRequestPassphrase {
@@ -107,9 +90,6 @@ export interface UiRequestPassphrase {
     device: Device;
     passphraseState?: string;
     existsAttachPinUser?: boolean;
-    source?: 'wallet-session-coordinator';
-    reason?: 'open-wallet' | 'session-recovery';
-    expectedPassphraseState?: string;
   };
 }
 
@@ -118,8 +98,6 @@ export interface UiRequestPassphraseOnDevice {
   payload: {
     device: Device;
     passphraseState?: string;
-    source?: 'wallet-session-coordinator';
-    reason?: 'open-wallet' | 'session-recovery';
   };
 }
 
@@ -151,10 +129,6 @@ export interface FirmwareProgress {
     device: Device;
     progress: number;
     progressType: IFirmwareUpdateProgressType;
-    transferredBytes?: number;
-    totalBytes?: number;
-    rateBytesPerSecond?: number;
-    elapsedMs?: number;
   };
 }
 
@@ -170,10 +144,6 @@ export interface DeviceProgress {
   type: typeof UI_REQUEST.DEVICE_PROGRESS;
   payload: {
     progress?: number;
-    transferredBytes?: number;
-    totalBytes?: number;
-    rateBytesPerSecond?: number;
-    elapsedMs?: number;
   };
 }
 

package/src/index.ts

@@ -19,11 +19,6 @@ export * from './types';
 export { whitelist, whitelistExtension } from './data/config';
 export { executeCallback, cleanupCallback };
 export { preloadSessionCache } from './device/Device';
-export {
-  getFirmwareUpdateHostBindingGeneration,
-  registerFirmwareUpdateHostBinding,
-  unregisterFirmwareUpdateHostBinding,
-} from './api/firmware/FirmwareHostBinding';
 
 const HardwareSdk = ({
   init,
@@ -32,7 +27,6 @@ const HardwareSdk = ({
   eventEmitter,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: InjectApi): CoreApi =>
@@ -43,7 +37,6 @@ const HardwareSdk = ({
     eventEmitter,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });
@@ -56,7 +49,6 @@ const HardwareSDKLowLevel = ({
   addHardwareGlobalEventListener,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: LowLevelInjectApi): LowLevelCoreApi =>
@@ -68,7 +60,6 @@ const HardwareSDKLowLevel = ({
     addHardwareGlobalEventListener,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });

package/src/inject.ts

@@ -1,17 +1,6 @@
-import { getFirmwareUpdateCapabilities } from './api/firmware/FirmwareUpdateCapabilities';
-import {
-  prepareFirmwareUpdatePlan,
-  validateFirmwareUpdatePreparedPlan,
-} from './api/firmware/FirmwareUpdatePreparedPlan';
-import {
-  getFirmwareUpdateHostBindingGeneration,
-  registerFirmwareUpdateHostBinding,
-  unregisterFirmwareUpdateHostBinding,
-} from './api/firmware/FirmwareHostBinding';
-
+import type { Unsuccessful } from './types';
 import type { EventEmitter } from 'events';
 import type { CallMethod } from './events';
-import type { Unsuccessful } from './types';
 import type { CoreApi } from './types/api';
 import type { AllNetworkAddress } from './types/api/allNetworkGetAddress';
 
@@ -47,14 +36,12 @@ export interface InjectApi {
   dispose: CoreApi['dispose'];
   uiResponse: CoreApi['uiResponse'];
   cancel: CoreApi['cancel'];
-  cancelOperation: CoreApi['cancelOperation'];
   switchTransport: CoreApi['switchTransport'];
 }
 
 export const inject = ({
   call,
   cancel,
-  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -81,15 +68,11 @@ export const inject = ({
 
     call,
 
-    dispose: async () => {
-      unregisterFirmwareUpdateHostBinding();
-      await dispose();
-    },
+    dispose,
 
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 
@@ -113,31 +96,19 @@ export const createCoreApi = (
   | 'dispose'
   | 'uiResponse'
   | 'cancel'
-  | 'cancelOperation'
   | 'updateSettings'
   | 'switchTransport'
 > => ({
-  getFirmwareUpdateCapabilities,
-  registerFirmwareUpdateHostBinding,
-  unregisterFirmwareUpdateHostBinding,
-  getFirmwareUpdateHostBindingGeneration,
-  prepareFirmwareUpdatePlan,
-  validateFirmwareUpdatePreparedPlan,
   getLogs: () => call({ method: 'getLogs' }),
-  clearSessionCache: params => call({ ...params, method: 'clearSessionCache' }),
   /**
    * 搜索设备
    */
-  searchDevices: params => call({ ...params, method: 'searchDevices' }),
+  searchDevices: () => call({ method: 'searchDevices' }),
 
   /**
    * 获取设备信息
    */
   getFeatures: (connectId, params) => call({ ...params, connectId, method: 'getFeatures' }),
-  getDeviceState: (connectId, params) => {
-    const { refresh: _refresh, includeRaw: _includeRaw, ...commonParams } = (params ?? {}) as any;
-    return call({ ...commonParams, connectId, method: 'getDeviceState' });
-  },
   getOnekeyFeatures: (connectId, params) =>
     call({ ...params, connectId, method: 'getOnekeyFeatures' }),
 
@@ -177,45 +148,6 @@ export const createCoreApi = (
   deviceFlags: (connectId, params) => call({ ...params, connectId, method: 'deviceFlags' }),
   deviceRebootToBoardloader: connectId => call({ connectId, method: 'deviceRebootToBoardloader' }),
   deviceRebootToBootloader: connectId => call({ connectId, method: 'deviceRebootToBootloader' }),
-
-  // Pro2 business API
-  deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
-  deviceGetOnboardingStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
-  deviceUploadWallpaper: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceUploadWallpaper' }),
-  deviceInfoGet: (connectId, params) => call({ ...params, connectId, method: 'deviceInfoGet' }),
-  deviceStatusGet: (connectId, params) => call({ ...params, connectId, method: 'deviceStatusGet' }),
-  deviceSettingsGet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSettingsGet' }),
-  protocolInfoRequest: (connectId, params) =>
-    call({ ...params, connectId, method: 'protocolInfoRequest' }),
-  ping: (connectId, params) => call({ ...params, connectId, method: 'ping' }),
-  deviceSessionOpen: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSessionOpen' }),
-  deviceFirmwareUpdate: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceFirmwareUpdate' }),
-  deviceGetFirmwareUpdateStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceGetFirmwareUpdateStatus' }),
-  deviceFactoryInfoSet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceFactoryInfoSet' }),
-  deviceFactoryInfoGet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceFactoryInfoGet' }),
-  deviceSettingsSet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSettingsSet' }),
-  deviceSettingsPageShow: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSettingsPageShow' }),
-  filesystemPermissionFix: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemPermissionFix' }),
-  filesystemFormat: connectId => call({ connectId, method: 'filesystemFormat' }),
-  uploadPortfolio: (connectId, params) => call({ ...params, connectId, method: 'uploadPortfolio' }),
-  fileRead: (connectId, params) => call({ ...params, connectId, method: 'fileRead' }),
-  fileWrite: (connectId, params) => call({ ...params, connectId, method: 'fileWrite' }),
-  fileDelete: (connectId, params) => call({ ...params, connectId, method: 'fileDelete' }),
-  dirList: (connectId, params) => call({ ...params, connectId, method: 'dirList' }),
-  dirMake: (connectId, params) => call({ ...params, connectId, method: 'dirMake' }),
-  dirRemove: (connectId, params) => call({ ...params, connectId, method: 'dirRemove' }),
-  pathInfo: (connectId, params) => call({ ...params, connectId, method: 'pathInfo' }),
   deviceRecovery: (connectId, params) => call({ ...params, connectId, method: 'deviceRecovery' }),
   deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
   deviceSettings: (connectId, params) => call({ ...params, connectId, method: 'deviceSettings' }),
@@ -231,8 +163,6 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'deviceUpdateBootloader' }),
   getPassphraseState: (connectId, params) =>
     call({ ...params, connectId, method: 'getPassphraseState' }),
-  openWalletSession: (connectId, params) =>
-    call({ ...params, connectId, method: 'openWalletSession' }),
   deviceCancel: (connectId, params) => call({ ...params, connectId, method: 'deviceCancel' }),
   deviceLock: (connectId, params) => call({ ...params, connectId, method: 'deviceLock' }),
   deviceUnlock: (connectId, params) =>
@@ -330,8 +260,6 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'firmwareUpdateV2' }),
   firmwareUpdateV3: (connectId, params) =>
     call({ ...params, connectId, method: 'firmwareUpdateV3' }),
-  firmwareUpdateV4: (connectId, params) =>
-    call({ ...params, connectId, method: 'firmwareUpdateV4' }),
   promptWebDeviceAccess: params => call({ ...params, method: 'promptWebDeviceAccess' }),
 
   tronGetAddress: (connectId, deviceId, params) =>

package/src/lowLevelInject.ts

@@ -1,5 +1,4 @@
 import { createCoreApi } from './inject';
-import { unregisterFirmwareUpdateHostBinding } from './api/firmware/FirmwareHostBinding';
 
 import type { EventEmitter } from 'events';
 import type { CallMethod, CoreMessage } from './events';
@@ -14,7 +13,6 @@ export interface LowLevelInjectApi {
   dispose: CoreApi['dispose'];
   uiResponse: CoreApi['uiResponse'];
   cancel: CoreApi['cancel'];
-  cancelOperation: CoreApi['cancelOperation'];
   updateSettings: CoreApi['updateSettings'];
   switchTransport: CoreApi['switchTransport'];
   addHardwareGlobalEventListener: (listener: IAddHardwareGlobalEventListener) => void;
@@ -27,7 +25,6 @@ export type LowLevelCoreApi = Omit<CoreApi, 'on' | 'off'> & {
 export const lowLevelInject = ({
   call,
   cancel,
-  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -46,15 +43,11 @@ export const lowLevelInject = ({
 
     call,
 
-    dispose: async () => {
-      unregisterFirmwareUpdateHostBinding();
-      await dispose();
-    },
+    dispose,
 
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 

package/src/topLevelInject.ts

@@ -1,7 +1,6 @@
 import EventEmitter from 'events';
 
 import { createCoreApi } from './inject';
-import { unregisterFirmwareUpdateHostBinding } from './api/firmware/FirmwareHostBinding';
 
 import type { ConnectSettings } from './types/settings';
 import type { CoreApi } from './types/api';
@@ -47,17 +46,12 @@ export const topLevelInject = () => {
       lowLevelApi?.removeAllListeners(type);
     },
 
-    dispose: async () => {
-      unregisterFirmwareUpdateHostBinding();
-      await lowLevelApi?.dispose();
-    },
+    dispose: () => lowLevelApi?.dispose(),
 
     uiResponse: response => lowLevelApi?.uiResponse(response),
 
     cancel: (connectId?: string) => lowLevelApi?.cancel(connectId),
 
-    cancelOperation: (operationId: string) => lowLevelApi?.cancelOperation(operationId),
-
     updateSettings: settings => lowLevelApi?.updateSettings(settings) ?? Promise.resolve(false),
 
     switchTransport: (env: ConnectSettings['env']) =>

package/src/types/api/checkAllFirmwareRelease.ts

@@ -1,8 +1,8 @@
 import type { IBLEFirmwareReleaseInfo } from '../settings';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
+import type { Features } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
-import type { Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus } from '../device';
-import type { FirmwareUpdatePlan } from './firmwareUpdatePlan';
+import type { IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus } from '../device';
 
 export type FirmwareRelease = {
   shouldUpdate?: boolean;
@@ -21,13 +21,11 @@ export type AllFirmwareRelease = {
   bootloader?: FirmwareRelease;
   bridge?: FirmwareRelease;
   features?: Features;
-  firmwareUpdatePlan?: FirmwareUpdatePlan;
 };
 
 export type CheckAllFirmwareReleaseParams = {
   checkBridgeRelease?: boolean;
   firmwareType?: EFirmwareType;
-  platform?: 'native' | 'desktop' | 'ext' | 'web' | 'web-embed';
 };
 
 export declare function checkAllFirmwareRelease(

package/src/types/api/deviceSettings.ts

@@ -14,16 +14,7 @@ export type DeviceSettingsParams = {
   experimentalFeatures?: boolean;
   autoShutdownDelayMs?: number;
   changeBrightness?: boolean;
-  brightness?: number;
   hapticFeedback?: boolean;
-  bluetoothEnabled?: boolean;
-  airgapMode?: boolean;
-  animationEnabled?: boolean;
-  tapToWake?: boolean;
-  deviceNameDisplayEnabled?: boolean;
-  fidoEnabled?: boolean;
-  usbLockEnabled?: boolean;
-  randomKeypad?: boolean;
 };
 
 export declare function deviceSettings(

package/src/types/api/deviceUnlock.ts

@@ -1,4 +1,4 @@
-import type { Features } from '../device';
+import type { Features } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export declare function deviceUnlock(connectId: string, params?: CommonParams): Response<Features>;

package/src/types/api/deviceUpdateBootloader.ts

@@ -1,18 +1,9 @@
 import type { Success } from '@onekeyfe/hd-transport';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type {
-  FirmwareArtifactReader,
-  FirmwareArtifactReference,
-  FirmwareCheckpointParams,
-} from './firmwareUpdate';
-import type { FirmwareUpdatePreparedPlan } from './firmwareUpdatePreparedPlan';
 import type { Response } from '../params';
 
-export type DeviceUpdateBootloaderParams = FirmwareCheckpointParams & {
-  preparedPlan?: FirmwareUpdatePreparedPlan;
+export type DeviceUpdateBootloaderParams = {
   binary?: ArrayBuffer;
-  artifact?: FirmwareArtifactReference;
-  artifactReader?: FirmwareArtifactReader;
   firmwareType?: EFirmwareType;
 };
 

package/src/types/api/export.ts

@@ -25,35 +25,10 @@ export type {
   DeviceUploadResourceResponse,
 } from './deviceUploadResource';
 export type {
-  FirmwareArtifactReader,
-  FirmwareArtifactReference,
-  FirmwareCheckpoint,
-  FirmwareCheckpointParams,
-  FirmwareCheckpointSink,
-  FirmwareCheckpointStage,
-  FirmwareUpdateHostBinding,
-  FirmwareUpdateArtifactParams,
   FirmwareUpdateParams,
   FirmwareUpdateBinaryParams,
   FirmwareUpdateV3Params,
-  FirmwareUpdateV4Params,
-  FirmwareUpdateV4Target,
 } from './firmwareUpdate';
-export type {
-  FirmwareUpdatePlan,
-  FirmwareUpdatePlanArtifact,
-  FirmwareUpdatePlanArtifactRole,
-  FirmwareUpdatePlanEpoch,
-  FirmwareUpdatePlanEpochKind,
-  FirmwareUpdatePlanTarget,
-} from './firmwareUpdatePlan';
-export type {
-  FirmwareUpdatePreparedArtifact,
-  FirmwareUpdatePreparedArtifactInput,
-  FirmwareUpdatePreparedEntry,
-  FirmwareUpdatePreparedPlan,
-} from './firmwareUpdatePreparedPlan';
-export type { FirmwareUpdateCapabilities } from './firmwareUpdateCapabilities';
 export type { AllFirmwareRelease } from './checkAllFirmwareRelease';
 
 export type { AllNetworkAddressParams, AllNetworkGetAddressParams } from './allNetworkGetAddress';