@onekeyfe/hd-core 0.0.3 → 0.0.6

package/dist/api/helpers/pathUtils.d.ts

@@ -1,5 +1,4 @@
 import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport/src/types/messages';
-export declare const HD_HARDENED = 2147483648;
 export declare const toHardened: (n: number) => number;
 export declare const fromHardened: (n: number) => number;
 export declare const getHDPath: (path: string) => Array<number>;

package/dist/api/helpers/pathUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGpG,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAQ5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAmBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}
+{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAIpG,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAQ5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAmBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}

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,iBAgIjD,CAAC;AAoHF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA2BxC,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,20 @@
 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";
+    readonly BLUETOOTH_PERMISSION: "ui-bluetooth_permission";
+    readonly LOCATION_PERMISSION: "ui-location_permission";
 };
+export interface UiRequestWithoutPayload {
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW | typeof UI_REQUEST.BLUETOOTH_PERMISSION | typeof UI_REQUEST.LOCATION_PERMISSION;
+    payload?: typeof undefined;
+}
 export declare type UiRequestDeviceAction = {
     type: typeof UI_REQUEST.REQUEST_PIN;
     payload: {
@@ -12,7 +22,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;;;;;;;CASb,CAAC;AAEX,MAAM,WAAW,uBAAuB;IACtC,IAAI,EACA,OAAO,UAAU,CAAC,eAAe,GACjC,OAAO,UAAU,CAAC,oBAAoB,GACtC,OAAO,UAAU,CAAC,mBAAmB,CAAC;IAC1C,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

@@ -1,7 +1,7 @@
 import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
 import { Messages, Transport, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 export { Messages as PROTO } from '@onekeyfe/hd-transport';
-import { EthereumPublicKey, EthereumMessageSignature, Success as Success$1, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, TxInputType, TxOutputType, PrevInput, TxOutputBinType, TxInput, RecoveryDeviceType, SafetyCheckLevel, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumPublicKey, EthereumMessageSignature, Success as Success$1, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, RecoveryDeviceType, SafetyCheckLevel, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
 
 interface CommonParams {
     keepSession?: boolean;
@@ -361,6 +361,20 @@ declare type BTCSignMessageParams = {
 };
 declare function btcSignMessage(connectId: string, params: CommonParams & BTCSignMessageParams): Response<MessageSignature>;
 
+declare type SignedTransaction = {
+    signatures: string[];
+    serializedTx: string;
+    txid?: string;
+};
+declare type TransactionOptions = {
+    version?: number;
+    lock_time?: number;
+    expiry?: number;
+    overwintered?: boolean;
+    version_group_id?: number;
+    timestamp?: number;
+    branch_id?: number;
+};
 declare type RefTransaction = {
     hash: string;
     version: number;
@@ -417,7 +431,7 @@ declare type BTCSignTransactionParams = {
     branchId?: number;
     timestamp?: number;
 };
-declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<Success$1>;
+declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<SignedTransaction>;
 
 declare type BTCVerifyMessageParams = {
     address: string;
@@ -588,10 +602,54 @@ 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";
+    readonly BLUETOOTH_PERMISSION: "ui-bluetooth_permission";
+    readonly LOCATION_PERMISSION: "ui-location_permission";
+};
+interface UiRequestWithoutPayload {
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW | typeof UI_REQUEST.BLUETOOTH_PERMISSION | typeof UI_REQUEST.LOCATION_PERMISSION;
+    payload?: typeof undefined;
+}
 declare type UiRequestDeviceAction = {
     type: typeof UI_REQUEST.REQUEST_PIN;
     payload: {
@@ -599,7 +657,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 +743,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[];
@@ -852,8 +892,9 @@ declare const getDeviceType: (features?: {
 } | undefined) => IDeviceType;
 declare const getDeviceUUID: (features: Features) => string;
 declare const getDeviceLabel: (features: Features) => string;
-declare const getDeviceFirmwareVersion: (features: Features) => IVersionArray;
-declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersionArray | null;
+
+declare const getHDPath: (path: string) => Array<number>;
+declare const getScriptType: (path: Array<number>) => InputScriptType;
 
 declare type RunOptions = {
     keepSession?: boolean;
@@ -958,4 +999,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 { AccountAddress, AccountAddresses, AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCSignTransactionParams, 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, RefTransaction, ReleaseInfo, RemoteConfigResponse, Response, SearchDevice, SignedTransaction, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, Success, TransactionOptions, 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, getDeviceLabel, getDeviceType, getDeviceUUID, getEnv, getHDPath, getScriptType, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };

package/dist/index.js

@@ -845,6 +845,109 @@ const getDeviceBLEFirmwareVersion = (features) => {
     return features.ble_ver.split('.');
 };
 
+const HD_HARDENED = 0x80000000;
+const toHardened = (n) => (n | HD_HARDENED) >>> 0;
+const fromHardened = (n) => (n & ~HD_HARDENED) >>> 0;
+const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
+const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
+const getHDPath = (path) => {
+    const parts = path.toLowerCase().split('/');
+    if (parts[0] !== 'm')
+        throw PATH_NOT_VALID;
+    return parts
+        .filter((p) => p !== 'm' && p !== '')
+        .map((p) => {
+        let hardened = false;
+        if (p.substr(p.length - 1) === "'") {
+            hardened = true;
+            p = p.substr(0, p.length - 1);
+        }
+        let n = parseInt(p);
+        if (Number.isNaN(n)) {
+            throw PATH_NOT_VALID;
+        }
+        else if (n < 0) {
+            throw PATH_NEGATIVE_VALUES;
+        }
+        if (hardened) {
+            n = toHardened(n);
+        }
+        return n;
+    });
+};
+const isMultisigPath = (path) => Array.isArray(path) && path[0] === toHardened(48);
+const isSegwitPath = (path) => Array.isArray(path) && path[0] === toHardened(49);
+const getScriptType = (path) => {
+    if (!Array.isArray(path) || path.length < 1)
+        return 'SPENDADDRESS';
+    const p1 = fromHardened(path[0]);
+    switch (p1) {
+        case 48:
+            return 'SPENDMULTISIG';
+        case 49:
+            return 'SPENDP2SHWITNESS';
+        case 84:
+            return 'SPENDWITNESS';
+        default:
+            return 'SPENDADDRESS';
+    }
+};
+const getOutputScriptType = (path) => {
+    if (!Array.isArray(path) || path.length < 1)
+        return 'PAYTOADDRESS';
+    if (path[0] === 49) {
+        return 'PAYTOP2SHWITNESS';
+    }
+    const p = fromHardened(path[0]);
+    switch (p) {
+        case 48:
+            return 'PAYTOMULTISIG';
+        case 49:
+            return 'PAYTOP2SHWITNESS';
+        case 84:
+            return 'PAYTOWITNESS';
+        default:
+            return 'PAYTOADDRESS';
+    }
+};
+const serializedPath = (path) => {
+    const pathStr = path
+        .map((p) => {
+        if (p & HD_HARDENED) {
+            return `${p & ~HD_HARDENED}'`;
+        }
+        return p;
+    })
+        .join('/');
+    return `m/${pathStr}`;
+};
+const validatePath = (path, length = 0, base = false) => {
+    let valid;
+    if (typeof path === 'string') {
+        valid = getHDPath(path);
+    }
+    else if (Array.isArray(path)) {
+        valid = path.map((p) => {
+            const n = parseInt(p);
+            if (Number.isNaN(n)) {
+                throw PATH_NOT_VALID;
+            }
+            else if (n < 0) {
+                throw PATH_NEGATIVE_VALUES;
+            }
+            return n;
+        });
+    }
+    else {
+        valid = undefined;
+    }
+    if (!valid)
+        throw PATH_NOT_VALID;
+    if (length > 0 && valid.length < length)
+        throw PATH_NOT_VALID;
+    return base ? valid.splice(0, 3) : valid;
+};
+
 var nested = {
 	BinanceGetAddress: {
 		fields: {
@@ -9805,6 +9908,11 @@ 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',
+    BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
+    LOCATION_PERMISSION: 'ui-location_permission',
 };
 const createUiMessage = (type, payload) => ({
     event: UI_EVENT,
@@ -9841,6 +9949,7 @@ const createUiResponse = (type, payload) => ({
     payload,
 });
 
+const DEVICE_EVENT = 'DEVICE_EVENT';
 const DEVICE = {
     CONNECT: 'device-connect',
     CONNECT_UNACQUIRED: 'device-connect_unacquired',
@@ -9859,6 +9968,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('|');
@@ -10483,109 +10597,6 @@ class GetFeatures extends BaseMethod {
     }
 }
 
-const HD_HARDENED = 0x80000000;
-const toHardened = (n) => (n | HD_HARDENED) >>> 0;
-const fromHardened = (n) => (n & ~HD_HARDENED) >>> 0;
-const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
-const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
-const getHDPath = (path) => {
-    const parts = path.toLowerCase().split('/');
-    if (parts[0] !== 'm')
-        throw PATH_NOT_VALID;
-    return parts
-        .filter((p) => p !== 'm' && p !== '')
-        .map((p) => {
-        let hardened = false;
-        if (p.substr(p.length - 1) === "'") {
-            hardened = true;
-            p = p.substr(0, p.length - 1);
-        }
-        let n = parseInt(p);
-        if (Number.isNaN(n)) {
-            throw PATH_NOT_VALID;
-        }
-        else if (n < 0) {
-            throw PATH_NEGATIVE_VALUES;
-        }
-        if (hardened) {
-            n = toHardened(n);
-        }
-        return n;
-    });
-};
-const isMultisigPath = (path) => Array.isArray(path) && path[0] === toHardened(48);
-const isSegwitPath = (path) => Array.isArray(path) && path[0] === toHardened(49);
-const getScriptType = (path) => {
-    if (!Array.isArray(path) || path.length < 1)
-        return 'SPENDADDRESS';
-    const p1 = fromHardened(path[0]);
-    switch (p1) {
-        case 48:
-            return 'SPENDMULTISIG';
-        case 49:
-            return 'SPENDP2SHWITNESS';
-        case 84:
-            return 'SPENDWITNESS';
-        default:
-            return 'SPENDADDRESS';
-    }
-};
-const getOutputScriptType = (path) => {
-    if (!Array.isArray(path) || path.length < 1)
-        return 'PAYTOADDRESS';
-    if (path[0] === 49) {
-        return 'PAYTOP2SHWITNESS';
-    }
-    const p = fromHardened(path[0]);
-    switch (p) {
-        case 48:
-            return 'PAYTOMULTISIG';
-        case 49:
-            return 'PAYTOP2SHWITNESS';
-        case 84:
-            return 'PAYTOWITNESS';
-        default:
-            return 'PAYTOADDRESS';
-    }
-};
-const serializedPath = (path) => {
-    const pathStr = path
-        .map((p) => {
-        if (p & HD_HARDENED) {
-            return `${p & ~HD_HARDENED}'`;
-        }
-        return p;
-    })
-        .join('/');
-    return `m/${pathStr}`;
-};
-const validatePath = (path, length = 0, base = false) => {
-    let valid;
-    if (typeof path === 'string') {
-        valid = getHDPath(path);
-    }
-    else if (Array.isArray(path)) {
-        valid = path.map((p) => {
-            const n = parseInt(p);
-            if (Number.isNaN(n)) {
-                throw PATH_NOT_VALID;
-            }
-            else if (n < 0) {
-                throw PATH_NEGATIVE_VALUES;
-            }
-            return n;
-        });
-    }
-    else {
-        valid = undefined;
-    }
-    if (!valid)
-        throw PATH_NOT_VALID;
-    if (length > 0 && valid.length < length)
-        throw PATH_NOT_VALID;
-    return base ? valid.splice(0, 3) : valid;
-};
-
 const hasHexPrefix = (str) => str.slice(0, 2).toLowerCase() === '0x';
 const stripHexPrefix = (str) => (hasHexPrefix(str) ? str.slice(2) : str);
 const addHexPrefix = (str) => (hasHexPrefix(str) ? str : `0x${str}`);
@@ -10978,8 +10989,8 @@ class BTCGetPublicKey extends BaseMethod {
     }
     init() {
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
-        const hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
-        const payload = hasBundle ? this.payload : { bundle: [this.payload] };
+        this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
+        const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
         payload.bundle.forEach((batch) => {
@@ -12316,7 +12327,7 @@ let _connector;
 let _uiPromises = [];
 let _callPromise;
 const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
         return Promise.reject(TypedError('Method_InvalidParameter', 'onCall: message.id or message.payload is missing'));
     }
@@ -12336,7 +12347,10 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
             return createResponseMessage(method.responseID, true, response);
         }
         catch (error) {
-            return createResponseMessage(method.responseID, false, error);
+            return createResponseMessage(method.responseID, false, {
+                code: error.code,
+                error: (_a = error.message) !== null && _a !== void 0 ? _a : error,
+            });
         }
     }
     try {
@@ -12359,8 +12373,11 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
         return Promise.reject(error);
     }
     Log.debug('Call API - setDevice: ', device);
-    (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
+    (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.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);
@@ -12385,7 +12402,13 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
         Log.debug('Call API - Device Run: ', device);
         const deviceRun = () => device.run(inner);
         _callPromise = create(deviceRun);
-        return yield _callPromise.promise;
+        try {
+            return yield _callPromise.promise;
+        }
+        catch (e) {
+            console.log('Device Run Error: ', e);
+            return createResponseMessage(method.responseID, false, e.message);
+        }
     }
     catch (error) {
         messageResponse = createResponseMessage(method.responseID, false, error);
@@ -12398,6 +12421,8 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
                 method.dispose();
             }
         }
+        closePopup();
+        cleanup();
     }
 });
 function initDeviceList(method) {
@@ -12447,6 +12472,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 +12489,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);
 };
@@ -12481,6 +12517,11 @@ class Core extends events.exports {
                     }
                     break;
                 }
+                case UI_REQUEST$1.BLUETOOTH_PERMISSION:
+                case UI_REQUEST$1.LOCATION_PERMISSION: {
+                    postMessage(message);
+                    break;
+                }
                 case IFRAME.CALL: {
                     const response = yield callAPI(message);
                     return response;
@@ -12509,7 +12550,7 @@ const init = (settings, Transport) => __awaiter(void 0, void 0, void 0, function
             yield DataManager.load(settings);
             initTransport(Transport);
         }
-        catch (_b) {
+        catch (_c) {
             Log.error('DataManager.load error');
         }
         enableLog(DataManager.getSettings('debug'));
@@ -12539,6 +12580,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 +12590,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;
@@ -12555,12 +12598,12 @@ exports.createUiMessage = createUiMessage;
 exports.createUiResponse = createUiResponse;
 exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
-exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
-exports.getDeviceFirmwareVersion = getDeviceFirmwareVersion;
 exports.getDeviceLabel = getDeviceLabel;
 exports.getDeviceType = getDeviceType;
 exports.getDeviceUUID = getDeviceUUID;
 exports.getEnv = getEnv;
+exports.getHDPath = getHDPath;
+exports.getScriptType = getScriptType;
 exports.getTimeStamp = getTimeStamp;
 exports.httpRequest = httpRequest;
 exports.initCore = init;

package/dist/types/api/btcSignTransaction.d.ts

@@ -1,4 +1,4 @@
-import { TxInput as OrigTxInput, PrevInput, Success, TxOutputBinType, TxOutputType, TxInputType } from '@onekeyfe/hd-transport/src/types/messages';
+import { TxInput as OrigTxInput, PrevInput, TxOutputBinType, TxOutputType, TxInputType } from '@onekeyfe/hd-transport/src/types/messages';
 import type { CommonParams, Response } from '../params';
 export declare type SignedTransaction = {
     signatures: string[];
@@ -70,5 +70,5 @@ export declare type BTCSignTransactionParams = {
     branchId?: number;
     timestamp?: number;
 };
-export declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<Success>;
+export declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<SignedTransaction>;
 //# sourceMappingURL=btcSignTransaction.d.ts.map

package/dist/types/api/btcSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"btcSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcSignTransaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"btcSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcSignTransaction.ts"],"names":[],"mappings":"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"}

package/dist/types/api/export.d.ts

@@ -2,6 +2,7 @@ export type { BTCAddress, BTCGetAddressParams } from './btcGetAddress';
 export type { BTCPublicKey, BTCGetPublicKeyParams } from './btcGetPublicKey';
 export type { BTCSignMessageParams } from './btcSignMessage';
 export type { BTCVerifyMessageParams } from './btcVerifyMessage';
+export type { RefTransaction, AccountAddress, AccountAddresses, BTCSignTransactionParams, SignedTransaction, TransactionOptions, } from './btcSignTransaction';
 export type { DeviceChangePinParams } from './deviceChangePin';
 export type { DeviceFlagsParams } from './deviceFlags';
 export type { DeviceRecoveryParams } from './deviceRecovery';

package/dist/types/api/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACzE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,wBAAwB,EACxB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,0BAA0B,EAC1B,iCAAiC,EACjC,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACtF,YAAY,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC5F,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,YAAY,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,YAAY,EACV,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACzE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,wBAAwB,EACxB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,0BAA0B,EAC1B,iCAAiC,EACjC,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACtF,YAAY,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC5F,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,YAAY,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/utils/index.d.ts

@@ -2,6 +2,7 @@ import { initLog, enableLog } from './logger';
 export * from './assets';
 export * from './versionUtils';
 export * from './deferred';
-export * from './deviceFeaturesUtils';
+export { getDeviceType, getDeviceUUID, getDeviceLabel } from './deviceFeaturesUtils';
+export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
 export { initLog, enableLog };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE9C,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE9C,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "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.6",
     "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": "b37ddf4e02812f40a01ec38ffef2ff6cdcad4bbc"
 }

package/src/api/btc/BTCGetPublicKey.ts

@@ -13,8 +13,8 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
 
-    const hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
-    const payload = hasBundle ? this.payload : { bundle: [this.payload] };
+    this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
+    const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
 
     validateParams(payload, [{ name: 'bundle', type: 'array' }]);
 

package/src/api/helpers/pathUtils.ts

@@ -3,7 +3,7 @@
 import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport/src/types/messages';
 import { ERRORS } from '../../constants';
 
-export const HD_HARDENED = 0x80000000;
+const HD_HARDENED = 0x80000000;
 export const toHardened = (n: number): number => (n | HD_HARDENED) >>> 0;
 export const fromHardened = (n: number): number => (n & ~HD_HARDENED) >>> 0;
 

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';
@@ -60,7 +61,10 @@ export const callAPI = async (message: CoreMessage) => {
       const response = await method.run();
       return createResponseMessage(method.responseID, true, response);
     } catch (error) {
-      return createResponseMessage(method.responseID, false, error);
+      return createResponseMessage(method.responseID, false, {
+        code: error.code,
+        error: error.message ?? error,
+      });
     }
   }
 
@@ -90,6 +94,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> => {
@@ -132,7 +139,13 @@ export const callAPI = async (message: CoreMessage) => {
     Log.debug('Call API - Device Run: ', device);
     const deviceRun = () => device.run(inner);
     _callPromise = createDeferred(deviceRun);
-    return await _callPromise.promise;
+
+    try {
+      return await _callPromise.promise;
+    } catch (e) {
+      console.log('Device Run Error: ', e);
+      return createResponseMessage(method.responseID, false, e.message);
+    }
   } catch (error) {
     messageResponse = createResponseMessage(method.responseID, false, error);
     _callPromise?.reject(ERRORS.TypedError('Call_API', error));
@@ -144,6 +157,10 @@ export const callAPI = async (message: CoreMessage) => {
         method.dispose();
       }
     }
+
+    closePopup();
+
+    cleanup();
     // TODO: 方法执行后，检查队列内是否有等待调用的 API，依次调用
   }
 };
@@ -203,6 +220,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 +249,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
@@ -257,6 +291,12 @@ export default class Core extends EventEmitter {
         break;
       }
 
+      case UI_REQUEST.BLUETOOTH_PERMISSION:
+      case UI_REQUEST.LOCATION_PERMISSION: {
+        postMessage(message);
+        break;
+      }
+
       case IFRAME.CALL: {
         const response = await callAPI(message);
         return response;

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,29 @@
 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',
+
+  BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
+  LOCATION_PERMISSION: 'ui-location_permission',
 } as const;
 
+export interface UiRequestWithoutPayload {
+  type:
+    | typeof UI_REQUEST.CLOSE_UI_WINDOW
+    | typeof UI_REQUEST.BLUETOOTH_PERMISSION
+    | typeof UI_REQUEST.LOCATION_PERMISSION;
+  payload?: typeof undefined;
+}
+
 export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
   payload: {
@@ -16,7 +32,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 };
 

package/src/types/api/btcSignTransaction.ts

@@ -1,7 +1,6 @@
 import {
   TxInput as OrigTxInput,
   PrevInput,
-  Success,
   TxOutputBinType,
   TxOutputType,
   TxInputType,
@@ -95,4 +94,4 @@ export type BTCSignTransactionParams = {
 export declare function btcSignTransaction(
   connectId: string,
   params: CommonParams & BTCSignTransactionParams
-): Response<Success>;
+): Response<SignedTransaction>;

package/src/types/api/export.ts

@@ -2,6 +2,14 @@ export type { BTCAddress, BTCGetAddressParams } from './btcGetAddress';
 export type { BTCPublicKey, BTCGetPublicKeyParams } from './btcGetPublicKey';
 export type { BTCSignMessageParams } from './btcSignMessage';
 export type { BTCVerifyMessageParams } from './btcVerifyMessage';
+export type {
+  RefTransaction,
+  AccountAddress,
+  AccountAddresses,
+  BTCSignTransactionParams,
+  SignedTransaction,
+  TransactionOptions,
+} from './btcSignTransaction';
 
 export type { DeviceChangePinParams } from './deviceChangePin';
 export type { DeviceFlagsParams } from './deviceFlags';

package/src/utils/index.ts

@@ -3,6 +3,7 @@ import { initLog, enableLog } from './logger';
 export * from './assets';
 export * from './versionUtils';
 export * from './deferred';
-export * from './deviceFeaturesUtils';
+export { getDeviceType, getDeviceUUID, getDeviceLabel } from './deviceFeaturesUtils';
+export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
 
 export { initLog, enableLog };