Skip to content

fix(usb): update usb-lib calls and improve error logging #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stoprocent merged 1 commit into from
May 20, 2025
Merged

fix(usb): update usb-lib calls and improve error logging #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions lib/usb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const events = require('events');
const util = require('util');

const debug = require('debug')('hci-usb');
const usb = require('usb');
const { usb, findByIds, getDeviceList } = require('usb');

const HCI_COMMAND_PKT = 0x01;
const HCI_ACLDATA_PKT = 0x02;
Expand Down Expand Up @@ -67,9 +67,7 @@ BluetoothHciSocket.prototype.bindUser = function (devId, params) {
this._usbDevice = this._findUsbDevice(devId, usbParams);
}
} else {
this._usbDevice = VENDOR_DEVICE_LIST
.map(d => usb.findByIds(d.vid, d.pid))
.find(d => d != null);
this._usbDevice = VENDOR_DEVICE_LIST.map((d) => findByIds(d.vid, d.pid)).find((d) => d != null);
}

if (!this._usbDevice) {
Expand Down Expand Up @@ -131,7 +129,7 @@ BluetoothHciSocket.prototype._getUsbParams = function (params) {
};

BluetoothHciSocket.prototype._findUsbDevice = function (devId, usbParams) {
const usbDevices = usb.getDeviceList();
const usbDevices = getDeviceList();

for (let i = 0; i < usbDevices.length; i++) {
const usbDevice = usbDevices[i];
Expand All @@ -158,7 +156,7 @@ BluetoothHciSocket.prototype._findUsbDevice = function (devId, usbParams) {
};

BluetoothHciSocket.prototype.getDeviceList = function () {
return usb.getDeviceList()
return getDeviceList()
.filter(dev => {
return VENDOR_DEVICE_LIST.findIndex(d => {
return dev.deviceDescriptor.idVendor === d.vid && dev.deviceDescriptor.idProduct === d.pid;
Expand All @@ -185,11 +183,21 @@ BluetoothHciSocket.prototype.isDevUp = function () {
BluetoothHciSocket.prototype.start = function () {
if (this._mode === 'raw' || this._mode === 'user') {
process.on('exit', this._exitHandler);


this._hciEventEndpoint.removeAllListeners();
this._hciEventEndpoint.on('data', this.onHciEventEndpointData.bind(this));
this._hciEventEndpoint.on('error', (error) => {
debug('HCI event endpoint error: ' + error);
this.emit('error', error);
});
this._hciEventEndpoint.startPoll();

this._aclDataInEndpoint.removeAllListeners();
this._aclDataInEndpoint.on('data', this.onAclDataInEndpointData.bind(this));
this._aclDataInEndpoint.on('error', (error) => {
debug('ACL data in endpoint error: ' + error);
this.emit('error', error);
});
this._aclDataInEndpoint.startPoll();
}
};
Expand All @@ -212,9 +220,26 @@ BluetoothHciSocket.prototype.write = function (data) {
const type = data.readUInt8(0);

if (HCI_COMMAND_PKT === type) {
this._usbDevice.controlTransfer(usb.LIBUSB_REQUEST_TYPE_CLASS | usb.LIBUSB_RECIPIENT_INTERFACE, 0, 0, 0, data.slice(1), function () {});
this._usbDevice.controlTransfer(
usb.LIBUSB_REQUEST_TYPE_CLASS | usb.LIBUSB_RECIPIENT_INTERFACE,
0,
0,
0,
data.slice(1),
(error) => {
if (error) {
debug('Control transfer failed: ' + error);
this.emit('error', error);
}
}
);
} else if (HCI_ACLDATA_PKT === type) {
this._aclDataOutEndpoint.transfer(data.slice(1));
this._aclDataOutEndpoint.transfer(data.slice(1), (error) => {
if (error) {
debug('ACL data transfer failed: ' + error);
this.emit('error', error);
}
});
}
}
};
Expand Down