@switchbot/homebridge-switchbot 3.5.1-beta.12 → 3.5.1-beta.3

package/dist/irdevice/other.js

@@ -38,7 +38,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Switch = this.Switch;
-            this.debugWarnLog('Displaying as Switch');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Switch`);
             this.Switch.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.On)
@@ -66,7 +66,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.GarageDoor = this.GarageDoor;
-            this.debugWarnLog('Displaying as Garage Door Opener');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Garage Door Opener`);
             this.GarageDoor.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .setCharacteristic(this.hap.Characteristic.ObstructionDetected, false)
@@ -95,7 +95,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Door = this.Door;
-            this.debugWarnLog('Displaying as Door');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Door`);
             this.Door.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
@@ -130,7 +130,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Window = this.Window;
-            this.debugWarnLog('Displaying as Window');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window`);
             this.Window.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
@@ -164,7 +164,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.WindowCovering = this.WindowCovering;
-            this.debugWarnLog('Displaying as Window Covering');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window Covering`);
             this.WindowCovering.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
@@ -199,7 +199,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.LockMechanism = this.LockMechanism;
-            this.debugWarnLog('Displaying as Lock');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Lock`);
             this.LockMechanism.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.LockTargetState)
@@ -227,7 +227,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Faucet = this.Faucet;
-            this.debugWarnLog('Displaying as Faucet');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Faucet`);
             this.Faucet.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.Active)
@@ -255,7 +255,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Fan = this.Fan;
-            this.debugWarnLog('Displaying as Fan');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Fan`);
             this.Fan.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.On)
@@ -284,7 +284,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.StatefulProgrammableSwitch = this.StatefulProgrammableSwitch;
-            this.debugWarnLog('Displaying as Stateful Programmable Switch');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
             this.StatefulProgrammableSwitch.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
@@ -312,7 +312,7 @@ export class Others extends irdeviceBase {
                 On: accessory.context.On ?? false,
             };
             accessory.context.Outlet = this.Outlet;
-            this.debugWarnLog('Displaying as Outlet');
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Outlet`);
             this.Outlet.Service
                 .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
                 .getCharacteristic(this.hap.Characteristic.On)
@@ -338,7 +338,7 @@ export class Others extends irdeviceBase {
     async OnSet(value) {
         let On;
         if (this.otherDeviceType === 'garagedoor') {
-            this.infoLog(`Set TargetDoorState: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetDoorState: ${value}`);
             if (value === this.hap.Characteristic.TargetDoorState.CLOSED) {
                 this.GarageDoor.On = false;
             }
@@ -348,7 +348,7 @@ export class Others extends irdeviceBase {
             On = this.GarageDoor.On;
         }
         else if (this.otherDeviceType === 'door') {
-            this.infoLog(`Set TargetPosition: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
             if (value === 0) {
                 this.Door.On = false;
             }
