@fastybird/smart-panel-backend 1.1.0-alpha.14 → 1.1.0-alpha.16

package/dist/plugins/devices-home-assistant/services/home-assistant-raw-event.service.js

@@ -0,0 +1,271 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HomeAssistantRawEventService = void 0;
+const common_1 = require("@nestjs/common");
+const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const devices_constants_1 = require("../../../modules/devices/devices.constants");
+const channel_input_occurrences_service_1 = require("../../../modules/devices/services/channel-input-occurrences.service");
+const channels_properties_service_1 = require("../../../modules/devices/services/channels.properties.service");
+const channels_service_1 = require("../../../modules/devices/services/channels.service");
+const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const devices_home_assistant_constants_1 = require("../devices-home-assistant.constants");
+const ha_event_utils_1 = require("../utils/ha-event.utils");
+let HomeAssistantRawEventService = class HomeAssistantRawEventService {
+    generateSourceOccurrenceId(deviceIdentifier, command, contextId) {
+        if (contextId && typeof contextId === 'string' && contextId.trim()) {
+            return `${deviceIdentifier}:${command}:${contextId.trim()}`;
+        }
+        this.occurrenceSequence = (this.occurrenceSequence + 1) % Number.MAX_SAFE_INTEGER;
+        return `${deviceIdentifier}:${command}:${Date.now()}_${this.occurrenceSequence}`;
+    }
+    constructor(devicesService, channelsService, channelsPropertiesService, channelInputOccurrencesService) {
+        this.devicesService = devicesService;
+        this.channelsService = channelsService;
+        this.channelsPropertiesService = channelsPropertiesService;
+        this.channelInputOccurrencesService = channelInputOccurrencesService;
+        this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_home_assistant_constants_1.DEVICES_HOME_ASSISTANT_PLUGIN_NAME, 'HomeAssistantRawEventService');
+        this.occurrenceSequence = 0;
+    }
+    get event() {
+        return '*';
+    }
+    parseZhaEvent(data, contextId) {
+        const deviceIdentifier = (typeof data.device_id === 'string' && data.device_id.trim() ? data.device_id.trim() : null) ??
+            (typeof data.device_ieee === 'string' && data.device_ieee.trim() ? data.device_ieee.trim() : null) ??
+            (typeof data.unique_id === 'string' && data.unique_id.trim() ? data.unique_id.trim() : null);
+        const command = typeof data.command === 'string' ? data.command : null;
+        if (!deviceIdentifier || !command) {
+            return null;
+        }
+        let eventType;
+        const lowerCommand = command.toLowerCase();
+        switch (lowerCommand) {
+            case 'on':
+            case 'off':
+            case 'toggle':
+            case 'button_single':
+            case 'single':
+            case 'press':
+                eventType = 'press';
+                break;
+            case 'button_double':
+            case 'double':
+                eventType = 'double_press';
+                break;
+            case 'button_triple':
+            case 'triple':
+                eventType = 'triple_press';
+                break;
+            case 'button_hold':
+            case 'hold':
+            case 'move':
+            case 'move_with_on_off':
+                eventType = 'long_press';
+                break;
+            case 'release':
+            case 'stop':
+            case 'stop_with_on_off':
+                eventType = 'release';
+                break;
+            default:
+                eventType = (0, ha_event_utils_1.normalizeHaEventType)(command);
+                break;
+        }
+        const endpointId = typeof data.endpoint_id === 'number' ? data.endpoint_id : undefined;
+        const upstreamContextId = (typeof contextId === 'string' && contextId.trim() ? contextId.trim() : null) ??
+            (typeof data.context === 'object' &&
+                data.context !== null &&
+                typeof data.context.id === 'string'
+                ? data.context.id.trim()
+                : null) ??
+            (typeof data.context_id === 'string' && data.context_id.trim() ? data.context_id.trim() : null);
+        const sourceOccurrenceId = this.generateSourceOccurrenceId(deviceIdentifier, command, upstreamContextId);
+        return {
+            deviceIdentifier,
+            eventType,
+            nativeCommand: command,
+            endpointId,
+            sourceOccurrenceId,
+        };
+    }
+    parseDeconzEvent(data, contextId) {
+        const identifier = typeof data.unique_id === 'string'
+            ? data.unique_id
+            : typeof data.id === 'string'
+                ? data.id
+                : data.device_id;
+        const eventCode = typeof data.event === 'number' && Number.isInteger(data.event) ? data.event : null;
+        if (!identifier || eventCode === null) {
+            return null;
+        }
+        const actionCode = eventCode % 100;
+        const buttonNum = Math.floor(eventCode / 1000);
+        if (buttonNum < 1 || buttonNum > 4) {
+            return null;
+        }
+        let eventType;
+        switch (actionCode) {
+            case 0:
+                eventType = 'down';
+                break;
+            case 1:
+                eventType = 'long_press';
+                break;
+            case 2:
+                eventType = 'press';
+                break;
+            case 3:
+                eventType = 'release';
+                break;
+            case 4:
+                eventType = 'double_press';
+                break;
+            case 5:
+                eventType = 'triple_press';
+                break;
+            default:
+                return null;
+        }
+        const upstreamContextId = (typeof contextId === 'string' && contextId.trim() ? contextId.trim() : null) ??
+            (typeof data.context === 'object' &&
+                data.context !== null &&
+                typeof data.context.id === 'string'
+                ? data.context.id.trim()
+                : null) ??
+            (typeof data.context_id === 'string' && data.context_id.trim() ? data.context_id.trim() : null);
+        const sourceOccurrenceId = this.generateSourceOccurrenceId(identifier, eventCode, upstreamContextId);
+        return {
+            deviceIdentifier: identifier,
+            eventType,
+            nativeCommand: String(eventCode),
+            endpointId: buttonNum,
+            sourceOccurrenceId,
+        };
+    }
+    diagnoseUnsupportedEvent(eventType, data) {
+        if (eventType === 'zha_event' || eventType === 'deconz_event') {
+            return (`[RAW EVENT] Incomplete payload for documented raw event "${eventType}". ` +
+                `Missing mandatory identifiers (e.g. device_ieee, unique_id, command, or event code). Data: ${JSON.stringify(data ?? {})}`);
+        }
+        return (`[RAW EVENT] Unsupported raw event source "${eventType}". ` +
+            `Arbitrary event-bus names cannot be assumed to encode physical hardware buttons without verified schema. ` +
+            `To integrate buttons reliably, use standard Home Assistant 'event.*' entities.`);
+    }
+    async handle(rawMsg) {
+        const eventType = typeof rawMsg.event_type === 'string' ? rawMsg.event_type : null;
+        const data = typeof rawMsg.data === 'object' && rawMsg.data !== null ? rawMsg.data : {};
+        if (!eventType) {
+            return;
+        }
+        const contextId = typeof rawMsg.context === 'object' &&
+            rawMsg.context !== null &&
+            typeof rawMsg.context.id === 'string'
+            ? rawMsg.context.id
+            : null;
+        let parsed = null;
+        if (eventType === 'zha_event') {
+            parsed = this.parseZhaEvent(data, contextId);
+        }
+        else if (eventType === 'deconz_event') {
+            parsed = this.parseDeconzEvent(data, contextId);
+        }
+        if (!parsed) {
+            const diagnostic = this.diagnoseUnsupportedEvent(eventType, data);
+            this.logger.debug(diagnostic);
+            return;
+        }
+        const devices = await this.devicesService.findAll(devices_home_assistant_constants_1.DEVICES_HOME_ASSISTANT_TYPE);
+        let device = devices.find((d) => d.haDeviceId === parsed?.deviceIdentifier || d.id === parsed?.deviceIdentifier);
+        let targetChannel;
+        let targetProperty;
+        if (!device) {
+            for (const dev of devices) {
+                const channels = await this.channelsService.findAll(dev.id);
+                for (const chan of channels) {
+                    const properties = await this.channelsPropertiesService.findAll(chan.id);
+                    const matchedProp = properties.find((p) => p.haEntityId === parsed?.deviceIdentifier);
+                    if (matchedProp) {
+                        device = dev;
+                        targetChannel = chan;
+                        targetProperty = matchedProp.category === devices_constants_1.PropertyCategory.EVENT ? matchedProp : undefined;
+                        break;
+                    }
+                }
+                if (device)
+                    break;
+            }
+        }
+        if (!device) {
+            this.logger.debug(`[RAW EVENT] No adopted device found matching raw event identifier: "${parsed.deviceIdentifier}". ` +
+                `Ensure the device is adopted in Smart Panel.`);
+            return;
+        }
+        if (!targetChannel) {
+            const channels = await this.channelsService.findAll(device.id);
+            const buttonChannels = channels.filter((c) => c.category === devices_constants_1.ChannelCategory.BUTTON);
+            if (buttonChannels.length === 0) {
+                this.logger.debug(`[RAW EVENT] Device ${device.id} has no BUTTON channels mapped.`);
+                return;
+            }
+            if (parsed.endpointId !== undefined) {
+                const endpoint = parsed.endpointId;
+                targetChannel = buttonChannels.find((c) => c.identifier === String(endpoint) ||
+                    c.identifier === `button_${endpoint}` ||
+                    c.identifier === `btn_${endpoint}` ||
+                    c.identifier === `endpoint_${endpoint}` ||
+                    c.identifier?.endsWith(`_${endpoint}`));
+                if (!targetChannel) {
+                    this.logger.debug(`[RAW EVENT] No button channel found matching endpoint ${endpoint} for device ${device.id}.`);
+                    return;
+                }
+            }
+            else {
+                targetChannel = buttonChannels[0];
+            }
+        }
+        if (!targetProperty) {
+            const properties = await this.channelsPropertiesService.findAll(targetChannel.id);
+            targetProperty = properties.find((p) => p.category === devices_constants_1.PropertyCategory.EVENT);
+        }
+        if (!targetProperty) {
+            this.logger.debug(`[RAW EVENT] Channel ${targetChannel.id} has no EVENT property.`);
+            return;
+        }
+        if (this.channelInputOccurrencesService) {
+            await this.channelInputOccurrencesService.publishOccurrence({
+                deviceId: device.id,
+                channelId: targetChannel.id,
+                propertyId: targetProperty.id,
+                event: parsed.eventType,
+                nativeEventType: parsed.nativeCommand,
+                sourceOccurrenceId: parsed.sourceOccurrenceId,
+                data: {
+                    event_type: eventType,
+                    raw_data: data,
+                },
+            });
+        }
+    }
+};
+exports.HomeAssistantRawEventService = HomeAssistantRawEventService;
+exports.HomeAssistantRawEventService = HomeAssistantRawEventService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(3, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [devices_service_1.DevicesService,
+        channels_service_1.ChannelsService,
+        channels_properties_service_1.ChannelsPropertiesService,
+        channel_input_occurrences_service_1.ChannelInputOccurrencesService])
+], HomeAssistantRawEventService);
+//# sourceMappingURL=home-assistant-raw-event.service.js.map

