watsonb8/homebridge-harmony-control
1
1
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases Wiki Activity

Using harmony device

Browse Source 
Still need to look up devices specific to hubs (In the case of the same device on multiple hubs)
This commit is contained in:
watsonb8 2020-01-23 09:01:14 -05:00
parent 5ddd1e1af0
commit ba1a1685ae
3 changed files with 29 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/DataProviders/HarmonyDataProvider.ts
View File

@ -7,6 +7,7 @@ import { EventEmitter } from "events";
import { IDevice, ICommand } from '../Models/IDevice'; import { IDevice, ICommand } from '../Models/IDevice';
import { IHub } from "../Models/Config/IHub"; import { IHub } from "../Models/Config/IHub";
import { IDeviceConfig } from "../Models/Config/IDeviceConfig"; import { IDeviceConfig } from "../Models/Config/IDeviceConfig";
import { HarmonyDevice } from "../Models/HarmonyDevice";
let Characteristic: HAPNodeJS.Characteristic; let Characteristic: HAPNodeJS.Characteristic;
@ -28,7 +29,7 @@ class HarmonyDataProvider extends EventEmitter {
private _deviceConfigs: Array<IDeviceConfig>; private _deviceConfigs: Array<IDeviceConfig>;
private _hubs: { [hubName: string]: IHub } = {}; private _hubs: { [hubName: string]: IHub } = {};
private _devices: { [name: string]: IDevice; } = {}; private _devices: { [name: string]: HarmonyDevice; } = {};
private _states: { [controlUnitName: string]: (IActivityState | undefined) } = {}; private _states: { [controlUnitName: string]: (IActivityState | undefined) } = {};
private _matrix: IMatrix; private _matrix: IMatrix;
@ -47,7 +48,7 @@ class HarmonyDataProvider extends EventEmitter {
this.connect(); this.connect();
} }
public get devices(): { [name: string]: IDevice; } { public get devices(): { [name: string]: HarmonyDevice; } {
return this._devices; return this._devices;
} }
@ -70,8 +71,8 @@ class HarmonyDataProvider extends EventEmitter {
return; return;
} }
//Build potential list of devices to turn off //Build potential list of devices to turn off
let devicesToTurnOff: Array<IDevice> = this._states[controlUnitName]!.currentActivity.DeviceSetupList let devicesToTurnOff: Array<HarmonyDevice> = this._states[controlUnitName]!.currentActivity.DeviceSetupList
.map((value: IDeviceSetupItem): IDevice => { .map((value: IDeviceSetupItem): HarmonyDevice => {
return this.getDeviceFromName(value.DeviceName); return this.getDeviceFromName(value.DeviceName);
}); });
@ -79,7 +80,7 @@ class HarmonyDataProvider extends EventEmitter {
devicesToTurnOff = this.sanitizeDeviceList(devicesToTurnOff, controlUnitName); devicesToTurnOff = this.sanitizeDeviceList(devicesToTurnOff, controlUnitName);
//Turn off devices //Turn off devices
devicesToTurnOff.forEach(async (device: IDevice) => { devicesToTurnOff.forEach(async (device: HarmonyDevice) => {
await device.powerOff(); await device.powerOff();
}); });
@ -97,7 +98,7 @@ class HarmonyDataProvider extends EventEmitter {
} }
//Build potential list of devices to to turn on //Build potential list of devices to to turn on
let devicesToTurnOn: Array<IDevice> = activity.DeviceSetupList.map((value: IDeviceSetupItem): IDevice => { let devicesToTurnOn: Array<HarmonyDevice> = activity.DeviceSetupList.map((value: IDeviceSetupItem): HarmonyDevice => {
return this.getDeviceFromName(value.DeviceName); return this.getDeviceFromName(value.DeviceName);
}); });
@ -105,7 +106,7 @@ class HarmonyDataProvider extends EventEmitter {
devicesToTurnOn = this.sanitizeDeviceList(devicesToTurnOn, controlUnitName); devicesToTurnOn = this.sanitizeDeviceList(devicesToTurnOn, controlUnitName);
//Turn on devices //Turn on devices
await Promise.all(devicesToTurnOn.map(async (device: IDevice) => { await Promise.all(devicesToTurnOn.map(async (device: HarmonyDevice) => {
if (device && device.name && this._devices[device.name]) { if (device && device.name && this._devices[device.name]) {
if (!device.on) { if (!device.on) {
this._log(`Turning on device ${device.name}`) this._log(`Turning on device ${device.name}`)
@ -117,7 +118,7 @@ class HarmonyDataProvider extends EventEmitter {
//Assign correct input //Assign correct input
await Promise.all( await Promise.all(
activity.DeviceSetupList.map(async (value: IDeviceSetupItem) => { activity.DeviceSetupList.map(async (value: IDeviceSetupItem) => {
let device: IDevice = this.getDeviceFromName(value.DeviceName); let device: HarmonyDevice = this.getDeviceFromName(value.DeviceName);
if (device && device.supportsCommand(`Input${value.Input}`)) { if (device && device.supportsCommand(`Input${value.Input}`)) {
await device.sendCommand(`Input${value.Input}`) await device.sendCommand(`Input${value.Input}`)
@ -133,7 +134,7 @@ class HarmonyDataProvider extends EventEmitter {
let inputCommandName: string = `In ${input.InputNumber}`; let inputCommandName: string = `In ${input.InputNumber}`;
let outputCommandName: string = `Out ${output.OutputLetter}`; let outputCommandName: string = `Out ${output.OutputLetter}`;
let matrixDevice: IDevice = this.getDeviceFromName(this._matrix.DeviceName); let matrixDevice: HarmonyDevice = this.getDeviceFromName(this._matrix.DeviceName);
//Route hdmi //Route hdmi
if (matrixDevice.supportsCommand(inputCommandName) && matrixDevice.supportsCommand(outputCommandName)) { if (matrixDevice.supportsCommand(inputCommandName) && matrixDevice.supportsCommand(outputCommandName)) {
@ -146,13 +147,13 @@ class HarmonyDataProvider extends EventEmitter {
//Build potential list of devices to turn off //Build potential list of devices to turn off
if (lastActivity) { if (lastActivity) {
let devicesToTurnOff: Array<IDevice> = lastActivity.DeviceSetupList.map((value: IDeviceSetupItem): IDevice => { let devicesToTurnOff: Array<HarmonyDevice> = lastActivity.DeviceSetupList.map((value: IDeviceSetupItem): HarmonyDevice => {
return this.getDeviceFromName(value.DeviceName); return this.getDeviceFromName(value.DeviceName);
}); });
//remove devices that will be used for next activity from list //remove devices that will be used for next activity from list
//delete array[index] is stupid because it just nulls out the index. But now i have to deal with nulls //delete array[index] is stupid because it just nulls out the index. But now i have to deal with nulls
devicesToTurnOff.forEach((device: IDevice, index: number) => { devicesToTurnOff.forEach((device: HarmonyDevice, index: number) => {
if (device && device.name && activity.DeviceSetupList.some(e => { if (device && device.name && activity.DeviceSetupList.some(e => {
return (e && e.DeviceName === device.name) return (e && e.DeviceName === device.name)
})) { })) {
@ -167,7 +168,7 @@ class HarmonyDataProvider extends EventEmitter {
await Promise.all( await Promise.all(
//Turn off devices //Turn off devices
devicesToTurnOff.map(async (device: IDevice) => { devicesToTurnOff.map(async (device: HarmonyDevice) => {
if (device) { if (device) {
if (device.on) { if (device.on) {
this._log(`Turning off device ${device.name}`) this._log(`Turning off device ${device.name}`)
@ -189,7 +190,7 @@ class HarmonyDataProvider extends EventEmitter {
public volumeUp = async (controlUnitName: string) => { public volumeUp = async (controlUnitName: string) => {
let volumeUpCommand: string = "Volume Up" let volumeUpCommand: string = "Volume Up"
if (this._states[controlUnitName]) { if (this._states[controlUnitName]) {
let volumeDevice: IDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice); let volumeDevice: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice);
await volumeDevice.sendCommand(volumeUpCommand); await volumeDevice.sendCommand(volumeUpCommand);
} }
} }
@ -200,7 +201,7 @@ class HarmonyDataProvider extends EventEmitter {
public volumeDown = async (controlUnitName: string) => { public volumeDown = async (controlUnitName: string) => {
let volumeDownCommand: string = "Volume Down" let volumeDownCommand: string = "Volume Down"
if (this._states[controlUnitName]) { if (this._states[controlUnitName]) {
let volumeDevice: IDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice); let volumeDevice: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice);
await volumeDevice.sendCommand(volumeDownCommand); await volumeDevice.sendCommand(volumeDownCommand);
} }
} }
@ -215,7 +216,7 @@ class HarmonyDataProvider extends EventEmitter {
if (this._states[controlUnitName]) { if (this._states[controlUnitName]) {
let commandName: string = ""; let commandName: string = "";
let device: IDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.ControlDevice); let device: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.ControlDevice);
switch (key) { switch (key) {
case RemoteKey.ARROW_UP: { case RemoteKey.ARROW_UP: {
commandName = "Direction Up"; commandName = "Direction Up";
@ -273,7 +274,7 @@ class HarmonyDataProvider extends EventEmitter {
* @param deviceName The device name * @param deviceName The device name
*/ */
public getCommand(deviceCommandName: string, deviceName: string): ICommand | undefined { public getCommand(deviceCommandName: string, deviceName: string): ICommand | undefined {
const device: IDevice = this.getDeviceFromName(deviceName); const device: HarmonyDevice = this.getDeviceFromName(deviceName);
if (device && device.supportsCommand(deviceCommandName)) { if (device && device.supportsCommand(deviceCommandName)) {
return device.getCommand(deviceCommandName); return device.getCommand(deviceCommandName);
} else { } else {
@ -306,60 +307,13 @@ class HarmonyDataProvider extends EventEmitter {
deviceCommands.forEach((command: any) => { deviceCommands.forEach((command: any) => {
commands[command.label] = command.action; commands[command.label] = command.action;
}); });
self._devices[dev.label] = { self._devices[dev.label] = new HarmonyDevice({
id: dev.id, id: dev.id,
name: dev.label, name: dev.label,
commands: commands, commands: commands,
on: false,
harmony: hub.Harmony,
log: self._log, log: self._log,
//Define device methods harmony: hub.Harmony
supportsCommand(commandName: string): boolean { });
let command = commands[commandName];
return (command) ? true : false;
},
getCommand(commandName: string): ICommand {
return commands[commandName];
},
async powerOn(): Promise<void> {
let powerOnCommand: string = "Power On";
let powerToggleCommand: string = "Power Toggle";
if (this.supportsCommand(powerOnCommand)) {
await this.sendCommand(powerOnCommand);
this.on = true;
} else if (this.supportsCommand(powerToggleCommand)) {
await this.sendCommand(powerToggleCommand);
this.on = true;
}
},
async powerOff(): Promise<void> {
let powerOffCommand: string = "Power Off";
let powerToggleCommand: string = "Power Toggle";
if (this.supportsCommand(powerOffCommand)) {
await this.sendCommand(powerOffCommand);
this.on = false;
} else if (this.supportsCommand(powerToggleCommand)) {
await this.sendCommand(powerToggleCommand);
this.on = false;
}
},
async sendCommand(commandName: string): Promise<void> {
let command!: ICommand;
if (this.supportsCommand(commandName)) {
command = this.getCommand(commandName);
}
try {
//Execute command
await this.harmony.sendCommand(JSON.stringify(command));
//Sleep
await sleep(800);
} catch (err) {
this.log(`ERROR - error sending command to harmony: ${err}`);
}
}
}
})); }));
self._log(`Harmony data provider ready`); self._log(`Harmony data provider ready`);
self.emit("Ready"); self.emit("Ready");
@ -378,7 +332,7 @@ class HarmonyDataProvider extends EventEmitter {
* Get the IDevice by name. * Get the IDevice by name.
* @param deviceName The device to retrieve. * @param deviceName The device to retrieve.
*/ */
private getDeviceFromName(deviceName: string): IDevice { private getDeviceFromName(deviceName: string): HarmonyDevice {
return this._devices[deviceName]; return this._devices[deviceName];
} }
@ -387,7 +341,7 @@ class HarmonyDataProvider extends EventEmitter {
* @param devicesToTurnOn The list of devices to modify. * @param devicesToTurnOn The list of devices to modify.
* @param controlUnitName The name of the control unit in question. * @param controlUnitName The name of the control unit in question.
*/ */
private sanitizeDeviceList(devicesToTurnOn: Array<IDevice>, controlUnitName: string): Array<IDevice> { private sanitizeDeviceList(devicesToTurnOn: Array<HarmonyDevice>, controlUnitName: string): Array<HarmonyDevice> {
for (let controlUnitKey in this._states) { for (let controlUnitKey in this._states) {
//Skip self //Skip self
if (controlUnitKey === controlUnitName) { if (controlUnitKey === controlUnitName) {
@ -399,7 +353,7 @@ class HarmonyDataProvider extends EventEmitter {
currentOtherState.currentActivity.DeviceSetupList.forEach((value: IDeviceSetupItem) => { currentOtherState.currentActivity.DeviceSetupList.forEach((value: IDeviceSetupItem) => {
//there are devices to remove //there are devices to remove
if (devicesToTurnOn.some(e => e && e.name === value.DeviceName)) { if (devicesToTurnOn.some(e => e && e.name === value.DeviceName)) {
let deviceToRemove: IDevice = devicesToTurnOn.filter(i => i.name === value.DeviceName)[0]; let deviceToRemove: HarmonyDevice = devicesToTurnOn.filter(i => i.name === value.DeviceName)[0];
delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)]; delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)];
} }
}); });

4
src/Models/HarmonyDevice.ts
View File

@ -26,6 +26,10 @@ export class HarmonyDevice {
public id: string; public id: string;
public name: string; public name: string;
public get on(): boolean {
return this._on;
}
//Define device methods //Define device methods
public supportsCommand(commandName: string): boolean { public supportsCommand(commandName: string): boolean {
let command = this._commands[commandName]; let command = this._commands[commandName];

3
src/index.ts
View File

@ -40,7 +40,8 @@ class HarmonyMatrixPlatform {
if (this.config) { if (this.config) {
//construct data provider //construct data provider
this.dataProvider = new HarmonyDataProvider({ this.dataProvider = new HarmonyDataProvider({
hubAddress: this.config.hubIp, hubs: this.config.Hubs,
deviceConfigs: this.config.Devices,
matrix: this.config.Matrix, matrix: this.config.Matrix,
log: this.log log: this.log
}); });