Merge pull request #19 from sajmonr/6-hubspace-outlet

6 hubspace outlet

Author: sajmonr

src/accessories/device-accessory-factory.ts

@@ -5,6 +5,7 @@ import { HubspacePlatform } from '../platform';
 import { FanAccessory } from './fan-accessory';
 import { HubspaceAccessory } from './hubspace-accessory';
 import { LightAccessory } from './light-accessory';
+import { OutletAccessory } from './outlet-accessory';
 
 /**
  * Creates {@link HubspaceAccessory} for a specific {@link DeviceType}
@@ -20,6 +21,8 @@ export function createAccessoryForDevice(device: Device, platform: HubspacePlatf
             return new LightAccessory(platform, accessory);
         case DeviceType.Fan:
             return new FanAccessory(platform, accessory);
+        case DeviceType.Outlet:
+            return new OutletAccessory(platform, accessory);
         default:
             throw new Error(`Accessory of type '${device.type}' is not supported.`);
     }

src/accessories/outlet-accessory.ts

@@ -0,0 +1,45 @@
+import { CharacteristicValue, PlatformAccessory } from 'homebridge';
+import { DeviceFunction } from '../models/device-functions';
+import { HubspacePlatform } from '../platform';
+import { isNullOrUndefined } from '../utils';
+import { HubspaceAccessory } from './hubspace-accessory';
+
+export class OutletAccessory extends HubspaceAccessory{
+
+    /**
+     * Crates a new instance of the accessory
+     * @param platform Hubspace platform
+     * @param accessory Platform accessory
+     */
+    constructor(platform: HubspacePlatform, accessory: PlatformAccessory) {
+        super(platform, accessory, platform.Service.Outlet);
+
+        this.configurePower();
+    }
+
+    private configurePower(): void{
+        if(this.supportsFunction(DeviceFunction.OutletPower)){
+            this.service.getCharacteristic(this.platform.Characteristic.On)
+                .onGet(this.getOn.bind(this))
+                .onSet(this.setOn.bind(this));
+        }
+    }
+
+    private async getOn(): Promise<CharacteristicValue>{
+        // Try to get the value
+        const value = await this.deviceService.getValueAsBoolean(this.device.deviceId, DeviceFunction.OutletPower);
+
+        // If the value is not defined then show 'Not Responding'
+        if(isNullOrUndefined(value)){
+            throw new this.platform.api.hap.HapStatusError(this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+        }
+
+        // Otherwise return the value
+        return value!;
+    }
+
+    private async setOn(value: CharacteristicValue): Promise<void>{
+        await this.deviceService.setValue(this.device.deviceId, DeviceFunction.OutletPower, value);
+    }
+
+}

src/models/device-functions.ts

@@ -8,6 +8,7 @@ export enum DeviceFunction{
     Brightness,
     FanPower,
     FanSpeed
+    OutletPower,
 }
 
 /**
@@ -37,6 +38,11 @@ export const DeviceFunctions: DeviceFunctionDef[] = [
         attributeId: 6,
         functionClass: 'fan-speed',
         functionInstanceName: 'fan-speed'
+    },
+    {
+        type: DeviceFunction.OutletPower,
+        attributeId: 2,
+        functionClass: 'power'
     }
 ];
 

src/models/device-type.ts

@@ -1,9 +1,10 @@
-/** 
+/**
  * Type of a device
  */
 export enum DeviceType{
     Light = 'light',
-    Fan = 'fan'
+    Fan = 'fan',
+    Outlet = 'power-outlet'
 }
 
 /**
@@ -17,6 +18,8 @@ export function getDeviceTypeForKey(key: string): DeviceType | undefined{
             return DeviceType.Light;
         case 'fan':
             return DeviceType.Fan;
+        case 'power-outlet':
+            return DeviceType.Outlet;
         default:
             return undefined;
     }

src/responses/devices-response.ts

@@ -10,10 +10,10 @@ export interface DeviceResponse{
     typeId: string;
     friendlyName: string;
     description: {
-        key: string;
         device: {
             manufacturerName: string;
             model: string;
+            deviceClass: string;
         };
         functions: DeviceFunctionResponse[];
     };

src/services/discovery.service.ts

@@ -108,7 +108,7 @@ export class DiscoveryService{
     }
 
     private mapDeviceResponseToModel(response: DeviceResponse): Device | undefined{
-        const type = getDeviceTypeForKey(response.description.key);
+        const type = getDeviceTypeForKey(response.description.device.deviceClass);
 
         if(!type) return undefined;