@switchbot/homebridge-switchbot 1.3.0 → 1.3.1-beta.0

package/src/devices/humidifiers.ts

@@ -630,7 +630,7 @@ export class Humidifier {
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Humidifier: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Humidifier: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`

package/src/devices/indoorcam.ts

@@ -10,8 +10,13 @@ export class IndoorCam {
   private service: Service;
 
   // Characteristic Values
-  On!: CharacteristicValue;
-  OutletInUse!: CharacteristicValue;
+  Active!: CharacteristicValue;
+  SetupEndpoints!: CharacteristicValue;
+  StreamingStatus!: CharacteristicValue;
+  SupportedRTPConfiguration!: CharacteristicValue;
+  SelectedRTPStreamConfiguration!: CharacteristicValue;
+  SupportedVideoStreamConfiguration!: CharacteristicValue;
+  SupportedAudioStreamConfiguration!: CharacteristicValue;
 
   // OpenAPI Others
   deviceStatus!: deviceStatusResponse;
@@ -29,9 +34,12 @@ export class IndoorCam {
     private accessory: PlatformAccessory,
     public device: device & devicesConfig,
   ) {
+    // Indoor Cam Config
+    this.platform.device(`Indoor Cam: ${this.accessory.displayName} Config: (hide_device: ${device.hide_device})`);
+
+    this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} was added but will not work as OpenAPI doesn't support it yet.`);
     // default placeholders
-    this.On = false;
-    this.OutletInUse = true;
+    this.SelectedRTPStreamConfiguration;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doCameraUpdate = new Subject();
@@ -50,8 +58,8 @@ export class IndoorCam {
     // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
     // you can create multiple services for each accessory
     (this.service =
-      accessory.getService(this.platform.Service.Outlet) ||
-      accessory.addService(this.platform.Service.Outlet)), `${accessory.displayName} Indoor Camera`;
+      accessory.getService(this.platform.Service.CameraRTPStreamManagement) ||
+      accessory.addService(this.platform.Service.CameraRTPStreamManagement)), `${accessory.displayName} Indoor Camera`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -65,9 +73,26 @@ export class IndoorCam {
     // see https://developers.homebridge.io/#/service/WindowCovering
 
     // create handlers for required characteristics
-    this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+    this.service.getCharacteristic(this.platform.Characteristic.Active)
+      .onSet(this.ActiveSet.bind(this));
+
+    this.service.getCharacteristic(this.platform.Characteristic.SelectedRTPStreamConfiguration)
+      .onSet(this.SelectedRTPStreamConfigurationSet.bind(this));
+
+    this.service.getCharacteristic(this.platform.Characteristic.SetupEndpoints)
+      .onSet(this.SetupEndpointsSet.bind(this));
+
+    this.service.getCharacteristic(this.platform.Characteristic.StreamingStatus)
+      .onSet(this.StreamingStatusSet.bind(this));
 
-    this.service.setCharacteristic(this.platform.Characteristic.OutletInUse, this.OutletInUse || true);
+    this.service.getCharacteristic(this.platform.Characteristic.SupportedAudioStreamConfiguration)
+      .onSet(this.SupportedAudioStreamConfigurationSet.bind(this));
+
+    this.service.getCharacteristic(this.platform.Characteristic.SupportedRTPConfiguration)
+      .onSet(this.SupportedRTPConfigurationSet.bind(this));
+
+    this.service.getCharacteristic(this.platform.Characteristic.SupportedVideoStreamConfiguration)
+      .onSet(this.SupportedVideoStreamConfigurationSet.bind(this));
 
     // Update Homekit
     this.updateHomeKitCharacteristics();
@@ -108,14 +133,7 @@ export class IndoorCam {
   }
 
   parseStatus() {
-    switch (this.deviceStatus.body.power) {
-      case 'on':
-        this.On = true;
-        break;
-      default:
-        this.On = false;
-    }
-    this.platform.debug(`Indoor Cam ${this.accessory.displayName} On: ${this.On}`);
+    this.platform.debug(`Indoor Cam ${this.accessory.displayName} SelectedRTPStreamConfiguration: ${this.SelectedRTPStreamConfiguration}`);
   }
 
 
@@ -146,45 +164,37 @@ export class IndoorCam {
  * Camera   -    "command"     "turnOn"    "default"	  =        set to ON state
  */
   async pushChanges() {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-    } as payload;
-
-    if (this.On) {
-      payload.command = 'turnOn';
+    if (!this.Active) {
+      const payload = {
+        commandType: 'command',
+        parameter: 'default',
+        command: 'turnOn',
+      } as payload;
+
+      this.platform.log.info(`Indoor Cam: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+
+      // Make the API request
+      const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
+      this.platform.debug(`Indoor Cam: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+      this.statusCode(push);
+      this.refreshStatus();
     } else {
-      payload.command = 'turnOff';
+      this.platform.device(`Indoor Cam: ${this.accessory.displayName} No pushChanges. Active: ${this.Active}`);
     }
-
-    this.platform.log.info(`Indoor Cam: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-      + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
-
-    // Make the API request
-    const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
-    this.statusCode(push);
-    this.refreshStatus();
   }
 
   updateHomeKitCharacteristics() {
-    if (this.On === undefined) {
-      this.platform.debug(`Indoor Cam: ${this.accessory.displayName} On: ${this.On}`);
+    if (this.SelectedRTPStreamConfiguration === undefined) {
+      this.platform.debug(`Indoor Cam: ${this.accessory.displayName} On: ${this.SelectedRTPStreamConfiguration}`);
     } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.On, this.On);
-      this.platform.device(`Indoor Cam: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
-    }
-    if (this.OutletInUse === undefined) {
-      this.platform.debug(`Indoor Cam: ${this.accessory.displayName} OutletInUse: ${this.OutletInUse}`);
-    } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.OutletInUse, this.OutletInUse);
-      this.platform.device(`Indoor Cam: ${this.accessory.displayName} updateCharacteristic OutletInUse: ${this.OutletInUse}`);
+      this.service.updateCharacteristic(this.platform.Characteristic.SelectedRTPStreamConfiguration, this.SelectedRTPStreamConfiguration);
+      this.platform.device(`Indoor Cam: ${this.accessory.displayName} updateCharacteristic On: ${this.SelectedRTPStreamConfiguration}`);
     }
   }
 
   public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.On, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.OutletInUse, e);
