@onekeyfe/hd-common-connect-sdk 0.1.44 → 0.1.45

package/dist/index.js

@@ -1,6 +1,17 @@
-import HardwareSdk, { getLogger, LoggerNames, parseConnectSettings, createErrorMessage, CORE_EVENT, setLoggerPostMessage, initCore, enableLog, IFRAME, UI_EVENT, LOG_EVENT, DEVICE_EVENT, DEVICE, FIRMWARE_EVENT } from '@onekeyfe/hd-core';
-import { ERRORS, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
-import WebusbTransport from '@onekeyfe/hd-transport-webusb';
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var HardwareSdk = require('@onekeyfe/hd-core');
+var hdShared = require('@onekeyfe/hd-shared');
+var HttpTransport = require('@onekeyfe/hd-transport-http');
+var WebusbTransport = require('@onekeyfe/hd-transport-webusb');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var HardwareSdk__default = /*#__PURE__*/_interopDefaultLegacy(HardwareSdk);
+var HttpTransport__default = /*#__PURE__*/_interopDefaultLegacy(HttpTransport);
+var WebusbTransport__default = /*#__PURE__*/_interopDefaultLegacy(WebusbTransport);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -543,47 +554,47 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 }
 
 var eventEmitter = new events.exports();
-var Log = getLogger(LoggerNames.HdCommonConnectSdk);
+var Log = HardwareSdk.getLogger(HardwareSdk.LoggerNames.HdCommonConnectSdk);
 var _core;
-var _settings = parseConnectSettings();
+var _settings = HardwareSdk.parseConnectSettings();
 var _messageID = 0;
 var messagePromises = {};
 var dispose = function () {
     eventEmitter.removeAllListeners();
-    _settings = parseConnectSettings();
+    _settings = HardwareSdk.parseConnectSettings();
 };
 var uiResponse = function (response) {
     if (!_core) {
-        throw ERRORS.TypedError(HardwareErrorCode.NotInitialized);
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInitialized);
     }
     var type = response.type, payload = response.payload;
-    _core.handleMessage({ event: UI_EVENT, type: type, payload: payload });
+    _core.handleMessage({ event: HardwareSdk.UI_EVENT, type: type, payload: payload });
 };
 var cancel = function (connectId) {
     if (_core === undefined)
         return;
-    _core.handleMessage({ event: IFRAME.CANCEL, type: IFRAME.CANCEL, payload: { connectId: connectId } });
+    _core.handleMessage({ event: HardwareSdk.IFRAME.CANCEL, type: HardwareSdk.IFRAME.CANCEL, payload: { connectId: connectId } });
 };
 function handleMessage(message) {
     var event = message.event;
     if (!_core) {
         return;
     }
-    if (event !== LOG_EVENT) {
+    if (event !== HardwareSdk.LOG_EVENT) {
         Log.debug('hd-common-connect-sdk handleMessage', message);
     }
     switch (event) {
-        case UI_EVENT:
+        case HardwareSdk.UI_EVENT:
             // pass UI event up
             eventEmitter.emit(message.event, message);
             eventEmitter.emit(message.type, message.payload);
             break;
-        case LOG_EVENT:
-        case FIRMWARE_EVENT:
+        case HardwareSdk.LOG_EVENT:
+        case HardwareSdk.FIRMWARE_EVENT:
             eventEmitter.emit(message.event, message);
             break;
-        case DEVICE_EVENT:
-            if ([DEVICE.CONNECT, DEVICE.DISCONNECT, DEVICE.FEATURES, DEVICE.SUPPORT_FEATURES].includes(message.type)) {
+        case HardwareSdk.DEVICE_EVENT:
+            if ([HardwareSdk.DEVICE.CONNECT, HardwareSdk.DEVICE.DISCONNECT, HardwareSdk.DEVICE.FEATURES, HardwareSdk.DEVICE.SUPPORT_FEATURES].includes(message.type)) {
                 eventEmitter.emit(message.type, message.payload);
             }
             break;
@@ -599,11 +610,11 @@ function postMessage(message, usePromise) {
             switch (_a.label) {
                 case 0:
                     if (!_core) {
-                        throw ERRORS.TypedError('postMessage: _core not found');
+                        throw hdShared.ERRORS.TypedError('postMessage: _core not found');
                     }
                     if (!usePromise) return [3 /*break*/, 2];
                     _messageID++;
-                    messagePromises[_messageID] = createDeferred();
+                    messagePromises[_messageID] = hdShared.createDeferred();
                     return [4 /*yield*/, _core.handleMessage(__assign(__assign({}, message), { id: "".concat(_messageID) }))];
                 case 1:
                     response = _a.sent();
@@ -617,25 +628,28 @@ function postMessage(message, usePromise) {
     });
 }
 var init = function (settings) { return __awaiter(void 0, void 0, void 0, function () {
-    var error_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var Transport, error_1;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                _settings = __assign(__assign(__assign({}, _settings), settings), { env: 'webusb' });
-                enableLog(!!settings.debug);
+                _settings = __assign(__assign(__assign({}, _settings), settings), { env: (_a = settings.env) !== null && _a !== void 0 ? _a : 'node' });
+                HardwareSdk.enableLog(!!settings.debug);
                 Log.debug('init');
-                _a.label = 1;
+                _b.label = 1;
             case 1:
-                _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, initCore(_settings, WebusbTransport)];
+                _b.trys.push([1, 3, , 4]);
+                console.log(_settings.env);
+                Transport = _settings.env === 'webusb' ? WebusbTransport__default["default"] : HttpTransport__default["default"];
+                return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport)];
             case 2:
-                _core = _a.sent();
-                _core === null || _core === void 0 ? void 0 : _core.on(CORE_EVENT, handleMessage);
-                setLoggerPostMessage(handleMessage);
+                _core = _b.sent();
+                _core === null || _core === void 0 ? void 0 : _core.on(HardwareSdk.CORE_EVENT, handleMessage);
+                HardwareSdk.setLoggerPostMessage(handleMessage);
                 return [2 /*return*/, true];
             case 3:
-                error_1 = _a.sent();
-                Log.error(createErrorMessage(error_1));
+                error_1 = _b.sent();
+                Log.error(HardwareSdk.createErrorMessage(error_1));
                 return [2 /*return*/, false];
             case 4: return [2 /*return*/];
         }
@@ -650,23 +664,23 @@ var call = function (params) { return __awaiter(void 0, void 0, void 0, function
                 _a.label = 1;
             case 1:
                 _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, postMessage({ event: IFRAME.CALL, type: IFRAME.CALL, payload: params })];
+                return [4 /*yield*/, postMessage({ event: HardwareSdk.IFRAME.CALL, type: HardwareSdk.IFRAME.CALL, payload: params })];
             case 2:
                 response = _a.sent();
                 if (response) {
                     Log.debug('response: ', response);
                     return [2 /*return*/, response];
                 }
-                return [2 /*return*/, createErrorMessage(ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse))];
+                return [2 /*return*/, HardwareSdk.createErrorMessage(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse))];
             case 3:
                 error_2 = _a.sent();
                 Log.error('__call error: ', error_2);
-                return [2 /*return*/, createErrorMessage(error_2)];
+                return [2 /*return*/, HardwareSdk.createErrorMessage(error_2)];
             case 4: return [2 /*return*/];
         }
     });
 }); };
