usb 2.0.0-alpha.2 → 2.1.0

package/dist/index.d.ts

@@ -1,6 +1,8 @@
-import { WebUSB } from './webusb';
+import { WebUSB, getWebUsb } from './webusb';
 import { WebUSBDevice } from './webusb/webusb-device';
 import * as usb from './usb';
+declare const webusb: WebUSB;
+declare const getDeviceList: typeof usb.getDeviceList;
 /**
  * Convenience method to get the first device with the specified VID and PID, or `undefined` if no such device is present.
  * @param vid
@@ -12,6 +14,4 @@ declare const findByIds: (vid: number, pid: number) => usb.Device | undefined;
  * @param serialNumber
  */
 declare const findBySerialNumber: (serialNumber: string) => Promise<usb.Device | undefined>;
-declare const webusb: WebUSB;
-declare const getDeviceList: typeof usb.getDeviceList;
-export { usb, getDeviceList, findByIds, findBySerialNumber, webusb, WebUSB, WebUSBDevice };
+export { usb, getDeviceList, findByIds, findBySerialNumber, getWebUsb, webusb, WebUSB, WebUSBDevice };

package/dist/index.js

@@ -47,14 +47,19 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebUSBDevice = exports.WebUSB = exports.webusb = exports.findBySerialNumber = exports.findByIds = exports.getDeviceList = exports.usb = void 0;
+exports.WebUSBDevice = exports.WebUSB = exports.webusb = exports.getWebUsb = exports.findBySerialNumber = exports.findByIds = exports.getDeviceList = exports.usb = void 0;
 var util_1 = require("util");
 var webusb_1 = require("./webusb");
 Object.defineProperty(exports, "WebUSB", { enumerable: true, get: function () { return webusb_1.WebUSB; } });
+Object.defineProperty(exports, "getWebUsb", { enumerable: true, get: function () { return webusb_1.getWebUsb; } });
 var webusb_device_1 = require("./webusb/webusb-device");
 Object.defineProperty(exports, "WebUSBDevice", { enumerable: true, get: function () { return webusb_device_1.WebUSBDevice; } });
 var usb = require("./usb");
 exports.usb = usb;
