@switchbot/homebridge-switchbot 4.1.8-beta.6 → 4.2.0

package/src/device/curtain.ts

@@ -333,7 +333,7 @@ export class Curtain extends deviceBase {
       })
       const motion: Service
       = this.accessory.getService(this.hap.Service.MotionSensor)
-      || this.accessory.addService(this.hap.Service.MotionSensor, 'Motion')
+        || this.accessory.addService(this.hap.Service.MotionSensor, 'Motion')
       motion.addOptionalCharacteristic(this.platform.eve.Characteristics.LastActivation)
       motion.getCharacteristic(this.platform.eve.Characteristics.LastActivation).onGet(() => {
         const lastActivation = this.accessory.context.lastActivation
@@ -553,7 +553,7 @@ export class Curtain extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/fan.ts

@@ -348,7 +348,7 @@ export class Fan extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/hub.ts

@@ -315,7 +315,7 @@ export class Hub extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/humidifier.ts

@@ -345,7 +345,7 @@ export class Humidifier extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/iosensor.ts

@@ -309,7 +309,7 @@ export class IOSensor extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/lightstrip.ts

@@ -347,7 +347,7 @@ export class StripLight extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/lock.ts

@@ -351,7 +351,7 @@ export class Lock extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/meter.ts

@@ -306,7 +306,7 @@ export class Meter extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/meterplus.ts

@@ -310,7 +310,7 @@ export class MeterPlus extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/meterpro.ts

@@ -386,7 +386,7 @@ export class MeterPro extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/motion.ts

@@ -281,7 +281,7 @@ export class Motion extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/plug.ts

@@ -206,7 +206,7 @@ export class Plug extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/robotvacuumcleaner.ts

@@ -294,7 +294,7 @@ export class RobotVacuumCleaner extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/device/waterdetector.ts

@@ -156,7 +156,7 @@ export class WaterDetector extends deviceBase {
       this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
         ? !this.serviceData.leak ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
         : this.serviceData.leak ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`)
+      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, BLE`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, BLE`)
     }
     // Battery Info
     if ('battery' in this.serviceData) {
@@ -185,7 +185,7 @@ export class WaterDetector extends deviceBase {
       this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
         ? this.deviceStatus.status === 0 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
         : this.deviceStatus.status === 1 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`)
+      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, OpenAPI`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, OpenAPI`)
     }
 
     // BatteryLevel
@@ -228,7 +228,7 @@ export class WaterDetector extends deviceBase {
       this.LeakSensor.LeakDetected = (this.device as waterDetectorConfig).dry
         ? this.webhookContext.detectionState === 0 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
         : this.webhookContext.detectionState === 1 ? this.hap.Characteristic.LeakDetected.LEAK_DETECTED : this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED
-      this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`)
+      this.LeakSensor.LeakDetected === this.hap.Characteristic.LeakDetected.LEAK_DETECTED ? this.warnLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, Webhook`) : this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}, dry: ${(this.device as waterDetectorConfig).dry}, Webhook`)
     }
 
     // BatteryLevel
@@ -288,7 +288,7 @@ export class WaterDetector extends deviceBase {
 
   async registerPlatformBLE(): Promise<void> {
     this.debugLog('registerPlatformBLE')
-    if (this.config.options?.BLE) {
+    if (this.config.options?.BLE && !this.device.disablePlatformBLE) {
       this.debugLog('is listening to Platform BLE.')
       try {
         const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId)

package/src/settings.ts

@@ -79,6 +79,7 @@ export interface BaseDeviceConfig extends device {
   maxRetries?: number
   delayBetweenRetries?: number
   disableCaching?: boolean
+  disablePlatformBLE?: boolean
   mqttURL?: string
   mqttOptions?: IClientOptions
   mqttPubOptions?: IClientOptions

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));