usb 3.0.0-alpha.6 → 3.0.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/README.md CHANGED
@@ -8,6 +8,8 @@ Node.JS library for communicating with USB devices.
8
8
 
9
9
  This is a complete rewrite in rust using [@kevinmehall](https://github.com/kevinmehall)'s excellent [nusb library](https://docs.rs/nusb/latest/nusb) and [napi-rs](https://napi.rs/).
10
10
 
11
+ For the previous v2.x.x version of node-usb, please see https://github.com/node-usb/node-usb.
12
+
11
13
  # License
12
14
  [MIT](LICENSE.md)
13
15
 
@@ -151,11 +153,13 @@ If using a packaging system for electron, ensure the `node-usb` library does not
151
153
  - npmRebuild: false
152
154
 
153
155
  # APIs
154
- Since `v3.0.0`, the `node-usb` API follows the WebUSB specification which can be found here:
156
+ Since `v3.0.0`, the API exclusively follows the WebUSB specification which can be found here:
155
157
 
156
158
  https://wicg.github.io/webusb/
157
159
 
158
- Two versions of the WebUSB API exist by default:
160
+ If you want to use the older `Legacy API`, please install [v2.x.x of node-usb](https://github.com/node-usb/node-usb).
161
+
162
+ Two versions of the API exist by default:
159
163
 
160
164
  - `usb` - which exposes all functionality in an unrestricted manner (e.g. without needing to `requestDevice()` first)
161
165
  - `webusb` - which follows the WebUSB specification exactly and requires the user to authorise devices via `requestDevice()` first.
package/dist/index.d.ts CHANGED
@@ -35,6 +35,7 @@ declare class WebUSB extends EventTarget implements USB {
35
35
  protected nativeEmitter: Emitter;
36
36
  protected authorisedDevices: Set<USBDeviceFilter>;
37
37
  protected listenerCount: number;
38
+ protected eventListeners: Map<string, Set<EventListener>>;
38
39
  protected knownDevices: Map<string, UsbDevice>;
39
40
  constructor(options?: USBOptions);
40
41
  private deviceConnectCallback;
package/dist/index.js CHANGED
@@ -102,6 +102,7 @@ class WebUSB extends EventTarget {
102
102
  this.nativeEmitter = new index_js_1.Emitter();
103
103
  this.authorisedDevices = new Set();
104
104
  this.listenerCount = 0;
105
+ this.eventListeners = new Map();
105
106
  this.knownDevices = new Map();
106
107
  this.deviceConnectCallback = async (device) => {
107
108
  this.knownDevices.set(device.handle, device);
@@ -126,9 +127,15 @@ class WebUSB extends EventTarget {
126
127
  if (type !== 'connect' && type !== 'disconnect') {
127
128
  return;
128
129
  }
130
+ const existingListeners = this.eventListeners.get(type) || new Set();
131
+ const hadListeners = this.listenerCount > 0;
129
132
  super.addEventListener(type, listener);
130
- this.listenerCount++;
131
- if (this.listenerCount === 1) {
133
+ if (!existingListeners.has(listener)) {
134
+ existingListeners.add(listener);
135
+ this.eventListeners.set(type, existingListeners);
136
+ this.listenerCount++;
137
+ }
138
+ if (!hadListeners && this.listenerCount > 0) {
132
139
  this.nativeEmitter.addAttach(this.deviceConnectCallback);
133
140
  this.nativeEmitter.addDetach(this.deviceDisconnectCallback);
134
141
  (0, index_js_1.nativeGetDevices)().then(devices => devices.forEach(device => this.knownDevices.set(device.handle, device)));
@@ -138,9 +145,16 @@ class WebUSB extends EventTarget {
138
145
  if (type !== 'connect' && type !== 'disconnect') {
139
146
  return;
140
147
  }
148
+ const existingListeners = this.eventListeners.get(type);
149
+ const removed = existingListeners ? existingListeners.delete(callback) : false;
141
150
  super.removeEventListener(type, callback);
142
- this.listenerCount--;
143
- if (this.listenerCount === 0) {
151
+ if (removed) {
152
+ this.listenerCount--;
153
+ if (existingListeners && existingListeners.size === 0) {
154
+ this.eventListeners.delete(type);
155
+ }
156
+ }
157
+ if (removed && this.listenerCount === 0) {
144
158
  this.nativeEmitter.removeAttach();
145
159
  this.nativeEmitter.removeDetach();
146
160
  this.knownDevices.clear();
@@ -204,25 +218,20 @@ class WebUSB extends EventTarget {
204
218
  if (devices.length === 0) {
205
219
  throw new NamedError('Failed to execute \'requestDevice\' on \'USB\': No device selected.', 'NotFoundError');
206
220
  }
207
- try {
208
- // If no devicesFound function, select the first device found
209
- const device = this.options.devicesFound ? await this.options.devicesFound(devices) : devices[0];
210
- if (!device) {
211
- throw new NamedError('Failed to execute \'requestDevice\' on \'USB\': No device selected.', 'NotFoundError');
212
- }
213
- this.authorisedDevices.add({
214
- vendorId: device.vendorId,
215
- productId: device.productId,
216
- classCode: device.deviceClass,
217
- subclassCode: device.deviceSubclass,
218
- protocolCode: device.deviceProtocol,
219
- serialNumber: device.serialNumber || undefined
220
- });
221
- return device;
222
- }
223
- catch (error) {
221
+ // If no devicesFound function, select the first device found
222
+ const device = this.options.devicesFound ? await this.options.devicesFound(devices) : devices[0];
223
+ if (!device) {
224
224
  throw new NamedError('Failed to execute \'requestDevice\' on \'USB\': No device selected.', 'NotFoundError');
225
225
  }
226
+ this.authorisedDevices.add({
227
+ vendorId: device.vendorId,
228
+ productId: device.productId,
229
+ classCode: device.deviceClass,
230
+ subclassCode: device.deviceSubclass,
231
+ protocolCode: device.deviceProtocol,
232
+ serialNumber: device.serialNumber || undefined
233
+ });
234
+ return device;
226
235
  }
227
236
  /**
228
237
  * Gets all allowed Web USB devices which are connected
package/index.js CHANGED
@@ -77,8 +77,8 @@ function requireNative() {
77
77
  try {
78
78
  const binding = require('@node-usb/usb-android-arm64')
79
79
  const bindingPackageVersion = require('@node-usb/usb-android-arm64/package.json').version
80
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
81
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
80
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
81
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
82
82
  }
83
83
  return binding
84
84
  } catch (e) {
@@ -93,8 +93,8 @@ function requireNative() {
93
93
  try {
94
94
  const binding = require('@node-usb/usb-android-arm-eabi')
95
95
  const bindingPackageVersion = require('@node-usb/usb-android-arm-eabi/package.json').version
96
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
97
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
96
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
97
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
98
98
  }
99
99
  return binding
100
100
  } catch (e) {
@@ -114,8 +114,8 @@ function requireNative() {
114
114
  try {
115
115
  const binding = require('@node-usb/usb-win32-x64-gnu')
116
116
  const bindingPackageVersion = require('@node-usb/usb-win32-x64-gnu/package.json').version
117
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
118
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
117
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
118
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
119
119
  }
120
120
  return binding
121
121
  } catch (e) {
@@ -130,8 +130,8 @@ function requireNative() {
130
130
  try {
131
131
  const binding = require('@node-usb/usb-win32-x64-msvc')
132
132
  const bindingPackageVersion = require('@node-usb/usb-win32-x64-msvc/package.json').version
133
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
134
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
133
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
134
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
135
135
  }
136
136
  return binding
137
137
  } catch (e) {
@@ -147,8 +147,8 @@ function requireNative() {
147
147
  try {
148
148
  const binding = require('@node-usb/usb-win32-ia32-msvc')
149
149
  const bindingPackageVersion = require('@node-usb/usb-win32-ia32-msvc/package.json').version
150
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
151
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
150
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
151
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
152
152
  }
153
153
  return binding
154
154
  } catch (e) {
@@ -163,8 +163,8 @@ function requireNative() {
163
163
  try {
164
164
  const binding = require('@node-usb/usb-win32-arm64-msvc')
165
165
  const bindingPackageVersion = require('@node-usb/usb-win32-arm64-msvc/package.json').version
166
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
167
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
166
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
167
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
168
168
  }
169
169
  return binding
170
170
  } catch (e) {
@@ -182,8 +182,8 @@ function requireNative() {
182
182
  try {
183
183
  const binding = require('@node-usb/usb-darwin-universal')
184
184
  const bindingPackageVersion = require('@node-usb/usb-darwin-universal/package.json').version
185
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
186
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
185
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
186
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
187
187
  }
188
188
  return binding
189
189
  } catch (e) {
@@ -198,8 +198,8 @@ function requireNative() {
198
198
  try {
199
199
  const binding = require('@node-usb/usb-darwin-x64')
200
200
  const bindingPackageVersion = require('@node-usb/usb-darwin-x64/package.json').version
201
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
202
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
201
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
202
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
203
203
  }
204
204
  return binding
205
205
  } catch (e) {
@@ -214,8 +214,8 @@ function requireNative() {
214
214
  try {
215
215
  const binding = require('@node-usb/usb-darwin-arm64')
216
216
  const bindingPackageVersion = require('@node-usb/usb-darwin-arm64/package.json').version
217
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
218
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
217
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
218
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
219
219
  }
220
220
  return binding
221
221
  } catch (e) {
@@ -234,8 +234,8 @@ function requireNative() {
234
234
  try {
235
235
  const binding = require('@node-usb/usb-freebsd-x64')
236
236
  const bindingPackageVersion = require('@node-usb/usb-freebsd-x64/package.json').version
237
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
238
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
237
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
238
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
239
239
  }
240
240
  return binding
241
241
  } catch (e) {
@@ -250,8 +250,8 @@ function requireNative() {
250
250
  try {
251
251
  const binding = require('@node-usb/usb-freebsd-arm64')
252
252
  const bindingPackageVersion = require('@node-usb/usb-freebsd-arm64/package.json').version
253
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
254
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
253
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
254
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
255
255
  }
256
256
  return binding
257
257
  } catch (e) {
@@ -271,8 +271,8 @@ function requireNative() {
271
271
  try {
272
272
  const binding = require('@node-usb/usb-linux-x64-musl')
273
273
  const bindingPackageVersion = require('@node-usb/usb-linux-x64-musl/package.json').version
274
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
275
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
274
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
275
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
276
276
  }
277
277
  return binding
278
278
  } catch (e) {
@@ -287,8 +287,8 @@ function requireNative() {
287
287
  try {
288
288
  const binding = require('@node-usb/usb-linux-x64-gnu')
289
289
  const bindingPackageVersion = require('@node-usb/usb-linux-x64-gnu/package.json').version
290
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
291
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
290
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
291
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
292
292
  }
293
293
  return binding
294
294
  } catch (e) {
@@ -305,8 +305,8 @@ function requireNative() {
305
305
  try {
306
306
  const binding = require('@node-usb/usb-linux-arm64-musl')
307
307
  const bindingPackageVersion = require('@node-usb/usb-linux-arm64-musl/package.json').version
308
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
309
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
308
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
309
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
310
310
  }
311
311
  return binding
312
312
  } catch (e) {
@@ -321,8 +321,8 @@ function requireNative() {
321
321
  try {
322
322
  const binding = require('@node-usb/usb-linux-arm64-gnu')
323
323
  const bindingPackageVersion = require('@node-usb/usb-linux-arm64-gnu/package.json').version
324
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
325
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
324
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
325
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
326
326
  }
327
327
  return binding
328
328
  } catch (e) {
@@ -339,8 +339,8 @@ function requireNative() {
339
339
  try {
340
340
  const binding = require('@node-usb/usb-linux-arm-musleabihf')
341
341
  const bindingPackageVersion = require('@node-usb/usb-linux-arm-musleabihf/package.json').version
342
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
343
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
342
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
343
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
344
344
  }
345
345
  return binding
346
346
  } catch (e) {
@@ -355,8 +355,8 @@ function requireNative() {
355
355
  try {
356
356
  const binding = require('@node-usb/usb-linux-arm-gnueabihf')
357
357
  const bindingPackageVersion = require('@node-usb/usb-linux-arm-gnueabihf/package.json').version
358
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
359
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
358
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
359
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
360
360
  }
361
361
  return binding
362
362
  } catch (e) {
@@ -373,8 +373,8 @@ function requireNative() {
373
373
  try {
374
374
  const binding = require('@node-usb/usb-linux-loong64-musl')
375
375
  const bindingPackageVersion = require('@node-usb/usb-linux-loong64-musl/package.json').version
376
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
377
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
376
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
377
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
378
378
  }
379
379
  return binding
380
380
  } catch (e) {
@@ -389,8 +389,8 @@ function requireNative() {
389
389
  try {
390
390
  const binding = require('@node-usb/usb-linux-loong64-gnu')
391
391
  const bindingPackageVersion = require('@node-usb/usb-linux-loong64-gnu/package.json').version
392
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
393
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
392
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
393
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
394
394
  }
395
395
  return binding
396
396
  } catch (e) {
@@ -407,8 +407,8 @@ function requireNative() {
407
407
  try {
408
408
  const binding = require('@node-usb/usb-linux-riscv64-musl')
409
409
  const bindingPackageVersion = require('@node-usb/usb-linux-riscv64-musl/package.json').version
410
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
411
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
410
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
411
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
412
412
  }
413
413
  return binding
414
414
  } catch (e) {
@@ -423,8 +423,8 @@ function requireNative() {
423
423
  try {
424
424
  const binding = require('@node-usb/usb-linux-riscv64-gnu')
425
425
  const bindingPackageVersion = require('@node-usb/usb-linux-riscv64-gnu/package.json').version
426
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
427
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
426
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
427
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
428
428
  }
429
429
  return binding
430
430
  } catch (e) {
@@ -440,8 +440,8 @@ function requireNative() {
440
440
  try {
441
441
  const binding = require('@node-usb/usb-linux-ppc64-gnu')
442
442
  const bindingPackageVersion = require('@node-usb/usb-linux-ppc64-gnu/package.json').version
443
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
444
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
443
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
444
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
445
445
  }
446
446
  return binding
447
447
  } catch (e) {
@@ -456,8 +456,8 @@ function requireNative() {
456
456
  try {
457
457
  const binding = require('@node-usb/usb-linux-s390x-gnu')
458
458
  const bindingPackageVersion = require('@node-usb/usb-linux-s390x-gnu/package.json').version
459
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
460
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
459
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
460
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
461
461
  }
462
462
  return binding
463
463
  } catch (e) {
@@ -476,8 +476,8 @@ function requireNative() {
476
476
  try {
477
477
  const binding = require('@node-usb/usb-openharmony-arm64')
478
478
  const bindingPackageVersion = require('@node-usb/usb-openharmony-arm64/package.json').version
479
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
480
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
479
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
480
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
481
481
  }
482
482
  return binding
483
483
  } catch (e) {
@@ -492,8 +492,8 @@ function requireNative() {
492
492
  try {
493
493
  const binding = require('@node-usb/usb-openharmony-x64')
494
494
  const bindingPackageVersion = require('@node-usb/usb-openharmony-x64/package.json').version
495
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
496
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
495
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
496
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
497
497
  }
498
498
  return binding
499
499
  } catch (e) {
@@ -508,8 +508,8 @@ function requireNative() {
508
508
  try {
509
509
  const binding = require('@node-usb/usb-openharmony-arm')
510
510
  const bindingPackageVersion = require('@node-usb/usb-openharmony-arm/package.json').version
511
- if (bindingPackageVersion !== '3.0.0-alpha.6' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
512
- throw new Error(`Native binding package version mismatch, expected 3.0.0-alpha.6 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
511
+ if (bindingPackageVersion !== '3.0.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
512
+ throw new Error(`Native binding package version mismatch, expected 3.0.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
513
513
  }
514
514
  return binding
515
515
  } catch (e) {
@@ -525,23 +525,33 @@ function requireNative() {
525
525
 
526
526
  nativeBinding = requireNative()
527
527
 
528
- if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
528
+ // NAPI_RS_FORCE_WASI is a tri-state flag:
529
+ // unset / any other value → native binding preferred, WASI is only a fallback
530
+ // 'true' → force WASI fallback even if native loaded
531
+ // 'error' → force WASI and throw if no WASI binding is found
532
+ // Treating any non-empty string as truthy (the historical behavior) meant
533
+ // NAPI_RS_FORCE_WASI=false, NAPI_RS_FORCE_WASI=0, etc. inadvertently triggered
534
+ // the WASI path, causing ENOENT for packages shipped without a .wasi.cjs file.
535
+ const forceWasi =
536
+ process.env.NAPI_RS_FORCE_WASI === 'true' || process.env.NAPI_RS_FORCE_WASI === 'error'
537
+
538
+ if (!nativeBinding || forceWasi) {
529
539
  let wasiBinding = null
530
540
  let wasiBindingError = null
531
541
  try {
532
542
  wasiBinding = require('./usb.wasi.cjs')
533
543
  nativeBinding = wasiBinding
534
544
  } catch (err) {
535
- if (process.env.NAPI_RS_FORCE_WASI) {
545
+ if (forceWasi) {
536
546
  wasiBindingError = err
537
547
  }
538
548
  }
539
- if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
549
+ if (!nativeBinding || forceWasi) {
540
550
  try {
541
551
  wasiBinding = require('@node-usb/usb-wasm32-wasi')
542
552
  nativeBinding = wasiBinding
543
553
  } catch (err) {
544
- if (process.env.NAPI_RS_FORCE_WASI) {
554
+ if (forceWasi) {
545
555
  if (!wasiBindingError) {
546
556
  wasiBindingError = err
547
557
  } else {
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": "3.0.0-alpha.6",
5
+ "version": "3.0.0",
6
6
  "main": "dist/index.js",
7
7
  "engines": {
8
8
  "node": ">= 12.22.0 < 13 || >= 14.17.0 < 15 || >= 15.12.0 < 16 || >= 16.0.0"
@@ -45,6 +45,8 @@
45
45
  "build": "napi build --platform --release",
46
46
  "build:ts": "tsc",
47
47
  "build:all": "npm run build && npm run build:ts",
48
+ "format": "cargo fmt",
49
+ "format:check": "cargo fmt -- --check",
48
50
  "full-test": "mocha --timeout 10000 --require coffeescript/register test/*.coffee",
49
51
  "prepublishOnly": "napi prepublish -t npm",
50
52
  "preversion": "napi build --platform && git add .",
@@ -53,14 +55,18 @@
53
55
  "docs": "typedoc"
54
56
  },
55
57
  "dependencies": {
56
- "@types/w3c-web-usb": "^1.0.13"
58
+ "@types/w3c-web-usb": "^1.0.14"
57
59
  },
58
60
  "devDependencies": {
59
- "@napi-rs/cli": "^3.2.0",
61
+ "@napi-rs/cli": "^3.7.0",
60
62
  "coffeescript": "^2.7.0",
61
- "mocha": "^11.7.5",
62
- "typedoc": "^0.28.16",
63
- "typescript": "^5.9.3"
63
+ "mocha": "^11.7.6",
64
+ "typedoc": "^0.28.19",
65
+ "typescript": "^6.0.3"
66
+ },
67
+ "overrides": {
68
+ "diff": "9.0.0",
69
+ "serialize-javascript": "7.0.5"
64
70
  },
65
71
  "napi": {
66
72
  "binaryName": "usb",
@@ -84,15 +90,15 @@
84
90
  "index.js"
85
91
  ],
86
92
  "optionalDependencies": {
87
- "@node-usb/usb-win32-x64-msvc": "3.0.0-alpha.6",
88
- "@node-usb/usb-darwin-x64": "3.0.0-alpha.6",
89
- "@node-usb/usb-linux-x64-gnu": "3.0.0-alpha.6",
90
- "@node-usb/usb-linux-x64-musl": "3.0.0-alpha.6",
91
- "@node-usb/usb-linux-arm64-gnu": "3.0.0-alpha.6",
92
- "@node-usb/usb-win32-ia32-msvc": "3.0.0-alpha.6",
93
- "@node-usb/usb-linux-arm-gnueabihf": "3.0.0-alpha.6",
94
- "@node-usb/usb-darwin-arm64": "3.0.0-alpha.6",
95
- "@node-usb/usb-linux-arm64-musl": "3.0.0-alpha.6",
96
- "@node-usb/usb-win32-arm64-msvc": "3.0.0-alpha.6"
93
+ "@node-usb/usb-win32-x64-msvc": "3.0.0",
94
+ "@node-usb/usb-darwin-x64": "3.0.0",
95
+ "@node-usb/usb-linux-x64-gnu": "3.0.0",
96
+ "@node-usb/usb-linux-x64-musl": "3.0.0",
97
+ "@node-usb/usb-linux-arm64-gnu": "3.0.0",
98
+ "@node-usb/usb-win32-ia32-msvc": "3.0.0",
99
+ "@node-usb/usb-linux-arm-gnueabihf": "3.0.0",
100
+ "@node-usb/usb-darwin-arm64": "3.0.0",
101
+ "@node-usb/usb-linux-arm64-musl": "3.0.0",
102
+ "@node-usb/usb-win32-arm64-msvc": "3.0.0"
97
103
  }
98
104
  }
File without changes