@onekeyfe/hd-core - npm Package Compare versions

Comparing version 0.0.3 to 0.0.4

dist/events/core.d.ts

 import { Unsuccessful } from '../types/params';
 import { IFrameCallMessage } from './call';
+import { DeviceEventMessage } from './device';
 import { IFrameEventMessage } from './iframe';
@@ -10,3 +11,3 @@ import { UiEventMessage } from './ui-request';
     success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage | DeviceEventMessage);
 export declare type PostMessageEvent = MessageEvent<any>;
@@ -13,0 +14,0 @@ export declare const parseMessage: (messageData: any) => CoreMessage;

dist/events/device.d.ts

 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: {
@@ -23,2 +26,14 @@ readonly CONNECT: "device-connect";
 }
+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

dist/events/ui-request.d.ts

 import type { PROTO } from '../constants';
 import type { Device } from '../types';
+import type { DeviceButtonRequest } from './device';
 import type { MessageFactoryFn } from './utils';
@@ -7,3 +8,10 @@ export declare const UI_EVENT = "UI_EVENT";
     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 = {
@@ -16,3 +24,7 @@ type: typeof UI_REQUEST.REQUEST_PIN;
 };
-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 & {
@@ -19,0 +31,0 @@ event: typeof UI_EVENT;

dist/index.d.ts

@@ -591,6 +591,48 @@ import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
 
+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 = {
@@ -603,3 +645,7 @@ type: typeof UI_REQUEST.REQUEST_PIN;
 };
-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 & {
@@ -686,3 +732,3 @@ event: typeof UI_EVENT;
     success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage | DeviceEventMessage);
 declare type PostMessageEvent = MessageEvent<any>;
@@ -694,24 +740,2 @@ declare const parseMessage: (messageData: any) => CoreMessage;
 
-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 = {
@@ -965,2 +989,2 @@ didUpdate: boolean;
 
-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.json

 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "> TODO: description",
@@ -28,3 +28,3 @@ "author": "OneKey",
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.0.3",
+    "@onekeyfe/hd-transport": "^0.0.4",
     "axios": "^0.27.2",
@@ -39,3 +39,3 @@ "bignumber.js": "^9.0.2",
   },
-  "gitHead": "179c9f232b1cc52aa60af42f6daec76564f20e50"
+  "gitHead": "cabba10f92c55ebbe16c54a329c892d03a0c05fb"
 }

src/core/index.ts

@@ -22,2 +22,3 @@ import EventEmitter from 'events';
   createUiMessage,
+  createDeviceMessage,
 } from '../events';
@@ -94,2 +95,5 @@ import type { BaseMethod } from '../api/BaseMethod';
   device.on(DEVICE.PIN, onDevicePinHandler);
+  device.on(DEVICE.BUTTON, (d, code) => {
+    onDeviceButtonHandler(d, code);
+  });
 
@@ -149,2 +153,6 @@ try {
     }
+
+    closePopup();
+
+    cleanup();
     // TODO: 方法执行后，检查队列内是否有等待调用的 API，依次调用
@@ -209,2 +217,14 @@ }
 
+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']) => {
@@ -227,2 +247,7 @@ console.log('onDevicePinHandler');
 
+const onDeviceButtonHandler = (...[device, request]: [...DeviceEvents['button']]) => {
+  postMessage(createDeviceMessage(DEVICE.BUTTON, { ...request, device: device.toMessageObject() }));
+  postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, { device: device.toMessageObject() }));
+};
+
 /**
@@ -229,0 +254,0 @@ * Emit message to listener (parent).

src/events/core.ts

 import { Unsuccessful } from '../types/params';
 import { IFrameCallMessage } from './call';
+import { DeviceEventMessage } from './device';
 import { IFrameEventMessage } from './iframe';
@@ -12,3 +13,9 @@ import { UiEventMessage } from './ui-request';
   success?: true | false;
-} & (IFrameEventMessage | IFrameCallMessage | UiResponseMessage | UiEventMessage);
+} & (
+  | IFrameEventMessage
+  | IFrameCallMessage
+  | UiResponseMessage
+  | UiEventMessage
+  | DeviceEventMessage
+);
 
@@ -15,0 +22,0 @@ export type PostMessageEvent = MessageEvent<any>;

src/events/device.ts

 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 = {
@@ -29,1 +32,25 @@ // device list events
 }
+
+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);

src/events/ui-request.ts

 import type { PROTO } from '../constants';
 import type { Device } from '../types';
+import type { DeviceButtonRequest } from './device';
 import type { MessageFactoryFn } from './utils';
@@ -9,4 +10,13 @@
   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 = {
@@ -20,4 +30,9 @@ type: typeof UI_REQUEST.REQUEST_PIN;
 
-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 };
@@ -24,0 +39,0 @@

No alert changes

Improved metrics

Total package byte prevSize

891209

increased by0.68%

Lines of code

28824

increased by0.49%

Dependency changes

• + Added@onekeyfe/hd-transport@0.0.4(transitive)

• - Removed@onekeyfe/hd-transport@0.0.3(transitive)

• Updated@onekeyfe/hd-transport@^0.0.4