+    this.service.updateCharacteristic(this.platform.Characteristic.SelectedRTPStreamConfiguration, e);
   }
 
   private statusCode(push: AxiosResponse<{ statusCode: number; }>) {
@@ -202,7 +212,7 @@ export class IndoorCam {
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
@@ -216,15 +226,73 @@ export class IndoorCam {
     }
   }
 
+  /**
+   * Handle requests to set the value of the "Active" characteristic
+   */
+  ActiveSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} Active: ${value}`);
+
+    this.Active = value;
+    this.doCameraUpdate.next();
+  }
+
+  /**
+   * Handle requests to set the value of the "SelectedRTPStreamConfiguration" characteristic
+   */
+  SelectedRTPStreamConfigurationSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} SelectedRTPStreamConfiguration: ${value}`);
+
+    this.SelectedRTPStreamConfiguration = value;
+    this.doCameraUpdate.next();
+  }
+
   /**
    * Handle requests to set the value of the "On" characteristic
    */
-  OnSet(value: CharacteristicValue) {
-    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} On: ${value}`);
+  SetupEndpointsSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} SetupEndpoints: ${value}`);
 
-    this.On = value;
+    this.SetupEndpoints = value;
     this.doCameraUpdate.next();
   }
 
+  /**
+   * Handle requests to set the value of the "On" characteristic
+   */
+  SupportedAudioStreamConfigurationSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} SupportedAudioStreamConfiguration: ${value}`);
+
+    this.SupportedAudioStreamConfiguration = value;
+    this.doCameraUpdate.next();
+  }
+
+  /**
+   * Handle requests to set the value of the "On" characteristic
+   */
+  SupportedRTPConfigurationSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} SupportedRTPConfiguration: ${value}`);
+
+    this.SupportedRTPConfiguration = value;
+    this.doCameraUpdate.next();
+  }
 
