@switchbot/homebridge-switchbot 4.1.4-beta.2 → 4.1.5

package/src/irdevice/light.ts

@@ -166,8 +166,8 @@ export class Light extends irdeviceBase {
    * Light -       "command"       "channelSub"      "default"          =        previous channel
    */
   async pushLightOnChanges(On: boolean): Promise<void> {
-    this.debugLog(`pushLightOnChanges On: ${On}, disablePushOn: ${this.disablePushOn}`)
-    if (On === true && this.disablePushOn === false) {
+    this.debugLog(`pushLightOnChanges On: ${On}, disablePushOn: ${this.deviceDisablePushOn}`)
+    if (On === true && this.deviceDisablePushOn === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
       const bodyChange: bodyChange = {
@@ -180,8 +180,8 @@ export class Light extends irdeviceBase {
   }
 
   async pushLightOffChanges(On: boolean): Promise<void> {
-    this.debugLog(`pushLightOffChanges On: ${On}, disablePushOff: ${this.disablePushOff}`)
-    if (On === false && this.disablePushOff === false) {
+    this.debugLog(`pushLightOffChanges On: ${On}, disablePushOff: ${this.deviceDisablePushOff}`)
+    if (On === false && this.deviceDisablePushOff === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
       const bodyChange: bodyChange = {

package/src/irdevice/other.ts

@@ -407,9 +407,9 @@ export class Others extends irdeviceBase {
    * Other -       "command"       "channelSub"      "default"          =        previous channel
    */
   async pushOnChanges(On: boolean): Promise<void> {
-    this.debugLog(`pushOnChanges On: ${On}, disablePushOn: ${this.disablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`)
+    this.debugLog(`pushOnChanges On: ${On}, disablePushOn: ${this.deviceDisablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`)
     if (this.device.customize) {
-      if (On === true && !this.disablePushOn) {
+      if (On === true && !this.deviceDisablePushOn) {
         const commandType: string = await this.commandType()
         const command: string = await this.commandOn()
         const bodyChange: bodyChange = {
@@ -425,9 +425,9 @@ export class Others extends irdeviceBase {
   }
 
   async pushOffChanges(On: boolean): Promise<void> {
-    this.debugLog(`pushOffChanges On: ${On}, disablePushOff: ${this.disablePushOff}, customize: ${this.device.customize}, customOff: ${this.device.customOff}`)
+    this.debugLog(`pushOffChanges On: ${On}, disablePushOff: ${this.deviceDisablePushOff}, customize: ${this.device.customize}, customOff: ${this.device.customOff}`)
     if (this.device.customize) {
-      if (On === false && !this.disablePushOff) {
+      if (On === false && !this.deviceDisablePushOff) {
         const commandType: string = await this.commandType()
         const command: string = await this.commandOff()
         const bodyChange: bodyChange = {

package/src/irdevice/tv.ts

@@ -206,8 +206,8 @@ export class TV extends irdeviceBase {
    * TV           "command"       "channelSub"      "default"          previous channel
    */
   async pushTvOnChanges(): Promise<void> {
-    this.debugLog(`pushTvOnChanges Active: ${this.Television.Active}, disablePushOn: ${this.disablePushOn}`)
-    if (this.Television.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
+    this.debugLog(`pushTvOnChanges Active: ${this.Television.Active}, disablePushOn: ${this.deviceDisablePushOn}`)
+    if (this.Television.Active === this.hap.Characteristic.Active.ACTIVE && !this.deviceDisablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
       const bodyChange: bodyChange = {
@@ -220,8 +220,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushTvOffChanges(): Promise<void> {
-    this.debugLog(`pushTvOffChanges Active: ${this.Television.Active}, disablePushOff: ${this.disablePushOff}`)
-    if (this.Television.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
+    this.debugLog(`pushTvOffChanges Active: ${this.Television.Active}, disablePushOff: ${this.deviceDisablePushOff}`)
+    if (this.Television.Active === this.hap.Characteristic.Active.INACTIVE && !this.deviceDisablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
       const bodyChange: bodyChange = {
@@ -234,8 +234,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushOkChanges(): Promise<void> {
-    this.debugLog(`pushOkChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushOkChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Ok',
         parameter: 'default',
@@ -246,8 +246,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushBackChanges(): Promise<void> {
-    this.debugLog(`pushBackChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushBackChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Back',
         parameter: 'default',
@@ -258,8 +258,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushMenuChanges(): Promise<void> {
-    this.debugLog(`pushMenuChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushMenuChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Menu',
         parameter: 'default',
@@ -270,8 +270,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushUpChanges(): Promise<void> {
-    this.debugLog(`pushUpChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushUpChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Up',
         parameter: 'default',
@@ -282,8 +282,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushDownChanges(): Promise<void> {
-    this.debugLog(`pushDownChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushDownChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Down',
         parameter: 'default',
@@ -294,8 +294,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushRightChanges(): Promise<void> {
-    this.debugLog(`pushRightChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushRightChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Right',
         parameter: 'default',
@@ -306,8 +306,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushLeftChanges(): Promise<void> {
-    this.debugLog(`pushLeftChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushLeftChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'Left',
         parameter: 'default',
@@ -318,8 +318,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushVolumeUpChanges(): Promise<void> {
-    this.debugLog(`pushVolumeUpChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushVolumeUpChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'volumeAdd',
         parameter: 'default',
@@ -330,8 +330,8 @@ export class TV extends irdeviceBase {
   }
 
   async pushVolumeDownChanges(): Promise<void> {
-    this.debugLog(`pushVolumeDownChanges disablePushDetail: ${this.disablePushDetail}`)
-    if (!this.disablePushDetail) {
+    this.debugLog(`pushVolumeDownChanges disablePushDetail: ${this.deviceDisablePushDetail}`)
+    if (!this.deviceDisablePushDetail) {
       const bodyChange: bodyChange = {
         command: 'volumeSub',
         parameter: 'default',

package/src/irdevice/vacuumcleaner.ts

@@ -65,8 +65,8 @@ export class VacuumCleaner extends irdeviceBase {
    * Vacuum Cleaner    "command"       "turnOn"       "default"       set to ON state
    */
   async pushOnChanges(): Promise<void> {
-    this.debugLog(`pushOnChanges On: ${this.Switch.On}, disablePushOn: ${this.disablePushOn}`)
-    if (this.Switch.On && !this.disablePushOn) {
+    this.debugLog(`pushOnChanges On: ${this.Switch.On}, disablePushOn: ${this.deviceDisablePushOn}`)
+    if (this.Switch.On && !this.deviceDisablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
       const bodyChange: bodyChange = {
@@ -79,8 +79,8 @@ export class VacuumCleaner extends irdeviceBase {
   }
 
   async pushOffChanges(): Promise<void> {
-    this.debugLog(`pushOffChanges On: ${this.Switch.On}, disablePushOff: ${this.disablePushOff}`)
-    if (!this.Switch.On && !this.disablePushOff) {
+    this.debugLog(`pushOffChanges On: ${this.Switch.On}, disablePushOff: ${this.deviceDisablePushOff}`)
+    if (!this.Switch.On && !this.deviceDisablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
       const bodyChange: bodyChange = {

package/src/irdevice/waterheater.ts

@@ -66,8 +66,8 @@ export class WaterHeater extends irdeviceBase {
    * WaterHeater     "command"       "turnOn"          "default"         set to ON state
    */
   async pushWaterHeaterOnChanges(): Promise<void> {
-    this.debugLog(`pushWaterHeaterOnChanges Active: ${this.Valve.Active}, disablePushOn: ${this.disablePushOn}`)
-    if (this.Valve.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
+    this.debugLog(`pushWaterHeaterOnChanges Active: ${this.Valve.Active}, disablePushOn: ${this.deviceDisablePushOn}`)
+    if (this.Valve.Active === this.hap.Characteristic.Active.ACTIVE && !this.deviceDisablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
       const bodyChange: bodyChange = {
@@ -80,8 +80,8 @@ export class WaterHeater extends irdeviceBase {
   }
 
   async pushWaterHeaterOffChanges(): Promise<void> {
-    this.debugLog(`pushWaterHeaterOffChanges Active: ${this.Valve.Active}, disablePushOff: ${this.disablePushOff}`)
-    if (this.Valve.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
+    this.debugLog(`pushWaterHeaterOffChanges Active: ${this.Valve.Active}, disablePushOff: ${this.deviceDisablePushOff}`)
+    if (this.Valve.Active === this.hap.Characteristic.Active.INACTIVE && !this.deviceDisablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
       const bodyChange: bodyChange = {

package/src/settings.ts

@@ -220,6 +220,11 @@ export interface irBaseDeviceConfig extends irdevice {
   connectionType?: string
   hide_device?: boolean
   external?: boolean
+  refreshRate?: number
+  updateRate?: number
+  pushRate?: number
+  maxRetries?: number
+  delayBetweenRetries?: number
   firmware?: string
   deviceId: string
   logging?: string

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

@@ -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.cjs <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));