@onekeyfe/hd-core 0.1.28 → 0.1.29

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.
@@ -1 +1 @@
1
- {"version":3,"file":"RequestWebUsbDevice.d.ts","sourceRoot":"","sources":["../../src/api/RequestWebUsbDevice.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,IAAI;IAIE,GAAG;;;CAsCV"}
1
+ {"version":3,"file":"RequestWebUsbDevice.d.ts","sourceRoot":"","sources":["../../src/api/RequestWebUsbDevice.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,IAAI;IAIE,GAAG;;;CA+BV"}
package/dist/index.js CHANGED
@@ -13637,18 +13637,12 @@ class RequestWebUsbDevice extends BaseMethod {
13637
13637
  if (env !== 'webusb') {
13638
13638
  return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Not webusb environment'));
13639
13639
  }
13640
- const transport = TransportManager.getTransport();
13641
13640
  try {
13642
- const device = (yield transport.requestDevice());
13643
- if (!device) {
13644
- return yield Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Please select the device to connect'));
13645
- }
13646
13641
  const deviceDiff = yield ((_a = this.connector) === null || _a === void 0 ? void 0 : _a.enumerate());
13647
13642
  const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
13648
13643
  const { deviceList } = yield DevicePool.getDevices(devicesDescriptor);
13649
- const _device = deviceList.find(d => d.originalDescriptor.path === device.serialNumber);
13650
- if (_device) {
13651
- return { device: _device.toMessageObject() };
13644
+ if (deviceList.length > 0) {
13645
+ return { device: deviceList[0].toMessageObject() };
13652
13646
  }
13653
13647
  return yield Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Please select the device to connect'));
13654
13648
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "0.1.28",
3
+ "version": "0.1.29",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "^0.1.28",
29
- "@onekeyfe/hd-transport": "^0.1.28",
28
+ "@onekeyfe/hd-shared": "^0.1.29",
29
+ "@onekeyfe/hd-transport": "^0.1.29",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "js-sha256": "^0.9.0",
@@ -37,5 +37,5 @@
37
37
  "@types/parse-uri": "^1.0.0",
38
38
  "@types/semver": "^7.3.9"
39
39
  },
40
- "gitHead": "84236b7baecf937399e557aa2d9a5b47ecd01d3f"
40
+ "gitHead": "c90519ae4589f210f4d1cd582dec58ba046653a0"
41
41
  }
@@ -22,22 +22,15 @@ export default class RequestWebUsbDevice extends BaseMethod {
22
22
  );
23
23
  }
24
24
 
25
- const transport = TransportManager.getTransport();
26
-
27
25
  try {
28
- const device = (await transport.requestDevice()) as any;
29
- if (!device) {
30
- return await Promise.reject(
31
- ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Please select the device to connect')
32
- );
33
- }
34
-
35
26
  const deviceDiff = await this.connector?.enumerate();
36
27
  const devicesDescriptor = deviceDiff?.descriptors ?? [];
37
28
  const { deviceList } = await DevicePool.getDevices(devicesDescriptor);
38
- const _device = deviceList.find(d => d.originalDescriptor.path === device.serialNumber);
39
- if (_device) {
40
- return { device: _device.toMessageObject() };
29
+ /**
30
+ * get first onekey device
31
+ */
32
+ if (deviceList.length > 0) {
33
+ return { device: deviceList[0].toMessageObject() };
41
34
  }
42
35
 
43
36
  return await Promise.reject(