@fastybird/smart-panel-backend 0.1.0-alpha.6 → 0.3.0-alpha.0

package/dist/plugins/devices-zigbee2mqtt/models/config.model.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Zigbee2mqttConfigModel = exports.Z2mDiscoveryConfigModel = exports.Z2mTlsConfigModel = exports.Z2mMqttConfigModel = void 0;
+exports.Zigbee2mqttConfigModel = exports.Z2mWsConfigModel = exports.Z2mDiscoveryConfigModel = exports.Z2mTlsConfigModel = exports.Z2mMqttConfigModel = void 0;
 const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
 const swagger_1 = require("@nestjs/swagger");
@@ -43,10 +43,12 @@ __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.IsInt)(),
     (0, class_validator_1.Min)(1),
+    (0, class_validator_1.Max)(65535),
     (0, swagger_1.ApiProperty)({
         description: 'MQTT broker port',
         example: devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_PORT,
         minimum: 1,
+        maximum: 65535,
     }),
     __metadata("design:type", Number)
 ], Z2mMqttConfigModel.prototype, "port", void 0);
@@ -237,11 +239,92 @@ __decorate([
 exports.Z2mDiscoveryConfigModel = Z2mDiscoveryConfigModel = __decorate([
     (0, swagger_1.ApiSchema)({ name: 'DevicesZigbee2mqttPluginDataDiscoveryConfig' })
 ], Z2mDiscoveryConfigModel);
+let Z2mWsConfigModel = class Z2mWsConfigModel {
+    constructor() {
+        this.host = 'localhost';
+        this.port = devices_zigbee2mqtt_constants_1.DEFAULT_WS_PORT;
+        this.baseTopic = devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_BASE_TOPIC;
+        this.secure = false;
+        this.connectTimeout = devices_zigbee2mqtt_constants_1.DEFAULT_WS_CONNECT_TIMEOUT;
+        this.reconnectInterval = devices_zigbee2mqtt_constants_1.DEFAULT_WS_RECONNECT_INTERVAL;
+    }
+};
+exports.Z2mWsConfigModel = Z2mWsConfigModel;
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({
+        description: 'Zigbee2MQTT frontend hostname or IP address',
+        example: 'localhost',
+    }),
+    __metadata("design:type", String)
+], Z2mWsConfigModel.prototype, "host", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.Min)(1),
+    (0, class_validator_1.Max)(65535),
+    (0, swagger_1.ApiProperty)({
+        description: 'Zigbee2MQTT frontend port',
+        example: devices_zigbee2mqtt_constants_1.DEFAULT_WS_PORT,
+        minimum: 1,
+        maximum: 65535,
+    }),
+    __metadata("design:type", Number)
+], Z2mWsConfigModel.prototype, "port", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'base_topic' }),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({
+        name: 'base_topic',
+        description: 'Zigbee2MQTT base topic (used for message routing)',
+        example: devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_BASE_TOPIC,
+    }),
+    __metadata("design:type", String)
+], Z2mWsConfigModel.prototype, "baseTopic", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsBoolean)(),
+    (0, swagger_1.ApiProperty)({
+        description: 'Use secure WebSocket (wss://)',
+        example: false,
+    }),
+    __metadata("design:type", Boolean)
+], Z2mWsConfigModel.prototype, "secure", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'connect_timeout' }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.Min)(1000),
+    (0, swagger_1.ApiProperty)({
+        name: 'connect_timeout',
+        description: 'Connection timeout in milliseconds',
+        example: devices_zigbee2mqtt_constants_1.DEFAULT_WS_CONNECT_TIMEOUT,
+        minimum: 1000,
+    }),
+    __metadata("design:type", Number)
+], Z2mWsConfigModel.prototype, "connectTimeout", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'reconnect_interval' }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.Min)(1000),
+    (0, swagger_1.ApiProperty)({
+        name: 'reconnect_interval',
+        description: 'Reconnection interval in milliseconds',
+        example: devices_zigbee2mqtt_constants_1.DEFAULT_WS_RECONNECT_INTERVAL,
+        minimum: 1000,
+    }),
+    __metadata("design:type", Number)
+], Z2mWsConfigModel.prototype, "reconnectInterval", void 0);
+exports.Z2mWsConfigModel = Z2mWsConfigModel = __decorate([
+    (0, swagger_1.ApiSchema)({ name: 'DevicesZigbee2mqttPluginDataWsConfig' })
+], Z2mWsConfigModel);
 let Zigbee2mqttConfigModel = class Zigbee2mqttConfigModel extends config_model_1.PluginConfigModel {
     constructor() {
         super(...arguments);
         this.type = devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME;
+        this.connectionType = devices_zigbee2mqtt_constants_1.DEFAULT_CONNECTION_TYPE;
         this.mqtt = new Z2mMqttConfigModel();
+        this.ws = new Z2mWsConfigModel();
         this.tls = new Z2mTlsConfigModel();
         this.discovery = new Z2mDiscoveryConfigModel();
     }
@@ -256,22 +339,44 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], Zigbee2mqttConfigModel.prototype, "type", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'connection_type' }),
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsIn)(['mqtt', 'ws']),
+    (0, swagger_1.ApiProperty)({
+        name: 'connection_type',
+        description: 'Connection type: "mqtt" for MQTT broker or "ws" for direct WebSocket to Zigbee2MQTT frontend',
+        example: devices_zigbee2mqtt_constants_1.DEFAULT_CONNECTION_TYPE,
+        enum: ['mqtt', 'ws'],
+    }),
+    __metadata("design:type", String)
+], Zigbee2mqttConfigModel.prototype, "connectionType", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.ValidateNested)(),
     (0, class_transformer_1.Type)(() => Z2mMqttConfigModel),
     (0, swagger_1.ApiProperty)({
-        description: 'MQTT connection configuration',
+        description: 'MQTT connection configuration (used when connection_type is "mqtt")',
         type: () => Z2mMqttConfigModel,
     }),
     __metadata("design:type", Z2mMqttConfigModel)
 ], Zigbee2mqttConfigModel.prototype, "mqtt", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => Z2mWsConfigModel),
