@switchbot/homebridge-switchbot 2.1.0-beta.8 → 2.1.0

package/src/device/meterplus.ts

@@ -176,7 +176,9 @@ export class MeterPlus {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLEparseStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
@@ -231,7 +233,9 @@ export class MeterPlus {
    * Asks the SwitchBot API for the latest device information
    */
   async refreshStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLERefreshStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();

package/src/device/motion.ts

@@ -142,7 +142,9 @@ export class Motion {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLEparseStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
@@ -213,7 +215,9 @@ export class Motion {
    * Asks the SwitchBot API for the latest device information
    */
   async refreshStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLERefreshStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();

package/src/device/plug.ts

@@ -125,7 +125,9 @@ export class Plug {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLEparseStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
@@ -164,7 +166,9 @@ export class Plug {
    * Asks the SwitchBot API for the latest device information
    */
   async refreshStatus(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLERefreshStatus();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
@@ -308,7 +312,9 @@ export class Plug {
    */
 
   async pushChanges(): Promise<void> {
-    if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
+    } else if (this.BLE) {
       await this.BLEpushChanges();
     } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();

package/src/device/striplight.ts

@@ -212,7 +212,9 @@ export class StripLight {
    * Parse the device status from the SwitchBot api
    */
   async parseStatus(): Promise<void> {
-    /*if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else/*if (this.BLE) {
       await this.BLEparseStatus();
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIparseStatus();
@@ -276,7 +278,9 @@ export class StripLight {
    * Asks the SwitchBot API for the latest device information
    */
   async refreshStatus(): Promise<void> {
-    /*if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
+    } else/*if (this.BLE) {
       await this.BLERefreshStatus();
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
@@ -423,7 +427,9 @@ export class StripLight {
    *
    */
   async pushChanges(): Promise<void> {
-    /*if (this.BLE) {
+    if (!this.device.enableCloudService && this.OpenAPI) {
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
+    } else /*if (this.BLE) {
       await this.BLEpushChanges();
     } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIpushChanges();

package/src/platform.ts

@@ -42,7 +42,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   public readonly accessories: PlatformAccessory[] = [];
 
   version = require('../package.json').version || '1.12.8'; // eslint-disable-line @typescript-eslint/no-var-requires
-  deviceStatus!: any;
   debugMode!: boolean;
   platformLogging?: string;
 
@@ -281,117 +280,95 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           let rawData = '';
           res.on('data', (d) => {
             rawData += d;
-            this.deviceStatus = d;
             this.debugLog(`d: ${d}`);
           });
           res.on('end', () => {
             try {
               const devicesAPI = JSON.parse(rawData);
               this.debugLog(`devicesAPI: ${superStringify(devicesAPI.body)}`);
-
               // SwitchBot Devices
-              /*if (devicesAPI.body.deviceList.length !== 0) {
+              if (devicesAPI.body.deviceList.length !== 0) {
                 this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
               } else {
                 this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-              }*/
-              const deviceBodyList = devicesAPI.body.deviceList;
-              let deviceLists: any[];
-              if (deviceBodyList) {
-                if (deviceBodyList.length > 1) {
-                  deviceLists = deviceBodyList;
-                  this.infoLog(`Total SwitchBot Devices Found: ${deviceLists.length}`);
-                } else {
-                  deviceLists = [deviceBodyList];
-                  this.infoLog(`Total SwitchBot Devices Found: ${deviceLists.length}`);
-                }
-                if (!this.config.options?.devices) {
-                  this.debugLog(`SwitchBot Device Config Not Set: ${superStringify(this.config.options?.devices)}`);
-                  const devices = deviceLists.map((v: any) => v);
-                  for (const device of devices) {
-                    if (device.deviceType) {
-                      if (device.configDeviceName) {
-                        device.deviceName = device.configDeviceName;
-                      }
-                      this.createDevice(device);
+              }
+              const deviceLists = devicesAPI.body.deviceList;
+              if (!this.config.options?.devices) {
+                this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+                const devices = deviceLists.map((v: any) => v);
+                for (const device of devices) {
+                  if (device.deviceType) {
+                    if (device.configDeviceName) {
+                      device.deviceName = device.configDeviceName;
                     }
+                    this.createDevice(device);
                   }
-                } else if (this.config.credentials?.token && this.config.options.devices) {
-                  this.debugLog(`SwitchBot Device Config Set: ${superStringify(this.config.options?.devices)}`);
-                  const deviceConfigs = this.config.options?.devices;
-
-                  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.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
-                      ),
-                      ...itm,
-                    }));
-
-                  const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-                  this.debugLog(`SwitchBot Devices: ${superStringify(devices)}`);
-                  for (const device of devices) {
-                    if (device.deviceType) {
-                      if (device.configDeviceName) {
-                        device.deviceName = device.configDeviceName;
-                      }
-                      this.createDevice(device);
+                }
+              } else if (this.config.credentials?.token && this.config.options.devices) {
+                this.debugLog(`SwitchBot Device Config Set: ${superStringify(this.config.options?.devices)}`);
+                const deviceConfigs = this.config.options?.devices;
+
+                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.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
+                    ),
+                    ...itm,
+                  }));
+
+                const devices = mergeBydeviceId(deviceLists, deviceConfigs);
+                this.debugLog(`SwitchBot Devices: ${superStringify(devices)}`);
+                for (const device of devices) {
+                  if (device.deviceType) {
+                    if (device.configDeviceName) {
+                      device.deviceName = device.configDeviceName;
                     }
+                    this.createDevice(device);
                   }
-                } else {
-                  this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
                 }
               } else {
-                this.errorLog(`SwitchBot Device Request Issue: ${this.deviceStatus}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+                this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
               }
+
               // IR Devices
-              /*if (devicesAPI.body.infraredRemoteList.length !== 0) {
+              if (devicesAPI.body.infraredRemoteList.length !== 0) {
                 this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
               } else {
                 this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
-              }*/
-              const irDeviceBodyList = devicesAPI.body.infraredRemoteList;
-              let irDeviceLists: any[];
-              if (irDeviceBodyList) {
-                if (irDeviceBodyList.length > 1) {
-                  irDeviceLists = irDeviceBodyList;
-                  this.infoLog(`Total IR Devices Found: ${irDeviceLists.length}`);
-                } else {
-                  irDeviceLists = [irDeviceBodyList];
-                  this.infoLog(`Total IR Devices Found: ${irDeviceLists.length}`);
-                }
-                if (!this.config.options?.irdevices) {
-                  this.debugLog(`IR Device Config Not Set: ${superStringify(this.config.options?.irdevices)}`);
-                  const devices = irDeviceLists.map((v: any) => v);
-                  for (const device of devices) {
-                    if (device.remoteType) {
-                      this.createIRDevice(device);
-                    }
-                  }
-                } else {
-                  this.debugLog(`IR Device Config Set: ${superStringify(this.config.options?.irdevices)}`);
-                  const irDeviceConfig = this.config.options?.irdevices;
-
-                  const mergeIRBydeviceId = (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.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
-                      ),
-                      ...itm,
-                    }));
-
-                  const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-                  this.debugLog(`IR Devices: ${superStringify(devices)}`);
-                  for (const device of devices) {
-                    if (device.remoteType) {
-                      this.createIRDevice(device);
-                    }
+              }
+              if (devicesAPI.body.infraredRemoteList.length !== 0) {
+                this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+              } else {
+                this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+              }
+              const irDeviceLists = devicesAPI.body.infraredRemoteList;
+              if (!this.config.options?.irdevices) {
+                this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                const devices = irDeviceLists.map((v: any) => v);
+                for (const device of devices) {
+                  if (device.remoteType) {
+                    this.createIRDevice(device);
                   }
                 }
               } else {
-                this.errorLog(`SwitchBot IR Device Request Issue: ${this.deviceStatus}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+                this.debugLog(`IR Device Config Set: ${superStringify(this.config.options?.irdevices)}`);
+                const irDeviceConfig = this.config.options?.irdevices;
+
+                const mergeIRBydeviceId = (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.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
+                    ),
+                    ...itm,
+                  }));
+
+                const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
+                this.debugLog(`IR Devices: ${superStringify(devices)}`);
+                for (const device of devices) {
+                  this.createIRDevice(device);
+                }
               }
             } catch (e:any) {
               this.errorLog(`API Request: ${e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
@@ -497,7 +474,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   private createIRDevice(device: irdevice & devicesConfig) {
-    switch (device.remoteType!) {
+    switch (device.remoteType) {
       case 'TV':
       case 'DIY TV':
       case 'Projector':
@@ -1776,7 +1753,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     } else if (device.connectionType === 'BLE') {
       // BLE: Curtains
       registerCurtain = true;
-      this.debugLog(`deviceName: ${device.deviceName} [Curtain Config] connectionType: ${device.connectionType}`);
+      this.debugLog(`deviceName: ${device.deviceName} [Curtain Config] connectionType: ${device.connectionType}, group: ${device.group}`);
       this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
     } else {
       registerCurtain = false;
@@ -1800,7 +1777,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   async registerDevice(device: device & devicesConfig) {
     device.connectionType = await this.connectionType(device);
     let registerDevice: boolean;
-    if (!device.hide_device && device.enableCloudService && device.connectionType === 'BLE/OpenAPI') {
+    if (!device.hide_device && device.connectionType === 'BLE/OpenAPI') {
       if (device.deviceType === 'Curtain') {
         registerDevice = await this.registerCurtains(device);
         this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);
@@ -1819,7 +1796,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
       }
       this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
-    } else if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI') {
+    } else if (!device.hide_device && device.connectionType === 'OpenAPI') {
       if (device.deviceType === 'Curtain') {
         registerDevice = await this.registerCurtains(device);
         this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);

package/.github/npm-version-script.js

@@ -1,81 +0,0 @@
-#!/bin/env node
-
-/**
- * This scripts queries the npm registry to pull out the latest version for a given tag.
- */
-
-const fs = require("fs");
-const semver = require("semver");
-const child_process = require("child_process");
-const assert = require("assert");
-
-const BRANCH_VERSION_PATTERN = /^([A-Za-z]*)-(\d+.\d+.\d+)$/
-
-// Load the contents of the package.json file
-const packageJSON = JSON.parse(fs.readFileSync("package.json", "utf8"));
-
-let refArgument = process.argv[2];
-let tagArgument = process.argv[3] || "latest";
-
-if (refArgument == null) {
-  console.error("ref argument is missing");
-  console.error("Usage: npm-version-script.js <ref> [tag]");
-  process.exit(1);
-}
-
-/**
- * Queries the NPM registry for the latest version for the provided tag.
- * @param tag The tag to query for.
- * @returns {string} Returns the version.
- */
-function getTagVersionFromNpm(tag) {
-  try {
-    return child_process.execSync(`npm info ${packageJSON.name} version --tag="${tag}"`).toString("utf8").trim();
-  } catch (e) {
-    throw e;
-  }
-}
-
-function desiredTargetVersion(ref) {
-  // ref is a GitHub action ref string
-  if (ref.startsWith("refs/pull/")) {
-    throw Error("The version script was executed inside a PR!");
-  }
-
-  assert(ref.startsWith("refs/heads/"))
-  let branchName = ref.slice("refs/heads/".length);
-
-  let results = branchName.match(BRANCH_VERSION_PATTERN);
-  if (results != null) {
-    if (results[1] !== tagArgument) {
-      console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`);
-    }
-
-    return results[2];
-  }
-
-  // legacy mode were we use the `betaVersion` property in the package.json
-  if (branchName === "beta" && packageJSON.betaVersion) {
-    return packageJSON.betaVersion
-  }
-
-  throw new Error("Malformed branch name for ref: " + ref + ". Can't derive the base version. Use a branch name like: beta-x.x.x!");
-}
-
-// derive the base version from the branch ref
-const baseVersion = desiredTargetVersion(refArgument);
-
-// query the npm registry for the latest version of the provided tag name
-const latestReleasedVersion = getTagVersionFromNpm(tagArgument); // e.g. 0.7.0-beta.12
-const latestReleaseBase = semver.inc(latestReleasedVersion, "patch"); // will produce 0.7.0 (removing the preid, needed for the equality check below)
-
-let publishTag;
-if (semver.eq(baseVersion, latestReleaseBase)) { // check if we are releasing another version for the latest beta
-  publishTag = latestReleasedVersion; // set the current latest beta to be incremented
-} else {
-  publishTag = baseVersion; // start of with a new beta version
-}
-
-// save the package.json
-packageJSON.version = publishTag;
-fs.writeFileSync("package.json", JSON.stringify(packageJSON, null, 2));