@onekeyfe/hd-core 0.0.3 → 0.0.4

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EACL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAWxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgHjD,CAAC;AAmGF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IAqBxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAGzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAgBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAWxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAuHjD,CAAC;AAoHF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IAqBxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAGzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAgBnE,CAAC"}

package/dist/events/core.d.ts

@@ -1,5 +1,6 @@
 import { Unsuccessful } from '../types/params';
 import { IFrameCallMessage } from './call';
+import { DeviceEventMessage } from './device';
 import { IFrameEventMessage } from './iframe';
 import { UiEventMessage } from './ui-request';
 import { UiResponseMessage } from './ui-response';
@@ -7,7 +8,7 @@ export declare const CORE_EVENT = "CORE_EVENT";
 export declare type CoreMessage = {
     id?: string;
     success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage | DeviceEventMessage);
 export declare type PostMessageEvent = MessageEvent<any>;
 export declare const parseMessage: (messageData: any) => CoreMessage;
 export declare const createErrorMessage: (error: Error & {

package/dist/events/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/events/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,eAAO,MAAM,UAAU,eAAe,CAAC;AAEvC,oBAAY,WAAW,GAAG;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC;CACxB,GAAG,CAAC,kBAAkB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,cAAc,CAAC,CAAC;AAElF,oBAAY,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;AAEjD,eAAO,MAAM,YAAY,gBAAiB,GAAG,KAAG,WAiB/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,KAAK,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,YAMpE,CAAC"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/events/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,eAAO,MAAM,UAAU,eAAe,CAAC;AAEvC,oBAAY,WAAW,GAAG;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC;CACxB,GAAG,CACA,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,cAAc,GACd,kBAAkB,CACrB,CAAC;AAEF,oBAAY,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;AAEjD,eAAO,MAAM,YAAY,gBAAiB,GAAG,KAAG,WAiB/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,KAAK,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,YAMpE,CAAC"}

package/dist/events/device.d.ts

@@ -1,4 +1,7 @@
 import type { PROTO } from '../constants';
+import type { KnownDevice as Device } from '../types/device';
+import { MessageFactoryFn } from './utils';
+export declare const DEVICE_EVENT = "DEVICE_EVENT";
 export declare const DEVICE: {
     readonly CONNECT: "device-connect";
     readonly CONNECT_UNACQUIRED: "device-connect_unacquired";
@@ -20,4 +23,16 @@ export declare const DEVICE: {
 export interface DeviceButtonRequestPayload extends Omit<PROTO.ButtonRequest, 'code'> {
     code?: PROTO.ButtonRequest['code'] | 'ButtonRequest_FirmwareUpdate';
 }
+export interface DeviceButtonRequest {
+    type: typeof DEVICE.BUTTON;
+    payload: DeviceButtonRequestPayload & {
+        device: Device | null;
+    };
+}
+export declare type DeviceEvent = DeviceButtonRequest;
+export declare type DeviceEventMessage = DeviceEvent & {
+    event: typeof DEVICE_EVENT;
+};
+export declare type DeviceEventListenerFn = (type: typeof DEVICE_EVENT, cb: (event: DeviceEventMessage) => void) => void;
+export declare const createDeviceMessage: MessageFactoryFn<typeof DEVICE_EVENT, DeviceEvent>;
 //# sourceMappingURL=device.d.ts.map

package/dist/events/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/events/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;CAqBT,CAAC;AAEX,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC;IACnF,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,8BAA8B,CAAC;CACrE"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/events/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;CAqBT,CAAC;AAEX,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC;IACnF,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,8BAA8B,CAAC;CACrE;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IAC3B,OAAO,EAAE,0BAA0B,GAAG;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACjE;AAED,oBAAY,WAAW,GAAG,mBAAmB,CAAC;AAE9C,oBAAY,kBAAkB,GAAG,WAAW,GAAG;IAAE,KAAK,EAAE,OAAO,YAAY,CAAA;CAAE,CAAC;AAE9E,oBAAY,qBAAqB,GAAG,CAClC,IAAI,EAAE,OAAO,YAAY,EACzB,EAAE,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,KACpC,IAAI,CAAC;AAEV,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,OAAO,YAAY,EAAE,WAAW,CAQxE,CAAC"}

package/dist/events/ui-request.d.ts

@@ -1,10 +1,18 @@
 import type { PROTO } from '../constants';
 import type { Device } from '../types';
+import type { DeviceButtonRequest } from './device';
 import type { MessageFactoryFn } from './utils';
 export declare const UI_EVENT = "UI_EVENT";
 export declare const UI_REQUEST: {
     readonly REQUEST_PIN: "ui-request_pin";
+    readonly INVALID_PIN: "ui-invalid_pin";
+    readonly REQUEST_BUTTON: "ui-button";
+    readonly CLOSE_UI_WINDOW: "ui-close_window";
 };
+export interface UiRequestWithoutPayload {
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+    payload?: typeof undefined;
+}
 export declare type UiRequestDeviceAction = {
     type: typeof UI_REQUEST.REQUEST_PIN;
     payload: {
@@ -12,7 +20,11 @@ export declare type UiRequestDeviceAction = {
         type?: PROTO.PinMatrixRequestType;
     };
 };
-export declare type UiEvent = UiRequestDeviceAction;
+export interface UiRequestButton {
+    type: typeof UI_REQUEST.REQUEST_BUTTON;
+    payload: DeviceButtonRequest['payload'];
+}
+export declare type UiEvent = UiRequestWithoutPayload | UiRequestDeviceAction | UiRequestButton;
 export declare type UiEventMessage = UiEvent & {
     event: typeof UI_EVENT;
 };

package/dist/events/ui-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-request.d.ts","sourceRoot":"","sources":["../../src/events/ui-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,UAAU;;CAEb,CAAC;AAEX,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACnC,CAAC;CACH,CAAC;AAEF,oBAAY,OAAO,GAAG,qBAAqB,CAAC;AAE5C,oBAAY,cAAc,GAAG,OAAO,GAAG;IAAE,KAAK,EAAE,OAAO,QAAQ,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,OAAO,QAAQ,EAAE,OAAO,CAK5D,CAAC"}
+{"version":3,"file":"ui-request.d.ts","sourceRoot":"","sources":["../../src/events/ui-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,UAAU;;;;;CAMb,CAAC;AAEX,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,OAAO,UAAU,CAAC,eAAe,CAAC;IACxC,OAAO,CAAC,EAAE,OAAO,SAAS,CAAC;CAC5B;AAED,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACnC,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,UAAU,CAAC,cAAc,CAAC;IACvC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;CACzC;AAED,oBAAY,OAAO,GAAG,uBAAuB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAExF,oBAAY,cAAc,GAAG,OAAO,GAAG;IAAE,KAAK,EAAE,OAAO,QAAQ,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,OAAO,QAAQ,EAAE,OAAO,CAK5D,CAAC"}

package/dist/index.d.ts

@@ -588,10 +588,52 @@ declare type MessageFactoryFn<Group, Event> = UnionToIntersection<Event extends
     payload: undefined;
 } : never>;
 
+declare const DEVICE_EVENT = "DEVICE_EVENT";
+declare const DEVICE: {
+    readonly CONNECT: "device-connect";
+    readonly CONNECT_UNACQUIRED: "device-connect_unacquired";
+    readonly DISCONNECT: "device-disconnect";
+    readonly CHANGED: "device-changed";
+    readonly ACQUIRE: "device-acquire";
+    readonly RELEASE: "device-release";
+    readonly ACQUIRED: "device-acquired";
+    readonly RELEASED: "device-released";
+    readonly USED_ELSEWHERE: "device-used_elsewhere";
+    readonly UNREADABLE: "unreadable-device";
+    readonly LOADING: "device-loading";
+    readonly BUTTON: "button";
+    readonly PIN: "pin";
+    readonly PASSPHRASE: "passphrase";
+    readonly PASSPHRASE_ON_DEVICE: "passphrase_on_device";
+    readonly WORD: "word";
+};
+interface DeviceButtonRequestPayload extends Omit<Messages.ButtonRequest, 'code'> {
+    code?: Messages.ButtonRequest['code'] | 'ButtonRequest_FirmwareUpdate';
+}
+interface DeviceButtonRequest {
+    type: typeof DEVICE.BUTTON;
+    payload: DeviceButtonRequestPayload & {
+        device: KnownDevice | null;
+    };
+}
+declare type DeviceEvent = DeviceButtonRequest;
+declare type DeviceEventMessage = DeviceEvent & {
+    event: typeof DEVICE_EVENT;
+};
+declare type DeviceEventListenerFn = (type: typeof DEVICE_EVENT, cb: (event: DeviceEventMessage) => void) => void;
+declare const createDeviceMessage: MessageFactoryFn<typeof DEVICE_EVENT, DeviceEvent>;
+
 declare const UI_EVENT = "UI_EVENT";
 declare const UI_REQUEST: {
     readonly REQUEST_PIN: "ui-request_pin";
+    readonly INVALID_PIN: "ui-invalid_pin";
+    readonly REQUEST_BUTTON: "ui-button";
+    readonly CLOSE_UI_WINDOW: "ui-close_window";
 };
+interface UiRequestWithoutPayload {
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+    payload?: typeof undefined;
+}
 declare type UiRequestDeviceAction = {
     type: typeof UI_REQUEST.REQUEST_PIN;
     payload: {
@@ -599,7 +641,11 @@ declare type UiRequestDeviceAction = {
         type?: Messages.PinMatrixRequestType;
     };
 };
-declare type UiEvent = UiRequestDeviceAction;
+interface UiRequestButton {
+    type: typeof UI_REQUEST.REQUEST_BUTTON;
+    payload: DeviceButtonRequest['payload'];
+}
+declare type UiEvent = UiRequestWithoutPayload | UiRequestDeviceAction | UiRequestButton;
 declare type UiEventMessage = UiEvent & {
     event: typeof UI_EVENT;
 };
@@ -681,35 +727,13 @@ declare const CORE_EVENT = "CORE_EVENT";
 declare type CoreMessage = {
     id?: string;
     success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage | DeviceEventMessage);
 declare type PostMessageEvent = MessageEvent<any>;
 declare const parseMessage: (messageData: any) => CoreMessage;
 declare const createErrorMessage: (error: Error & {
     code?: string;
 }) => Unsuccessful;
 
-declare const DEVICE: {
-    readonly CONNECT: "device-connect";
-    readonly CONNECT_UNACQUIRED: "device-connect_unacquired";
-    readonly DISCONNECT: "device-disconnect";
-    readonly CHANGED: "device-changed";
-    readonly ACQUIRE: "device-acquire";
-    readonly RELEASE: "device-release";
-    readonly ACQUIRED: "device-acquired";
-    readonly RELEASED: "device-released";
-    readonly USED_ELSEWHERE: "device-used_elsewhere";
-    readonly UNREADABLE: "unreadable-device";
-    readonly LOADING: "device-loading";
-    readonly BUTTON: "button";
-    readonly PIN: "pin";
-    readonly PASSPHRASE: "passphrase";
-    readonly PASSPHRASE_ON_DEVICE: "passphrase_on_device";
-    readonly WORD: "word";
-};
-interface DeviceButtonRequestPayload extends Omit<Messages.ButtonRequest, 'code'> {
-    code?: Messages.ButtonRequest['code'] | 'ButtonRequest_FirmwareUpdate';
-}
-
 declare type DeviceDescriptorDiff = {
     didUpdate: boolean;
     connected: OneKeyDeviceInfo[];
@@ -958,4 +982,4 @@ declare class DataManager {
 
 declare const HardwareSdk: ({ init, call, dispose, eventEmitter, uiResponse, cancel, }: InjectApi) => CoreApi;
 
-export { AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCVerifyMessageParams, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CommonParams, ConnectSettings, Core, CoreApi, CoreMessage, DEFAULT_PRIORITY, DEVICE, DataManager, Deferred, Device$1 as Device, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSettingsParams, DeviceStatus, DeviceTypeMap, errors as ERRORS, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, Features, FirmwareRange, FirmwareRelease, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, MethodResponseMessage, PostMessageEvent, RESPONSE_EVENT, ReleaseInfo, RemoteConfigResponse, Response, SearchDevice, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, Success, TransportReleaseStatus, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestDeviceAction, UiResponseEvent, UiResponseMessage, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, create, createErrorMessage, createIFrameMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceBLEFirmwareVersion, getDeviceFirmwareVersion, getDeviceLabel, getDeviceType, getDeviceUUID, getEnv, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };
+export { AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCVerifyMessageParams, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CommonParams, ConnectSettings, Core, CoreApi, CoreMessage, DEFAULT_PRIORITY, DEVICE, DEVICE_EVENT, DataManager, Deferred, Device$1 as Device, DeviceButtonRequest, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceEvent, DeviceEventListenerFn, DeviceEventMessage, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSettingsParams, DeviceStatus, DeviceTypeMap, errors as ERRORS, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, Features, FirmwareRange, FirmwareRelease, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, MethodResponseMessage, PostMessageEvent, RESPONSE_EVENT, ReleaseInfo, RemoteConfigResponse, Response, SearchDevice, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, Success, TransportReleaseStatus, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestButton, UiRequestDeviceAction, UiRequestWithoutPayload, UiResponseEvent, UiResponseMessage, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, create, createDeviceMessage, createErrorMessage, createIFrameMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceBLEFirmwareVersion, getDeviceFirmwareVersion, getDeviceLabel, getDeviceType, getDeviceUUID, getEnv, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };

package/dist/index.js

@@ -9805,6 +9805,9 @@ const createErrorMessage = (error) => ({
 const UI_EVENT = 'UI_EVENT';
 const UI_REQUEST$1 = {
     REQUEST_PIN: 'ui-request_pin',
+    INVALID_PIN: 'ui-invalid_pin',
+    REQUEST_BUTTON: 'ui-button',
+    CLOSE_UI_WINDOW: 'ui-close_window',
 };
 const createUiMessage = (type, payload) => ({
     event: UI_EVENT,
@@ -9841,6 +9844,7 @@ const createUiResponse = (type, payload) => ({
     payload,
 });
 
+const DEVICE_EVENT = 'DEVICE_EVENT';
 const DEVICE = {
     CONNECT: 'device-connect',
     CONNECT_UNACQUIRED: 'device-connect_unacquired',
@@ -9859,6 +9863,11 @@ const DEVICE = {
     PASSPHRASE_ON_DEVICE: 'passphrase_on_device',
     WORD: 'word',
 };
+const createDeviceMessage = (type, payload) => ({
+    event: DEVICE_EVENT,
+    type,
+    payload,
+});
 
 const assertType = (res, resType) => {
     const splitResTypes = Array.isArray(resType) ? resType : resType.split('|');
@@ -12361,6 +12370,9 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
     Log.debug('Call API - setDevice: ', device);
     (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
     device.on(DEVICE.PIN, onDevicePinHandler);
+    device.on(DEVICE.BUTTON, (d, code) => {
+        onDeviceButtonHandler(d, code);
+    });
     try {
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
             const unexpectedMode = device.hasUnexpectedMode(method.allowDeviceMode, method.requireDeviceMode);
@@ -12398,6 +12410,8 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
                 method.dispose();
             }
         }
+        closePopup();
+        cleanup();
     }
 });
 function initDeviceList(method) {
@@ -12447,6 +12461,13 @@ function initDeviceForBle(method) {
     device.deviceConnector = _connector;
     return device;
 }
+const cleanup = () => {
+    _uiPromises = [];
+    Log.debug('Cleanup...');
+};
+const closePopup = () => {
+    postMessage(createUiMessage(UI_REQUEST$1.CLOSE_UI_WINDOW));
+};
 const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, void 0, void 0, function* () {
     console.log('onDevicePinHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PIN, device);
@@ -12457,6 +12478,10 @@ const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, vo
     const uiResp = yield uiPromise.promise;
     callback(null, uiResp.payload);
 });
+const onDeviceButtonHandler = (...[device, request]) => {
+    postMessage(createDeviceMessage(DEVICE.BUTTON, Object.assign(Object.assign({}, request), { device: device.toMessageObject() })));
+    postMessage(createUiMessage(UI_REQUEST$1.REQUEST_BUTTON, { device: device.toMessageObject() }));
+};
 const postMessage = (message) => {
     _core.emit(CORE_EVENT, message);
 };
@@ -12539,6 +12564,7 @@ exports.CORE_EVENT = CORE_EVENT;
 exports.Core = Core;
 exports.DEFAULT_PRIORITY = DEFAULT_PRIORITY;
 exports.DEVICE = DEVICE;
+exports.DEVICE_EVENT = DEVICE_EVENT;
 exports.DataManager = DataManager;
 exports.ERRORS = errors;
 exports.IFRAME = IFRAME;
@@ -12548,6 +12574,7 @@ exports.UI_REQUEST = UI_REQUEST$1;
 exports.UI_RESPONSE = UI_RESPONSE;
 exports.corsValidator = corsValidator;
 exports.create = create;
+exports.createDeviceMessage = createDeviceMessage;
 exports.createErrorMessage = createErrorMessage;
 exports.createIFrameMessage = createIFrameMessage;
 exports.createResponseMessage = createResponseMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,7 +25,7 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.0.3",
+    "@onekeyfe/hd-transport": "^0.0.4",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "parse-uri": "^1.0.7",
@@ -35,5 +35,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "179c9f232b1cc52aa60af42f6daec76564f20e50"
+  "gitHead": "cabba10f92c55ebbe16c54a329c892d03a0c05fb"
 }

package/src/core/index.ts

@@ -19,6 +19,7 @@ import {
   UiPromise,
   UiPromiseResponse,
   createUiMessage,
+  createDeviceMessage,
 } from '../events';
 import type { BaseMethod } from '../api/BaseMethod';
 import type { ConnectSettings, KnownDevice } from '../types';
@@ -90,6 +91,9 @@ export const callAPI = async (message: CoreMessage) => {
   method.setDevice?.(device);
 
   device.on(DEVICE.PIN, onDevicePinHandler);
+  device.on(DEVICE.BUTTON, (d, code) => {
+    onDeviceButtonHandler(d, code);
+  });
 
   try {
     const inner = async (): Promise<void> => {
@@ -144,6 +148,10 @@ export const callAPI = async (message: CoreMessage) => {
         method.dispose();
       }
     }
+
+    closePopup();
+
+    cleanup();
     // TODO: 方法执行后，检查队列内是否有等待调用的 API，依次调用
   }
 };
@@ -203,6 +211,18 @@ function initDeviceForBle(method: BaseMethod) {
   return device;
 }
 
+const cleanup = () => {
+  _uiPromises = [];
+  Log.debug('Cleanup...');
+};
+
+/**
+ * Force close popup
+ */
+const closePopup = () => {
+  postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
+};
+
 const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin']) => {
   console.log('onDevicePinHandler');
   // create ui promise
@@ -220,6 +240,11 @@ const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin
   callback(null, uiResp.payload);
 };
 
+const onDeviceButtonHandler = (...[device, request]: [...DeviceEvents['button']]) => {
+  postMessage(createDeviceMessage(DEVICE.BUTTON, { ...request, device: device.toMessageObject() }));
+  postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, { device: device.toMessageObject() }));
+};
+
 /**
  * Emit message to listener (parent).
  * Clear method reference from _callMethods

package/src/events/core.ts

@@ -1,5 +1,6 @@
 import { Unsuccessful } from '../types/params';
 import { IFrameCallMessage } from './call';
+import { DeviceEventMessage } from './device';
 import { IFrameEventMessage } from './iframe';
 import { UiEventMessage } from './ui-request';
 import { UiResponseMessage } from './ui-response';
@@ -9,7 +10,13 @@ export const CORE_EVENT = 'CORE_EVENT';
 export type CoreMessage = {
   id?: string;
   success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (
+  | IFrameEventMessage
+  | IFrameCallMessage
+  | UiResponseMessage
+  | UiEventMessage
+  | DeviceEventMessage
+);
 
 export type PostMessageEvent = MessageEvent<any>;
 

package/src/events/device.ts

@@ -1,5 +1,8 @@
 import type { PROTO } from '../constants';
+import type { KnownDevice as Device } from '../types/device';
+import { MessageFactoryFn } from './utils';
 
+export const DEVICE_EVENT = 'DEVICE_EVENT';
 export const DEVICE = {
   // device list events
   CONNECT: 'device-connect',
@@ -26,3 +29,27 @@ export const DEVICE = {
 export interface DeviceButtonRequestPayload extends Omit<PROTO.ButtonRequest, 'code'> {
   code?: PROTO.ButtonRequest['code'] | 'ButtonRequest_FirmwareUpdate';
 }
+
+export interface DeviceButtonRequest {
+  type: typeof DEVICE.BUTTON;
+  payload: DeviceButtonRequestPayload & { device: Device | null };
+}
+
+export type DeviceEvent = DeviceButtonRequest;
+
+export type DeviceEventMessage = DeviceEvent & { event: typeof DEVICE_EVENT };
+
+export type DeviceEventListenerFn = (
+  type: typeof DEVICE_EVENT,
+  cb: (event: DeviceEventMessage) => void
+) => void;
+
+export const createDeviceMessage: MessageFactoryFn<typeof DEVICE_EVENT, DeviceEvent> = (
+  type,
+  payload
+) =>
+  ({
+    event: DEVICE_EVENT,
+    type,
+    payload,
+  } as any);

package/src/events/ui-request.ts

@@ -1,13 +1,23 @@
 import type { PROTO } from '../constants';
 import type { Device } from '../types';
+import type { DeviceButtonRequest } from './device';
 import type { MessageFactoryFn } from './utils';
 
 export const UI_EVENT = 'UI_EVENT';
 
 export const UI_REQUEST = {
   REQUEST_PIN: 'ui-request_pin',
+  INVALID_PIN: 'ui-invalid_pin',
+  REQUEST_BUTTON: 'ui-button',
+
+  CLOSE_UI_WINDOW: 'ui-close_window',
 } as const;
 
+export interface UiRequestWithoutPayload {
+  type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+  payload?: typeof undefined;
+}
+
 export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
   payload: {
@@ -16,7 +26,12 @@ export type UiRequestDeviceAction = {
   };
 };
 
-export type UiEvent = UiRequestDeviceAction;
+export interface UiRequestButton {
+  type: typeof UI_REQUEST.REQUEST_BUTTON;
+  payload: DeviceButtonRequest['payload'];
+}
+
+export type UiEvent = UiRequestWithoutPayload | UiRequestDeviceAction | UiRequestButton;
 
 export type UiEventMessage = UiEvent & { event: typeof UI_EVENT };