@@ -358,7 +358,7 @@ export class Others extends irdeviceBase {
             On = this.Door.On;
         }
         else if (this.otherDeviceType === 'window') {
-            this.infoLog(`Set TargetPosition: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
             if (value === 0) {
                 this.Window.On = false;
             }
@@ -368,7 +368,7 @@ export class Others extends irdeviceBase {
             On = this.Window.On;
         }
         else if (this.otherDeviceType === 'windowcovering') {
-            this.infoLog(`Set TargetPosition: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
             if (value === 0) {
                 this.WindowCovering.On = false;
             }
@@ -378,7 +378,7 @@ export class Others extends irdeviceBase {
             On = this.WindowCovering.On;
         }
         else if (this.otherDeviceType === 'lock') {
-            this.infoLog(`Set LockTargetState: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
             if (value === this.hap.Characteristic.LockTargetState.SECURED) {
                 this.LockMechanism.On = false;
             }
@@ -388,7 +388,7 @@ export class Others extends irdeviceBase {
             On = this.LockMechanism.On;
         }
         else if (this.otherDeviceType === 'faucet') {
-            this.infoLog(`Set Active: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Active: ${value}`);
             if (value === this.hap.Characteristic.Active.INACTIVE) {
                 this.Faucet.On = false;
             }
@@ -398,7 +398,7 @@ export class Others extends irdeviceBase {
             On = this.Faucet.On;
         }
         else if (this.otherDeviceType === 'stateful') {
-            this.infoLog(`Set ProgrammableSwitchOutputState: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set ProgrammableSwitchOutputState: ${value}`);
             if (value === 0) {
                 this.StatefulProgrammableSwitch.On = false;
             }
@@ -408,7 +408,7 @@ export class Others extends irdeviceBase {
             On = this.StatefulProgrammableSwitch.On;
         }
         else {
-            this.infoLog(`Set On: ${value}`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set On: ${value}`);
             this.Outlet.On = value;
             On = this.Outlet.On ? true : false;
         }
@@ -431,7 +431,7 @@ export class Others extends irdeviceBase {
      * Other -       "command"       "channelSub"      "default"	        =        previous channel
      */
     async pushOnChanges(On) {
-        await this.debugLog(`pushOnChanges On: ${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 (On === true && !this.disablePushOn) {
@@ -446,11 +446,11 @@ export class Others extends irdeviceBase {
             }
         }
         else {
-            this.errorLog('On Command not set');
+            this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} On Command not set`);
         }
     }
     async pushOffChanges(On) {
-        await this.debugLog(`pushOffChanges On: ${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 (On === false && !this.disablePushOff) {
@@ -465,13 +465,13 @@ export class Others extends irdeviceBase {
             }
         }
         else {
-            this.errorLog('Off Command not set.');
+            this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Off Command not set.`);
         }
     }
     async pushChanges(bodyChange) {
-        await this.debugLog('pushChanges');
+        this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
         if (this.device.connectionType === 'OpenAPI') {
-            this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`);
+            this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
                 const { body, statusCode } = await this.pushChangeRequest(bodyChange);
                 const deviceStatus = await body.json();
@@ -491,185 +491,185 @@ export class Others extends irdeviceBase {
             }
         }
         else {
-            await this.warnLog(`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() {
-        await this.debugLog('updateHomeKitCharacteristics');
         if (this.otherDeviceType === 'garagedoor') {
             if (this.GarageDoor.On === undefined) {
-                await this.debugLog(`On: ${this.GarageDoor.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.GarageDoor.On}`);
             }
             else {
                 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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetDoorState: Open, CurrentDoorState: Open (${this.GarageDoor.On})`);
                 }
                 else {
                     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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetDoorState: Closed, CurrentDoorState: Closed (${this.GarageDoor.On})`);
                 }
             }
-            await this.debugLog(`Garage Door On: ${this.GarageDoor.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Garage Door On: ${this.GarageDoor.On}`);
         }
         else if (this.otherDeviceType === 'door') {
             if (this.Door.On === undefined) {
-                await this.debugLog(`On: ${this.Door.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Door.On}`);
             }
             else {
                 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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 100, CurrentPosition: 100 (${this.Door.On})`);
                 }
                 else {
                     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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 0, CurrentPosition: 0 (${this.Door.On})`);
                 }
             }
-            await this.debugLog(`Door On: ${this.Door.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Door On: ${this.Door.On}`);
         }
         else if (this.otherDeviceType === 'window') {
             if (this.Window.On === undefined) {
-                await this.debugLog(`On: ${this.Window.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Window.On}`);
             }
             else {
                 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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 100, CurrentPosition: 100 (${this.Window.On})`);
                 }
                 else {
                     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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 0, CurrentPosition: 0 (${this.Window.On})`);
                 }
             }
-            await this.debugLog(`Window On: ${this.Window.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window On: ${this.Window.On}`);
         }
         else if (this.otherDeviceType === 'windowcovering') {
             if (this.WindowCovering.On === undefined) {
-                await this.debugLog(`On: ${this.WindowCovering.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.WindowCovering.On}`);
             }
             else {
                 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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 100, CurrentPosition: 100 (${this.WindowCovering.On})`);
                 }
                 else {
                     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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` TargetPosition: 0, CurrentPosition: 0 (${this.WindowCovering.On})`);
                 }
             }
-            await this.debugLog(`Window Covering On: ${this.WindowCovering.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window Covering On: ${this.WindowCovering.On}`);
         }
         else if (this.otherDeviceType === 'lock') {
             if (this.LockMechanism?.On === undefined) {
-                await this.debugLog(`On: ${this.LockMechanism?.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.LockMechanism?.On}`);
             }
             else {
                 if (this.LockMechanism.On) {
                     this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
                     this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.LockMechanism.On})`);
                 }
                 else {
                     this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
                     this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` LockTargetState: SECURED, LockCurrentState: SECURED (${this.LockMechanism.On})`);
                 }
             }
-            await this.debugLog(`Lock On: ${this.LockMechanism?.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Lock On: ${this.LockMechanism?.On}`);
         }
         else if (this.otherDeviceType === 'faucet') {
             if (this.Faucet.On === undefined) {
-                await this.debugLog(`On: ${this.Faucet.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Faucet.On}`);
             }
             else {
                 if (this.Faucet.On) {
                     this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.ACTIVE);
-                    await this.debugLog(`updateCharacteristic Active: ${this.Faucet.On}`);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
                 else {
                     this.Faucet.Service.updateCharacteristic(this.hap.Characteristic.Active, this.hap.Characteristic.Active.INACTIVE);
-                    await this.debugLog(`updateCharacteristic Active: ${this.Faucet.On}`);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Faucet.On}`);
                 }
             }
-            await this.debugLog(`Faucet On: ${this.Faucet.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Faucet On: ${this.Faucet.On}`);
         }
         else if (this.otherDeviceType === 'fan') {
             if (this.Fan.On === undefined) {
-                await this.debugLog(`On: ${this.Fan.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Fan.On}`);
             }
             else {
                 if (this.Fan.On) {
                     this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
-                    await this.debugLog(`updateCharacteristic On: ${this.Fan.On}`);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
                 else {
                     this.Fan.Service.updateCharacteristic(this.hap.Characteristic.On, this.Fan.On);
-                    await this.debugLog(`updateCharacteristic On: ${this.Fan.On}`);
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Fan.On}`);
                 }
             }
-            await this.debugLog(`Fan On: ${this.Fan.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Fan On: ${this.Fan.On}`);
         }
         else if (this.otherDeviceType === 'stateful') {
             if (this.StatefulProgrammableSwitch.On === undefined) {
-                await this.debugLog(`On: ${this.StatefulProgrammableSwitch.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.StatefulProgrammableSwitch.On}`);
             }
             else {
                 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);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1 (${this.StatefulProgrammableSwitch.On})`);
                 }
                 else {
                     this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
                     this.StatefulProgrammableSwitch.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState, 0);
-                    await this.debugLog('updateCharacteristic'
+                    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
                         + ` ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0 (${this.StatefulProgrammableSwitch.On})`);
                 }
             }
-            await this.debugLog(`StatefulProgrammableSwitch On: ${this.StatefulProgrammableSwitch.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.StatefulProgrammableSwitch.On}`);
         }
         else if (this.otherDeviceType === 'switch') {
             if (this.Switch.On === undefined) {
-                await this.debugLog(`On: ${this.Switch.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Switch.On}`);
             }
             else {
                 this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
-                await this.debugLog(`updateCharacteristic On: ${this.Switch.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Switch.On}`);
             }
         }
         else {
             if (this.Outlet.On === undefined) {
-                await this.debugLog(`On: ${this.Outlet.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
             }
             else {
                 this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, this.Outlet.On);
-                await this.debugLog(`updateCharacteristic On: ${this.Outlet.On}`);
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Outlet.On}`);
             }
         }
     }
@@ -739,7 +739,7 @@ export class Others extends irdeviceBase {
         // If Outlet.Service still present, then remove first
         if (this.Outlet?.Service) {
             this.Outlet.Service = this.accessory.getService(this.hap.Service.Outlet);
-            this.warnLog('Removing Leftover Outlet Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Outlet Service`);
             accessory.removeService(this.Outlet.Service);
         }
     }
@@ -747,7 +747,7 @@ export class Others extends irdeviceBase {
         // If GarageDoor.Service still present, then remove first
         if (this.GarageDoor?.Service) {
             this.GarageDoor.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener);
-            this.warnLog('Removing Leftover Garage Door Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
             accessory.removeService(this.GarageDoor.Service);
         }
     }
