@switchbot/homebridge-switchbot 1.15.1-beta.8 → 2.0.0-beta.0

package/src/device/colorbulb.ts

@@ -6,7 +6,7 @@ import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
-import { device, devicesConfig, deviceStatus, switchbot, payload, hs2rgb, rgb2hs, m2hs, serviceData, ad, HostDomain, DevicePath } from '../settings';
+import { device, devicesConfig, deviceStatus, switchbot, hs2rgb, rgb2hs, m2hs, serviceData, ad, HostDomain, DevicePath } from '../settings';
 
 /**
  * Platform Accessory
@@ -34,7 +34,7 @@ export class ColorBulb {
   color: deviceStatus['color'];
   brightness: deviceStatus['brightness'];
   colorTemperature?: deviceStatus['colorTemperature'];
-  deviceStatus!: any; //deviceStatusResponse;
+  deviceStatus!: any;
 
   // BLE Others
   connected?: boolean;
@@ -68,6 +68,7 @@ export class ColorBulb {
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: device & devicesConfig) {
     // default placeholders
     this.logs(device);
+    this.scan(device);
     this.refreshRate(device);
     this.adaptiveLighting(device);
     this.config(device);
@@ -316,7 +317,10 @@ export class ColorBulb {
         })
         .then(() => {
           // Set an event hander
+          this.errorLog(`Color Bulb: ${this.accessory.displayName} then switchbot: ${JSON.stringify(switchbot)}`);
           switchbot.onadvertisement = (ad: any) => {
+            this.errorLog(`Color Bulb: ${this.accessory.displayName} switchbot: ${JSON.stringify(switchbot.onadvertisement)}`);
+            this.errorLog(`Color Bulb: ${this.accessory.displayName} ad: ${JSON.stringify(ad)}`);
             this.address = ad.address;
             if (this.deviceLogging.includes('debug')) {
               this.infoLog(this.address);
@@ -325,19 +329,19 @@ export class ColorBulb {
               this.infoLog(`Color Bulb: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
             }
             this.serviceData = ad.serviceData;
-            this.state = ad.serviceData.state;
-            this.delay = ad.serviceData.delay;
+            //this.state = ad.serviceData.state;
+            //this.delay = ad.serviceData.delay;
             //this.timer = ad.serviceData.timer;
             //this.syncUtcTime = ad.serviceData.syncUtcTime;
-            this.wifiRssi = ad.serviceData.wifiRssi;
+            //this.wifiRssi = ad.serviceData.wifiRssi;
             //this.overload = ad.serviceData.overload;
             //this.currentPower = ad.serviceData.currentPower;
             this.debugLog(`Color Bulb: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.debugLog(
+            /*this.debugLog(
               `Color Bulb: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
                 `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
                 `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
-            );
+            );*/
 
             if (this.serviceData) {
               this.connected = true;
@@ -351,13 +355,18 @@ export class ColorBulb {
           return switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
-          // Stop to monitor
+        // Stop to monitor
           switchbot.stopScan();
           if (this.connected) {
             this.parseStatus();
             this.updateHomeKitCharacteristics();
           } else {
-            await this.BLEconnection(switchbot);
+            this.errorLog(`Color Bulb: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+            if (this.platform.config.credentials?.token) {
+              this.warnLog(`Color Bulb: ${this.accessory.displayName} Using OpenAPI Connection`);
+              this.SwitchToOpenAPI = true;
+              await this.openAPIRefreshStatus();
+            }
           }
         })
         .catch(async (e: any) => {
@@ -381,6 +390,7 @@ export class ColorBulb {
 
   async getCustomBLEAddress(switchbot: any) {
     if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+      this.debugLog(`Color Bulb: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
       (async () => {
         // Start to monitor advertisement packets
         await switchbot.startScan({
@@ -388,7 +398,7 @@ export class ColorBulb {
         });
         // Set an event handler
         switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(JSON.stringify(ad, null, '  '));
+          this.warnLog(`Color Bulb: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
         };
         await switchbot.wait(10000);
         // Stop to monitor
@@ -478,68 +488,66 @@ export class ColorBulb {
   async pushChanges(): Promise<void> {
     try {
       if (this.On !== this.OnCached) {
-        // Push On Update
-        const payload = {
-          commandType: 'command',
-          parameter: 'default',
-        } as payload;
-
-        if (this.On) {
-          payload.command = 'turnOn';
-        } else {
-          payload.command = 'turnOff';
-        }
-
-        this.infoLog(
-          `Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-            ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-        );
-
-        // Make the API request
+        // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
         const data = this.platform.config.credentials?.token + t + nonce;
-        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+          .update(Buffer.from(data, 'utf-8'))
+          .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+
+        let command = '';
+        if (this.On) {
+          command = 'turnOn';
+        } else {
+          command = 'turnOff';
+        }
+        const body = JSON.stringify({
+          'command': `${command}`,
+          'parameter': 'default',
+          'commandType': 'command',
+        });
+        this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
           path: `${DevicePath}/${this.device.deviceId}/commands`,
           method: 'POST',
           headers: {
-            Authorization: this.platform.config.credentials?.token,
-            sign: sign,
-            nonce: nonce,
-            t: t,
+            'Authorization': this.platform.config.credentials?.token,
+            'sign': sign,
+            'nonce': nonce,
+            't': t,
             'Content-Type': 'application/json',
+            'Content-Length': body.length,
           },
         };
-        const req = https.request(options, (res) => {
+        const req = https.request(options, res => {
           this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
           this.statusCode({ res });
-          res.on('data', (d) => {
-            this.debugLog(`d: ${d}`);
+          res.on('data', d => {
+            this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
           });
         });
-        req.on('error', (error) => {
-          this.errorLog(`Color Bulb: ${this.accessory.displayName} error: ${error}`);
+        req.on('error', (e: any) => {
+          this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
         });
-        req.write(payload);
+        req.write(body);
         req.end();
-
         this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
         this.OnCached = this.On;
         this.accessory.context.On = this.OnCached;
       }
       // Push Brightness Update
       if (this.On) {
-        await this.pushBrightnessChanges();
+        //await this.pushBrightnessChanges();
       }
 
       // Push ColorTemperature Update
       if (this.On) {
-        await this.pushColorTemperatureChanges();
+        //await this.pushColorTemperatureChanges();
       }
 
       // Push Hue & Saturation Update
@@ -566,51 +574,47 @@ export class ColorBulb {
         const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
         this.debugLog(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
 
-        const payload = {
-          commandType: 'command',
-          command: 'setColor',
-          parameter: `${red}:${green}:${blue}`,
-        } as payload;
-
-        this.infoLog(
-          `Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-            ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-        );
-
-        // Make the API request
+        // Make Push Hue/Saturation request to the API
         const t = Date.now();
         const nonce = 'requestID';
         const data = this.platform.config.credentials?.token + t + nonce;
-        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+          .update(Buffer.from(data, 'utf-8'))
+          .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+        const body = JSON.stringify({
+          'command': 'setColor',
+          'parameter': `${red}:${green}:${blue}`,
+          'commandType': 'command',
+        });
+        this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
           path: `${DevicePath}/${this.device.deviceId}/commands`,
           method: 'POST',
           headers: {
-            Authorization: this.platform.config.credentials?.token,
-            sign: sign,
-            nonce: nonce,
-            t: t,
+            'Authorization': this.platform.config.credentials?.token,
+            'sign': sign,
+            'nonce': nonce,
+            't': t,
             'Content-Type': 'application/json',
+            'Content-Length': body.length,
           },
         };
-        const req = https.request(options, (res) => {
+        const req = https.request(options, res => {
           this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', (d) => {
-            this.debugLog(`d: ${d}`);
+          res.on('data', d => {
+            this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
           });
         });
-        req.on('error', (error) => {
-          this.errorLog(`Color Bulb: ${this.accessory.displayName} error: ${error}`);
+        req.on('error', (e: any) => {
+          this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
         });
-        req.write(payload);
+        req.write(body);
         req.end();
-
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushHueSaturationChanges: ${JSON.stringify(req)}`);
         this.HueCached = this.Hue;
         this.SaturationCached = this.Saturation;
       } else {
@@ -636,51 +640,48 @@ export class ColorBulb {
         const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
         this.cacheKelvin = kelvin;
 
-        const payload = {
-          commandType: 'command',
-          command: 'setColorTemperature',
-          parameter: `${kelvin}`,
-        } as payload;
-
-        this.infoLog(
-          `Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-            ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-        );
-
-        // Make the API request
+        // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
         const data = this.platform.config.credentials?.token + t + nonce;
-        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+          .update(Buffer.from(data, 'utf-8'))
+          .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+        const body = JSON.stringify({
+          'command': 'setColorTemperature',
+          'parameter': `${kelvin}`,
+          'commandType': 'command',
+        });
+        this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
           path: `${DevicePath}/${this.device.deviceId}/commands`,
           method: 'POST',
           headers: {
-            Authorization: this.platform.config.credentials?.token,
-            sign: sign,
-            nonce: nonce,
-            t: t,
+            'Authorization': this.platform.config.credentials?.token,
+            'sign': sign,
+            'nonce': nonce,
+            't': t,
             'Content-Type': 'application/json',
+            'Content-Length': body.length,
           },
         };
-        const req = https.request(options, (res) => {
+        const req = https.request(options, res => {
           this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', (d) => {
-            this.debugLog(`d: ${d}`);
+          res.on('data', d => {
+            this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
           });
         });
-        req.on('error', (error) => {
-          this.errorLog(`Color Bulb: ${this.accessory.displayName} error: ${error}`);
+        req.on('error', (e: any) => {
+          this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
         });
-        req.write(payload);
+        req.write(body);
         req.end();
 
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushColorTemperatureChanges: ${JSON.stringify(req)}`);
         this.ColorTemperatureCached = this.ColorTemperature;
       } else {
         this.debugLog(
@@ -702,51 +703,47 @@ export class ColorBulb {
   async pushBrightnessChanges(): Promise<void> {
     try {
       if (this.Brightness !== this.BrightnessCached) {
-        const payload = {
-          commandType: 'command',
-          command: 'setBrightness',
-          parameter: `${this.Brightness}`,
-        } as payload;
-
-        this.infoLog(
-          `Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-            ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-        );
-
-        // Make the API request
+        // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
         const data = this.platform.config.credentials?.token + t + nonce;
-        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+        const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+          .update(Buffer.from(data, 'utf-8'))
+          .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+        const body = JSON.stringify({
+          'command': 'setBrightness',
+          'parameter': `${this.Brightness}`,
+          'commandType': 'command',
+        });
+        this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
           path: `${DevicePath}/${this.device.deviceId}/commands`,
           method: 'POST',
           headers: {
-            Authorization: this.platform.config.credentials?.token,
-            sign: sign,
-            nonce: nonce,
-            t: t,
+            'Authorization': this.platform.config.credentials?.token,
+            'sign': sign,
+            'nonce': nonce,
+            't': t,
             'Content-Type': 'application/json',
+            'Content-Length': body.length,
           },
         };
-        const req = https.request(options, (res) => {
+        const req = https.request(options, res => {
           this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-          this.statusCode({ res });
-          res.on('data', (d) => {
-            this.debugLog(`d: ${d}`);
+          res.on('data', d => {
+            this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
           });
         });
-        req.on('error', (error) => {
-          this.errorLog(`Color Bulb: ${this.accessory.displayName} error: ${error}`);
+        req.on('error', (e: any) => {
+          this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
         });
-        req.write(payload);
+        req.write(body);
         req.end();
-
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Color Bulb: ${this.accessory.displayName} pushBrightnessChanges: ${JSON.stringify(req)}`);
         this.BrightnessCached = this.Brightness;
       } else {
         this.debugLog(
@@ -954,6 +951,20 @@ export class ColorBulb {
     }
   }
 
+  async scan(device: device & devicesConfig): Promise<void> {
+    if (device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
+      if (device.ble) {
+        this.debugLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.device.ble) {
+        this.debugLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   async logs(device: device & devicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';

package/src/device/contact.ts

@@ -354,7 +354,7 @@ export class Contact {
         });
         // Set an event handler
         switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(JSON.stringify(ad, null, '  '));
+          this.warnLog(`Contact Sensor: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
         };
         await switchbot.wait(10000);
         // Stop to monitor

package/src/device/curtain.ts

@@ -8,7 +8,7 @@ import { connectAsync } from 'async-mqtt';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, switchbot, payload, deviceStatus, ad, HostDomain, DevicePath } from '../settings';
+import { device, devicesConfig, serviceData, switchbot, deviceStatus, ad, HostDomain, DevicePath } from '../settings';
 
 export class Curtain {
   // Services
@@ -436,6 +436,7 @@ export class Curtain {
     this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     this.getCustomBLEAddress(switchbot);
     // Start to monitor advertisement packets
+    this.errorLog(`Color Bulb: ${this.accessory.displayName} switchbot: ${JSON.stringify(switchbot)}`);
     if (switchbot !== false) {
       switchbot
         .startScan({
@@ -481,7 +482,12 @@ export class Curtain {
             this.parseStatus();
             this.updateHomeKitCharacteristics();
           } else {
-            await this.BLEconnection(switchbot);
+            this.errorLog(`Curtain: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+            if (this.platform.config.credentials?.token) {
+              this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+              this.SwitchToOpenAPI = true;
+              await this.openAPIRefreshStatus();
+            }
           }
         })
         .catch(async (e: any) => {
@@ -512,7 +518,7 @@ export class Curtain {
         });
         // Set an event handler
         switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(JSON.stringify(ad, null, '  '));
+          this.warnLog(`Curtain: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
         };
         await switchbot.wait(10000);
         // Stop to monitor
@@ -679,6 +685,15 @@ export class Curtain {
       try {
         this.debugLog(`Curtain: ${this.accessory.displayName} OpenAPI pushChanges`);
         if (this.TargetPosition !== this.CurrentPosition) {
+          // Make Push On request to the API
+          const t = Date.now();
+          const nonce = 'requestID';
+          const data = this.platform.config.credentials?.token + t + nonce;
+          const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret)
+            .update(Buffer.from(data, 'utf-8'))
+            .digest();
+          const sign = signTerm.toString('base64');
+          this.debugLog(`Curtain: ${this.accessory.displayName} sign: ${sign}`);
           this.debugLog(`Pushing ${this.TargetPosition}`);
           const adjustedTargetPosition = 100 - Number(this.TargetPosition);
           if (this.TargetPosition > 50) {
@@ -695,54 +710,39 @@ export class Curtain {
           }
           this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
           const adjustedMode = this.setPositionMode || 'ff';
-          const payload = {
-            commandType: 'command',
-            command: 'setPosition',
-            parameter: `0,${adjustedMode},${adjustedTargetPosition}`,
-          } as payload;
-
-          this.infoLog(
-            `Curtain: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-              ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-          );
-
-          // Make the API request
-          const t = Date.now();
-          const nonce = 'requestID';
-          const data = this.platform.config.credentials?.token + t + nonce;
-          const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
-          const sign = signTerm.toString('base64');
-          this.debugLog(`Curtain: ${this.accessory.displayName} sign: ${sign}`);
+          const body = JSON.stringify({
+            'command': 'setPosition',
+            'parameter': `0,${adjustedMode},${adjustedTargetPosition}`,
+            'commandType': 'command',
+          });
+          this.infoLog(`Curtain: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
           const options = {
             hostname: HostDomain,
             port: 443,
             path: `${DevicePath}/${this.device.deviceId}/commands`,
             method: 'POST',
             headers: {
-              Authorization: this.platform.config.credentials?.token,
-              sign: sign,
-              nonce: nonce,
-              t: t,
+              'Authorization': this.platform.config.credentials?.token,
+              'sign': sign,
+              'nonce': nonce,
+              't': t,
               'Content-Type': 'application/json',
+              'Content-Length': body.length,
             },
           };
-
-          const req = https.request(options, (res) => {
+          const req = https.request(options, res => {
             this.debugLog(`Curtain: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
             this.statusCode({ res });
-            res.on('data', (d) => {
+            res.on('data', d => {
               this.debugLog(`Curtain: ${this.accessory.displayName} d: ${d}`);
             });
           });
-
-          req.on('error', (error) => {
-            this.errorLog(`Curtain: ${this.accessory.displayName} error: ${error}`);
+          req.on('error', (e: any) => {
+            this.errorLog(`Curtain: ${this.accessory.displayName} error message: ${e.message}`);
           });
-
-          req.write(payload);
+          req.write(body);
           req.end();
-
-          this.debugLog(`Curtain: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+          this.debugLog(`Curtain: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
         } else {
           this.debugLog(
             `Curtain: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.` +