@onekeyfe/hd-common-connect-sdk 1.1.26-alpha.0 → 1.1.26-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +58 -31
  2. package/package.json +9 -9
  3. package/src/index.ts +8 -5
package/dist/index.js CHANGED
@@ -7,15 +7,31 @@ var hdShared = require('@onekeyfe/hd-shared');
7
7
  var HttpTransport = require('@onekeyfe/hd-transport-http');
8
8
  var hdTransportWebDevice = require('@onekeyfe/hd-transport-web-device');
9
9
  var LowlevelTransport = require('@onekeyfe/hd-transport-lowlevel');
10
- var NodeUsbTransport = require('@onekeyfe/hd-transport-usb');
11
10
  var EmulatorTransport = require('@onekeyfe/hd-transport-emulator');
12
11
 
13
12
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
14
13
 
14
+ function _interopNamespace(e) {
15
+ if (e && e.__esModule) return e;
16
+ var n = Object.create(null);
17
+ if (e) {
18
+ Object.keys(e).forEach(function (k) {
19
+ if (k !== 'default') {
20
+ var d = Object.getOwnPropertyDescriptor(e, k);
21
+ Object.defineProperty(n, k, d.get ? d : {
22
+ enumerable: true,
23
+ get: function () { return e[k]; }
24
+ });
25
+ }
26
+ });
27
+ }
28
+ n["default"] = e;
29
+ return Object.freeze(n);
30
+ }
31
+
15
32
  var HardwareSdk__default = /*#__PURE__*/_interopDefaultLegacy(HardwareSdk);
16
33
  var HttpTransport__default = /*#__PURE__*/_interopDefaultLegacy(HttpTransport);
17
34
  var LowlevelTransport__default = /*#__PURE__*/_interopDefaultLegacy(LowlevelTransport);
18
- var NodeUsbTransport__default = /*#__PURE__*/_interopDefaultLegacy(NodeUsbTransport);
19
35
  var EmulatorTransport__default = /*#__PURE__*/_interopDefaultLegacy(EmulatorTransport);
20
36
 
21
37
  /******************************************************************************
@@ -565,19 +581,29 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
565
581
 
566
582
  var eventEmitter = new events.exports();
567
583
  var Log = HardwareSdk.getLogger(HardwareSdk.LoggerNames.HdCommonConnectSdk);
568
- var getTransport = function (env) {
569
- if (env === 'desktop-web-ble')
570
- return hdTransportWebDevice.ElectronBleTransport;
571
- if (env === 'webusb' || env === 'desktop-webusb')
572
- return hdTransportWebDevice.WebUsbTransport;
573
- if (env === 'lowlevel')
574
- return LowlevelTransport__default["default"];
575
- if (env === 'node-usb')
576
- return NodeUsbTransport__default["default"];
577
- if (env === 'emulator')
578
- return EmulatorTransport__default["default"];
579
- return HttpTransport__default["default"];
580
- };
584
+ var getTransport = function (env) { return __awaiter(void 0, void 0, void 0, function () {
585
+ var NodeUsbTransport;
586
+ return __generator(this, function (_a) {
587
+ switch (_a.label) {
588
+ case 0:
589
+ if (env === 'desktop-web-ble')
590
+ return [2 /*return*/, hdTransportWebDevice.ElectronBleTransport];
591
+ if (env === 'webusb' || env === 'desktop-webusb')
592
+ return [2 /*return*/, hdTransportWebDevice.WebUsbTransport];
593
+ if (env === 'lowlevel')
594
+ return [2 /*return*/, LowlevelTransport__default["default"]];
595
+ if (!(env === 'node-usb')) return [3 /*break*/, 2];
596
+ return [4 /*yield*/, Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('@onekeyfe/hd-transport-usb')); })];
597
+ case 1:
598
+ NodeUsbTransport = (_a.sent()).default;
599
+ return [2 /*return*/, NodeUsbTransport];
600
+ case 2:
601
+ if (env === 'emulator')
602
+ return [2 /*return*/, EmulatorTransport__default["default"]];
603
+ return [2 /*return*/, HttpTransport__default["default"]];
604
+ }
605
+ });
606
+ }); };
581
607
  var _core;
