@onekeyfe/hd-core 0.0.5 → 0.0.6

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;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/ui-request.d.ts

@@ -8,9 +8,11 @@ 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 = {

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,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

@@ -643,9 +643,11 @@ 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 = {

package/dist/index.js

@@ -9911,6 +9911,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,
@@ -12325,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'));
     }
@@ -12345,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 {
@@ -12368,7 +12373,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 +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);
@@ -12506,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;
@@ -12534,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'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.0.5",
+  "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.5",
+    "@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": "24d2a28fd3f2e7fda4c21742e968bce764985615"
+  "gitHead": "b37ddf4e02812f40a01ec38ffef2ff6cdcad4bbc"
 }

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));
@@ -282,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/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;
 }