homebridge-kasa-python 2.9.1 → 3.0.0-beta.1

package/dist/devices/homekitSwitch.js

@@ -1,321 +1,37 @@
-import { EventEmitter } from 'node:events';
-import HomeKitDevice from './index.js';
-import { deferAndCombine } from '../utils.js';
+import HomeKitDevice from './baseDevice.js';
+import { buildOnDescriptor, buildBrightnessDescriptor, } from './descriptorHelpers.js';
 export default class HomeKitDeviceSwitch extends HomeKitDevice {
     kasaDevice;
-    isUpdating = false;
-    previousKasaDevice;
-    getSysInfo;
     hasBrightness;
-    pollingInterval;
-    updateEmitter = new EventEmitter();
-    static locks = new Map();
     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.checkService();
-        this.getSysInfo = deferAndCombine(async () => {
-            if (!this.deviceManager) {
-                this.log.warn('Device manager is not available');
-                return;
-            }
-            const host = this.kasaDevice.sys_info?.host;
-            if (!host) {
-                this.log.warn('No host found in sys_info for device');
-                return;
-            }
-            try {
-                this.previousKasaDevice = { ...this.kasaDevice };
-                const updatedSysInfo = await this.deviceManager.getSysInfo(host);
-                if (!updatedSysInfo) {
-                    this.log.warn('getSysInfo returned undefined');
-                    return;
-                }
-                this.kasaDevice.sys_info = updatedSysInfo;
-                this.log.debug(`Updated sys_info for device: ${updatedSysInfo.alias ?? host}`);
-            }
-            catch (err) {
-                const errorMsg = 'Error updating sys_info:';
-                if (err instanceof Error) {
-                    this.log.error(`${errorMsg} ${err.message}`);
-                }
-                else {
-                    this.log.error(`${errorMsg} ${String(err)}`);
-                }
-            }
-        }, platform.config.advancedOptions.waitTimeUpdate);
-        platform.periodicDeviceDiscoveryEmitter.on('periodicDeviceDiscoveryComplete', () => {
-            this.updateEmitter.emit('periodicDeviceDiscoveryComplete');
-        });
+        this.hasBrightness = !!kasaDevice.feature_info.brightness;
+        this.setupPrimaryService();
     }
     async initialize() {
-        this.log.debug(`Initializing polling for device: ${this.kasaDevice.sys_info.alias}`);
         await this.startPolling();
     }
