fix: re-add devicePath

SuperFlyTV · Sep 6, 2021 · 349f6a9 · 349f6a9
1 parent ed1c1ea
commit 349f6a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/packages/core/src/xkeys.ts b/packages/core/src/xkeys.ts
@@ -44,10 +44,7 @@ export class XKeys extends EventEmitter {
 		return XKEYS_VENDOR_ID
 	}
 
-	constructor(
-		private device: HIDDevice,
-		private deviceInfo: DeviceInfo
-	) {
+	constructor(private device: HIDDevice, private deviceInfo: DeviceInfo, private _devicePath: string | undefined) {
 		super()
 
 		this.product = this._setupDevice(deviceInfo)
@@ -547,6 +544,9 @@ export class XKeys extends EventEmitter {
 	public _getDeviceInfo(): DeviceInfo {
 		return this.deviceInfo
 	}
+	public get devicePath(): string | undefined {
+		return this._devicePath
+	}
 	/** The unique id of the xkeys-panel. Note: This is only available if options.automaticUnitIdMode is set for the Watcher */
 	public get uniqueId(): string {
 		return `${this.info.productId}_${this.unitId}`

diff --git a/packages/node/src/methods.ts b/packages/node/src/methods.ts
@@ -87,7 +87,7 @@ export async function setupXkeysPanel(devicePathOrHIDDevice?: HID.Device | HID.H
 
 	const deviceWrap = new NodeHIDDevice(device)
 
-	const xkeys = new XKeys(deviceWrap, deviceInfo)
+	const xkeys = new XKeys(deviceWrap, deviceInfo, devicePath)
 
 	// Wait for the device to initialize:
 	await xkeys.init()

diff --git a/packages/webhid/src/methods.ts b/packages/webhid/src/methods.ts
@@ -32,11 +32,15 @@ export async function setupXkeysPanel(browserDevice: HIDDevice): Promise<XKeys>
 
 	const deviceWrap = new WebHIDDevice(browserDevice)
 
-	const xkeys = new XKeys(deviceWrap, {
-		product: browserDevice.productName,
-		productId: productId,
-		interface: null, // todo: Check what to use here (collection.usage?)
-	})
+	const xkeys = new XKeys(
+		deviceWrap,
+		{
+			product: browserDevice.productName,
+			productId: productId,
+			interface: null, // todo: Check what to use here (collection.usage?)
+		},
+		undefined
+	)
 
 	// Wait for the device to initialize:
 	await xkeys.init()