@switchbot/homebridge-switchbot 2.14.0 → 3.0.0-beta.0

package/dist/irdevice/other.js

@@ -1,32 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Others = void 0;
-const undici_1 = require("undici");
-const settings_1 = require("../settings");
+import { request } from 'undici';
+import { Devices } from '../settings';
 /**
  * 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.
  */
-class Others {
+export class Others {
+    platform;
+    accessory;
+    device;
+    api;
+    log;
+    config;
+    hap;
+    // Services
+    fanService;
+    doorService;
+    lockService;
+    faucetService;
+    windowService;
+    switchService;
+    outletService;
+    garageDoorService;
+    windowCoveringService;
+    statefulProgrammableSwitchService;
+    // Characteristic Values
+    On;
+    FirmwareRevision;
+    // Config
+    deviceLogging;
+    disablePushOn;
+    otherDeviceType;
+    disablePushOff;
     constructor(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.logs(device);
+        this.deviceLogs(device);
         this.deviceType(device);
         this.context();
         this.disablePushOnChanges(device);
         this.disablePushOffChanges(device);
-        this.config(device);
+        this.deviceConfig(device);
         // set accessory information
         accessory
-            .getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.platform.Characteristic.Model, device.remoteType)
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.platform.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+            .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);
         // deviceType
         if (this.otherDeviceType === 'switch') {
             this.removeFanService(accessory);
@@ -40,14 +67,14 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add switchService
             const switchService = `${accessory.displayName} Switch`;
-            (this.switchService = accessory.getService(this.platform.Service.Switch)
-                || accessory.addService(this.platform.Service.Switch)), switchService;
+            (this.switchService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.switchService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.switchService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.switchService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'garagedoor') {
             this.removeFanService(accessory);
@@ -61,15 +88,15 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add garageDoorService
             const garageDoorService = `${accessory.displayName} Garage Door Opener`;
-            (this.garageDoorService = accessory.getService(this.platform.Service.GarageDoorOpener)
-                || accessory.addService(this.platform.Service.GarageDoorOpener)), garageDoorService;
+            (this.garageDoorService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.garageDoorService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.garageDoorService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
-            this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
+            this.garageDoorService.getCharacteristic(this.hap.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
+            this.garageDoorService.setCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
         }
         else if (this.otherDeviceType === 'door') {
             this.removeFanService(accessory);
@@ -83,15 +110,15 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add doorService
             const doorService = `${accessory.displayName} Door`;
-            (this.doorService = accessory.getService(this.platform.Service.Door)
-                || accessory.addService(this.platform.Service.Door)), doorService;
+            (this.doorService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.doorService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.doorService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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
-                .getCharacteristic(this.platform.Characteristic.TargetPosition)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
@@ -99,7 +126,7 @@ class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.doorService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+            this.doorService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'window') {
             this.removeFanService(accessory);
@@ -113,15 +140,15 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add windowService
             const windowService = `${accessory.displayName} Window`;
-            (this.windowService = accessory.getService(this.platform.Service.Window)
-                || accessory.addService(this.platform.Service.Window)), windowService;
+            (this.windowService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.windowService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.windowService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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
-                .getCharacteristic(this.platform.Characteristic.TargetPosition)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
@@ -129,7 +156,7 @@ class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.windowService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+            this.windowService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'windowcovering') {
             this.removeFanService(accessory);
@@ -143,15 +170,15 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add windowCoveringService
             const windowCoveringService = `${accessory.displayName} Window Covering`;
-            (this.windowCoveringService = accessory.getService(this.platform.Service.WindowCovering)
-                || accessory.addService(this.platform.Service.WindowCovering)), windowCoveringService;
+            (this.windowCoveringService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.windowCoveringService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.windowCoveringService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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
-                .getCharacteristic(this.platform.Characteristic.TargetPosition)
+                .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
@@ -159,7 +186,7 @@ class Others {
                 minStep: 100,
             })
                 .onSet(this.OnSet.bind(this));
-            this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+            this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
         else if (this.otherDeviceType === 'lock') {
             this.removeFanService(accessory);
@@ -173,14 +200,14 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add lockService
             const lockService = `${accessory.displayName} Lock`;
-            (this.lockService = accessory.getService(this.platform.Service.LockMechanism)
-                || accessory.addService(this.platform.Service.LockMechanism)), lockService;
+            (this.lockService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.lockService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.lockService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
+            this.lockService.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'faucet') {
             this.removeFanService(accessory);
@@ -194,14 +221,14 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add faucetService
             const faucetService = `${accessory.displayName} Faucet`;
-            (this.faucetService = accessory.getService(this.platform.Service.Faucet)
-                || accessory.addService(this.platform.Service.Faucet)), faucetService;
+            (this.faucetService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.faucetService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.faucetService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.Active).onSet(this.OnSet.bind(this));
+            this.faucetService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'fan') {
             this.removeLockService(accessory);
@@ -215,14 +242,14 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add fanService
             const fanService = `${accessory.displayName} Fan`;
-            (this.fanService = accessory.getService(this.platform.Service.Fan)
-                || accessory.addService(this.platform.Service.Fan)), fanService;
+            (this.fanService = accessory.getService(this.hap.Service.Fan)
+                || accessory.addService(this.hap.Service.Fan)), fanService;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Fan`);
-            this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-            if (!this.fanService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.fanService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.fanService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'stateful') {
             this.removeFanService(accessory);
@@ -236,15 +263,15 @@ class Others {
             this.removeWindowCoveringService(accessory);
             // Add statefulProgrammableSwitchService
             const statefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
-            (this.statefulProgrammableSwitchService = accessory.getService(this.platform.Service.StatefulProgrammableSwitch)
-                || accessory.addService(this.platform.Service.StatefulProgrammableSwitch)), statefulProgrammableSwitchService;
+            (this.statefulProgrammableSwitchService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.statefulProgrammableSwitchService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.statefulProgrammableSwitchService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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
-                .getCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState)
+                .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
                 .onSet(this.OnSet.bind(this));
         }
         else {
@@ -259,14 +286,14 @@ class Others {
             this.removeStatefulProgrammableSwitchService(accessory);
             // Add outletService
             const outletService = `${accessory.displayName} Outlet`;
-            (this.outletService = accessory.getService(this.platform.Service.Outlet)
-                || accessory.addService(this.platform.Service.Outlet)), outletService;
+            (this.outletService = 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.platform.Characteristic.Name, accessory.displayName);
-            if (!this.outletService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.outletService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+            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.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+            this.outletService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
     }
     /**
@@ -275,7 +302,7 @@ class Others {
     async OnSet(value) {
         if (this.otherDeviceType === 'garagedoor') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
-            if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
+            if (value === this.hap.Characteristic.TargetDoorState.CLOSED) {
                 this.On = false;
             }
             else {
@@ -295,7 +322,7 @@ class Others {
         }
         else if (this.otherDeviceType === 'lock') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
-            if (value === this.platform.Characteristic.LockTargetState.SECURED) {
+            if (value === this.hap.Characteristic.LockTargetState.SECURED) {
                 this.On = false;
             }
             else {
@@ -304,7 +331,7 @@ class Others {
         }
         else if (this.otherDeviceType === 'faucet') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Active: ${value}`);
-            if (value === this.platform.Characteristic.Active.INACTIVE) {
+            if (value === this.hap.Characteristic.Active.INACTIVE) {
                 this.On = false;
             }
             else {
@@ -385,7 +412,7 @@ class Others {
         if (this.device.connectionType === 'OpenAPI') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -425,13 +452,13 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, this.platform.Characteristic.TargetDoorState.OPEN);
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.OPEN);
+                    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`);
                 }
                 else {
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, this.platform.Characteristic.TargetDoorState.CLOSED);
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.CLOSED);
+                    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`);
                 }
             }
@@ -443,15 +470,15 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
                 else {
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
-                    this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
             }
@@ -463,15 +490,15 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
                 else {
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
-                    this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
             }
@@ -483,15 +510,15 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
                 else {
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
-                    this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
+                    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`);
                 }
             }
@@ -503,14 +530,14 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, this.platform.Characteristic.LockTargetState.UNSECURED);
-                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, this.platform.Characteristic.LockCurrentState.UNSECURED);
+                    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`);
                 }
                 else {
-                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, this.platform.Characteristic.LockTargetState.SECURED);
-                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, this.platform.Characteristic.LockCurrentState.SECURED);
+                    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`);
                 }
             }
@@ -522,11 +549,11 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE);
+                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
                 }
                 else {
-                    this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.INACTIVE);
+                    this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
                 }
             }
@@ -538,11 +565,11 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
                 }
                 else {
-                    this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                    this.fanService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
                 }
             }
@@ -554,14 +581,14 @@ class Others {
             }
             else {
                 if (this.On) {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 1);
+                    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`);
                 }
                 else {
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
-                    this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 0);
+                    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`);
                 }
@@ -573,7 +600,7 @@ class Others {
                 this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
             }
             else {
-                this.switchService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                this.switchService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
                 this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
             }
         }
@@ -582,7 +609,7 @@ class Others {
                 this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.On}`);
             }
             else {
-                this.outletService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                this.outletService?.updateCharacteristic(this.hap.Characteristic.On, this.On);
                 this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
             }
         }