-    async withLock(key, action) {
-        let lock = HomeKitDeviceSwitch.locks.get(key);
-        if (!lock) {
-            lock = Promise.resolve();
-        }
-        const currentLock = lock.then(async () => {
-            try {
-                return await action();
-            }
-            finally {
-                if (HomeKitDeviceSwitch.locks.get(key) === currentLock) {
-                    HomeKitDeviceSwitch.locks.delete(key);
-                }
-            }
-        });
-        HomeKitDeviceSwitch.locks.set(key, currentLock.then(() => { }));
-        return currentLock;
-    }
-    checkService() {
-        const serviceType = this.getServiceType();
-        const service = this.homebridgeAccessory.getService(serviceType) ?? this.addService(serviceType, this.name);
-        this.checkCharacteristics(service);
-    }
-    getServiceType() {
+    getPrimaryServiceType() {
         const { Switch, Lightbulb } = this.platform.Service;
         return this.hasBrightness ? Lightbulb : Switch;
     }
-    checkCharacteristics(service) {
-        const characteristics = this.getCharacteristics();
-        characteristics.forEach(({ type, name }) => {
-            this.getOrAddCharacteristic(service, type, name);
-        });
-    }
-    getCharacteristics() {
-        const characteristics = [];
-        characteristics.push({
-            type: this.platform.Characteristic.On,
-            name: this.platform.getCharacteristicName(this.platform.Characteristic.On),
-        });
+    buildPrimaryDescriptors() {
+        const C = this.platform.Characteristic;
+        const list = [
+            buildOnDescriptor(C, async (value, context) => {
+                await this.deviceManager.controlDevice(context.device.host, 'state', value);
+            }),
+        ];
         if (this.hasBrightness) {
-            characteristics.push({
-                type: this.platform.Characteristic.Brightness,
-                name: this.platform.getCharacteristicName(this.platform.Characteristic.Brightness),
-            });
-        }
-        return characteristics;
-    }
-    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));
-    }
-    async handleOnGet(service, characteristicType, characteristicName) {
-        if (this.kasaDevice.offline || this.platform.isShuttingDown) {
-            this.log.warn(`Device is offline or platform is shutting down, cannot get value for characteristic ${characteristicName}`);
-            return this.getDefaultValue(characteristicType);
-        }
-        try {
-            let characteristicValue = service.getCharacteristic(characteristicType).value;
-            if (!characteristicValue) {
-                characteristicValue = this.getInitialValue(characteristicType);
-                service.getCharacteristic(characteristicType).updateValue(characteristicValue);
-            }
-            this.log.debug(`Got value for characteristic ${characteristicName}: ${characteristicValue}`);
-            return characteristicValue ?? this.getDefaultValue(characteristicType);
-        }
-        catch (error) {
-            this.log.error(`Error getting current value for characteristic ${characteristicName} for device: ${this.name}:`, error);
-            this.kasaDevice.offline = true;
-            await this.stopPolling();
-            return this.getDefaultValue(characteristicType);
-        }
-    }
-    getDefaultValue(characteristicType) {
-        if (characteristicType === this.platform.Characteristic.Brightness) {
-            return 0;
-        }
-        return false;
-    }
-    getInitialValue(characteristicType) {
-        if (characteristicType === this.platform.Characteristic.On) {
-            return this.kasaDevice.sys_info.state ?? false;
-        }
-        else if (characteristicType === this.platform.Characteristic.Brightness) {
-            return this.kasaDevice.sys_info.brightness ?? 0;
-        }
-        return this.getDefaultValue(characteristicType);
-    }
-    async handleOnSet(service, characteristicType, characteristicName, value) {
-        const lockKey = `${this.kasaDevice.sys_info.device_id}`;
-        await this.withLock(lockKey, async () => {
-            if (this.kasaDevice.offline || this.platform.isShuttingDown) {
-                this.log.warn(`Device is offline or platform is shutting down, cannot set value for characteristic ${characteristicName}`);
-                return;
-            }
-            const task = async () => {
-                if (this.deviceManager) {
-                    try {
-                        this.isUpdating = true;
-                        this.log.debug(`Setting value for characteristic ${characteristicName} to ${value}`);
-                        const characteristicKey = this.getCharacteristicKey(characteristicName);
-                        if (!characteristicKey) {
-                            throw new Error(`Characteristic key not found for ${characteristicName}`);
-                        }
-                        await this.deviceManager.controlDevice(this.kasaDevice.sys_info.host, 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));
-                        this.log.debug(`Set value for characteristic ${characteristicName} to ${value} successfully`);
-                    }
-                    catch (error) {
-                        this.log.error(`Error setting current value for characteristic ${characteristicName} for device: ${this.name}:`, error);
-                        this.kasaDevice.offline = true;
-                        await this.stopPolling();
-                    }
-                    finally {
-                        this.isUpdating = false;
-                        this.updateEmitter.emit('updateComplete');
-                    }
-                }
-                else {
-                    throw new Error('Device manager is undefined.');
-                }
-            };
-            await task();
-        });
-    }
-    getCharacteristicKey(characteristicName) {
-        const characteristicMap = {
-            On: 'state',
-            Brightness: 'brightness',
-        };
-        return characteristicMap[characteristicName ?? ''];
-    }
-    async updateState() {
-        const lockKey = `${this.kasaDevice.sys_info.device_id}`;
-        await this.withLock(lockKey, async () => {
-            if (this.kasaDevice.offline || this.platform.isShuttingDown) {
-                await this.stopPolling();
-                return;
-            }
-            if (this.isUpdating || this.platform.periodicDeviceDiscovering) {
-                let periodicDiscoveryComplete = false;
-                await Promise.race([
-                    new Promise((resolve) => this.updateEmitter.once('updateComplete', resolve)),
-                    new Promise((resolve) => {
-                        this.updateEmitter.once('periodicDeviceDiscoveryComplete', () => {
-                            periodicDiscoveryComplete = true;
-                            resolve();
-                        });
-                    }),
-                ]);
-                if (periodicDiscoveryComplete) {
-                    if (this.pollingInterval) {
-                        await new Promise((resolve) => setTimeout(resolve, this.platform.config.discoveryOptions.pollingInterval));
-                    }
-                    else {
-                        return;
-                    }
-                }
-            }
-            this.isUpdating = true;
-            const task = async () => {
-                try {
-                    await this.getSysInfo();
-                    const service = this.getService();
-                    if (service && this.previousKasaDevice) {
-                        this.updateDeviceState(service);
-                    }
-                    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);
-                    this.kasaDevice.offline = true;
-                    await this.stopPolling();
-                }
-                finally {
-                    this.isUpdating = false;
-                    this.updateEmitter.emit('updateComplete');
-                }
-            };
-            await task();
-        });
-    }
-    getService() {
-        return this.homebridgeAccessory.getService(this.platform.Service.Switch) ??
-            this.homebridgeAccessory.getService(this.platform.Service.Lightbulb);
-    }
-    updateDeviceState(service) {
-        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);
-            this.log.debug(`Updated state for device: ${this.name} to state: ${state}`);
-        }
-        if (this.hasBrightness && prevState.brightness !== brightness) {
-            this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.Brightness), this.name, brightness ?? 0);
-            this.log.debug(`Updated brightness for device: ${this.name} to brightness: ${brightness}`);
+            list.push(buildBrightnessDescriptor(C, async (value, context) => {
+                await this.deviceManager.controlDevice(context.device.host, 'brightness', value);
+            }));
         }
+        return list;
     }