package/dist/plugins/devices-home-assistant/services/home-assistant-raw-event.service.js.map

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

package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.d.ts

@@ -8,7 +8,7 @@ import { HaSupervisorService } from './ha-supervisor.service';
 import { HomeAssistantHttpService } from './home-assistant.http.service';
 export interface WsEventService {
     get event(): string;
-    handle(event: HomeAssistantStateChangedEventDto): Promise<void>;
+    handle(event: HomeAssistantStateChangedEventDto | Record<string, unknown>): Promise<void>;
 }
 export declare class HomeAssistantWsService extends BaseManagedExtensionService {
     private readonly configService;
@@ -58,7 +58,7 @@ export declare class HomeAssistantWsService extends BaseManagedExtensionService
     private resolveConnectionIssue;
     private scheduleReconnect;
     private handleMessage;
-    private subscribeToStates;
+    private subscribeToEvents;
     private startPing;
     private stopPing;
     private waitUntil;

package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js

@@ -443,7 +443,7 @@ let HomeAssistantWsService = class HomeAssistantWsService extends base_managed_e
             }
             this.unexpectedCloseStreak = 0;
             await this.resolveConnectionIssue();
-            this.subscribeToStates();
+            this.subscribeToEvents();
             this.startPing();
             this.homeAssistantHttpService.markAllDevicesConnected().catch((err) => {
                 this.logger.warn(`Failed to mark devices as connected: ${err?.message ?? 'unknown error'}`);
@@ -464,24 +464,42 @@ let HomeAssistantWsService = class HomeAssistantWsService extends base_managed_e
         else if (msg.type === 'event') {
             if ('event' in msg &&
                 typeof msg.event === 'object' &&
+                msg.event !== null &&
                 'event_type' in msg.event &&
-                msg.event.event_type === 'state_changed') {
-                const handler = this.eventsHandlers.get(msg.event.event_type) ?? this.eventsHandlers.get('*');
+                typeof msg.event.event_type === 'string') {
+                const eventType = msg.event.event_type;
+                const handler = this.eventsHandlers.get(eventType) ?? this.eventsHandlers.get('*');
                 if (handler) {
-                    const event = (0, transform_utils_1.toInstance)(home_assistant_state_dto_1.HomeAssistantStateChangedEventDto, msg.event, {
-                        excludeExtraneousValues: false,
-                    });
-                    await handler.handle(event);
+                    if (eventType === 'state_changed') {
+                        const event = (0, transform_utils_1.toInstance)(home_assistant_state_dto_1.HomeAssistantStateChangedEventDto, msg.event, {
+                            excludeExtraneousValues: false,
+                        });
+                        await handler.handle(event);
+                    }
+                    else {
+                        await handler.handle(msg.event);
+                    }
+                }
+                else {
+                    this.logger.debug(`[WS EVENT] Unhandled event on Home Assistant event bus: "${eventType}".`);
                 }
             }
         }
     }
-    subscribeToStates() {
-        this.ws?.send(JSON.stringify({
-            id: this.nextId++,
-            type: 'subscribe_events',
-            event_type: 'state_changed',
-        }));
+    subscribeToEvents() {
+        const subscribedEvents = new Set(['state_changed']);
+        for (const eventType of this.eventsHandlers.keys()) {
+            if (eventType !== '*') {
+                subscribedEvents.add(eventType);
+            }
+        }
+        for (const eventType of subscribedEvents) {
+            this.ws?.send(JSON.stringify({
+                id: this.nextId++,
+                type: 'subscribe_events',
+                event_type: eventType,
+            }));
+        }
     }
     startPing() {
         this.stopPing();

package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js.map

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

package/dist/plugins/devices-home-assistant/services/mapping-preview.service.js

@@ -21,6 +21,7 @@ const devices_home_assistant_exceptions_1 = require("../devices-home-assistant.e
 const mappings_1 = require("../mappings");
 const transformer_registry_1 = require("../mappings/transformers/transformer.registry");
 const mapping_preview_model_1 = require("../models/mapping-preview.model");
+const ha_event_utils_1 = require("../utils/ha-event.utils");
 const home_assistant_http_service_1 = require("./home-assistant.http.service");
 const home_assistant_ws_service_1 = require("./home-assistant.ws.service");
 const light_capability_analyzer_1 = require("./light-capability.analyzer");
@@ -195,6 +196,15 @@ let MappingPreviewService = class MappingPreviewService {
         if (missingRequired.length > 0) {
             status = 'partial';
         }
+        const targetCategory = overrideChannelCategory ?? mapping.channel.category;
+        let channelIdentifier = null;
+        if (targetCategory === devices_constants_1.ChannelCategory.BUTTON) {
+            const match = /(?:button|btn|endpoint)[_.-]?(\d+)|[_.-](\d+)$/i.exec(entityId);
+            const num = match ? (match[1] ?? match[2]) : null;
+            if (num) {
+                channelIdentifier = `button_${num}`;
+            }
+        }
         return {
             entityId,
             domain: domain,
@@ -203,9 +213,10 @@ let MappingPreviewService = class MappingPreviewService {
             attributes: state?.attributes ?? {},
             status,
             suggestedChannel: {
-                category: overrideChannelCategory ?? mapping.channel.category,
-                name: friendlyName ?? this.generateChannelName(entityId, mapping.channel.category),
+                category: targetCategory,
+                name: friendlyName ?? this.generateChannelName(entityId, targetCategory),
                 confidence: overrideChannelCategory ? 'high' : this.determineConfidenceFromMapping(mapping, deviceClass),
+                identifier: channelIdentifier,
             },
             suggestedProperties,
             unmappedAttributes,
@@ -495,6 +506,15 @@ let MappingPreviewService = class MappingPreviewService {
                 return sourceList;
             }
         }
+        if (channelCategory === devices_constants_1.ChannelCategory.BUTTON && propertyCategory === devices_constants_1.PropertyCategory.EVENT) {
+            const eventTypes = attrs.event_types;
+            if (Array.isArray(eventTypes) && eventTypes.length > 0) {
+                const formatted = (0, ha_event_utils_1.mapHaEventTypesToFormat)(eventTypes);
+                if (formatted.length > 0) {
+                    return formatted;
+                }
+            }
+        }
         return null;
     }
     createSkippedEntityPreview(entityId, state) {
@@ -596,8 +616,8 @@ let MappingPreviewService = class MappingPreviewService {
         }
         const consolidated = [];
         for (const [category, entities] of groupedByCategory.entries()) {
-            if (entities.length === 1) {
-                consolidated.push(entities[0]);
+            if (entities.length === 1 || category === devices_constants_1.ChannelCategory.BUTTON) {
+                consolidated.push(...entities);
                 continue;
             }
             this.logger.debug(`[MAPPING PREVIEW] Consolidating ${entities.length} entities into single channel category: ${category}`, { entityIds: entities.map((e) => e.entityId) });