-var HardwareCommonConnectSdk = HardwareSdk({
+var HardwareCommonConnectSdk = HardwareSdk__default["default"]({
     eventEmitter: eventEmitter,
     init: init,
     call: call,
@@ -675,4 +689,5 @@ var HardwareCommonConnectSdk = HardwareSdk({
     uiResponse: uiResponse
 });
 
-export { HardwareCommonConnectSdk as default, messagePromises };
+exports["default"] = HardwareCommonConnectSdk;
+exports.messagePromises = messagePromises;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,9 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^0.1.44",
-    "@onekeyfe/hd-shared": "^0.1.44",
-    "@onekeyfe/hd-transport-webusb": "^0.1.44"
+    "@onekeyfe/hd-core": "^0.1.45",
+    "@onekeyfe/hd-shared": "^0.1.45",
+    "@onekeyfe/hd-transport-http": "^0.1.45",
+    "@onekeyfe/hd-transport-webusb": "^0.1.45"
   },
-  "gitHead": "fb673918587877267cbbeca6e0c6abbc56a0d0fa"
+  "gitHead": "0436f8ff26494933124c1c6f4586d4aeb5526c30"
 }

package/src/index.ts

@@ -20,6 +20,7 @@ import HardwareSdk, {
   DEVICE,
 } from '@onekeyfe/hd-core';
 import { ERRORS, createDeferred, Deferred, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import HttpTransport from '@onekeyfe/hd-transport-http';
 import WebusbTransport from '@onekeyfe/hd-transport-webusb';
 
 const eventEmitter = new EventEmitter();
@@ -100,14 +101,16 @@ async function postMessage(message: CoreMessage, usePromise = true) {
 }
 
 const init = async (settings: Partial<ConnectSettings>) => {
-  _settings = { ..._settings, ...settings, env: 'webusb' };
+  _settings = { ..._settings, ...settings, env: settings.env ?? 'node' };
 
   enableLog(!!settings.debug);
 
   Log.debug('init');
 
   try {
-    _core = await initCore(_settings, WebusbTransport);
+    console.log(_settings.env);
+    const Transport = _settings.env === 'webusb' ? WebusbTransport : HttpTransport;
+    _core = await initCore(_settings, Transport);
     _core?.on(CORE_EVENT, handleMessage);
     setLoggerPostMessage(handleMessage);