npm - @fastybird/smart-panel-backend - Versions diffs - 0.1.0-alpha.5 → 0.1.0-alpha.7 - Mend

@fastybird/smart-panel-backend 0.1.0-alpha.5 → 0.1.0-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (219) hide show

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

@@ -0,0 +1 @@

+ {"version":3,"file":"base-client-adapter.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/base-client-adapter.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js CHANGED Viewed

@@ -217,6 +217,9 @@ let Z2mDeviceMapperService = class Z2mDeviceMapperService {
                     z2mPropertyKey === 'state') {
                     continue;
                 }
+                if (property.permissions?.length === 1 && property.permissions[0] === devices_constants_1.PermissionType.WRITE_ONLY) {
+                    continue;
+                }
                 if (channel.category === devices_constants_1.ChannelCategory.LIGHT && property.category === devices_constants_1.PropertyCategory.BRIGHTNESS) {
                     continue;
                 }
@@ -546,13 +549,10 @@ let Z2mDeviceMapperService = class Z2mDeviceMapperService {
         }
     }
     async createProperty(channel, mappedProperty) {
-        const isSharedZ2mProperty = mappedProperty.z2mProperty === 'color' &&
-            (mappedProperty.category === devices_constants_1.PropertyCategory.HUE || mappedProperty.category === devices_constants_1.PropertyCategory.SATURATION);
         const isStaticProperty = mappedProperty.z2mProperty.startsWith('__static_');
         const isDerivedProperty = mappedProperty.z2mProperty.startsWith('__derived_');
-        const propertyIdentifier = isSharedZ2mProperty || isStaticProperty || isDerivedProperty
-            ? mappedProperty.identifier
-            : mappedProperty.z2mProperty;
+        const useSpecIdentifier = isStaticProperty || isDerivedProperty || mappedProperty.identifier !== mappedProperty.z2mProperty;
+        const propertyIdentifier = useSpecIdentifier ? mappedProperty.identifier : mappedProperty.z2mProperty;
         let property = await this.channelsPropertiesService.findOneBy('identifier', propertyIdentifier, channel.id, devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
         if (!property) {
             const format = mappedProperty.format && mappedProperty.format.length > 0
@@ -571,6 +571,7 @@ let Z2mDeviceMapperService = class Z2mDeviceMapperService {
                 permissions: mappedProperty.permissions,
                 format,
                 step: mappedProperty.step ?? null,
+                invalid: mappedProperty.invalid ?? null,
                 value: mappedProperty.staticValue ?? null,
             };
             property = await this.channelsPropertiesService.create(channel.id, createDto);

package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js.map CHANGED Viewed

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

package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.d.ts CHANGED Viewed

@@ -1,36 +1,14 @@
-import { Z2mAdapterCallbacks, Z2mMqttConfig, Z2mRegisteredDevice, Z2mSetPayload } from '../interfaces/zigbee2mqtt.interface';
-export declare class Z2mMqttClientAdapterService {
-    private readonly logger;
+import { Z2mMqttConfig, Z2mSetPayload } from '../interfaces/zigbee2mqtt.interface';
+import { Z2mBaseClientAdapter } from './base-client-adapter';
+export declare class Z2mMqttClientAdapterService extends Z2mBaseClientAdapter {
     private client;
     private config;
-    private connected;
-    private bridgeOnline;
-    private reconnectTimer;
-    private readonly deviceRegistry;
-    private readonly stateCache;
-    private callbacks;
-    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>;
+    constructor();
     connect(config: Z2mMqttConfig): Promise<void>;
     disconnect(): Promise<void>;
     publishCommand(friendlyName: string, payload: Z2mSetPayload): Promise<boolean>;
     requestState(friendlyName: string, properties?: string[]): Promise<boolean>;
     private buildBrokerUrl;
     private subscribeToTopics;
-    private handleMessage;
-    private handleBridgeMessage;
-    private handleBridgeStateMessage;
-    private handleBridgeDevicesMessage;
-    private requestMissingStates;
-    private handleBridgeEventMessage;
-    private handleDeviceStateMessage;
-    private handleDeviceAvailabilityMessage;
     private scheduleReconnect;
-    private clearReconnectTimer;
 }

package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js CHANGED Viewed

@@ -38,57 +38,25 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+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.Z2mMqttClientAdapterService = void 0;
 const mqtt = __importStar(require("mqtt"));
 const common_1 = require("@nestjs/common");
-const logger_1 = require("../../../common/logger");
-const devices_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constants");
-let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
+const base_client_adapter_1 = require("./base-client-adapter");
+let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService extends base_client_adapter_1.Z2mBaseClientAdapter {
     constructor() {
-        this.logger = (0, logger_1.createExtensionLogger)(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME, 'MqttClientAdapter');
+        super('MqttClientAdapter');
         this.client = null;
         this.config = null;
-        this.connected = false;
-        this.bridgeOnline = false;
-        this.reconnectTimer = null;
-        this.deviceRegistry = new Map();
-        this.stateCache = new Map();
-        this.callbacks = {};
-    }
-    setCallbacks(callbacks) {
-        this.callbacks = callbacks;
-    }
-    get baseTopic() {
-        return this.config?.baseTopic ?? devices_zigbee2mqtt_constants_1.DEFAULT_MQTT_BASE_TOPIC;
-    }
-    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) ?? {};
     }
     async connect(config) {
-        this.config = config;
+        this.configBaseTopic = config.baseTopic;
         this.clearReconnectTimer();
         await this.disconnect();
+        this.config = config;
         const brokerUrl = this.buildBrokerUrl(config);
         this.logger.log(`Connecting to MQTT broker: ${brokerUrl}`);
         return new Promise((resolve, reject) => {
@@ -142,7 +110,7 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
                     this.logger.warn('MQTT client is offline');
                 });
                 this.client.on('message', (topic, payload) => {
-                    this.handleMessage(topic, payload);
+                    this.handleMessage(topic, payload.toString());
                 });
             }
             catch (error) {
@@ -155,20 +123,19 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
     }
     async disconnect() {
         this.clearReconnectTimer();
+        this.connected = false;
+        this.bridgeOnline = false;
+        this.config = null;
         if (this.client) {
             this.logger.log('Disconnecting from MQTT broker');
-            this.connected = false;
-            this.bridgeOnline = false;
-            this.config = null;
-            return new Promise((resolve) => {
+            await new Promise((resolve) => {
                 this.client?.end(true, {}, () => {
                     this.client = null;
-                    this.deviceRegistry.clear();
-                    this.stateCache.clear();
                     resolve();
                 });
             });
         }
+        this.resetState();
     }
     async publishCommand(friendlyName, payload) {
         if (!this.client || !this.connected) {
@@ -233,217 +200,6 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
             });
         }
     }
-    handleMessage(topic, payload) {
-        const message = payload.toString();
-        try {
-            const relativePath = topic.replace(`${this.baseTopic}/`, '');
-            const topicParts = relativePath.split('/');
-            if (topicParts.length === 0) {
-                return;
-            }
-            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) {
-                if (this.deviceRegistry.has(pathWithoutSuffix)) {
-                    this.handleDeviceAvailabilityMessage(pathWithoutSuffix, message);
-                }
-                else {
-                    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),
-            });
-        }
-    }
     scheduleReconnect() {
         if (this.reconnectTimer || !this.config) {
             return;
@@ -463,15 +219,10 @@ let Z2mMqttClientAdapterService = class Z2mMqttClientAdapterService {
             }
         }, interval);
     }
