@ledgerhq/hw-transport-webusb - npm Package Compare versions

Comparing version 4.35.0 to 4.37.0-beta.2b8718d2

flow-typed/npm/@ledgerhq/hw-transport_vx.x.x.js

@@ -1,3 +0,3 @@
-// flow-typed signature: 8fdbba3613ab089f2d0866b6185c7942
-// flow-typed version: <<STUB>>/@ledgerhq/hw-transport_v^4.32.0/flow_v0.66.0
+// flow-typed signature: 706a3964084461777df028ab50f42e4f
+// flow-typed version: <<STUB>>/@ledgerhq/hw-transport_v^4.35.0/flow_v0.66.0
 
@@ -25,6 +25,2 @@ /**
  */
-declare module '@ledgerhq/hw-transport/flow-typed/npm/events_vx.x.x' {
-  declare module.exports: any;
-}
-
 declare module '@ledgerhq/hw-transport/flow-typed/npm/flow-bin_v0.x.x' {
@@ -34,6 +30,2 @@ declare module.exports: any;
 
-declare module '@ledgerhq/hw-transport/flow-typed/npm/flow-typed_vx.x.x' {
-  declare module.exports: any;
-}
-
 declare module '@ledgerhq/hw-transport/src/Transport' {
@@ -44,13 +36,7 @@ declare module.exports: any;
 // Filename aliases
-declare module '@ledgerhq/hw-transport/flow-typed/npm/events_vx.x.x.js' {
-  declare module.exports: $Exports<'@ledgerhq/hw-transport/flow-typed/npm/events_vx.x.x'>;
-}
 declare module '@ledgerhq/hw-transport/flow-typed/npm/flow-bin_v0.x.x.js' {
   declare module.exports: $Exports<'@ledgerhq/hw-transport/flow-typed/npm/flow-bin_v0.x.x'>;
 }
-declare module '@ledgerhq/hw-transport/flow-typed/npm/flow-typed_vx.x.x.js' {
-  declare module.exports: $Exports<'@ledgerhq/hw-transport/flow-typed/npm/flow-typed_vx.x.x'>;
-}
 declare module '@ledgerhq/hw-transport/src/Transport.js' {
   declare module.exports: $Exports<'@ledgerhq/hw-transport/src/Transport'>;
 }

lib/TransportWebUSB.js

@@ -13,8 +13,10 @@ "use strict";
 
-var _webusb = require("./webusb");
+var _hidFraming = require("@ledgerhq/devices/lib/hid-framing");
 
-var _hidFraming = require("./hid-framing");
-
 var _hidFraming2 = _interopRequireDefault(_hidFraming);
 
+var _devices = require("@ledgerhq/devices");
+
+var _webusb = require("./webusb");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -65,13 +67,17 @@
                 _context.next = 2;
-                return this.device.releaseInterface(interfaceNumber);
+                return this.exchangeBusyPromise;
 
               case 2:
                 _context.next = 4;
-                return this.device.reset();
+                return this.device.releaseInterface(interfaceNumber);
 
               case 4:
                 _context.next = 6;
+                return this.device.reset();
+
+              case 6:
+                _context.next = 8;
                 return this.device.close();
 
-              case 6:
+              case 8:
               case "end":
@@ -93,5 +99,2 @@ return _context.stop();
     value: function setScrambleKey() {}
-
-    // $FlowFixMe
-
   }], [{
@@ -154,3 +157,4 @@ key: "open",
     if (!unsubscribed) {
-      observer.next({ type: "add", descriptor: device, device: device });
+      var deviceModel = (0, _devices.identifyUSBProductId)(device.productId);
+      observer.next({ type: "add", descriptor: device, deviceModel: deviceModel });
       observer.complete();
@@ -172,3 +176,3 @@ }
   this.exchange = function (apdu) {
-    return _this2.atomic(_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+    return _this2.exchangeAtomicImpl(_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
       var debug, channel, packetSize, framing, blocks, i, result, acc, r;
@@ -243,51 +247,2 @@ return regeneratorRuntime.wrap(function _callee3$(_context3) {
   };
-
-  this.atomic = function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(f) {
-      var resolveBusy, busyPromise, res;
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              if (!_this2.busy) {
-                _context4.next = 2;
-                break;
-              }
-
-              throw new _hwTransport.TransportError("Transport race condition", "RaceCondition");
-
-            case 2:
-              resolveBusy = void 0;
-              busyPromise = new Promise(function (r) {
-                resolveBusy = r;
-              });
-
-              _this2.busy = busyPromise;
-              _context4.prev = 5;
-              _context4.next = 8;
-              return f();
-
-            case 8:
-              res = _context4.sent;
-              return _context4.abrupt("return", res);
-
-            case 10:
-              _context4.prev = 10;
-
-              if (resolveBusy) resolveBusy();
-              _this2.busy = null;
-              return _context4.finish(10);
-
-            case 14:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4, _this2, [[5,, 10, 14]]);
-    }));
-
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
 };
@@ -294,0 +249,0 @@

lib/webusb.js

@@ -6,2 +6,3 @@ "use strict";
 });