@@ -671,49 +698,49 @@ class Others {
     }
     async apiError(e) {
         if (this.otherDeviceType === 'garagedoor') {
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, e);
-            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.ObstructionDetected, e);
+            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.TargetDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.hap.Characteristic.ObstructionDetected, e);
         }
         else if (this.otherDeviceType === 'door') {
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+            this.doorService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.doorService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.doorService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'window') {
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+            this.windowService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.windowService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.windowService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'windowcovering') {
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
-            this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+            this.windowCoveringService?.updateCharacteristic(this.hap.Characteristic.PositionState, e);
         }
         else if (this.otherDeviceType === 'lock') {
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
-            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
+            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
+            this.doorService?.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
         }
         else if (this.otherDeviceType === 'faucet') {
-            this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, e);
+            this.faucetService?.updateCharacteristic(this.hap.Characteristic.Active, e);
         }
         else if (this.otherDeviceType === 'fan') {
-            this.fanService?.updateCharacteristic(this.platform.Characteristic.On, e);
+            this.fanService?.updateCharacteristic(this.hap.Characteristic.On, e);
         }
         else if (this.otherDeviceType === 'stateful') {
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent, e);
-            this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, e);
+            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e);
+            this.statefulProgrammableSwitchService?.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, e);
         }
         else if (this.otherDeviceType === 'switch') {
-            this.switchService?.updateCharacteristic(this.platform.Characteristic.On, e);
+            this.switchService?.updateCharacteristic(this.hap.Characteristic.On, e);
         }
         else {
-            this.outletService?.updateCharacteristic(this.platform.Characteristic.On, e);
+            this.outletService?.updateCharacteristic(this.hap.Characteristic.On, e);
         }
     }
     async removeOutletService(accessory) {
         // If outletService still pressent, then remove first
-        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
+        this.outletService = this.accessory.getService(this.hap.Service.Outlet);
         if (this.outletService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
         }
@@ -721,7 +748,7 @@ class Others {
     }
     async removeGarageDoorService(accessory) {
         // If garageDoorService still pressent, then remove first
-        this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
+        this.garageDoorService = this.accessory.getService(this.hap.Service.GarageDoorOpener);
         if (this.garageDoorService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
         }
@@ -729,7 +756,7 @@ class Others {
     }
     async removeDoorService(accessory) {
         // If doorService still pressent, then remove first
-        this.doorService = this.accessory.getService(this.platform.Service.Door);
+        this.doorService = this.accessory.getService(this.hap.Service.Door);
         if (this.doorService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
         }
@@ -737,7 +764,7 @@ class Others {
     }
     async removeLockService(accessory) {
         // If lockService still pressent, then remove first
-        this.lockService = this.accessory.getService(this.platform.Service.LockMechanism);
+        this.lockService = this.accessory.getService(this.hap.Service.LockMechanism);
         if (this.lockService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
         }
@@ -745,7 +772,7 @@ class Others {
     }
     async removeFaucetService(accessory) {
         // If faucetService still pressent, then remove first
-        this.faucetService = this.accessory.getService(this.platform.Service.Faucet);
+        this.faucetService = this.accessory.getService(this.hap.Service.Faucet);
         if (this.faucetService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
         }
@@ -753,7 +780,7 @@ class Others {
     }
     async removeFanService(accessory) {
         // If fanService still pressent, then remove first
-        this.fanService = this.accessory.getService(this.platform.Service.Fan);
+        this.fanService = this.accessory.getService(this.hap.Service.Fan);
         if (this.fanService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
         }
@@ -761,7 +788,7 @@ class Others {
     }
     async removeWindowService(accessory) {
         // If windowService still pressent, then remove first
-        this.windowService = this.accessory.getService(this.platform.Service.Window);
+        this.windowService = this.accessory.getService(this.hap.Service.Window);
         if (this.windowService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
         }
@@ -769,7 +796,7 @@ class Others {
     }
     async removeWindowCoveringService(accessory) {
         // If windowCoveringService still pressent, then remove first
-        this.windowCoveringService = this.accessory.getService(this.platform.Service.WindowCovering);
+        this.windowCoveringService = this.accessory.getService(this.hap.Service.WindowCovering);
         if (this.windowCoveringService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
         }
@@ -777,7 +804,7 @@ class Others {
     }
     async removeStatefulProgrammableSwitchService(accessory) {
         // If statefulProgrammableSwitchService still pressent, then remove first
-        this.statefulProgrammableSwitchService = this.accessory.getService(this.platform.Service.StatefulProgrammableSwitch);
+        this.statefulProgrammableSwitchService = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
         if (this.statefulProgrammableSwitchService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
         }
@@ -785,7 +812,7 @@ class Others {
     }
     async removeSwitchService(accessory) {
         // If switchService still pressent, then remove first
-        this.switchService = this.accessory.getService(this.platform.Service.Switch);
+        this.switchService = this.accessory.getService(this.hap.Service.Switch);
         if (this.switchService) {
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
         }
@@ -819,7 +846,7 @@ class Others {
             this.accessory.context.FirmwareRevision = this.FirmwareRevision;
         }
     }
-    async config(device) {
+    async deviceConfig(device) {
         let config = {};
         if (device.other) {
             config = device.other;
@@ -852,7 +879,7 @@ class Others {
             this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
         }
     }
-    async logs(device) {
+    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}`);
@@ -916,5 +943,4 @@ class Others {
         return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
     }
 }
-exports.Others = Others;
 //# sourceMappingURL=other.js.map