Merge branch 'feature/multi_hub'

Still need to look up devices specific to hubs (In the case of the same device on multiple hubs)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "homebridge-harmony-control",
-    "version": "1.0.2",
+    "version": "1.0.7",
     "description": "Homebridge platform to control smart home equipment by room.",
     "main": "bin/index.js",
     "scripts": {

src/Accessories/ControlUnit.ts

@@ -1,5 +1,4 @@
-import { Activity } from '../Models/Activity';
+import * as Config from "../Models/Config"
-import { Matrix } from '../Models/Matrix';
 import { IAccessory } from './IAccessory';
 import callbackify from '../Util/Callbackify';
 import HarmonyDataProvider from '../DataProviders/HarmonyDataProvider';
@@ -31,7 +30,7 @@ export enum RemoteKey {
 export interface IControlUnitProps {
     dataProvider: HarmonyDataProvider,
     displayName: string,
-    activities: Array<Activity>,
+    activities: Array<Config.IActivity>,
     api: any,
     log: any,
     homebridge: any,
@@ -41,24 +40,21 @@ export interface IControlUnitProps {
  * ControlUnit accessory
  */
 export class ControlUnit implements IAccessory {
-    //Required by homebridge
+
-    name: string = "";
 
     //fields
     private log: any = {};
     private displayName: string = "";
 
     //Service fields
-    private televisionService: HAPNodeJS.Service | undefined;
+    private _televisionService: HAPNodeJS.Service | undefined;
-    private televisionSpeakerService: HAPNodeJS.Service | undefined;
+    private _televisionSpeakerService: HAPNodeJS.Service | undefined;
-    private informationService: HAPNodeJS.Service | undefined;
+    private _infoService: HAPNodeJS.Service;
-    private inputServices: Array<HAPNodeJS.Service | undefined> = [];
+    private _inputServices: Array<HAPNodeJS.Service | undefined> = [];
 
     //Harmony fields
-    private activities: Array<Activity> = [];
+    private _activities: Array<Config.IActivity> = [];
-    private dataProvider: HarmonyDataProvider;
+    private _dataProvider: HarmonyDataProvider;
-
-    public platformAccessory: any;
 
     /**
      * Constructor
@@ -73,13 +69,19 @@ export class ControlUnit implements IAccessory {
         this.name = props.displayName;
         this.displayName = props.displayName;
 
-        this.activities = props.activities;
+        this._activities = props.activities;
 
-        this.dataProvider = props.dataProvider;
+        this._dataProvider = props.dataProvider;
         homebridge = props.homebridge;
 
         this.platformAccessory = new homebridge.platformAccessory(this.displayName, this.generateUUID(), homebridge.hap.Accessory.Categories.TELEVISION);
 
+        //@ts-ignore
+        this._infoService = new Service.AccessoryInformation();
+        this._infoService.setCharacteristic(Characteristic.Manufacturer, "Brandon Watson")
+        this._infoService.setCharacteristic(Characteristic.Model, "Matrix Output Television")
+        this._infoService.setCharacteristic(Characteristic.SerialNumber, "123-456-789");
+
         //Configure services
         this.configureTvService();
 
@@ -98,10 +100,15 @@ export class ControlUnit implements IAccessory {
             //@ts-ignore
             if (service.linked) {
                 //@ts-ignore
-                this.televisionService!.addLinkedService(service);
+                this._televisionService!.addLinkedService(service);
             }
         });
     }
+
+    //Required by homebridge
+    name: string = "";
+    public platformAccessory: any;
+
     /*************
      * 
      * Tv Service
@@ -112,31 +119,31 @@ export class ControlUnit implements IAccessory {
      * Configure television service
      */
     private configureTvService(): void {
-        this.televisionService = new Service.Television(
+        this._televisionService = new Service.Television(
             this.displayName,
             'tvService'
         )
 
-        this.televisionService.setCharacteristic(Characteristic.ConfiguredName, this.displayName);
+        this._televisionService.setCharacteristic(Characteristic.ConfiguredName, this.displayName);
         //@ts-ignore
-        this.televisionService.setCharacteristic(Characteristic.SleepDiscoveryMode, Characteristic.SleepDiscoveryMode.ALWAYS_DISCOVERABLE);
+        this._televisionService.setCharacteristic(Characteristic.SleepDiscoveryMode, Characteristic.SleepDiscoveryMode.ALWAYS_DISCOVERABLE);
-        this.televisionService.setCharacteristic(Characteristic.ActiveIdentifier, 1);
+        this._televisionService.setCharacteristic(Characteristic.ActiveIdentifier, 1);
-        this.televisionService.setCharacteristic(Characteristic.Active, false);
+        this._televisionService.setCharacteristic(Characteristic.Active, false);
 
         //setup listeners
-        this.televisionService.getCharacteristic(Characteristic.Active)
+        this._televisionService.getCharacteristic(Characteristic.Active)
             //@ts-ignore
             .on("set", callbackify(this.onSetAccessoryActive))
             //@ts-ignore
             .on("get", callbackify(this.onGetAccessoryActive));
 
         //Set remote characteristics if is external
-        this.televisionService.getCharacteristic(Characteristic.RemoteKey)
+        this._televisionService.getCharacteristic(Characteristic.RemoteKey)
             //@ts-ignore
             .on("set", callbackify(this.onSetRemoteKey));
 
 
-        this.televisionService.getCharacteristic(Characteristic.ActiveIdentifier)
+        this._televisionService.getCharacteristic(Characteristic.ActiveIdentifier)
             //@ts-ignore
             .on("set", callbackify(this.onSetActiveIdentifier))
             //@ts-ignore
@@ -148,9 +155,9 @@ export class ControlUnit implements IAccessory {
      */
     private onSetAccessoryActive = async (value: any) => {
         switch (value) {
-            case 0: this.dataProvider.powerOff(this.name); break;
+            case 0: this._dataProvider.powerOff(this.name); break;
             //Turn on with first activity
-            case 1: this.dataProvider.powerOn(this.name, this.activities[0]); break;
+            case 1: this._dataProvider.powerOn(this.name, this._activities[0]); break;
         }
     }
 
@@ -159,31 +166,31 @@ export class ControlUnit implements IAccessory {
      */
     private onGetAccessoryActive = async () => {
         //@ts-ignore
-        return this.dataProvider.getIsActive(this.name) ? Characteristic.Active.Active : Characteristic.Active.Inactive
+        return this._dataProvider.getIsActive(this.name) ? Characteristic.Active.Active : Characteristic.Active.Inactive
     }
 
     /**
      * Event handler for SET remote key
      */
     private onSetRemoteKey = async (key: any) => {
-        this.dataProvider.sendKeyPress(this.name, key);
+        this._dataProvider.sendKeyPress(this.name, key);
     }
 
     /**
      * Event handler for SET active identifier characteristic
      */
     private onSetActiveIdentifier = async (identifier: any) => {
-        this.dataProvider.startActivity(this.name, this.activities[identifier]);
+        this._dataProvider.startActivity(this.name, this._activities[identifier]);
     }
 
     /**
      * Event handler for GET active identifier characteristic
      */
     private onGetActiveIdentifier = async () => {
-        let currentActivity: Activity = this.dataProvider.getIsActive(this.name)!;
+        let currentActivity: Config.IActivity = this._dataProvider.getIsActive(this.name)!;
         let identifier: number = 0;
         if (currentActivity) {
-            identifier = this.activities.findIndex(e => e.displayName === currentActivity.displayName);
+            identifier = this._activities.findIndex(e => e.DisplayName === currentActivity.DisplayName);
         }
         return identifier;
     }
@@ -198,23 +205,23 @@ export class ControlUnit implements IAccessory {
      * Configure Speaker Service
      */
     private configureTvSpeakerService(): void {
-        this.televisionSpeakerService = new Service.TelevisionSpeaker(
+        this._televisionSpeakerService = new Service.TelevisionSpeaker(
             this.displayName,
             'tvSpeakerService'
         );
-        this.televisionSpeakerService.setCharacteristic(Characteristic.Name, this.displayName);
+        this._televisionSpeakerService.setCharacteristic(Characteristic.Name, this.displayName);
         //@ts-ignore
-        this.televisionSpeakerService.setCharacteristic(Characteristic.Active, Characteristic.Active.ACTIVE);
+        this._televisionSpeakerService.setCharacteristic(Characteristic.Active, Characteristic.Active.ACTIVE);
         //@ts-ignore
-        this.televisionSpeakerService.setCharacteristic(Characteristic.VolumeControlType, Characteristic.VolumeControlType.ABSOLUTE);
+        this._televisionSpeakerService.setCharacteristic(Characteristic.VolumeControlType, Characteristic.VolumeControlType.ABSOLUTE);
-        this.televisionSpeakerService.subtype = this.displayName + "Volume";
+        this._televisionSpeakerService.subtype = this.displayName + "Volume";
-        if (this.televisionService) {
+        if (this._televisionService) {
             //@ts-ignore
-            this.televisionService.addLinkedService(this.televisionSpeakerService);
+            this._televisionService.addLinkedService(this._televisionSpeakerService);
         }
 
         //Setup listeners
-        this.televisionSpeakerService.getCharacteristic(Characteristic.VolumeSelector)
+        this._televisionSpeakerService.getCharacteristic(Characteristic.VolumeSelector)
             //@ts-ignore
             .on("set", callbackify(this.onSetVolumeSelector));
     }
@@ -224,8 +231,8 @@ export class ControlUnit implements IAccessory {
      */
     private onSetVolumeSelector = async (value: any) => {
         switch (value) {
-            case 0: this.dataProvider.volumeUp(this.name); break;
+            case 0: this._dataProvider.volumeUp(this.name); break;
-            case 1: this.dataProvider.volumeDown(this.name); break;
+            case 1: this._dataProvider.volumeDown(this.name); break;
         }
     }
 
@@ -240,13 +247,13 @@ export class ControlUnit implements IAccessory {
      */
     private configureInputSourceService(): void {
         let inputs: Array<HAPNodeJS.Service> = [];
-        this.activities.forEach((activity: Activity, index: number) => {
+        this._activities.forEach((activity: Config.IActivity, index: number) => {
-            let inputService = new Service.InputSource(activity.displayName, 'activity' + activity.displayName);
+            let inputService = new Service.InputSource(activity.DisplayName, 'activity' + activity.DisplayName);
             inputService
                 .setCharacteristic(Characteristic.Identifier, index)
                 .setCharacteristic(
                     Characteristic.ConfiguredName,
-                    activity.displayName)
+                    activity.DisplayName)
                 .setCharacteristic(
                     Characteristic.IsConfigured,
                     //@ts-ignore
@@ -256,10 +263,10 @@ export class ControlUnit implements IAccessory {
                 .setCharacteristic(Characteristic.InputSourceType, Characteristic.InputSourceType.HDMI);
 
             //@ts-ignore
-            this.televisionService!.addLinkedService(inputService);
+            this._televisionService!.addLinkedService(inputService);
             inputs.push(inputService);
         });
-        this.inputServices = inputs;
+        this._inputServices = inputs;
     }
 
     private generateUUID(): string { // Public Domain/MIT
@@ -278,8 +285,8 @@ export class ControlUnit implements IAccessory {
      * Called by homebridge to gather services for this accessory.
      */
     getServices(): Array<HAPNodeJS.Service> {
-        let services: Array<HAPNodeJS.Service> = [this.televisionService!, this.televisionSpeakerService!];
+        let services: Array<HAPNodeJS.Service> = [this._infoService, this._televisionService!, this._televisionSpeakerService!];
-        this.inputServices.forEach((service: HAPNodeJS.Service | undefined) => {
+        this._inputServices.forEach((service: HAPNodeJS.Service | undefined) => {
             services.push(service!);
         });
         return (services);

src/Accessories/DeviceButton.ts

@@ -0,0 +1,155 @@
+import HarmonyDataProvider from "../DataProviders/HarmonyDataProvider";
+import { IDeviceButton } from "../Models/Config";
+import { IAccessory } from "./IAccessory";
+import { ICommand } from "../Models";
+import { HarmonyDevice } from "../Models/HarmonyDevice";
+
+let Service: HAPNodeJS.Service;
+let Characteristic: HAPNodeJS.Characteristic;
+
+export interface IDeviceButtonProps {
+    dataProvider: HarmonyDataProvider,
+    buttonName: string,
+    displayName: string,
+    deviceInfo: IDeviceButton,
+    api: any,
+    log: any,
+    homebridge: any,
+}
+
+export class DeviceButton implements IAccessory {
+    private _api: any;
+    private _homebridge: any;
+    private _log: any = {};
+
+    //Service fields
+    private _switchService: HAPNodeJS.Service;
+    private _infoService: HAPNodeJS.Service;
+
+    private _buttonInfo: IDeviceButton;
+
+    private _dataProvider: HarmonyDataProvider;
+
+    private _device!: HarmonyDevice;
+
+    private _buttonState: boolean;
+
+    constructor(props: IDeviceButtonProps) {
+        //Assign class variables
+        this._log = props.log;
+        this._api = props.api;
+        Service = props.api.hap.Service;
+        Characteristic = props.api.hap.Characteristic;
+        this.name = props.displayName;
+        this._homebridge = props.homebridge;
+
+        this._buttonInfo = props.deviceInfo;
+
+        this._dataProvider = props.dataProvider;
+
+        this._buttonState = false;
+
+        if (this._buttonInfo.NumberOfKeyPresses && this._buttonInfo.IsStateful) {
+            throw new Error("A button cannot be stateful and be pressed more than once");
+        }
+
+        //Assign default number of key presses
+        if (!this._buttonInfo.NumberOfKeyPresses) {
+            this._buttonInfo.NumberOfKeyPresses = 1;
+        }
+
+        this.platformAccessory = new this._homebridge.platformAccessory(this.name, this.generateUUID(), this._homebridge.hap.Accessory.Categories.SWITCH);
+
+        //@ts-ignore
+        this._infoService = new Service.AccessoryInformation();
+        this._infoService.setCharacteristic(Characteristic.Manufacturer, "Brandon Watson")
+        this._infoService.setCharacteristic(Characteristic.Model, "Device Button")
+        this._infoService.setCharacteristic(Characteristic.SerialNumber, "123-456-789");
+
+        this._switchService = new Service.Switch(
+            this.name,
+            'switchService'
+        )
+
+        this._switchService.getCharacteristic(Characteristic.On)
+            //@ts-ignore
+            .on("set", this.onSwitchSet)
+            .updateValue(this._buttonState)
+            .on("get", this.onSwitchGet);
+    }
+
+    /**
+     * Required by homebridge.
+     */
+    public name: string;
+
+    public platformAccessory: any;
+
+    /**
+     * Called by homebridge to gather services.
+     */
+    public getServices = (): Array<HAPNodeJS.Service> => {
+        return [this._infoService, this._switchService!];
+    }
+
+    /**
+     * Handler for switch set event
+     * @param callback The callback function to call when complete
+     */
+    private onSwitchSet = async (newState: boolean, callback: (error?: Error | null | undefined) => void) => {
+        if (!this._buttonInfo.IsStateful && newState === this._buttonState) {
+            return callback();
+        }
+
+        //Get device command if we don't have it
+        if (!this._device) {
+            this._device = this._dataProvider.getDeviceFromName(this._buttonInfo.DeviceName);
+        }
+
+        //Execute command
+        if (this._device) {
+            //change state if stateful
+            if (this._buttonInfo.IsStateful && this._buttonState != newState) {
+                this._buttonState = newState
+                await this._device.sendCommand(this._buttonInfo.ButtonName);
+            } else if (!this._buttonInfo.IsStateful) {
+                //Send the number of configured key presses
+                for (let i = 0; i < this._buttonInfo.NumberOfKeyPresses; i++) {
+                    await this._device.sendCommand(this._buttonInfo.ButtonName);
+                }
+                this._switchService.getCharacteristic(Characteristic.On).updateValue(false);
+                return callback(new Error("Normal Response"));
+            }
+        }
+        return callback();
+    }
+
+    /**
+     * Handler for switch get event
+     * @param callback The callback function to call when complete
+     */
+    private onSwitchGet = (callback: (error: Error | null, value: boolean) => void) => {
+        //Only return state if button is stateful
+        if (this._buttonInfo.IsStateful) {
+            return callback(null, this._buttonState);
+        } else {
+            return callback(null, false)
+        }
+
+    }
+
+    /**
+     * Helper function to generate a UUID
+     */
+    private generateUUID(): string { // Public Domain/MIT
+        var d = new Date().getTime();
+        if (typeof performance !== 'undefined' && typeof performance.now === 'function') {
+            d += performance.now(); //use high-precision timer if available
+        }
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+        });
+    }
+}

src/Accessories/index.ts

@@ -0,0 +1,3 @@
+export { ControlUnit } from './ControlUnit';
+export { DeviceButton } from './DeviceButton';
+export { IAccessory } from './IAccessory';

src/DataProviders/HarmonyDataProvider.ts

@@ -1,66 +1,64 @@
-import { Activity } from "../Models/Activity";
+import { IActivity } from "../Models/Config/IActivity";
-import { DeviceSetupItem } from "../Models/DeviceSetupItem";
+import { IDeviceSetupItem } from "../Models/Config/IDeviceSetupItem";
-import { Input, Matrix, Output } from "../Models/Matrix";
+import { IInput, IMatrix, IOutput } from "../Models/Config/IMatrix";
 import { RemoteKey } from '../Accessories/ControlUnit';
-import { sleep } from '../Util/Sleep';
+import { EventEmitter } from "events";
+import { ICommand } from '../Models/IDevice';
+import { IHub } from "../Models/Config/IHub";
+import { IDeviceConfig } from "../Models/Config/IDeviceConfig";
+import { HarmonyDevice } from "../Models/HarmonyDevice";
+import { HarmonyHub } from "../Models/HarmonyHub";
 
 let Characteristic: HAPNodeJS.Characteristic;
 
 const Harmony = require("harmony-websocket");
-interface IDevice {
-    id: string,
-    name: string,
-    supportsCommand(commandName: string): boolean,
-    getCommand(commandName: string): string,
-    commands: { [name: string]: string };
-    on: boolean;
-}
 
 interface IActivityState {
-    currentActivity: Activity
+    currentActivity: IActivity
 }
 
 interface IHarmonyDataProviderProps {
-    hubAddress: string,
+    hubs: Array<IHub>;
+    deviceConfigs: Array<IDeviceConfig>;
     log: any,
-    matrix: Matrix
+    matrix: IMatrix
 }
 
-class HarmonyDataProvider {
+class HarmonyDataProvider extends EventEmitter {
-    private harmony: any;
+    private _log: any;
-    private log: any;
+    private _hubsByDevice: { [deviceName: string]: string } = {};
-    private hubAddress: string = "";
+    private _hubs: { [hubName: string]: HarmonyHub } = {};
-    private connected: boolean = false;
+    // private _devicesByHub: { [hubName: string]: { [deviceName: string]: HarmonyDevice } } = {};
+    private _states: { [controlUnitName: string]: (IActivityState | undefined) } = {};
 
-    private devices: { [name: string]: IDevice; } = {};
+    private _matrix: IMatrix;
-    private states: { [controlUnitName: string]: (IActivityState | undefined) } = {};
-
-    private matrix: Matrix;
 
     constructor(props: IHarmonyDataProviderProps) {
-        this.log = props.log;
+        super();
-        this.hubAddress = props.hubAddress;
+        this._log = props.log;
-        this.matrix = props.matrix;
+        this._matrix = props.matrix;
-
+        props.deviceConfigs.forEach((deviceConfig: IDeviceConfig) => {
-        this.harmony = new Harmony();
+            this._hubsByDevice[deviceConfig.Name] = deviceConfig.Hub;
-
-        //Listeners
-        this.harmony.on('open', () => {
-            this.connected = true;
-        });
-        this.harmony.on('close', () => {
-            this.connected = false;
         });
+        // this._deviceConfigs = props.deviceConfigs;
 
-        this.connect();
+        this.connect(props.hubs);
+    }
+
+    // public get devicesByHub(): { [hubName: string]: { [deviceName: string]: HarmonyDevice } } {
+    //     return this._devicesByHub;
+    // }
+
+    public get hubs(): { [hubName: string]: HarmonyHub } {
+        return this._hubs;
     }
 
     /**
      * Power on all devices in an activity.
      */
-    public powerOn = async (controlUnitName: string, activity: Activity) => {
+    public powerOn = async (controlUnitName: string, activity: IActivity) => {
         //Only power on if not alread on
-        let currentActivity = this.states[controlUnitName] ? this.states[controlUnitName]!.currentActivity : undefined;
+        let currentActivity = this._states[controlUnitName] ? this._states[controlUnitName]!.currentActivity : undefined;
         if (!currentActivity) {
             await this.startActivity(controlUnitName, activity);
         }
@@ -70,96 +68,97 @@ class HarmonyDataProvider {
      * Power off all devices in an activity that aren't being used.
      */
     public powerOff = async (controlUnitName: string) => {
-        if (!this.states[controlUnitName]) {
+        if (!this._states[controlUnitName]) {
             return;
         }
         //Build potential list of devices to turn off
-        let devicesToTurnOff: Array<IDevice> = this.states[controlUnitName]!.currentActivity.deviceSetupItems
+        let devicesToTurnOff: Array<HarmonyDevice> = this._states[controlUnitName]!.currentActivity.DeviceSetupList
-            .map((value: DeviceSetupItem): IDevice => {
+            .map((value: IDeviceSetupItem): HarmonyDevice => {
-                return this.getDeviceFromName(value.deviceName);
+                return this.getDeviceFromName(value.DeviceName);
             });
 
         //Resolve device conflicts with other controlUnits
         devicesToTurnOff = this.sanitizeDeviceList(devicesToTurnOff, controlUnitName);
 
         //Turn off devices
-        devicesToTurnOff.forEach((device: IDevice) => {
+        devicesToTurnOff.forEach(async (device: HarmonyDevice) => {
-            this.powerOffDevice(device);
+            if (device) {
+                await device.powerOff();
+            }
         });
 
-        this.states[controlUnitName] = undefined;
+        this._states[controlUnitName] = undefined;
     }
 
     /**
      * Start an activity
      */
-    public startActivity = async (controlUnitName: string, activity: Activity) => {
+    public startActivity = async (controlUnitName: string, activity: IActivity) => {
-        this.log(`Starting activity ${activity.displayName} for controlUnit: ${controlUnitName}`)
+        this._log(`Starting activity ${activity.DisplayName} for controlUnit: ${controlUnitName}`)
-        let lastActivity: Activity | undefined = undefined;
+        let lastActivity: IActivity | undefined = undefined;
-        if (this.states[controlUnitName]) {
+        if (this._states[controlUnitName]) {
-            lastActivity = this.states[controlUnitName]!.currentActivity;
+            lastActivity = this._states[controlUnitName]!.currentActivity;
         }
 
         //Build potential list of devices to to turn on
-        let devicesToTurnOn: Array<IDevice> = activity.deviceSetupItems.map((value: DeviceSetupItem): IDevice => {
+        let devicesToTurnOn: Array<HarmonyDevice> = activity.DeviceSetupList.map((value: IDeviceSetupItem): HarmonyDevice => {
-            return this.getDeviceFromName(value.deviceName);
+            return this.getDeviceFromName(value.DeviceName);
         });
 
         //Resolve device conflicts with other controlUnits
         devicesToTurnOn = this.sanitizeDeviceList(devicesToTurnOn, controlUnitName);
 
         //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) {
                 if (!device.on) {
-                    this.log(`Turning on device ${device.name}`)
+                    this._log(`Turning on device ${device.name}`)
-                    await this.powerOnDevice(device);
+                    await device.powerOn();
                 }
             }
         }));
 
         //Assign correct input
         await Promise.all(
-            activity.deviceSetupItems.map(async (value: DeviceSetupItem) => {
+            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}`)) {
-                    let command: string = device.getCommand(`Input${value.input}`);
+                    await device.sendCommand(`Input${value.Input}`)
-                    await this.sendCommand(command);
                 }
             })
         );
 
-        if (activity.useMatrix) {
+        if (activity.UseMatrix) {
             //get input and output
-            let input: Input = this.matrix.inputs.filter(e => e.inputDevice === activity.controlDeviceId)[0];
+            let input: IInput = this._matrix.Inputs.filter(e => e.InputDevice === activity.ControlDevice)[0];
-            let output: Output = this.matrix.outputs.filter(e => e.outputDevice === activity.outputDeviceId)[0];
+            let output: IOutput = this._matrix.Outputs.filter(e => e.OutputDevice === activity.OutputDevice)[0];
 
-            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
             if (matrixDevice.supportsCommand(inputCommandName) && matrixDevice.supportsCommand(outputCommandName)) {
-                await this.sendCommand(matrixDevice.getCommand(outputCommandName));
+                await matrixDevice.sendCommand(outputCommandName);
-                await this.sendCommand(matrixDevice.getCommand(inputCommandName));
+                await matrixDevice.sendCommand(inputCommandName);
-                await this.sendCommand(matrixDevice.getCommand(outputCommandName));
+                await matrixDevice.sendCommand(outputCommandName);
-                await this.sendCommand(matrixDevice.getCommand(inputCommandName));
+                await matrixDevice.sendCommand(inputCommandName);
             }
         }
 
         //Build potential list of devices to turn off
         if (lastActivity) {
-            let devicesToTurnOff: Array<IDevice> = lastActivity.deviceSetupItems.map((value: DeviceSetupItem): 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
             //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.deviceSetupItems.some(e => {
+                if (device && device.name && activity.DeviceSetupList.some(e => {
-                    return (e && e.deviceName === device.name)
+                    return (e && e.DeviceName === device.name)
                 })) {
                     delete devicesToTurnOff[index];
                 }
@@ -168,15 +167,15 @@ class HarmonyDataProvider {
             //Resolve device conflicts with other controlUnits
             devicesToTurnOff = this.sanitizeDeviceList(devicesToTurnOff, controlUnitName);
 
-            this.log(`Sanatized devices to turn off: ${JSON.stringify(devicesToTurnOff.map(e => e ? e.name : ""))}`);
+            this._log(`Sanatized devices to turn off: ${JSON.stringify(devicesToTurnOff.map(e => e ? e.name : ""))}`);
 
             await Promise.all(
                 //Turn off devices
-                devicesToTurnOff.map(async (device: IDevice) => {
+                devicesToTurnOff.map(async (device: HarmonyDevice) => {
                     if (device) {
                         if (device.on) {
-                            this.log(`Turning off device ${device.name}`)
+                            this._log(`Turning off device ${device.name}`)
-                            await this.powerOffDevice(device);
+                            await device.powerOff();
                         }
                     }
                 })
@@ -185,7 +184,7 @@ class HarmonyDataProvider {
         }
 
         //Assign current activity
-        this.states[controlUnitName] = { currentActivity: activity };
+        this._states[controlUnitName] = { currentActivity: activity };
     }
 
     /**
@@ -193,11 +192,9 @@ class HarmonyDataProvider {
      */
     public volumeUp = async (controlUnitName: string) => {
         let volumeUpCommand: string = "Volume Up"
-        if (this.states[controlUnitName]) {
+        if (this._states[controlUnitName]) {
-            let volumeDevice: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.volumeDeviceId);
+            let volumeDevice: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice);
-            if (volumeDevice.supportsCommand(volumeUpCommand)) {
+            await volumeDevice.sendCommand(volumeUpCommand);
-                this.sendCommand(volumeDevice.getCommand(volumeUpCommand));
-            }
         }
     }
 
@@ -206,11 +203,9 @@ class HarmonyDataProvider {
      */
     public volumeDown = async (controlUnitName: string) => {
         let volumeDownCommand: string = "Volume Down"
-        if (this.states[controlUnitName]) {
+        if (this._states[controlUnitName]) {
-            let volumeDevice: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.volumeDeviceId);
+            let volumeDevice: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.VolumeDevice);
-            if (volumeDevice.supportsCommand(volumeDownCommand)) {
+            await volumeDevice.sendCommand(volumeDownCommand);
-                this.sendCommand(volumeDevice.getCommand(volumeDownCommand));
-            }
         }
     }
 
@@ -221,10 +216,10 @@ class HarmonyDataProvider {
      * @param key The key to send.
      */
     public sendKeyPress = async (controlUnitName: string, key: any) => {
-        if (this.states[controlUnitName]) {
+        if (this._states[controlUnitName]) {
             let commandName: string = "";
 
-            let device: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.controlDeviceId);
+            let device: HarmonyDevice = this.getDeviceFromName(this._states[controlUnitName]!.currentActivity.ControlDevice);
             switch (key) {
                 case RemoteKey.ARROW_UP: {
                     commandName = "Direction Up";
@@ -264,9 +259,7 @@ class HarmonyDataProvider {
                 }
             }
 
-            if (device && device.supportsCommand(commandName)) {
+            await device.sendCommand(commandName);
-                this.sendCommand(device.getCommand(commandName));
-            }
         }
     }
 
@@ -274,90 +267,54 @@ class HarmonyDataProvider {
      * Return if a control unit is active
      * @param controlUnitName 
      */
-    public getIsActive(controlUnitName: string): Activity | undefined {
+    public getIsActive(controlUnitName: string): IActivity | undefined {
-        return this.states[controlUnitName] ? this.states[controlUnitName]!.currentActivity : undefined;
+        return this._states[controlUnitName] ? this._states[controlUnitName]!.currentActivity : undefined;
-    }
-
-    /**
-     * Connect to harmony and receive device info
-     */
-    private connect = async () => {
-        await this.harmony.connect(this.hubAddress);
-        let self = this;
-
-        setTimeout(async function () {
-            if (self.connected) {
-                let devices: any = await self.harmony.getDevices();
-                try {
-                    await Promise.all(
-                        //Add each to dictionary
-                        devices.map(async (dev: any) => {
-                            //get commands
-                            let commands: { [name: string]: string } = {};
-                            let deviceCommands: any = await self.harmony.getDeviceCommands(dev.id);
-                            deviceCommands.forEach((command: any) => {
-                                commands[command.label] = command.action;
-                            });
-                            self.devices[dev.label] = {
-                                id: dev.id,
-                                name: dev.label,
-                                commands: commands,
-                                on: false,
-                                //Define device methods
-                                supportsCommand(commandName: string): boolean {
-                                    let command = commands[commandName];
-                                    return (command) ? true : false;
-                                },
-                                getCommand(commandName: string): string {
-                                    return commands[commandName];
-                                }
-                            }
-                        }));
-                    self.log(`Harmony data provider ready`);
-
-                } catch (err) {
-                    self.log(`ERROR - error connecting to harmony: ${err}`);
-                }
-            }
-        }, 1000);
-    }
-
-    /**
-     * Power off a device (Power toggle if no power off).
-     */
-    private powerOffDevice = async (device: IDevice) => {
-        let powerOffCommand: string = "Power Off";
-        let powerToggleCommand: string = "Power Toggle";
-        if (device && device.supportsCommand(powerOffCommand)) {
-            await this.sendCommand(device.getCommand(powerOffCommand));
-            device.on = false;
-        } else if (device && device.supportsCommand(powerToggleCommand)) {
-            await this.sendCommand(device.getCommand(powerToggleCommand));
-            device.on = false;
-        }
-    }
-
-    /**
-     * Power on a device (Power toggle if no power on).
-     */
-    private powerOnDevice = async (device: IDevice) => {
-        let powerOnCommand: string = "Power On";
-        let powerToggleCommand: string = "Power Toggle";
-        if (device && device.supportsCommand(powerOnCommand)) {
-            await this.sendCommand(device.getCommand(powerOnCommand));
-            device.on = true;
-        } else if (device && device.supportsCommand(powerToggleCommand)) {
-            await this.sendCommand(device.getCommand(powerToggleCommand));
-            device.on = true;
-        }
     }
 
     /**
      * Get the IDevice by name.
      * @param deviceName The device to retrieve.
      */
-    private getDeviceFromName(deviceName: string): IDevice {
+    public getDeviceFromName(deviceName: string): HarmonyDevice {
-        return this.devices[deviceName];
+        let device: HarmonyDevice | undefined;
+        try {
+            device = this._hubs[this._hubsByDevice[deviceName]].getDeviceByName(deviceName);
+        } catch (err) {
+            this._log(`Error retrieving device from hub: ${err}`);
+        }
+
+        return device!;
+    }
+
+    // /**
+    //  * Gets device button commands
+    //  * @param deviceCommandName The device command name
+    //  * @param deviceName The device name
+    //  */
+    // public getCommand(deviceCommandName: string, deviceName: string): ICommand | undefined {
+    //     const device: HarmonyDevice = this.getDeviceFromName(deviceName);
+    //     if (device && device.supportsCommand(deviceCommandName)) {
+    //         return device.getCommand(deviceCommandName);
+    //     } else {
+    //         return undefined;
+    //     }
+    // }
+
+    private connect = async (hubs: Array<IHub>) => {
+        let readyCount = 0;
+        await Promise.all(
+            hubs.map(async (hub: IHub): Promise<void> => {
+                const newHarmonyHub = new HarmonyHub(hub.Name, hub.Ip, this._log);
+                this._hubs[hub.Name] = newHarmonyHub;
+                newHarmonyHub.on("Ready", () => {
+                    readyCount++;
+                    if (readyCount === Object.keys(this._hubs).length) {
+                        this.emit("Ready");
+                    }
+                })
+                await newHarmonyHub.initialize();
+            })
+        )
     }
 
     /**
@@ -365,19 +322,19 @@ class HarmonyDataProvider {
      * @param devicesToTurnOn The list of devices to modify.
      * @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
             if (controlUnitKey === controlUnitName) {
                 continue;
             }
-            let currentOtherState: IActivityState = this.states[controlUnitKey]!;
+            let currentOtherState: IActivityState = this._states[controlUnitKey]!;
 
             if (currentOtherState) {
-                currentOtherState.currentActivity.deviceSetupItems.forEach((value: DeviceSetupItem) => {
+                currentOtherState.currentActivity.DeviceSetupList.forEach((value: IDeviceSetupItem) => {
                     //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)];
                     }
                 });
@@ -386,23 +343,6 @@ class HarmonyDataProvider {
 
         return devicesToTurnOn;
     }
-
-    /**
-     * Send a command to the harmony hub.
-     * @param command The command to send.
-     */
-    private sendCommand = async (command: string) => {
-        try {
-            //Execute command
-            let response = await this.harmony.sendCommand(JSON.stringify(command));
-
-            //Sleep
-            await sleep(800);
-        } catch (err) {
-            this.log(`ERROR - error sending command to harmony: ${err}`);
-        }
-
-    }
 }
 
 export default HarmonyDataProvider;

src/Models/Activity.ts

@@ -1,69 +0,0 @@
-import { DeviceSetupItem } from './DeviceSetupItem';
-/**
- * Input properties.
- */
-export interface IActivityProps {
-    deviceList: Array<DeviceSetupItem>,
-    controlDeviceId: string,
-    volumeDeviceId: string,
-    outputDeviceId: string,
-    displayName: string
-    useMatrix: boolean,
-}
-
-/**
- * Data model class to hold activity related information.
- */
-export class Activity {
-    private _volumeDeviceId: string = "";
-    private _outputDeviceId: string = "";
-    private _controlDeviceId: string = "";
-    private _displayName: string = "";
-    private _deviceSetupItems: Array<DeviceSetupItem>;
-    private _useMatrix: boolean = false;
-
-    constructor(props: IActivityProps) {
-        this._controlDeviceId = props.controlDeviceId;
-        this._outputDeviceId = props.outputDeviceId;
-        this._volumeDeviceId = props.volumeDeviceId;
-        this._displayName = props.displayName;
-        this._deviceSetupItems = props.deviceList;
-        this._useMatrix = props.useMatrix
-    }
-
-    /**
-     * The device associated with main control.
-     */
-    public get controlDeviceId(): string {
-        return this._controlDeviceId;
-    };
-
-    /**
-     * The device associated with the volume control.
-     */
-    public get volumeDeviceId(): string {
-        return this._volumeDeviceId
-    };
-
-    /**
-     * The device associated with output.
-     */
-    public get outputDeviceId(): string {
-        return this._outputDeviceId;
-    };
-
-    /**
-     * The display name of the activity.
-     */
-    public get displayName(): string {
-        return this._displayName;
-    }
-
-    public get deviceSetupItems(): Array<DeviceSetupItem> {
-        return this._deviceSetupItems
-    }
-
-    public get useMatrix(): boolean {
-        return this._useMatrix;
-    }
-}

src/Models/Config/IActivity.ts

@@ -0,0 +1,11 @@
+import { IDeviceSetupItem } from './IDeviceSetupItem';
+
+export interface IActivity {
+    OutputDevice: string;
+    VolumeDevice: string;
+    ControlDevice: string;
+    DisplayName: string;
+    DeviceSetupList: Array<IDeviceSetupItem>;
+    UseMatrix: boolean;
+
+}

src/Models/Config/IConfig.ts

@@ -0,0 +1,20 @@
+import { IMatrix } from "./IMatrix";
+import { IActivity } from "./IActivity";
+import { IDeviceButton } from "./IDeviceButton";
+import { IDeviceConfig } from "./IDeviceConfig";
+import { IHub } from './IHub';
+
+export interface IControlUnit {
+    DisplayName: string;
+    Activities: Array<IActivity>;
+}
+
+export interface IConfig {
+    hubIp: string;
+    EmitDevicesOnStartup: boolean;
+    Matrix: IMatrix;
+    ControlUnits: Array<IControlUnit>;
+    DeviceButtons: Array<IDeviceButton>;
+    Devices: Array<IDeviceConfig>;
+    Hubs: Array<IHub>;
+}

src/Models/Config/IDeviceButton.ts

@@ -0,0 +1,7 @@
+export interface IDeviceButton {
+    DeviceName: string;
+    ButtonName: string;
+    DisplayName: string;
+    NumberOfKeyPresses: number;
+    IsStateful: boolean;
+}

src/Models/Config/IDeviceConfig.ts

@@ -0,0 +1,4 @@
+export interface IDeviceConfig {
+    Name: string;
+    Hub: string;
+}

src/Models/Config/IDeviceSetupItem.ts

@@ -0,0 +1,5 @@
+
+export interface IDeviceSetupItem {
+    DeviceName: string;
+    Input: string;
+}

src/Models/Config/IHub.ts

@@ -0,0 +1,5 @@
+export interface IHub {
+    Name: string;
+    Ip: string;
+    Harmony: any;
+}

src/Models/Config/IMatrix.ts

@@ -0,0 +1,15 @@
+export interface IInput {
+    InputNumber: string,
+    InputDevice: string,
+}
+
+export interface IOutput {
+    OutputLetter: string,
+    OutputDevice: string,
+}
+
+export interface IMatrix {
+    Inputs: Array<IInput>;
+    Outputs: Array<IOutput>;
+    DeviceName: string;
+}

src/Models/Config/index.ts

@@ -0,0 +1,5 @@
+export * from './IActivity';
+export * from './IConfig';
+export * from './IDeviceButton';
+export * from './IDeviceSetupItem';
+export * from './IMatrix';

src/Models/DeviceSetupItem.ts

@@ -1,25 +0,0 @@
-
-export interface IDeviceSetupItemProps {
-    deviceName: string,
-    input: string
-}
-
-/**
- * Data model to hold device setup items.
- */
-export class DeviceSetupItem {
-    private _deviceId: string = "";
-    private _input: string = "";
-    constructor(props: IDeviceSetupItemProps) {
-        this._deviceId = props.deviceName;
-        this._input = props.input;
-    }
-
-    public get deviceName() {
-        return this._deviceId;
-    }
-
-    public get input() {
-        return this._input;
-    }
-}

src/Models/HarmonyDevice.ts

@@ -0,0 +1,94 @@
+import { ICommand } from "./IDevice";
+import { sleep } from "../Util/Sleep";
+
+export interface IHarmonyDeviceProps {
+    id: string;
+    name: string;
+    harmony: any;
+    log: any;
+    commands: { [name: string]: ICommand };
+}
+
+export class HarmonyDevice {
+    private _harmony: any;
+    private _log: any;
+    private _commands: { [name: string]: ICommand } = {};
+    private _on: boolean;
+
+    constructor(props: IHarmonyDeviceProps) {
+        this.id = props.id;
+        this.name = props.name;
+        this._harmony = props.harmony;
+        this._on = false;
+        this._commands = props.commands;
+    }
+
+    public id: string;
+    public name: string;
+
+    public get on(): boolean {
+        return this._on;
+    }
+
+    public get commands(): { [name: string]: ICommand } {
+        return this._commands;
+    }
+
+    //Define device methods
+    public supportsCommand(commandName: string): boolean {
+        let command = this._commands[commandName];
+        return (command) ? true : false;
+    }
+
+    public getCommand(commandName: string): ICommand {
+        return this._commands[commandName];
+    }
+
+    public 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;
+        }
+    }
+
+    public 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;
+        }
+    }
+
+    public async sendCommand(commandName: string): Promise<void> {
+        let command!: ICommand;
+        if (this.supportsCommand(commandName)) {
+            command = this.getCommand(commandName);
+        }
+
+        try {
+            //Execute command
+            //HACK to fix Harmon Kardon receiver not turning off
+            if (command.command === "PowerOff") {
+                for (let i = 0; i < 2; i++) {
+                    await this._harmony.sendCommand(JSON.stringify(command));
+                }
+
+            }
+            await this._harmony.sendCommand(JSON.stringify(command));
+
+            //Sleep
+            await sleep(800);
+        } catch (err) {
+            this._log(`ERROR - error sending command to harmony: ${err}`);
+        }
+    }
+}

src/Models/HarmonyHub.ts

@@ -0,0 +1,68 @@
+import { HarmonyDevice } from './HarmonyDevice';
+const Harmony = require("harmony-websocket");
+import { ICommand } from './IDevice';
+import { EventEmitter } from 'events';
+
+
+
+export class HarmonyHub extends EventEmitter {
+    private _devices: { [deviceName: string]: HarmonyDevice } = {}
+    private _ip: string;
+    private _harmony: any;
+    private _log: any;
+    private _name: string;
+
+    constructor(hubName: string, ipAddress: string, log: any) {
+        super();
+        this._ip = ipAddress;
+        this._log = log;
+        this._name = hubName;
+    }
+
+    public get devices(): { [deviceName: string]: HarmonyDevice } {
+        return this._devices;
+    }
+
+    public get hubName(): string {
+        return this._name;
+    }
+
+    public getDeviceByName = (deviceName: string): HarmonyDevice => {
+        return this._devices[deviceName];
+    }
+
+    public initialize = async () => {
+        this._harmony = new Harmony();
+        await this._harmony.connect(this._ip);
+
+        //Gather devices
+        let devices: any = await this._harmony.getDevices();
+        try {
+            await Promise.all(
+                //Add each to dictionary
+                devices.map(async (dev: any) => {
+                    //get commands
+                    let commands: { [name: string]: ICommand } = {};
+                    let deviceCommands: any = await this._harmony.getDeviceCommands(dev.id);
+                    deviceCommands.forEach((command: any) => {
+                        commands[command.label] = command.action;
+                    });
+                    this._devices[dev.label] = new HarmonyDevice({
+                        id: dev.id,
+                        name: dev.label,
+                        commands: commands,
+                        log: this._log,
+                        harmony: this._harmony
+                    });
+                }));
+            this.emit("Ready");
+
+        } catch (err) {
+            this._log(`ERROR - error connecting to harmony: ${err}`);
+        }
+    }
+
+    private connect = async (): Promise<void> => {
+        await this._harmony.Connect(this._ip);
+    }
+}

src/Models/IDevice.ts

@@ -0,0 +1,19 @@
+export interface ICommand {
+    command?: string,
+    deviceId?: string,
+    type?: string
+}
+
+export interface IDevice {
+    id: string;
+    name: string;
+    harmony: any;
+    log: any
+    supportsCommand(commandName: string): boolean,
+    getCommand(commandName: string): ICommand,
+    powerOn(): Promise<void>;
+    powerOff(): Promise<void>;
+    sendCommand(commandName: string): Promise<void>;
+    commands: { [name: string]: ICommand };
+    on: boolean;
+}

src/Models/Matrix.ts

@@ -1,42 +0,0 @@
-export interface IMatrixProps {
-    inputs: Array<Input>,
-    outputs: Array<Output>,
-    deviceName: string,
-}
-
-export interface Input {
-    inputNumber: string,
-    inputDevice: string,
-}
-
-export interface Output {
-    outputLetter: string,
-    outputDevice: string,
-}
-
-/**
- * Data model to hold matrix information.
- */
-export class Matrix {
-    private _inputs: Array<Input> = [];
-    private _outputs: Array<Output> = [];
-    private _deviceName: string;
-
-    constructor(props: IMatrixProps) {
-        this._inputs = props.inputs;
-        this._outputs = props.outputs;
-        this._deviceName = props.deviceName;
-    }
-
-    public get inputs(): Array<Input> {
-        return this._inputs
-    }
-
-    public get outputs(): Array<Output> {
-        return this._outputs;
-    }
-
-    public get deviceName(): string {
-        return this._deviceName;
-    }
-}

src/Models/index.ts

@@ -0,0 +1 @@
+export * from './IDevice';

src/index.ts

@@ -1,8 +1,9 @@
-import { ControlUnit } from "./Accessories/ControlUnit";
+import * as Accessories from "./Accessories";
-import { Activity } from "./Models/Activity";
-import { DeviceSetupItem } from "./Models/DeviceSetupItem";
-import { Input, Output, Matrix } from "./Models/Matrix";
 import HarmonyDataProvider from "./DataProviders/HarmonyDataProvider";
+import * as Config from "./Models/Config";
+import { IDevice } from "./Models";
+import { HarmonyDevice } from "./Models/HarmonyDevice";
+import { HarmonyHub } from "./Models/HarmonyHub";
 
 let Accessory: any;
 let Homebridge: any;
@@ -24,10 +25,10 @@ export default function (homebridge: any) {
 
 class HarmonyMatrixPlatform {
     log: any = {};
-    config: any = {};
+    config: Config.IConfig;
     api: any;
     dataProvider: HarmonyDataProvider | null;
-    controlUnits: Array<ControlUnit> = [];
+    accessoryList: Array<Accessories.IAccessory> = [];
 
     constructor(log: any, config: any, api: any) {
         this.log = log;
@@ -37,7 +38,37 @@ class HarmonyMatrixPlatform {
         this.api.on('didFinishLaunching', this.didFinishLaunching.bind(this));
 
         this.dataProvider = null;
-        this.log("This is new");
+
+        if (this.config) {
+            //construct data provider
+            this.dataProvider = new HarmonyDataProvider({
+                hubs: this.config.Hubs,
+                deviceConfigs: this.config.Devices,
+                matrix: this.config.Matrix,
+                log: this.log
+            });
+
+            //Emit devices if requested
+
+            this.dataProvider.on("Ready", () => {
+                this.log("All hubs connected");
+                if (this.config.EmitDevicesOnStartup) {
+                    const hubs = this.dataProvider!.hubs;
+                    Object.values(hubs).forEach((hub: HarmonyHub) => {
+                        const deviceDictionary = hub.devices;
+                        this.log(`${hub.hubName}`)
+
+                        Object.values(deviceDictionary).forEach((device: HarmonyDevice) => {
+                            this.log(`    ${device.name} : ${device.id}`);
+                            Object.keys(device.commands).forEach((command: string) => {
+                                this.log(`        ${command}`);
+                            });
+                        });
+                    });
+                }
+            });
+
+        }
     }
 
     /**
@@ -48,115 +79,44 @@ class HarmonyMatrixPlatform {
         this.log(`Publishing external accessories`);
 
         //This is required in order to have multiple tv remotes on one platform
-        this.controlUnits.forEach((accessory: ControlUnit) => {
+        this.accessoryList.forEach((accessory: Accessories.IAccessory) => {
-            this.api.publishExternalAccessories("HarmonyMatrixPlatform", [accessory.platformAccessory]);
+            if (accessory instanceof Accessories.ControlUnit) {
+                this.api.publishExternalAccessories("HarmonyMatrixPlatform", [accessory.platformAccessory]);
+            }
         })
-
     }
 
     /**
      * Called by homebridge to gather accessories.
      * @param callback 
      */
-    accessories(callback: (accessories: Array<ControlUnit>) => void) {
+    accessories(callback: (accessories: Array<Accessories.IAccessory>) => void) {
-        //Parse ip
-        let hubIp: string = this.config["hubIp"];
 
-        //Parse matrix
+        //Add control units
-        let configInputs: any = this.config["Matrix"]["Inputs"];
+        this.config.ControlUnits.forEach((unit: Config.IControlUnit) => {
-        let configOutputs: any = this.config["Matrix"]["Outputs"];
+            this.accessoryList.push(new Accessories.ControlUnit({
-        let matrixName: string = this.config["Matrix"]["DeviceName"];
-
-        let inputs: Array<Input> = [];
-        let outputs: Array<Output> = [];
-
-        configInputs.forEach((configInput: any) => {
-            let inputDevice: string = configInput["InputDevice"];
-            let inputNumber: string = configInput["InputNumber"];
-
-            this.log(`INFO - Added input to matrix '${inputDevice}'`);
-
-            inputs.push({
-                inputDevice: inputDevice,
-                inputNumber: inputNumber
-            });
-        });
-        configOutputs.forEach((configOutput: any) => {
-            let outputDevice: string = configOutput["OutputDevice"];
-            let outputLetter: string = configOutput["OutputLetter"];
-
-            this.log(`INFO - Added output to matrix '${outputDevice}'`);
-
-            outputs.push({
-                outputDevice: outputDevice,
-                outputLetter: outputLetter
-            });
-
-        });
-
-        let matrix = new Matrix({
-            inputs: inputs,
-            outputs: outputs,
-            deviceName: matrixName,
-        });
-
-        //construct data provider
-        this.dataProvider = new HarmonyDataProvider({
-            hubAddress: hubIp,
-            matrix: matrix,
-            log: this.log
-        });
-
-        //Parse control units
-        let configControlUnits: any = this.config["ControlUnits"];
-
-        configControlUnits.forEach((configControlUnit: any) => {
-            //Parse activities list
-            let configActivities: any = configControlUnit["Activities"];
-            let activities: Array<Activity> = [];
-            configActivities.forEach((configActivity: any) => {
-                //parse devices
-                let configDevices: any = configActivity["DeviceSetupList"];
-                let devices: Array<DeviceSetupItem> = [];
-                configDevices.forEach((configDevice: any) => {
-                    //Add device
-                    devices.push(new DeviceSetupItem({
-                        deviceName: configDevice["DeviceName"],
-                        input: configDevice["Input"]
-                    }));
-                    this.log(`INFO - Added device '${configDevice["DeviceName"]}' for activity '${configActivity["DisplayName"]}'`);
-                });
-
-                //Add activity
-                activities.push(new Activity({
-                    volumeDeviceId: configActivity["VolumeDevice"],
-                    controlDeviceId: configActivity["ControlDevice"],
-                    outputDeviceId: configActivity["OutputDevice"],
-                    displayName: configActivity["DisplayName"],
-                    useMatrix: configActivity["UseMatrix"] === "true" ? true : false,
-                    deviceList: devices
-                }));
-                this.log(`INFO - Added activity '${configActivity["DisplayName"]}'`);
-            });
-
-            let controlUnit: ControlUnit = new ControlUnit({
                 dataProvider: this.dataProvider!,
-                displayName: configControlUnit["DisplayName"],
+                displayName: unit.DisplayName,
                 api: this.api,
                 log: this.log,
-                activities: activities,
+                activities: unit.Activities,
                 homebridge: Homebridge,
-            });
+            }));
-
-            //@ts-ignore
-            let accessory = controlUnit as homebridge.platformAccessory;
-            //@ts-ignore
-
-            //Add control unit
-            this.controlUnits.push(accessory);
-
-            this.log(`INFO - Added ControlUnit`);
         });
-        callback(this.controlUnits);
+
+        //Add device buttons
+        this.config.DeviceButtons.forEach((button: Config.IDeviceButton) => {
+            this.accessoryList.push(new Accessories.DeviceButton({
+                dataProvider: this.dataProvider!,
+                buttonName: button.ButtonName,
+                displayName: button.DisplayName,
+                deviceInfo: button,
+                api: this.api,
+                log: this.log,
+                homebridge: Homebridge,
+
+            }))
+        });
+        callback(this.accessoryList);
     }
 }