+    (0, swagger_1.ApiProperty)({
+        description: 'WebSocket connection configuration (used when connection_type is "ws")',
+        type: () => Z2mWsConfigModel,
+    }),
+    __metadata("design:type", Z2mWsConfigModel)
+], Zigbee2mqttConfigModel.prototype, "ws", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.ValidateNested)(),
     (0, class_transformer_1.Type)(() => Z2mTlsConfigModel),
     (0, swagger_1.ApiProperty)({
-        description: 'TLS/SSL configuration',
+        description: 'TLS/SSL configuration (used when connection_type is "mqtt")',
         type: () => Z2mTlsConfigModel,
     }),
     __metadata("design:type", Z2mTlsConfigModel)

package/dist/plugins/devices-zigbee2mqtt/models/config.model.js.map

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

package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.d.ts

@@ -2,24 +2,23 @@ import { IDevicePlatform, IDevicePropertyData } from '../../../modules/devices/p
 import { Zigbee2mqttChannelEntity, Zigbee2mqttChannelPropertyEntity, Zigbee2mqttDeviceEntity } from '../entities/devices-zigbee2mqtt.entity';
 import { ConfigDrivenConverter } from '../mappings/config-driven.converter';
 import { Z2mDeviceMapperService } from '../services/device-mapper.service';
-import { Z2mMqttClientAdapterService } from '../services/mqtt-client-adapter.service';
 import { Z2mVirtualPropertyService } from '../services/virtual-property.service';