@@ -755,7 +755,7 @@ export class Others extends irdeviceBase {
         // If Door.Service still present, then remove first
         if (this.Door?.Service) {
             this.Door.Service = this.accessory.getService(this.hap.Service.Door);
-            this.warnLog('Removing Leftover Door Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Door Service`);
             accessory.removeService(this.Door.Service);
         }
     }
@@ -763,7 +763,7 @@ export class Others extends irdeviceBase {
         // If Lock.Service still present, then remove first
         if (this.LockMechanism?.Service) {
             this.LockMechanism.Service = this.accessory.getService(this.hap.Service.LockMechanism);
-            this.warnLog('Removing Leftover Lock Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
             accessory.removeService(this.LockMechanism.Service);
         }
     }
@@ -771,7 +771,7 @@ export class Others extends irdeviceBase {
         // If Faucet.Service still present, then remove first
         if (this.Faucet?.Service) {
             this.Faucet.Service = this.accessory.getService(this.hap.Service.Faucet);
-            this.warnLog('Removing Leftover Faucet Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Faucet Service`);
             accessory.removeService(this.Faucet.Service);
         }
     }
@@ -779,7 +779,7 @@ export class Others extends irdeviceBase {
         // If Fan Service still present, then remove first
         if (this.Fan?.Service) {
             this.Fan.Service = this.accessory.getService(this.hap.Service.Fan);
-            this.warnLog('Removing Leftover Fan Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Fan Service`);
             accessory.removeService(this.Fan.Service);
         }
     }
@@ -787,7 +787,7 @@ export class Others extends irdeviceBase {
         // If Window.Service still present, then remove first
         if (this.Window?.Service) {
             this.Window.Service = this.accessory.getService(this.hap.Service.Window);
-            this.warnLog('Removing Leftover Window Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Service`);
             accessory.removeService(this.Window.Service);
         }
     }
@@ -795,7 +795,7 @@ export class Others extends irdeviceBase {
         // If WindowCovering.Service still present, then remove first
         if (this.WindowCovering?.Service) {
             this.WindowCovering.Service = this.accessory.getService(this.hap.Service.WindowCovering);
-            this.warnLog('Removing Leftover Window Covering Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
             accessory.removeService(this.WindowCovering.Service);
         }
     }
@@ -803,7 +803,7 @@ export class Others extends irdeviceBase {
         // If StatefulProgrammableSwitch.Service still present, then remove first
         if (this.StatefulProgrammableSwitch?.Service) {
             this.StatefulProgrammableSwitch.Service = this.accessory.getService(this.hap.Service.StatefulProgrammableSwitch);
-            this.warnLog('Removing Leftover Stateful Programmable Switch Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
             accessory.removeService(this.StatefulProgrammableSwitch.Service);
         }
     }
@@ -811,24 +811,24 @@ export class Others extends irdeviceBase {
         // If Switch.Service still present, then remove first
         if (this.Switch?.Service) {
             this.Switch.Service = this.accessory.getService(this.hap.Service.Switch);
-            this.warnLog('Removing Leftover Switch Service');
+            this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Switch Service`);
             accessory.removeService(this.Switch.Service);
         }
     }
     async getOtherConfigSettings(device) {
         if (!device.other?.deviceType && this.accessory.context.deviceType) {
             this.otherDeviceType = this.accessory.context.deviceType;
-            await this.debugWarnLog(`Using Device Type: ${this.otherDeviceType}, from Accessory Cache.`);
+            this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}, from Accessory Cache.`);
         }
         else if (device.other?.deviceType) {
             this.accessory.context.deviceType = device.other.deviceType;
-            await this.debugWarnLog(`Accessory Cache: ${this.accessory.context.deviceType}`);
+            this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Accessory Cache: ${this.accessory.context.deviceType}`);
             this.otherDeviceType = this.accessory.context.deviceType;
-            await this.debugWarnLog(`Using Device Type: ${this.otherDeviceType}`);
+            this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
         }
         else {
             this.otherDeviceType = 'outlet';
-            this.warnLog(`no deviceType set, using default deviceType: ${this.otherDeviceType}`);
+            this.warnLog(`${this.device.remoteType}: ${this.accessory.displayName} no deviceType set, using default deviceType: ${this.otherDeviceType}`);
         }
     }
 }