@switchbot/homebridge-switchbot 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/platform.js

@@ -28,6 +28,7 @@ const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const buffer_1 = require("buffer");
 const fakegato_history_1 = __importDefault(require("fakegato-history"));
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const fs_1 = require("fs");
 const settings_1 = require("./settings");
 /**
@@ -61,9 +62,9 @@ class SwitchBotPlatform {
             this.debugLog('Config OK');
         }
         catch (e) {
-            this.errorLog(JSON.stringify(e.message));
+            this.errorLog((0, super_stringify_1.default)(e.message));
             if (this.platformLogging?.includes('debug')) {
-                this.errorLog(JSON.stringify(e));
+                this.errorLog((0, super_stringify_1.default)(e));
             }
             return;
         }
@@ -85,9 +86,9 @@ class SwitchBotPlatform {
                 }
             }
             catch (e) {
-                this.errorLog('Failed to Discover Devices.', JSON.stringify(e.message));
+                this.errorLog('Failed to Discover Devices.', (0, super_stringify_1.default)(e.message));
                 if (this.platformLogging?.includes('debug')) {
-                    this.errorLog(JSON.stringify(e));
+                    this.errorLog((0, super_stringify_1.default)(e));
                 }
             }
         });
@@ -138,7 +139,7 @@ class SwitchBotPlatform {
             platformConfig['pushRate'] = this.config.options.pushRate;
         }
         if (Object.entries(platformConfig).length !== 0) {
-            this.infoLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
+            this.infoLog(`Platform Config: ${(0, super_stringify_1.default)(platformConfig)}`);
         }
         if (this.config.options) {
             // Device Config
@@ -242,7 +243,7 @@ class SwitchBotPlatform {
                 this.warnLog(`Token: ${pluginConfig.credentials.token}`);
             }
             // save the config, ensuring we maintain pretty json
-            (0, fs_1.writeFileSync)(this.api.user.configPath(), JSON.stringify(currentConfig, null, 4));
+            (0, fs_1.writeFileSync)(this.api.user.configPath(), (0, super_stringify_1.default)(currentConfig, null, 4));
             this.verifyConfig();
         }
         catch (e) {
@@ -276,7 +277,7 @@ class SwitchBotPlatform {
                 };
                 const req = https_1.default.request(options, (res) => {
                     this.debugLog(`statusCode: ${res.statusCode}`);
-                    this.debugLog(`headers: ${JSON.stringify(res.headers)}`);
+                    this.debugLog(`headers: ${(0, super_stringify_1.default)(res.headers)}`);
                     let rawData = '';
                     res.on('data', (d) => {
                         rawData += d;
@@ -285,7 +286,7 @@ class SwitchBotPlatform {
                     res.on('end', () => {
                         try {
                             const devicesAPI = JSON.parse(rawData);
-                            this.debugLog(`devicesAPI: ${JSON.stringify(devicesAPI.body)}`);
+                            this.debugLog(`devicesAPI: ${(0, super_stringify_1.default)(devicesAPI.body)}`);
                             // SwitchBot Devices
                             if (devicesAPI.body.deviceList.length !== 0) {
                                 this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
@@ -295,7 +296,7 @@ class SwitchBotPlatform {
                             }
                             const deviceLists = devicesAPI.body.deviceList;
                             if (!this.config.options?.devices) {
-                                this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                this.debugLog(`SwitchBot Device Config Not Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                                 const devices = deviceLists.map((v) => v);
                                 for (const device of devices) {
                                     if (device.deviceType) {
@@ -307,14 +308,14 @@ class SwitchBotPlatform {
                                 }
                             }
                             else if (this.config.credentials?.token && this.config.options.devices) {
-                                this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                this.debugLog(`SwitchBot Device Config Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                                 const deviceConfigs = this.config.options?.devices;
                                 const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
                                     ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
                                     ...itm,
                                 }));
                                 const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-                                this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
+                                this.debugLog(`SwitchBot Devices: ${(0, super_stringify_1.default)(devices)}`);
                                 for (const device of devices) {
                                     if (device.deviceType) {
                                         if (device.configDeviceName) {
@@ -336,7 +337,7 @@ class SwitchBotPlatform {
                             }
                             const irDeviceLists = devicesAPI.body.infraredRemoteList;
                             if (!this.config.options?.irdevices) {
-                                this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                this.debugLog(`IR Device Config Not Set: ${(0, super_stringify_1.default)(this.config.options?.irdevices)}`);
                                 const devices = irDeviceLists.map((v) => v);
                                 for (const device of devices) {
                                     if (device.remoteType) {
@@ -345,14 +346,14 @@ class SwitchBotPlatform {
                                 }
                             }
                             else {
-                                this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                this.debugLog(`IR Device Config Set: ${(0, super_stringify_1.default)(this.config.options?.irdevices)}`);
                                 const irDeviceConfig = this.config.options?.irdevices;
                                 const mergeIRBydeviceId = (a1, a2) => a1.map((itm) => ({
                                     ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
                                     ...itm,
                                 }));
                                 const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-                                this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
+                                this.debugLog(`IR Devices: ${(0, super_stringify_1.default)(devices)}`);
                                 for (const device of devices) {
                                     if (device.remoteType) {
                                         this.createIRDevice(device);
@@ -371,7 +372,7 @@ class SwitchBotPlatform {
                 req.end();
             }
             else if (!this.config.credentials?.token && this.config.options?.devices) {
-                this.debugLog(`SwitchBot Device Manual Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+                this.debugLog(`SwitchBot Device Manual Config Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                 const deviceConfigs = this.config.options?.devices;
                 const devices = deviceConfigs.map((v) => v);
                 for (const device of devices) {
@@ -432,10 +433,10 @@ class SwitchBotPlatform {
             this.errorLog('Failed to Discover Devices');
         }
         if (this.platformLogging === 'debug') {
-            this.errorLog(`Failed to Discover Devices, Error Message: ${JSON.stringify(e.message)}`);
+            this.errorLog(`Failed to Discover Devices, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
         if (this.platformLogging === 'debugMode') {
-            this.errorLog(`Failed to Discover Devices, Error: ${JSON.stringify(e)}`);
+            this.errorLog(`Failed to Discover Devices, Error: ${(0, super_stringify_1.default)(e)}`);
         }
     }
     createDevice(device) {
@@ -581,7 +582,7 @@ class SwitchBotPlatform {
                 //existingAccessory.context.firmwareRevision = firmware;
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -629,11 +630,11 @@ class SwitchBotPlatform {
             // the accessory already exists
             if (this.registerDevice(device)) {
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                this.debugLog(JSON.stringify(device.bot?.mode));
+                this.debugLog((0, super_stringify_1.default)(device.bot?.mode));
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -650,7 +651,7 @@ class SwitchBotPlatform {
         else if (this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            this.debugLog(JSON.stringify(device.bot?.mode));
+            this.debugLog((0, super_stringify_1.default)(device.bot?.mode));
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
@@ -686,7 +687,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -737,7 +738,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -788,7 +789,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -839,7 +840,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -890,7 +891,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -965,7 +966,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -1016,7 +1017,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -1067,7 +1068,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -1118,7 +1119,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 await this.connectionTypeExistingAccessory(device, existingAccessory);
@@ -1167,7 +1168,7 @@ class SwitchBotPlatform {
             // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
             existingAccessory.context.model = device.remoteType;
             existingAccessory.context.deviceID = device.deviceId;
-            existingAccessory.displayName = device.deviceName;
+            existingAccessory.displayName = device.configDeviceName || device.deviceName;
             existingAccessory.context.firmwareRevision = device.firmware;
             existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
             await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1218,7 +1219,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1269,7 +1270,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1320,7 +1321,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1371,7 +1372,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1422,7 +1423,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1473,7 +1474,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1524,7 +1525,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1575,7 +1576,7 @@ class SwitchBotPlatform {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.remoteType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 await this.connectionTypeExistingIRAccessory(existingAccessory);
@@ -1676,12 +1677,12 @@ class SwitchBotPlatform {
     }
     deviceListInfo(devices) {
         if (this.platformLogging?.includes('debug')) {
-            this.warnLog(`deviceListInfoStatus: ${JSON.stringify(devices)}`);
+            this.warnLog(`deviceListInfoStatus: ${(0, super_stringify_1.default)(devices)}`);
         }
     }
     async deviceInfo(device) {
         if (this.platformLogging?.includes('debug')) {
-            this.warnLog(JSON.stringify(device));
+            this.warnLog((0, super_stringify_1.default)(device));
             const t = Date.now();
             const nonce = 'requestID';
             const data = this.config.credentials?.token + t + nonce;
@@ -1713,10 +1714,10 @@ class SwitchBotPlatform {
             req.end();
             this.deviceStatus = req;
             if (this.deviceStatus.message === 'success') {
-                this.warnLog(`${device.deviceName} deviceInfoStatus: ${JSON.stringify(this.deviceStatus)}`);
+                this.warnLog(`${device.deviceName} deviceInfoStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
             }
             else {
-                this.warnLog(`${device.deviceName} deviceInfoStatus: ${JSON.stringify(this.deviceStatus.message)}`);
+                this.warnLog(`${device.deviceName} deviceInfoStatus: ${(0, super_stringify_1.default)(this.deviceStatus.message)}`);
                 this.warnLog('Unable to retreive deviceInfoStatus.');
             }
         }