@switchbot/homebridge-switchbot 2.0.0-beta.12 → 2.0.0-beta.14

package/src/device/striplight.ts

@@ -3,8 +3,9 @@ import crypto from 'crypto';
 import { Context } from 'vm';
 import { IncomingMessage } from 'http';
 import { interval, Subject } from 'rxjs';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
-import { debounceTime, skipWhile, tap } from 'rxjs/operators';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
 import { device, devicesConfig, switchbot, hs2rgb, rgb2hs, deviceStatus, HostDomain, DevicePath, ad, serviceData } from '../settings';
 
@@ -55,8 +56,8 @@ export class StripLight {
   cacheKelvin!: number;
 
   // Updates
-  colorBulbUpdateInProgress!: boolean;
-  doColorBulbUpdate!: Subject<void>;
+  stripLightUpdateInProgress!: boolean;
+  doStripLightUpdate!: Subject<void>;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: device & devicesConfig) {
     // default placeholders
@@ -75,8 +76,8 @@ export class StripLight {
     this.minKelvin = 2000;
     this.maxKelvin = 9000;
     // this is subject we use to track when we need to POST changes to the SwitchBot API
-    this.doColorBulbUpdate = new Subject();
-    this.colorBulbUpdateInProgress = false;
+    this.doStripLightUpdate = new Subject();
+    this.stripLightUpdateInProgress = false;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
@@ -152,17 +153,17 @@ export class StripLight {
 
     // Start an update interval
     interval(this.deviceRefreshRate * 1000)
-      .pipe(skipWhile(() => this.colorBulbUpdateInProgress))
+      .pipe(skipWhile(() => this.stripLightUpdateInProgress))
       .subscribe(async () => {
         await this.refreshStatus();
       });
 
     // Watch for Bulb change events
     // We put in a debounce of 100ms so we don't make duplicate calls
-    this.doColorBulbUpdate
+    this.doStripLightUpdate
       .pipe(
         tap(() => {
-          this.colorBulbUpdateInProgress = true;
+          this.stripLightUpdateInProgress = true;
         }),
         debounceTime(this.platform.config.options!.pushRate! * 1000),
       )
@@ -172,11 +173,18 @@ export class StripLight {
         } catch (e: any) {
           this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges`);
           if (this.deviceLogging.includes('debug')) {
-            this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
+            this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${superStringify(e.message)}`);
           }
           this.apiError(e);
         }
-        this.colorBulbUpdateInProgress = false;
+        this.stripLightUpdateInProgress = false;
+        // Refresh the status from the API
+        interval(15000)
+          .pipe(skipWhile(() => this.stripLightUpdateInProgress))
+          .pipe(take(1))
+          .subscribe(async () => {
+            await this.refreshStatus();
+          });
       });
   }
 