+import { Zigbee2mqttService } from '../services/zigbee2mqtt.service';
 export type IZigbee2mqttDevicePropertyData = IDevicePropertyData & {
     device: Zigbee2mqttDeviceEntity;
     channel: Zigbee2mqttChannelEntity;
     property: Zigbee2mqttChannelPropertyEntity;
 };
 export declare class Zigbee2mqttDevicePlatform implements IDevicePlatform {
-    private readonly mqttAdapter;
+    private readonly zigbee2mqttService;
     private readonly virtualPropertyService;
     private readonly configDrivenConverter;
     private readonly deviceMapper;
     private readonly logger;
-    constructor(mqttAdapter: Z2mMqttClientAdapterService, virtualPropertyService: Z2mVirtualPropertyService, configDrivenConverter: ConfigDrivenConverter, deviceMapper: Z2mDeviceMapperService);
+    constructor(zigbee2mqttService: Zigbee2mqttService, virtualPropertyService: Z2mVirtualPropertyService, configDrivenConverter: ConfigDrivenConverter, deviceMapper: Z2mDeviceMapperService);
     getType(): string;
     process({ device, channel, property, value }: IZigbee2mqttDevicePropertyData): Promise<boolean>;
     processBatch(updates: Array<IZigbee2mqttDevicePropertyData>): Promise<boolean>;
     private executeCommand;
-    private coerceBoolean;
     private coerceNumber;
 }

package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.js

@@ -17,11 +17,11 @@ const devices_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constant
 const devices_zigbee2mqtt_entity_1 = require("../entities/devices-zigbee2mqtt.entity");
 const config_driven_converter_1 = require("../mappings/config-driven.converter");
 const device_mapper_service_1 = require("../services/device-mapper.service");
-const mqtt_client_adapter_service_1 = require("../services/mqtt-client-adapter.service");
 const virtual_property_service_1 = require("../services/virtual-property.service");
+const zigbee2mqtt_service_1 = require("../services/zigbee2mqtt.service");
 let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
