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

package/dist/devices/baseDevice.js

@@ -0,0 +1,361 @@
+import { EventEmitter } from 'node:events';
+import AccessoryInformation from '../accessoryInformation.js';
+import { deferAndCombine, prefixLogger } from '../utils.js';
+export default class HomeKitDevice {
+    platform;
+    kasaDevice;
+    category;
+    categoryName;
+    log;
+    deviceManager;
+    homebridgeAccessory;
+    isUpdating = false;
+    previousSnapshot;
+    pollingInterval;
+    updateEmitter = new EventEmitter();
+    static locks = new Map();
+    getSysInfoDeferred;
+    primaryDescriptors = [];
+    primaryService;
+    constructor(platform, kasaDevice, category, categoryName) {
+        this.platform = platform;
+        this.kasaDevice = kasaDevice;
+        this.category = category;
+        this.categoryName = categoryName;
+        this.deviceManager = platform.deviceManager;
+        this.log = prefixLogger(platform.log, `[${this.name}]`);
+        this.homebridgeAccessory = this.initializeAccessory();
+        this.homebridgeAccessory.on("identify" /* PlatformAccessoryEvent.IDENTIFY */, () => this.identify());
+        platform.periodicDeviceDiscoveryEmitter.on('periodicDeviceDiscoveryComplete', () => {
+            this.updateEmitter.emit('periodicDeviceDiscoveryComplete');
+        });
+        this.getSysInfoDeferred = deferAndCombine(this.fetchSysInfoInternal.bind(this), platform.config.advancedOptions.waitTimeUpdate);
+        try {
+            this.previousSnapshot = JSON.parse(JSON.stringify(this.kasaDevice));
+        }
+        catch {
+            this.previousSnapshot = { ...this.kasaDevice };
+        }
+    }
+    initializeAccessory() {
+        const uuid = this.platform.api.hap.uuid.generate(this.id);
+        const existingAccessory = this.platform.configuredAccessories.get(uuid);
+        let accessory;
+        if (!existingAccessory) {
+            this.log.debug(`Creating new Platform Accessory [${this.id}] [${uuid}] category: ${this.categoryName}`);
+            accessory = new this.platform.api.platformAccessory(this.name, uuid, this.category);
+            accessory.context.deviceId = this.id;
+            accessory.context.lastSeen = this.kasaDevice.last_seen;
+            accessory.context.offline = this.kasaDevice.offline;
+            this.platform.registerPlatformAccessory(accessory);
+        }
+        else {
+            accessory = existingAccessory;
+            this.updateAccessory(accessory);
+        }
+        const info = AccessoryInformation(this.platform.api.hap)(accessory, this);
+        if (!info) {
+            this.log.error('Could not retrieve default AccessoryInformation');
+        }
+        return accessory;
+    }
+    updateAccessory(accessory) {
+        accessory.displayName = this.name;
+        accessory.context.deviceId = this.id;
+        accessory.context.lastSeen = this.kasaDevice.last_seen;
+        accessory.context.offline = this.kasaDevice.offline;
+        this.platform.configuredAccessories.set(accessory.UUID, accessory);
+        this.platform.api.updatePlatformAccessories([accessory]);
+    }
+    get id() {
+        return this.kasaDevice.sys_info.device_id;
+    }
+    get name() {
+        return this.kasaDevice.sys_info.alias;
+    }
+    get manufacturer() {
+        return 'TP-Link';
+    }
+    get model() {
+        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;
+    }
+    extractChildIndex(child) {
+        const idString = String(child?.id ?? '');
+        const match = idString.match(/(\d{1,2})$/);
+        return match ? parseInt(match[1], 10) : 0;
+    }
+    makeLockKey(childId) {
+        return childId !== undefined && childId !== null
+            ? `${this.kasaDevice.sys_info.device_id}:${childId}`
+            : `${this.kasaDevice.sys_info.device_id}`;
+    }
+    async withLock(key, action) {
+        const previousPromise = HomeKitDevice.locks.get(key) ?? Promise.resolve();
+        const currentPromise = previousPromise.then(async () => {
+            try {
+                return await action();
+            }
+            finally {
+                if (HomeKitDevice.locks.get(key) === currentPromise) {
+                    HomeKitDevice.locks.delete(key);
+                }
+            }
+        });
+        HomeKitDevice.locks.set(key, currentPromise);
+        return currentPromise;
+    }
+    shouldSkipUpdate() {
+        return this.kasaDevice.offline || this.platform.isShuttingDown;
+    }
+    async waitForUpdateOrDiscovery() {
+        let discoveryFinished = false;
+        await Promise.race([
+            new Promise(resolve => this.updateEmitter.once('updateComplete', resolve)),
+            new Promise(resolve => {
+                this.updateEmitter.once('periodicDeviceDiscoveryComplete', () => {
+                    discoveryFinished = true;
+                    resolve();
+                });
+            }),
+        ]);
+        if (discoveryFinished && this.pollingInterval) {
+            await new Promise(r => setTimeout(r, this.platform.config.discoveryOptions.pollingInterval));
+        }
+    }
+    async getSysInfo() {
+        await this.getSysInfoDeferred();
+    }
+    async fetchSysInfoInternal() {
+        if (!this.deviceManager) {
+            this.log.warn('Device manager not available');
+            return;
+        }
+        const host = this.kasaDevice.sys_info?.host;
+        if (!host) {
+            this.log.warn('No host in sys_info');
+            return;
+        }
+        try {
+            this.previousSnapshot = JSON.parse(JSON.stringify(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: ${updatedSysInfo.alias ?? host}`);
+        }
+        catch (error) {
+            this.log.error('Error updating sys_info', error);
+        }
+    }
+    async refreshAndUpdateCharacteristics(forceUpdate) {
+        const deviceKey = this.kasaDevice.sys_info.device_id;
+        if (!forceUpdate && HomeKitDevice.locks.has(deviceKey)) {
+            this.log.debug('Skipping poll; active update lock');
+            return;
+        }
+        await this.withLock(deviceKey, async () => {
+            if (this.shouldSkipUpdate()) {
+                await this.stopPolling();
+                return;
+            }
+            if (this.isUpdating || this.platform.periodicDeviceDiscovering) {
+                await this.waitForUpdateOrDiscovery();
+            }
+            this.isUpdating = true;
+            try {
+                await this.getSysInfo();
+                await this.updateAllServicesAndCharacteristics(forceUpdate);
+            }
+            catch (error) {
+                this.log.error('Error during poll update:', error);
+                this.kasaDevice.offline = true;
+                await this.stopPolling();
+            }
+            finally {
+                this.isUpdating = false;
+                this.updateEmitter.emit('updateComplete');
+            }
+        });
+    }
+    async startPolling() {
+        if (this.shouldSkipUpdate()) {
+            await this.stopPolling();
+            return;
+        }
+        if (this.pollingInterval) {
+            clearInterval(this.pollingInterval);
+        }
+        this.pollingInterval = setInterval(() => void this.refreshAndUpdateCharacteristics(false), this.platform.config.discoveryOptions.pollingInterval);
+    }
+    async stopPolling() {
+        if (this.pollingInterval) {
+            clearInterval(this.pollingInterval);
+            this.pollingInterval = undefined;
+        }
+        if (this.isUpdating) {
+            await new Promise(resolve => {
+                this.isUpdating = false;
+                this.updateEmitter.once('updateComplete', resolve);
+            });
+        }
+    }
+    updateAfterPeriodicDiscovery() {
+        void this.refreshAndUpdateCharacteristics(true);
+    }
+    setupPrimaryService() {
+        const serviceType = this.getPrimaryServiceType();
+        if (!serviceType) {
+            return;
+        }
+        this.primaryService = this.homebridgeAccessory.getService(serviceType)
+            ?? this.addService(serviceType, this.name);
+        this.primaryDescriptors = this.buildPrimaryDescriptors();
+        for (const descriptor of this.primaryDescriptors) {
+            this.registerCharacteristic(this.primaryService, descriptor.type, () => this.genericOnGet(descriptor), descriptor.writable ? (value) => this.genericOnSet(descriptor, value) : undefined);
+        }
+    }
+    getPrimaryServiceType() {
+        return null;
+    }
+    buildPrimaryDescriptors() {
+        return [];
+    }
+    registerCharacteristic(service, type, onGet, onSet) {
+        const characteristic = service.getCharacteristic(type) ?? service.addCharacteristic(type);
+        characteristic.onGet(onGet);
+        if (onSet) {
+            characteristic.onSet(onSet);
+        }
+    }
+    buildDescriptorContext(child) {
+        return {
+            platform: this.platform,
+            device: this.kasaDevice.sys_info,
+            child,
+            alias: child ? child.alias : this.name,
+        };
+    }
+    updateDeviceField(key, value) {
+        this.kasaDevice.sys_info[key] = value;
+    }
+    async genericOnGet(descriptor) {
+        const context = this.buildDescriptorContext();
+        try {
+            const characteristic = this.primaryService.getCharacteristic(descriptor.type);
+            let value = characteristic.value;
+            if (value === undefined || value === null) {
+                value = descriptor.getInitial(context);
+                characteristic.updateValue(value);
+            }
+            return value;
+        }
+        catch (error) {
+            this.log.error(`OnGet error for ${descriptor.name ?? descriptor.type.UUID}`, error);
+            this.kasaDevice.offline = true;
+            await this.stopPolling();
+            return this.defaultValueForCharacteristic(descriptor.type);
+        }
+    }
+    async genericOnSet(descriptor, value) {
+        const context = this.buildDescriptorContext();
+        if (!descriptor.applySet) {
+            return;
+        }
+        await this.executeDescriptorSet(descriptor, value, context);
+    }
+    async executeDescriptorSet(descriptor, value, context, isGrouped = false) {
+        const lockKey = this.makeLockKey();
+        await this.withLock(lockKey, async () => {
+            if (this.shouldSkipUpdate()) {
+                return;
+            }
+            if (!this.deviceManager) {
+                throw new Error('Device manager undefined');
+            }
+            try {
+                this.isUpdating = true;
+                await descriptor.applySet(value, context);
+                const postSetValue = descriptor.getCurrent(context);
+                if (this.primaryService) {
+                    this.updateValue(this.primaryService, this.primaryService.getCharacteristic(descriptor.type), context.alias, postSetValue);
+                }
+                this.previousSnapshot = JSON.parse(JSON.stringify(this.kasaDevice));
+            }
+            catch (error) {
+                this.log.error(`OnSet error for ${descriptor.name ?? descriptor.type.UUID}`, error);
+                this.kasaDevice.offline = true;
+                await this.stopPolling();
+            }
+            finally {
+                if (!isGrouped) {
+                    this.isUpdating = false;
+                    this.updateEmitter.emit('updateComplete');
+                }
+            }
+        });
+    }
+    async updateAllServicesAndCharacteristics(forceUpdate) {
+        if (!this.primaryService) {
+            return;
+        }
+        for (const descriptor of this.primaryDescriptors) {
+            const context = this.buildDescriptorContext();
+            try {
+                const previousSysInfo = this.previousSnapshot?.sys_info;
+                const previousContext = {
+                    platform: this.platform,
+                    device: previousSysInfo || {},
+                    alias: this.name,
+                };
+                previousContext.device.__snapshot = true;
+                const previousValue = previousSysInfo ? descriptor.getCurrent(previousContext) : descriptor.getInitial(context);
+                const nextValue = descriptor.getCurrent(context);
+                this.updateIfChanged(this.primaryService, this.primaryService.getCharacteristic(descriptor.type), context.alias, previousValue, nextValue, descriptor.name, forceUpdate);
+            }
+            catch (error) {
+                this.log.error(`Update diff error for ${descriptor.name ?? descriptor.type.UUID}`, error);
+            }
+        }
+    }
+    defaultValueForCharacteristic(type) {
+        const C = this.platform.Characteristic;
+        const zeroish = new Set([
+            C.Brightness.UUID, C.ColorTemperature.UUID, C.Hue.UUID,
+            C.Saturation.UUID, C.RotationSpeed.UUID,
+        ]);
+        if (zeroish.has(type.UUID)) {
+            return 0;
+        }
+        if (type.UUID === C.Active.UUID) {
+            return C.Active.INACTIVE;
+        }
+        return false;
+    }
+    updateIfChanged(service, characteristic, alias, previousValue, nextValue, label, force = false) {
+        const needsInit = characteristic.value === undefined || characteristic.value === null;
+        if (force || needsInit || previousValue !== nextValue) {
+            if (label) {
+                this.log.debug(`[${alias}] Updating ${label}: ${previousValue} → ${nextValue}`);
+            }
+            this.updateValue(service, characteristic, alias, nextValue);
+        }
+    }
+    addService(serviceCtor, name, subType) {
+        const friendly = this.platform.getServiceName(serviceCtor);
+        this.log.debug(`Creating ${friendly} Service on ${name}${subType ? ` [${subType}]` : ''}`);
+        return this.homebridgeAccessory.addService(serviceCtor, name, subType ?? '');
+    }
+    updateValue(service, characteristic, deviceAlias, value) {
+        this.log.info(`Updating ${this.platform.lsc(service, characteristic)} on ${deviceAlias} to ${value}`);
+        characteristic.updateValue(value);
+    }
+}
+//# sourceMappingURL=baseDevice.js.map

package/dist/devices/baseDevice.js.map

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

package/dist/devices/baseParent.d.ts

@@ -0,0 +1,19 @@
+import type { WithUUID } from 'homebridge';
+import HomeKitDevice from './baseDevice.js';
+import type { ChildDevice, CharacteristicDescriptor } from './deviceTypes.js';
+export default abstract class HomeKitParentDevice extends HomeKitDevice {
+    private childDescriptorMap;
+    protected setupChildServices(): void;
+    private ensureChildService;
+    private childKey;
+    private resolveLiveChild;
+    protected updateChildField<K extends keyof ChildDevice>(childId: string, key: K, value: ChildDevice[K]): void;
+    private buildChildDescriptorContext;
+    private childOnGet;
+    private childOnSet;
+    private getChildService;
+    private executeChildDescriptorSet;
+    protected updateAllServicesAndCharacteristics(forceUpdate: boolean): Promise<void>;
+    protected abstract getChildServiceType(child: ChildDevice): WithUUID<typeof this.platform.Service>;
+    protected abstract buildChildDescriptors(child: ChildDevice): CharacteristicDescriptor[];
+}

package/dist/devices/baseParent.js

@@ -0,0 +1,150 @@
+import HomeKitDevice from './baseDevice.js';
+export default class HomeKitParentDevice extends HomeKitDevice {
+    childDescriptorMap = new Map();
+    setupChildServices() {
+        const children = this.kasaDevice.sys_info.children;
+        if (!Array.isArray(children)) {
+            return;
+        }
+        for (const child of children) {
+            this.ensureChildService(child);
+        }
+    }
+    ensureChildService(child) {
+        const serviceType = this.getChildServiceType(child);
+        const childIndex = this.extractChildIndex(child);
+        const subType = `child-${childIndex + 1}`;
+        let service = this.homebridgeAccessory.getServiceById(serviceType, subType);
+        if (!service) {
+            service = this.addService(serviceType, child.alias, subType);
+        }
+        const descriptors = this.buildChildDescriptors(child);
+        this.childDescriptorMap.set(this.childKey(child), descriptors);
+        for (const descriptor of descriptors) {
+            const onSet = descriptor.writable
+                ? (value) => this.childOnSet(service, child, descriptor, value)
+                : undefined;
+            this.registerCharacteristic(service, descriptor.type, () => this.childOnGet(service, child, descriptor), onSet);
+        }
+    }
+    childKey(child) {
+        return String(child.id ?? child.alias);
+    }
+    resolveLiveChild(snapshotChild) {
+        const id = snapshotChild?.id;
+        const children = this.kasaDevice.sys_info.children;
+        if (!Array.isArray(children)) {
+            return undefined;
+        }
+        return children.find(c => c.id === id);
+    }
+    updateChildField(childId, key, value) {
+        const children = this.kasaDevice.sys_info.children;
+        if (!Array.isArray(children)) {
+            return;
+        }
+        const idx = children.findIndex(c => c.id === childId);
+        if (idx >= 0) {
+            children[idx][key] = value;
+        }
+    }
+    buildChildDescriptorContext(child) {
+        const live = this.resolveLiveChild(child) ?? child;
+        return this.buildDescriptorContext(live);
+    }
+    async childOnGet(service, child, descriptor) {
+        const context = this.buildChildDescriptorContext(child);
+        try {
+            let value = service.getCharacteristic(descriptor.type).value;
+            if (value === undefined || value === null) {
+                value = descriptor.getInitial(context);
+                service.getCharacteristic(descriptor.type).updateValue(value);
+            }
+            return value;
+        }
+        catch (error) {
+            this.log.error(`Child OnGet error (${child.alias}) ${descriptor.name}`, error);
+            this.kasaDevice.offline = true;
+            await this.stopPolling();
+            return this.defaultValueForCharacteristic(descriptor.type);
+        }
+    }
+    async childOnSet(service, child, descriptor, value) {
+        const context = this.buildChildDescriptorContext(child);
+        if (!descriptor.applySet) {
+            return;
+        }
+        await this.executeChildDescriptorSet(service, child, descriptor, value, context);
+    }
+    getChildService(child) {
+        const serviceType = this.getChildServiceType(child);
+        const childIndex = this.extractChildIndex(child);
+        return this.homebridgeAccessory.getServiceById(serviceType, `child-${childIndex + 1}`);
+    }
+    async executeChildDescriptorSet(service, child, descriptor, value, context, isGrouped = false) {
+        const lockKey = this.makeLockKey();
+        await this.withLock(lockKey, async () => {
+            if (this.shouldSkipUpdate()) {
+                return;
+            }
+            if (!this.deviceManager) {
+                throw new Error('Device manager undefined');
+            }
+            try {
+                this.isUpdating = true;
+                await descriptor.applySet(value, context);
+                const postSetValue = descriptor.getCurrent(context);
+                this.updateValue(service, service.getCharacteristic(descriptor.type), context.alias, postSetValue);
+                this.previousSnapshot = JSON.parse(JSON.stringify(this.kasaDevice));
+            }
+            catch (error) {
+                this.log.error(`Child OnSet error (${child.alias}) ${descriptor.name}`, error);
+                this.kasaDevice.offline = true;
+                await this.stopPolling();
+            }
+            finally {
+                if (!isGrouped) {
+                    this.isUpdating = false;
+                    this.updateEmitter.emit('updateComplete');
+                }
+            }
+        });
+    }
+    async updateAllServicesAndCharacteristics(forceUpdate) {
+        const children = this.kasaDevice.sys_info.children;
+        if (!Array.isArray(children)) {
+            return;
+        }
+        for (const child of children) {
+            const service = this.getChildService(child);
+            if (!service) {
+                continue;
+            }
+            const key = this.childKey(child);
+            const descriptors = this.childDescriptorMap.get(key);
+            if (!descriptors) {
+                continue;
+            }
+            for (const descriptor of descriptors) {
+                const context = this.buildChildDescriptorContext(child);
+                try {
+                    const previousChild = this.previousSnapshot?.sys_info.children?.find(c => c.id === child.id);
+                    const previousContext = {
+                        platform: this.platform,
+                        device: this.previousSnapshot?.sys_info ?? {},
+                        child: previousChild,
+                        alias: child.alias,
+                    };
+                    previousContext.device.__snapshot = true;
+                    const previousValue = previousChild ? descriptor.getCurrent(previousContext) : descriptor.getInitial(context);
+                    const nextValue = descriptor.getCurrent(context);
+                    this.updateIfChanged(service, service.getCharacteristic(descriptor.type), context.alias, previousValue, nextValue, descriptor.name, forceUpdate);
+                }
+                catch (error) {
+                    this.log.error(`Child update diff error (${child.alias}) ${descriptor.name}`, error);
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=baseParent.js.map

package/dist/devices/baseParent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"baseParent.js","sourceRoot":"","sources":["../../src/devices/baseParent.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAQ5C,MAAM,CAAC,OAAO,OAAgB,mBAAoB,SAAQ,aAAa;IAC7D,kBAAkB,GAA4C,IAAI,GAAG,EAAE,CAAC;IAEtE,kBAAkB;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,KAAkB;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,SAAS,UAAU,GAAG,CAAC,EAAE,CAAC;QAC1C,IAAI,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;QAC/D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ;gBAC/B,CAAC,CAAC,CAAC,KAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC;gBACrF,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,CAAC,sBAAsB,CAAC,OAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;QACpH,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,KAAkB;QACjC,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAEO,gBAAgB,CAAC,aAA0B;QACjD,MAAM,EAAE,GAAG,aAAa,EAAE,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAA8B,OAAe,EAAE,GAAM,EAAE,KAAqB;QACpG,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;QACtD,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;YACZ,QAAQ,CAAC,GAAG,CAAiB,CAAC,GAAG,CAAC,GAAG,KAA0B,CAAC;QACnE,CAAC;IACH,CAAC;IAEO,2BAA2B,CAAC,KAAkB;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;QACnD,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,KAAkB,EAAE,UAAoC;QACjG,MAAM,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC;YACH,IAAI,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;YAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC1C,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBACvC,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAC,KAAK,KAAK,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YAC/E,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;YAC/B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,6BAA6B,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,OAAgB,EAChB,KAAkB,EAClB,UAAoC,EACpC,KAA0B;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC;IAEO,eAAe,CAAC,KAAkB;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,OAAgB,EAChB,KAAkB,EAClB,UAAoC,EACpC,KAA0B,EAC1B,OAA0B,EAC1B,SAAS,GAAG,KAAK;QAEjB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACtC,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC;gBACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,MAAM,UAAU,CAAC,QAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAE3C,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAEpD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,YAAmC,CAAC,CAAC;gBAC1H,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAC,KAAK,KAAK,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC/E,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC/B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3B,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;oBACxB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,mCAAmC,CAAC,WAAoB;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,SAAS;YACX,CAAC;YACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;gBACxD,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC7F,MAAM,eAAe,GAAsB;wBACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,MAAM,EAAG,IAAI,CAAC,gBAAgB,EAAE,QAAoB,IAAI,EAAa;wBACrE,KAAK,EAAE,aAAa;wBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;qBACnB,CAAC;oBACD,eAAe,CAAC,MAAkB,CAAC,UAAU,GAAG,IAAI,CAAC;oBAEtD,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC9G,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBACjD,IAAI,CAAC,eAAe,CAClB,OAAO,EACP,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAC1C,OAAO,CAAC,KAAK,EACb,aAAoC,EACpC,SAAgC,EAChC,UAAU,CAAC,IAAI,EACf,WAAW,CACZ,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,KAAK,KAAK,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;gBACvF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CAIF"}

package/dist/devices/create.d.ts

@@ -1,4 +1,4 @@
-import HomeKitDevice from './index.js';
+import HomeKitDevice from './baseDevice.js';
+import type { KasaDevice } from './deviceTypes.js';
 import type KasaPythonPlatform from '../platform.js';
-import type { KasaDevice } from './kasaDevices.js';
-export default function create(platform: KasaPythonPlatform, kasaDevice: KasaDevice): Promise<HomeKitDevice | undefined>;
+export default function createDevice(platform: KasaPythonPlatform, kasaDevice: KasaDevice): Promise<HomeKitDevice | undefined>;

package/dist/devices/create.js

@@ -1,9 +1,9 @@
+import { LightBulbs, Plugs, PowerStrips, Switches } from './deviceTypes.js';
 import HomeKitDeviceLightBulb from './homekitLightBulb.js';
 import HomeKitDevicePlug from './homekitPlug.js';
 import HomeKitDevicePowerStrip from './homekitPowerStrip.js';
 import HomeKitDeviceSwitch from './homekitSwitch.js';
 import HomeKitDeviceSwitchWithChildren from './homekitSwitchWithChildren.js';
-import { LightBulbs, Plugs, PowerStrips, Switches } from './kasaDevices.js';
 function isLightBulb(device) {
     return LightBulbs.includes(device.sys_info.model);
 }
@@ -16,46 +16,40 @@ function isPowerStrip(device) {
 function isSwitch(device) {
     return Switches.includes(device.sys_info.model);
 }
-export default async function create(platform, kasaDevice) {
-    let homeKitDevice;
+export default async function createDevice(platform, kasaDevice) {
+    let instance;
     if (isLightBulb(kasaDevice)) {
-        const lightBulb = kasaDevice;
-        platform.log.debug('HomeKit device is a LightBulb:', lightBulb.sys_info.model);
-        homeKitDevice = new HomeKitDeviceLightBulb(platform, lightBulb);
+        platform.log.debug('Device classified as LightBulb:', kasaDevice.sys_info.model);
+        instance = new HomeKitDeviceLightBulb(platform, kasaDevice);
     }
     else if (isPlug(kasaDevice)) {
-        const plug = kasaDevice;
-        platform.log.debug('HomeKit device is a Plug:', plug.sys_info.model);
-        homeKitDevice = new HomeKitDevicePlug(platform, plug);
+        platform.log.debug('Device classified as Plug:', kasaDevice.sys_info.model);
+        instance = new HomeKitDevicePlug(platform, kasaDevice);
     }
     else if (isPowerStrip(kasaDevice)) {
-        const powerStrip = kasaDevice;
-        platform.log.debug('HomeKit device is a PowerStrip:', powerStrip.sys_info.model);
-        homeKitDevice = new HomeKitDevicePowerStrip(platform, powerStrip);
+        platform.log.debug('Device classified as PowerStrip:', kasaDevice.sys_info.model);
+        instance = new HomeKitDevicePowerStrip(platform, kasaDevice);
     }
     else if (isSwitch(kasaDevice)) {
-        const switchDevice = kasaDevice;
-        platform.log.debug('HomeKit device is a Switch:', switchDevice.sys_info.model);
-        if (switchDevice.sys_info.child_num > 0) {
-            homeKitDevice = new HomeKitDeviceSwitchWithChildren(platform, switchDevice);
+        platform.log.debug('Device classified as Switch:', kasaDevice.sys_info.model);
+        if (kasaDevice.sys_info.child_num > 0) {
+            instance = new HomeKitDeviceSwitchWithChildren(platform, kasaDevice);
         }
         else {
-            homeKitDevice = new HomeKitDeviceSwitch(platform, switchDevice);
+            instance = new HomeKitDeviceSwitch(platform, kasaDevice);
         }
     }
     else {
-        platform.log.error('Unknown device type:', kasaDevice);
+        platform.log.error('Unknown device type; skipping:', kasaDevice.sys_info.model);
         return undefined;
     }
-    if (homeKitDevice) {
-        try {
-            await homeKitDevice.initialize();
-        }
-        catch (error) {
-            platform.log.error(`Error initializing device [${kasaDevice.sys_info.device_id}]:`, error);
-            return undefined;
-        }
+    try {
+        await instance.initialize();
+    }
+    catch (error) {
+        platform.log.error(`Error initializing device [${kasaDevice.sys_info.device_id}]:`, error);
+        return undefined;
     }
-    return homeKitDevice;
+    return instance;
 }
 //# sourceMappingURL=create.js.map