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

package/dist/index.js

@@ -11,6 +11,24 @@ var EmulatorTransport = require('@onekeyfe/hd-transport-emulator');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
 var HardwareSdk__default = /*#__PURE__*/_interopDefaultLegacy(HardwareSdk);
 var HttpTransport__default = /*#__PURE__*/_interopDefaultLegacy(HttpTransport);
 var LowlevelTransport__default = /*#__PURE__*/_interopDefaultLegacy(LowlevelTransport);
@@ -563,17 +581,29 @@ 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' || env === 'desktop-webusb')
-        return hdTransportWebDevice.WebUsbTransport;
-    if (env === 'lowlevel')
-        return LowlevelTransport__default["default"];
-    if (env === 'emulator')
-        return EmulatorTransport__default["default"];
-    return HttpTransport__default["default"];
-};
+var getTransport = function (env) { return __awaiter(void 0, void 0, void 0, function () {
+    var NodeUsbTransport;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (env === 'desktop-web-ble')
+                    return [2 /*return*/, hdTransportWebDevice.ElectronBleTransport];
+                if (env === 'webusb' || env === 'desktop-webusb')
+                    return [2 /*return*/, hdTransportWebDevice.WebUsbTransport];
+                if (env === 'lowlevel')
+                    return [2 /*return*/, LowlevelTransport__default["default"]];
+                if (!(env === 'node-usb')) return [3 /*break*/, 2];
+                return [4 /*yield*/, Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('@onekeyfe/hd-transport-usb')); })];
+            case 1:
+                NodeUsbTransport = (_a.sent()).default;
+                return [2 /*return*/, NodeUsbTransport];
+            case 2:
+                if (env === 'emulator')
+                    return [2 /*return*/, EmulatorTransport__default["default"]];
+                return [2 /*return*/, HttpTransport__default["default"]];
+        }
+    });
+}); };
 var _core;
 var _settings = HardwareSdk.parseConnectSettings();
 var _messageID = 0;
@@ -664,46 +694,47 @@ var init = function (settings, _, plugin) { return __awaiter(void 0, void 0, voi
                 Log.debug('init');
                 _b.label = 1;
             case 1:
-                _b.trys.push([1, 3, , 4]);
-                Transport = getTransport(_settings.env);
-                return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport, plugin)];
+                _b.trys.push([1, 4, , 5]);
+                return [4 /*yield*/, getTransport(_settings.env)];
             case 2:
+                Transport = _b.sent();
+                return [4 /*yield*/, HardwareSdk.initCore(_settings, Transport, plugin)];
+            case 3:
                 _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:
+            case 4:
                 error_1 = _b.sent();
                 Log.error(HardwareSdk.createErrorMessage(error_1));
                 return [2 /*return*/, false];
-            case 4: return [2 /*return*/];
+            case 5: return [2 /*return*/];
         }
     });
 }); };
 var call = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var response, error_2;
-    var _a, _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 Log.debug('call: ', params);
-                _e.label = 1;
+                _d.label = 1;
             case 1:
-                _e.trys.push([1, 3, , 4]);
+                _d.trys.push([1, 3, , 4]);
                 return [4 /*yield*/, postMessage({ event: HardwareSdk.IFRAME.CALL, type: HardwareSdk.IFRAME.CALL, payload: params })];
             case 2:
-                response = _e.sent();
+                response = _d.sent();
                 if (response) {
                     Log.debug('response: ', response);
                     if (!response.success) {
-                        console.log('response.payload?.code: ', (_a = response.payload) === null || _a === void 0 ? void 0 : _a.code);
-                        if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BleUnsupported) {
+                        if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === hdShared.HardwareErrorCode.BleUnsupported) {
                             postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
                         }
-                        if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BlePoweredOff) {
+                        if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BlePoweredOff) {
                             postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_POWERED_OFF), false);
                         }
-                        if (((_d = response.payload) === null || _d === void 0 ? void 0 : _d.code) === hdShared.HardwareErrorCode.BlePermissionError) {
+                        if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BlePermissionError) {
                             postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_PERMISSION), false);
                         }
                     }
@@ -711,7 +742,7 @@ var call = function (params) { return __awaiter(void 0, void 0, void 0, function
                 }
                 return [2 /*return*/, HardwareSdk.createErrorMessage(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse))];
             case 3:
-                error_2 = _e.sent();
+                error_2 = _d.sent();
                 Log.error('__call error: ', error_2);
                 return [2 /*return*/, HardwareSdk.createErrorMessage(error_2)];
             case 4: return [2 /*return*/];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "1.1.25",
+  "version": "1.1.26-alpha.10",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,12 +20,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.1.25",
-    "@onekeyfe/hd-shared": "1.1.25",
-    "@onekeyfe/hd-transport-emulator": "1.1.25",
-    "@onekeyfe/hd-transport-http": "1.1.25",
-    "@onekeyfe/hd-transport-lowlevel": "1.1.25",
-    "@onekeyfe/hd-transport-web-device": "1.1.25"
+    "@onekeyfe/hd-core": "1.1.26-alpha.10",
+    "@onekeyfe/hd-shared": "1.1.26-alpha.10",
+    "@onekeyfe/hd-transport-emulator": "1.1.26-alpha.10",
+    "@onekeyfe/hd-transport-http": "1.1.26-alpha.10",
+    "@onekeyfe/hd-transport-lowlevel": "1.1.26-alpha.10",
+    "@onekeyfe/hd-transport-usb": "1.1.26-alpha.10",
+    "@onekeyfe/hd-transport-web-device": "1.1.26-alpha.10"
   },
-  "gitHead": "6110417c47363db38190076610ea4de0e8508924"
+  "gitHead": "4cab4ba97dee894aa87145ced1e629c06f0ab8b7"
 }

package/src/index.ts

@@ -37,10 +37,16 @@ import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
 const eventEmitter = new EventEmitter();
 const Log = getLogger(LoggerNames.HdCommonConnectSdk);
 
-const getTransport = (env: ConnectSettings['env']) => {
+const getTransport = async (env: ConnectSettings['env']) => {
   if (env === 'desktop-web-ble') return ElectronBleTransport;
   if (env === 'webusb' || env === 'desktop-webusb') return WebUsbTransport;
   if (env === 'lowlevel') return LowlevelTransport;
+  if (env === 'node-usb') {
+    // Dynamic import — usb is a native Node.js module (libusb C++ bindings)
+    // that cannot be resolved by browser/React Native bundlers
+    const { default: NodeUsbTransport } = await import('@onekeyfe/hd-transport-usb');
+    return NodeUsbTransport;
+  }
   if (env === 'emulator') return EmulatorTransport;
   return HttpTransport;
 };
@@ -137,7 +143,7 @@ const init = async (
   Log.debug('init');
 
   try {
-    const Transport = getTransport(_settings.env);
+    const Transport = await getTransport(_settings.env);
     _core = await initCore(_settings, Transport, plugin);
     _core?.on(CORE_EVENT, handleMessage);
     setLoggerPostMessage(handleMessage);
@@ -159,7 +165,6 @@ const call = async (params: any) => {
       Log.debug('response: ', response);
 
       if (!response.success) {
-        console.log('response.payload?.code: ', response.payload?.code);
         if (response.payload?.code === HardwareErrorCode.BleUnsupported) {
           postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
         }