@@ -217,14 +225,14 @@ export class StripLight {
 
     // Color, Hue & Brightness
     if (this.color) {
-      this.debugLog(`Strip Light: ${this.accessory.displayName} color: ${JSON.stringify(this.color)}`);
+      this.debugLog(`Strip Light: ${this.accessory.displayName} color: ${superStringify(this.color)}`);
       const [red, green, blue] = this.color!.split(':');
-      this.debugLog(`Strip Light: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
-      this.debugLog(`Strip Light: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
-      this.debugLog(`Strip Light: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
+      this.debugLog(`Strip Light: ${this.accessory.displayName} red: ${superStringify(red)}`);
+      this.debugLog(`Strip Light: ${this.accessory.displayName} green: ${superStringify(green)}`);
+      this.debugLog(`Strip Light: ${this.accessory.displayName} blue: ${superStringify(blue)}`);
 
       const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
-      this.debugLog(`Strip Light: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
+      this.debugLog(`Strip Light: ${this.accessory.displayName} hs: ${superStringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
 
       // Hue
       this.Hue = hue;
@@ -271,7 +279,7 @@ export class StripLight {
               this.infoLog(`Strip Light: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
               this.infoLog(`Strip Light: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
             }
-            this.errorLog(`Strip Light: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+            this.errorLog(`Strip Light: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             this.serviceData = ad.serviceData;
             //this.state = ad.serviceData.state;
             //this.delay = ad.serviceData.delay;
@@ -280,7 +288,7 @@ export class StripLight {
             //this.wifiRssi = ad.serviceData.wifiRssi;
             //this.overload = ad.serviceData.overload;
             //this.currentPower = ad.serviceData.currentPower;
-            this.debugLog(`Strip Light: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+            this.debugLog(`Strip Light: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             /*this.debugLog(
               `Strip Light: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
                 `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
@@ -317,7 +325,7 @@ export class StripLight {
           this.errorLog(`Strip Light: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
           if (this.deviceLogging.includes('debug')) {
             this.errorLog(
-              `Strip Light: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+              `Strip Light: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${superStringify(e.message)}`,
             );
           }
           if (this.platform.config.credentials?.token) {
@@ -342,7 +350,7 @@ export class StripLight {
         });
         // Set an event handler
         switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(`Strip Light: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
+          this.warnLog(`Strip Light: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
         };
         await switchbot.wait(10000);
         // Stop to monitor
@@ -391,7 +399,7 @@ export class StripLight {
         res.on('end', () => {
           try {
             this.deviceStatus = JSON.parse(rawData);
-            this.debugLog(`Strip Light: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+            this.debugLog(`Strip Light: ${this.accessory.displayName} refreshStatus: ${superStringify(this.deviceStatus)}`);
             this.power = this.deviceStatus.body.power;
             this.color = this.deviceStatus.body.color;
             this.brightness = this.deviceStatus.body.brightness;
@@ -410,7 +418,7 @@ export class StripLight {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -446,7 +454,7 @@ export class StripLight {
         } else {
           command = 'turnOff';
         }
-        const body = JSON.stringify({
+        const body = superStringify({
           'command': `${command}`,
           'parameter': 'default',
           'commandType': 'command',
@@ -478,7 +486,7 @@ export class StripLight {
         });
         req.write(body);
         req.end();
-        this.debugLog(`Strip Light: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       }
       // Push Brightness Update
       if (this.On) {
@@ -493,7 +501,7 @@ export class StripLight {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -503,11 +511,11 @@ export class StripLight {
   async pushHueSaturationChanges(): Promise<void> {
     try {
       if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
-        this.debugLog(`Strip Light: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
-        this.debugLog(`Strip Light: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} Hue: ${superStringify(this.Hue)}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} Saturation: ${superStringify(this.Saturation)}`);
 
         const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
-        this.debugLog(`Strip Light: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} rgb: ${superStringify([red, green, blue])}`);
         // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
@@ -517,7 +525,7 @@ export class StripLight {
           .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Strip Light: ${this.accessory.displayName} sign: ${sign}`);
-        const body = JSON.stringify({
+        const body = superStringify({
           'command': 'setColor',
           'parameter': `${red}:${green}:${blue}`,
           'commandType': 'command',
@@ -549,7 +557,7 @@ export class StripLight {
         });
         req.write(body);
         req.end();
-        this.debugLog(`Strip Light: ${this.accessory.displayName} pushHueSaturationChanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} pushHueSaturationChanges: ${superStringify(req)}`);
       } else {
         this.debugLog(
           `Strip Light: ${this.accessory.displayName} No Changes.` +
@@ -562,7 +570,7 @@ export class StripLight {
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Strip Light: ${this.accessory.displayName} failed pushHueSaturationChanges with OpenAPI Connection,`
-          + ` Error Message: ${JSON.stringify(e.message)}`,
+          + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -581,7 +589,7 @@ export class StripLight {
           .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`Strip Light: ${this.accessory.displayName} sign: ${sign}`);
-        const body = JSON.stringify({
+        const body = superStringify({
           'command': 'setBrightness',
           'parameter': `${this.Brightness}`,
           'commandType': 'command',
@@ -613,7 +621,7 @@ export class StripLight {
         });
         req.write(body);
         req.end();
-        this.debugLog(`Strip Light: ${this.accessory.displayName} pushBrightnessChanges: ${JSON.stringify(req)}`);
+        this.debugLog(`Strip Light: ${this.accessory.displayName} pushBrightnessChanges: ${superStringify(req)}`);
       } else {
         this.debugLog(
           `Strip Light: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, `
@@ -625,7 +633,7 @@ export class StripLight {
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `Strip Light: ${this.accessory.displayName} failed pushBrightnessChanges with OpenAPI Connection,`
-          + ` Error Message: ${JSON.stringify(e.message)}`,
+          + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -693,7 +701,7 @@ export class StripLight {
       case 190:
         this.errorLog(
           `Strip Light: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-            ` Or command: ${JSON.stringify(res)} format is invalid`,
+            ` Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -722,7 +730,7 @@ export class StripLight {
     this.debugLog(`Strip Light: ${this.accessory.displayName} On: ${value}`);
 
     this.On = value;
-    this.doColorBulbUpdate.next();
+    this.doStripLightUpdate.next();
   }
 
   /**
@@ -732,7 +740,7 @@ export class StripLight {
     this.debugLog(`Strip Light: ${this.accessory.displayName} Brightness: ${value}`);
 
     this.Brightness = value;
-    this.doColorBulbUpdate.next();
+    this.doStripLightUpdate.next();
   }
 
   /**
@@ -742,7 +750,7 @@ export class StripLight {
     this.debugLog(`Strip Light: ${this.accessory.displayName} Hue: ${value}`);
 
     this.Hue = value;
-    this.doColorBulbUpdate.next();
+    this.doStripLightUpdate.next();
   }
 
   /**
@@ -752,7 +760,7 @@ export class StripLight {
     this.debugLog(`Strip Light: ${this.accessory.displayName} Saturation: ${value}`);
 
     this.Saturation = value;
-    this.doColorBulbUpdate.next();
+    this.doStripLightUpdate.next();
   }
 
   async config(device: device & devicesConfig): Promise<void> {
@@ -776,7 +784,7 @@ export class StripLight {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Strip Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Strip Light: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 

package/src/irdevice/airconditioner.ts

@@ -1,6 +1,7 @@
 import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
@@ -110,14 +111,14 @@ export class AirConditioner {
       this.TargetHeaterCoolerState = 1 || 2;
       this.ValidValues = [1, 2];
       this.debugLog(
-        `Air Conditioner: ${this.accessory.displayName} ValidValues: ${JSON.stringify(this.ValidValues)},` +
+        `Air Conditioner: ${this.accessory.displayName} ValidValues: ${superStringify(this.ValidValues)},` +
           ` hide_automode: ${this.hide_automode}, TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`,
       );
     } else {
       this.TargetHeaterCoolerState = 0 || 1 || 2;
       this.ValidValues = [0, 1, 2];
       this.debugLog(
-        `Air Conditioner: ${this.accessory.displayName} ValidValues: ${JSON.stringify(this.ValidValues)},` +
+        `Air Conditioner: ${this.accessory.displayName} ValidValues: ${superStringify(this.ValidValues)},` +
           ` hide_automode: ${this.hide_automode}, TargetHeaterCoolerState: ${this.TargetHeaterCoolerState}`,
       );
     }
@@ -183,7 +184,7 @@ export class AirConditioner {
    */
   async pushAirConditionerOnChanges(): Promise<void> {
     if (this.Active !== this.platform.Characteristic.Active.ACTIVE || this.pushOn) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOn',
         'parameter': 'default',
         'commandType': 'command',
@@ -193,7 +194,7 @@ export class AirConditioner {
   }
 
   async pushAirConditionerOffChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'turnOff',
       'parameter': 'default',
       'commandType': 'command',
@@ -243,7 +244,7 @@ export class AirConditioner {
     } else {
       this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.INACTIVE;
     }
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'setAll',
       'parameter': `${parameter}`,
       'commandType': 'command',
@@ -290,7 +291,7 @@ export class AirConditioner {
       });
       req.write(body);
       req.end();
-      this.debugLog(`Air Conditioner: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+      this.debugLog(`Air Conditioner: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       this.CurrentTemperatureCached = this.CurrentTemperature;
       this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
       this.HeatingThresholdTemperature = this.CurrentTemperatureCached;
@@ -303,7 +304,7 @@ export class AirConditioner {
     } catch (e: any) {
       this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges`);
       if (this.deviceLogging.includes('debug')) {
-        this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
+        this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${superStringify(e.message)}`);
       }
       this.apiError(e);
     }
@@ -329,7 +330,7 @@ export class AirConditioner {
       case 190:
         this.errorLog(
           `Air Conditioner: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
+            ` with server, Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -620,7 +621,7 @@ export class AirConditioner {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Air Conditioner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Air Conditioner: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 

package/src/irdevice/airpurifier.ts

@@ -1,6 +1,7 @@
 import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
@@ -158,7 +159,7 @@ export class AirPurifier {
    */
   async pushAirPurifierOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOn',
         'parameter': 'default',
         'commandType': 'command',
@@ -169,7 +170,7 @@ export class AirPurifier {
 
   async pushAirPurifierOffChanges(): Promise<void> {
     if (this.Active !== 0) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOff',
         'parameter': 'default',
         'commandType': 'command',
@@ -195,7 +196,7 @@ export class AirPurifier {
     this.CurrentAPFanSpeed = this.CurrentFanSpeed || 1;
     this.APActive = this.Active === 1 ? 'on' : 'off';
     const parameter = `${this.CurrentAPTemp},${this.CurrentAPMode},${this.CurrentAPFanSpeed},${this.APActive}`;
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'setAll',
       'parameter': `${parameter}`,
       'commandType': 'command',
@@ -250,7 +251,7 @@ export class AirPurifier {
       });
       req.write(body);
       req.end();
-      this.debugLog(`Air Purifier: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+      this.debugLog(`Air Purifier: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       this.updateHomeKitCharacteristics();
       this.CurrentTemperatureCached = this.CurrentTemperature;
       this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
@@ -258,7 +259,7 @@ export class AirPurifier {
       this.errorLog(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -285,7 +286,7 @@ export class AirPurifier {
       case 190:
         this.errorLog(
           `Air Purifier: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
+            ` with server, Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -313,7 +314,7 @@ export class AirPurifier {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Air Purifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Air Purifier: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 

package/src/irdevice/camera.ts

@@ -1,6 +1,7 @@
 import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
@@ -86,7 +87,7 @@ export class Camera {
    */
   async pushOnChanges(): Promise<void> {
     if (this.On) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOn',
         'parameter': 'default',
         'commandType': 'command',
@@ -97,7 +98,7 @@ export class Camera {
 
   async pushOffChanges(): Promise<void> {
     if (!this.On) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOff',
         'parameter': 'default',
         'commandType': 'command',
@@ -144,7 +145,7 @@ export class Camera {
       });
       req.write(body);
       req.end();
-      this.debugLog(`Camera: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+      this.debugLog(`Camera: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       this.updateHomeKitCharacteristics();
       this.OnCached = this.On;
       this.accessory.context.On = this.OnCached;
@@ -152,7 +153,7 @@ export class Camera {
       this.errorLog(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -179,7 +180,7 @@ export class Camera {
       case 190:
         this.errorLog(
           `Camera: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
+            ` with server, Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -204,7 +205,7 @@ export class Camera {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Camera: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Camera: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 

package/src/irdevice/fan.ts

@@ -1,6 +1,7 @@
 import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { irdevice, irDevicesConfig, HostDomain, DevicePath } from '../settings';
@@ -188,7 +189,7 @@ export class Fan {
    */
   async pushFanOnChanges(): Promise<void> {
     if (this.Active !== 1) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOn',
         'parameter': 'default',
         'commandType': 'command',
@@ -198,7 +199,7 @@ export class Fan {
   }
 
   async pushFanOffChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'turnOff',
       'parameter': 'default',
       'commandType': 'command',
@@ -207,7 +208,7 @@ export class Fan {
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'highSpeed',
       'parameter': 'default',
       'commandType': 'command',
@@ -216,7 +217,7 @@ export class Fan {
   }
 
   async pushFanSpeedDownChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'lowSpeed',
       'parameter': 'default',
       'commandType': 'command',
@@ -225,7 +226,7 @@ export class Fan {
   }
 
   async pushFanSwingChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'swing',
       'parameter': 'default',
       'commandType': 'command',
@@ -271,13 +272,13 @@ export class Fan {
       });
       req.write(body);
       req.end();
-      this.debugLog(`Fan: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+      this.debugLog(`Fan: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -304,7 +305,7 @@ export class Fan {
       case 190:
         this.errorLog(
           `Fan: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
+            ` with server, Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -331,7 +332,7 @@ export class Fan {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Fan: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Fan: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 

package/src/irdevice/light.ts

@@ -1,6 +1,7 @@
 import https from 'https';
 import crypto from 'crypto';
 import { IncomingMessage } from 'http';
+import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { irDevicesConfig, irdevice, HostDomain, DevicePath } from '../settings';
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
@@ -101,7 +102,7 @@ export class Light {
    */
   async pushLightOnChanges(): Promise<void> {
     if (this.On) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOn',
         'parameter': 'default',
         'commandType': 'command',
@@ -112,7 +113,7 @@ export class Light {
 
   async pushLightOffChanges(): Promise<void> {
     if (!this.On) {
-      const body = JSON.stringify({
+      const body = superStringify({
         'command': 'turnOff',
         'parameter': 'default',
         'commandType': 'command',
@@ -122,7 +123,7 @@ export class Light {
   }
 
   async pushLightBrightnessUpChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'brightnessUp',
       'parameter': 'default',
       'commandType': 'command',
@@ -131,7 +132,7 @@ export class Light {
   }
 
   async pushLightBrightnessDownChanges(): Promise<void> {
-    const body = JSON.stringify({
+    const body = superStringify({
       'command': 'brightnessDown',
       'parameter': 'default',
       'commandType': 'command',
@@ -177,7 +178,7 @@ export class Light {
       });
       req.write(body);
       req.end();
-      this.debugLog(`Light: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
+      this.debugLog(`Light: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
       this.OnCached = this.On;
       this.accessory.context.On = this.OnCached;
       this.updateHomeKitCharacteristics();
@@ -185,7 +186,7 @@ export class Light {
       this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
+          `Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -212,7 +213,7 @@ export class Light {
       case 190:
         this.errorLog(
           `Light: ${this.accessory.displayName} Device internal error due to device states not synchronized` +
-            ` with server, Or command: ${JSON.stringify(res)} format is invalid`,
+            ` with server, Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
@@ -237,7 +238,7 @@ export class Light {
       config['logging'] = device.logging;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Light: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }