@switchbot/homebridge-switchbot 3.1.1-beta.0 → 3.1.1-beta.10

package/src/device/bot.ts

@@ -549,7 +549,7 @@ export class Bot {
           id: this.device.bleMac,
         })
         .then(async () => {
-          // Set an event hander
+          // Set an event handler
           switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
@@ -596,15 +596,12 @@ export class Bot {
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
+      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -756,7 +753,7 @@ export class Bot {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode`);
         this.On = false;
       } else {
-        throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
+        throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Parameters not set for this Bot.`);
       }
       const bodyChange = JSON.stringify({
         command: `${command}`,
@@ -765,14 +762,12 @@ export class Bot {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -1074,7 +1069,7 @@ export class Bot {
   }
 
   async removeOutletService(accessory: PlatformAccessory): Promise<void> {
-    // If outletService still pressent, then remove first
+    // If outletService still present, then remove first
     this.outletService = this.accessory.getService(this.hap.Service.Outlet);
     if (this.outletService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
@@ -1083,7 +1078,7 @@ export class Bot {
   }
 
   async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
-    // If garageDoorService still pressent, then remove first
+    // If garageDoorService still present, then remove first
     this.garageDoorService = this.accessory.getService(this.hap.Service.GarageDoorOpener);
     if (this.garageDoorService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
@@ -1092,7 +1087,7 @@ export class Bot {
   }
 
   async removeDoorService(accessory: PlatformAccessory): Promise<void> {
-    // If doorService still pressent, then remove first
+    // If doorService still present, then remove first
     this.doorService = this.accessory.getService(this.hap.Service.Door);
     if (this.doorService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
@@ -1101,7 +1096,7 @@ export class Bot {
   }
 
   async removeLockService(accessory: PlatformAccessory): Promise<void> {
-    // If lockService still pressent, then remove first
+    // If lockService still present, then remove first
     this.lockService = this.accessory.getService(this.hap.Service.LockMechanism);
     if (this.lockService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
@@ -1110,7 +1105,7 @@ export class Bot {
   }
 
   async removeFaucetService(accessory: PlatformAccessory): Promise<void> {
-    // If faucetService still pressent, then remove first
+    // If faucetService still present, then remove first
     this.faucetService = this.accessory.getService(this.hap.Service.Faucet);
     if (this.faucetService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Faucet Service`);
@@ -1119,7 +1114,7 @@ export class Bot {
   }
 
   async removeFanService(accessory: PlatformAccessory): Promise<void> {
-    // If fanService still pressent, then remove first
+    // If fanService still present, then remove first
     this.fanService = this.accessory.getService(this.hap.Service.Fan);
     if (this.fanService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
@@ -1128,7 +1123,7 @@ export class Bot {
   }
 
   async removeWindowService(accessory: PlatformAccessory): Promise<void> {
-    // If windowService still pressent, then remove first
+    // If windowService still present, then remove first
     this.windowService = this.accessory.getService(this.hap.Service.Window);
     if (this.windowService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
@@ -1137,7 +1132,7 @@ export class Bot {
   }
 
   async removeWindowCoveringService(accessory: PlatformAccessory): Promise<void> {
-    // If windowCoveringService still pressent, then remove first
+    // If windowCoveringService still present, then remove first
     this.windowCoveringService = this.accessory.getService(this.hap.Service.WindowCovering);
     if (this.windowCoveringService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
@@ -1146,7 +1141,7 @@ export class Bot {
   }
 
   async removeStatefulProgrammableSwitchService(accessory: PlatformAccessory): Promise<void> {
-    // If statefulProgrammableSwitchService still pressent, then remove first
+    // If statefulProgrammableSwitchService still present, then remove first
     this.statefulProgrammableSwitchService = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
     if (this.statefulProgrammableSwitchService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
@@ -1155,7 +1150,7 @@ export class Bot {
   }
 
   async removeSwitchService(accessory: PlatformAccessory): Promise<void> {
-    // If switchService still pressent, then remove first
+    // If switchService still present, then remove first
     this.switchService = this.accessory.getService(this.hap.Service.Switch);
     if (this.switchService) {
       this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
@@ -1365,10 +1360,10 @@ export class Bot {
   async deviceType(device: device & devicesConfig): Promise<void> {
     if (!device.bot?.deviceType && this.accessory.context.deviceType) {
       this.botDeviceType = this.accessory.context.deviceType;
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Type: ${this.botDeviceType}, from Accesory Cache.`);
+      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Type: ${this.botDeviceType}, from Accessory Cache.`);
     } else if (device.bot?.deviceType) {
       this.accessory.context.deviceType = device.bot.deviceType;
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Accesory Cache: ${this.accessory.context.deviceType}`);
+      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Accessory Cache: ${this.accessory.context.deviceType}`);
       this.botDeviceType = this.accessory.context.deviceType;
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Type: ${this.botDeviceType}`);
     } else {
@@ -1446,6 +1441,9 @@ export class Bot {
     if (device.maxRetry !== undefined) {
       config['maxRetry'] = device.maxRetry;
     }
+    if (device.webhook !== undefined) {
+      config['webhook'] = device.webhook;
+    }
     if (Object.entries(config).length !== 0) {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }

package/src/device/ceilinglight.ts

@@ -378,7 +378,7 @@ export class CeilingLight {
           id: this.device.bleMac,
         })
         .then(async () => {
-          // Set an event hander
+          // Set an event handler
           switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
@@ -431,15 +431,12 @@ export class CeilingLight {
   async openAPIRefreshStatus() {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
+      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -561,14 +558,12 @@ export class CeilingLight {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -622,14 +617,12 @@ export class CeilingLight {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -668,14 +661,12 @@ export class CeilingLight {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -712,14 +703,12 @@ export class CeilingLight {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -1106,6 +1095,9 @@ export class CeilingLight {
     if (device.maxRetry !== undefined) {
       config['maxRetry'] = device.maxRetry;
     }
+    if (device.webhook !== undefined) {
+      config['webhook'] = device.webhook;
+    }
     if (Object.entries(config).length !== 0) {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }

package/src/device/colorbulb.ts

@@ -424,7 +424,7 @@ export class ColorBulb {
           id: this.device.bleMac,
         })
         .then(async () => {
-          // Set an event hander
+          // Set an event handler
           switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
@@ -478,15 +478,12 @@ export class ColorBulb {
   async openAPIRefreshStatus() {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
+      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -744,14 +741,12 @@ export class ColorBulb {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -805,14 +800,12 @@ export class ColorBulb {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -851,14 +844,12 @@ export class ColorBulb {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -895,14 +886,12 @@ export class ColorBulb {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -1294,6 +1283,9 @@ export class ColorBulb {
     if (device.maxRetry !== undefined) {
       config['maxRetry'] = device.maxRetry;
     }
+    if (device.webhook !== undefined) {
+      config['webhook'] = device.webhook;
+    }
     if (Object.entries(config).length !== 0) {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }

package/src/device/contact.ts

@@ -38,7 +38,7 @@ export class Contact {
   OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
 
   // BLE Status
-  BLE_BateryLevel!: serviceData['battery'];
+  BLE_BatteryLevel!: serviceData['battery'];
   BLE_MotionDetected!: serviceData['movement'];
   BLE_ContactSensorState!: serviceData['doorState'];
   BLE_CurrentAmbientLightLevel: serviceData['lightLevel'];
@@ -75,11 +75,11 @@ export class Contact {
     this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
     this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
     // default placeholders
-    this.devicedeviceLogs(device);
+    this.deviceLogs(device);
     this.scan(device);
     this.refreshRate(device);
     this.context();
-    this.devicedeviceConfig(device);
+    this.deviceConfig(device);
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doContactUpdate = new Subject();
@@ -257,10 +257,10 @@ export class Contact {
       }
     }
     // Battery
-    if (this.BLE_BateryLevel === undefined) {
-      this.BLE_BateryLevel === 100;
+    if (this.BLE_BatteryLevel === undefined) {
+      this.BLE_BatteryLevel === 100;
     }
-    this.BatteryLevel = Number(this.BLE_BateryLevel);
+    this.BatteryLevel = Number(this.BLE_BatteryLevel);
     if (this.BatteryLevel < 10) {
       this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
@@ -360,7 +360,7 @@ export class Contact {
           id: this.device.bleMac,
         })
         .then(async () => {
-          // Set an event hander
+          // Set an event handler
           this.scanning = true;
           switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
@@ -368,7 +368,7 @@ export class Contact {
               ` BLE Address Found: ${ad.address}`,
             );
             this.BLE_MotionDetected = ad.serviceData.movement;
-            this.BLE_BateryLevel = ad.serviceData.battery;
+            this.BLE_BatteryLevel = ad.serviceData.battery;
             this.BLE_ContactSensorState = ad.serviceData.doorState;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
             this.debugLog(
@@ -411,15 +411,12 @@ export class Contact {
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
+      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -648,7 +645,7 @@ export class Contact {
     }
   }
 
-  async devicedeviceConfig(device: device & devicesConfig): Promise<void> {
+  async deviceConfig(device: device & devicesConfig): Promise<void> {
     let config = {};
     if (device.contact) {
       config = device.contact;
@@ -668,12 +665,15 @@ export class Contact {
     if (device.scanDuration !== undefined) {
       config['scanDuration'] = device.scanDuration;
     }
+    if (device.webhook !== undefined) {
+      config['webhook'] = device.webhook;
+    }
     if (Object.entries(config).length !== 0) {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
-  async devicedeviceLogs(device: device & devicesConfig): Promise<void> {
+  async deviceLogs(device: device & devicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);

package/src/device/curtain.ts

@@ -36,9 +36,9 @@ export class Curtain {
   OpenAPI_CurrentPosition: deviceStatus['slidePosition'];
   OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
 
-  // OpenAPI Others
+  // Others
   Mode!: string;
-  setPositionMode?: string | number;
+  setPositionMode?: string;
 
   // BLE Status
   BLE_InMotion: serviceData['inMotion'];
@@ -157,12 +157,6 @@ export class Curtain {
 
     this.windowCoveringService
       .getCharacteristic(this.hap.Characteristic.HoldPosition)
-      .setProps({
-        minStep: this.minStep(device),
-        minValue: 0,
-        maxValue: 100,
-        validValueRanges: [0, 100],
-      })
       .onSet(this.HoldPositionSet.bind(this));
 
     // Light Sensor Service
@@ -559,7 +553,7 @@ export class Curtain {
           id: this.device.bleMac,
         })
         .then(async () => {
-          // Set an event hander
+          // Set an event handler
           switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
@@ -609,15 +603,12 @@ export class Curtain {
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
-      const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
+      const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
       const deviceStatus: any = await body.json();
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
       if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
         this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -675,35 +666,30 @@ export class Curtain {
         .toLowerCase();
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
       this.SilentPerformance();
-      const adjustedMode = this.setPositionMode || null;
-      if (adjustedMode === null) {
-        this.Mode = 'Default Mode';
-      }
+      const adjustedMode = this.setPositionMode == '1' ? 0x01 : 0xff;
       this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
       if (switchbot !== false) {
-        await this.retry({
-          max: this.maxRetry(),
-          fn: () => {
-            return switchbot
-              .discover({ model: 'c', quick: true, id: this.device.bleMac })
-              .then(async (device_list: any) => {
-                this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
-                return await device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
-              })
-              .then(() => {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-              })
-              .catch(async (e: any) => {
-                this.apiError(e);
-                this.errorLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}` +
-                  ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-                );
-                await this.BLEPushConnection();
-                throw new Error('Connection error');
-              });
-          },
-        });
+        try {
+          const device_list = await switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac });
+          this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
+
+          await this.retry({
+            max: this.maxRetry(),
+            fn: async () => {
+              await device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
+            },
+          });
+
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+        } catch (e) {
+          this.apiError(e);
+          this.errorLog(
+            `${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}` +
+              ` Connection, Error Message: ${JSON.stringify((e as Error).message)}`,
+          );
+          await this.BLEPushConnection();
+          throw new Error('Connection error');
+        }
       } else {
         this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
         await this.BLEPushConnection();
@@ -774,14 +760,12 @@ export class Curtain {
       });
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
-        const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
+        const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} headers: ${JSON.stringify(headers)}`);
         const deviceStatus: any = await body.json();
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
@@ -969,7 +953,7 @@ export class Curtain {
   }
 
   /*
-   * Setup MQTT hadler if URL is specifed.
+   * Setup MQTT hadler if URL is specified.
    */
   async setupMqtt(device: device & devicesConfig): Promise<void> {
     if (device.mqttURL) {
@@ -1033,18 +1017,18 @@ export class Curtain {
   async SilentPerformance() {
     if (Number(this.TargetPosition) > 50) {
       if (this.device.curtain?.setOpenMode === '1') {
-        this.setPositionMode = 1;
+        this.setPositionMode = '1';
         this.Mode = 'Silent Mode';
       } else {
-        this.setPositionMode = 0;
+        this.setPositionMode = '0';
         this.Mode = 'Performance Mode';
       }
     } else {
       if (this.device.curtain?.setCloseMode === '1') {
-        this.setPositionMode = 1;
+        this.setPositionMode = '1';
         this.Mode = 'Silent Mode';
       } else {
-        this.setPositionMode = 0;
+        this.setPositionMode = '0';
         this.Mode = 'Performance Mode';
       }
     }
@@ -1280,6 +1264,9 @@ export class Curtain {
     if (device.maxRetry !== undefined) {
       config['maxRetry'] = device.maxRetry;
     }
+    if (device.webhook !== undefined) {
+      config['webhook'] = device.webhook;
+    }
     if (Object.entries(config).length !== 0) {
       this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }