homebridge-kasa-python 1.0.2 → 2.0.0

package/dist/devices/homekitPowerstrip.d.ts

@@ -1,23 +1,17 @@
-import type { PlatformAccessory } from 'homebridge';
 import HomekitDevice from './index.js';
-import { KasaPythonConfig } from '../config.js';
-import DeviceManager from './deviceManager.js';
 import type KasaPythonPlatform from '../platform.js';
-import type { KasaPythonAccessoryContext } from '../platform.js';
-import type { DeviceConfig, Powerstrip } from './kasaDevices.js';
+import type { Powerstrip } from './kasaDevices.js';
 export default class HomeKitDevicePowerStrip extends HomekitDevice {
-    readonly config: KasaPythonConfig;
-    readonly kasaDevice: Powerstrip;
-    readonly deviceConfig: DeviceConfig;
-    constructor(platform: KasaPythonPlatform, config: KasaPythonConfig, homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext> | undefined, kasaDevice: Powerstrip, deviceConfig: DeviceConfig, deviceManager?: DeviceManager);
-    /**
-     * Aggregates getSysInfo requests
-     *
-     * @private
-     */
+    protected kasaDevice: Powerstrip;
     private getSysInfo;
-    private addAndConfigureOutletService;
-    private addOnCharacteristic;
-    private addOutletInUseCharacteristic;
+    private previousKasaDevice;
+    private isUpdating;
+    constructor(platform: KasaPythonPlatform, kasaDevice: Powerstrip);
+    private addOutletService;
+    private addCharacteristic;
+    private handleOnGet;
+    private handleOnSet;
+    private updateState;
+    private startPolling;
     identify(): void;
 }

package/dist/devices/homekitPowerstrip.js

