@switchbot/homebridge-switchbot 2.0.0-beta.27 → 2.0.0-beta.29

package/dist/platform.js

@@ -31,7 +31,6 @@ 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");
-const rxjs_1 = require("rxjs");
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -63,10 +62,8 @@ class SwitchBotPlatform {
             this.debugLog('Config OK');
         }
         catch (e) {
-            this.errorLog((0, super_stringify_1.default)(e.message));
-            if (this.platformLogging?.includes('debug')) {
-                this.errorLog(`Verify Config: ${e}`);
-            }
+            this.errorLog(`Verify Config, Error Message: ${e.message}`);
+            this.debugErrorLog(`Verify Config, Error: ${e}`);
             return;
         }
         // import fakegato-history module
@@ -91,34 +88,11 @@ class SwitchBotPlatform {
                 }
             }
             catch (e) {
-                this.errorLog('Failed to Discover Devices.', (0, super_stringify_1.default)(e.message));
-                if (this.platformLogging?.includes('debug')) {
-                    this.errorLog(`Platform: ${e}`);
-                }
+                this.errorLog(`Failed to Discover, Error Message: ${e.message}`);
+                this.debugErrorLog(`Failed to Discover, Error: ${e}`);
             }
         });
     }
-    logs() {
-        this.debugMode = process.argv.includes('-D') || process.argv.includes('--debug');
-        if (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none') {
-            this.platformLogging = this.config.options.logging;
-            if (this.platformLogging.includes('debug')) {
-                this.log.warn(`Using Config Logging: ${this.platformLogging}`);
-            }
-        }
-        else if (this.debugMode) {
-            this.platformLogging = 'debugMode';
-            if (this.platformLogging?.includes('debug')) {
-                this.log.warn(`Using ${this.platformLogging} Logging`);
-            }
-        }
-        else {
-            this.platformLogging = 'standard';
-            if (this.platformLogging?.includes('debug')) {
-                this.log.warn(`Using ${this.platformLogging} Logging`);
-            }
-        }
-    }
     /**
      * This function is invoked when homebridge restores cached accessories from disk at startup.
      * It should be used to setup event handlers for characteristics and update respective values.
@@ -180,45 +154,28 @@ class SwitchBotPlatform {
         if (!this.config.options.refreshRate) {
             // default 120 seconds (2 minutes)
             this.config.options.refreshRate = 120;
-            if (this.platformLogging?.includes('debug')) {
-                this.debugLog('Using Default Refresh Rate (2 minutes).');
-            }
+            this.debugWarnLog('Using Default Refresh Rate (2 minutes).');
         }
         if (!this.config.options.pushRate) {
             // default 100 milliseconds
             this.config.options.pushRate = 0.1;
-            if (this.platformLogging?.includes('debug')) {
-                this.warnLog('Using Default Push Rate.');
-            }
+            this.debugWarnLog('Using Default Push Rate.');
         }
-        if (!this.config.credentials) {
-            if (this.platformLogging?.includes('debug')) {
-                this.debugLog('Missing Credentials');
-            }
+        if (!this.config.credentials && !this.config.options) {
+            this.debugWarnLog('Missing Credentials');
         }
-        if (!this.config.credentials?.token) {
-            if (this.platformLogging?.includes('debug')) {
-                this.errorLog('Missing token');
-                this.warnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
+        else if (this.config.credentials && !this.config.credentials.notice) {
+            if (!this.config.credentials?.token) {
+                this.debugErrorLog('Missing token');
+                this.debugWarnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
             }
-        }
-        if (this.config.credentials?.token) {
-            if (!this.config.credentials?.secret) {
-                if (this.platformLogging?.includes('debug')) {
-                    this.errorLog('Missing secret');
-                    this.warnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
+            if (this.config.credentials?.token) {
+                if (!this.config.credentials?.secret) {
+                    this.debugErrorLog('Missing secret');
+                    this.debugWarnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
                 }
             }
         }
-        // Re-Discover Devices
-        if (!this.config.options.discoverDevices) {
-            this.config.options.discoverDevices = false;
-            this.debugLog(`Rediscover Devices disabled, discoverDevices: ${this.config.options.discoverDevices}`);
-        }
-        if (!this.config.options.discoverDevicesInterval) {
-            this.config.options.discoverDevicesInterval = 86400;
-            this.debugLog(`Default Rediscover Devices Interval, discoverDevicesInterval: ${this.config.options.discoverDevicesInterval}`);
-        }
     }
     /**
      * The openToken was old config.
@@ -260,9 +217,7 @@ class SwitchBotPlatform {
             // set the refresh token
             pluginConfig.credentials.token = this.config.credentials?.openToken;
             pluginConfig.credentials.openToken = 'Delete';
-            if (this.platformLogging?.includes('debug')) {
-                this.warnLog(`Token: ${pluginConfig.credentials.token}`);
-            }
+            this.debugWarnLog(`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));
             this.verifyConfig();
@@ -303,6 +258,7 @@ class SwitchBotPlatform {
                     let rawData = '';
                     res.on('data', (d) => {
                         rawData += d;
+                        this.deviceStatus = d;
                         this.debugLog(`d: ${d}`);
                     });
                     res.on('end', () => {
@@ -360,6 +316,9 @@ class SwitchBotPlatform {
                                     this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
                                 }
                             }
+                            else {
+                                this.errorLog(`SwitchBot Device Request Issue: ${this.deviceStatus}`);
+                            }
                             // IR Devices
                             /*if (devicesAPI.body.infraredRemoteList.length !== 0) {
                               this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
@@ -402,6 +361,9 @@ class SwitchBotPlatform {
                                     }
                                 }
                             }
+                            else {
+                                this.errorLog(`SwitchBot IR Device Request Issue: ${this.deviceStatus}`);
+                            }
                         }
                         catch (e) {
                             this.errorLog(`API Request: ${e}`);
@@ -430,62 +392,8 @@ class SwitchBotPlatform {
             }
         }
         catch (e) {
-            this.deviceError(`Discover Devices: ${e}`);
-        }
-        if (this.config.options?.discoverDevices) {
-            (0, rxjs_1.interval)(this.config.options.discoverDevicesInterval * 1000)
-                .pipe((0, rxjs_1.take)(1))
-                .subscribe(async () => {
-                await this.discoverDevices();
-            });
-        }
-    }
-    deviceError(e) {
-        if (e.message.includes('400')) {
-            this.errorLog('Failed to Discover Devices: Bad Request');
-            this.debugLog('The client has issued an invalid request. This is commonly used to specify validation errors in a request payload.');
-        }
-        else if (e.message.includes('401')) {
-            this.errorLog('Failed to Discover Devices: Unauthorized Request');
-            this.debugLog('Authorization for the API is required, but the request has not been authenticated.');
-        }
-        else if (e.message.includes('403')) {
-            this.errorLog('Failed to Discover Devices: Forbidden Request');
-            this.debugLog('The request has been authenticated but does not have appropriate permissions, or a requested resource is not found.');
-        }
-        else if (e.message.includes('404')) {
-            this.errorLog('Failed to Discover Devices: Requst Not Found');
-            this.debugLog('Specifies the requested path does not exist.');
-        }
-        else if (e.message.includes('406')) {
-            this.errorLog('Failed to Discover Devices: Request Not Acceptable');
-            this.debugLog('The client has requested a MIME type via the Accept header for a value not supported by the server.');
-        }
-        else if (e.message.includes('415')) {
-            this.errorLog('Failed to Discover Devices: Unsupported Requst Header');
-            this.debugLog('The client has defined a contentType header that is not supported by the server.');
-        }
-        else if (e.message.includes('422')) {
-            this.errorLog('Failed to Discover Devices: Unprocessable Entity');
-            this.debugLog('The client has made a valid request, but the server cannot process it.' +
-                ' This is often used for APIs for which certain limits have been exceeded.');
-        }
-        else if (e.message.includes('429')) {
-            this.errorLog('Failed to Discover Devices: Too Many Requests');
-            this.debugLog('The client has exceeded the number of requests allowed for a given time window.');
-        }
-        else if (e.message.includes('500')) {
-            this.errorLog('Failed to Discover Devices: Internal Server Error');
-            this.debugLog('An unexpected error on the SmartThings servers has occurred. These errors should be rare.');
-        }
-        else {
-            this.errorLog('Failed to Discover Devices');
-        }
-        if (this.platformLogging === 'debug') {
-            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: ${e}`);
+            this.debugErrorLog(`Failed to Discover Devices, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+            this.debugErrorLog(`Failed to Discover Devices, Error: ${e}`);
         }
     }
     createDevice(device) {
@@ -521,7 +429,7 @@ class SwitchBotPlatform {
                 this.createContact(device);
                 break;
             case 'Curtain':
-                this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
+                this.debugLog(`Discovered ${device.deviceType} ${device.deviceName}: ${device.deviceId}`);
                 this.createCurtain(device);
                 break;
             case 'Plug':
@@ -664,7 +572,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createBot(device) {
@@ -718,7 +626,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createMeter(device) {
@@ -769,7 +677,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createMeterPlus(device) {
@@ -820,7 +728,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createMotion(device) {
@@ -871,7 +779,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createContact(device) {
@@ -922,7 +830,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createCurtain(device) {
@@ -932,7 +840,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.isCurtainGrouped(device)) {
+            if (await this.registerDevice(device)) {
                 // 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;
@@ -951,7 +859,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.isCurtainGrouped(device)) {
+        else if (await 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}`);
             if (device.group && !device.curtain?.disable_group) {
@@ -960,10 +868,10 @@ class SwitchBotPlatform {
             }
             else {
                 if (device.master) {
-                    this.debugLog(`Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                    this.warnLog(`Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
                 }
                 else {
-                    this.debugLog(`Secondary Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                    this.errorLog(`Secondary Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
                 }
             }
             // create a new accessory
@@ -985,19 +893,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
-        }
-    }
-    isCurtainGrouped(device) {
-        this.debugLog(`deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds},` +
-            ` master: ${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}`);
-        if (device.group && !device.curtain?.disable_group) {
-            this.debugLog(`[Curtain Config] disable_group: ${device.curtain?.disable_group}`);
-            return device.master && this.registerDevice(device);
-        }
-        else {
-            this.debugLog(`[Curtain Config] disable_group: ${device.curtain?.disable_group}, UnGrouping ${device.master}`);
-            return this.registerDevice(device);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createPlug(device) {
@@ -1048,7 +944,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createLock(device) {
@@ -1099,7 +995,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createColorBulb(device) {
@@ -1150,7 +1046,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createStripLight(device) {
@@ -1201,7 +1097,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
     async createTV(device) {
@@ -1250,7 +1146,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createFan(device) {
@@ -1301,7 +1197,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createLight(device) {
@@ -1352,7 +1248,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createAirConditioner(device) {
@@ -1403,7 +1299,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createAirPurifier(device) {
@@ -1454,7 +1350,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createWaterHeater(device) {
@@ -1505,7 +1401,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createVacuumCleaner(device) {
@@ -1556,7 +1452,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createCamera(device) {
@@ -1607,7 +1503,7 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
     async createOthers(device) {
@@ -1658,11 +1554,32 @@ class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
+            this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+        }
+    }
+    async registerCurtains(device) {
+        this.warnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds}, master: ` +
+            `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
+        let registerCurtain;
+        if (device.group && !device.curtain?.disable_group) {
+            registerCurtain = true;
+            this.debugLog(`deviceName: ${device.deviceName} [Curtain Config] disable_group: ${device.curtain?.disable_group}`);
+            this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
+        }
+        else if (device.connectionType?.includes('BLE') || device.connectionType === 'Disabled') {
+            registerCurtain = true;
+            this.debugLog(`deviceName: ${device.deviceName} [Curtain Config] connectionType: ${device.connectionType}`);
+            this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
+        }
+        else {
+            registerCurtain = false;
+            this.errorLog(`deviceName: ${device.deviceName} [Curtain Config] disable_group: ${device.curtain?.disable_group}, UnGrouping ${device.master}`);
+            this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
+        return registerCurtain;
     }
     async connectionType(device) {
-        let connectionType = '';
+        let connectionType;
         if (!device.connectionType && this.config.credentials?.token && this.config.credentials.secret) {
             connectionType = 'OpenAPI';
         }
@@ -1673,38 +1590,66 @@ class SwitchBotPlatform {
     }
     async registerDevice(device) {
         device.connectionType = await this.connectionType(device);
+        let registerDevice;
         if (!device.hide_device && device.enableCloudService && device.connectionType === 'BLE/OpenAPI') {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} Both OpenAPI and BLE Connections Enabled, Connection Type: ${device.connectionType}`);
+            if (device.deviceType === 'Curtain') {
+                registerDevice = await this.registerCurtains(device);
+                this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);
+            }
+            else {
+                registerDevice = true;
+                this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+            }
+            this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
         }
         else if (!device.hide_device && device.deviceId && device.configDeviceType && device.configDeviceName
             && device.connectionType === 'BLE') {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled, Connection Type: ${device.connectionType}`);
+            if (device.deviceType === 'Curtain') {
+                registerDevice = await this.registerCurtains(device);
+                this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);
+            }
+            else {
+                registerDevice = true;
+                this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+            }
+            this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
         }
         else if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI') {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} OpenAPI Connection Enabled, Connection Type: ${device.connectionType}`);
+            if (device.deviceType === 'Curtain') {
+                registerDevice = await this.registerCurtains(device);
+                this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);
+            }
+            else {
+                registerDevice = true;
+                this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+            }
+            this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will display in HomeKit`);
         }
-        else if (!device.hide_device && device.enableCloudService && device.connectionType === 'Disable') {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} Device connection Disabled, will continue to display in HomeKit,`
-                + ` Connection Type: ${device.connectionType}`);
+        else if (!device.hide_device && device.connectionType === 'Disabled') {
+            if (device.deviceType === 'Curtain') {
+                registerDevice = await this.registerCurtains(device);
+                this.debugWarnLog(`Device: ${device.deviceName} Curtain registerDevice: ${registerDevice}`);
+            }
+            else {
+                registerDevice = true;
+                this.debugWarnLog(`Device: ${device.deviceName} registerDevice: ${registerDevice}`);
+            }
+            this.debugWarnLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will continue to display in HomeKit`);
         }
-        else if (!device.connectionType) {
-            this.registeringDevice = false;
-            this.errorLog(`Device: ${device.deviceName} Connection Type not Set, will not display in HomeKit, Connection Type: ${device.connectionType}`);
+        else if (!device.connectionType && !device.hide_device) {
+            registerDevice = false;
+            this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, will not display in HomeKit`);
         }
         else if (device.hide_device) {
-            this.registeringDevice = false;
-            this.errorLog(`Device: ${device.deviceName} Device Set to Hidden, will not display in HomeKit, hide_device: ${device.hide_device}`);
+            registerDevice = false;
+            this.debugErrorLog(`Device: ${device.deviceName} hide_device: ${device.hide_device}, will not display in HomeKit`);
         }
         else {
-            this.registeringDevice = false;
-            this.errorLog(`Device: ${device.deviceName} OpenAPI or BLE Are Not Enabled, Connection Type: ${device.connectionType},`
-                + ` hide_device: ${device.hide_device}`);
+            registerDevice = false;
+            this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, hide_device: `
+                + `${device.hide_device},  will not display in HomeKit`);
         }
-        return this.registeringDevice;
+        return registerDevice;
     }
     async externalOrPlatform(device, accessory) {
         this.debugLog(`${accessory.displayName} External Accessory Mode: ${device.external}`);
@@ -1724,11 +1669,6 @@ class SwitchBotPlatform {
         this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [existingAccessory]);
         this.warnLog(`Removing existing accessory from cache: ${existingAccessory.displayName}`);
     }
-    deviceListInfo(devices) {
-        if (this.platformLogging?.includes('debug')) {
-            this.warnLog(`deviceListInfoStatus: ${(0, super_stringify_1.default)(devices)}`);
-        }
-    }
     async statusCode({ res }) {
         switch (res.statusCode) {
             case 151:
@@ -1774,6 +1714,27 @@ class SwitchBotPlatform {
         }
         return switchbot;
     }
+    logs() {
+        this.debugMode = process.argv.includes('-D') || process.argv.includes('--debug');
+        if (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none') {
+            this.platformLogging = this.config.options.logging;
+            if (this.platformLogging.includes('debug')) {
+                this.log.warn(`Using Config Logging: ${this.platformLogging}`);
+            }
+        }
+        else if (this.debugMode) {
+            this.platformLogging = 'debugMode';
+            if (this.platformLogging?.includes('debug')) {
+                this.log.warn(`Using ${this.platformLogging} Logging`);
+            }
+        }
+        else {
+            this.platformLogging = 'standard';
+            if (this.platformLogging?.includes('debug')) {
+                this.log.warn(`Using ${this.platformLogging} Logging`);
+            }
+        }
+    }
     /**
      * If device level logging is turned on, log to log.warn
      * Otherwise send debug logs to log.debug
@@ -1788,11 +1749,25 @@ class SwitchBotPlatform {
             this.log.warn(String(...log));
         }
     }
+    debugWarnLog(...log) {
+        if (this.enablingPlatfromLogging()) {
+            if (this.platformLogging?.includes('debug')) {
+                this.log.warn('[DEBUG]', String(...log));
+            }
+        }
+    }
     errorLog(...log) {
         if (this.enablingPlatfromLogging()) {
             this.log.error(String(...log));
         }
     }
+    debugErrorLog(...log) {
+        if (this.enablingPlatfromLogging()) {
+            if (this.platformLogging?.includes('debug')) {
+                this.log.error('[DEBUG]', String(...log));
+            }
+        }
+    }
     debugLog(...log) {
         if (this.enablingPlatfromLogging()) {
             if (this.platformLogging === 'debugMode') {