582
608
  var _settings = HardwareSdk.parseConnectSettings();
583
609
  var _messageID = 0;
@@ -668,46 +694,47 @@ var init = function (settings, _, plugin) { return __awaiter(void 0, void 0, voi
668
694
  Log.debug('init');
669
695
  _b.label = 1;
670
696
  case 1:
671
- _b.trys.push([1, 3, , 4]);
672
- Transport = getTransport(_settings.env);
673
- return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport, plugin)];
697
+ _b.trys.push([1, 4, , 5]);
698
+ return [4 /*yield*/, getTransport(_settings.env)];
674
699
  case 2:
700
+ Transport = _b.sent();
701
+ return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport, plugin)];
702
+ case 3:
675
703
  _core = _b.sent();
676
704
  _core === null || _core === void 0 ? void 0 : _core.on(HardwareSdk.CORE_EVENT, handleMessage);
677
705
  HardwareSdk.setLoggerPostMessage(handleMessage);
678
706
  return [2 /*return*/, true];
679
- case 3:
707
+ case 4:
680
708
  error_1 = _b.sent();
681
709
  Log.error(HardwareSdk.createErrorMessage(error_1));
682
710
  return [2 /*return*/, false];
683
- case 4: return [2 /*return*/];
711
+ case 5: return [2 /*return*/];
684
712
  }
685
713
  });
686
714
  }); };