+var webusb = new webusb_1.WebUSB();
+exports.webusb = webusb;
+var getDeviceList = usb.getDeviceList;
+exports.getDeviceList = getDeviceList;
 /**
  * Convenience method to get the first device with the specified VID and PID, or `undefined` if no such device is present.
  * @param vid
@@ -70,12 +75,13 @@ exports.findByIds = findByIds;
  * @param serialNumber
  */
 var findBySerialNumber = function (serialNumber) { return __awaiter(void 0, void 0, void 0, function () {
-    var devices, devices_1, devices_1_1, device, getStringDescriptor, buffer, _a, e_1_1;
+    var devices, opened, devices_1, devices_1_1, device, getStringDescriptor, buffer, _a, e_1_1;
     var e_1, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 devices = usb.getDeviceList();
+                opened = function (device) { return !!device.interfaces; };
                 _c.label = 1;
             case 1:
                 _c.trys.push([1, 9, 10, 11]);
@@ -87,7 +93,9 @@ var findBySerialNumber = function (serialNumber) { return __awaiter(void 0, void
                 _c.label = 3;
             case 3:
                 _c.trys.push([3, 5, 6, 7]);
-                device.open();
+                if (!opened(device)) {
+                    device.open();
+                }
                 getStringDescriptor = util_1.promisify(device.getStringDescriptor).bind(device);
                 return [4 /*yield*/, getStringDescriptor(device.deviceDescriptor.iSerialNumber)];
             case 4:
@@ -101,7 +109,9 @@ var findBySerialNumber = function (serialNumber) { return __awaiter(void 0, void
                 return [3 /*break*/, 7];
             case 6:
                 try {
-                    device.close();
+                    if (opened(device)) {
+                        device.close();
+                    }
                 }
                 catch (_d) {
                     // Ignore any errors, device may be a system device or inaccessible
@@ -126,8 +136,4 @@ var findBySerialNumber = function (serialNumber) { return __awaiter(void 0, void
     });
 }); };
 exports.findBySerialNumber = findBySerialNumber;
-var webusb = new webusb_1.WebUSB();
-exports.webusb = webusb;
-var getDeviceList = usb.getDeviceList;
-exports.getDeviceList = getDeviceList;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../tsc/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAiC;AACjC,mCAAkC;AA6D9B,uFA7DK,eAAM,OA6DL;AA5DV,wDAAsD;AA+DlD,6FA/DK,4BAAY,OA+DL;AA9DhB,2BAA6B;AAgDzB,kBAAG;AA9CP;;;;GAIG;AACH,IAAM,SAAS,GAAG,UAAC,GAAW,EAAE,GAAW;IACvC,IAAM,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,gBAAgB,CAAC,QAAQ,KAAK,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,KAAK,GAAG,EAAjF,CAAiF,CAAC,CAAC;AACnH,CAAC,CAAC;AA0CE,8BAAS;AAxCb;;;GAGG;AACH,IAAM,kBAAkB,GAAG,UAAO,YAAoB;;;;;;gBAC5C,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;;;;gBAEf,YAAA,SAAA,OAAO,CAAA;;;;gBAAjB,MAAM;;;;gBAET,MAAM,CAAC,IAAI,EAAE,CAAC;gBAER,mBAAmB,GAAG,gBAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAChE,qBAAM,mBAAmB,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAA;;gBAAzE,MAAM,GAAG,SAAgE;gBAE/E,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,KAAK,YAAY,EAAE;oBAC9C,sBAAO,MAAM,EAAC;iBACjB;;;;;;gBAID,IAAI;oBACA,MAAM,CAAC,KAAK,EAAE,CAAC;iBAClB;gBAAC,WAAM;oBACJ,mEAAmE;iBACtE;;;;;;;;;;;;;;;;qBAIT,sBAAO,SAAS,EAAC;;;KACpB,CAAC;AAYE,gDAAkB;AAVtB,IAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;AAaxB,wBAAM;AAZV,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;AAOpC,sCAAa"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../tsc/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAiC;AACjC,mCAA6C;AAmEzC,uFAnEK,eAAM,OAmEL;AANN,0FA7Da,kBAAS,OA6Db;AA5Db,wDAAsD;AAqElD,6FArEK,4BAAY,OAqEL;AApEhB,2BAA6B;AAqDzB,kBAAG;AAnDP,IAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;AA4DxB,wBAAM;AA3DV,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;AAqDpC,sCAAa;AAnDjB;;;;GAIG;AACH,IAAM,SAAS,GAAG,UAAC,GAAW,EAAE,GAAW;IACvC,IAAM,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,gBAAgB,CAAC,QAAQ,KAAK,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,KAAK,GAAG,EAAjF,CAAiF,CAAC,CAAC;AACnH,CAAC,CAAC;AA4CE,8BAAS;AA1Cb;;;GAGG;AACH,IAAM,kBAAkB,GAAG,UAAO,YAAoB;;;;;;gBAC5C,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;gBAC9B,MAAM,GAAG,UAAC,MAAkB,IAAc,OAAA,CAAC,CAAC,MAAM,CAAC,UAAU,EAAnB,CAAmB,CAAC;;;;gBAE/C,YAAA,SAAA,OAAO,CAAA;;;;gBAAjB,MAAM;;;;gBAET,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;oBACjB,MAAM,CAAC,IAAI,EAAE,CAAC;iBACjB;gBAEK,mBAAmB,GAAG,gBAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAChE,qBAAM,mBAAmB,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAA;;gBAAzE,MAAM,GAAG,SAAgE;gBAE/E,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,KAAK,YAAY,EAAE;oBAC9C,sBAAO,MAAM,EAAC;iBACjB;;;;;;gBAID,IAAI;oBACA,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;wBAChB,MAAM,CAAC,KAAK,EAAE,CAAC;qBAClB;iBACJ;gBAAC,WAAM;oBACJ,mEAAmE;iBACtE;;;;;;;;;;;;;;;;qBAIT,sBAAO,SAAS,EAAC;;;KACpB,CAAC;AASE,gDAAkB"}

package/dist/usb/bindings.d.ts

@@ -15,6 +15,15 @@ export declare class LibUSBException extends Error {
 export declare function setDebugLevel(level: number): void;
 export declare function _enableHotplugEvents(): void;
 export declare function _disableHotplugEvents(): void;
+export declare function _getLibusbCapability(capability: number): number;
+/**
+ * Restore (re-reference) the hotplug events unreferenced by `unrefHotplugEvents()`
+ */
+export declare function refHotplugEvents(): void;
+/**
+ * Unreference the hotplug events from the event loop, allowing the process to exit even when listening for the `attach` and `detach` events
+ */
+export declare function unrefHotplugEvents(): void;
 /** Represents a USB transfer */
 export declare class Transfer {
     constructor(device: Device, endpointAddr: number, type: number, timeout: number, callback: (error: LibUSBException, buf: Buffer, actual: number) => void);
@@ -212,6 +221,10 @@ export declare const LIBUSB_RECIPIENT_ENDPOINT: number;
 export declare const LIBUSB_RECIPIENT_OTHER: number;
 export declare const LIBUSB_CONTROL_SETUP_SIZE: number;
 export declare const LIBUSB_DT_BOS_SIZE: number;
+export declare const LIBUSB_CAP_HAS_CAPABILITY: number;
+export declare const LIBUSB_CAP_HAS_HOTPLUG: number;
+export declare const LIBUSB_CAP_HAS_HID_ACCESS: number;
+export declare const LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER: number;
 /** Input/output error */
 export declare const LIBUSB_ERROR_IO: number;
 /** Invalid parameter */

package/dist/usb/bindings.js

@@ -3,7 +3,8 @@
 //  Eric Brody <https://github.com/underscorebrody>
 //  Rob Moran <https://github.com/thegecko>
 Object.defineProperty(exports, "__esModule", { value: true });
+var path_1 = require("path");
 /* eslint-disable @typescript-eslint/no-var-requires */
-var usb = require('bindings')('usb_bindings');
+var usb = require('node-gyp-build')(path_1.join(__dirname, '..', '..'));
 module.exports = usb;
 //# sourceMappingURL=bindings.js.map

package/dist/usb/bindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../tsc/usb/bindings.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,mDAAmD;AACnD,2CAA2C;;AAI3C,uDAAuD;AACvD,IAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,CAAC;AAChD,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC"}
+{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../tsc/usb/bindings.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,mDAAmD;AACnD,2CAA2C;;AAE3C,6BAA4B;AAG5B,uDAAuD;AACvD,IAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,WAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACnE,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC"}

package/dist/usb/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var events_1 = require("events");
 var device_1 = require("./device");
 var usb = require("./bindings");
@@ -10,13 +21,81 @@ Object.setPrototypeOf(usb, events_1.EventEmitter.prototype);
 Object.getOwnPropertyNames(device_1.ExtendedDevice.prototype).forEach(function (name) {
     Object.defineProperty(usb.Device.prototype, name, Object.getOwnPropertyDescriptor(device_1.ExtendedDevice.prototype, name) || Object.create(null));
 });
+// Polling mechanism for discovering device changes until this is fixed:
+// https://github.com/libusb/libusb/issues/86
+var pollTimeout = 500;
+var hotplugSupported = usb._getLibusbCapability(usb.LIBUSB_CAP_HAS_HOTPLUG) > 0;
+var pollingHotplug = false;
+var pollDevices = [];
+var pollHotplug = function (start) {
+    var e_1, _a, e_2, _b;
+    if (start === void 0) { start = false; }
+    if (start) {
+        pollingHotplug = true;
+    }
+    else if (!pollingHotplug) {
+        return;
+    }
+    var devices = usb.getDeviceList();
+    if (!start) {
+        var _loop_1 = function (device) {
+            var found = pollDevices.find(function (item) { return item.deviceAddress === device.deviceAddress; });
+            if (!found) {
+                usb.emit('attach', device);
+            }
+        };
+        try {
+            // Find attached devices
+            for (var devices_1 = __values(devices), devices_1_1 = devices_1.next(); !devices_1_1.done; devices_1_1 = devices_1.next()) {
+                var device = devices_1_1.value;
+                _loop_1(device);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (devices_1_1 && !devices_1_1.done && (_a = devices_1.return)) _a.call(devices_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        var _loop_2 = function (device) {
+            var found = devices.find(function (item) { return item.deviceAddress === device.deviceAddress; });
+            if (!found) {
+                usb.emit('detach', device);
+            }
+        };
+        try {
+            // Find detached devices
+            for (var pollDevices_1 = __values(pollDevices), pollDevices_1_1 = pollDevices_1.next(); !pollDevices_1_1.done; pollDevices_1_1 = pollDevices_1.next()) {
+                var device = pollDevices_1_1.value;
+                _loop_2(device);
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (pollDevices_1_1 && !pollDevices_1_1.done && (_b = pollDevices_1.return)) _b.call(pollDevices_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+    }
+    pollDevices = devices;
+    setTimeout(function () {
+        pollHotplug();
+    }, pollTimeout);
+};
 usb.on('newListener', function (event) {
     if (event !== 'attach' && event !== 'detach') {
         return;
     }
     var listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        usb._enableHotplugEvents();
+        if (hotplugSupported) {
+            usb._enableHotplugEvents();
+        }
+        else {
+            pollHotplug(true);
+        }
     }
 });
 usb.on('removeListener', function (event) {
@@ -25,7 +104,12 @@ usb.on('removeListener', function (event) {
     }
     var listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        usb._disableHotplugEvents();
+        if (hotplugSupported) {
+            usb._disableHotplugEvents();
+        }
+        else {
+            pollingHotplug = false;
+        }
     }
 });
 module.exports = usb;

package/dist/usb/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":";AAAA,iCAAsC;AACtC,mCAA0C;AAC1C,gCAAkC;AAElC,IAAI,GAAG,CAAC,UAAU,EAAE;IAChB,+BAA+B;IAC/B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;CAChD;AAED,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC;AAEnD,MAAM,CAAC,mBAAmB,CAAC,uBAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAA,IAAI;IAC7D,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,wBAAwB,CAAC,uBAAc,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9I,CAAC,CAAC,CAAC;AA6BH,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,UAAA,KAAK;IACvB,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE;QAC1C,OAAO;KACV;IACD,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,aAAa,KAAK,CAAC,EAAE;QACrB,GAAG,CAAC,oBAAoB,EAAE,CAAC;KAC9B;AACL,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAA,KAAK;IAC1B,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE;QAC1C,OAAO;KACV;IACD,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,aAAa,KAAK,CAAC,EAAE;QACrB,GAAG,CAAC,qBAAqB,EAAE,CAAC;KAC/B;AACL,CAAC,CAAC,CAAC;AAEH,iBAAS,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}

package/dist/usb/interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../tsc/usb/interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../tsc/usb/interface.ts"],"names":[],"mappings":"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"}

package/dist/webusb/index.d.ts

@@ -1,33 +1,46 @@
 /// <reference types="w3c-web-usb" />
-import { TypedEventTarget } from './typed-event-target';
+/// <reference types="node" />
+import { EventEmitter } from 'events';
 /**
  * USB Options
  */
 export interface USBOptions {
     /**
-     * A `device found` callback function to allow the user to select a device
+     * Optional `device found` callback function to allow the user to select a device
      */
-    devicesFound?: (devices: Array<USBDevice>) => Promise<USBDevice | void>;
-}
-/**
- * @hidden
- */
-export declare type USBEvents = {
+    devicesFound?: (devices: USBDevice[]) => Promise<USBDevice | void>;
+    /**
+     * Optional array of preconfigured allowed devices
+     */
+    allowedDevices?: USBDeviceFilter[];
     /**
-     * USBDevice connected event
+     * Optional flag to automatically allow all devices
      */
-    connect: USBConnectionEvent;
+    allowAllDevices?: boolean;
     /**
-     * USBDevice disconnected event
+     * Optional timeout (in milliseconds) to use for the device control transfers
      */
-    disconnect: USBConnectionEvent;
-};
-export declare class WebUSB extends TypedEventTarget<USBEvents> implements USB {
+    deviceTimeout?: number;
+}
+/**
+ * Convenience method to get the WebUSB interface available
+ */
+export declare const getWebUsb: () => USB;
+export declare class WebUSB implements USB {
     private options;
-    private allowedDevices;
+    protected emitter: EventEmitter;
+    protected knownDevices: Map<string, USBDevice>;
+    protected allowedDevices: USBDeviceFilter[];
     constructor(options?: USBOptions);
-    set onconnect(listener: (event: USBConnectionEvent) => void);
-    set ondisconnect(listener: (event: USBConnectionEvent) => void);
+    private _onconnect;
+    set onconnect(fn: (ev: USBConnectionEvent) => void);
+    private _ondisconnect;
+    set ondisconnect(fn: (ev: USBConnectionEvent) => void);
+    addEventListener(type: 'connect' | 'disconnect', listener: (this: this, ev: USBConnectionEvent) => void): void;
+    addEventListener(type: 'connect' | 'disconnect', listener: EventListener): void;
+    removeEventListener(type: 'connect' | 'disconnect', callback: (this: this, ev: USBConnectionEvent) => void): void;
+    removeEventListener(type: 'connect' | 'disconnect', callback: EventListener): void;
+    dispatchEvent(_event: Event): boolean;
     /**
      * Requests a single Web USB device
      * @param options The options to use when scanning
@@ -41,7 +54,7 @@ export declare class WebUSB extends TypedEventTarget<USBEvents> implements USB {
     getDevices(): Promise<USBDevice[]>;
     private loadDevices;
     private preFilterDevices;
-    private isSameDevice;
-    private replaceAllowedDevice;
     private filterDevice;
+    private getDeviceId;
+    private isAllowedDevice;
 }