@onekeyfe/hd-transport-web-device 1.1.27 → 1.1.29-alpha.1
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.
- package/dist/index.js +2 -2
- package/dist/webusb.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/webusb.ts +10 -3
package/dist/index.js
CHANGED
|
@@ -98,9 +98,9 @@ class WebUsbTransport {
|
|
|
98
98
|
return [];
|
|
99
99
|
const devices = yield this.usb.getDevices();
|
|
100
100
|
const onekeyDevices = devices.filter(dev => {
|
|
101
|
-
const isOneKey = hdShared.ONEKEY_WEBUSB_FILTER.some(desc => dev.vendorId === desc.vendorId && dev.productId === desc.productId);
|
|
101
|
+
const isOneKey = hdShared.ONEKEY_WEBUSB_FILTER.some((desc) => dev.vendorId === desc.vendorId && dev.productId === desc.productId);
|
|
102
102
|
const hasSerialNumber = typeof dev.serialNumber === 'string' && dev.serialNumber.length > 0;
|
|
103
|
-
return isOneKey && hasSerialNumber;
|
|
103
|
+
return isOneKey && hasSerialNumber && !hdShared.isKnownTrezorWebUsbDevice(dev);
|
|
104
104
|
});
|
|
105
105
|
this.deviceList = onekeyDevices.map(device => ({
|
|
106
106
|
path: device.serialNumber,
|
package/dist/webusb.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAUpE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAejF,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IAWnB,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;IAyBnB,OAAO,CAAC,KAAK,EAAE,YAAY;IAc3B,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAiBpC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAgB5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IA+BvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YAkCpB,mBAAmB;IAkC3B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAqC9D,WAAW,CAAC,IAAI,EAAE,MAAM;IA+BxB,OAAO,CAAC,IAAI,EAAE,MAAM;CAK3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-transport-web-device",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.29-alpha.1",
|
|
4
4
|
"author": "OneKey",
|
|
5
5
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
6
6
|
"license": "MIT",
|
|
@@ -20,13 +20,13 @@
|
|
|
20
20
|
"lint:fix": "eslint . --fix"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@onekeyfe/hd-shared": "1.1.
|
|
24
|
-
"@onekeyfe/hd-transport": "1.1.
|
|
23
|
+
"@onekeyfe/hd-shared": "1.1.29-alpha.1",
|
|
24
|
+
"@onekeyfe/hd-transport": "1.1.29-alpha.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@onekeyfe/hd-transport-electron": "1.1.
|
|
27
|
+
"@onekeyfe/hd-transport-electron": "1.1.29-alpha.1",
|
|
28
28
|
"@types/w3c-web-usb": "^1.0.6",
|
|
29
29
|
"@types/web-bluetooth": "^0.0.17"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "db793e686fecbecbfa72aab8fd35c70159a72e35"
|
|
32
32
|
}
|
package/src/webusb.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
/* eslint-disable no-undef */
|
|
2
2
|
import transport, { LogBlockCommand } from '@onekeyfe/hd-transport';
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
ERRORS,
|
|
5
|
+
HardwareErrorCode,
|
|
6
|
+
ONEKEY_WEBUSB_FILTER,
|
|
7
|
+
isKnownTrezorWebUsbDevice,
|
|
8
|
+
wait,
|
|
9
|
+
} from '@onekeyfe/hd-shared';
|
|
4
10
|
import ByteBuffer from 'bytebuffer';
|
|
5
11
|
|
|
6
12
|
import type { AcquireInput, OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
|
|
@@ -111,10 +117,11 @@ export default class WebUsbTransport {
|
|
|
111
117
|
const devices = await this.usb.getDevices();
|
|
112
118
|
const onekeyDevices = devices.filter(dev => {
|
|
113
119
|
const isOneKey = ONEKEY_WEBUSB_FILTER.some(
|
|
114
|
-
desc
|
|
120
|
+
(desc: { vendorId: number; productId: number }) =>
|
|
121
|
+
dev.vendorId === desc.vendorId && dev.productId === desc.productId
|
|
115
122
|
);
|
|
116
123
|
const hasSerialNumber = typeof dev.serialNumber === 'string' && dev.serialNumber.length > 0;
|
|
117
|
-
return isOneKey && hasSerialNumber;
|
|
124
|
+
return isOneKey && hasSerialNumber && !isKnownTrezorWebUsbDevice(dev);
|
|
118
125
|
});
|
|
119
126
|
|
|
120
127
|
this.deviceList = onekeyDevices.map(device => ({
|