@switchbot/homebridge-switchbot 3.0.1-beta.2 → 3.0.1-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "3.0.1-beta.2",
+  "version": "3.0.1-beta.4",
   "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
   "author": {
     "name": "SwitchBot",
@@ -75,21 +75,21 @@
     "fakegato-history": "^0.6.4",
     "homebridge-lib": "^6.7.3",
     "rxjs": "^7.8.1",
-    "undici": "^6.4.0"
+    "undici": "^6.6.0"
   },
   "optionalDependencies": {
     "node-switchbot": "^2.0.0-beta.0",
     "@abandonware/noble": "^1.9.2-23"
   },
   "devDependencies": {
-    "@types/node": "^20.11.6",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@types/node": "^20.11.16",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
     "eslint": "^8.56.0",
     "homebridge": "^1.7.0",
     "homebridge-config-ui-x": "4.55.1",
     "nodemon": "^3.0.3",
-    "npm-check-updates": "^16.14.12",
+    "npm-check-updates": "^16.14.14",
     "rimraf": "^5.0.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"

package/src/device/curtain.ts

@@ -544,10 +544,18 @@ export class Curtain {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     this.getCustomBLEAddress(switchbot);
     // Start to monitor advertisement packets
+    let model: string;
+    switch (this.device.configDeviceType) {
+      case 'Curtain3':
+        model = '{';
+        break;
+      default:
+        model = 'c';
+    }
     if (switchbot !== false) {
       switchbot
         .startScan({
-          model: 'c',
+          model: model,
           id: this.device.bleMac,
         })
         .then(async () => {

package/src/platform.ts

@@ -663,6 +663,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.createContact(device);
         break;
       case 'Curtain':
+      case 'Curtain3':
         this.debugLog(`Discovered ${device.deviceType} ${device.deviceName}: ${device.deviceId}`);
         this.createCurtain(device);
         break;
@@ -2306,16 +2307,15 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   async registerCurtains(device: device & devicesConfig) {
-    if (device.deviceType === 'Curtain') {
-      this.debugWarnLog(
-        `deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds}, master: ` +
-        `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`,
-      );
-    } else {
-      this.debugWarnLog(
-        `deviceName: ${device.deviceName} deviceId: ${device.deviceId}, blindTiltDevicesIds: ${device.blindTiltDevicesIds}, master: ` +
-        `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`,
-      );
+    switch (device.deviceType) {
+      case 'Curtain':
+      case 'Curtain3':
+        this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds}, master: ` +
+          `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
+        break;
+      default:
+        this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, blindTiltDevicesIds: ${device.blindTiltDevicesIds}, master:`
+        + ` ${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
     }
 
     let registerCurtain: boolean;
@@ -2376,12 +2376,16 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     device.connectionType = await this.connectionType(device);
     let registerDevice: boolean;
     if (!device.hide_device && device.connectionType === 'BLE/OpenAPI') {
-      if (device.deviceType === 'Curtain' || device.deviceType === 'Blind Tilt') {
-        registerDevice = await this.registerCurtains(device);
-        this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
-      } else {
-        registerDevice = true;
-        this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+      switch (device.deviceType) {
+        case 'Curtain':
+        case 'Curtain3':
+        case 'Blind Tilt':
+          registerDevice = await this.registerCurtains(device);
+          this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
+          break;
+        default:
+          registerDevice = true;
+          this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
       }
       if (registerDevice === true) {
         this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
@@ -2389,12 +2393,16 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will not display in HomeKit`);
       }
     } else if (!device.hide_device && device.deviceId && device.configDeviceType && device.configDeviceName && device.connectionType === 'BLE') {
-      if (device.deviceType === 'Curtain' || device.deviceType === 'Blind Tilt') {
-        registerDevice = await this.registerCurtains(device);
-        this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
-      } else {
-        registerDevice = true;
-        this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+      switch (device.deviceType) {
+        case 'Curtain':
+        case 'Curtain3':
+        case 'Blind Tilt':
+          registerDevice = await this.registerCurtains(device);
+          this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
+          break;
+        default:
+          registerDevice = true;
+          this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
       }
       if (registerDevice === true) {
         this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
@@ -2402,12 +2410,16 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will not display in HomeKit`);
       }
     } else if (!device.hide_device && device.connectionType === 'OpenAPI') {
-      if (device.deviceType === 'Curtain' || device.deviceType === 'Blind Tilt') {
-        registerDevice = await this.registerCurtains(device);
-        this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
-      } else {
-        registerDevice = true;
-        this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+      switch (device.deviceType) {
+        case 'Curtain':
+        case 'Curtain3':
+        case 'Blind Tilt':
+          registerDevice = await this.registerCurtains(device);
+          this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
+          break;
+        default:
+          registerDevice = true;
+          this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
       }
       if (registerDevice === true) {
         this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
@@ -2415,12 +2427,16 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will not display in HomeKit`);
       }
     } else if (!device.hide_device && device.connectionType === 'Disabled') {
-      if (device.deviceType === 'Curtain' || device.deviceType === 'Blind Tilt') {
-        registerDevice = await this.registerCurtains(device);
-        this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
-      } else {
-        registerDevice = true;
-        this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+      switch (device.deviceType) {
+        case 'Curtain':
+        case 'Curtain3':
+        case 'Blind Tilt':
+          registerDevice = await this.registerCurtains(device);
+          this.debugWarnLog(`Device: ${device.deviceName} ${device.deviceType} registerDevice: ${registerDevice}`);
+          break;
+        default:
+          registerDevice = true;
+          this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
       }
       this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will continue to display in HomeKit`);
     } else if (!device.connectionType && !device.hide_device) {