@onekeyfe/hd-core 0.0.5 → 0.0.8

package/dist/api/SearchDevices.d.ts

@@ -5,7 +5,7 @@ export default class SearchDevices extends BaseMethod {
     init(): void;
     run(): Promise<{
         connectId: string;
-        deviceType: string;
+        deviceType: import("..").IDeviceType | null;
         path: string;
         session?: string | null | undefined;
         debugSession?: string | null | undefined;

package/dist/api/SearchDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAKxD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAIE,GAAG;;;;;;;;;;CA+BV"}
+{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAIE,GAAG;;;;;;;;;;CA8BV"}

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,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"}
+{"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;AA8HF,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/ui-request.d.ts

@@ -8,16 +8,18 @@ export declare const UI_REQUEST: {
     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;
+    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: {
         device: Device;
-        type?: PROTO.PinMatrixRequestType;
+        type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry';
     };
 };
 export interface UiRequestButton {

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,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"}
+{"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,GAAG,wBAAwB,CAAC;KAC9D,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

@@ -643,16 +643,18 @@ declare const UI_REQUEST: {
     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;
+    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: {
         device: Device$1;
-        type?: Messages.PinMatrixRequestType;
+        type?: Messages.PinMatrixRequestType | 'ButtonRequest_PinEntry';
     };
 };
 interface UiRequestButton {
@@ -888,6 +890,8 @@ declare const getDeviceType: (features?: {
     display_rotation: number | null;
     experimental_features: boolean | null;
 } | undefined) => IDeviceType;
+declare const getDeviceTypeByBleName: (name?: string | undefined) => IDeviceType | null;
+declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDeviceType;
 declare const getDeviceUUID: (features: Features) => string;
 declare const getDeviceLabel: (features: Features) => string;
 
@@ -997,4 +1001,4 @@ declare class DataManager {
 
 declare const HardwareSdk: ({ init, call, dispose, eventEmitter, uiResponse, cancel, }: InjectApi) => CoreApi;
 
-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 };
+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, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getEnv, getHDPath, getScriptType, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };

package/dist/index.js

@@ -814,6 +814,26 @@ const getDeviceType = (features) => {
     }
     const serialNo = features.serial_no;
     const miniFlag = serialNo.slice(0, 2);
+    if (miniFlag.toLowerCase() === 'mi')
+        return 'mini';
+    if (miniFlag.toLowerCase() === 'tc')
+        return 'touch';
+    return 'classic';
+};
+const getDeviceTypeByBleName = (name) => {
+    if (!name)
+        return 'classic';
+    if (name.startsWith('MI'))
+        return 'mini';
+    if (name.startsWith('T'))
+        return 'touch';
+    return 'classic';
+};
+const getDeviceTypeByDeviceId = (deviceId) => {
+    if (!deviceId) {
+        return 'classic';
+    }
+    const miniFlag = deviceId.slice(0, 2);
     if (miniFlag.toLowerCase() === 'mi')
         return 'mini';
     return 'classic';
@@ -9911,6 +9931,8 @@ const UI_REQUEST$1 = {
     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,
@@ -10560,7 +10582,10 @@ class SearchDevices extends BaseMethod {
             const devicesDescriptor = (_c = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _c !== void 0 ? _c : [];
             const env = DataManager.getSettings('env');
             if (env === 'react-native') {
-                return devicesDescriptor.map(device => (Object.assign(Object.assign({}, device), { connectId: device.id, deviceType: 'classic' })));
+                return devicesDescriptor.map(device => {
+                    var _a;
+                    return (Object.assign(Object.assign({}, device), { connectId: device.id, deviceType: getDeviceTypeByBleName((_a = device.name) !== null && _a !== void 0 ? _a : '') }));
+                });
             }
             const devices = [];
             try {
@@ -12325,7 +12350,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'));
     }
@@ -12345,7 +12370,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 {
@@ -12368,7 +12396,7 @@ 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);
@@ -12397,7 +12425,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);
@@ -12480,7 +12514,15 @@ const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, vo
 });
 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() }));
+    if (request.code === 'ButtonRequest_PinEntry') {
+        postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PIN, {
+            device: device.toMessageObject(),
+            type: 'ButtonRequest_PinEntry',
+        }));
+    }
+    else {
+        postMessage(createUiMessage(UI_REQUEST$1.REQUEST_BUTTON, { device: device.toMessageObject() }));
+    }
 };
 const postMessage = (message) => {
     _core.emit(CORE_EVENT, message);
@@ -12506,6 +12548,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;
@@ -12534,7 +12581,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'));
@@ -12584,6 +12631,8 @@ exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
 exports.getDeviceLabel = getDeviceLabel;
 exports.getDeviceType = getDeviceType;
+exports.getDeviceTypeByBleName = getDeviceTypeByBleName;
+exports.getDeviceTypeByDeviceId = getDeviceTypeByDeviceId;
 exports.getDeviceUUID = getDeviceUUID;
 exports.getEnv = getEnv;
 exports.getHDPath = getHDPath;

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -46,6 +46,8 @@ export declare const getDeviceType: (features?: {
     display_rotation: number | null;
     experimental_features: boolean | null;
 } | undefined) => IDeviceType;
+export declare const getDeviceTypeByBleName: (name?: string | undefined) => IDeviceType | null;
+export declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDeviceType;
 export declare const getDeviceUUID: (features: Features) => string;
 export declare const getDeviceLabel: (features: Features) => string;
 export declare const getDeviceFirmwareVersion: (features: Features) => IVersionArray;

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

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,WASnD,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,kBAK1D,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,kBAK1D,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}