@@ -1,100 +1,133 @@
 import HomekitDevice from './index.js';
 import { deferAndCombine, getOrAddCharacteristic } from '../utils.js';
 export default class HomeKitDevicePowerStrip extends HomekitDevice {
-    config;
     kasaDevice;
-    deviceConfig;
-    constructor(platform, config, homebridgeAccessory, kasaDevice, deviceConfig, deviceManager) {
-        super(platform, config, homebridgeAccessory, kasaDevice, 7 /* Categories.OUTLET */, deviceConfig, deviceManager);
-        this.config = config;
+    getSysInfo;
+    previousKasaDevice;
+    isUpdating = false;
+    constructor(platform, kasaDevice) {
+        super(platform, kasaDevice, 7 /* Categories.OUTLET */);
         this.kasaDevice = kasaDevice;
-        this.deviceConfig = deviceConfig;
         this.kasaDevice.sys_info.children.forEach((child, index) => {
-            this.addAndConfigureOutletService(child, index);
+            this.addOutletService(child, index);
         });
         this.getSysInfo = deferAndCombine(async (requestCount) => {
             this.log.debug(`executing deferred getSysInfo count: ${requestCount}`);
-            return Promise.resolve(await this.deviceManager.getSysInfo(this));
+            if (this.deviceManager) {
+                const newKasaDevice = await this.deviceManager.getSysInfo(this);
+                this.previousKasaDevice = this.kasaDevice;
+                this.kasaDevice = newKasaDevice;
+                return this.kasaDevice;
+            }
+            return undefined;
         }, platform.config.waitTimeUpdate);
+        this.startPolling();
     }
-    /**
-     * Aggregates getSysInfo requests
-     *
-     * @private
-     */
-    getSysInfo;
-    addAndConfigureOutletService(child, index) {
+    addOutletService(child, index) {
         const { Outlet } = this.platform.Service;
         const outletService = this.homebridgeAccessory.getServiceById(Outlet, `outlet-${index + 1}`) ??
             this.addService(Outlet, child.alias, `outlet-${index + 1}`);
-        this.addOnCharacteristic(outletService, child);
-        this.addOutletInUseCharacteristic(outletService, child);
+        this.addCharacteristic(outletService, this.platform.Characteristic.On, child);
+        this.addCharacteristic(outletService, this.platform.Characteristic.OutletInUse, child);
         return outletService;
     }
-    addOnCharacteristic(outletService, childDevice) {
-        const onCharacteristic = getOrAddCharacteristic(outletService, this.platform.Characteristic.On);
-        onCharacteristic
-            .onGet(async () => {
-            const device = await this.getSysInfo().catch(this.logRejection.bind(this));
-            if (device) {
-                const childState = device.sys_info.children?.find((child) => child.id === childDevice.id)?.state;
-                this.log.debug(`Current State of On is: ${childState === 1 ? true : false} for ${childDevice.alias}`);
-                return childState ?? 0;
+    addCharacteristic(service, characteristicType, child) {
+        const characteristic = getOrAddCharacteristic(service, characteristicType);
+        characteristic.onGet(this.handleOnGet.bind(this, child, characteristicType));
+        if (characteristicType === this.platform.Characteristic.On) {
+            characteristic.onSet(this.handleOnSet.bind(this, child));
+        }
+        return service;
+    }
+    async handleOnGet(child, characteristicType) {
+        try {
+            const childInfo = this.kasaDevice.sys_info.children.find((c) => c.id === child.id);
+            if (!childInfo) {
+                this.log.warn(`Child with id ${child.id} not found`);
+                return 0;
             }
-            return 0;
-        })
-            .onSet(async (value) => {
-            this.log.info(`Setting On to: ${value} for ${childDevice.alias}`);
-            const childNumber = (parseInt(childDevice.id.replace(this.id, ''), 10));
-            if (typeof value === 'boolean' && value === true) {
-                this.deviceManager.turnOnChild(this, childNumber).catch(this.logRejection.bind(this));
-                return;
+            const stateValue = childInfo.state === 1;
+            const characteristicName = this.platform.getCharacteristicName(characteristicType);
+            this.log.debug(`Current State of ${characteristicName} is: ${stateValue} for ${child.alias}`);
+            return childInfo.state ?? 0;
+        }
+        catch (error) {
+            this.log.error('Error getting device state:', error);
+        }
+        return 0;
+    }
+    async handleOnSet(child, value) {
+        this.log.info(`Setting On to: ${value} for ${child.alias}`);
+        if (typeof value === 'boolean') {
+            if (this.deviceManager) {
+                const childNumber = parseInt(child.id.slice(-1), 10);
+                try {
+                    this.isUpdating = true;
+                    await this.deviceManager.toggleDevice(this, value, childNumber);
+                    const kasaChild = this.kasaDevice.sys_info.children.find((c) => c.id === child.id);
+                    if (kasaChild) {
+                        kasaChild.state = value ? 1 : 0;
+                    }
+                    this.previousKasaDevice = this.kasaDevice;
+                    const service = this.homebridgeAccessory.getServiceById(this.platform.Service.Outlet, `outlet-${childNumber + 1}`);
+                    if (service) {
+                        const onCharacteristic = service.getCharacteristic(this.platform.Characteristic.On);
+                        const outletInUseCharacteristic = service.getCharacteristic(this.platform.Characteristic.OutletInUse);
+                        this.updateValue(service, onCharacteristic, value);
+                        this.updateValue(service, outletInUseCharacteristic, value);
+                    }
+                    return;
+                }
+                catch (error) {
+                    this.logRejection(error);
+                }
+                finally {
+                    this.isUpdating = false;
+                }
             }
-            else if (typeof value === 'boolean' && value === false) {
-                this.deviceManager.turnOffChild(this, childNumber).catch(this.logRejection.bind(this));
-                return;
+            else {
+                throw new Error('Device manager is undefined.');
             }
+        }
+        else {
             this.log.warn('setValue: Invalid On:', value);
             throw new Error(`setValue: Invalid On: ${value}`);
-        });
-        let oldChildState = childDevice.state;
-        setInterval(async () => {
-            const device = await this.getSysInfo().catch(this.logRejection.bind(this));
-            let newChildState;
-            if (device) {
-                newChildState = device.sys_info.children?.find((child) => child.id === childDevice.id)?.state;
-            }
-            if (newChildState !== undefined && newChildState !== oldChildState) {
-                this.updateChildValue(outletService, onCharacteristic, newChildState, childDevice.alias);
-                oldChildState = newChildState;
-            }
-        }, this.config.discoveryOptions.pollingInterval);
-        return outletService;
+        }
     }
-    addOutletInUseCharacteristic(outletService, childDevice) {
-        const outletInUseCharacteristic = getOrAddCharacteristic(outletService, this.platform.Characteristic.OutletInUse);
-        outletInUseCharacteristic.onGet(async () => {
-            const device = await this.getSysInfo().catch(this.logRejection.bind(this));
-            if (device) {
-                const childState = device.sys_info.children?.find((child) => child.id === childDevice.id)?.state;
-                this.log.debug(`Current State of Outlet In Use is: ${childState === 1 ? true : false} for ${childDevice.alias}`);
-                return childState ?? 0;
-            }
-            return 0;
-        });
-        let oldChildState = childDevice.state;
-        setInterval(async () => {
-            const device = await this.getSysInfo().catch(this.logRejection.bind(this));
-            let newChildState;
+    async updateState() {
+        if (this.isUpdating) {
+            return;
+        }
+        this.isUpdating = true;
+        try {
+            const device = await this.getSysInfo();
             if (device) {
-                newChildState = device.sys_info.children?.find((child) => child.id === childDevice.id)?.state;
-            }
-            if (newChildState !== undefined && newChildState !== oldChildState) {
-                this.updateChildValue(outletService, outletInUseCharacteristic, newChildState, childDevice.alias);
-                oldChildState = newChildState;
+                device.sys_info.children.forEach(async (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 previousKasaChild = this.previousKasaDevice.sys_info.children.find(c => c.id === child.id);
+                        const kasaChild = this.kasaDevice.sys_info.children.find(c => c.id === child.id);
+                        if (previousKasaChild && kasaChild && previousKasaChild.state !== child.state) {
+                            kasaChild.state = child.state;
+                            const onCharacteristic = service.getCharacteristic(this.platform.Characteristic.On);
+                            const outletInUseCharacteristic = service.getCharacteristic(this.platform.Characteristic.OutletInUse);
+                            this.updateValue(service, onCharacteristic, child.state === 1, child.alias);
+                            this.updateValue(service, outletInUseCharacteristic, child.state === 1, child.alias);
+                        }
+                    }
+                });
             }
-        }, this.config.discoveryOptions.pollingInterval);
-        return outletService;
+        }
+        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":"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"}
+{"version":3,"file":"homekitPowerstrip.js","sourceRoot":"","sources":["../../src/devices/homekitPowerstrip.ts"],"names":[],"mappings":"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"}

package/dist/devices/index.d.ts

@@ -1,36 +1,29 @@
-import type { Categories, Characteristic, CharacteristicValue, HapStatusError, Logger, Nullable, PlatformAccessory, Service, WithUUID } from 'homebridge';
-import type { KasaPythonConfig } from '../config.js';
+import type { Categories, Characteristic, CharacteristicValue, HapStatusError, Logger, Nullable, PlatformAccessory, Service } from 'homebridge';
 import DeviceManager from './deviceManager.js';
 import type KasaPythonPlatform from '../platform.js';
+import type { DeviceConfig, KasaDevice } from './kasaDevices.js';
 import type { KasaPythonAccessoryContext } from '../platform.js';
-import type { KasaDevice } from '../utils.js';
-import type { DeviceConfig } from './kasaDevices.js';
 export default abstract class HomekitDevice {
     readonly platform: KasaPythonPlatform;
-    readonly config: KasaPythonConfig;
-    readonly kasaDevice: KasaDevice;
+    protected kasaDevice: KasaDevice;
     readonly category: Categories;
     readonly log: Logger;
-    protected deviceManager: DeviceManager;
-    homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext>;
+    readonly categoryName: string;
     readonly deviceConfig: DeviceConfig;
-    private lsc;
-    /**
-     * Creates an instance of HomeKitDevice.
-     */
-    constructor(platform: KasaPythonPlatform, config: KasaPythonConfig, homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext> | undefined, kasaDevice: KasaDevice, category: Categories, deviceConfig: DeviceConfig, deviceManager?: DeviceManager);
+    protected deviceManager: DeviceManager | undefined;
+    homebridgeAccessory: PlatformAccessory<KasaPythonAccessoryContext>;
+    constructor(platform: KasaPythonPlatform, kasaDevice: KasaDevice, category: Categories);
+    private initializeAccessory;
+    private updateAccessory;
+    private correctAccessoryProperty;
     get id(): string;
     get name(): string;
     get manufacturer(): string;
     get model(): string;
     get serialNumber(): string;
     get firmwareRevision(): string;
-    get hardwareRevision(): string;
     abstract identify(): void;
-    updateValue(service: Service, characteristic: Characteristic, value: Nullable<CharacteristicValue> | Error | HapStatusError): void;
-    updateChildValue(service: Service, characteristic: Characteristic, value: Nullable<CharacteristicValue> | Error | HapStatusError, childDeviceAlias: string): void;
-    addService(serviceConstructor: typeof this.platform.Service.Outlet | typeof this.platform.Service.Lightbulb, name: string, subType?: string): Service;
+    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 removeServiceIfExists(service: WithUUID<typeof Service>): void;
-    protected removeCharacteristicIfExists(service: Service, characteristic: WithUUID<new () => Characteristic>): void;
 }

package/dist/devices/index.js

@@ -1,66 +1,59 @@
-import chalk from 'chalk';
 import AccessoryInformation from '../accessoryInformation.js';
-import DeviceManager from './deviceManager.js';
 import { prefixLogger } from '../utils.js';
 export default class HomekitDevice {
     platform;
-    config;
     kasaDevice;
     category;
     log;
+    categoryName;
+    deviceConfig;
     deviceManager;
     homebridgeAccessory;
-    deviceConfig;
-    lsc;
-    /**
-     * Creates an instance of HomeKitDevice.
-     */
-    constructor(platform, config, homebridgeAccessory, kasaDevice, category, deviceConfig, deviceManager) {
+    constructor(platform, kasaDevice, category) {
         this.platform = platform;
-        this.config = config;
         this.kasaDevice = kasaDevice;
         this.category = category;
-        this.deviceConfig = deviceConfig;
-        this.deviceManager = deviceManager ? deviceManager : new DeviceManager(platform);
-        this.log = prefixLogger(platform.log, () => `${chalk.blue(`[${this.name}]`)}`);
-        this.lsc = this.platform.lsc.bind(this.platform);
-        const categoryName = platform.getCategoryName(category) ?? '';
-        if (homebridgeAccessory === null || homebridgeAccessory === undefined) {
-            const uuid = platform.api.hap.uuid.generate(this.id);
-            this.log.debug(`Creating new Accessory [${this.id}] [${uuid}] category: ${categoryName}`);
-            this.homebridgeAccessory = new platform.api.platformAccessory(this.name, uuid, category);
-            this.homebridgeAccessory.context.deviceId = this.id;
-            this.platform.registerPlatformAccessory(this.homebridgeAccessory);
+        this.deviceConfig = kasaDevice.device_config;
+        this.deviceManager = platform.deviceManager;
+        this.log = prefixLogger(platform.log, `[${this.name}]`);
+        this.categoryName = this.platform.getCategoryName(this.category);
+        this.homebridgeAccessory = this.initializeAccessory();
+        this.homebridgeAccessory.on("identify" /* PlatformAccessoryEvent.IDENTIFY */, () => this.identify());
+    }
+    initializeAccessory() {
+        const uuid = this.platform.api.hap.uuid.generate(this.id);
+        const homebridgeAccessory = this.platform.configuredAccessories.get(uuid);
+        let accessory;
+        if (!homebridgeAccessory) {
+            this.log.debug(`Creating new Accessory [${this.id}] [${uuid}] category: ${this.categoryName}`);
+            accessory = new this.platform.api.platformAccessory(this.name, uuid, this.category);
+            accessory.context.deviceId = this.id;
+            this.platform.registerPlatformAccessory(accessory);
         }
         else {
-            this.homebridgeAccessory = homebridgeAccessory;
-            this.log.debug(`Existing Accessory found [${homebridgeAccessory.context.deviceId}] [${homebridgeAccessory.UUID}] category: ${categoryName}`);
-            this.homebridgeAccessory.displayName = this.name;
-            if (this.homebridgeAccessory.category !== category) {
-                this.log.warn(`Correcting Accessory Category from: ${platform.getCategoryName(this.homebridgeAccessory.category)} to: ${categoryName}`);
-                this.homebridgeAccessory.category = category;
-            }
-            this.homebridgeAccessory.context.deviceId = this.id;
-            this.platform.api.updatePlatformAccessories([this.homebridgeAccessory]);
+            this.log.debug(`Existing Accessory found [${homebridgeAccessory.context.deviceId}] ` +
+                `[${homebridgeAccessory.UUID}] category: ${this.platform.getCategoryName(homebridgeAccessory.category)}`);
+            accessory = homebridgeAccessory;
+            this.updateAccessory(accessory);
         }
-        const accInfo = AccessoryInformation(platform.api.hap)(this.homebridgeAccessory, this);
-        if (accInfo === null) {
+        const accInfo = AccessoryInformation(this.platform.api.hap)(accessory, this);
+        if (!accInfo) {
             this.log.error('Could not retrieve default AccessoryInformation');
         }
-        // Remove Old Services
-        this.homebridgeAccessory.services.forEach((service) => {
-            if (service instanceof platform.Service.AccessoryInformation) {
-                return;
-            }
-            if (service instanceof platform.Service.Outlet) {
-                return;
-            }
-            this.log.warn(`Removing stale Service: ${this.lsc(service)} uuid:[%s] subtype:[%s]`, service.UUID, service.subtype || '');
-            this.homebridgeAccessory.removeService(service);
-        });
-        this.homebridgeAccessory.on("identify" /* PlatformAccessoryEvent.IDENTIFY */, () => {
-            this.identify();
-        });
+        return accessory;
+    }
+    updateAccessory(accessory) {
+        this.correctAccessoryProperty(accessory, 'displayName', this.name);
+        this.correctAccessoryProperty(accessory, 'category', this.category);
+        this.correctAccessoryProperty(accessory.context, 'deviceId', this.id);
+        this.platform.configuredAccessories.set(accessory.UUID, accessory);
+        this.platform.api.updatePlatformAccessories([accessory]);
+    }
+    correctAccessoryProperty(obj, key, expectedValue) {
+        if (obj[key] !== expectedValue) {
+            this.log.warn(`Correcting Accessory ${String(key)} from: ${String(obj[key])} to: ${String(expectedValue)}`);
+            obj[key] = expectedValue;
+        }
     }
     get id() {
         return this.kasaDevice.sys_info.deviceId;
@@ -75,23 +68,17 @@ export default class HomekitDevice {
         return this.kasaDevice.sys_info.model;
     }
     get serialNumber() {
-        return `${this.kasaDevice.sys_info.mac} ${this.kasaDevice.sys_info.deviceId}`;
+        return `${this.kasaDevice.sys_info.mac.replace(/:/g, '').slice(-4)}`;
     }
     get firmwareRevision() {
         return this.kasaDevice.sys_info.sw_ver;
     }
-    get hardwareRevision() {
-        return this.kasaDevice.sys_info.hw_ver;
-    }
-    updateValue(service, characteristic, value) {
-        this.log.debug(`Updating ${this.lsc(service, characteristic)} ${value}`);
+    updateValue(service, characteristic, value, childDeviceAlias) {
+        const logMessage = `Updating ${this.platform.lsc(service, characteristic)}` +
+            `${childDeviceAlias ? ` on ${childDeviceAlias}` : ''} to ${value}`;
+        this.log.debug(logMessage);
         characteristic.updateValue(value);
     }
-    updateChildValue(service, characteristic, value, childDeviceAlias) {
-        const homekitState = value === 1 ? true : false;
-        this.log.debug(`Updating ${this.lsc(service, characteristic)} on ${childDeviceAlias} to ${homekitState}`);
-        characteristic.updateValue(homekitState);
-    }
     addService(serviceConstructor, name, subType) {
         const serviceName = this.platform.getServiceName(serviceConstructor);
         this.log.debug(`Creating new ${serviceName} Service on ${name}${subType ? ` [${subType}]` : ''}`);
@@ -100,19 +87,5 @@ export default class HomekitDevice {
     logRejection(reason) {
         this.log.error(JSON.stringify(reason));
     }
-    removeServiceIfExists(service) {
-        const foundService = this.homebridgeAccessory.getService(service);
-        if (foundService !== null && foundService !== undefined) {
-            this.log.warn(`Removing stale Service: ${this.lsc(service, foundService)} uuid:[%s]`, foundService.UUID);
-            this.homebridgeAccessory.removeService(foundService);
-        }
-    }
-    removeCharacteristicIfExists(service, characteristic) {
-        if (service.testCharacteristic(characteristic)) {
-            const characteristicToRemove = service.getCharacteristic(characteristic);
-            this.log.warn(`Removing stale Characteristic: ${this.lsc(service, characteristicToRemove)} uuid:[%s]`, characteristicToRemove.UUID);
-            service.removeCharacteristic(characteristicToRemove);
-        }
-    }
 }
 //# 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":"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"}

package/dist/devices/kasaDevices.d.ts

@@ -1,7 +1,6 @@
+export type KasaDevice = Plug | Powerstrip;
 interface DeviceCommonInfo {
     alias: string;
-    children?: ChildPlug[];
-    device_id: string;
     host: string;
     is_off: boolean;
     is_on: boolean;
@@ -32,17 +31,17 @@ export interface DeviceConfig {
         device_family: string;
         encryption_type: string;
     };
-    uses_http: false;
+    uses_http: boolean;
 }
 export interface Plug extends DeviceCommonInfo {
-    children: ChildPlug[];
+    children?: ChildPlug[];
     device_config: DeviceConfig;
 }
 export interface Powerstrip extends DeviceCommonInfo {
-    device_config: DeviceConfig;
     sys_info: SysInfo & {
         children: ChildPlug[];
         child_num: number;
     };
+    device_config: DeviceConfig;
 }
 export {};