@onekeyfe/hd-core 1.2.0-alpha.20 → 1.2.0-alpha.22

package/src/device/Device.ts

@@ -153,7 +153,8 @@ export interface Device {
  * This allows short-lived processes (e.g. CLI) to restore a previously
  * obtained session, avoiding the need to re-enter passphrase on every
  * invocation. The session must have been obtained from a prior
- * getPassphraseState() call on the same device.
+ * wallet-session call on the same device. This compatibility hook is intended
+ * for a trusted CLI process restoring its own OS-keychain entry.
  *
  * @param deviceId - The device's device_id (from features)
  * @param passphraseState - The passphrase state token
@@ -222,24 +223,7 @@ export class Device extends EventEmitter {
 
   get features(): Features | undefined {
     if (!this.state) return undefined;
-    const features = projectFeatures(this.state);
-    const sessionCacheDeviceKey =
-      this.state.identity.deviceId ||
-      (this.isProtocolV2()
-        ? this.originalDescriptor.path || this.originalDescriptor.id
-        : undefined);
-    const sessionId =
-      sessionCacheDeviceKey && this.passphraseState
-        ? deviceWalletSessionStore.get(sessionCacheDeviceKey, this.passphraseState)
-        : undefined;
-    return sessionId
-      ? {
-          ...features,
-          sessionId,
-          session_id: sessionId,
-          passphraseState: this.passphraseState,
-        }
-      : features;
+    return projectFeatures(this.state);
   }
 
   set features(features: Features | undefined) {
@@ -334,7 +318,7 @@ export class Device extends EventEmitter {
       instanceId: this.instanceId,
       createdAt: this.createdAt,
       deviceType,
-      /** ID for current seeds, will clear after replace a new seed at device */
+      /** Wallet-lifecycle ID; changes after the device is wiped or reinitialized. */
       deviceId,
       path: this.originalDescriptor?.path,
       bleName,
@@ -691,16 +675,14 @@ export class Device extends EventEmitter {
     const deviceId = _deviceId || this.getCurrentDeviceId();
     if (deviceId) return deviceId;
     if (this.isProtocolV2()) {
-      return this.originalDescriptor.path || this.originalDescriptor.id;
+      return this.originalDescriptor.path;
     }
     return undefined;
   }
 
   private reconcileSessionCacheDeviceIdentity(previousDeviceId?: string) {
     deviceWalletSessionStore.reconcileDeviceIdentity({
-      temporaryKey: this.isProtocolV2()
-        ? this.originalDescriptor.path || this.originalDescriptor.id
-        : undefined,
+      temporaryKey: this.isProtocolV2() ? this.originalDescriptor.path : undefined,
       previousDeviceId,
       nextDeviceId: this.getCurrentDeviceId(),
     });
@@ -806,43 +788,55 @@ export class Device extends EventEmitter {
       return;
     }
 
-    // Log.debug('initialize param:', options);
+    try {
+      const callInitialize = async (payload: Record<string, unknown>, initSession?: boolean) => {
+        const initStartAt = Date.now();
+        const { message } = await this.commands.typedCall('Initialize', 'Features', payload, {
+          // iOS BLE bound devices can need close to 20 seconds.
+          timeoutMs: 25 * 1000,
+        });
+        this.setLastInitializeDuration(Date.now() - initStartAt);
+        this._updateFeatures(message, initSession);
+        await TransportManager.reconfigure(this.features);
+      };
 
-    this.passphraseState = options?.passphraseState;
+      const expectedDeviceId = options?.deviceId;
+      if (expectedDeviceId) {
+        // Establish the live physical identity before sending wallet-bound state.
+        this.passphraseState = undefined;
+        await callInitialize({ is_contains_attach: true });
+        if (!this.checkDeviceId(expectedDeviceId)) {
+          throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckDeviceIdError);
+        }
+      }
 
-    if (options?.initSession) {
-      this.clearInternalState(options?.deviceId);
-    }
+      this.passphraseState = options?.passphraseState;
 
-    const internalState = this.getInternalState(options?.deviceId);
-    const payload: any = {};
-    if (internalState) {
-      payload.session_id = internalState;
-    }
+      if (options?.initSession) {
+        this.clearInternalState(options?.deviceId);
+      }
 
-    if (options?.deriveCardano) {
-      payload.derive_cardano = true;
-    }
-    payload.passphrase_state = options?.passphraseState;
-    payload.is_contains_attach = true;
+      const internalState = this.getInternalState(options?.deviceId);
+      const payload: Record<string, unknown> = {
+        passphrase_state: options?.passphraseState,
+        is_contains_attach: true,
+      };
+      if (internalState) {
+        payload.session_id = internalState;
+      }
+      if (options?.deriveCardano) {
+        payload.derive_cardano = true;
+      }
 
-    const initStartAt = Date.now();
-    try {
-      // @ts-expect-error
-      const { message } = await Promise.race([
-        this.commands.typedCall('Initialize', 'Features', payload),
-        new Promise((_, reject) => {
-          setTimeout(() => {
-            reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
-            // iOS ble bound device timeout 20s
-          }, 25 * 1000);
-        }),
-      ]);
-
-      const initCostMs = Date.now() - initStartAt;
-      this.setLastInitializeDuration(initCostMs);
-      this._updateFeatures(message, options?.initSession);
-      await TransportManager.reconfigure(this.features);
+      const requiresWalletInitialize =
+        !expectedDeviceId ||
+        Boolean(internalState) ||
+        Boolean(options?.passphraseState) ||
+        options?.deriveCardano === true ||
+        options?.initSession === true;
+      if (requiresWalletInitialize) {
+        await callInitialize(payload, options?.initSession);
+      }
     } catch (error) {
       Log.error('Initialization failed:', error);
       throw error;
@@ -955,7 +949,7 @@ export class Device extends EventEmitter {
           'DeviceSettings',
           {}
         );
-        this.updateState(mapDeviceSettingsToState(message), 'apply-settings');
+        this.updateState(mapDeviceSettingsToState(message), 'settings-read');
       }
     }
 
@@ -972,10 +966,6 @@ export class Device extends EventEmitter {
         ? protoFeatures
         : buildProtocolV1FeaturesPayload(protoFeatures, this.features);
 
-    // GetFeatures doesn't return 'session_id'
-    if (this.features?.sessionId && !feat.sessionId) {
-      feat.sessionId = this.features.sessionId;
-    }
     feat.unlocked = feat.unlocked ?? true;
 
     feat = fixFeaturesFirmwareVersion(feat);

package/src/device/DeviceCommands.ts

@@ -1,6 +1,7 @@
 import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import {
   DeviceErrorCode,
+  DeviceSessionErrorCode,
   type FailureType,
   type Messages,
   type Transport,
@@ -52,7 +53,7 @@ const HIGH_VOLUME_DEBUG_CALLS = new Set([
   'FirmwareUpload',
   'ResourceAck',
 ]);
-const SENSITIVE_DEBUG_CALLS = new Set(['DeviceSessionGet']);
+const SENSITIVE_DEBUG_CALLS = new Set(['DeviceSessionOpen']);
 
 function shouldReduceDebugForCall(type: string) {
   return HIGH_VOLUME_DEBUG_CALLS.has(type);
@@ -337,20 +338,27 @@ export class DeviceCommands {
     if (this.disposed) {
       return;
     }
-    this.dispose(true);
-    if (this.callPromise) {
-      try {
-        await Promise.all([
-          new Promise((_resolve, reject) =>
-            // eslint-disable-next-line no-promise-executor-return
-            setTimeout(() => reject(new Error('cancel timeout')), 10 * 1000)
-          ),
-          await this.callPromise,
-        ]);
-      } catch {
-        // device error
+    const activeCall = this.callPromise;
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const cancellation = (async () => {
+      await this.dispose(true);
+      await activeCall?.catch(() => undefined);
+    })();
+
+    try {
+      await Promise.race([
+        cancellation,
+        new Promise<void>(resolve => {
+          timer = setTimeout(resolve, 10 * 1000);
+        }),
+      ]);
+    } finally {
+      if (timer) clearTimeout(timer);
+      if (this.callPromise === activeCall) {
         this.callPromise = undefined;
       }
+      // The cancellation work may finish after the bounded wait.
+      cancellation.catch(() => undefined);
     }
   }
 
@@ -451,7 +459,7 @@ export class DeviceCommands {
         'PinMatrixAck',
         'PassphraseAck',
         'Cancel',
-        'DeviceSessionGet',
+        'DeviceSessionOpen',
         'BixinPinInputOnDevice',
         'FilesystemFileRead',
         'FilesystemFileWrite',
@@ -599,6 +607,42 @@ export class DeviceCommands {
         const isLegacyProtocolV2LockedFailure =
           this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(normalizedMessage);
         if (
+          callType === 'DeviceSessionOpen' &&
+          subcode === DeviceSessionErrorCode.DeviceSessionError_InvalidSession
+        ) {
+          error = ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid, message, {
+            failureCode: code,
+            subcode,
+            firmwareMessage: message,
+          });
+        } else if (
+          callType === 'DeviceSessionOpen' &&
+          subcode === DeviceSessionErrorCode.DeviceSessionError_UserCancelled
+        ) {
+          error = ERRORS.TypedError(HardwareErrorCode.ActionCancelled, message, {
+            failureCode: code,
+            subcode,
+            firmwareMessage: message,
+          });
+        } else if (
+          callType === 'DeviceSessionOpen' &&
+          subcode === DeviceSessionErrorCode.DeviceSessionError_AttachPinUnavailable
+        ) {
+          error = ERRORS.TypedError(HardwareErrorCode.DeviceCheckUnlockTypeError, message, {
+            failureCode: code,
+            subcode,
+            firmwareMessage: message,
+          });
+        } else if (
+          callType === 'DeviceSessionOpen' &&
+          subcode === DeviceSessionErrorCode.DeviceSessionError_PassphraseDisabled
+        ) {
+          error = ERRORS.TypedError(HardwareErrorCode.DeviceNotOpenedPassphrase, message, {
+            failureCode: code,
+            subcode,
+            firmwareMessage: message,
+          });
+        } else if (
           subcode === DeviceErrorCode.DeviceError_ActionCancelled ||
           isLegacyProtocolV2ActionCancelledFailure
         ) {

package/src/device/DeviceFeaturesState.ts

@@ -1,14 +1,5 @@
 import type { Features } from '../types';
 
-export type DeviceFeaturesUpdateSource =
-  | 'device-info'
-  | 'device-status'
-  | 'device-settings-get'
-  | 'device-settings-set'
-  | 'apply-settings'
-  | 'unlock'
-  | 'cache';
-
 /**
  * Merge a field-level device-state patch.
  *

package/src/device/DeviceStateMapper.ts

@@ -1,7 +1,11 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import { buildProtocolV1FeaturesPayload } from '../deviceProfile/buildDeviceFeatures';
-import { mapLanguageToProtocolV2 } from '../utils/deviceSettings';
+import {
+  mapLanguageFromProtocolV2,
+  mapLanguageToProtocolV2,
+  normalizeSafetyCheckLevel,
+} from '../utils/deviceSettings';
 
 import type {
   ApplySettings,
@@ -25,6 +29,23 @@ const definedEntries = <T extends Record<string, unknown>>(value: T): T =>
     Object.entries(value).filter(([, fieldValue]) => fieldValue !== undefined)
   ) as T;
 
+const sanitizeRawFeatures = (features: Features): Features['raw'] => {
+  if (!features.raw) return undefined;
+
+  const raw = { ...features.raw };
+  if (raw.protocolV1Features) {
+    const { session_id: _sessionId, ...protocolV1Features } = raw.protocolV1Features;
+    const compatibilityFields = protocolV1Features as typeof protocolV1Features & {
+      sessionId?: string;
+      passphraseState?: string;
+    };
+    delete compatibilityFields.sessionId;
+    delete compatibilityFields.passphraseState;
+    raw.protocolV1Features = compatibilityFields as PROTO.Features;
+  }
+  return raw;
+};
+
 const imageVersion = (image?: DeviceFirmwareImageInfo | null) => image?.version ?? undefined;
 
 const bytesToHex = (value: unknown): string | undefined => {
@@ -123,7 +144,7 @@ export const mapFeaturesToState = (features: Features): DeviceStatePatch => ({
   },
   capabilities: features.capabilities,
   verification: definedEntries(features.verify ?? {}),
-  raw: features.raw,
+  raw: sanitizeRawFeatures(features),
 });
 
 export const mapProtocolV1FeaturesToState = (
@@ -289,9 +310,10 @@ export const mapApplySettingsToState = (settings: ApplySettings): DeviceStatePat
     autoShutdownDelayMs: settings.auto_shutdown_delay_ms,
     displayRotation: settings.display_rotation,
     passphraseAlwaysOnDevice: settings.passphrase_always_on_device,
-    safetyChecks: settings.safety_checks,
+    safetyChecks: normalizeSafetyCheckLevel(settings.safety_checks),
     experimentalFeatures: settings.experimental_features,
     hapticFeedback: settings.haptic_feedback,
+    bleEnabled: settings.use_ble,
   });
   return {
     ...(Object.keys(identity).length ? { identity } : {}),
@@ -301,14 +323,11 @@ export const mapApplySettingsToState = (settings: ApplySettings): DeviceStatePat
 };
 
 export const mapDeviceSettingsToState = (settings: DeviceSettings): DeviceStatePatch => {
-  const settingsWithExperimental = settings as DeviceSettings & {
-    experimental_features?: boolean;
-  };
   const identity = definedEntries({ label: settings.label });
   const status = definedEntries({ passphraseProtection: settings.passphrase_enable });
   const stateSettings = definedEntries({
     bleEnabled: settings.bt_enable,
-    language: settings.language,
+    language: mapLanguageFromProtocolV2(settings.language),
     wallpaperPath: settings.wallpaper_path,
     brightness: settings.brightness,
     autoLockDelayMs: settings.autolock_delay_ms,
@@ -319,7 +338,6 @@ export const mapDeviceSettingsToState = (settings: DeviceSettings): DeviceStateP
     deviceNameDisplayEnabled: settings.device_name_display_enabled,
     airgapMode: settings.airgap_mode,
     fidoEnabled: settings.fido_enabled,
-    experimentalFeatures: settingsWithExperimental.experimental_features,
     usbLockEnabled: settings.usb_lock_enable,
     randomKeypad: settings.random_keypad,
   });

package/src/device/DeviceStateProjector.ts

@@ -16,6 +16,12 @@ export const projectFeatures = (state: StoredDeviceState): Features => {
   delete publicRawFeatures.session_id;
   delete publicRawFeatures.sessionId;
   delete publicRawFeatures.passphraseState;
+  const publicRaw = snapshot.raw
+    ? {
+        ...snapshot.raw,
+        protocolV1Features: publicRawFeatures,
+      }
+    : undefined;
   const rawOneKeyFeatures = snapshot.raw?.protocolV1OneKeyFeatures ?? {};
   const bootloaderMode =
     snapshot.protocol === 'V1'
@@ -84,7 +90,7 @@ export const projectFeatures = (state: StoredDeviceState): Features => {
     se04BootVersion: snapshot.versions.se04Boot,
     seVersion: snapshot.versions.se ?? null,
     verify: snapshot.verification,
-    raw: snapshot.raw,
+    raw: publicRaw,
     device_id: snapshot.identity.deviceId ?? undefined,
     ble_name: snapshot.identity.bleName ?? undefined,
     passphrase_protection: snapshot.status.passphraseProtection ?? undefined,

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -10,6 +10,7 @@ import {
   resolveDeviceSerialNo,
   resolveDeviceType,
 } from '../utils/deviceFeaturesCompat';
+import { normalizeSafetyCheckLevel } from '../utils/deviceSettings';
 
 import type {
   DeviceFirmwareImageInfo,
@@ -121,7 +122,7 @@ export const buildProtocolV1FeaturesPayload = (
     passphraseAlwaysOnDevice: features.passphrase_always_on_device ?? null,
     attachToPinEnabled: features.attach_to_pin_user ?? previous?.attachToPinEnabled ?? null,
     unlockedAttachPin: features.unlocked_attach_pin ?? previous?.unlockedAttachPin ?? undefined,
-    safetyChecks: features.safety_checks ?? null,
+    safetyChecks: normalizeSafetyCheckLevel(features.safety_checks) ?? null,
     autoLockDelayMs: features.auto_lock_delay_ms ?? null,
     autoShutdownDelayMs: features.auto_shutdown_delay_ms ?? null,
     displayRotation: features.display_rotation ?? null,

package/src/events/call.ts

@@ -53,12 +53,6 @@ export interface IFrameCancelMessage {
   payload: { connectId?: string };
 }
 
-export interface IFrameCancelOperationMessage {
-  event: typeof IFRAME.CANCEL_OPERATION;
-  type: typeof IFRAME.CANCEL_OPERATION;
-  payload: { operationId: string };
-}
-
 export interface IFrameSwitchTransportMessage {
   event: typeof IFRAME.SWITCH_TRANSPORT;
   type: typeof IFRAME.SWITCH_TRANSPORT;

package/src/events/core.ts

@@ -5,7 +5,6 @@ import type {
   IFrameCallMessage,
   IFrameCallbackMessage,
   IFrameCancelMessage,
-  IFrameCancelOperationMessage,
   IFrameSwitchTransportMessage,
 } from './call';
 import type { DeviceEventMessage } from './device';
@@ -24,7 +23,6 @@ export type CoreMessage = {
   | IFrameEventMessage
   | IFrameCallMessage
   | IFrameCancelMessage
-  | IFrameCancelOperationMessage
   | IFrameSwitchTransportMessage
   | IFrameCallbackMessage
   | UiResponseMessage

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

@@ -8,6 +8,7 @@ export const LogBlockEvent: Set<string> = new Set([
 const LogBlockMethod: Set<string> = new Set([
   'evmSignTypedData',
   'openWalletSession',
+  'DeviceSessionOpen',
   'deviceUploadWallpaper',
   'uploadPortfolio',
   'fileWrite',

package/src/index.ts

@@ -19,6 +19,11 @@ 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,
@@ -27,7 +32,6 @@ const HardwareSdk = ({
   eventEmitter,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: InjectApi): CoreApi =>
@@ -38,7 +42,6 @@ const HardwareSdk = ({
     eventEmitter,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });
@@ -51,7 +54,6 @@ const HardwareSDKLowLevel = ({
   addHardwareGlobalEventListener,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: LowLevelInjectApi): LowLevelCoreApi =>
@@ -63,7 +65,6 @@ const HardwareSDKLowLevel = ({
     addHardwareGlobalEventListener,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });

package/src/inject.ts

@@ -1,6 +1,17 @@
-import type { Unsuccessful } from './types';
+import { getFirmwareUpdateCapabilities } from './api/firmware/FirmwareUpdateCapabilities';
+import {
+  prepareFirmwareUpdatePlan,
+  validateFirmwareUpdatePreparedPlan,
+} from './api/firmware/FirmwareUpdatePreparedPlan';
+import {
+  getFirmwareUpdateHostBindingGeneration,
+  registerFirmwareUpdateHostBinding,
+  unregisterFirmwareUpdateHostBinding,
+} from './api/firmware/FirmwareHostBinding';
+
 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';
 
@@ -36,14 +47,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,
@@ -70,12 +79,14 @@ export const inject = ({
 
     call,
 
-    dispose,
+    dispose: async () => {
+      unregisterFirmwareUpdateHostBinding();
+      await dispose();
+    },
 
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 
@@ -99,10 +110,15 @@ 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' }),
   /**
@@ -164,36 +180,7 @@ export const createCoreApi = (
     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' }),
-  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' }),

package/src/lowLevelInject.ts

@@ -1,4 +1,5 @@
 import { createCoreApi } from './inject';
+import { unregisterFirmwareUpdateHostBinding } from './api/firmware/FirmwareHostBinding';
 
 import type { EventEmitter } from 'events';
 import type { CallMethod, CoreMessage } from './events';
@@ -13,7 +14,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;
@@ -26,7 +26,6 @@ export type LowLevelCoreApi = Omit<CoreApi, 'on' | 'off'> & {
 export const lowLevelInject = ({
   call,
   cancel,
-  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -45,12 +44,14 @@ export const lowLevelInject = ({
 
     call,
 
-    dispose,
+    dispose: async () => {
+      unregisterFirmwareUpdateHostBinding();
+      await dispose();
+    },
 
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 

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

@@ -18,7 +18,7 @@ export function assertCompleteDeviceSession(
   ) {
     throw ERRORS.TypedError(
       HardwareErrorCode.RuntimeError,
-      'DeviceSessionGet returned an incomplete DeviceSession response.'
+      'DeviceSessionOpen returned an incomplete DeviceSession response.'
     );
   }
 }

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

@@ -12,7 +12,7 @@ const LOCK_FREE_DEVICE_SETTINGS = new Set<keyof DeviceSettings>([
 export const getProtocolV2SettingsUnlockPolicy = (settings: DeviceSettings): UnlockPolicy =>
   Object.keys(settings).every(key => LOCK_FREE_DEVICE_SETTINGS.has(key as keyof DeviceSettings))
     ? 'none'
-    : 'retry-on-locked';
+    : 'unlock-before-run';
 
 export type ProtocolV2SettingsOperation =
   | {
@@ -32,7 +32,7 @@ export const getProtocolV2SettingsBehavior = (
 } => {
   if (operation.kind === 'page') {
     return {
-      unlockPolicy: 'retry-on-locked',
+      unlockPolicy: 'unlock-before-run',
       uiInteraction: {
         request: 'button',
         source: 'method-lifecycle',