package/dist/utils/index.d.ts

@@ -2,7 +2,7 @@ import { initLog, enableLog } from './logger';
 export * from './assets';
 export * from './versionUtils';
 export * from './deferred';
-export { getDeviceType, getDeviceUUID, getDeviceLabel } from './deviceFeaturesUtils';
+export { getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, 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,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"}
+{"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,EACL,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,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.5",
+  "version": "0.0.8",
   "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.5",
+    "@onekeyfe/hd-transport": "^0.0.8",
     "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": "24d2a28fd3f2e7fda4c21742e968bce764985615"
+  "gitHead": "edfa30382fdf36182bc389c8ff1dd1a689096592"
 }

package/src/api/SearchDevices.ts

@@ -3,6 +3,7 @@ import DeviceConnector from '../device/DeviceConnector';
 import TransportManager from '../data-manager/TransportManager';
 import { Device } from '../device/Device';
 import { DataManager } from '../data-manager';
+import { getDeviceTypeByBleName } from '../utils';
 
 export default class SearchDevices extends BaseMethod {
   connector?: DeviceConnector;
@@ -26,8 +27,7 @@ export default class SearchDevices extends BaseMethod {
       return devicesDescriptor.map(device => ({
         ...device,
         connectId: device.id,
-        // 蓝牙场景只有 classic 能被搜索到
-        deviceType: 'classic',
+        deviceType: getDeviceTypeByBleName(device.name ?? ''),
       }));
     }
 

package/src/core/index.ts

@@ -61,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,
+      });
     }
   }
 
@@ -136,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));
@@ -242,7 +251,17 @@ const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin
 
 const onDeviceButtonHandler = (...[device, request]: [...DeviceEvents['button']]) => {
   postMessage(createDeviceMessage(DEVICE.BUTTON, { ...request, device: device.toMessageObject() }));
-  postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, { device: device.toMessageObject() }));
+
+  if (request.code === 'ButtonRequest_PinEntry') {
+    postMessage(
+      createUiMessage(UI_REQUEST.REQUEST_PIN, {
+        device: device.toMessageObject() as KnownDevice,
+        type: 'ButtonRequest_PinEntry',
+      })
+    );
+  } else {
+    postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, { device: device.toMessageObject() }));
+  }
 };
 
 /**
@@ -282,6 +301,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/ui-request.ts

@@ -11,10 +11,16 @@ export const UI_REQUEST = {
   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;
+  type:
+    | typeof UI_REQUEST.CLOSE_UI_WINDOW
+    | typeof UI_REQUEST.BLUETOOTH_PERMISSION
+    | typeof UI_REQUEST.LOCATION_PERMISSION;
   payload?: typeof undefined;
 }
 
@@ -22,7 +28,7 @@ export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
   payload: {
     device: Device;
-    type?: PROTO.PinMatrixRequestType;
+    type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry';
   };
 };
 

package/src/utils/deviceFeaturesUtils.ts

@@ -8,6 +8,24 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   const serialNo = features.serial_no;
   const miniFlag = serialNo.slice(0, 2);
   if (miniFlag.toLowerCase() === 'mi') return 'mini';
+  if (miniFlag.toLowerCase() === 'tc') return 'touch';
+  return 'classic';
+};
+
+export const getDeviceTypeByBleName = (name?: string): IDeviceType | null => {
+  if (!name) return 'classic';
+  if (name.startsWith('MI')) return 'mini';
+  if (name.startsWith('T')) return 'touch';
+  return 'classic';
+};
+
+export const getDeviceTypeByDeviceId = (deviceId?: string): IDeviceType => {
+  if (!deviceId) {
+    return 'classic';
+  }
+
+  const miniFlag = deviceId.slice(0, 2);
+  if (miniFlag.toLowerCase() === 'mi') return 'mini';
   return 'classic';
 };
 

package/src/utils/index.ts

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