homebridge-kasa-python 2.7.0-beta.8 → 2.7.0

package/dist/devices/homekitSwitchWithChildren.js

@@ -0,0 +1,365 @@
+import { EventEmitter } from 'node:events';
+import HomeKitDevice from './index.js';
+import { deferAndCombine } from '../utils.js';
+export default class HomeKitDeviceSwitchWithChildren extends HomeKitDevice {
+    kasaDevice;
+    isUpdating = false;
+    previousKasaDevice;
+    getSysInfo;
+    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 HomeKitDeviceSwitchWithChildren for device: ${kasaDevice.sys_info.alias}`);
+        this.kasaDevice.sys_info.children?.forEach((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.kasaDevice.sys_info.host);
+                this.log.debug(`Updated sys_info for device: ${this.kasaDevice.sys_info.alias}`);
+            }
+            else {
+                this.log.warn('Device manager is not available');
+            }
+        }, platform.config.advancedOptions.waitTimeUpdate);
+        this.startPolling();
+        platform.periodicDeviceDiscoveryEmitter.on('periodicDeviceDiscoveryComplete', () => {
+            this.updateEmitter.emit('periodicDeviceDiscoveryComplete');
+        });
+    }
+    async withLock(key, action) {
+        let lock = HomeKitDeviceSwitchWithChildren.locks.get(key);
+        if (!lock) {
+            lock = Promise.resolve();
+        }
+        const currentLock = lock.then(async () => {
+            try {
+                return await action();
+            }
+            finally {
+                if (HomeKitDeviceSwitchWithChildren.locks.get(key) === currentLock) {
+                    HomeKitDeviceSwitchWithChildren.locks.delete(key);
+                }
+            }
+        });
+        HomeKitDeviceSwitchWithChildren.locks.set(key, currentLock.then(() => { }));
+        return currentLock;
+    }
+    checkService(child, index) {
+        const serviceType = this.getServiceType(child);
+        const service = this.homebridgeAccessory.getServiceById(serviceType, `child-${index + 1}`) ??
+            this.addService(serviceType, child.alias, `child-${index + 1}`);
+        this.checkCharacteristics(service, child);
+    }
+    getServiceType(child) {
+        const { Lightbulb, Fanv2 } = this.platform.Service;
+        return child.fan_speed_level !== undefined ? Fanv2 : Lightbulb;
+    }
+    checkCharacteristics(service, child) {
+        const characteristics = this.getCharacteristics(child);
+        characteristics.forEach(({ type, name }) => {
+            this.getOrAddCharacteristic(service, type, name, child);
+        });
+    }
+    getCharacteristics(child) {
+        const characteristics = [];
+        if (child.fan_speed_level !== undefined) {
+            characteristics.push({
+                type: this.platform.Characteristic.RotationSpeed,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.RotationSpeed),
+            }, {
+                type: this.platform.Characteristic.Active,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.Active),
+            });
+        }
+        if (child.brightness !== undefined) {
+            characteristics.push({
+                type: this.platform.Characteristic.On,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.On),
+            }, {
+                type: this.platform.Characteristic.Brightness,
+                name: this.platform.getCharacteristicName(this.platform.Characteristic.Brightness),
+            });
+        }
+        return characteristics;
+    }
+    getOrAddCharacteristic(service, characteristicType, characteristicName, child) {
+        const characteristic = service.getCharacteristic(characteristicType) ??
+            service.addCharacteristic(characteristicType);
+        characteristic.onGet(this.handleOnGet.bind(this, service, characteristicType, characteristicName, child));
+        characteristic.onSet(this.handleOnSet.bind(this, service, characteristicType, characteristicName, child));
+    }
+    async handleOnGet(service, characteristicType, characteristicName, child) {
+        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, child);
+                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: ${child.alias}:`, error);
+            this.kasaDevice.offline = true;
+            this.stopPolling();
+            return this.getDefaultValue(characteristicType);
+        }
+    }
+    getDefaultValue(characteristicType) {
+        const zeroValueCharacteristics = [
+            this.platform.Characteristic.Brightness,
+            this.platform.Characteristic.RotationSpeed,
+        ];
+        if (zeroValueCharacteristics.includes(characteristicType)) {
+            return 0;
+        }
+        else if (characteristicType === this.platform.Characteristic.Active) {
+            return this.platform.Characteristic.Active.INACTIVE;
+        }
+        return false;
+    }
+    getInitialValue(characteristicType, child) {
+        if (characteristicType === this.platform.Characteristic.Active) {
+            return child.state ? this.platform.Characteristic.Active.ACTIVE : this.platform.Characteristic.Active.INACTIVE;
+        }
+        else if (characteristicType === this.platform.Characteristic.Brightness) {
+            return child.brightness ?? 0;
+        }
+        else if (characteristicType === this.platform.Characteristic.RotationSpeed) {
+            return this.mapRotationSpeedToValue(child.fan_speed_level) ?? 0;
+        }
+        else if (characteristicType === this.platform.Characteristic.On) {
+            return child.state ?? false;
+        }
+        return false;
+    }
+    mapRotationSpeedToValue(value) {
+        return value * 25;
+    }
+    async handleOnSet(service, characteristicType, characteristicName, child, value) {
+        const lockKey = `${this.kasaDevice.sys_info.device_id}:${child.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;
+            }
+            if (this.isUpdating || this.platform.periodicDeviceDiscovering) {
+                await Promise.race([
+                    new Promise((resolve) => this.updateEmitter.once('updateComplete', resolve)),
+                    new Promise((resolve) => this.updateEmitter.once('periodicDeviceDiscoveryComplete', resolve)),
+                ]);
+            }
+            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}`);
+                        }
+                        const childNumber = parseInt(child.id.slice(-1), 10);
+                        const controlValue = this.getControlValue(characteristicName, value);
+                        await this.deviceManager.controlDevice(this.kasaDevice.sys_info.host, characteristicKey, controlValue, childNumber);
+                        child[characteristicKey] = controlValue;
+                        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.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: ${child.alias}:`, error);
+                        this.kasaDevice.offline = true;
+                        this.stopPolling();
+                    }
+                    finally {
+                        this.isUpdating = false;
+                        this.updateEmitter.emit('updateComplete');
+                    }
+                }
+                else {
+                    throw new Error('Device manager is undefined.');
+                }
+            };
+            await task();
+        });
+    }
+    getCharacteristicKey(characteristicName) {
+        const characteristicMap = {
+            Active: 'state',
+            Brightness: 'brightness',
+            RotationSpeed: 'fan_speed_level',
+            On: 'state',
+        };
+        return characteristicMap[characteristicName ?? ''];
+    }
+    getControlValue(characteristicName, value) {
+        if (characteristicName === 'Active') {
+            return value === 1 ? true : false;
+        }
+        else if (characteristicName === 'RotationSpeed') {
+            return this.mapRotationSpeedToValue(value);
+        }
+        return value;
+    }
+    async updateState() {
+        const lockKey = `${this.kasaDevice.sys_info.device_id}`;
+        await this.withLock(lockKey, async () => {
+            if (this.kasaDevice.offline || this.platform.isShuttingDown) {
+                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();
+                    this.kasaDevice.sys_info.children?.forEach((child) => {
+                        const childNumber = parseInt(child.id.slice(-1), 10);
+                        const service = this.getService(child, childNumber);
+                        if (service && this.previousKasaDevice) {
+                            this.updateChildState(service, child);
+                        }
+                        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);
+                    this.kasaDevice.offline = true;
+                    this.stopPolling();
+                }
+                finally {
+                    this.isUpdating = false;
+                    this.updateEmitter.emit('updateComplete');
+                }
+            };
+            await task();
+        });
+    }
+    getService(child, childNumber) {
+        if (child.brightness !== undefined) {
+            return this.homebridgeAccessory.getServiceById(this.platform.Service.Lightbulb, `child-${childNumber + 1}`);
+        }
+        else if (child.fan_speed_level !== undefined) {
+            return this.homebridgeAccessory.getServiceById(this.platform.Service.Fanv2, `child-${childNumber + 1}`);
+        }
+        return undefined;
+    }
+    updateChildState(service, child) {
+        const previousChild = this.previousKasaDevice?.sys_info.children?.find(c => c.id === child.id);
+        if (previousChild) {
+            if (previousChild.state !== child.state) {
+                if (service.UUID === this.platform.Service.Lightbulb.UUID) {
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.On), child.alias, child.state);
+                    this.log.debug(`Updated state for child device: ${child.alias} to ${child.state}`);
+                }
+                else if (service.UUID === this.platform.Service.Fanv2.UUID) {
+                    this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.Active), child.alias, child.state ? this.platform.Characteristic.Active.ACTIVE : this.platform.Characteristic.Active.INACTIVE);
+                    this.log.debug(`Updated active state for child device: ${child.alias} to ${child.state ? 'ACTIVE' : 'INACTIVE'}`);
+                }
+            }
+            if (child.brightness !== undefined && previousChild.brightness !== child.brightness) {
+                this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.Brightness), child.alias, child.brightness);
+                this.log.debug(`Updated brightness for child device: ${child.alias} to ${child.brightness}`);
+            }
+            if (child.fan_speed_level !== undefined && previousChild.fan_speed_level !== child.fan_speed_level) {
+                const updateValue = this.mapRotationSpeedToValue(child.fan_speed_level);
+                this.updateValue(service, service.getCharacteristic(this.platform.Characteristic.RotationSpeed), child.alias, updateValue);
+                this.log.debug(`Updated fan speed for child device: ${child.alias} to ${updateValue}`);
+            }
+        }
+    }
+    updateAfterPeriodicDiscovery() {
+        this.kasaDevice.sys_info.children?.forEach((child, index) => {
+            const serviceType = this.getServiceType(child);
+            const service = this.homebridgeAccessory.getServiceById(serviceType, `child-${index + 1}`);
+            if (service) {
+                this.updateCharacteristics(service, child);
+            }
+            else {
+                this.log.debug(`Service not found for child device: ${child.alias}`);
+            }
+        });
+    }
+    updateCharacteristics(service, child) {
+        const characteristics = this.getCharacteristics(child);
+        characteristics.forEach(({ type, name }) => {
+            const characteristic = service.getCharacteristic(type);
+            if (characteristic) {
+                const characteristicKey = this.getCharacteristicKey(name);
+                if (child[characteristicKey] !== undefined) {
+                    const value = child[characteristicKey];
+                    const controlValue = this.getControlValue(name, value);
+                    this.log.debug(`Setting value for characteristic ${name} to ${controlValue}`);
+                    this.updateValue(service, characteristic, child.alias, controlValue);
+                }
+            }
+        });
+    }
+    startPolling() {
+        if (this.kasaDevice.offline || this.platform.isShuttingDown) {
+            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');
+                }
+                this.stopPolling();
+            }
+            else {
+                await this.updateState();
+            }
+        }, this.platform.config.discoveryOptions.pollingInterval);
+    }
+    stopPolling() {
+        if (this.pollingInterval) {
+            clearInterval(this.pollingInterval);
+            this.pollingInterval = undefined;
+            this.log.debug('Stopped polling');
+        }
+    }
+    identify() {
+        this.log.info('identify');
+    }
+}
+//# sourceMappingURL=homekitSwitchWithChildren.js.map

package/dist/devices/homekitSwitchWithChildren.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"homekitSwitchWithChildren.js","sourceRoot":"","sources":["../../src/devices/homekitSwitchWithChildren.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 } from 'homebridge';
+import { Categories, Characteristic, CharacteristicValue, HapStatusError, Logger, Nullable, PlatformAccessory, Service, WithUUID } from 'homebridge';
 import DeviceManager from './deviceManager.js';
 import type KasaPythonPlatform from '../platform.js';
-import type { DeviceConfig, KasaDevice } from './kasaDevices.js';
+import type { KasaDevice } from './kasaDevices.js';
 import type { KasaPythonAccessoryContext } from '../platform.js';
 export default abstract class HomeKitDevice {
     readonly platform: KasaPythonPlatform;
@@ -9,14 +9,13 @@ export default abstract class HomeKitDevice {
     readonly category: Categories;
     readonly categoryName: string;
     readonly log: Logger;
-    readonly deviceConfig: DeviceConfig;
     protected deviceManager: DeviceManager | undefined;
     homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext>;
     isUpdating: boolean;
     constructor(platform: KasaPythonPlatform, kasaDevice: KasaDevice, category: Categories, categoryName: string);
     private initializeAccessory;
     private updateAccessory;
-    private correctAccessoryProperty;
+    private correctAccessoryProperties;
     get id(): string;
     get name(): string;
     get manufacturer(): string;
@@ -24,8 +23,8 @@ export default abstract class HomeKitDevice {
     get serialNumber(): string;
     get firmwareRevision(): string;
     abstract identify(): void;
+    abstract updateAfterPeriodicDiscovery(): void;
     abstract startPolling(): void;
-    addService(serviceConstructor: typeof this.platform.Service.Outlet, name: string, subType?: string): Service;
+    addService(serviceConstructor: WithUUID<typeof this.platform.Service>, name: string, subType?: string): Service;
     updateValue(service: Service, characteristic: Characteristic, deviceAlias: string, value: Nullable<CharacteristicValue> | Error | HapStatusError): void;
-    logRejection(reason: unknown): void;
 }

package/dist/devices/index.js

@@ -6,7 +6,6 @@ export default class HomeKitDevice {
     category;
     categoryName;
     log;
-    deviceConfig;
     deviceManager;
     homebridgeAccessory;
     isUpdating = false;
@@ -15,7 +14,6 @@ export default class HomeKitDevice {
         this.kasaDevice = kasaDevice;
         this.category = category;
         this.categoryName = categoryName;
-        this.deviceConfig = kasaDevice.device_config;
         this.deviceManager = platform.deviceManager;
         this.log = prefixLogger(platform.log, `[${this.name}]`);
         this.homebridgeAccessory = this.initializeAccessory();
@@ -46,18 +44,24 @@ export default class HomeKitDevice {
         return platformAccessory;
     }
     updateAccessory(platformAccessory) {
-        this.correctAccessoryProperty(platformAccessory, 'displayName', this.name);
-        this.correctAccessoryProperty(platformAccessory, 'category', this.category);
-        this.correctAccessoryProperty(platformAccessory.context, 'deviceId', this.id);
-        this.correctAccessoryProperty(platformAccessory.context, 'lastSeen', this.kasaDevice.last_seen);
-        this.correctAccessoryProperty(platformAccessory.context, 'offline', this.kasaDevice.offline);
+        this.correctAccessoryProperties(platformAccessory, {
+            displayName: this.name,
+            category: this.category,
+            context: {
+                deviceId: this.id,
+                lastSeen: this.kasaDevice.last_seen,
+                offline: this.kasaDevice.offline,
+            },
+        });
         this.platform.configuredAccessories.set(platformAccessory.UUID, platformAccessory);
         this.platform.api.updatePlatformAccessories([platformAccessory]);
     }
-    correctAccessoryProperty(obj, key, expectedValue) {
-        if (obj[key] !== expectedValue) {
-            this.log.debug(`Correcting Platform Accessory ${String(key)} from: ${String(obj[key])} to: ${String(expectedValue)}`);
-            obj[key] = expectedValue;
+    correctAccessoryProperties(obj, properties) {
+        for (const [key, expectedValue] of Object.entries(properties)) {
+            if (obj[key] !== expectedValue) {
+                this.log.debug(`Correcting Platform Accessory ${key} from: ${String(obj[key])} to: ${String(expectedValue)}`);
+                obj[key] = expectedValue;
+            }
         }
     }
     get id() {
@@ -70,25 +74,22 @@ export default class HomeKitDevice {
         return 'TP-Link';
     }
     get model() {
-        return `${this.kasaDevice.disc_info.model} ${this.kasaDevice.sys_info.hw_ver}`;
+        return `${this.kasaDevice.sys_info.model} ${this.kasaDevice.sys_info.hw_ver}`;
     }
     get serialNumber() {
         return this.kasaDevice.sys_info.mac;
     }
     get firmwareRevision() {
-        return `${this.kasaDevice.sys_info.sw_ver.split(' ')[0]}`;
+        return this.kasaDevice.sys_info.sw_ver;
     }
     addService(serviceConstructor, name, subType) {
         const serviceName = this.platform.getServiceName(serviceConstructor);
         this.log.debug(`Creating new ${serviceName} Service on ${name}${subType ? ` [${subType}]` : ''}`);
-        return this.homebridgeAccessory.addService(serviceConstructor, name, subType);
+        return this.homebridgeAccessory.addService(serviceConstructor, name, subType ? subType : '');
     }
     updateValue(service, characteristic, deviceAlias, value) {
         this.log.info(`Updating ${this.platform.lsc(service, characteristic)} on ${deviceAlias} to ${value}`);
         characteristic.updateValue(value);
     }
-    logRejection(reason) {
-        this.log.error(`Rejection: ${JSON.stringify(reason)}`);
-    }
 }
 //# sourceMappingURL=index.js.map

package/dist/devices/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devices/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devices/index.ts"],"names":[],"mappings":"AAaA,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK3C,MAAM,CAAC,OAAO,OAAgB,aAAa;IAO9B;IACF;IACE;IACA;IATF,GAAG,CAAS;IACX,aAAa,CAA4B;IACnD,mBAAmB,CAAgD;IAC5D,UAAU,GAAY,KAAK,CAAC;IAEnC,YACW,QAA4B,EAC9B,UAAsB,EACpB,QAAoB,EACpB,YAAoB;QAHpB,aAAQ,GAAR,QAAQ,CAAoB;QAC9B,eAAU,GAAV,UAAU,CAAY;QACpB,aAAQ,GAAR,QAAQ,CAAY;QACpB,iBAAY,GAAZ,YAAY,CAAQ;QAE7B,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACtD,IAAI,CAAC,mBAAmB,CAAC,EAAE,mDAAkC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtF,CAAC;IAEO,mBAAmB;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1E,IAAI,iBAAgE,CAAC;QACrE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,IAAI,CAAC,EAAE,MAAM,IAAI,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YACxG,iBAAiB,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5F,iBAAiB,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;YAC7C,iBAAiB,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAC/D,iBAAiB,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAC5D,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,IAAI;gBAC3F,IAAI,mBAAmB,CAAC,IAAI,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAClE,iBAAiB,GAAG,mBAAmB,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACrF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,eAAe,CAAC,iBAAgE;QACtF,IAAI,CAAC,0BAA0B,CAAC,iBAAiB,EAAE;YACjD,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;gBACnC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO;aACjC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACnF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACnE,CAAC;IAEO,0BAA0B,CAAI,GAAM,EAAE,UAAsB;QAClE,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9D,IAAI,GAAG,CAAC,GAAc,CAAC,KAAK,aAAa,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,UAAU,MAAM,CAAC,GAAG,CAAC,GAAc,CAAC,CAAC,QAAQ,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACzH,GAAG,CAAC,GAAc,CAAC,GAAG,aAA2B,CAAC;YACpD,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC5C,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAChF,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;IACtC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;IACzC,CAAC;IAQD,UAAU,CAAC,kBAA0D,EAAE,IAAY,EAAE,OAAgB;QACnG,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,WAAW,eAAe,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClG,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,WAAW,CACT,OAAgB,EAChB,cAA8B,EAC9B,WAAmB,EACnB,KAA6D;QAE7D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,WAAW,OAAO,KAAK,EAAE,CAAC,CAAC;QACtG,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF"}

package/dist/devices/kasaDevices.d.ts

@@ -7,26 +7,27 @@ export interface SysInfo {
     color_temp?: number;
     device_id: string;
     device_type: string;
+    fan_speed_level?: number;
     host: string;
     hw_ver: string;
     hsv?: HSV;
     mac: string;
+    model: string;
     state?: boolean;
     sw_ver: string;
     [key: string]: string | number | boolean | ChildDevice[] | HSV | undefined;
 }
-export interface DiscoveryInfo {
-    model: string;
-}
 export interface FeatureInfo {
     brightness?: boolean;
     color_temp?: boolean;
     hsv?: boolean;
+    fan?: boolean;
 }
 export interface ChildDevice {
     alias: string;
     brightness?: number;
     color_temp?: number;
+    fan_speed_level?: number;
     hsv?: HSV;
     id: string;
     state: boolean;
@@ -56,33 +57,25 @@ export interface ConfigDevice {
 }
 export interface LightBulb {
     sys_info: SysInfo;
-    disc_info: DiscoveryInfo;
     feature_info: FeatureInfo;
-    device_config: DeviceConfig;
     last_seen: Date;
     offline: boolean;
 }
 export interface Plug {
     sys_info: SysInfo;
-    disc_info: DiscoveryInfo;
     feature_info: FeatureInfo;
-    device_config: DeviceConfig;
     last_seen: Date;
     offline: boolean;
 }
 export interface PowerStrip {
     sys_info: SysInfo;
-    disc_info: DiscoveryInfo;
     feature_info: FeatureInfo;
-    device_config: DeviceConfig;
     last_seen: Date;
     offline: boolean;
 }
 export interface Switch {
     sys_info: SysInfo;
-    disc_info: DiscoveryInfo;
     feature_info: FeatureInfo;
-    device_config: DeviceConfig;
     last_seen: Date;
     offline: boolean;
 }