-    constructor(mqttAdapter, virtualPropertyService, configDrivenConverter, deviceMapper) {
-        this.mqttAdapter = mqttAdapter;
+    constructor(zigbee2mqttService, virtualPropertyService, configDrivenConverter, deviceMapper) {
+        this.zigbee2mqttService = zigbee2mqttService;
         this.virtualPropertyService = virtualPropertyService;
         this.configDrivenConverter = configDrivenConverter;
         this.deviceMapper = deviceMapper;
@@ -37,8 +37,9 @@ let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
         if (updates.length === 0) {
             return true;
         }
-        if (!this.mqttAdapter.isConnected()) {
-            this.logger.warn('MQTT not connected, cannot send command');
+        const adapter = this.zigbee2mqttService.getActiveAdapter();
+        if (!adapter.isConnected()) {
+            this.logger.warn('Not connected to Zigbee2MQTT, cannot send command');
             return false;
         }
         const byDevice = new Map();
@@ -77,7 +78,7 @@ let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
             const friendlyName = device.identifier;
             for (const { channel, props } of channels.values()) {
                 try {
-                    const success = await this.executeCommand(device, channel, Array.from(props.values()), friendlyName);
+                    const success = await this.executeCommand(adapter, device, channel, Array.from(props.values()), friendlyName);
                     results.push(success);
                 }
                 catch (error) {
@@ -90,7 +91,7 @@ let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
         }
         return results.length > 0 && results.every((r) => r === true);
     }
-    async executeCommand(device, channel, propertyUpdates, friendlyName) {
+    async executeCommand(adapter, device, channel, propertyUpdates, friendlyName) {
         const payload = {};
         let colorHue;
         let colorSaturation;
@@ -160,24 +161,12 @@ let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
             return false;
         }
         this.logger.log(`Sending command to ${friendlyName}: ${JSON.stringify(payload)}`);
-        const success = await this.mqttAdapter.publishCommand(friendlyName, payload);
-        if (success) {
-        }
-        else {
+        const success = await adapter.publishCommand(friendlyName, payload);
+        if (!success) {
             this.logger.warn(`Failed to send command to ${friendlyName}`);
         }
         return success;
     }
-    coerceBoolean(value) {
-        if (typeof value === 'boolean') {
-            return value;
-        }
-        if (typeof value === 'number') {
-            return value !== 0;
-        }
-        const strValue = String(value).toLowerCase();
-        return strValue === 'true' || strValue === '1' || strValue === 'on';
-    }
     coerceNumber(value, min, max) {
         let numValue;
         if (typeof value === 'number') {
@@ -198,7 +187,7 @@ let Zigbee2mqttDevicePlatform = class Zigbee2mqttDevicePlatform {
 exports.Zigbee2mqttDevicePlatform = Zigbee2mqttDevicePlatform;
 exports.Zigbee2mqttDevicePlatform = Zigbee2mqttDevicePlatform = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [mqtt_client_adapter_service_1.Z2mMqttClientAdapterService,
+    __metadata("design:paramtypes", [zigbee2mqtt_service_1.Zigbee2mqttService,
         virtual_property_service_1.Z2mVirtualPropertyService,
         config_driven_converter_1.ConfigDrivenConverter,
         device_mapper_service_1.Z2mDeviceMapperService])

package/dist/plugins/devices-zigbee2mqtt/platforms/zigbee2mqtt.device.platform.js.map

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

package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.d.ts

@@ -0,0 +1,35 @@
+import { ExtensionLoggerService } from '../../../common/logger';
+import { Z2mAdapterCallbacks, Z2mMqttConfig, Z2mRegisteredDevice, Z2mSetPayload, Z2mWsConfig } from '../interfaces/zigbee2mqtt.interface';
+export declare abstract class Z2mBaseClientAdapter {
+    protected readonly logger: ExtensionLoggerService;
+    protected connected: boolean;
+    protected bridgeOnline: boolean;
+    protected reconnectTimer: NodeJS.Timeout | null;
+    protected configBaseTopic: string;
+    protected readonly deviceRegistry: Map<string, Z2mRegisteredDevice>;
+    protected readonly stateCache: Map<string, Record<string, unknown>>;
+    protected callbacks: Z2mAdapterCallbacks;
+    constructor(adapterName: string);
+    setCallbacks(callbacks: Z2mAdapterCallbacks): void;
+    get baseTopic(): string;
+    isConnected(): boolean;
+    isBridgeOnline(): boolean;
+    getRegisteredDevices(): Z2mRegisteredDevice[];
+    getDevice(friendlyName: string): Z2mRegisteredDevice | undefined;
+    getDeviceByIeeeAddress(ieeeAddress: string): Z2mRegisteredDevice | undefined;
+    getCachedState(friendlyName: string): Record<string, unknown>;
+    abstract connect(config: Z2mMqttConfig | Z2mWsConfig): Promise<void>;
+    abstract disconnect(): Promise<void>;
+    abstract publishCommand(friendlyName: string, payload: Z2mSetPayload): Promise<boolean>;
+    abstract requestState(friendlyName: string, properties?: string[]): Promise<boolean>;
+    protected handleMessage(topic: string, message: string, isRelative?: boolean): void;
+    protected handleBridgeMessage(subtopic: string | undefined, message: string): void;
+    protected handleBridgeStateMessage(message: string): void;
+    protected handleBridgeDevicesMessage(message: string): void;
+    protected requestMissingStates(): void;
+    protected handleBridgeEventMessage(message: string): void;
+    protected handleDeviceStateMessage(friendlyName: string, message: string): void;
+    protected handleDeviceAvailabilityMessage(friendlyName: string, message: string): void;
+    protected clearReconnectTimer(): void;
+    protected resetState(): void;
+}

package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.js

@@ -0,0 +1,265 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Z2mBaseClientAdapter = void 0;
+const logger_1 = require("../../../common/logger");
+const devices_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constants");
+class Z2mBaseClientAdapter {
+    constructor(adapterName) {
+        this.connected = false;
+        this.bridgeOnline = false;
+        this.reconnectTimer = null;
+        this.configBaseTopic = devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_BASE_TOPIC;
+        this.deviceRegistry = new Map();
+        this.stateCache = new Map();
+        this.callbacks = {};
+        this.logger = (0, logger_1.createExtensionLogger)(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME, adapterName);
+    }
+    setCallbacks(callbacks) {
+        this.callbacks = callbacks;
+    }
+    get baseTopic() {
+        return this.configBaseTopic;
+    }
+    isConnected() {
+        return this.connected;
+    }
+    isBridgeOnline() {
+        return this.bridgeOnline;
+    }
+    getRegisteredDevices() {
+        return Array.from(this.deviceRegistry.values());
+    }
+    getDevice(friendlyName) {
+        return this.deviceRegistry.get(friendlyName);
+    }
+    getDeviceByIeeeAddress(ieeeAddress) {
+        for (const device of this.deviceRegistry.values()) {
+            if (device.ieeeAddress === ieeeAddress) {
+                return device;
+            }
+        }
+        return undefined;
+    }
+    getCachedState(friendlyName) {
+        return this.stateCache.get(friendlyName) ?? {};
+    }
+    handleMessage(topic, message, isRelative = false) {
+        try {
+            const relativePath = isRelative ? topic : topic.replace(`${this.baseTopic}/`, '');
+            if (!relativePath) {
+                return;
+            }
+            const topicParts = relativePath.split('/');
+            if (this.deviceRegistry.has(relativePath)) {
+                this.handleDeviceStateMessage(relativePath, message);
+                return;
+            }
+            if (topicParts[0] === 'bridge') {
+                this.handleBridgeMessage(topicParts[1], message);
+                return;
+            }
+            const lastPart = topicParts[topicParts.length - 1];
+            const pathWithoutSuffix = topicParts.slice(0, -1).join('/');
+            if (lastPart === 'availability' && pathWithoutSuffix) {
+                this.handleDeviceAvailabilityMessage(pathWithoutSuffix, message);
+                return;
+            }
+            if (lastPart === 'set' || lastPart === 'get') {
+                return;
+            }
+            this.handleDeviceStateMessage(relativePath, message);
+        }
+        catch (error) {
+            this.logger.warn(`Failed to handle message on topic ${topic}`, {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    handleBridgeMessage(subtopic, message) {
+        switch (subtopic) {
+            case 'state':
+                this.handleBridgeStateMessage(message);
+                break;
+            case 'devices':
+                this.handleBridgeDevicesMessage(message);
+                break;
+            case 'event':
+                this.handleBridgeEventMessage(message);
+                break;
+            case 'groups':
+                this.logger.debug('Received bridge/groups message (not implemented)');
+                break;
+        }
+    }
+    handleBridgeStateMessage(message) {
+        try {
+            const state = JSON.parse(message);
+            const wasOnline = this.bridgeOnline;
+            this.bridgeOnline = state.state === 'online';
+            if (this.bridgeOnline && !wasOnline) {
+                this.logger.log('Zigbee2MQTT bridge is online');
+                void this.callbacks.onBridgeOnline?.();
+            }
+            else if (!this.bridgeOnline && wasOnline) {
+                this.logger.warn('Zigbee2MQTT bridge is offline');
+                void this.callbacks.onBridgeOffline?.();
+            }
+        }
+        catch (error) {
+            this.logger.warn('Failed to parse bridge/state message', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    handleBridgeDevicesMessage(message) {
+        try {
+            const devices = JSON.parse(message);
+            this.logger.log(`Received device registry with ${devices.length} devices`);
+            for (const device of devices) {
+                if (device.definition) {
+                    this.logger.debug(`Device ${device.friendly_name}: ${device.definition.exposes?.length ?? 0} exposes, ` +
+                        `types: ${device.definition.exposes?.map((e) => e.type).join(', ') ?? 'none'}`);
+                }
+            }
+            for (const device of devices) {
+                if (devices_zigbee2mqtt_constants_1.Z2M_IGNORED_DEVICE_TYPES.includes(device.type) ||
+                    !device.supported ||
+                    device.disabled) {
+                    continue;
+                }
+                const existing = this.deviceRegistry.get(device.friendly_name);
+                const cachedState = this.stateCache.get(device.friendly_name) ?? {};
+                const registeredDevice = {
+                    ieeeAddress: device.ieee_address,
+                    friendlyName: device.friendly_name,
+                    description: device.description,
+                    type: device.type,
+                    supported: device.supported,
+                    disabled: device.disabled,
+                    definition: device.definition,
+                    powerSource: device.power_source,
+                    modelId: device.model_id,
+                    available: existing?.available ?? true,
+                    lastSeen: existing?.lastSeen,
+                    currentState: { ...(existing?.currentState ?? {}), ...cachedState },
+                };
+                this.deviceRegistry.set(device.friendly_name, registeredDevice);
+                if (Object.keys(cachedState).length > 0) {
+                    this.logger.debug(`Applied cached state to "${device.friendly_name}": ${Object.keys(cachedState).join(', ')}`);
+                }
+            }
+            const currentFriendlyNames = new Set(devices.map((d) => d.friendly_name));
+            for (const friendlyName of this.deviceRegistry.keys()) {
+                if (!currentFriendlyNames.has(friendlyName)) {
+                    this.deviceRegistry.delete(friendlyName);
+                }
+            }
+            this.requestMissingStates();
+            const filteredDevices = devices.filter((d) => !devices_zigbee2mqtt_constants_1.Z2M_IGNORED_DEVICE_TYPES.includes(d.type) &&
+                d.supported &&
+                !d.disabled);
+            void this.callbacks.onDevicesReceived?.(filteredDevices);
+        }
+        catch (error) {
+            this.logger.error('Failed to parse bridge/devices message', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    requestMissingStates() {
+        for (const [friendlyName, device] of this.deviceRegistry.entries()) {
+            if (Object.keys(device.currentState).length === 0) {
+                this.logger.debug(`Requesting state for device without current state: ${friendlyName}`);
+                this.requestState(friendlyName).catch(() => {
+                });
+            }
+        }
+    }
+    handleBridgeEventMessage(message) {
+        try {
+            const event = JSON.parse(message);
+            switch (event.type) {
+                case 'device_joined':
+                case 'device_announce':
+                    this.logger.log(`Device joined: ${event.data.friendly_name}`);
+                    void this.callbacks.onDeviceJoined?.(event.data.ieee_address ?? '', event.data.friendly_name ?? '');
+                    break;
+                case 'device_leave':
+                    this.logger.log(`Device left: ${event.data.friendly_name}`);
+                    if (event.data.friendly_name) {
+                        this.deviceRegistry.delete(event.data.friendly_name);
+                    }
+                    void this.callbacks.onDeviceLeft?.(event.data.ieee_address ?? '', event.data.friendly_name ?? '');
+                    break;
+                case 'device_interview':
+                    this.logger.debug(`Device interview: ${event.data.friendly_name} - ${event.data.status}`);
+                    break;
+            }
+        }
+        catch (error) {
+            this.logger.warn('Failed to parse bridge/event message', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    handleDeviceStateMessage(friendlyName, message) {
+        try {
+            const state = JSON.parse(message);
+            this.logger.debug(`Received state for "${friendlyName}": ${Object.keys(state).join(', ')}`);
+            const existingCachedState = this.stateCache.get(friendlyName) ?? {};
+            this.stateCache.set(friendlyName, { ...existingCachedState, ...state });
+            const device = this.deviceRegistry.get(friendlyName);
+            if (device) {
+                device.currentState = { ...device.currentState, ...state };
+                device.lastSeen = new Date();
+                this.logger.debug(`Updated registry and cache for "${friendlyName}"`);
+            }
+            else {
+                this.logger.debug(`Updated cache for "${friendlyName}" (not yet in registry)`);
+            }
+            void this.callbacks.onDeviceStateChanged?.(friendlyName, state);
+        }
+        catch (error) {
+            this.logger.warn(`Failed to parse state for device ${friendlyName}`, {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    handleDeviceAvailabilityMessage(friendlyName, message) {
+        this.logger.debug(`Received availability for "${friendlyName}": ${message}`);
+        try {
+            let available;
+            try {
+                const availability = JSON.parse(message);
+                available = availability.state === 'online';
+            }
+            catch {
+                available = message === 'online';
+            }
+            const device = this.deviceRegistry.get(friendlyName);
+            if (device) {
+                device.available = available;
+            }
+            void this.callbacks.onDeviceAvailabilityChanged?.(friendlyName, available);
+        }
+        catch (error) {
+            this.logger.warn(`Failed to parse availability for device ${friendlyName}`, {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    clearReconnectTimer() {
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+    }
+    resetState() {
+        this.connected = false;
+        this.bridgeOnline = false;
+        this.deviceRegistry.clear();
+        this.stateCache.clear();
+    }
+}
+exports.Z2mBaseClientAdapter = Z2mBaseClientAdapter;
+//# sourceMappingURL=base-client-adapter.js.map