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

package/dist/devices/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/devices/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/devices/create.ts"],"names":[],"mappings":"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"}

package/dist/devices/descriptorHelpers.d.ts

@@ -0,0 +1,14 @@
+import type { Characteristic, CharacteristicValue } from 'homebridge';
+import type { CharacteristicDescriptor, DescriptorContext } from './deviceTypes.js';
+import type { EnergyCharacteristics } from '../energyCharacteristics.js';
+export declare function buildOnDescriptor(C: typeof Characteristic, setState?: (value: CharacteristicValue, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor;
+export declare function buildBrightnessDescriptor(C: typeof Characteristic, setBrightness: (value: number, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor;
+export declare function buildColorTemperatureDescriptor(C: typeof Characteristic, setColorTemp: (value: number, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor;
+export declare function buildHSVDescriptors(C: typeof Characteristic, enqueueHSV: (partial: {
+    hue?: number;
+    saturation?: number;
+}, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor[];
+export declare function buildOutletInUseDescriptor(C: typeof Characteristic, hasEnergy: boolean): CharacteristicDescriptor;
+export declare function buildEnergyDescriptors(energyCharacteristics: EnergyCharacteristics): CharacteristicDescriptor[];
+export declare function buildFanActiveDescriptor(C: typeof Characteristic, setActive: (active: boolean, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor;
+export declare function buildFanRotationDescriptor(C: typeof Characteristic, setRotation: (fan_speed_level: number, context: DescriptorContext) => Promise<void>): CharacteristicDescriptor;

package/dist/devices/descriptorHelpers.js

@@ -0,0 +1,146 @@
+export function buildOnDescriptor(C, setState) {
+    return {
+        type: C.On,
+        name: 'On',
+        writable: true,
+        getInitial: context => (context.child ? context.child.state : context.device.state) ?? false,
+        getCurrent: context => (context.child ? context.child.state : context.device.state) ?? false,
+        applySet: setState
+            ? async (value, context) => {
+                await setState(value, context);
+                const state = Boolean(value);
+                if (context.child) {
+                    context.child.state = state;
+                }
+                else {
+                    context.device.state = state;
+                }
+            }
+            : undefined,
+    };
+}
+export function buildBrightnessDescriptor(C, setBrightness) {
+    return {
+        type: C.Brightness,
+        name: 'Brightness',
+        writable: true,
+        getInitial: context => (context.child ? context.child.brightness : context.device.brightness) ?? 0,
+        getCurrent: context => (context.child ? context.child.brightness : context.device.brightness) ?? 0,
+        applySet: async (value, context) => {
+            const brightness = Number(value);
+            await setBrightness(brightness, context);
+            if (context.child) {
+                context.child.brightness = brightness;
+            }
+            else {
+                context.device.brightness = brightness;
+            }
+        },
+    };
+}
+export function buildColorTemperatureDescriptor(C, setColorTemp) {
+    return {
+        type: C.ColorTemperature,
+        name: 'ColorTemperature',
+        writable: true,
+        getInitial: context => (context.child ? context.child.color_temp : context.device.color_temp) ?? 0,
+        getCurrent: context => (context.child ? context.child.color_temp : context.device.color_temp) ?? 0,
+        applySet: async (value, context) => {
+            const colorTemp = Number(value);
+            await setColorTemp(colorTemp, context);
+            if (context.child) {
+                context.child.color_temp = colorTemp;
+            }
+            else {
+                context.device.color_temp = colorTemp;
+            }
+        },
+    };
+}
+export function buildHSVDescriptors(C, enqueueHSV) {
+    return [
+        {
+            type: C.Hue,
+            name: 'Hue',
+            writable: true,
+            getInitial: context => (context.child ? context.child.hsv?.hue : context.device.hsv?.hue) ?? 0,
+            getCurrent: context => (context.child ? context.child.hsv?.hue : context.device.hsv?.hue) ?? 0,
+            applySet: async (value, context) => enqueueHSV({ hue: Number(value) }, context),
+        },
+        {
+            type: C.Saturation,
+            name: 'Saturation',
+            writable: true,
+            getInitial: context => (context.child ? context.child.hsv?.saturation : context.device.hsv?.saturation) ?? 0,
+            getCurrent: context => (context.child ? context.child.hsv?.saturation : context.device.hsv?.saturation) ?? 0,
+            applySet: async (value, context) => enqueueHSV({ saturation: Number(value) }, context),
+        },
+    ];
+}
+export function buildOutletInUseDescriptor(C, hasEnergy) {
+    const energy = (context) => ((context.child ? context.child.energy?.power : context.device.energy?.power) ?? 0) >= 1.0;
+    const state = (context) => (context.child ? context.child.state : context.device.state) ?? false;
+    return {
+        type: C.OutletInUse,
+        name: 'OutletInUse',
+        writable: false,
+        getInitial: (context) => (hasEnergy ? energy(context) : state(context)),
+        getCurrent: (context) => (hasEnergy ? energy(context) : state(context)),
+    };
+}
+export function buildEnergyDescriptors(energyCharacteristics) {
+    const definitions = [
+        [energyCharacteristics.Volts, 'voltage', 'Volts'],
+        [energyCharacteristics.Amperes, 'current', 'Amperes'],
+        [energyCharacteristics.Watts, 'power', 'Watts'],
+        [energyCharacteristics.KiloWattHours, 'total', 'KiloWattHours'],
+    ];
+    return definitions.map(([characteristicType, field, label]) => ({
+        type: characteristicType,
+        name: label,
+        writable: false,
+        getInitial: context => (context.child ? context.child.energy?.[field] : context.device.energy?.[field]) ?? 0,
+        getCurrent: context => (context.child ? context.child.energy?.[field] : context.device.energy?.[field]) ?? 0,
+    }));
+}
+export function buildFanActiveDescriptor(C, setActive) {
+    return {
+        type: C.Active,
+        name: 'Active',
+        writable: true,
+        getInitial: context => ((context.child ? context.child.state : context.device.state) ? C.Active.ACTIVE : C.Active.INACTIVE),
+        getCurrent: context => ((context.child ? context.child.state : context.device.state) ? C.Active.ACTIVE : C.Active.INACTIVE),
+        applySet: async (value, context) => {
+            const active = value === C.Active.ACTIVE;
+            await setActive(active, context);
+            if (context.child) {
+                context.child.state = active;
+            }
+            else {
+                context.device.state = active;
+            }
+        },
+    };
+}
+export function buildFanRotationDescriptor(C, setRotation) {
+    return {
+        type: C.RotationSpeed,
+        name: 'RotationSpeed',
+        writable: true,
+        getInitial: context => (context.child ? context.child.fan_speed_level : context.device.fan_speed_level) ?? 0,
+        getCurrent: context => (context.child ? context.child.fan_speed_level : context.device.fan_speed_level) ?? 0,
+        applySet: async (value, context) => {
+            const fan_speed_level = Math.min(100, Math.ceil(Math.max(0, Number(value) || 0) / 25) * 25);
+            await setRotation(fan_speed_level, context);
+            if (context.child) {
+                context.child.fan_speed_level = fan_speed_level;
+                context.child.state = fan_speed_level > 0;
+            }
+            else {
+                context.device.fan_speed_level = fan_speed_level;
+                context.device.state = fan_speed_level > 0;
+            }
+        },
+    };
+}
+//# sourceMappingURL=descriptorHelpers.js.map

package/dist/devices/descriptorHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"descriptorHelpers.js","sourceRoot":"","sources":["../../src/devices/descriptorHelpers.ts"],"names":[],"mappings":"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"}

package/dist/devices/deviceManager.d.ts

@@ -1,9 +1,9 @@
 import type { CharacteristicValue } from 'homebridge';
 import KasaPythonPlatform from '../platform.js';
-import type { HSV, SysInfo } from './kasaDevices.js';
+import type { HSV, SysInfo } from './deviceTypes.js';
 import { EventEmitter } from 'events';
 export declare const deviceEventEmitter: EventEmitter<[never]>;
-type ControlDeviceValue = CharacteristicValue | HSV;
+type ControlValue = CharacteristicValue | HSV;
 export default class DeviceManager {
     private platform;
     private log;
@@ -11,21 +11,21 @@ export default class DeviceManager {
     private username;
     private password;
     private additionalBroadcasts;
-    private manualDevices;
-    private excludeMacAddresses;
-    private includeMacAddresses;
+    private manualDeviceHosts;
+    private excludeMacs;
+    private includeMacs;
     constructor(platform: KasaPythonPlatform);
-    private convertManualDevices;
-    private updateDeviceAlias;
-    private isKasaDevice;
-    private readConfigFile;
-    private writeConfigFile;
     discoverDevices(): Promise<void>;
-    private processDevice;
-    private shouldConvertManualDevices;
+    private persistDiscoveredDevice;
     getSysInfo(host: string): Promise<SysInfo | undefined>;
-    controlDevice(host: string, feature: string, value: ControlDeviceValue, child_num?: number): Promise<void>;
+    controlDevice(host: string, feature: string, value: ControlValue, childNum?: number): Promise<void>;
+    private mapFeatureToAction;
     private performDeviceAction;
+    private updateDeviceAlias;
+    private needsManualDevicesNormalization;
+    private normalizeManualDevices;
+    private readConfigFile;
+    private writeConfigFile;
     private handleAxiosError;
 }
 export {};

package/dist/devices/deviceManager.js

@@ -12,9 +12,9 @@ export default class DeviceManager {
     username;
     password;
     additionalBroadcasts;
-    manualDevices;
-    excludeMacAddresses;
-    includeMacAddresses;
+    manualDeviceHosts;
+    excludeMacs;
+    includeMacs;
     constructor(platform) {
         this.platform = platform;
         this.log = platform.log;
@@ -22,166 +22,103 @@ export default class DeviceManager {
         this.password = platform.config.password;
         this.apiUrl = `http://127.0.0.1:${platform.port}`;
         this.additionalBroadcasts = platform.config.discoveryOptions.additionalBroadcasts;
-        this.manualDevices = platform.config.discoveryOptions.manualDevices.map(device => device.host);
-        this.excludeMacAddresses = platform.config.discoveryOptions.excludeMacAddresses;
-        this.includeMacAddresses = platform.config.discoveryOptions.includeMacAddresses;
-    }
-    convertManualDevices(manualDevices) {
-        return manualDevices.map(device => {
-            if (typeof device === 'string') {
-                return { host: device, alias: 'Will Be Filled By Plug-In Automatically' };
-            }
-            else if ('breakoutChildDevices' in device) {
-                delete device.breakoutChildDevices;
-            }
-            else if ('host' in device && !('alias' in device)) {
-                device.alias = 'Will Be Filled By Plug-In Automatically';
-            }
-            return device;
-        });
-    }
-    updateDeviceAlias(device) {
-        let sysInfo;
-        if (this.isKasaDevice(device)) {
-            sysInfo = device.sys_info;
-        }
-        else {
-            sysInfo = device;
-        }
-        if (sysInfo.alias) {
-            const aliasMappings = {
-                'TP-LINK_Power Strip_': 'Power Strip',
-                'TP-LINK_Smart Plug_': 'Smart Plug',
-                'TP-LINK_Smart Bulb_': 'Smart Bulb',
-            };
-            for (const [pattern, replacement] of Object.entries(aliasMappings)) {
-                if (sysInfo.alias.includes(pattern)) {
-                    sysInfo.alias = `${replacement} ${sysInfo.alias.slice(-4)}`;
-                    break;
-                }
-            }
-        }
-    }
-    isKasaDevice(device) {
-        return device.sys_info !== undefined;
-    }
-    async readConfigFile(configPath) {
-        try {
-            const configData = await fs.readFile(configPath, 'utf8');
-            return JSON.parse(configData);
-        }
-        catch (error) {
-            this.log.error(`Error reading config file: ${String(error)}`);
-            throw error;
-        }
-    }
-    async writeConfigFile(configPath, fileConfig) {
-        try {
-            await fs.writeFile(configPath, JSON.stringify(fileConfig, null, 2), 'utf8');
-        }
-        catch (error) {
-            this.log.error(`Error writing config file: ${String(error)}`);
-        }
+        this.manualDeviceHosts = platform.config.discoveryOptions.manualDevices.map(d => d.host);
+        this.excludeMacs = platform.config.discoveryOptions.excludeMacAddresses;
+        this.includeMacs = platform.config.discoveryOptions.includeMacAddresses;
     }
     async discoverDevices() {
-        this.log.info('Discovering devices using streaming...');
+        this.log.info('Starting device discovery (SSE)...');
         try {
-            const config = this.username && this.password
+            const authConfig = this.username && this.password
                 ? { auth: { username: this.username, password: this.password } }
                 : {};
             const response = await axios.post(`${this.apiUrl}/discover`, {
                 additionalBroadcasts: this.additionalBroadcasts,
-                manualDevices: this.manualDevices,
-                excludeMacAddresses: this.excludeMacAddresses,
-                includeMacAddresses: this.includeMacAddresses,
-            }, config);
-            this.log.info('Discovery initiated:', response.data);
+                manualDevices: this.manualDeviceHosts,
+                excludeMacAddresses: this.excludeMacs,
+                includeMacAddresses: this.includeMacs,
+            }, authConfig);
+            this.log.info('Discovery initiated:', Object.keys(response.data).length, 'potential entries');
             const configPath = path.join(this.platform.storagePath, 'config.json');
             const fileConfig = await this.readConfigFile(configPath);
-            const platformConfig = fileConfig.platforms.find((p) => p.platform === 'KasaPython');
-            if (!platformConfig) {
-                this.log.error('KasaPython configuration not found in config file.');
+            const platformSection = fileConfig.platforms.find((p) => p.platform === 'KasaPython');
+            if (!platformSection) {
+                this.log.error('KasaPython configuration missing in config file.');
             }
             else {
-                platformConfig.manualDevices = platformConfig.manualDevices || [];
+                platformSection.manualDevices = platformSection.manualDevices || [];
             }
             const eventSource = new EventSource(`${this.apiUrl}/stream`);
             eventSource.onmessage = (event) => {
                 try {
                     const data = JSON.parse(event.data);
-                    this.log.debug('Received SSE event data:', data);
+                    this.log.debug('SSE event data:', data);
                     if (data.status === 'discovery_complete') {
                         this.log.info('Device discovery complete.');
                         eventSource.close();
+                        return;
                     }
-                    else {
-                        if (!data.sys_info || !data.sys_info.host) {
-                            this.log.error('Invalid device data received:', data);
-                            return;
-                        }
-                        const device = {
-                            sys_info: data.sys_info,
-                            feature_info: data.feature_info,
-                            last_seen: new Date(),
-                            offline: false,
-                        };
-                        this.log.info(`Received device info for ${device.sys_info.host}`);
-                        this.processDevice(device, platformConfig);
-                        deviceEventEmitter.emit('deviceDiscovered', device);
+                    if (!data.sys_info || !data.sys_info.host) {
+                        this.log.error('Invalid device payload (missing sys_info.host):', data);
+                        return;
                     }
+                    const device = {
+                        sys_info: data.sys_info,
+                        feature_info: data.feature_info,
+                        last_seen: new Date(),
+                        offline: false,
+                    };
+                    this.log.info(`Discovered device: ${device.sys_info.alias} (${device.sys_info.host})`);
+                    this.updateDeviceAlias(device.sys_info);
+                    this.persistDiscoveredDevice(device, platformSection);
+                    deviceEventEmitter.emit('deviceDiscovered', device);
                 }
-                catch (err) {
-                    this.log.error('Error parsing SSE event data:', err);
+                catch (error) {
+                    this.log.error('Error parsing discovery SSE event:', error);
                 }
             };
-            eventSource.onerror = (err) => {
-                this.log.error('EventSource error:', err);
+            eventSource.onerror = (error) => {
+                this.log.error('Discovery EventSource error:', error);
                 eventSource.close();
             };
             await new Promise(resolve => setTimeout(resolve, 10000));
             eventSource.close();
-            if (platformConfig) {
-                platformConfig.manualDevices = platformConfig.manualDevices.filter((device) => {
-                    if (typeof device === 'string') {
+            if (platformSection) {
+                platformSection.manualDevices = platformSection.manualDevices.filter((entry) => {
+                    if (typeof entry === 'string') {
                         return true;
                     }
-                    else if (!device.host) {
-                        this.log.warn(`Removing manual device without host: ${JSON.stringify(device)}`);
+                    if (!entry.host) {
+                        this.log.warn(`Removing manual device without host: ${JSON.stringify(entry)}`);
                         return false;
                     }
                     return true;
                 });
-                if (this.shouldConvertManualDevices(platformConfig.manualDevices)) {
-                    platformConfig.manualDevices = this.convertManualDevices(platformConfig.manualDevices);
+                if (this.needsManualDevicesNormalization(platformSection.manualDevices)) {
+                    platformSection.manualDevices = this.normalizeManualDevices(platformSection.manualDevices);
                 }
                 await this.writeConfigFile(configPath, fileConfig);
-                this.platform.config = parseConfig(platformConfig);
+                this.platform.config = parseConfig(platformSection);
             }
         }
         catch (error) {
             this.handleAxiosError(error, 'discoverDevices');
         }
     }
-    processDevice(device, platformConfig) {
+    persistDiscoveredDevice(device, platformConfig) {
         try {
-            this.updateDeviceAlias(device);
             if (platformConfig.manualDevices) {
-                const existingDevice = platformConfig.manualDevices.find((d) => d.host === device.sys_info.host);
-                if (existingDevice) {
-                    existingDevice.host = device.sys_info.host;
-                    existingDevice.alias = device.sys_info.alias;
+                const existing = platformConfig.manualDevices.find((d) => d.host === device.sys_info.host);
+                if (existing) {
+                    existing.host = device.sys_info.host;
+                    existing.alias = device.sys_info.alias;
                 }
             }
         }
         catch (error) {
-            this.log.error(`Error processing device: ${String(error)}`);
+            this.log.error('Error persisting discovered device:', error);
         }
     }
-    shouldConvertManualDevices(manualDevices) {
-        return manualDevices.length > 0 &&
-            (typeof manualDevices[0] === 'string' ||
-                manualDevices.some((device) => typeof device !== 'string'));
-    }
     async getSysInfo(host) {
         try {
             const response = await axios.post(`${this.apiUrl}/getSysInfo`, { host });
@@ -198,28 +135,27 @@ export default class DeviceManager {
             throw error;
         }
     }
-    async controlDevice(host, feature, value, child_num) {
-        let action;
+    async controlDevice(host, feature, value, childNum) {
+        const action = this.mapFeatureToAction(feature, value);
+        await this.performDeviceAction(host, feature, action, value, childNum);
+    }
+    mapFeatureToAction(feature, value) {
         switch (feature) {
             case 'brightness':
             case 'color_temp':
             case 'fan_speed_level':
-                action = `set_${feature}`;
-                break;
+                return `set_${feature}`;
             case 'hsv':
-                action = 'set_hsv';
-                break;
+                return 'set_hsv';
             case 'state':
-                action = value ? 'turn_on' : 'turn_off';
-                break;
+                return value ? 'turn_on' : 'turn_off';
             default:
                 throw new Error(`Unsupported feature: ${feature}`);
         }
-        await this.performDeviceAction(host, feature, action, value, child_num);
     }
     async performDeviceAction(host, feature, action, value, childNumber) {
         const url = `${this.apiUrl}/controlDevice`;
-        const data = {
+        const payload = {
             host,
             feature,
             action,
@@ -227,45 +163,87 @@ export default class DeviceManager {
             ...(childNumber !== undefined && { child_num: childNumber }),
         };
         try {
-            const response = await axios.post(url, data);
+            const response = await axios.post(url, payload);
             if (response.data.status !== 'success') {
-                this.log.error(`Error performing action: ${response.data.message}`);
+                this.log.error(`Action failed (${feature}/${action}) on ${host}: ${response.data.message}`);
             }
         }
         catch (error) {
             this.handleAxiosError(error, 'controlDevice');
         }
     }
+    updateDeviceAlias(sysInfo) {
+        if (!sysInfo.alias) {
+            return;
+        }
+        const aliasPatterns = {
+            'TP-LINK_Power Strip_': 'Power Strip',
+            'TP-LINK_Smart Plug_': 'Smart Plug',
+            'TP-LINK_Smart Bulb_': 'Smart Bulb',
+        };
+        for (const [pattern, replacement] of Object.entries(aliasPatterns)) {
+            if (sysInfo.alias.includes(pattern)) {
+                sysInfo.alias = `${replacement} ${sysInfo.alias.slice(-4)}`;
+                break;
+            }
+        }
+    }
+    needsManualDevicesNormalization(manualDevices) {
+        return manualDevices.length > 0 &&
+            (typeof manualDevices[0] === 'string' ||
+                manualDevices.some(entry => typeof entry !== 'string'));
+    }
+    normalizeManualDevices(manualDevices) {
+        return manualDevices.map(entry => {
+            if (typeof entry === 'string') {
+                return { host: entry, alias: 'Will Be Filled By Plug-In Automatically' };
+            }
+            else if ('host' in entry && !('alias' in entry)) {
+                entry.alias = 'Will Be Filled By Plug-In Automatically';
+            }
+            else if ('breakoutChildDevices' in entry) {
+                delete entry.breakoutChildDevices;
+            }
+            return entry;
+        });
+    }
+    async readConfigFile(configPath) {
+        const data = await fs.readFile(configPath, 'utf8');
+        return JSON.parse(data);
+    }
+    async writeConfigFile(configPath, fileConfig) {
+        try {
+            await fs.writeFile(configPath, JSON.stringify(fileConfig, null, 2), 'utf8');
+        }
+        catch (error) {
+            this.log.error(`Error writing config file: ${String(error)}`);
+        }
+    }
     handleAxiosError(error, context) {
         if (axios.isAxiosError(error)) {
             if (error.response) {
                 const statusCode = error.response.status;
-                const errorMessage = error.response.data?.error || error.response.statusText || 'Unknown error';
-                if (statusCode === 500) {
-                    this.log.error(`Error during ${context}: ${errorMessage}`);
-                }
-                else {
-                    this.log.error(`Error during ${context}: ${statusCode} - ${errorMessage}`);
-                }
+                const message = error.response.data?.error || error.response.statusText || 'Unknown error';
+                this.log.error(`[${context}] HTTP ${statusCode}: ${message}`);
             }
             else if (error.code === 'ECONNREFUSED') {
-                this.log.error(`Connection refused during ${context} - device may be offline`);
+                this.log.error(`[${context}] Connection refused (device API offline?)`);
             }
             else if (error.code === 'ETIMEDOUT') {
-                this.log.error(`Connection timed out during ${context} - network may be down`);
+                this.log.error(`[${context}] Connection timed out (network issue)`);
             }
             else {
-                this.log.error(`Axios error during ${context}: ${error.message}`);
+                this.log.error(`[${context}] Axios error: ${error.message}`);
             }
         }
         else if (error instanceof Error) {
-            this.log.error(`Error during ${context}: ${error.message}`);
+            this.log.error(`[${context}] Error: ${error.message}`);
             if (error.stack) {
                 this.log.debug(error.stack);
             }
         }
         else {
-            this.log.error(`Unknown error during ${context}: ${JSON.stringify(error)}`);
+            this.log.error(`[${context}] Unknown error: ${JSON.stringify(error)}`);
         }
     }
 }