@switchbot/homebridge-switchbot 3.5.0-beta.22 → 3.5.0-beta.24

package/dist/irdevice/other.js

@@ -1,61 +1,41 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * other.ts: @switchbot/homebridge-switchbot.
+ */
 import { request } from 'undici';
+import { irdeviceBase } from './irdevice.js';
 import { Devices } from '../settings.js';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class Others {
+export class Others extends irdeviceBase {
     platform;
-    accessory;
-    device;
-    api;
-    log;
-    config;
-    hap;
-    // Services
-    fanService;
-    doorService;
-    lockService;
-    faucetService;
-    windowService;
-    switchService;
-    outletService;
-    garageDoorService;
-    windowCoveringService;
-    statefulProgrammableSwitchService;
-    // Characteristic Values
-    On;
-    FirmwareRevision;
+    Switch;
+    GarageDoor;
+    Door;
+    Window;
+    WindowCovering;
+    Lock;
+    Faucet;
+    Fan;
+    StatefulProgrammableSwitch;
+    Outlet;
     // Config
-    deviceLogging;
-    disablePushOn;
     otherDeviceType;
-    disablePushOff;
     constructor(platform, accessory, device) {
+        super(platform, accessory, device);
         this.platform = platform;
-        this.accessory = accessory;
-        this.device = device;
-        this.api = this.platform.api;
-        this.log = this.platform.log;
-        this.config = this.platform.config;
-        this.hap = this.api.hap;
         // default placeholders
-        this.deviceLogs(device);
-        this.deviceType(device);
-        this.deviceContext();
-        this.disablePushOnChanges(device);
-        this.disablePushOffChanges(device);
-        this.deviceConfig(device);
-        // set accessory information
-        accessory
-            .getService(this.hap.Service.AccessoryInformation)
-            .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.hap.Characteristic.Model, device.remoteType)
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+        this.getOtherConfigSettings(device);
         // deviceType
         if (this.otherDeviceType === 'switch') {
+            // Initialize Switch property
+            this.Switch = {
+                Service: accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -65,18 +45,20 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add switchService
-            const switchService = `${accessory.displayName} Switch`;
-            (this.switchService = accessory.getService(this.hap.Service.Switch)
-                || accessory.addService(this.hap.Service.Switch)), switchService;
+            // Add Switch Service
+            const SwitchService = `${accessory.displayName} Switch`;
+            (this.Switch.Service = accessory.getService(this.hap.Service.Switch)
+                || accessory.addService(this.hap.Service.Switch)), SwitchService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Switch`);
-            this.switchService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.switchService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.switchService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.switchService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Switch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'garagedoor') {
+            // Initialize Garage Door property
+            this.GarageDoor = {
+                Service: accessory.addService(this.hap.Service.GarageDoorOpener),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -86,19 +68,21 @@ export class Others {
             this.removeWindowService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add garageDoorService
-            const garageDoorService = `${accessory.displayName} Garage Door Opener`;
-            (this.garageDoorService = accessory.getService(this.hap.Service.GarageDoorOpener)
-                || accessory.addService(this.hap.Service.GarageDoorOpener)), garageDoorService;
+            // Add GarageDoor Service
+            const GarageDoorService = `${accessory.displayName} Garage Door Opener`;
+            (this.GarageDoor.Service = accessory.getService(this.hap.Service.GarageDoorOpener)
+                || accessory.addService(this.hap.Service.GarageDoorOpener)), GarageDoorService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Garage Door Opener`);
-            this.garageDoorService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.garageDoorService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.garageDoorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.garageDoorService.getCharacteristic(this.hap.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
-            this.garageDoorService.setCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
+            this.GarageDoor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.GarageDoor.Service.getCharacteristic(this.hap.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
+            this.GarageDoor.Service.setCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
         }
         else if (this.otherDeviceType === 'door') {
+            // Initialize Door property
+            this.Door = {
+                Service: accessory.addService(this.hap.Service.Door),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeOutletService(accessory);
@@ -108,16 +92,13 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add doorService
-            const doorService = `${accessory.displayName} Door`;
-            (this.doorService = accessory.getService(this.hap.Service.Door)
-                || accessory.addService(this.hap.Service.Door)), doorService;
+            // Add Door Service
+            const DoorService = `${accessory.displayName} Door`;
+            (this.Door.Service = accessory.getService(this.hap.Service.Door)
+                || accessory.addService(this.hap.Service.Door)), DoorService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Door`);
-            this.doorService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.doorService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.doorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.doorService
+            this.Door.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Door.Service
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
@@ -126,9 +107,14 @@ export class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.doorService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+            this.Door.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'window') {
+            // Initialize Window property
+            this.Window = {
+                Service: accessory.addService(this.hap.Service.Window),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -138,16 +124,13 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add windowService
-            const windowService = `${accessory.displayName} Window`;
-            (this.windowService = accessory.getService(this.hap.Service.Window)
-                || accessory.addService(this.hap.Service.Window)), windowService;
+            // Add Window Service
+            const WindowService = `${accessory.displayName} Window`;
+            (this.Window.Service = accessory.getService(this.hap.Service.Window)
+                || accessory.addService(this.hap.Service.Window)), WindowService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window`);
-            this.windowService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.windowService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.windowService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.windowService
+            this.Window.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Window.Service
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
@@ -156,9 +139,14 @@ export class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.windowService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+            this.Window.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'windowcovering') {
+            // Initialize WindowCovering property
+            this.WindowCovering = {
+                Service: accessory.addService(this.hap.Service.WindowCovering),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -168,16 +156,13 @@ export class Others {
             this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add windowCoveringService
-            const windowCoveringService = `${accessory.displayName} Window Covering`;
-            (this.windowCoveringService = accessory.getService(this.hap.Service.WindowCovering)
-                || accessory.addService(this.hap.Service.WindowCovering)), windowCoveringService;
+            // Add WindowCovering Service
+            const WindowCoveringService = `${accessory.displayName} Window Covering`;
+            (this.WindowCovering.Service = accessory.getService(this.hap.Service.WindowCovering)
+                || accessory.addService(this.hap.Service.WindowCovering)), WindowCoveringService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window Covering`);
-            this.windowCoveringService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.windowCoveringService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.windowCoveringService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.windowCoveringService
+            this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.WindowCovering.Service
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
@@ -186,9 +171,14 @@ export class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+            this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'lock') {
+            // Initialize Lock property
+            this.Lock = {
+                Service: accessory.addService(this.hap.Service.LockMechanism),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
@@ -198,18 +188,20 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add lockService
-            const lockService = `${accessory.displayName} Lock`;
-            (this.lockService = accessory.getService(this.hap.Service.LockMechanism)
-                || accessory.addService(this.hap.Service.LockMechanism)), lockService;
+            // Add Lock Service
+            const LockService = `${accessory.displayName} Lock`;
+            (this.Lock.Service = accessory.getService(this.hap.Service.LockMechanism)
+                || accessory.addService(this.hap.Service.LockMechanism)), LockService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Lock`);
-            this.lockService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.lockService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.lockService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.lockService.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
+            this.Lock.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Lock.Service.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'faucet') {
+            // Initialize Faucet property
+            this.Faucet = {
+                Service: accessory.addService(this.hap.Service.Faucet),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -219,18 +211,20 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add faucetService
-            const faucetService = `${accessory.displayName} Faucet`;
-            (this.faucetService = accessory.getService(this.hap.Service.Faucet)
-                || accessory.addService(this.hap.Service.Faucet)), faucetService;
+            // Add Faucet Service
+            const FaucetService = `${accessory.displayName} Faucet`;
+            (this.Faucet.Service = accessory.getService(this.hap.Service.Faucet)
+                || accessory.addService(this.hap.Service.Faucet)), FaucetService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Faucet`);
-            this.faucetService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.faucetService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.faucetService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.faucetService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.OnSet.bind(this));
+            this.Faucet.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Faucet.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'fan') {
+            // Initialize Fan property
+            this.Fan = {
+                Service: accessory.addService(this.hap.Service.Fanv2),
+                On: accessory.context.On || true,
+            };
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeFaucetService(accessory);
@@ -240,18 +234,20 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add fanService
-            const fanService = `${accessory.displayName} Fan`;
-            (this.fanService = accessory.getService(this.hap.Service.Fan)
-                || accessory.addService(this.hap.Service.Fan)), fanService;
+            // Add Fan Service
+            const FanService = `${accessory.displayName} Fan`;
+            (this.Fan.Service = accessory.getService(this.hap.Service.Fanv2)
+                || accessory.addService(this.hap.Service.Fanv2)), FanService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Fan`);
-            this.fanService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.fanService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.fanService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.fanService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.Fan.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Fan.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'stateful') {
+            // Initialize StatefulProgrammableSwitch property
+            this.StatefulProgrammableSwitch = {
+                Service: accessory.addService(this.hap.Service.StatefulProgrammableSwitch),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -261,20 +257,22 @@ export class Others {
             this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
-            // Add statefulProgrammableSwitchService
-            const statefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
-            (this.statefulProgrammableSwitchService = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-                || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), statefulProgrammableSwitchService;
+            // Add StatefulProgrammableSwitch.Service
+            const StatefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
+            (this.StatefulProgrammableSwitch.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+                || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), StatefulProgrammableSwitchService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
-            this.statefulProgrammableSwitchService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.statefulProgrammableSwitchService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.statefulProgrammableSwitchService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.statefulProgrammableSwitchService
+            this.StatefulProgrammableSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.StatefulProgrammableSwitch.Service
                 .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
                 .onSet(this.OnSet.bind(this));
         }
         else {
+            // Initialize Outlet property
+            this.Outlet = {
+                Service: accessory.addService(this.hap.Service.Outlet),
+                On: accessory.context.On || true,
+            };
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -284,79 +282,101 @@ export class Others {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add outletService
-            const outletService = `${accessory.displayName} Outlet`;
-            (this.outletService = accessory.getService(this.hap.Service.Outlet)
-                || accessory.addService(this.hap.Service.Outlet)), outletService;
+            // Add Outlet.Service
+            const OutletService = `${accessory.displayName} Outlet`;
+            (this.Outlet.Service = accessory.getService(this.hap.Service.Outlet)
+                || accessory.addService(this.hap.Service.Outlet)), OutletService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Outlet`);
-            this.outletService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            if (!this.outletService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.outletService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-            }
-            this.outletService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.Outlet.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+            this.Outlet.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
     }
     /**
      * Handle requests to set the "On" characteristic
      */
     async OnSet(value) {
+        let On;
         if (this.otherDeviceType === 'garagedoor') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
             if (value === this.hap.Characteristic.TargetDoorState.CLOSED) {
-                this.On = false;
+                this.GarageDoor.On = false;
+            }
+            else {
+                this.GarageDoor.On = true;
+            }
+            On = this.GarageDoor.On;
+        }
+        else if (this.otherDeviceType === 'door') {
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+            if (value === 0) {
+                this.Door.On = false;
             }
             else {
-                this.On = true;
+                this.Door.On = true;
             }
+            On = this.Door.On;
         }
-        else if (this.otherDeviceType === 'door' ||
-            this.otherDeviceType === 'window' ||
-            this.otherDeviceType === 'windowcovering') {
+        else if (this.otherDeviceType === 'window') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
             if (value === 0) {
-                this.On = false;
+                this.Window.On = false;
             }
             else {
-                this.On = true;
+                this.Window.On = true;
             }
+            On = this.Window.On;
+        }
+        else if (this.otherDeviceType === 'windowcovering') {
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+            if (value === 0) {
+                this.WindowCovering.On = false;
+            }
+            else {
+                this.WindowCovering.On = true;
+            }
+            On = this.WindowCovering.On;
         }
         else if (this.otherDeviceType === 'lock') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
             if (value === this.hap.Characteristic.LockTargetState.SECURED) {
-                this.On = false;
+                this.Lock.On = false;
             }
             else {
-                this.On = true;
+                this.Lock.On = true;
             }
+            On = this.Lock.On;
         }
         else if (this.otherDeviceType === 'faucet') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Active: ${value}`);
             if (value === this.hap.Characteristic.Active.INACTIVE) {
-                this.On = false;
+                this.Faucet.On = false;
             }
             else {
-                this.On = true;
+                this.Faucet.On = true;
             }
+            On = this.Faucet.On;
         }
         else if (this.otherDeviceType === 'stateful') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
             if (value === 0) {
-                this.On = false;
+                this.StatefulProgrammableSwitch.On = false;
             }
             else {
-                this.On = true;
+                this.StatefulProgrammableSwitch.On = true;
             }
+            On = this.StatefulProgrammableSwitch.On;
         }
         else {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set On: ${value}`);
-            this.On = value;
+            this.Outlet.On = value;
+            On = this.Outlet.On ? true : false;
         }
         //pushChanges
-        if (this.On) {
-            await this.pushOnChanges();
+        if (On === true) {
+            await this.pushOnChanges(On);
         }
         else {
-            await this.pushOffChanges();
+            await this.pushOffChanges(On);
         }
     }
     /**
@@ -369,11 +389,11 @@ export class Others {
      * Other -       "command"       "channelAdd"      "default"	        =        next channel
      * Other -       "command"       "channelSub"      "default"	        =        previous channel
      */
-    async pushOnChanges() {
-        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOnChanges On: ${this.On},` +
-            ` disablePushOn: ${this.disablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`);
+    async pushOnChanges(On) {
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOnChanges On: ${On},`
+            + ` disablePushOn: ${this.disablePushOn}, customize: ${this.device.customize}, customOn: ${this.device.customOn}`);
         if (this.device.customize) {
-            if (this.On && !this.disablePushOn) {
+            if (On === true && !this.disablePushOn) {
                 const commandType = await this.commandType();
                 const command = await this.commandOn();
                 const bodyChange = JSON.stringify({
@@ -388,11 +408,11 @@ export class Others {
             this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} On Command not set`);
         }
     }
-    async pushOffChanges() {
-        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOffChanges On: ${this.On},` +
-            ` disablePushOff: ${this.disablePushOff}, customize: ${this.device.customize}, customOff: ${this.device.customOff}`);
+    async pushOffChanges(On) {
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushOffChanges On: ${On},`
+            + ` disablePushOff: ${this.disablePushOff}, customize: ${this.device.customize}, customOff: ${this.device.customOff}`);
         if (this.device.customize) {
-            if (!this.On && !this.disablePushOff) {
+            if (On === false && !this.disablePushOff) {
                 const commandType = await this.commandType();
                 const command = await this.commandOff();
                 const bodyChange = JSON.stringify({
@@ -434,425 +454,316 @@ export class Others {
             }
             catch (e) {
                 this.apiError(e);
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType}` +
-                    ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName}` +
-                ` Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
+            this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName}`
+                + ` Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`);
         }
     }
     async updateHomeKitCharacteristics() {
         if (this.otherDeviceType === 'garagedoor') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.GarageDoor.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.GarageDoor.On}`);
             }
             else {
-                if (this.On) {
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.OPEN);
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.OPEN);
-                    this.debugLog(`${this.device.remoteType}: ` + `${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                if (this.GarageDoor.On) {
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.OPEN);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.OPEN);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor.On})`);
                 }
                 else {
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
-                    this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
-                    this.debugLog(`${this.device.remoteType}: ` + `${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
+                    this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetDoorState: Closed, CurrentDoorState: Closed (${this.GarageDoor.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Garage Door On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Garage Door On: ${this.GarageDoor.On}`);
         }
         else if (this.otherDeviceType === 'door') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Door.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Door.On}`);
             }
             else {
-                if (this.On) {
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.Door.On) {
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.Door.On})`);
                 }
                 else {
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.Door.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Door On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Door On: ${this.Door.On}`);
         }
         else if (this.otherDeviceType === 'window') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Window.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Window.On}`);
             }
             else {
-                if (this.On) {
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.Window.On) {
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.Window.On})`);
                 }
                 else {
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.Window.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window On: ${this.Window.On}`);
         }
         else if (this.otherDeviceType === 'windowcovering') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.WindowCovering.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.WindowCovering.On}`);
             }
             else {
-                if (this.On) {
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+                if (this.WindowCovering.On) {
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 100, CurrentPosition: 100 (${this.WindowCovering.On})`);
                 }
                 else {
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 0);
+                    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` TargetPosition: 0, CurrentPosition: 0 (${this.WindowCovering.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window Covering On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window Covering On: ${this.WindowCovering.On}`);
         }
         else if (this.otherDeviceType === 'lock') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Lock.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Lock.On}`);
             }
             else {
-                if (this.On) {
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
-                    this.debugLog(`${this.device.remoteType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic LockTargetState: UNSECURED, LockCurrentState: UNSECURED`);
+                if (this.Lock.On) {
+                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
+                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.Lock.On})`);
                 }
                 else {
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
-                    this.lockService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
-                    this.debugLog(`${this.device.remoteType}: ` + `${this.accessory.displayName} updateCharacteristic LockTargetState: SECURED, LockCurrentState: SECURED`);
+                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
+                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` LockTargetState: SECURED, LockCurrentState: SECURED (${this.Lock.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Lock On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Lock On: ${this.Lock.On}`);
         }
         else if (this.otherDeviceType === 'faucet') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Faucet.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Faucet.On}`);
             }
             else {
-                if (this.On) {
-                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+                if (this.Faucet.On) {
+                    this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
                 else {
-                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+                    this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Faucet On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Faucet On: ${this.Faucet.On}`);
         }
         else if (this.otherDeviceType === 'fan') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Fan.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Fan.On}`);
             }
             else {
-                if (this.On) {
-                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                if (this.Fan.On) {
+                    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
                 else {
-                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Fan On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Fan On: ${this.Fan.On}`);
         }
         else if (this.otherDeviceType === 'stateful') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.StatefulProgrammableSwitch.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.StatefulProgrammableSwitch.On}`);
             }
             else {
-                if (this.On) {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 1);
-                    this.debugLog(`${this.device.remoteType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1`);
+                if (this.StatefulProgrammableSwitch.On) {
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 1);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1 (${this.StatefulProgrammableSwitch.On})`);
                 }
                 else {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
-                    this.debugLog(`${this.device.remoteType}: ` +
-                        `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0`);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                    this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
+                        + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0 (${this.StatefulProgrammableSwitch.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.StatefulProgrammableSwitch.On}`);
         }
         else if (this.otherDeviceType === 'switch') {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Switch.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Switch.On}`);
             }
             else {
-                this.switchService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Switch.On}`);
             }
         }
         else {
-            if (this.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
+            if (this.Outlet.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
             }
             else {
-                this.outletService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+                this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, this.Outlet.On);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Outlet.On}`);
             }
         }
     }
-    async disablePushOnChanges(device) {
-        if (device.disablePushOn === undefined) {
-            this.disablePushOn = false;
-        }
-        else {
-            this.disablePushOn = device.disablePushOn;
-        }
-    }
-    async disablePushOffChanges(device) {
-        if (device.disablePushOff === undefined) {
-            this.disablePushOff = false;
-        }
-        else {
-            this.disablePushOff = device.disablePushOff;
-        }
-    }
-    async commandType() {
-        let commandType;
-        if (this.device.commandType && this.device.customize) {
-            commandType = this.device.commandType;
-        }
-        else if (this.device.customize) {
-            commandType = 'customize';
-        }
-        else {
-            commandType = 'command';
-        }
-        return commandType;
-    }
-    async commandOn() {
-        let command;
-        if (this.device.customize && this.device.customOn) {
-            command = this.device.customOn;
-        }
-        else {
-            command = 'turnOn';
-        }
-        return command;
-    }
-    async commandOff() {
-        let command;
-        if (this.device.customize && this.device.customOff) {
-            command = this.device.customOff;
-        }
-        else {
-            command = 'turnOff';
-        }
-        return command;
-    }
-    async statusCode(statusCode) {
-        switch (statusCode) {
-            case 151:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-                break;
-            case 152:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-                break;
-            case 160:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-                break;
-            case 161:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-                break;
-            case 171:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-                    `Hub: ${this.device.hubDeviceId}`);
-                break;
-            case 190:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command format is invalid, statusCode: ${statusCode}`);
-                break;
-            case 100:
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-                break;
-            case 200:
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-                break;
-            case 400:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-                    + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-                break;
-            case 401:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-                    + `but the request has not been authenticated, statusCode: ${statusCode}`);
-                break;
-            case 403:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-                    + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-                break;
-            case 404:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-                    + `statusCode: ${statusCode}`);
-                break;
-            case 406:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-                    + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 415:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-                    + `header that is not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 422:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unprocessable Entity,	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, statusCode: ${statusCode}`);
-                break;
-            case 429:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-                    + `requests allowed for a given time window, statusCode: ${statusCode}`);
-                break;
-            case 500:
-                this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-                    + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-                break;
-            default:
-                this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Unknown statusCode: ` +
-                    `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
-        }
-    }
     async apiError(e) {
         if (this.otherDeviceType === 'garagedoor') {
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
+            this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
+            this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
+            this.GarageDoor.Service.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
         }
         else if (this.otherDeviceType === 'door') {
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            this.Door.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.Door.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.Door.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'window') {
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            this.Window.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.Window.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.Window.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'windowcovering') {
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'lock') {
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
-            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
+            this.Door.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
+            this.Door.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
         }
         else if (this.otherDeviceType === 'faucet') {
-            this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, e);
+            this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
         }
         else if (this.otherDeviceType === 'fan') {
-            this.fanService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, e);
         }
         else if (this.otherDeviceType === 'stateful') {
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
+            this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+            this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
         }
         else if (this.otherDeviceType === 'switch') {
-            this.switchService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e);
         }
         else {
-            this.outletService?.updateCharacteristic(this.hap.Characteristic.On, e);
+            this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, e);
         }
     }
     async removeOutletService(accessory) {
-        // If outletService still present, then remove first
-        this.outletService = this.accessory.getService(this.hap.Service.Outlet);
-        if (this.outletService) {
+        // If Outlet.Service still present, then remove first
+        this.Outlet.Service = this.accessory.getService(this.hap.Service.Outlet);
+        if (this.Outlet.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
         }
-        accessory.removeService(this.outletService);
+        accessory.removeService(this.Outlet.Service);
     }
     async removeGarageDoorService(accessory) {
-        // If garageDoorService still present, then remove first
-        this.garageDoorService = this.accessory.getService(this.hap.Service.GarageDoorOpener);
-        if (this.garageDoorService) {
+        // If GarageDoor.Service still present, then remove first
+        this.GarageDoor.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener);
+        if (this.GarageDoor.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
         }
-        accessory.removeService(this.garageDoorService);
+        accessory.removeService(this.GarageDoor.Service);
     }
     async removeDoorService(accessory) {
-        // If doorService still present, then remove first
-        this.doorService = this.accessory.getService(this.hap.Service.Door);
-        if (this.doorService) {
+        // If Door.Service still present, then remove first
+        this.Door.Service = this.accessory.getService(this.hap.Service.Door);
+        if (this.Door.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
         }
-        accessory.removeService(this.doorService);
+        accessory.removeService(this.Door.Service);
     }
     async removeLockService(accessory) {
-        // If lockService still present, then remove first
-        this.lockService = this.accessory.getService(this.hap.Service.LockMechanism);
-        if (this.lockService) {
+        // If Lock.Service still present, then remove first
+        this.Lock.Service = this.accessory.getService(this.hap.Service.LockMechanism);
+        if (this.Lock.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
         }
-        accessory.removeService(this.lockService);
+        accessory.removeService(this.Lock.Service);
     }
     async removeFaucetService(accessory) {
-        // If faucetService still present, then remove first
-        this.faucetService = this.accessory.getService(this.hap.Service.Faucet);
-        if (this.faucetService) {
+        // If Faucet.Service still present, then remove first
+        this.Faucet.Service = this.accessory.getService(this.hap.Service.Faucet);
+        if (this.Faucet.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
         }
-        accessory.removeService(this.faucetService);
+        accessory.removeService(this.Faucet.Service);
     }
     async removeFanService(accessory) {
-        // If fanService still present, then remove first
-        this.fanService = this.accessory.getService(this.hap.Service.Fan);
-        if (this.fanService) {
+        // If Fan Service still present, then remove first
+        this.Fan.Service = this.accessory.getService(this.hap.Service.Fan);
+        if (this.Fan.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
         }
-        accessory.removeService(this.fanService);
+        accessory.removeService(this.Fan.Service);
     }
     async removeWindowService(accessory) {
-        // If windowService still present, then remove first
-        this.windowService = this.accessory.getService(this.hap.Service.Window);
-        if (this.windowService) {
+        // If Window.Service still present, then remove first
+        this.Window.Service = this.accessory.getService(this.hap.Service.Window);
+        if (this.Window.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
         }
-        accessory.removeService(this.windowService);
+        accessory.removeService(this.Window.Service);
     }
     async removeWindowCoveringService(accessory) {
-        // If windowCoveringService still present, then remove first
-        this.windowCoveringService = this.accessory.getService(this.hap.Service.WindowCovering);
-        if (this.windowCoveringService) {
+        // If WindowCovering.Service still present, then remove first
+        this.WindowCovering.Service = this.accessory.getService(this.hap.Service.WindowCovering);
+        if (this.WindowCovering.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
         }
-        accessory.removeService(this.windowCoveringService);
+        accessory.removeService(this.WindowCovering.Service);
     }
     async removeStatefulProgrammableSwitchService(accessory) {
-        // If statefulProgrammableSwitchService still present, then remove first
-        this.statefulProgrammableSwitchService = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
-        if (this.statefulProgrammableSwitchService) {
+        // If StatefulProgrammableSwitch.Service still present, then remove first
+        this.StatefulProgrammableSwitch.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
+        if (this.StatefulProgrammableSwitch.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
         }
-        accessory.removeService(this.statefulProgrammableSwitchService);
+        accessory.removeService(this.StatefulProgrammableSwitch.Service);
     }
     async removeSwitchService(accessory) {
-        // If switchService still present, then remove first
-        this.switchService = this.accessory.getService(this.hap.Service.Switch);
-        if (this.switchService) {
+        // If Switch.Service still present, then remove first
+        this.Switch.Service = this.accessory.getService(this.hap.Service.Switch);
+        if (this.Switch.Service) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
         }
-        accessory.removeService(this.switchService);
+        accessory.removeService(this.Switch.Service);
     }
-    async deviceType(device) {
+    async getOtherConfigSettings(device) {
         if (!device.other?.deviceType && this.accessory.context.deviceType) {
             this.otherDeviceType = this.accessory.context.deviceType;
             this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}, from Accessory Cache.`);
@@ -868,118 +779,5 @@ export class Others {
             this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} no deviceType set, using default deviceType: ${this.otherDeviceType}`);
         }
     }
-    async deviceContext() {
-        if (this.On === undefined) {
-            this.On = true;
-        }
-        else {
-            this.On = this.accessory.context.On;
-        }
-        if (this.FirmwareRevision === undefined) {
-            this.FirmwareRevision = this.platform.version;
-            this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-        }
-    }
-    async deviceConfig(device) {
-        let config = {};
-        if (device.other) {
-            config = device.other;
-        }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
-        }
-        if (device.connectionType !== undefined) {
-            config['connectionType'] = device.connectionType;
-        }
-        if (device.external !== undefined) {
-            config['external'] = device.external;
-        }
-        if (device.customOn !== undefined) {
-            config['customOn'] = device.customOn;
-        }
-        if (device.customOff !== undefined) {
-            config['customOff'] = device.customOff;
-        }
-        if (device.customize !== undefined) {
-            config['customize'] = device.customize;
-        }
-        if (device.disablePushOn !== undefined) {
-            config['disablePushOn'] = device.disablePushOn;
-        }
-        if (device.disablePushOff !== undefined) {
-            config['disablePushOff'] = device.disablePushOff;
-        }
-        if (Object.entries(config).length !== 0) {
-            this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-        }
-    }
-    async deviceLogs(device) {
-        if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-        }
-        else if (device.logging) {
-            this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
-        }
-        else if (this.platform.config.options?.logging) {
-            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
-        }
-        else {
-            this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-        }
-    }
-    /**
-     * Logging for Device
-     */
-    successLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.success(String(...log));
-        }
-    }
-    infoLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.info(String(...log));
-        }
-    }
-    warnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.warn(String(...log));
-        }
-    }
-    debugWarnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.warn('[DEBUG]', String(...log));
-            }
-        }
-    }
-    errorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.error(String(...log));
-        }
-    }
-    debugErrorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.error('[DEBUG]', String(...log));
-            }
-        }
-    }
-    debugLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging === 'debug') {
-                this.platform.log.info('[DEBUG]', String(...log));
-            }
-            else {
-                this.platform.log.debug(String(...log));
-            }
-        }
-    }
-    enablingDeviceLogging() {
-        return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
-    }
 }
 //# sourceMappingURL=other.js.map