homebridge-kasa-python 2.7.0-beta.2 → 2.7.0-beta.4

package/dist/devices/homekitPlug.js

@@ -1,19 +1,124 @@
 import HomekitDevice from './index.js';
+import { deferAndCombine } from '../utils.js';
 export default class HomeKitDevicePlug extends HomekitDevice {
     kasaDevice;
+    isUpdating = false;
+    previousKasaDevice;
+    getSysInfo;
     constructor(platform, kasaDevice) {
         super(platform, kasaDevice, 7 /* Categories.OUTLET */, 'OUTLET');
         this.kasaDevice = kasaDevice;
         this.log.debug(`Initializing HomeKitDevicePlug for device: ${kasaDevice.sys_info.alias}`);
-        this.addOutletService();
+        this.checkService();
+        this.getSysInfo = deferAndCombine(async () => {
+            if (this.deviceManager) {
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+                this.kasaDevice.sys_info = await this.deviceManager.getSysInfo(this.deviceConfig);
+            }
+            else {
+                this.log.warn('Device manager is not available');
+            }
+        }, platform.config.waitTimeUpdate);
+        this.startPolling();
     }
-    addOutletService() {
+    checkService() {
         const { Outlet } = this.platform.Service;
-        const outletService = this.homebridgeAccessory.getService(Outlet) ?? this.addService(Outlet, this.name);
-        this.log.debug(`Adding characteristics for outlet service: ${this.name}`);
-        this.addCharacteristic(outletService, this.platform.Characteristic.On);
-        this.addCharacteristic(outletService, this.platform.Characteristic.OutletInUse);
-        return outletService;
+        const service = this.homebridgeAccessory.getService(Outlet) ?? this.addService(Outlet, this.name);
+        this.checkCharacteristics(service);
+        return service;
+    }
+    checkCharacteristics(service) {
+        const characteristics = [
+            {
+                type: this.platform.Characteristic.On,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.On),
+            },
+            {
+                type: this.platform.Characteristic.OutletInUse,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.OutletInUse),
+            },
+        ].filter(Boolean);
+        characteristics.forEach(({ type, name }) => {
+            this.getOrAddCharacteristic(service, type, name);
+        });
+    }
+    getOrAddCharacteristic(service, characteristicType, characteristicName) {
+        const characteristic = service.getCharacteristic(characteristicType) ??
+            service.addCharacteristic(characteristicType);
+        characteristic.onGet(this.handleOnGet.bind(this, service, characteristicType, characteristicName));
+        if (characteristicType === this.platform.Characteristic.On) {
+            characteristic.onSet(this.handleOnSet.bind(this, service, characteristicType, characteristicName));
+        }
+        return service;
+    }
+    async handleOnGet(service, characteristicType, characteristicName) {
+        try {
+            const characteristicValue = service.getCharacteristic(characteristicType).value;
+            return characteristicValue ?? false;
+        }
+        catch (error) {
+            this.log.error(`Error getting current value for characteristic ${characteristicName} for device: ${this.name}:`, error);
+        }
+        return false;
+    }
+    async handleOnSet(service, characteristicType, characteristicName, value) {
+        if (this.deviceManager) {
+            try {
+                this.isUpdating = true;
+                const characteristicMap = {
+                    On: 'state',
+                };
+                const characteristicKey = characteristicMap[characteristicName ?? ''];
+                if (!characteristicKey) {
+                    throw new Error(`Characteristic key not found for ${characteristicName}`);
+                }
+                await this.deviceManager.controlDevice(this.deviceConfig, characteristicKey, value);
+                this.kasaDevice.sys_info[characteristicKey] = value;
+                this.updateValue(service, service.getCharacteristic(characteristicType), this.name, value);
+                this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.OutletInUse), this.name, value);
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+            }
+            catch (error) {
+                this.logRejection(error);
+            }
+            finally {
+                this.isUpdating = false;
+            }
+        }
+        else {
+            throw new Error('Device manager is undefined.');
+        }
+    }
+    async updateState() {
+        if (this.isUpdating) {
+            this.log.debug('Update already in progress, skipping updateState');
+            return;
+        }
+        this.isUpdating = true;
+        try {
+            await this.getSysInfo();
+            const service = this.homebridgeAccessory.getService(this.platform.Service.Outlet);
+            if (service && this.previousKasaDevice) {
+                const { state } = this.kasaDevice.sys_info;
+                const prevState = this.previousKasaDevice.sys_info;
+                if (prevState.state !== state) {
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.On), this.name, state ?? false);
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.OutletInUse), this.name, state ?? false);
+                }
+            }
+            else {
+                this.log.warn(`Service not found for device: ${this.name} or previous Kasa device is undefined`);
+            }
+        }
+        catch (error) {
+            this.log.error('Error updating device state:', error);
+        }
+        finally {
+            this.isUpdating = false;
+        }
+    }
+    startPolling() {
+        setInterval(this.updateState.bind(this), this.platform.config.discoveryOptions.pollingInterval);
     }
     identify() {
         this.log.info('identify');

package/dist/devices/homekitPlug.js.map

@@ -1 +1 @@
-{"version":3,"file":"homekitPlug.js","sourceRoot":"","sources":["../../src/devices/homekitPlug.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,MAAM,YAAY,CAAC;AAIvC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,aAAa;IAG9C;IAFZ,YACE,QAA4B,EAClB,UAAgB;QAE1B,KAAK,CACH,QAAQ,EACR,UAAU,6BAEV,QAAQ,CACT,CAAC;QAPQ,eAAU,GAAV,UAAU,CAAM;QAQ1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEO,gBAAgB;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAEzC,MAAM,aAAa,GACjB,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEhF,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"homekitPlug.js","sourceRoot":"","sources":["../../src/devices/homekitPlug.ts"],"names":[],"mappings":"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"}

package/dist/devices/homekitPowerStrip.d.ts

@@ -3,7 +3,16 @@ import type KasaPythonPlatform from '../platform.js';
 import type { PowerStrip } from './kasaDevices.js';
 export default class HomeKitDevicePowerStrip extends HomekitDevice {
     protected kasaDevice: PowerStrip;
+    private isUpdating;
+    private previousKasaDevice;
+    private getSysInfo;
     constructor(platform: KasaPythonPlatform, kasaDevice: PowerStrip);
-    private addOutletService;
+    private checkService;
+    private checkCharacteristics;
+    private getOrAddCharacteristic;
+    private handleOnGet;
+    private handleOnSet;
+    protected updateState(): Promise<void>;
+    private startPolling;
     identify(): void;
 }

package/dist/devices/homekitPowerStrip.js

@@ -1,23 +1,136 @@
 import HomekitDevice from './index.js';
+import { deferAndCombine } from '../utils.js';
 export default class HomeKitDevicePowerStrip extends HomekitDevice {
     kasaDevice;
+    isUpdating = false;
+    previousKasaDevice;
+    getSysInfo;
     constructor(platform, kasaDevice) {
         super(platform, kasaDevice, 7 /* Categories.OUTLET */, 'OUTLET');
         this.kasaDevice = kasaDevice;
         this.log.debug(`Initializing HomeKitDevicePowerStrip for device: ${kasaDevice.sys_info.alias}`);
         this.kasaDevice.sys_info.children?.forEach((child, index) => {
-            this.log.debug(`Adding outlet service for child device: ${child.alias}`);
-            this.addOutletService(child, index);
+            this.checkService(child, index);
         });
+        this.getSysInfo = deferAndCombine(async () => {
+            if (this.deviceManager) {
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+                this.kasaDevice.sys_info = await this.deviceManager.getSysInfo(this.deviceConfig);
+            }
+            else {
+                this.log.warn('Device manager is not available');
+            }
+        }, platform.config.waitTimeUpdate);
+        this.startPolling();
     }
-    addOutletService(child, index) {
+    checkService(child, index) {
         const { Outlet } = this.platform.Service;
-        const outletService = this.homebridgeAccessory.getServiceById(Outlet, `outlet-${index + 1}`) ??
+        const service = this.homebridgeAccessory.getServiceById(Outlet, `outlet-${index + 1}`) ??
             this.addService(Outlet, child.alias, `outlet-${index + 1}`);
-        this.log.debug(`Adding characteristics for outlet service: ${child.alias}`);
-        this.addCharacteristic(outletService, this.platform.Characteristic.On, child);
-        this.addCharacteristic(outletService, this.platform.Characteristic.OutletInUse, child);
-        return outletService;
+        this.checkCharacteristics(service, child);
+        return service;
+    }
+    checkCharacteristics(service, child) {
+        const characteristics = [
+            {
+                type: this.platform.Characteristic.On,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.On),
+            },
+            {
+                type: this.platform.Characteristic.OutletInUse,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.OutletInUse),
+            },
+        ].filter(Boolean);
+        characteristics.forEach(({ type, name }) => {
+            this.getOrAddCharacteristic(service, type, name, child);
+        });
+    }
+    getOrAddCharacteristic(service, characteristicType, characteristicName, child) {
+        const characteristic = service.getCharacteristic(characteristicType) ??
+            service.addCharacteristic(characteristicType);
+        characteristic.onGet(this.handleOnGet.bind(this, service, characteristicType, characteristicName, child));
+        if (characteristicType === this.platform.Characteristic.On) {
+            characteristic.onSet(this.handleOnSet.bind(this, service, characteristicType, characteristicName, child));
+        }
+        return service;
+    }
+    async handleOnGet(service, characteristicType, characteristicName, child) {
+        try {
+            const characteristicValue = service.getCharacteristic(characteristicType).value;
+            return characteristicValue ?? false;
+        }
+        catch (error) {
+            this.log.error(`Error getting current value for characteristic ${characteristicName} for device: ${child.alias}:`, error);
+        }
+        return false;
+    }
+    async handleOnSet(service, characteristicType, characteristicName, child, value) {
+        if (this.deviceManager) {
+            try {
+                this.isUpdating = true;
+                const characteristicMap = {
+                    On: 'state',
+                };
+                const characteristicKey = characteristicMap[characteristicName ?? ''];
+                if (!characteristicKey) {
+                    throw new Error(`Characteristic key not found for ${characteristicName}`);
+                }
+                const childNumber = parseInt(child.id.slice(-1), 10);
+                await this.deviceManager.controlDevice(this.deviceConfig, characteristicKey, value, childNumber);
+                child[characteristicKey] = value;
+                const childIndex = this.kasaDevice.sys_info.children?.findIndex(c => c.id === child.id);
+                if (childIndex !== undefined && childIndex !== -1) {
+                    this.kasaDevice.sys_info.children[childIndex] = { ...child };
+                }
+                this.updateValue(service, service.getCharacteristic(characteristicType), child.alias, value);
+                this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.OutletInUse), child.alias, value);
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+            }
+            catch (error) {
+                this.logRejection(error);
+            }
+            finally {
+                this.isUpdating = false;
+            }
+        }
+        else {
+            throw new Error('Device manager is undefined.');
+        }
+    }
+    async updateState() {
+        if (this.isUpdating) {
+            this.log.debug('Update already in progress, skipping updateState');
+            return;
+        }
+        this.isUpdating = true;
+        try {
+            await this.getSysInfo();
+            this.kasaDevice.sys_info.children?.forEach((child) => {
+                const childNumber = parseInt(child.id.slice(-1), 10);
+                const service = this.homebridgeAccessory.getServiceById(this.platform.Service.Outlet, `outlet-${childNumber + 1}`);
+                if (service && this.previousKasaDevice) {
+                    const previousChild = this.previousKasaDevice.sys_info.children?.find(c => c.id === child.id);
+                    if (previousChild) {
+                        if (previousChild.state !== child.state) {
+                            this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.On), child.alias, child.state);
+                            this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.OutletInUse), child.alias, child.state);
+                        }
+                    }
+                }
+                else {
+                    this.log.warn(`Service not found for child device: ${child.alias} or previous Kasa device is undefined`);
+                }
+            });
+        }
+        catch (error) {
+            this.log.error('Error updating device state:', error);
+        }
+        finally {
+            this.isUpdating = false;
+        }
+    }
+    startPolling() {
+        setInterval(this.updateState.bind(this), this.platform.config.discoveryOptions.pollingInterval);
     }
     identify() {
         this.log.info('identify');

package/dist/devices/homekitPowerStrip.js.map

@@ -1 +1 @@
-{"version":3,"file":"homekitPowerStrip.js","sourceRoot":"","sources":["../../src/devices/homekitPowerStrip.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,MAAM,YAAY,CAAC;AAIvC,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,aAAa;IAGpD;IAFZ,YACE,QAA4B,EAClB,UAAsB;QAEhC,KAAK,CACH,QAAQ,EACR,UAAU,6BAEV,QAAQ,CACT,CAAC;QAPQ,eAAU,GAAV,UAAU,CAAY;QAQhC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oDAAoD,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAChG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAkB,EAAE,KAAa,EAAE,EAAE;YAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,KAAkB,EAAE,KAAa;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACzC,MAAM,aAAa,GACjB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,KAAK,GAAG,CAAC,EAAE,CAAC;YACtE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,UAAU,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC9E,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvF,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"homekitPowerStrip.js","sourceRoot":"","sources":["../../src/devices/homekitPowerStrip.ts"],"names":[],"mappings":"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"}

package/dist/devices/homekitSwitch.d.ts

@@ -3,8 +3,18 @@ import type KasaPythonPlatform from '../platform.js';
 import type { Switch } from './kasaDevices.js';
 export default class HomeKitDeviceSwitch extends HomekitDevice {
     protected kasaDevice: Switch;
+    private isUpdating;
+    private previousKasaDevice;
+    private getSysInfo;
     private hasBrightness;
     constructor(platform: KasaPythonPlatform, kasaDevice: Switch);
-    private addSwitchService;
+    private checkService;
+    private checkCharacteristics;
+    private getOrAddCharacteristic;
+    private handleOnGet;
+    private getDefaultValue;
+    private handleOnSet;
+    protected updateState(): Promise<void>;
+    private startPolling;
     identify(): void;
 }

package/dist/devices/homekitSwitch.js

@@ -1,24 +1,134 @@
 import HomekitDevice from './index.js';
+import { deferAndCombine } from '../utils.js';
 export default class HomeKitDeviceSwitch extends HomekitDevice {
     kasaDevice;
+    isUpdating = false;
+    previousKasaDevice;
+    getSysInfo;
     hasBrightness;
     constructor(platform, kasaDevice) {
         super(platform, kasaDevice, 8 /* Categories.SWITCH */, 'SWITCH');
         this.kasaDevice = kasaDevice;
         this.log.debug(`Initializing HomeKitDeviceSwitch for device: ${kasaDevice.sys_info.alias}`);
         this.hasBrightness = !!this.kasaDevice.feature_info.brightness;
-        this.addSwitchService();
+        this.checkService();
+        this.getSysInfo = deferAndCombine(async () => {
+            if (this.deviceManager) {
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+                this.kasaDevice.sys_info = await this.deviceManager.getSysInfo(this.deviceConfig);
+            }
+            else {
+                this.log.warn('Device manager is not available');
+            }
+        }, platform.config.waitTimeUpdate);
+        this.startPolling();
     }
-    addSwitchService() {
+    checkService() {
         const { Switch, Lightbulb } = this.platform.Service;
         const serviceType = this.hasBrightness ? Lightbulb : Switch;
-        const switchService = this.homebridgeAccessory.getService(serviceType) ?? this.addService(serviceType, this.name);
-        this.log.debug(`Adding characteristics for ${this.hasBrightness ? 'lightbulb' : 'switch'} service: ${this.name}`);
-        if (this.hasBrightness) {
-            this.addCharacteristic(switchService, this.platform.Characteristic.Brightness);
+        const service = this.homebridgeAccessory.getService(serviceType) ?? this.addService(serviceType, this.name);
+        this.checkCharacteristics(service);
+        return service;
+    }
+    checkCharacteristics(service) {
+        const characteristics = [
+            {
+                type: this.platform.Characteristic.On,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.On),
+            },
+            this.hasBrightness && {
+                type: this.platform.Characteristic.Brightness,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.Brightness),
+            },
+        ].filter(Boolean);
+        characteristics.forEach(({ type, name }) => {
+            this.getOrAddCharacteristic(service, type, name);
+        });
+    }
+    getOrAddCharacteristic(service, characteristicType, characteristicName) {
+        const characteristic = service.getCharacteristic(characteristicType) ??
+            service.addCharacteristic(characteristicType);
+        characteristic.onGet(this.handleOnGet.bind(this, service, characteristicType, characteristicName));
+        characteristic.onSet(this.handleOnSet.bind(this, service, characteristicType, characteristicName));
+        return characteristic;
+    }
+    async handleOnGet(service, characteristicType, characteristicName) {
+        try {
+            const characteristicValue = service.getCharacteristic(characteristicType).value;
+            return characteristicValue ?? this.getDefaultValue(characteristicType);
+        }
+        catch (error) {
+            this.log.error(`Error getting current value for characteristic ${characteristicName} for device: ${this.name}:`, error);
+        }
+        return this.getDefaultValue(characteristicType);
+    }
+    getDefaultValue(characteristicType) {
+        if (characteristicType === this.platform.Characteristic.Brightness) {
+            return 0;
+        }
+        return false;
+    }
+    async handleOnSet(service, characteristicType, characteristicName, value) {
+        if (this.deviceManager) {
+            try {
+                this.isUpdating = true;
+                const characteristicMap = {
+                    Brightness: 'brightness',
+                    On: 'state',
+                };
+                const characteristicKey = characteristicMap[characteristicName ?? ''];
+                if (!characteristicKey) {
+                    throw new Error(`Characteristic key not found for ${characteristicName}`);
+                }
+                await this.deviceManager.controlDevice(this.deviceConfig, characteristicKey, value);
+                this.kasaDevice.sys_info[characteristicKey] = value;
+                this.updateValue(service, service.getCharacteristic(characteristicType), this.name, value);
+                this.previousKasaDevice = JSON.parse(JSON.stringify(this.kasaDevice));
+            }
+            catch (error) {
+                this.logRejection(error);
+            }
+            finally {
+                this.isUpdating = false;
+            }
         }
-        this.addCharacteristic(switchService, this.platform.Characteristic.On);
-        return switchService;
+        else {
+            throw new Error('Device manager is undefined.');
+        }
+    }
+    async updateState() {
+        if (this.isUpdating) {
+            this.log.debug('Update already in progress, skipping updateState');
+            return;
+        }
+        this.isUpdating = true;
+        try {
+            await this.getSysInfo();
+            const service = this.homebridgeAccessory.getService(this.platform.Service.Switch) ??
+                this.homebridgeAccessory.getService(this.platform.Service.Lightbulb);
+            if (service && this.previousKasaDevice) {
+                const { state, brightness } = this.kasaDevice.sys_info;
+                const prevState = this.previousKasaDevice.sys_info;
+                if (prevState.state !== state) {
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.On), this.name, state ?? false);
+                }
+                if (this.hasBrightness && prevState.brightness !== brightness) {
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.Brightness), this.name, brightness ?? 0);
+                }
+            }
+            else {
+                this.log.warn(`Service not found for device: ${this.name} or previous Kasa device is undefined`);
+            }
+        }
+        catch (error) {
+            this.log.error('Error updating device state:', error);
+        }
+        finally {
+            this.isUpdating = false;
+        }
+    }
+    startPolling() {
+        setInterval(this.updateState.bind(this), this.platform.config.discoveryOptions.pollingInterval);
     }
     identify() {
         this.log.info('identify');

package/dist/devices/homekitSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"homekitSwitch.js","sourceRoot":"","sources":["../../src/devices/homekitSwitch.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,MAAM,YAAY,CAAC;AAIvC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,aAAa;IAKhD;IAJJ,aAAa,CAAU;IAE/B,YACE,QAA4B,EAClB,UAAkB;QAE5B,KAAK,CACH,QAAQ,EACR,UAAU,6BAEV,QAAQ,CACT,CAAC;QAPQ,eAAU,GAAV,UAAU,CAAQ;QAQ5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC;QAC/D,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEO,gBAAgB;QACtB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAEpD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAE5D,MAAM,aAAa,GACjB,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,aAAa,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAClH,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"homekitSwitch.js","sourceRoot":"","sources":["../../src/devices/homekitSwitch.ts"],"names":[],"mappings":"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"}

package/dist/devices/index.d.ts

@@ -1,7 +1,7 @@
-import { Categories, Characteristic, CharacteristicValue, HapStatusError, Logger, Nullable, PlatformAccessory, Service, WithUUID } from 'homebridge';
+import { Categories, Characteristic, CharacteristicValue, HapStatusError, Logger, Nullable, PlatformAccessory, Service } from 'homebridge';
 import DeviceManager from './deviceManager.js';
 import type KasaPythonPlatform from '../platform.js';
-import type { ChildDevice, DeviceConfig, KasaDevice } from './kasaDevices.js';
+import type { DeviceConfig, KasaDevice } from './kasaDevices.js';
 import type { KasaPythonAccessoryContext } from '../platform.js';
 export default abstract class HomekitDevice {
     readonly platform: KasaPythonPlatform;
@@ -12,9 +12,6 @@ export default abstract class HomekitDevice {
     readonly deviceConfig: DeviceConfig;
     protected deviceManager: DeviceManager | undefined;
     homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext>;
-    private isUpdating;
-    private previousKasaDevice;
-    private getSysInfo;
     constructor(platform: KasaPythonPlatform, kasaDevice: KasaDevice, category: Categories, categoryName: string);
     private initializeAccessory;
     private updateAccessory;
@@ -26,14 +23,7 @@ export default abstract class HomekitDevice {
     get serialNumber(): string;
     get firmwareRevision(): string;
     abstract identify(): void;
-    updateValue(service: Service, characteristic: Characteristic, value: Nullable<CharacteristicValue> | Error | HapStatusError, childDeviceAlias?: string): void;
     addService(serviceConstructor: typeof this.platform.Service.Outlet, name: string, subType?: string): Service;
-    protected logRejection(reason: unknown): void;
-    protected addCharacteristic(service: Service, characteristicType: WithUUID<new () => Characteristic>, child?: ChildDevice): Service;
-    private handleOnGet;
-    private getCharacteristicValue;
-    private getDefaultValue;
-    private handleOnSet;
-    protected updateState(): Promise<void>;
-    private startPolling;
+    updateValue(service: Service, characteristic: Characteristic, deviceAlias: string, value: Nullable<CharacteristicValue> | Error | HapStatusError): void;
+    logRejection(reason: unknown): void;
 }