@onekeyfe/hd-common-connect-sdk 1.0.39-alpha.2 → 1.0.39-alpha.5

package/dist/index.js

@@ -5,7 +5,7 @@ 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');
+var hdTransportWebDevice = require('@onekeyfe/hd-transport-web-device');
 var LowlevelTransport = require('@onekeyfe/hd-transport-lowlevel');
 var EmulatorTransport = require('@onekeyfe/hd-transport-emulator');
 
@@ -13,7 +13,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var HardwareSdk__default = /*#__PURE__*/_interopDefaultLegacy(HardwareSdk);
 var HttpTransport__default = /*#__PURE__*/_interopDefaultLegacy(HttpTransport);
-var WebusbTransport__default = /*#__PURE__*/_interopDefaultLegacy(WebusbTransport);
 var LowlevelTransport__default = /*#__PURE__*/_interopDefaultLegacy(LowlevelTransport);
 var EmulatorTransport__default = /*#__PURE__*/_interopDefaultLegacy(EmulatorTransport);
 
@@ -564,6 +563,17 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 
 var eventEmitter = new events.exports();
 var Log = HardwareSdk.getLogger(HardwareSdk.LoggerNames.HdCommonConnectSdk);
+var getTransport = function (env) {
+    if (env === 'desktop-web-ble')
+        return hdTransportWebDevice.ElectronBleTransport;
+    if (env === 'webusb')
+        return hdTransportWebDevice.WebUsbTransport;
+    if (env === 'lowlevel')
+        return LowlevelTransport__default["default"];
+    if (env === 'emulator')
+        return EmulatorTransport__default["default"];
+    return HttpTransport__default["default"];
+};
 var _core;
 var _settings = HardwareSdk.parseConnectSettings();
 var _messageID = 0;
@@ -648,21 +658,7 @@ var init = function (settings, _, plugin) { return __awaiter(void 0, void 0, voi
                 _b.label = 1;
             case 1:
                 _b.trys.push([1, 3, , 4]);
-                console.log(_settings.env);
-                Transport = void 0;
-                switch (_settings.env) {
-                    case 'webusb':
-                        Transport = WebusbTransport__default["default"];
-                        break;
-                    case 'lowlevel':
-                        Transport = LowlevelTransport__default["default"];
-                        break;
-                    case 'emulator':
-                        Transport = EmulatorTransport__default["default"];
-                        break;
-                    default:
-                        Transport = HttpTransport__default["default"];
-                }
+                Transport = getTransport(_settings.env);
                 return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport, plugin)];
             case 2:
                 _core = _b.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "1.0.39-alpha.2",
+  "version": "1.0.39-alpha.5",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,11 +20,12 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^1.0.39-alpha.2",
-    "@onekeyfe/hd-shared": "^1.0.39-alpha.2",
-    "@onekeyfe/hd-transport-http": "^1.0.39-alpha.2",
-    "@onekeyfe/hd-transport-lowlevel": "^1.0.39-alpha.2",
-    "@onekeyfe/hd-transport-webusb": "^1.0.39-alpha.2"
+    "@onekeyfe/hd-core": "^1.0.39-alpha.5",
+    "@onekeyfe/hd-shared": "^1.0.39-alpha.5",
+    "@onekeyfe/hd-transport-emulator": "^1.0.39-alpha.5",
+    "@onekeyfe/hd-transport-http": "^1.0.39-alpha.5",
+    "@onekeyfe/hd-transport-lowlevel": "^1.0.39-alpha.5",
+    "@onekeyfe/hd-transport-web-device": "^1.0.39-alpha.5"
   },
-  "gitHead": "d821f1adbd5a8539cc08a87afdc58f11d031cf8c"
+  "gitHead": "6c62185f4a620a760ee67a648003c7c1ee828d19"
 }

package/src/index.ts

@@ -23,13 +23,21 @@ import HardwareSdk, {
 import { ERRORS, createDeferred, Deferred, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
 import HttpTransport from '@onekeyfe/hd-transport-http';
-import WebusbTransport from '@onekeyfe/hd-transport-webusb';
+import { WebUsbTransport, ElectronBleTransport } from '@onekeyfe/hd-transport-web-device';
 import LowlevelTransport from '@onekeyfe/hd-transport-lowlevel';
 import EmulatorTransport from '@onekeyfe/hd-transport-emulator';
 
 const eventEmitter = new EventEmitter();
 const Log = getLogger(LoggerNames.HdCommonConnectSdk);
 
+const getTransport = (env: ConnectSettings['env']) => {
+  if (env === 'desktop-web-ble') return ElectronBleTransport;
+  if (env === 'webusb') return WebUsbTransport;
+  if (env === 'lowlevel') return LowlevelTransport;
+  if (env === 'emulator') return EmulatorTransport;
+  return HttpTransport;
+};
+
 let _core: Core | undefined;
 let _settings = parseConnectSettings();
 
@@ -116,22 +124,7 @@ const init = async (
   Log.debug('init');
 
   try {
-    console.log(_settings.env);
-    // const Transport = _settings.env === 'webusb' ? WebusbTransport : HttpTransport;
-    let Transport: any;
-    switch (_settings.env) {
-      case 'webusb':
-        Transport = WebusbTransport;
-        break;
-      case 'lowlevel':
-        Transport = LowlevelTransport;
-        break;
-      case 'emulator':
-        Transport = EmulatorTransport;
-        break;
-      default:
-        Transport = HttpTransport;
-    }
+    const Transport = getTransport(_settings.env);
     _core = await initCore(_settings, Transport, plugin);
     _core?.on(CORE_EVENT, handleMessage);
     setLoggerPostMessage(handleMessage);