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

package/src/api/device/DeviceSettings.ts

@@ -10,11 +10,56 @@ import {
   mapDeviceSettingsToState,
 } from '../../device/DeviceStateMapper';
 import { getProtocolV2SettingsBehavior } from '../../protocols/protocol-v2/settingsUnlockPolicy';
-import { LANGUAGE_LABELS } from '../../utils/deviceSettings';
+import {
+  DEVICE_SETTINGS_V1_ONLY_FIELDS,
+  DEVICE_SETTINGS_V2_ONLY_FIELDS,
+  LANGUAGE_LABELS,
+  getDeviceSettingsCapabilities,
+} from '../../utils/deviceSettings';
 
 import type { ApplySettings } from '@onekeyfe/hd-transport';
 import type { DeviceSettingsParams } from '../../types/api/deviceSettings';
 
+const assertSettingsSupported = (
+  payload: DeviceSettingsParams,
+  unsupported: readonly (keyof DeviceSettingsParams)[],
+  protocol: 'Protocol V1' | 'Protocol V2'
+) => {
+  const provided = unsupported.filter(key => payload[key] !== undefined);
+  if (provided.length > 0) {
+    throw invalidParameter(`${protocol} does not support settings: ${provided.join(', ')}.`);
+  }
+};
+
+const assertProtocolV2SettingValues = (
+  payload: DeviceSettingsParams,
+  capabilities: ReturnType<typeof getDeviceSettingsCapabilities>
+) => {
+  const brightnessRange = capabilities.ranges.brightness;
+  if (
+    payload.brightness !== undefined &&
+    brightnessRange &&
+    (payload.brightness < brightnessRange.min || payload.brightness > brightnessRange.max)
+  ) {
+    throw invalidParameter(
+      `Protocol V2 brightness must be between ${brightnessRange.min} and ${brightnessRange.max}.`
+    );
+  }
+
+  const delayFields = [
+    ['autoLockDelayMs', capabilities.autoLockDelayOptions],
+    ['autoShutdownDelayMs', capabilities.autoShutdownDelayOptions],
+  ] as const;
+  delayFields.forEach(([field, options]) => {
+    const value = payload[field];
+    if (value !== undefined && !options.some(option => option.valueMs === value)) {
+      throw invalidParameter(
+        `Protocol V2 ${field} must be one of: ${options.map(option => option.valueMs).join(', ')}.`
+      );
+    }
+  });
+};
+
 const settingsPageForPayload = (
   payload: DeviceSettingsParams
 ): DeviceSettingsPage.DevicePassphrase | DeviceSettingsPage.DeviceAirgap | undefined => {
@@ -70,6 +115,7 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       safety_checks: this.payload.safetyChecks,
       experimental_features: this.payload.experimentalFeatures,
       auto_shutdown_delay_ms: this.payload.autoShutdownDelayMs,
+      use_ble: this.payload.bluetoothEnabled,
       ...(this.payload.changeBrightness
         ? { change_brightness: this.payload.changeBrightness }
         : undefined),
@@ -113,6 +159,12 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
   async run() {
     try {
       if (this.device.isProtocolV2()) {
+        assertSettingsSupported(this.payload, DEVICE_SETTINGS_V1_ONLY_FIELDS, 'Protocol V2');
+        const capabilities = getDeviceSettingsCapabilities(
+          this.device.getCurrentDeviceType(),
+          'V2'
+        );
+        assertProtocolV2SettingValues(this.payload, capabilities);
         const settings = mapCommonSettingsToProtocolV2(this.payload);
         const requestedPassphrase = this.payload.usePassphrase;
         const requestedAirgap = this.payload.airgapMode;
@@ -172,18 +224,27 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
         const res = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
           settings,
         });
-        this.device.updateState(mapDeviceSettingsToState(settings), 'apply-settings');
+        this.device.updateState(mapDeviceSettingsToState(settings), 'settings-write');
         return res.message;
       }
 
-      if (this.payload.airgapMode !== undefined) {
-        throw invalidParameter('Air-gap settings are not supported by Protocol V1.');
+      assertSettingsSupported(this.payload, DEVICE_SETTINGS_V2_ONLY_FIELDS, 'Protocol V1');
+      const capabilities = getDeviceSettingsCapabilities(this.device.getCurrentDeviceType(), 'V1');
+      if (
+        this.payload.safetyChecks !== undefined &&
+        !capabilities.safetyCheckOptions.some(option => option.value === this.payload.safetyChecks)
+      ) {
+        throw invalidParameter(
+          `Protocol V1 safetyChecks must be one of: ${capabilities.safetyCheckOptions
+            .map(option => option.value)
+            .join(', ')}.`
+        );
       }
 
       const res = await this.device.commands.typedCall('ApplySettings', 'Success', {
         ...this.params,
       });
-      this.device.updateState(mapApplySettingsToState(this.params), 'apply-settings');
+      this.device.updateState(mapApplySettingsToState(this.params), 'settings-write');
       return res.message;
     } catch (error) {
       if (error.message?.toLowerCase().includes('no setting provided')) {

package/src/api/device/DeviceUnlock.ts

@@ -17,6 +17,7 @@ export default class DeviceUnlock extends BaseMethod<LockDevice> {
   }
 
   async run() {
-    return this.device.unlockDevice();
+    await this.device.unlockDevice();
+    return this.device.getDeviceState();
   }
 }

package/src/api/index.ts

@@ -51,15 +51,12 @@ export { default as deviceUploadWallpaper } from './protocol-v2/DeviceUploadWall
 // Protocol V2 development APIs. These remain public while Pro2 integration is in development.
 export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
 export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
-export { default as deviceSettingsGet } from './protocol-v2/DeviceSettingsGet';
 export { default as protocolInfoRequest } from './protocol-v2/ProtocolInfoRequest';
 export { default as ping } from './protocol-v2/Ping';
 export { default as deviceFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
 export { default as deviceGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
 export { default as deviceFactoryInfoSet } from './protocol-v2/DeviceFactoryInfoSet';
 export { default as deviceFactoryInfoGet } from './protocol-v2/DeviceFactoryInfoGet';
-export { default as deviceSettingsSet } from './protocol-v2/DeviceSettingsSet';
-export { default as deviceSettingsPageShow } from './protocol-v2/DeviceSettingsPageShow';
 export { default as filesystemPermissionFix } from './protocol-v2/FilesystemPermissionFix';
 export { default as filesystemFormat } from './protocol-v2/FilesystemFormat';
 export { default as fileRead } from './FileRead';

package/src/core/RequestQueue.ts

@@ -1,47 +1,21 @@
-import { type Deferred, createDeferred } from '@onekeyfe/hd-shared';
-
 import { LoggerNames, getLogger } from '../utils';
 
+import type { Deferred } from '@onekeyfe/hd-shared';
 import type { BaseMethod } from '../api/BaseMethod';
 
 const Log = getLogger(LoggerNames.Core);
-const OPERATION_PRE_CANCEL_TTL_MS = 30_000;
-const DEFAULT_BACKGROUND_PREEMPT_TIMEOUT_MS = 5_500;
-
 export type RequestTask = {
   id: number;
   method: BaseMethod;
   callPromise?: Deferred<any> | undefined;
   abortController?: AbortController;
-  settled: Deferred<void>;
-  released: Deferred<void>;
-};
-
-export type RequestAdmission =
-  | { status: 'reserved'; task: RequestTask }
-  | { status: 'busy'; blockingTask?: RequestTask };
-
-export type RequestAdmissionOptions = {
-  backgroundPreemptTimeoutMs?: number;
 };
 
 export default class RequestQueue {
   private requestQueue = new Map<number, RequestTask>();
 
-  private operationRequestIds = new Map<string, number>();
-
-  private pendingOperationCancellations = new Map<string, number>();
-
   private pendingCallbackTasks = new Map<string, Deferred<void>>();
 
-  private prunePendingOperationCancellations(now = Date.now()) {
-    this.pendingOperationCancellations.forEach((expiresAt, operationId) => {
-      if (expiresAt <= now) {
-        this.pendingOperationCancellations.delete(operationId);
-      }
-    });
-  }
-
   // 生成唯一请求ID
   public generateRequestId = (method?: BaseMethod) => {
     if (method && method.responseID != null) {
@@ -57,93 +31,11 @@ export default class RequestQueue {
     }
     const abortController = new AbortController();
     method.abortSignal = abortController.signal;
-    const task = {
-      id: requestId,
-      method,
-      abortController,
-      settled: createDeferred<void>(),
-      released: createDeferred<void>(),
-    };
+    const task = { id: requestId, method, abortController };
     this.requestQueue.set(requestId, task);
-    const operationId = method.payload?.operationId;
-    if (typeof operationId === 'string' && operationId) {
-      this.operationRequestIds.set(operationId, requestId);
-      this.prunePendingOperationCancellations();
-      if (this.pendingOperationCancellations.delete(operationId)) {
-        abortController.abort();
-      }
-    }
     return task;
   }
 
-  public async admitTask(
-    method: BaseMethod,
-    options: RequestAdmissionOptions = {}
-  ): Promise<RequestAdmission> {
-    const activeTasks = Array.from(this.requestQueue.values()).filter(
-      task => task.method.connectId === method.connectId
-    );
-
-    if (method.executionPriority === 'background') {
-      if (activeTasks.length) {
-        Log.debug(
-          `Reject background method ${method.name}: device is occupied by ${activeTasks[0].method.name}`
-        );
-        return { status: 'busy', blockingTask: activeTasks[0] };
-      }
-      return { status: 'reserved', task: this.createTask(method) };
-    }
-
-    const backgroundTasks = activeTasks.filter(
-      task => task.method.executionPriority === 'background'
-    );
-    if (!backgroundTasks.length) {
-      return { status: 'reserved', task: this.createTask(method) };
-    }
-
-    Log.debug(
-      `Preempt ${backgroundTasks.length} background request(s) for user method ${method.name}`
-    );
-    backgroundTasks.forEach(task => task.abortController?.abort());
-    const timeoutMs =
-      options.backgroundPreemptTimeoutMs ??
-      Math.max(
-        DEFAULT_BACKGROUND_PREEMPT_TIMEOUT_MS,
-        ...backgroundTasks.map(task => task.method.maxAbortLatencyMs ?? 0)
-      );
-    const released = await this.waitForTasksReleased(backgroundTasks, timeoutMs);
-    if (!released) {
-      Log.warn(`Background request cleanup timed out before user method ${method.name}`);
-      return { status: 'busy', blockingTask: backgroundTasks[0] };
-    }
-
-    return { status: 'reserved', task: this.createTask(method) };
-  }
-
-  private async waitForTasksReleased(tasks: RequestTask[], timeoutMs: number) {
-    let timer: ReturnType<typeof setTimeout> | undefined;
-    const timeoutPromise = new Promise<false>(resolve => {
-      timer = setTimeout(() => resolve(false), timeoutMs);
-    });
-    const releasedPromise = Promise.all(tasks.map(task => task.released.promise)).then(() => true);
-    const released = await Promise.race([releasedPromise, timeoutPromise]);
-    if (timer) {
-      clearTimeout(timer);
-    }
-    return released;
-  }
-
-  public abortOperation(operationId: string) {
-    const requestId = this.operationRequestIds.get(operationId);
-    if (requestId !== undefined) {
-      return this.abortRequest(requestId);
-    }
-    const now = Date.now();
-    this.prunePendingOperationCancellations(now);
-    this.pendingOperationCancellations.set(operationId, now + OPERATION_PRE_CANCEL_TTL_MS);
-    return false;
-  }
-
   public getTask(requestId: number): RequestTask | undefined {
     return this.requestQueue.get(requestId);
   }
@@ -186,7 +78,6 @@ export default class RequestQueue {
         count++;
       }
     });
-    this.pendingOperationCancellations.clear();
     return count;
   }
 
@@ -200,8 +91,8 @@ export default class RequestQueue {
     const request = this.requestQueue.get(requestId);
     if (request) {
       request.callPromise?.resolve(response);
-      request.settled.resolve();
     }
+    this.releaseTask(requestId);
   }
 
   // 拒绝请求
@@ -209,22 +100,12 @@ export default class RequestQueue {
     const request = this.requestQueue.get(requestId);
     if (request) {
       request.callPromise?.reject(error);
-      request.settled.resolve();
     }
+    this.releaseTask(requestId);
   }
 
   // 删除请求
   public releaseTask(requestId: number) {
-    const task = this.requestQueue.get(requestId);
-    const operationId = task?.method.payload?.operationId;
-    if (
-      typeof operationId === 'string' &&
-      this.operationRequestIds.get(operationId) === requestId
-    ) {
-      this.operationRequestIds.delete(operationId);
-    }
-    task?.settled.resolve();
-    task?.released.resolve();
     this.requestQueue.delete(requestId);
   }
 

package/src/core/index.ts

@@ -196,25 +196,34 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
   //   );
   // }
 
+  const { requestQueue, methodSynchronize } = context;
+  const error = await methodSynchronize(() => {
+    for (const requestId of requestQueue.getRequestTasksId()) {
+      const task = requestQueue.getTask(requestId);
+      Log.debug(
+        'pre request task: ',
+        `task?.id: ${task?.id},
+      task?.method.connectId: ${task?.method.connectId},
+      task?.method.deviceId: ${task?.method.deviceId},
+      task?.method.name: ${task?.method.name}`
+      );
+      // if (task) {
+      //   return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceBusy));
+      // }
+    }
+    return null;
+  });
+
+  if (error) {
+    return createResponseMessage(method.responseID, false, { error });
+  }
+
   // only the pre-warm signal (PreInitialize) forks here; normal methods fall
   // through to onCallDevice below, so the pre-warm dedup/guards never touch them
   if (method.isPreWarmSignal) {
     return handlePreWarmSignal(context, message, method);
   }
 
-  const { requestQueue, methodSynchronize } = context;
-  const admission = await methodSynchronize(
-    () => requestQueue.admitTask(method),
-    method.connectId ?? method.deviceId ?? 'unknown-device'
-  );
-  if (admission.status === 'busy') {
-    const error = ERRORS.TypedError(HardwareErrorCode.DeviceBusy);
-    DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
-    completeMethodRequestContext(method, error);
-    method.dispose();
-    return createResponseMessage(method.responseID, false, { error });
-  }
-
   return onCallDevice(context, message, method);
 };
 
@@ -334,7 +343,7 @@ const onCallDevice = async (
 
   await waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
 
-  const task = requestQueue.getTask(method.responseID) ?? requestQueue.createTask(method);
+  const task = requestQueue.createTask(method);
 
   // Pre-warm holds the device as a per-connectId callback task so a concurrent
   // real call waits (before ensureConnected) instead of racing its Initialize.
@@ -378,10 +387,6 @@ const onCallDevice = async (
   if (method.payload?.onlyConnectBleDevice) {
     preWarmCallbackTask?.resolve();
     Log.debug('Call API - only connect ble device: ', device?.mainId);
-    DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
-    requestQueue.releaseTask(method.responseID);
-    completeMethodRequestContext(method);
-    method.dispose();
     return createResponseMessage(method.responseID, true, null);
   }
 
@@ -661,9 +666,8 @@ const onCallDevice = async (
       skipInitialize: canSkipInitialize(method, device),
       ...parseInitOptions(method),
     };
-    const deviceRunPromise = device.run(inner, runOptions);
-    task.callPromise = createDeferred<any>();
-    deviceRunPromise.catch(error => task.callPromise?.reject(error));
+    const deviceRun = () => device.run(inner, runOptions);
+    task.callPromise = createDeferred<any>(deviceRun);
 
     try {
       return await task.callPromise.promise;
@@ -671,8 +675,6 @@ const onCallDevice = async (
       Log.debug('Device Run Error: ', e);
       completeMethodRequestContext(method, e);
       return createResponseMessage(method.responseID, false, { error: e });
-    } finally {
-      await deviceRunPromise.catch(() => undefined);
     }
   } catch (error) {
     messageResponse = createResponseMessage(method.responseID, false, { error });
@@ -1389,10 +1391,6 @@ export default class Core extends EventEmitter {
     Log.debug(`[Core] Created SDK instance: ${this.sdkInstanceId}`);
   }
 
-  cancelOperation(operationId: string) {
-    this.requestQueue.abortOperation(operationId);
-  }
-
   private getCoreContext() {
     return {
       sdkInstanceId: this.sdkInstanceId,
@@ -1468,10 +1466,6 @@ export default class Core extends EventEmitter {
         cancel(this.getCoreContext(), message.payload.connectId);
         break;
       }
-      case IFRAME.CANCEL_OPERATION: {
-        this.cancelOperation(message.payload.operationId);
-        break;
-      }
       case IFRAME.CALLBACK: {
         Log.log('callback message: ', message);
         postMessage(message);

package/src/device/Device.ts

@@ -955,7 +955,7 @@ export class Device extends EventEmitter {
           'DeviceSettings',
           {}
         );
-        this.updateState(mapDeviceSettingsToState(message), 'apply-settings');
+        this.updateState(mapDeviceSettingsToState(message), 'settings-read');
       }
     }
 

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,
@@ -289,9 +293,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 +306,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 +321,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/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/index.ts

@@ -27,7 +27,6 @@ const HardwareSdk = ({
   eventEmitter,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: InjectApi): CoreApi =>
@@ -38,7 +37,6 @@ const HardwareSdk = ({
     eventEmitter,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });
@@ -51,7 +49,6 @@ const HardwareSDKLowLevel = ({
   addHardwareGlobalEventListener,
   uiResponse,
   cancel,
-  cancelOperation,
   updateSettings,
   switchTransport,
 }: LowLevelInjectApi): LowLevelCoreApi =>
@@ -63,7 +60,6 @@ const HardwareSDKLowLevel = ({
     addHardwareGlobalEventListener,
     uiResponse,
     cancel,
-    cancelOperation,
     updateSettings,
     switchTransport,
   });

package/src/inject.ts

@@ -36,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,
@@ -75,7 +73,6 @@ export const inject = ({
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 
@@ -99,7 +96,6 @@ export const createCoreApi = (
   | 'dispose'
   | 'uiResponse'
   | 'cancel'
-  | 'cancelOperation'
   | 'updateSettings'
   | 'switchTransport'
 > => ({
@@ -166,8 +162,6 @@ export const createCoreApi = (
     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' }),
@@ -179,10 +173,6 @@ export const createCoreApi = (
     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' }),

package/src/lowLevelInject.ts

@@ -13,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;
@@ -26,7 +25,6 @@ export type LowLevelCoreApi = Omit<CoreApi, 'on' | 'off'> & {
 export const lowLevelInject = ({
   call,
   cancel,
-  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -50,7 +48,6 @@ export const lowLevelInject = ({
     uiResponse,
 
     cancel,
-    cancelOperation,
 
     updateSettings,
 

package/src/topLevelInject.ts

@@ -52,8 +52,6 @@ export const topLevelInject = () => {
 
     cancel: (connectId?: string) => lowLevelApi?.cancel(connectId),
 
-    cancelOperation: (operationId: string) => lowLevelApi?.cancelOperation(operationId),
-
     updateSettings: settings => lowLevelApi?.updateSettings(settings) ?? Promise.resolve(false),
 
     switchTransport: (env: ConnectSettings['env']) =>