usb 2.11.0 → 2.12.0
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/CHANGELOG.md +16 -0
- package/README.md +1 -1
- package/binding.gyp +3 -0
- package/dist/usb/device.js +2 -1
- package/dist/usb/device.js.map +1 -1
- package/dist/usb/endpoint.d.ts +3 -0
- package/dist/usb/endpoint.js +5 -2
- package/dist/usb/endpoint.js.map +1 -1
- package/dist/usb/index.js +6 -3
- package/dist/usb/index.js.map +1 -1
- package/dist/usb/interface.d.ts +2 -0
- package/dist/usb/interface.js +3 -0
- package/dist/usb/interface.js.map +1 -1
- package/dist/webusb/webusb-device.d.ts +5 -0
- package/dist/webusb/webusb-device.js +29 -20
- package/dist/webusb/webusb-device.js.map +1 -1
- package/package.json +4 -4
- package/prebuilds/android-arm/usb.armv7.node +0 -0
- package/prebuilds/android-arm64/usb.armv8.node +0 -0
- package/prebuilds/darwin-x64+arm64/usb.node +0 -0
- package/prebuilds/linux-arm/usb.armv6.node +0 -0
- package/prebuilds/linux-arm/usb.armv7.node +0 -0
- package/prebuilds/linux-arm64/usb.armv8.node +0 -0
- package/prebuilds/linux-ia32/usb.node +0 -0
- package/prebuilds/linux-x64/usb.glibc.node +0 -0
- package/prebuilds/linux-x64/usb.musl.node +0 -0
- package/prebuilds/win32-arm64/usb.node +0 -0
- package/prebuilds/win32-ia32/{node.napi.node → usb.node} +0 -0
- package/prebuilds/win32-x64/{node.napi.node → usb.node} +0 -0
- package/test/webusb.coffee +9 -0
- package/prebuilds/android-arm/node.napi.armv7.node +0 -0
- package/prebuilds/android-arm64/node.napi.armv8.node +0 -0
- package/prebuilds/darwin-x64+arm64/node.napi.node +0 -0
- package/prebuilds/linux-arm/node.napi.armv6.node +0 -0
- package/prebuilds/linux-arm/node.napi.armv7.node +0 -0
- package/prebuilds/linux-arm64/node.napi.armv8.node +0 -0
- package/prebuilds/linux-ia32/node.napi.node +0 -0
- package/prebuilds/linux-x64/node.napi.glibc.node +0 -0
- package/prebuilds/linux-x64/node.napi.musl.node +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [2.12.0] - 2024-03-02
|
|
4
|
+
|
|
5
|
+
#### Added
|
|
6
|
+
- Added prebuilt binary for Windows Arm64 - [`735`](https://github.com/node-usb/node-usb/pull/735) ([Rob Moran](https://github.com/thegecko))
|
|
7
|
+
- Added exception handling - [`738`](https://github.com/node-usb/node-usb/pull/738) ([Rob Moran](https://github.com/thegecko))
|
|
8
|
+
- Added exception when trying to transfer and device is closed - [`715`](https://github.com/node-usb/node-usb/pull/715) ([Rob Moran](https://github.com/thegecko))
|
|
9
|
+
|
|
10
|
+
### Changed
|
|
11
|
+
- Precreate async transfer functions to increase speed - [`725`](https://github.com/node-usb/node-usb/pull/725) ([Cosmin Tanislav](https://github.com/Demon000))
|
|
12
|
+
- Precreate all other async functions to increase speed - [`730`](https://github.com/node-usb/node-usb/pull/730) ([Rob Moran](https://github.com/thegecko))
|
|
13
|
+
|
|
14
|
+
### Fixed
|
|
15
|
+
- Explicitly set configuration in WebUSB for vendor-specific devices on macos - [`739`](https://github.com/node-usb/node-usb/pull/739) ([Jouni Airaksinen](https://github.com/jounii))
|
|
16
|
+
- Handle exception when loading library on WSL - [`726`](https://github.com/node-usb/node-usb/pull/726) ([Julian Waller](https://github.com/Julusian))
|
|
17
|
+
- Comment typo fix - [`723`](https://github.com/node-usb/node-usb/pull/723) ([koji](https://github.com/koji))
|
|
18
|
+
|
|
3
19
|
## [2.11.0] - 2023-10-02
|
|
4
20
|
|
|
5
21
|
### Fixed
|
package/README.md
CHANGED
package/binding.gyp
CHANGED
package/dist/usb/device.js
CHANGED
|
@@ -61,10 +61,11 @@ class ExtendedDevice {
|
|
|
61
61
|
*/
|
|
62
62
|
open(defaultConfig = true) {
|
|
63
63
|
this.__open();
|
|
64
|
+
// The presence of interfaces is used to determine if the device is open
|
|
65
|
+
this.interfaces = [];
|
|
64
66
|
if (defaultConfig === false) {
|
|
65
67
|
return;
|
|
66
68
|
}
|
|
67
|
-
this.interfaces = [];
|
|
68
69
|
const len = this.configDescriptor ? this.configDescriptor.interfaces.length : 0;
|
|
69
70
|
for (let i = 0; i < len; i++) {
|
|
70
71
|
this.interfaces[i] = new interface_1.Interface(this, i);
|
package/dist/usb/device.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../tsc/usb/device.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2CAAwC;AACxC,6CAA0C;AAG1C,MAAM,QAAQ,GAAG,CAAC,GAAoC,EAAqB,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,YAAY,UAAU,CAAC;AACjH,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAa,cAAc;IAA3B;QAMY,aAAQ,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../tsc/usb/device.ts"],"names":[],"mappings":"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"}
|
package/dist/usb/endpoint.d.ts
CHANGED
|
@@ -36,6 +36,7 @@ export declare class InEndpoint extends Endpoint {
|
|
|
36
36
|
protected pollTransferSize: number;
|
|
37
37
|
protected pollPending: number;
|
|
38
38
|
pollActive: boolean;
|
|
39
|
+
transferAsync: (length: number) => Promise<Buffer | undefined>;
|
|
39
40
|
constructor(device: Device, descriptor: EndpointDescriptor);
|
|
40
41
|
/**
|
|
41
42
|
* Perform a transfer to read data from the endpoint.
|
|
@@ -76,6 +77,8 @@ export declare class InEndpoint extends Endpoint {
|
|
|
76
77
|
export declare class OutEndpoint extends Endpoint {
|
|
77
78
|
/** Endpoint direction. */
|
|
78
79
|
direction: 'in' | 'out';
|
|
80
|
+
transferAsync: (buffer: Buffer) => Promise<number>;
|
|
81
|
+
constructor(device: Device, descriptor: EndpointDescriptor);
|
|
79
82
|
/**
|
|
80
83
|
* Perform a transfer to write `data` to the endpoint.
|
|
81
84
|
*
|
package/dist/usb/endpoint.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.OutEndpoint = exports.InEndpoint = exports.Endpoint = void 0;
|
|
4
4
|
const events_1 = require("events");
|
|
5
5
|
const bindings_1 = require("./bindings");
|
|
6
|
+
const util_1 = require("util");
|
|
6
7
|
const isBuffer = (obj) => obj && obj instanceof Uint8Array;
|
|
7
8
|
/** Common base for InEndpoint and OutEndpoint. */
|
|
8
9
|
class Endpoint extends events_1.EventEmitter {
|
|
@@ -43,6 +44,7 @@ class InEndpoint extends Endpoint {
|
|
|
43
44
|
this.pollTransferSize = 0;
|
|
44
45
|
this.pollPending = 0;
|
|
45
46
|
this.pollActive = false;
|
|
47
|
+
this.transferAsync = util_1.promisify(this.transfer).bind(this);
|
|
46
48
|
}
|
|
47
49
|
/**
|
|
48
50
|
* Perform a transfer to read data from the endpoint.
|
|
@@ -166,10 +168,11 @@ class InEndpoint extends Endpoint {
|
|
|
166
168
|
exports.InEndpoint = InEndpoint;
|
|
167
169
|
/** Endpoints in the OUT direction (PC->device) have this type. */
|
|
168
170
|
class OutEndpoint extends Endpoint {
|
|
169
|
-
constructor() {
|
|
170
|
-
super(
|
|
171
|
+
constructor(device, descriptor) {
|
|
172
|
+
super(device, descriptor);
|
|
171
173
|
/** Endpoint direction. */
|
|
172
174
|
this.direction = 'out';
|
|
175
|
+
this.transferAsync = util_1.promisify(this.transfer).bind(this);
|
|
173
176
|
}
|
|
174
177
|
/**
|
|
175
178
|
* Perform a transfer to write `data` to the endpoint.
|
package/dist/usb/endpoint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../tsc/usb/endpoint.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,yCAA0F;
|
|
1
|
+
{"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../tsc/usb/endpoint.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,yCAA0F;AAE1F,+BAAiC;AAEjC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAqB,EAAE,CAAC,GAAG,IAAI,GAAG,YAAY,UAAU,CAAC;AAEpG,kDAAkD;AAClD,MAAsB,QAAS,SAAQ,qBAAY;IAe/C,YAAsB,MAAc,EAAE,UAA8B;QAChE,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAQ;QANpC,8GAA8G;QACvG,YAAO,GAAG,CAAC,CAAC;QAOf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,gBAAgB,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;IACvD,CAAC;IAED,wDAAwD;IACjD,SAAS,CAAC,QAAsD;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;;;OAQG;IACI,YAAY,CAAC,OAAe,EAAE,QAA4F;QAC7H,OAAO,IAAI,mBAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzF,CAAC;CACJ;AAvCD,4BAuCC;AAED,iEAAiE;AACjE,MAAa,UAAW,SAAQ,QAAQ;IAYpC,YAAY,MAAc,EAAE,UAA8B;QACtD,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAX9B,0BAA0B;QACnB,cAAS,GAAiB,IAAI,CAAC;QAE5B,kBAAa,GAAe,EAAE,CAAC;QAC/B,qBAAgB,GAAG,CAAC,CAAC;QACrB,gBAAW,GAAG,CAAC,CAAC;QACnB,eAAU,GAAG,KAAK,CAAC;QAMtB,IAAI,CAAC,aAAa,GAAG,gBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;;;OAUG;IACI,QAAQ,CAAC,MAAc,EAAE,QAAqE;QACjG,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEpC,MAAM,EAAE,GAAG,CAAC,KAAkC,EAAE,OAAgB,EAAE,YAAqB,EAAE,EAAE;YACvF,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,IAAI;YACA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAClD;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;;;;OAUG;IACI,SAAS,CAAC,UAAmB,EAAE,YAAqB,EAAE,QAAiH;QAC1K,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAE,QAAkB,EAAE,MAAc,EAAE,YAAoB,EAAE,EAAE;YAClH,IAAI,CAAC,KAAK,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;aACpD;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,oCAAyB,EAAE;gBAClD,IAAI,IAAI,CAAC,UAAU,EAAE;oBACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBAC1B,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnB;aACJ;YAED,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,aAAa,CAAC,QAAQ,CAAC,CAAC;aAC3B;iBAAM;gBACH,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnB,IAAI,IAAI,CAAC,WAAW,KAAK,CAAC,EAAE;oBACxB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;oBACxB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;oBACxB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACjB,IAAI,QAAQ,EAAE;wBACV,MAAM,SAAS,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,MAAK,oCAAyB,CAAC;wBAC7D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;qBAC5E;iBACJ;aACJ;QACL,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,EAAE;YACzC,IAAI;gBACA,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;oBACjF,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;gBACxD,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBACtB,IAAI,CAAC,QAAQ,EAAE,CAAC;aACnB;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,EAAE,UAA0B,KAAK,EAAE,MAAM,EAAE,YAAY;YACxH,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;QAC7C,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAES,kBAAkB,CAAC,UAAU,GAAG,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,QAA4F;QACpL,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAErB,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;SAC3B;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;;;;OAOG;IACI,QAAQ,CAAC,QAAqB;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC7C;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,IAAI;gBACA,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;aAClC;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aAC7B;SACJ;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;CACJ;AA5ID,gCA4IC;AAED,kEAAkE;AAClE,MAAa,WAAY,SAAQ,QAAQ;IAOrC,YAAmB,MAAc,EAAE,UAA8B;QAC7D,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAN9B,0BAA0B;QACnB,cAAS,GAAiB,KAAK,CAAC;QAMnC,IAAI,CAAC,aAAa,GAAG,gBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;;;OAUG;IACI,QAAQ,CAAC,MAAc,EAAE,QAAuE;QACnG,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC5B;aAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC1B,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,MAAM,EAAE,GAAG,CAAC,KAAkC,EAAE,OAAgB,EAAE,MAAe,EAAE,EAAE;YACjF,IAAI,QAAQ,EAAE;gBACV,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;aAC3C;QACL,CAAC,CAAC;QAEF,IAAI;YACA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,eAAe,CAAC,MAAc,EAAE,QAAsD;QACzF,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE;YACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;SAC5C;aAAM;YACH,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;CACJ;AArDD,kCAqDC"}
|
package/dist/usb/index.js
CHANGED
|
@@ -15,9 +15,12 @@ Object.defineProperty(usb, 'pollHotplugDelay', {
|
|
|
15
15
|
value: 500,
|
|
16
16
|
writable: true
|
|
17
17
|
});
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
// `usb.Device` is not defined when `usb.INIT_ERROR` is true
|
|
19
|
+
if (usb.Device) {
|
|
20
|
+
Object.getOwnPropertyNames(device_1.ExtendedDevice.prototype).forEach(name => {
|
|
21
|
+
Object.defineProperty(usb.Device.prototype, name, Object.getOwnPropertyDescriptor(device_1.ExtendedDevice.prototype, name) || Object.create(null));
|
|
22
|
+
});
|
|
23
|
+
}
|
|
21
24
|
// Devices delta support for non-libusb hotplug events
|
|
22
25
|
let hotPlugDevices = new Set();
|
|
23
26
|
// This method needs to be used for attach/detach IDs (hotplugSupportType === 2) rather than a lookup because vid/pid are not unique
|
package/dist/usb/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":";AAAA,mCAAsC;AACtC,qCAA0C;AAC1C,kCAAkC;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;AACnD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE;IACtC,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,IAAI;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE;IAC3C,KAAK,EAAE,GAAG;IACV,QAAQ,EAAE,IAAI;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,mBAAmB,CAAC,uBAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}
|
package/dist/usb/interface.d.ts
CHANGED
|
@@ -12,6 +12,8 @@ export declare class Interface {
|
|
|
12
12
|
descriptor: InterfaceDescriptor;
|
|
13
13
|
/** List of endpoints on this interface: InEndpoint and OutEndpoint objects. */
|
|
14
14
|
endpoints: Endpoint[];
|
|
15
|
+
releaseAsync: () => Promise<void>;
|
|
16
|
+
setAltSettingAsync: (alternateSetting: number) => Promise<void>;
|
|
15
17
|
constructor(device: Device, id: number);
|
|
16
18
|
protected refresh(): void;
|
|
17
19
|
/**
|
package/dist/usb/interface.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Interface = void 0;
|
|
4
4
|
const bindings_1 = require("./bindings");
|
|
5
5
|
const endpoint_1 = require("./endpoint");
|
|
6
|
+
const util_1 = require("util");
|
|
6
7
|
class Interface {
|
|
7
8
|
constructor(device, id) {
|
|
8
9
|
this.device = device;
|
|
@@ -10,6 +11,8 @@ class Interface {
|
|
|
10
11
|
/** Integer alternate setting number. */
|
|
11
12
|
this.altSetting = 0;
|
|
12
13
|
this.refresh();
|
|
14
|
+
this.releaseAsync = util_1.promisify(this.release).bind(this);
|
|
15
|
+
this.setAltSettingAsync = util_1.promisify(this.setAltSetting).bind(this);
|
|
13
16
|
}
|
|
14
17
|
refresh() {
|
|
15
18
|
if (!this.device.configDescriptor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../tsc/usb/interface.ts"],"names":[],"mappings":";;;AAAA,yCAAyE;AAEzE,yCAA+D;
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../tsc/usb/interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,10 @@ export declare class WebUSBDevice implements USBDevice {
|
|
|
21
21
|
productName?: string | undefined;
|
|
22
22
|
serialNumber?: string | undefined;
|
|
23
23
|
configurations: USBConfiguration[];
|
|
24
|
+
private controlTransferAsync;
|
|
25
|
+
private setConfigurationAsync;
|
|
26
|
+
private resetAsync;
|
|
27
|
+
private getStringDescriptorAsync;
|
|
24
28
|
private constructor();
|
|
25
29
|
get configuration(): USBConfiguration | undefined;
|
|
26
30
|
get opened(): boolean;
|
|
@@ -46,4 +50,5 @@ export declare class WebUSBDevice implements USBDevice {
|
|
|
46
50
|
private getEndpoint;
|
|
47
51
|
private controlTransferParamsToType;
|
|
48
52
|
private _releaseInterface;
|
|
53
|
+
private checkDeviceOpen;
|
|
49
54
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.WebUSBDevice = void 0;
|
|
4
4
|
const usb = require("../usb");
|
|
5
5
|
const util_1 = require("util");
|
|
6
|
+
const os_1 = require("os");
|
|
6
7
|
const LIBUSB_TRANSFER_TYPE_MASK = 0x03;
|
|
7
8
|
const ENDPOINT_NUMBER_MASK = 0x7f;
|
|
8
9
|
const CLEAR_FEATURE = 0x01;
|
|
@@ -27,6 +28,10 @@ class WebUSBDevice {
|
|
|
27
28
|
this.deviceVersionMajor = deviceVersion.major;
|
|
28
29
|
this.deviceVersionMinor = deviceVersion.minor;
|
|
29
30
|
this.deviceVersionSubminor = deviceVersion.sub;
|
|
31
|
+
this.controlTransferAsync = util_1.promisify(this.device.controlTransfer).bind(this.device);
|
|
32
|
+
this.setConfigurationAsync = util_1.promisify(this.device.setConfiguration).bind(this.device);
|
|
33
|
+
this.resetAsync = util_1.promisify(this.device.reset).bind(this.device);
|
|
34
|
+
this.getStringDescriptorAsync = util_1.promisify(this.device.getStringDescriptor).bind(this.device);
|
|
30
35
|
}
|
|
31
36
|
static async createInstance(device) {
|
|
32
37
|
const instance = new WebUSBDevice(device);
|
|
@@ -94,8 +99,7 @@ class WebUSBDevice {
|
|
|
94
99
|
throw new Error('selectConfiguration error: configuration not found');
|
|
95
100
|
}
|
|
96
101
|
try {
|
|
97
|
-
|
|
98
|
-
await setConfiguration(configurationValue);
|
|
102
|
+
await this.setConfigurationAsync(configurationValue);
|
|
99
103
|
}
|
|
100
104
|
catch (error) {
|
|
101
105
|
throw new Error(`selectConfiguration error: ${error}`);
|
|
@@ -160,8 +164,7 @@ class WebUSBDevice {
|
|
|
160
164
|
}
|
|
161
165
|
try {
|
|
162
166
|
const iface = this.device.interface(interfaceNumber);
|
|
163
|
-
|
|
164
|
-
await setAltSetting(alternateSetting);
|
|
167
|
+
await iface.setAltSettingAsync(alternateSetting);
|
|
165
168
|
}
|
|
166
169
|
catch (error) {
|
|
167
170
|
throw new Error(`selectAlternateInterface error: ${error}`);
|
|
@@ -169,9 +172,9 @@ class WebUSBDevice {
|
|
|
169
172
|
}
|
|
170
173
|
async controlTransferIn(setup, length) {
|
|
171
174
|
try {
|
|
175
|
+
this.checkDeviceOpen();
|
|
172
176
|
const type = this.controlTransferParamsToType(setup, usb.LIBUSB_ENDPOINT_IN);
|
|
173
|
-
const
|
|
174
|
-
const result = await controlTransfer(type, setup.request, setup.value, setup.index, length);
|
|
177
|
+
const result = await this.controlTransferAsync(type, setup.request, setup.value, setup.index, length);
|
|
175
178
|
return {
|
|
176
179
|
data: result ? new DataView(new Uint8Array(result).buffer) : undefined,
|
|
177
180
|
status: 'ok'
|
|
@@ -193,10 +196,10 @@ class WebUSBDevice {
|
|
|
193
196
|
}
|
|
194
197
|
async controlTransferOut(setup, data) {
|
|
195
198
|
try {
|
|
199
|
+
this.checkDeviceOpen();
|
|
196
200
|
const type = this.controlTransferParamsToType(setup, usb.LIBUSB_ENDPOINT_OUT);
|
|
197
|
-
const controlTransfer = util_1.promisify(this.device.controlTransfer).bind(this.device);
|
|
198
201
|
const buffer = data ? Buffer.from(data) : Buffer.alloc(0);
|
|
199
|
-
const bytesWritten = await
|
|
202
|
+
const bytesWritten = await this.controlTransferAsync(type, setup.request, setup.value, setup.index, buffer);
|
|
200
203
|
return {
|
|
201
204
|
bytesWritten,
|
|
202
205
|
status: 'ok'
|
|
@@ -215,8 +218,7 @@ class WebUSBDevice {
|
|
|
215
218
|
async clearHalt(direction, endpointNumber) {
|
|
216
219
|
try {
|
|
217
220
|
const wIndex = endpointNumber | (direction === 'in' ? usb.LIBUSB_ENDPOINT_IN : usb.LIBUSB_ENDPOINT_OUT);
|
|
218
|
-
|
|
219
|
-
await controlTransfer(usb.LIBUSB_RECIPIENT_ENDPOINT, CLEAR_FEATURE, ENDPOINT_HALT, wIndex, Buffer.from(new Uint8Array()));
|
|
221
|
+
await this.controlTransferAsync(usb.LIBUSB_RECIPIENT_ENDPOINT, CLEAR_FEATURE, ENDPOINT_HALT, wIndex, Buffer.from(new Uint8Array()));
|
|
220
222
|
}
|
|
221
223
|
catch (error) {
|
|
222
224
|
throw new Error(`clearHalt error: ${error}`);
|
|
@@ -224,9 +226,9 @@ class WebUSBDevice {
|
|
|
224
226
|
}
|
|
225
227
|
async transferIn(endpointNumber, length) {
|
|
226
228
|
try {
|
|
229
|
+
this.checkDeviceOpen();
|
|
227
230
|
const endpoint = this.getEndpoint(endpointNumber | usb.LIBUSB_ENDPOINT_IN);
|
|
228
|
-
const
|
|
229
|
-
const result = await transfer(length);
|
|
231
|
+
const result = await endpoint.transferAsync(length);
|
|
230
232
|
return {
|
|
231
233
|
data: result ? new DataView(new Uint8Array(result).buffer) : undefined,
|
|
232
234
|
status: 'ok'
|
|
@@ -248,10 +250,10 @@ class WebUSBDevice {
|
|
|
248
250
|
}
|
|
249
251
|
async transferOut(endpointNumber, data) {
|
|
250
252
|
try {
|
|
253
|
+
this.checkDeviceOpen();
|
|
251
254
|
const endpoint = this.getEndpoint(endpointNumber | usb.LIBUSB_ENDPOINT_OUT);
|
|
252
|
-
const transfer = util_1.promisify(endpoint.transfer).bind(endpoint);
|
|
253
255
|
const buffer = Buffer.from(data);
|
|
254
|
-
const bytesWritten = await
|
|
256
|
+
const bytesWritten = await endpoint.transferAsync(buffer);
|
|
255
257
|
return {
|
|
256
258
|
bytesWritten,
|
|
257
259
|
status: 'ok'
|
|
@@ -269,8 +271,7 @@ class WebUSBDevice {
|
|
|
269
271
|
}
|
|
270
272
|
async reset() {
|
|
271
273
|
try {
|
|
272
|
-
|
|
273
|
-
await reset();
|
|
274
|
+
await this.resetAsync();
|
|
274
275
|
}
|
|
275
276
|
catch (error) {
|
|
276
277
|
throw new Error(`reset error: ${error}`);
|
|
@@ -289,6 +290,11 @@ class WebUSBDevice {
|
|
|
289
290
|
try {
|
|
290
291
|
if (!this.opened) {
|
|
291
292
|
this.device.open();
|
|
293
|
+
// Explicitly set configuration for vendor-specific devices on macos
|
|
294
|
+
// https://github.com/node-usb/node-usb/issues/61
|
|
295
|
+
if (this.deviceClass === 0xff && os_1.platform() === 'darwin') {
|
|
296
|
+
await this.setConfigurationAsync(1);
|
|
297
|
+
}
|
|
292
298
|
}
|
|
293
299
|
this.manufacturerName = await this.getStringDescriptor(this.device.deviceDescriptor.iManufacturer);
|
|
294
300
|
this.productName = await this.getStringDescriptor(this.device.deviceDescriptor.iProduct);
|
|
@@ -314,8 +320,7 @@ class WebUSBDevice {
|
|
|
314
320
|
}
|
|
315
321
|
async getStringDescriptor(index) {
|
|
316
322
|
try {
|
|
317
|
-
const
|
|
318
|
-
const buffer = await getStringDescriptor(index);
|
|
323
|
+
const buffer = await this.getStringDescriptorAsync(index);
|
|
319
324
|
return buffer ? buffer.toString() : '';
|
|
320
325
|
}
|
|
321
326
|
catch (error) {
|
|
@@ -406,13 +411,17 @@ class WebUSBDevice {
|
|
|
406
411
|
}
|
|
407
412
|
try {
|
|
408
413
|
const iface = this.device.interface(interfaceNumber);
|
|
409
|
-
|
|
410
|
-
await release();
|
|
414
|
+
await iface.releaseAsync();
|
|
411
415
|
}
|
|
412
416
|
catch (error) {
|
|
413
417
|
throw new Error(`releaseInterface error: ${error}`);
|
|
414
418
|
}
|
|
415
419
|
}
|
|
420
|
+
checkDeviceOpen() {
|
|
421
|
+
if (!this.opened) {
|
|
422
|
+
throw new Error('The device must be opened first');
|
|
423
|
+
}
|
|
424
|
+
}
|
|
416
425
|
}
|
|
417
426
|
exports.WebUSBDevice = WebUSBDevice;
|
|
418
427
|
//# sourceMappingURL=webusb-device.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webusb-device.js","sourceRoot":"","sources":["../../tsc/webusb/webusb-device.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"webusb-device.js","sourceRoot":"","sources":["../../tsc/webusb/webusb-device.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "usb",
|
|
3
3
|
"description": "Library to access USB devices",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "2.
|
|
5
|
+
"version": "2.12.0",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"engines": {
|
|
8
8
|
"node": ">=12.22.0 <13.0 || >=14.17.0"
|
|
@@ -57,14 +57,14 @@
|
|
|
57
57
|
"node-gyp-build": "^4.5.0"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@types/node": "^20.
|
|
60
|
+
"@types/node": "^20.11.20",
|
|
61
61
|
"@typescript-eslint/eslint-plugin": "^5.45.1",
|
|
62
62
|
"@typescript-eslint/parser": "^5.45.1",
|
|
63
63
|
"coffeescript": "^2.7.0",
|
|
64
64
|
"eslint": "^8.29.0",
|
|
65
65
|
"mocha": "^10.1.0",
|
|
66
|
-
"node-gyp": "^
|
|
67
|
-
"prebuildify": "^
|
|
66
|
+
"node-gyp": "^10.0.1",
|
|
67
|
+
"prebuildify": "^6.0.0",
|
|
68
68
|
"prebuildify-ci": "^1.0.5",
|
|
69
69
|
"prebuildify-cross": "^5.0.0",
|
|
70
70
|
"typedoc": "^0.22.10",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/test/webusb.coffee
CHANGED
|
@@ -171,6 +171,15 @@ describe 'Alternates', ->
|
|
|
171
171
|
after ->
|
|
172
172
|
device.close()
|
|
173
173
|
|
|
174
|
+
describe 'Throwing Transfers', ->
|
|
175
|
+
device = null
|
|
176
|
+
|
|
177
|
+
before ->
|
|
178
|
+
device = await webusb.requestDevice({ filters: [{ vendorId: 0x59e3 }] });
|
|
179
|
+
|
|
180
|
+
it 'should fail transfer unless opened', ->
|
|
181
|
+
assert.rejects(device.transferIn(1, 64), 'The device must be opened first')
|
|
182
|
+
|
|
174
183
|
describe 'Transfers', ->
|
|
175
184
|
device = null
|
|
176
185
|
b = Uint8Array.from([0x30...0x40]).buffer
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|