+exports.getLedgerDevices = exports.isSupported = undefined;
 
@@ -11,10 +12,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 exports.requestLedgerDevice = requestLedgerDevice;
-var ledgerDevices = [{ vendorId: 0x2581, productId: 0x3b7c }, { vendorId: 0x2c97 }];
 
-var isLedgerDevice = function isLedgerDevice(device) {
-  return ledgerDevices.some(function (info) {
-    return (!info.productId || info.productId === device.productId) && (!info.vendorId || info.vendorId === device.vendorId);
-  });
-};
+var _devices = require("@ledgerhq/devices");
 
+var ledgerDevices = [{ vendorId: _devices.ledgerUSBVendorId }];
+
 function requestLedgerDevice() {
@@ -42,5 +40,7 @@ return Promise.resolve().then(function () {
   }).then(function (devices) {
-    return devices.filter(isLedgerDevice);
+    return devices.filter(function (d) {
+      return d.vendorId === _devices.ledgerUSBVendorId;
+    });
   });
 };
 //# sourceMappingURL=webusb.js.map

package.json

 {
   "name": "@ledgerhq/hw-transport-webusb",
-  "version": "4.35.0",
+  "version": "4.37.0-beta.2b8718d2",
   "description": "Ledger Hardware Wallet WebUSB implementation of the communication layer",
@@ -27,3 +27,5 @@ "keywords": [
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.35.0"
+    "@ledgerhq/devices": "^4.37.0-beta.2b8718d2",
+    "@ledgerhq/errors": "^4.37.0-beta.2b8718d2",
+    "@ledgerhq/hw-transport": "^4.37.0-beta.2b8718d2"
   },
@@ -30,0 +32,0 @@ "devDependencies": {

src/TransportWebUSB.js

 //@flow
-import Transport, { TransportError } from "@ledgerhq/hw-transport";
+import Transport from "@ledgerhq/hw-transport";
 import type {
@@ -8,4 +8,5 @@ Observer,
 } from "@ledgerhq/hw-transport";
+import hidFraming from "@ledgerhq/devices/lib/hid-framing";
+import { identifyUSBProductId } from "@ledgerhq/devices";
 import { getLedgerDevices, requestLedgerDevice, isSupported } from "./webusb";
-import hidFraming from "./hid-framing";
 
@@ -43,3 +44,4 @@ const configurationValue = 1;
       if (!unsubscribed) {
-        observer.next({ type: "add", descriptor: device, device });
+        const deviceModel = identifyUSBProductId(device.productId);
+        observer.next({ type: "add", descriptor: device, deviceModel });
         observer.complete();
@@ -65,2 +67,3 @@ }
   async close(): Promise<void> {
+    await this.exchangeBusyPromise;
     await this.device.releaseInterface(interfaceNumber);
@@ -72,3 +75,3 @@ await this.device.reset();
   exchange = (apdu: Buffer): Promise<Buffer> =>
-    this.atomic(async () => {
+    this.exchangeAtomicImpl(async () => {
       const { debug, channel, packetSize } = this;
@@ -102,23 +105,2 @@ if (debug) {
   setScrambleKey() {}
-
-  busy: ?Promise<void>;
-
-  // $FlowFixMe
-  atomic = async f => {
-    if (this.busy) {
-      throw new TransportError("Transport race condition", "RaceCondition");
-    }
-    let resolveBusy;
-    const busyPromise = new Promise(r => {
-      resolveBusy = r;
-    });
-    this.busy = busyPromise;
-    try {
-      const res = await f();
-      return res;
-    } finally {
-      if (resolveBusy) resolveBusy();
-      this.busy = null;
-    }
-  };
 }

src/webusb.js

 // @flow
+import { ledgerUSBVendorId } from "@ledgerhq/devices";
 
-const ledgerDevices = [
-  { vendorId: 0x2581, productId: 0x3b7c },
-  { vendorId: 0x2c97 }
-];
+const ledgerDevices = [{ vendorId: ledgerUSBVendorId }];
 
-const isLedgerDevice = device =>
-  ledgerDevices.some(
-    info =>
-      (!info.productId || info.productId === device.productId) &&
-      (!info.vendorId || info.vendorId === device.vendorId)
-  );
-
 export function requestLedgerDevice(): Promise<USBDevice> {
@@ -35,2 +26,2 @@ return Promise.resolve().then(() =>
     )
-    .then(devices => devices.filter(isLedgerDevice));
+    .then(devices => devices.filter(d => d.vendorId === ledgerUSBVendorId));

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

40307

decreased by-22.15%

Dependency count

3

increased by200%

Number of package files

17

decreased by-10.53%

Lines of code

773

decreased by-13.24%

Number of low quality alerts

1

increased byInfinity%

Dependency changes

• + Added@ledgerhq/devices@^4.37.0-beta.2b8718d2

• + Added@ledgerhq/errors@^4.37.0-beta.2b8718d2

• Updated@ledgerhq/hw-transport@^4.37.0-beta.2b8718d2