@switchbot/homebridge-switchbot 0.1.2-beta.35 → 0.1.2-beta.39

package/src/irdevices/tvs.ts

@@ -34,26 +34,35 @@ export class TV {
       case 'Speaker':
       case 'DIY Speaker':
         accessory.category = this.platform.api.hap.Categories.SPEAKER;
+        (this.service =
+          accessory.getService(this.platform.Service.Television) ||
+          accessory.addService(this.platform.Service.Television)), `${accessory.displayName} Speaker`;
         break;
       case 'IPTV':
       case 'DIY IPTV':
         accessory.category = this.platform.api.hap.Categories.TV_STREAMING_STICK;
+        (this.service =
+          accessory.getService(this.platform.Service.Television) ||
+          accessory.addService(this.platform.Service.Television)), `${accessory.displayName} Streaming Stick`;
         break;
       case 'DVD':
       case 'DIY DVD':
       case 'Set Top Box':
       case 'DIY Set Top Box':
         accessory.category = this.platform.api.hap.Categories.TV_SET_TOP_BOX;
+        (this.service =
+          accessory.getService(this.platform.Service.Television) ||
+          accessory.addService(this.platform.Service.Television)), `${accessory.displayName} Set Top Box`;
         break;
       default:
         accessory.category = this.platform.api.hap.Categories.TELEVISION;
-    }
 
-    // get the Television service if it exists, otherwise create a new Television service
-    // you can create multiple services for each accessory
-    (this.service =
-      accessory.getService(this.platform.Service.Television) ||
-      accessory.addService(this.platform.Service.Television)), `${device.deviceName} ${device.remoteType}`;
+        // get the Television service if it exists, otherwise create a new Television service
+        // you can create multiple services for each accessory
+        (this.service =
+          accessory.getService(this.platform.Service.Television) ||
+          accessory.addService(this.platform.Service.Television)), `${accessory.displayName} TV`;
+    }
 
     // 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:
@@ -86,7 +95,9 @@ export class TV {
     // create a new Television Speaker service
     (this.speakerService =
       accessory.getService(this.platform.Service.TelevisionSpeaker) ||
-      accessory.addService(this.platform.Service.TelevisionSpeaker)), `${device.deviceName} ${device.remoteType} Speaker`;
+      accessory.addService(this.platform.Service.TelevisionSpeaker)), `${accessory.displayName} Speaker`;
+
+    this.speakerService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Speaker`);
 
     this.speakerService
       .setCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE)

package/src/irdevices/vacuumcleaners.ts

@@ -29,8 +29,7 @@ export class VacuumCleaner {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Switch) ||
-      accessory.addService(this.platform.Service.Switch)),
-    `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Vacuum`;
 
     // 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:
@@ -38,10 +37,7 @@ export class VacuumCleaner {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(
-      this.platform.Characteristic.Name,
-      `${device.deviceName} ${device.remoteType}`,
-    );
+    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
     // handle on / off events using the On characteristic
     this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));

package/src/irdevices/waterheaters.ts

@@ -28,8 +28,8 @@ export class WaterHeater {
     // get the Television service if it exists, otherwise create a new Television service
     // you can create multiple services for each accessory
     (this.service =
-      accessory.getService(this.platform.Service.Valve) || accessory.addService(this.platform.Service.Valve)),
-    `${device.deviceName} ${device.remoteType}`;
+      accessory.getService(this.platform.Service.Valve) ||
+      accessory.addService(this.platform.Service.Valve)), `${accessory.displayName} Water Heater`;
 
     // 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:

package/src/platform.ts

@@ -115,6 +115,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
      * This will disable adding any device and will just output info.
      */
     this.config.options = this.config.options || {};
+    this.config.options.debug;
 
     //Enable BLE for Device
     this.config.options.ble;
@@ -171,14 +172,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     this.config.options.other.commandOn;
     this.config.options.other.commandOff;
 
-    if (this.config.options!.refreshRate! < 120) {
-      throw new Error('Refresh Rate must be above 120 (2 minutes).');
+    if (this.config.options!.refreshRate! < 30) {
+      throw new Error('Refresh Rate must be above 30 (30 seconds).');
     }
 
     if (!this.config.options.refreshRate) {
-      // default 600 seconds (15 minutes)
-      this.config.options!.refreshRate! = 1000;
-      this.log.warn('Using Default Refresh Rate.');
+      // default 120 seconds (2 minutes)
+      this.config.options!.refreshRate! = 120;
+      this.log.warn('Using Default Refresh Rate (2 minutes).');
     }
 
     if (!this.config.options.pushRate) {
@@ -255,7 +256,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
             this.debug(`Discovered ${device.deviceType}: ${device.deviceId} is Not Supported.`);
             break;
           default:
-            // eslint-disable-next-line max-len
             this.log.info(`Device: ${device.deviceName} with Device Type: ${device.deviceType}, is currently not supported.`);
             this.log.info('Submit Feature Requests Here: https://git.io/JL14Z');
         }
@@ -320,7 +320,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
             this.createOthers(device);
             break;
           default:
-            // eslint-disable-next-line max-len
             this.log.info(`Device: ${device.deviceName} with Device Type: ${device.remoteType}, is currently not supported.`);
             this.log.info('Submit Feature Requests Here: https://git.io/JL14Z');
         }
@@ -363,7 +362,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -419,7 +418,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.log.error('You must set your Bot to Press or Switch Mode');
       }
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -473,7 +472,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -525,7 +524,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -576,7 +575,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -638,7 +637,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       }
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -699,7 +698,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -752,7 +751,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -800,7 +799,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -858,7 +857,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -911,7 +910,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -964,7 +963,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1017,7 +1016,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1070,7 +1069,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1123,7 +1122,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1176,7 +1175,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1229,7 +1228,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1300,6 +1299,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   /**
    * If debug level logging is turned on, log to log.info
    * Otherwise send debug logs to log.debug
+   * this.debugMode = process.argv.includes('-D') || process.argv.includes('--debug');
    */
   debug(...log: any[]) {
     if (this.config.options!.debug === 'debug') {
@@ -1310,7 +1310,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   /**
-   * If debug level logging is turned on, log to log.info
+   * If device level logging is turned on, log to log.warn
    * Otherwise send debug logs to log.debug
    */
   device(...log: any[]) {