@onekeyfe/hd-core 1.1.2-alpha.2 → 1.1.2

package/src/core/index.ts

@@ -52,7 +52,7 @@ import { getSynchronize } from '../utils/getSynchronize';
 
 const Log = getLogger(LoggerNames.Core);
 
-export type CoreContext = ReturnType<Core['getCoreContext']>;
+type CoreContext = ReturnType<Core['getCoreContext']>;
 
 function hasDeriveCardano(method: BaseMethod): boolean {
   if (
@@ -195,11 +195,6 @@ const onCallDevice = async (
     DevicePool.clearDeviceCache(method.payload.connectId);
   }
 
-  // 等待之前的 callback 任务完成（确保设备不会并发调用）
-  if (method.connectId) {
-    await context.waitForCallbackTasks(method.connectId);
-  }
-
   await waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
 
   const task = requestQueue.createTask(method);
@@ -230,7 +225,6 @@ const onCallDevice = async (
 
   Log.debug('Call API - setDevice: ', device.mainId);
   method.setDevice?.(device);
-  method.context = context;
 
   device.on(DEVICE.PIN, onDevicePinHandler);
   device.on(DEVICE.BUTTON, onDeviceButtonHandler);
@@ -246,10 +240,6 @@ const onCallDevice = async (
   );
 
   try {
-    if (method.connectId) {
-      await context.waitForCallbackTasks(method.connectId);
-    }
-
     await waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
 
     const inner = async (): Promise<void> => {
@@ -720,10 +710,6 @@ export const cancel = (context: CoreContext, connectId?: string) => {
       // }
       // setPrePendingCallPromise(device?.interruptionFromUser());
       // requestQueue.abortRequestsByConnectId(connectId);
-
-      // cancel callback tasks
-      requestQueue.cancelCallbackTasks(connectId);
-
       const requestIds = requestQueue.getRequestTasksId();
       Log.debug(
         `Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(
@@ -961,7 +947,7 @@ const removeUiPromise = (promise: Deferred<any>) => {
 export default class Core extends EventEmitter {
   private requestQueue = new RequestQueue();
 
-  // background task
+  // 上一个请求的 promise 完成，后续需要清理的工作，需要在下一次请求前完成
   private prePendingCallPromise: Promise<void> | undefined;
 
   private methodSynchronize = getSynchronize();
@@ -974,13 +960,6 @@ export default class Core extends EventEmitter {
       setPrePendingCallPromise: (promise: Promise<void> | undefined) => {
         this.prePendingCallPromise = promise;
       },
-      // callback 任务管理
-      registerCallbackTask: (connectId: string, callbackPromise: Deferred<any>) => {
-        this.requestQueue.registerPendingCallbackTask(connectId, callbackPromise);
-      },
-      waitForCallbackTasks: (connectId: string) =>
-        this.requestQueue.waitForPendingCallbackTasks(connectId),
-      cancelCallbackTasks: (connectId: string) => this.requestQueue.cancelCallbackTasks(connectId),
     };
   }
 
@@ -1031,11 +1010,6 @@ export default class Core extends EventEmitter {
         cancel(this.getCoreContext(), message.payload.connectId);
         break;
       }
-      case IFRAME.CALLBACK: {
-        Log.log('callback message: ', message);
-        postMessage(message);
-        break;
-      }
       default:
         break;
     }

package/src/device/Device.ts

@@ -151,8 +151,6 @@ export class Device extends EventEmitter {
 
   passphraseState: string | undefined = undefined;
 
-  pendingCallbackPromise?: Deferred<void>;
-
   constructor(descriptor: DeviceDescriptor) {
     super();
     this.originalDescriptor = descriptor;
@@ -266,18 +264,6 @@ export class Device extends EventEmitter {
       (this.isUsedHere() && !this.keepSession && this.mainId) ||
       (this.mainId && DataManager.isBleConnect(env))
     ) {
-      // wait for callback tasks to complete before releasing device
-      if (this.pendingCallbackPromise) {
-        try {
-          Log.debug(
-            'Waiting for callback tasks to complete before releasing device (in release method)'
-          );
-          await this.pendingCallbackPromise.promise;
-        } catch (error) {
-          Log.error('Error waiting for callback tasks in release method:', error);
-        }
-      }
-
       if (this.commands) {
         this.commands.dispose(false);
         if (this.commands.callPromise) {

package/src/events/call.ts

@@ -58,16 +58,6 @@ export interface IFrameSwitchTransportMessage {
   payload: { env: ConnectSettings['env'] };
 }
 
-export interface IFrameCallbackMessage {
-  event: typeof IFRAME.CALLBACK;
-  type: typeof IFRAME.CALLBACK;
-  payload: {
-    callbackId: string;
-    data?: any;
-    error?: any;
-  };
-}
-
 export const RESPONSE_EVENT = 'RESPONSE_EVENT';
 
 export interface MethodResponseMessage {

package/src/events/core.ts

@@ -1,11 +1,6 @@
 import { HardwareError } from '@onekeyfe/hd-shared';
 import { Unsuccessful } from '../types/params';
-import {
-  IFrameCallMessage,
-  IFrameCancelMessage,
-  IFrameSwitchTransportMessage,
-  IFrameCallbackMessage,
-} from './call';
+import { IFrameCallMessage, IFrameCancelMessage, IFrameSwitchTransportMessage } from './call';
 import { DeviceEventMessage } from './device';
 import { IFrameEventMessage } from './iframe';
 import { UiEventMessage } from './ui-request';
@@ -23,7 +18,6 @@ export type CoreMessage = {
   | IFrameCallMessage
   | IFrameCancelMessage
   | IFrameSwitchTransportMessage
-  | IFrameCallbackMessage
   | UiResponseMessage
   | UiEventMessage
   | DeviceEventMessage

package/src/events/iframe.ts

@@ -8,7 +8,6 @@ export const IFRAME = {
   CALL: 'iframe-call',
   CANCEL: 'iframe-cancel',
   SWITCH_TRANSPORT: 'iframe-switch-transport',
-  CALLBACK: 'iframe-callback',
 } as const;
 
 export interface IFrameInit {
@@ -30,17 +29,7 @@ export interface IFrameSwitchTransport {
   };
 }
 
-export interface IFrameCallback {
-  type: typeof IFRAME.CALLBACK;
-  payload: {
-    callbackId: string;
-    data?: any;
-    error?: any;
-    finished?: boolean;
-  };
-}
-
-export type IFrameEvent = IFrameInit | IFrameBridge | IFrameSwitchTransport | IFrameCallback;
+export type IFrameEvent = IFrameInit | IFrameBridge | IFrameSwitchTransport;
 export type IFrameEventMessage = IFrameEvent & { event: typeof UI_EVENT };
 
 export const createIFrameMessage: MessageFactoryFn<typeof UI_EVENT, IFrameEvent> = (

package/src/index.ts

@@ -1,4 +1,4 @@
-import { inject, InjectApi, executeCallback, cleanupCallback } from './inject';
+import { inject, InjectApi } from './inject';
 import { lowLevelInject, LowLevelInjectApi, LowLevelCoreApi } from './lowLevelInject';
 import { topLevelInject } from './topLevelInject';
 import { CoreApi } from './types/api';
@@ -14,7 +14,6 @@ export * from './data-manager';
 export * from './events';
 export * from './types';
 export { whitelist, whitelistExtension } from './data/config';
-export { executeCallback, cleanupCallback };
 
 const HardwareSdk = ({
   init,

package/src/inject.ts

@@ -1,31 +1,6 @@
 import { EventEmitter } from 'events';
 import { CallMethod } from './events';
 import { CoreApi } from './types/api';
-import type { AllNetworkAddress } from './types/api/allNetworkGetAddress';
-
-type CallbackFunction = (data?: any, error?: { message: string; code?: number }) => void;
-
-const callbackManager = new Map<string, CallbackFunction>();
-
-const generateCallbackId = () =>
-  `callback_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
-
-const registerCallback = (id: string, callback: CallbackFunction) => {
-  callbackManager.set(id, callback);
-};
-
-const executeCallback = (id: string, ...args: any[]) => {
-  const callback = callbackManager.get(id);
-  if (callback) {
-    callback(...args);
-  }
-};
-
-const cleanupCallback = (id: string) => {
-  callbackManager.delete(id);
-};
-
-export { executeCallback, cleanupCallback };
 
 export interface InjectApi {
   call: CallMethod;
@@ -172,28 +147,6 @@ export const createCoreApi = (
 
   allNetworkGetAddress: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'allNetworkGetAddress' }),
-  allNetworkGetAddressByLoop: (connectId, deviceId, params) => {
-    const { onLoopItemResponse, onAllItemsResponse, ...restParams } = params;
-
-    const callbackId = generateCallbackId();
-    registerCallback(callbackId, onLoopItemResponse);
-
-    const callbackIdFinish = generateCallbackId();
-    registerCallback(callbackIdFinish, (data?: AllNetworkAddress[]) => {
-      onAllItemsResponse?.(data);
-      cleanupCallback(callbackIdFinish);
-      cleanupCallback(callbackId);
-    });
-
-    return call({
-      ...restParams,
-      connectId,
-      deviceId,
-      method: 'allNetworkGetAddressByLoop',
-      callbackId,
-      callbackIdFinish,
-    });
-  },
 
   evmGetAddress: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'evmGetAddress' }),

package/src/types/api/allNetworkGetAddress.ts

@@ -91,7 +91,7 @@ type AllNetworkAddressPayload =
       xpubSegwit: string;
     };
 
-export type AllNetworkAddress = AllNetworkAddressParams & {
+export type AllNetworkAddress = CommonResponseParams & {
   success: boolean;
   payload?:
     | AllNetworkAddressPayload
@@ -108,24 +108,8 @@ export type AllNetworkGetAddressParams = {
   bundle: AllNetworkAddressParams[];
 };
 
-export type AllNetworkGetAddressParamsByLoop = {
-  callbackId?: string;
-  callbackIdFinish?: string;
-  onLoopItemResponse: (
-    data?: AllNetworkAddress,
-    error?: { message: string; code?: number }
-  ) => void;
-  onAllItemsResponse: (data?: AllNetworkAddress[]) => void;
-};
-
 export declare function allNetworkGetAddress(
   connectId: string,
   deviceId: string,
   params: CommonParams & AllNetworkGetAddressParams
 ): Response<AllNetworkAddress[]>;
-
-export declare function allNetworkGetAddressByLoop(
-  connectId: string,
-  deviceId: string,
-  params: CommonParams & AllNetworkGetAddressParamsByLoop
-): Response<string[]>;

package/src/types/api/evmGetPublicKey.ts

@@ -14,7 +14,6 @@ export type EVMGetPublicKeyParams = {
   path: string | number[];
   showOnOneKey?: boolean;
   chainId?: number;
-  useBatch?: boolean;
 };
 
 export declare function evmGetPublicKey(

package/src/types/api/index.ts

@@ -43,7 +43,7 @@ import { setU2FCounter } from './setU2FCounter';
 
 import { cipherKeyValue } from './cipherKeyValue';
 
-import { allNetworkGetAddress, allNetworkGetAddressByLoop } from './allNetworkGetAddress';
+import { allNetworkGetAddress } from './allNetworkGetAddress';
 
 import { evmGetAddress } from './evmGetAddress';
 import { evmGetPublicKey } from './evmGetPublicKey';
@@ -230,7 +230,6 @@ export type CoreApi = {
    * All network function
    */
   allNetworkGetAddress: typeof allNetworkGetAddress;
-  allNetworkGetAddressByLoop: typeof allNetworkGetAddressByLoop;
 
   /**
    * EVM function

package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts

@@ -1,46 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import { CoreApi } from '../../types';
-import type { AllNetworkAddressParams, INetwork, AllNetworkAddress, CommonResponseParams } from '../../types/api/allNetworkGetAddress';
-export type NetworkConfig = {
-    methodName: keyof CoreApi;
-    getParams?: (baseParams: AllNetworkAddressParams, chainName?: string, methodName?: string) => any;
-    dependOnMethodName?: (keyof CoreApi)[];
-};
-export type INetworkReal = Exclude<INetwork, 'tbtc' | 'bch' | 'doge' | 'ltc' | 'neurai'>;
-export type NetworkConfigMap = {
-    [K in INetworkReal]: NetworkConfig;
-};
-export declare const networkAliases: {
-    [key: string]: {
-        name: INetworkReal;
-        coin: string;
-    };
-};
-type MethodParams = {
-    methodName: keyof CoreApi;
-    params: Parameters<CoreApi[keyof CoreApi]>[0];
-    _originRequestParams: AllNetworkAddressParams;
-    _originalIndex: number;
-};
-export default abstract class AllNetworkGetAddressBase extends BaseMethod<{
-    address_n: number[];
-    show_display: boolean;
-    network: string;
-    chain_name?: string;
-}[]> {
-    init(): void;
-    generateMethodName({ network, payload, originalIndex, }: {
-        network: INetwork;
-        payload: AllNetworkAddressParams;
-        originalIndex: number;
-    }): MethodParams;
-    callMethod(methodName: keyof CoreApi, params: any & {
-        bundle: (any & {
-            _originRequestParams: CommonResponseParams;
-        })[];
-    }): Promise<AllNetworkAddress[]>;
-    abstract getAllNetworkAddress(): Promise<AllNetworkAddress[]>;
-    run(): Promise<AllNetworkAddress[]>;
-}
-export {};
-//# sourceMappingURL=AllNetworkGetAddressBase.d.ts.map

package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAW9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AA8LF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAyDH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAEvD,GAAG;CAGV"}

package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts

@@ -1,8 +0,0 @@
-import AllNetworkGetAddressBase from './AllNetworkGetAddressBase';
-export default class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
-    getAllNetworkAddress(): Promise<never[]>;
-    private processCallbacksInBackground;
-    private sendFinishCallback;
-    private sendItemCallback;
-}
-//# sourceMappingURL=AllNetworkGetAddressByLoop.d.ts.map

package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllNetworkGetAddressByLoop.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressByLoop.ts"],"names":[],"mappings":"AAOA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,wBAAwB;IACxE,oBAAoB;YAwBZ,4BAA4B;IA4C1C,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,gBAAgB;CAczB"}