+  /**
+   * Handle requests to set the value of the "On" characteristic
+   */
+  StreamingStatusSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} StreamingStatus: ${value}`);
+
+    this.StreamingStatus = value;
+    this.doCameraUpdate.next();
+  }
+
+  /**
+   * Handle requests to set the value of the "On" characteristic
+   */
+  SupportedVideoStreamConfigurationSet(value: CharacteristicValue) {
+    this.platform.debug(`Indoor Cam: ${this.accessory.displayName} SupportedVideoStreamConfiguration: ${value}`);
+
+    this.SupportedVideoStreamConfiguration = value;
+    this.doCameraUpdate.next();
+  }
 }

package/src/devices/plugs.ts

@@ -190,7 +190,7 @@ export class Plug {
         this.platform.log.error(`Plug: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Plug: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Plug: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Plug: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`

package/src/irdevices/airconditioners.ts

@@ -379,7 +379,7 @@ export class AirConditioner {
         this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/airpurifiers.ts

@@ -239,7 +239,7 @@ export class AirPurifier {
         this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/cameras.ts

@@ -139,7 +139,7 @@ export class Camera {
         this.platform.log.error(`Camera: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Camera: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Camera: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Camera: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/fans.ts

@@ -261,7 +261,7 @@ export class Fan {
         this.platform.log.error(`Fan: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Fan: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Fan: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Fan: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/lights.ts

@@ -173,7 +173,7 @@ export class Light {
         this.platform.log.error(`Light: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Light: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Light: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Light: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/others.ts

@@ -160,7 +160,7 @@ export class Others {
         this.platform.log.error(`Other: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Other: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Other: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Other: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/tvs.ts

@@ -377,7 +377,7 @@ export class TV {
         this.platform.log.error(`${this.device.remoteType}: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`${this.device.remoteType}: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`${this.device.remoteType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`${this.device.remoteType}: `

package/src/irdevices/vacuumcleaners.ts

@@ -139,7 +139,7 @@ export class VacuumCleaner {
         this.platform.log.error(`Vacuum Cleaner: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Vacuum Cleaner: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Vacuum Cleaner: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Vacuum Cleaner: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/irdevices/waterheaters.ts

@@ -153,7 +153,7 @@ export class WaterHeater {
         this.platform.log.error(`Water Heater: ${this.accessory.displayName} Device is offline.`);
         break;
       case 171:
-        this.platform.log.error(`Water Heater: ${this.accessory.displayName} Hub Device is offline.`);
+        this.platform.log.error(`Water Heater: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
         break;
       case 190:
         this.platform.log.error(`Water Heater: ${this.accessory.displayName} Device internal error due to device states not synchronized`

package/src/platform.ts

@@ -204,7 +204,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
           const mergeBydeviceId = (a1: { deviceId: string; }[], a2: any[]) =>
             a1.map((itm: { deviceId: string; }) => ({
-              ...a2.find((item: { deviceId: string; }) => (item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId) && item),
+              ...a2.find((item: { deviceId: string; }) => (
+                item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '')) && item),
               ...itm,
             }));
 
@@ -238,7 +239,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
           const mergeIRBydeviceId = (a1: { deviceId: string; }[], a2: any[]) =>
             a1.map((itm: { deviceId: string; }) => ({
-              ...a2.find((item: { deviceId: string; }) => (item.deviceId === itm.deviceId) && item),
+              ...a2.find((item: { deviceId: string; }) => (
+                item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '')) && item),
               ...itm,
             }));
 
@@ -310,7 +312,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debug(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createColorBulb(device);
         break;
-      case 'IndoorCam':
+      case 'Indoor Cam':
         this.debug(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createIndoorCam(device);
         break;