-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(windows): Parse more types of pnpIds (#1288)
This should give us more serial numbers on windows. fixes #1220
- Loading branch information
Showing
3 changed files
with
65 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
'use strict'; | ||
|
||
const PARSERS = [ | ||
/USB\\(?:.+)\\(.+)/, | ||
/FTDIBUS\\(?:.+)\+(.+?)A?\\.+/ | ||
]; | ||
|
||
module.exports = function(pnpId) { | ||
if (!pnpId) { | ||
return null; | ||
} | ||
for (let index = 0; index < PARSERS.length; index++) { | ||
const parser = PARSERS[index]; | ||
const sn = pnpId.match(parser); | ||
if (sn) { | ||
return sn[1]; | ||
} | ||
} | ||
return null; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
'use strict'; | ||
|
||
const serialNumParser = require('../lib/bindings/win32-sn-parser'); | ||
|
||
const devices = { | ||
'FTDI Device': { | ||
pnpId: 'FTDIBUS\\VID_0403+PID_6015+DO004ZB7A\\0000', | ||
serialNumber: 'DO004ZB7' | ||
}, | ||
'Arduino Mega': { | ||
pnpId: 'USB\\VID_2341&PID_0042\\85531303630351C081D2', | ||
serialNumber: '85531303630351C081D2' | ||
}, | ||
'Atlas Scientific EZO-RGB Sensor': { | ||
pnpId: 'FTDIBUS\\VID_0403+PID_6015+DJ1XJE67A\\0000', | ||
serialNumber: 'DJ1XJE67' | ||
}, | ||
'Gearmo FTDI2-LED USB RS-232 Serial Adapter': { | ||
pnpId: 'FTDIBUS\\VID_0403+PID_6001+AL1WHZWFA\\0000', | ||
serialNumber: 'AL1WHZWF' | ||
}, | ||
'Arducam Nano V3.0 (Arduino Nano with FTDI)': { | ||
pnpId: 'FTDIBUS\\VID_0403+PID_6001+A51MAMMEA\\0000', | ||
serialNumber: 'A51MAMME' | ||
}, | ||
'Pretend Device with an unknown pnp id': { | ||
pnpId: 'WATEVER\\Whoever\\However!', | ||
serialNumber: null | ||
} | ||
}; | ||
|
||
describe('serialNumParser', () => { | ||
Object.keys(devices).forEach(device => { | ||
it(`parses pnp id for ${device}`, () => { | ||
const pnpId = devices[device].pnpId; | ||
const serialNumber = devices[device].serialNumber; | ||
assert.equal(serialNumParser(pnpId), serialNumber); | ||
}); | ||
}); | ||
}); |