-    clearReconnectTimer() {
-        if (this.reconnectTimer) {
-            clearTimeout(this.reconnectTimer);
-            this.reconnectTimer = null;
-        }
-    }
 };
 exports.Z2mMqttClientAdapterService = Z2mMqttClientAdapterService;
 exports.Z2mMqttClientAdapterService = Z2mMqttClientAdapterService = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
 ], Z2mMqttClientAdapterService);
 //# sourceMappingURL=mqtt-client-adapter.service.js.map

package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js.map CHANGED Viewed

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

package/dist/plugins/devices-zigbee2mqtt/services/virtual-property.types.js CHANGED Viewed

@@ -84,22 +84,6 @@ exports.CHANNEL_VIRTUAL_PROPERTIES = [
                     stop: 'STOP',
                 },
             },
-            {
-                property_category: devices_constants_1.PropertyCategory.MODE,
-                virtual_type: VirtualPropertyType.STATIC,
-                data_type: devices_constants_1.DataTypeType.ENUM,
-                permissions: [devices_constants_1.PermissionType.READ_ONLY],
-                format: ['position', 'lift_percentage', 'goto_lift_percentage'],
-                static_value: 'position',
-            },
-            {
-                property_category: devices_constants_1.PropertyCategory.TILT,
-                virtual_type: VirtualPropertyType.STATIC,
-                data_type: devices_constants_1.DataTypeType.ENUM,
-                permissions: [devices_constants_1.PermissionType.READ_ONLY],
-                format: ['tilt', 'tilt_percentage'],
-                static_value: 'tilt',
-            },
         ],
     },
 ];