-    updateAfterPeriodicDiscovery() {
-        const serviceType = this.getServiceType();
-        const service = this.homebridgeAccessory.getService(serviceType);
-        if (service) {
-            this.updateCharacteristics(service);
-        }
-        else {
-            this.log.debug(`Service not found for device: ${this.name}`);
-        }
-    }
-    updateCharacteristics(service) {
-        const characteristics = this.getCharacteristics();
-        characteristics.forEach(({ type, name }) => {
-            const characteristic = service.getCharacteristic(type);
-            if (characteristic) {
-                const characteristicKey = this.getCharacteristicKey(name);
-                if (this.kasaDevice.sys_info[characteristicKey] !== undefined) {
-                    const value = this.kasaDevice.sys_info[characteristicKey];
-                    this.log.debug(`Setting value for characteristic ${name} to ${value}`);
-                    this.updateValue(service, characteristic, this.name, value);
-                }
-            }
-        });
-    }
-    async startPolling() {
-        if (this.kasaDevice.offline || this.platform.isShuttingDown) {
-            await this.stopPolling();
-            return;
-        }
-        if (this.pollingInterval) {
-            clearInterval(this.pollingInterval);
-        }
-        this.log.debug('Starting polling for device:', this.name);
-        this.pollingInterval = setInterval(async () => {
-            if (this.kasaDevice.offline || this.platform.isShuttingDown) {
-                if (this.isUpdating) {
-                    this.isUpdating = false;
-                    this.updateEmitter.emit('updateComplete');
-                }
-                await this.stopPolling();
-            }
-            else {
-                await this.updateState();
-            }
-        }, this.platform.config.discoveryOptions.pollingInterval);
-    }
-    async stopPolling() {
-        if (this.pollingInterval) {
-            clearInterval(this.pollingInterval);
-            this.pollingInterval = undefined;
-            this.log.debug('Stopped polling');
-        }
-        if (this.isUpdating) {
-            this.log.debug('Waiting for ongoing polling task to complete for device:', this.name);
-            await new Promise((resolve) => {
-                this.isUpdating = false;
-                this.updateEmitter.once('updateComplete', resolve);
-            });
-        }
+    async updateAllServicesAndCharacteristics(forceUpdate) {
+        await super.updateAllServicesAndCharacteristics(forceUpdate);
     }
     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":"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"}
+{"version":3,"file":"homekitSwitch.js","sourceRoot":"","sources":["../../src/devices/homekitSwitch.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,aAAa;IAKnD;IAJD,aAAa,CAAU;IAE/B,YACE,QAA4B,EACrB,UAAkB;QAEzB,KAAK,CAAC,QAAQ,EAAE,UAAU,6BAAqB,QAAQ,CAAC,CAAC;QAFlD,eAAU,GAAV,UAAU,CAAQ;QAGzB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC;QAC1D,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC5B,CAAC;IAES,qBAAqB;QAC7B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACpD,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IACjD,CAAC;IAES,uBAAuB;QAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QAEvC,MAAM,IAAI,GAA+B;YACvC,iBAAiB,CACf,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvB,MAAM,IAAI,CAAC,aAAc,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/E,CAAC,CACF;SACF,CAAC;QAEF,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,yBAAyB,CACjC,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvB,MAAM,IAAI,CAAC,aAAc,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;YACpF,CAAC,CACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAES,KAAK,CAAC,mCAAmC,CAAC,WAAoB;QACtE,MAAM,KAAK,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF"}

package/dist/devices/homekitSwitchWithChildren.d.ts

@@ -1,35 +1,11 @@
-import HomeKitDevice from './index.js';
+import HomeKitParentDevice from './baseParent.js';
 import type KasaPythonPlatform from '../platform.js';
-import type { Switch } from './kasaDevices.js';
-export default class HomeKitDeviceSwitchWithChildren extends HomeKitDevice {
+import type { ChildDevice, Switch, CharacteristicDescriptor } from './deviceTypes.js';
+export default class HomeKitDeviceSwitchWithChildren extends HomeKitParentDevice {
     kasaDevice: Switch;
-    isUpdating: boolean;
-    private previousKasaDevice;
-    private getSysInfo;
-    private pollingInterval;
-    private updateEmitter;
-    private static locks;
     constructor(platform: KasaPythonPlatform, kasaDevice: Switch);
     initialize(): Promise<void>;
-    private withLock;
-    private checkService;
-    private getServiceType;
-    private checkCharacteristics;
-    private getCharacteristics;
-    private getOrAddCharacteristic;
-    private handleOnGet;
-    private getDefaultValue;
-    private getInitialValue;
-    private mapRotationSpeedToValue;
-    private handleOnSet;
-    private getCharacteristicKey;
-    private getControlValue;
-    protected updateState(): Promise<void>;
-    private getService;
-    private updateChildState;
-    updateAfterPeriodicDiscovery(): void;
-    private updateCharacteristics;
-    startPolling(): Promise<void>;
-    stopPolling(): Promise<void>;
+    protected getChildServiceType(child: ChildDevice): typeof import("hap-nodejs/dist/lib/definitions/ServiceDefinitions.js").Fanv2;
+    protected buildChildDescriptors(child: ChildDevice): CharacteristicDescriptor[];
     identify(): void;
 }