687
715
  var call = function (params) { return __awaiter(void 0, void 0, void 0, function () {
688
716
  var response, error_2;
689
- var _a, _b, _c, _d;
690
- return __generator(this, function (_e) {
691
- switch (_e.label) {
717
+ var _a, _b, _c;
718
+ return __generator(this, function (_d) {
719
+ switch (_d.label) {
692
720
  case 0:
693
721
  Log.debug('call: ', params);
694
- _e.label = 1;
722
+ _d.label = 1;
695
723
  case 1:
696
- _e.trys.push([1, 3, , 4]);
724
+ _d.trys.push([1, 3, , 4]);
697
725
  return [4 /*yield*/, postMessage({ event: HardwareSdk.IFRAME.CALL, type: HardwareSdk.IFRAME.CALL, payload: params })];
698
726
  case 2:
699
- response = _e.sent();
727
+ response = _d.sent();
700
728
  if (response) {
701
729
  Log.debug('response: ', response);
702
730
  if (!response.success) {
703
- console.log('response.payload?.code: ', (_a = response.payload) === null || _a === void 0 ? void 0 : _a.code);
704
- if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BleUnsupported) {
731
+ if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === hdShared.HardwareErrorCode.BleUnsupported) {
705
732
  postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
706
733
  }
707
- if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BlePoweredOff) {
734
+ if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BlePoweredOff) {
708
735
  postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_POWERED_OFF), false);
709
736
  }
710
- if (((_d = response.payload) === null || _d === void 0 ? void 0 : _d.code) === hdShared.HardwareErrorCode.BlePermissionError) {
737
+ if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BlePermissionError) {
711
738
  postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_PERMISSION), false);
712
739
  }
713
740
  }
@@ -715,7 +742,7 @@ var call = function (params) { return __awaiter(void 0, void 0, void 0, function
715
742
  }
716
743
  return [2 /*return*/, HardwareSdk.createErrorMessage(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse))];
717
744
  case 3:
718
- error_2 = _e.sent();
745
+ error_2 = _d.sent();
719
746
  Log.error('__call error: ', error_2);
720
747
  return [2 /*return*/, HardwareSdk.createErrorMessage(error_2)];
721
748
  case 4: return [2 /*return*/];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-common-connect-sdk",
3
- "version": "1.1.26-alpha.0",
3
+ "version": "1.1.26-alpha.10",
4
4
  "author": "OneKey",
5
5
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
6
6
  "license": "ISC",
@@ -20,13 +20,13 @@
20
20
  "lint:fix": "eslint . --fix"
21
21
  },
22
22
  "dependencies": {
23
- "@onekeyfe/hd-core": "1.1.26-alpha.0",
24
- "@onekeyfe/hd-shared": "1.1.26-alpha.0",
25
- "@onekeyfe/hd-transport-emulator": "1.1.26-alpha.0",
26
- "@onekeyfe/hd-transport-http": "1.1.26-alpha.0",
27
- "@onekeyfe/hd-transport-lowlevel": "1.1.26-alpha.0",
28
- "@onekeyfe/hd-transport-usb": "1.1.26-alpha.0",
29
- "@onekeyfe/hd-transport-web-device": "1.1.26-alpha.0"
23
+ "@onekeyfe/hd-core": "1.1.26-alpha.10",
24
+ "@onekeyfe/hd-shared": "1.1.26-alpha.10",
25
+ "@onekeyfe/hd-transport-emulator": "1.1.26-alpha.10",
26
+ "@onekeyfe/hd-transport-http": "1.1.26-alpha.10",
27
+ "@onekeyfe/hd-transport-lowlevel": "1.1.26-alpha.10",
28
+ "@onekeyfe/hd-transport-usb": "1.1.26-alpha.10",
29
+ "@onekeyfe/hd-transport-web-device": "1.1.26-alpha.10"
30
30
  },
31
- "gitHead": "8d3072a406b0672c9d20e2f58e25cef94a9759fb"
31
+ "gitHead": "4cab4ba97dee894aa87145ced1e629c06f0ab8b7"
32
32
  }
package/src/index.ts CHANGED
@@ -22,7 +22,6 @@ import { ERRORS, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
22
22
  import HttpTransport from '@onekeyfe/hd-transport-http';
23
23
  import { ElectronBleTransport, WebUsbTransport } from '@onekeyfe/hd-transport-web-device';
24
24
  import LowlevelTransport from '@onekeyfe/hd-transport-lowlevel';
25
- import NodeUsbTransport from '@onekeyfe/hd-transport-usb';
26
25
  import EmulatorTransport from '@onekeyfe/hd-transport-emulator';
27
26
 
28
27
  import type { Deferred } from '@onekeyfe/hd-shared';
@@ -38,11 +37,16 @@ import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
38
37
  const eventEmitter = new EventEmitter();
39
38
  const Log = getLogger(LoggerNames.HdCommonConnectSdk);
40
39
 
41
- const getTransport = (env: ConnectSettings['env']) => {
40
+ const getTransport = async (env: ConnectSettings['env']) => {
42
41
  if (env === 'desktop-web-ble') return ElectronBleTransport;
43
42
  if (env === 'webusb' || env === 'desktop-webusb') return WebUsbTransport;
44
43
  if (env === 'lowlevel') return LowlevelTransport;
45
- if (env === 'node-usb') return NodeUsbTransport;
44
+ if (env === 'node-usb') {
45
+ // Dynamic import — usb is a native Node.js module (libusb C++ bindings)
46
+ // that cannot be resolved by browser/React Native bundlers
47
+ const { default: NodeUsbTransport } = await import('@onekeyfe/hd-transport-usb');
48
+ return NodeUsbTransport;
49
+ }
46
50
  if (env === 'emulator') return EmulatorTransport;
47
51
  return HttpTransport;
48
52
  };
@@ -139,7 +143,7 @@ const init = async (
139
143
  Log.debug('init');
140
144
 
141
145
  try {
142
- const Transport = getTransport(_settings.env);
146
+ const Transport = await getTransport(_settings.env);
143
147
  _core = await initCore(_settings, Transport, plugin);
144
148
  _core?.on(CORE_EVENT, handleMessage);
145
149
  setLoggerPostMessage(handleMessage);
@@ -161,7 +165,6 @@ const call = async (params: any) => {
161
165
  Log.debug('response: ', response);
162
166
 
163
167
  if (!response.success) {
164
- console.log('response.payload?.code: ', response.payload?.code);
165
168
  if (response.payload?.code === HardwareErrorCode.BleUnsupported) {
166
169
  postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
167
170
  }