@fastybird/smart-panel-backend 1.0.0-beta.3 → 1.1.0-alpha.1

package/dist/modules/devices/services/platform.registry.service.d.ts

@@ -1,9 +1,15 @@
-import { DeviceEntity } from '../entities/devices.entity';
+import { ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
 import { IDevicePlatform } from '../platforms/device.platform';
+export interface DevicePlatformCommandBudget {
+    readonly device: DeviceEntity;
+    readonly commandCount: number;
+}
 export declare class PlatformRegistryService {
     private readonly logger;
     private readonly platforms;
     register(platform: IDevicePlatform): boolean;
     get(device: DeviceEntity): IDevicePlatform | null;
+    getCommandTtlMs(executions: readonly DevicePlatformCommandBudget[], defaultTtlMs: number): number;
+    usesAuthoritativePropertyReadback(device: DeviceEntity, property: ChannelPropertyEntity): boolean;
     list(): string[];
 }

package/dist/modules/devices/services/platform.registry.service.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformRegistryService = void 0;
 const common_1 = require("@nestjs/common");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const intents_constants_1 = require("../../intents/intents.constants");
 const devices_constants_1 = require("../devices.constants");
 let PlatformRegistryService = class PlatformRegistryService {
     constructor() {
@@ -33,6 +34,24 @@ let PlatformRegistryService = class PlatformRegistryService {
         }
         return platform;
     }
+    getCommandTtlMs(executions, defaultTtlMs) {
+        let completionWindowMs = 0;
+        let hasCustomTimeout = false;
+        for (const execution of executions) {
+            const timeoutMs = this.get(execution.device)?.getCommandTimeoutMs?.(execution.commandCount);
+            if (typeof timeoutMs === 'number' && Number.isFinite(timeoutMs) && timeoutMs > 0) {
+                completionWindowMs += timeoutMs;
+                hasCustomTimeout = true;
+            }
+            else {
+                completionWindowMs += defaultTtlMs;
+            }
+        }
+        return hasCustomTimeout ? completionWindowMs + defaultTtlMs + intents_constants_1.INTENT_CLEANUP_INTERVAL : defaultTtlMs;
+    }
+    usesAuthoritativePropertyReadback(device, property) {
+        return this.get(device)?.usesAuthoritativePropertyReadback?.(property) ?? false;
+    }
     list() {
         return Object.keys(this.platforms);
     }

package/dist/modules/devices/services/platform.registry.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.registry.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/platform.registry.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,8FAAwF;AACxF,4DAA2D;AAKpD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACW,WAAM,GAAG,IAAA,gDAAqB,EAAC,uCAAmB,EAAE,yBAAyB,CAAC,CAAC;QAE/E,cAAS,GAAoC,EAAE,CAAC;IAiClE,CAAC;IA/BA,QAAQ,CAAC,QAAyB;QACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEhC,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAC;YAE7D,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,MAAoB;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAErE,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,IAAI;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;CACD,CAAA;AApCY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;GACA,uBAAuB,CAoCnC"}
+{"version":3,"file":"platform.registry.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/platform.registry.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,8FAAwF;AACxF,uEAA0E;AAC1E,4DAA2D;AAUpD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACW,WAAM,GAAG,IAAA,gDAAqB,EAAC,uCAAmB,EAAE,yBAAyB,CAAC,CAAC;QAE/E,cAAS,GAAoC,EAAE,CAAC;IAuDlE,CAAC;IArDA,QAAQ,CAAC,QAAyB;QACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEhC,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAC;YAE7D,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,MAAoB;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAErE,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,eAAe,CAAC,UAAkD,EAAE,YAAoB;QACvF,IAAI,kBAAkB,GAAG,CAAC,CAAC;QAC3B,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAE5F,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAClF,kBAAkB,IAAI,SAAS,CAAC;gBAChC,gBAAgB,GAAG,IAAI,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACP,kBAAkB,IAAI,YAAY,CAAC;YACpC,CAAC;QACF,CAAC;QAED,OAAO,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,GAAG,YAAY,GAAG,2CAAuB,CAAC,CAAC,CAAC,YAAY,CAAC;IACtG,CAAC;IAED,iCAAiC,CAAC,MAAoB,EAAE,QAA+B;QACtF,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,iCAAiC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;IACjF,CAAC;IAED,IAAI;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;CACD,CAAA;AA1DY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;GACA,uBAAuB,CA0DnC"}

package/dist/modules/devices/services/property-command.service.d.ts

@@ -1,9 +1,32 @@
+import { IntentContext } from '../../intents/models/intent.model';
 import { IntentsService } from '../../intents/services/intents.service';
 import { ClientUserDto } from '../../websocket/dto/client-user.dto';
+import { UpdateChannelPropertyDto } from '../dto/update-channel-property.dto';
+import { ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
+import { PropertyCommandValue } from '../utils/property-command-value.utils';
 import { ChannelsPropertiesService } from './channels.properties.service';
 import { ChannelsService } from './channels.service';
 import { DevicesService } from './devices.service';
 import { PlatformRegistryService } from './platform.registry.service';
+export interface PropertyCommandExecutionOptions {
+    requestId?: string;
+    context?: IntentContext;
+}
+export interface DevicePropertyCommandResult {
+    device: string;
+    success: boolean;
+    reason?: string;
+}
+export interface SinglePropertyCommandResult extends DevicePropertyCommandResult {
+    deviceName?: string;
+    channel?: string;
+    property?: string;
+    value?: PropertyCommandValue;
+}
+export interface PropertyBatchCommandResult {
+    success: boolean;
+    results: SinglePropertyCommandResult[];
+}
 export declare class PropertyCommandService {
     private readonly devicesService;
     private readonly channelsService;
@@ -20,7 +43,14 @@ export declare class PropertyCommandService {
             reason?: string;
         }> | string;
     }>;
+    executePropertyCommandById(propertyId: string, rawValue: unknown, options?: PropertyCommandExecutionOptions): Promise<SinglePropertyCommandResult>;
+    executePropertyCommands(commands: Array<{
+        propertyId: string;
+        value: unknown;
+    }>, options?: PropertyCommandExecutionOptions): Promise<PropertyBatchCommandResult>;
+    private executeCommands;
+    private resolveCommandIntentTtlMs;
     private processDeviceCommands;
     processApiPropertyCommand(deviceId: string, channelId: string, propertyId: string, value: string | number | boolean): Promise<void>;
-    private validateValueType;
+    usesAuthoritativePropertyReadback(device: DeviceEntity | string, property: ChannelPropertyEntity, update?: UpdateChannelPropertyDto): Promise<boolean>;
 }

package/dist/modules/devices/services/property-command.service.js

@@ -21,6 +21,7 @@ const users_constants_1 = require("../../users/users.constants");
 const websocket_exceptions_1 = require("../../websocket/websocket.exceptions");
 const devices_constants_1 = require("../devices.constants");
 const property_command_dto_1 = require("../dto/property-command.dto");
+const property_command_value_utils_1 = require("../utils/property-command-value.utils");
 const channels_properties_service_1 = require("./channels.properties.service");
 const channels_service_1 = require("./channels.service");
 const devices_service_1 = require("./devices.service");
@@ -52,18 +53,6 @@ let PropertyCommandService = class PropertyCommandService {
             this.logger.error(`Command validation failed error=${JSON.stringify(errors)}`);
             return { success: false, results: 'Invalid payload' };
         }
-        const requestId = payload?.request_id;
-        const targets = dtoInstance.properties.map((prop) => ({
-            deviceId: prop.device,
-            channelId: prop.channel,
-            propertyId: prop.property,
-        }));
-        const intentType = intents_constants_1.IntentType.DEVICE_SET_PROPERTY;
-        const valueMap = {};
-        for (const prop of dtoInstance.properties) {
-            const compositeKey = `device:${prop.device}:${prop.channel}:${prop.property}`;
-            valueMap[compositeKey] = prop.value;
-        }
         let intentContext;
         if (dtoInstance.context) {
             intentContext = {
@@ -74,22 +63,213 @@ let PropertyCommandService = class PropertyCommandService {
                 extra: dtoInstance.context.extra,
             };
         }
-        const intent = this.intentsService.createIntent({
-            requestId,
-            type: intentType,
+        return this.executeCommands(dtoInstance.properties, {
+            requestId: dtoInstance.request_id,
             context: intentContext,
-            targets,
-            value: valueMap,
-            ttlMs: intents_constants_1.DEFAULT_TTL_DEVICE_COMMAND,
         });
-        this.logger.log(`Created intent ${intent.id} for ${targets.length} target(s)${requestId ? ` requestId=${requestId}` : ''}`);
+    }
+    async executePropertyCommandById(propertyId, rawValue, options = {}) {
+        const property = await this.channelsPropertiesService.findOne(propertyId);
+        if (!property) {
+            return { device: '', success: false, reason: 'Property not found' };
+        }
+        const propertyChannel = property.channel;
+        const channel = typeof propertyChannel === 'string' ? await this.channelsService.findOne(propertyChannel) : propertyChannel;
+        if (!channel) {
+            return { device: '', success: false, property: property.id, reason: 'Channel not found' };
+        }
+        const channelDevice = channel.device;
+        const device = typeof channelDevice === 'string' ? await this.devicesService.findOne(channelDevice) : channelDevice;
+        if (!device) {
+            return {
+                device: '',
+                success: false,
+                channel: channel.id,
+                property: property.id,
+                reason: 'Device not found',
+            };
+        }
+        if (!property.permissions.some((permission) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(permission))) {
+            return {
+                device: device.id,
+                deviceName: device.name,
+                channel: channel.id,
+                property: property.id,
+                success: false,
+                reason: 'Property is not writable',
+            };
+        }
+        const validation = (0, property_command_value_utils_1.validatePropertyCommandValue)(property, rawValue);
+        if (!validation.valid || validation.value === undefined) {
+            return {
+                device: device.id,
+                deviceName: device.name,
+                channel: channel.id,
+                property: property.id,
+                success: false,
+                reason: validation.reason ?? 'Invalid property value',
+            };
+        }
+        const execution = await this.executeCommands([
+            {
+                device: device.id,
+                channel: channel.id,
+                property: property.id,
+                value: validation.value,
+            },
+        ], options);
+        const result = Array.isArray(execution.results) ? execution.results[0] : undefined;
+        return {
+            device: device.id,
+            deviceName: device.name,
+            channel: channel.id,
+            property: property.id,
+            value: validation.value,
+            success: result?.success ?? false,
+            reason: result?.reason ?? (typeof execution.results === 'string' ? execution.results : undefined),
+        };
+    }
+    async executePropertyCommands(commands, options = {}) {
+        if (commands.length === 0) {
+            return { success: true, results: [] };
+        }
+        const resolved = [];
+        let targetDeviceId = null;
+        for (const cmd of commands) {
+            const property = await this.channelsPropertiesService.findOne(cmd.propertyId);
+            if (!property) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: '',
+                        success: false,
+                        property: c.propertyId,
+                        reason: c.propertyId === cmd.propertyId ? 'Property not found' : 'Batch aborted due to invalid property',
+                    })),
+                };
+            }
+            const propertyChannel = property.channel;
+            const channel = typeof propertyChannel === 'string' ? await this.channelsService.findOne(propertyChannel) : propertyChannel;
+            if (!channel) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: '',
+                        success: false,
+                        property: c.propertyId,
+                        reason: c.propertyId === cmd.propertyId ? 'Channel not found' : 'Batch aborted due to invalid channel',
+                    })),
+                };
+            }
+            const channelDevice = channel.device;
+            const device = typeof channelDevice === 'string' ? await this.devicesService.findOne(channelDevice) : channelDevice;
+            if (!device) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: '',
+                        success: false,
+                        property: c.propertyId,
+                        reason: c.propertyId === cmd.propertyId ? 'Device not found' : 'Batch aborted due to invalid device',
+                    })),
+                };
+            }
+            if (targetDeviceId === null) {
+                targetDeviceId = device.id;
+            }
+            else if (targetDeviceId !== device.id) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: device.id,
+                        success: false,
+                        property: c.propertyId,
+                        reason: `Single-device batch execution violation: properties belong to multiple devices (${targetDeviceId} vs ${device.id})`,
+                    })),
+                };
+            }
+            if (!property.permissions.some((permission) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(permission))) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: device.id,
+                        success: false,
+                        property: c.propertyId,
+                        reason: c.propertyId === cmd.propertyId ? 'Property is not writable' : 'Batch aborted: property not writable',
+                    })),
+                };
+            }
+            const validation = (0, property_command_value_utils_1.validatePropertyCommandValue)(property, cmd.value);
+            if (!validation.valid || validation.value === undefined) {
+                return {
+                    success: false,
+                    results: commands.map((c) => ({
+                        device: device.id,
+                        success: false,
+                        property: c.propertyId,
+                        reason: c.propertyId === cmd.propertyId
+                            ? (validation.reason ?? 'Invalid property value')
+                            : 'Batch aborted: invalid value',
+                    })),
+                };
+            }
+            resolved.push({
+                propertyId: cmd.propertyId,
+                property,
+                channel,
+                device,
+                value: validation.value,
+            });
+        }
+        const propertyCommandDtos = resolved.map((r) => ({
+            device: r.device.id,
+            channel: r.channel.id,
+            property: r.property.id,
+            value: r.value,
+        }));
+        const execution = await this.executeCommands(propertyCommandDtos, options);
+        const deviceResult = Array.isArray(execution.results) ? execution.results[0] : undefined;
+        const executionSuccess = execution.success && (deviceResult?.success ?? false);
+        const results = resolved.map((r) => ({
+            device: r.device.id,
+            deviceName: r.device.name,
+            channel: r.channel.id,
+            property: r.property.id,
+            value: r.value,
+            success: executionSuccess,
+            reason: deviceResult?.reason ?? (typeof execution.results === 'string' ? execution.results : undefined),
+        }));
+        return {
+            success: executionSuccess,
+            results,
+        };
+    }
+    async executeCommands(commands, options) {
+        const targets = commands.map((command) => ({
+            deviceId: command.device,
+            channelId: command.channel,
+            propertyId: command.property,
+        }));
+        const valueMap = {};
+        for (const command of commands) {
+            valueMap[`device:${command.device}:${command.channel}:${command.property}`] = command.value;
+        }
         const groupedProperties = {};
-        dtoInstance.properties.forEach((prop) => {
+        commands.forEach((prop) => {
             if (!groupedProperties[prop.device]) {
                 groupedProperties[prop.device] = [];
             }
             groupedProperties[prop.device].push(prop);
         });
+        const intent = this.intentsService.createIntent({
+            requestId: options.requestId,
+            type: intents_constants_1.IntentType.DEVICE_SET_PROPERTY,
+            context: options.context,
+            targets,
+            value: valueMap,
+            ttlMs: await this.resolveCommandIntentTtlMs(groupedProperties),
+        });
+        this.logger.log(`Created intent ${intent.id} for ${targets.length} target(s)${options.requestId ? ` requestId=${options.requestId}` : ''}`);
         const results = [];
         try {
             for (const deviceId of Object.keys(groupedProperties)) {
@@ -97,7 +277,7 @@ let PropertyCommandService = class PropertyCommandService {
                 results.push(result);
             }
             const intentResults = [];
-            for (const prop of dtoInstance.properties) {
+            for (const prop of commands) {
                 const deviceResult = results.find((r) => r.device === prop.device);
                 intentResults.push({
                     deviceId: prop.device,
@@ -114,7 +294,7 @@ let PropertyCommandService = class PropertyCommandService {
         }
         catch (error) {
             this.logger.error(`Unexpected error processing commands: ${error instanceof Error ? error.message : String(error)}`);
-            const failedResults = dtoInstance.properties.map((prop) => ({
+            const failedResults = commands.map((prop) => ({
                 deviceId: prop.device,
                 channelId: prop.channel,
                 propertyId: prop.property,
@@ -126,6 +306,21 @@ let PropertyCommandService = class PropertyCommandService {
             return { success: false, results: 'Internal error' };
         }
     }
+    async resolveCommandIntentTtlMs(groupedProperties) {
+        const executions = [];
+        for (const [deviceId, commands] of Object.entries(groupedProperties)) {
+            try {
+                const device = await this.devicesService.findOne(deviceId);
+                if (device !== null) {
+                    executions.push({ device, commandCount: commands.length });
+                }
+            }
+            catch {
+                return intents_constants_1.DEFAULT_TTL_DEVICE_COMMAND;
+            }
+        }
+        return this.platformRegistryService.getCommandTtlMs(executions, intents_constants_1.DEFAULT_TTL_DEVICE_COMMAND);
+    }
     async processDeviceCommands(deviceId, commands) {
         const device = await this.devicesService.findOne(deviceId);
         if (!device) {
@@ -153,12 +348,17 @@ let PropertyCommandService = class PropertyCommandService {
                 this.logger.warn(`Property not found id=${command.property} for channelId=${channel.id}`);
                 return { device: deviceId, success: false, reason: 'Property not found' };
             }
-            if (!this.validateValueType(property.dataType, command.value)) {
-                this.logger.warn(`Invalid value type for property id=${property.id} expected=${property.dataType}`);
-                return { device: deviceId, success: false, reason: 'Invalid value type' };
+            if (!property.permissions.some((permission) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(permission))) {
+                this.logger.warn(`Property is not writable id=${property.id}`);
+                return { device: deviceId, success: false, reason: 'Property is not writable' };
             }
-            this.logger.log(`Adding command for propertyId=${property.id} value=${command.value}`);
-            propertyUpdates.push({ device, channel, property, value: command.value });
+            const validation = (0, property_command_value_utils_1.validatePropertyCommandValue)(property, command.value);
+            if (!validation.valid || validation.value === undefined) {
+                this.logger.warn(`Invalid value for property id=${property.id} dataType=${property.dataType} reason=${validation.reason}`);
+                return { device: deviceId, success: false, reason: validation.reason ?? 'Invalid property value' };
+            }
+            this.logger.log(`Adding command for propertyId=${property.id} value=${validation.value}`);
+            propertyUpdates.push({ device, channel, property, value: validation.value });
         }
         this.logger.log(`Processing batch of ${propertyUpdates.length} commands for deviceId=${device.id}`);
         const success = await platform.processBatch(propertyUpdates);
@@ -170,31 +370,20 @@ let PropertyCommandService = class PropertyCommandService {
         return { device: deviceId, success: true };
     }
     async processApiPropertyCommand(deviceId, channelId, propertyId, value) {
-        const result = await this.processDeviceCommands(deviceId, [
-            { device: deviceId, channel: channelId, property: propertyId, value },
-        ]);
-        if (!result.success) {
-            this.logger.warn(`[API Command] Failed for deviceId=${deviceId}: ${result.reason}`);
+        const execution = await this.executeCommands([{ device: deviceId, channel: channelId, property: propertyId, value }], { context: { origin: 'api' } });
+        const result = Array.isArray(execution.results) ? execution.results[0] : undefined;
+        if (!execution.success) {
+            const reason = result?.reason ?? (typeof execution.results === 'string' ? execution.results : 'Execution failed');
+            this.logger.warn(`[API Command] Failed for deviceId=${deviceId}: ${reason}`);
         }
     }
-    validateValueType(dataType, value) {
-        switch (dataType) {
-            case devices_constants_1.DataTypeType.STRING:
-            case devices_constants_1.DataTypeType.ENUM:
-                return typeof value === 'string';
-            case devices_constants_1.DataTypeType.BOOL:
-                return typeof value === 'boolean';
-            case devices_constants_1.DataTypeType.CHAR:
-            case devices_constants_1.DataTypeType.UCHAR:
-            case devices_constants_1.DataTypeType.SHORT:
-            case devices_constants_1.DataTypeType.USHORT:
-            case devices_constants_1.DataTypeType.INT:
-            case devices_constants_1.DataTypeType.UINT:
-            case devices_constants_1.DataTypeType.FLOAT:
-                return typeof value === 'number';
-            default:
-                return false;
-        }
+    async usesAuthoritativePropertyReadback(device, property, update) {
+        const resolvedDevice = typeof device === 'string' ? await this.devicesService.findOne(device) : device;
+        const effectiveProperty = update
+            ? Object.setPrototypeOf({ ...property, ...update }, Reflect.getPrototypeOf(property))
+            : property;
+        return (resolvedDevice !== null &&
+            this.platformRegistryService.usesAuthoritativePropertyReadback(resolvedDevice, effectiveProperty));
     }
 };
 exports.PropertyCommandService = PropertyCommandService;

package/dist/modules/devices/services/property-command.service.js.map

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

package/dist/modules/devices/services/property-timeseries.service.d.ts

@@ -1,12 +1,15 @@
 import { StorageService } from '../../storage/services/storage.service';
 import { ChannelPropertyEntity } from '../entities/devices.entity';
 import { PropertyTimeseriesModel } from '../models/devices.model';
+import { PropertyValueSourceRegistryService } from './property-value-source.registry.service';
 export type BucketDuration = '1m' | '5m' | '15m' | '1h';
 export declare class PropertyTimeseriesService {
     private readonly storageService;
+    private readonly valueSourceRegistry;
     private readonly logger;
-    constructor(storageService: StorageService);
+    constructor(storageService: StorageService, valueSourceRegistry: PropertyValueSourceRegistryService);
     queryTimeseries(property: ChannelPropertyEntity, from: Date, to: Date, bucket?: BucketDuration): Promise<PropertyTimeseriesModel>;
+    queryTimeseriesStrict(property: ChannelPropertyEntity, from: Date, to: Date, bucket?: BucketDuration): Promise<PropertyTimeseriesModel>;
     private fetchPoints;
     private buildQuery;
     private parseValue;

package/dist/modules/devices/services/property-timeseries.service.js

@@ -16,44 +16,55 @@ const extension_logger_service_1 = require("../../../common/logger/extension-log
 const storage_service_1 = require("../../storage/services/storage.service");
 const devices_constants_1 = require("../devices.constants");
 const devices_model_1 = require("../models/devices.model");
+const property_value_source_registry_service_1 = require("./property-value-source.registry.service");
 let PropertyTimeseriesService = class PropertyTimeseriesService {
-    constructor(storageService) {
+    constructor(storageService, valueSourceRegistry) {
         this.storageService = storageService;
+        this.valueSourceRegistry = valueSourceRegistry;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_constants_1.DEVICES_MODULE_NAME, 'PropertyTimeseriesService');
     }
     async queryTimeseries(property, from, to, bucket) {
-        this.logger.debug(`[TIMESERIES] Querying property id=${property.id} from=${from.toISOString()} to=${to.toISOString()} bucket=${bucket ?? 'none'}`);
         try {
-            const points = await this.fetchPoints(property, from, to, bucket);
+            return await this.queryTimeseriesStrict(property, from, to, bucket);
+        }
+        catch {
             return (0, class_transformer_1.plainToInstance)(devices_model_1.PropertyTimeseriesModel, {
                 property: property.id,
                 from: from.toISOString(),
                 to: to.toISOString(),
                 bucket: bucket ?? this.getDefaultBucket(from, to),
-                points,
+                points: [],
             });
         }
-        catch (error) {
-            const err = error;
-            this.logger.error(`[TIMESERIES] Failed to query timeseries for property id=${property.id} error=${err.message}`, err.stack);
+    }
+    async queryTimeseriesStrict(property, from, to, bucket) {
+        const key = this.valueSourceRegistry.resolve(property);
+        this.logger.debug(`[TIMESERIES] Querying property id=${property.id} from=${from.toISOString()} to=${to.toISOString()} bucket=${bucket ?? 'none'}`);
+        try {
+            const points = await this.fetchPoints(property, key, from, to, bucket);
             return (0, class_transformer_1.plainToInstance)(devices_model_1.PropertyTimeseriesModel, {
                 property: property.id,
                 from: from.toISOString(),
                 to: to.toISOString(),
                 bucket: bucket ?? this.getDefaultBucket(from, to),
-                points: [],
+                points,
             });
         }
+        catch (error) {
+            const err = error;
+            this.logger.error(`[TIMESERIES] Failed to query timeseries for property id=${property.id} error=${err.message}`, err.stack);
+            throw error;
+        }
     }
-    async fetchPoints(property, from, to, bucket) {
+    async fetchPoints(property, key, from, to, bucket) {
         const effectiveBucket = bucket ?? this.getDefaultBucket(from, to);
-        const query = this.buildQuery(property.id, from, to, effectiveBucket);
-        const result = await this.storageService.query(query);
+        const query = this.buildQuery(key, from, to, effectiveBucket);
+        const result = await this.storageService.queryStrict(query);
         if (!result.length) {
             return [];
         }
         const points = result.map((row) => {
-            const time = row.time._nanoISO;
+            const time = row.time instanceof Date ? row.time.toISOString() : typeof row.time === 'string' ? row.time : row.time._nanoISO;
             const value = this.parseValue(row, property.dataType);
             return { time, value };
         });
@@ -119,6 +130,7 @@ let PropertyTimeseriesService = class PropertyTimeseriesService {
 exports.PropertyTimeseriesService = PropertyTimeseriesService;
 exports.PropertyTimeseriesService = PropertyTimeseriesService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [storage_service_1.StorageService])
+    __metadata("design:paramtypes", [storage_service_1.StorageService,
+        property_value_source_registry_service_1.PropertyValueSourceRegistryService])
 ], PropertyTimeseriesService);
 //# sourceMappingURL=property-timeseries.service.js.map

package/dist/modules/devices/services/property-timeseries.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"property-timeseries.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-timeseries.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAoD;AAEpD,2CAA4C;AAE5C,8FAAwF;AACxF,4EAAwE;AACxE,4DAAyE;AAEzE,2DAAwF;AAKjF,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAGrC,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAF1C,WAAM,GAAG,IAAA,gDAAqB,EAAC,uCAAmB,EAAE,2BAA2B,CAAC,CAAC;IAEpC,CAAC;IAK/D,KAAK,CAAC,eAAe,CACpB,QAA+B,EAC/B,IAAU,EACV,EAAQ,EACR,MAAuB;QAEvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,qCAAqC,QAAQ,CAAC,EAAE,SAAS,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,WAAW,EAAE,WAAW,MAAM,IAAI,MAAM,EAAE,CAC/H,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAElE,OAAO,IAAA,mCAAe,EAAC,uCAAuB,EAAE;gBAC/C,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;gBACxB,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE;gBACpB,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjD,MAAM;aACN,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,2DAA2D,QAAQ,CAAC,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,EAC7F,GAAG,CAAC,KAAK,CACT,CAAC;YAGF,OAAO,IAAA,mCAAe,EAAC,uCAAuB,EAAE;gBAC/C,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;gBACxB,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE;gBACpB,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjD,MAAM,EAAE,EAAE;aACV,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAKO,KAAK,CAAC,WAAW,CACxB,QAA+B,EAC/B,IAAU,EACV,EAAQ,EACR,MAAuB;QAEvB,MAAM,eAAe,GAAG,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAK3C,KAAK,CAAC,CAAC;QAEV,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;QACX,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAEtD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IACf,CAAC;IAKO,UAAU,CAAC,UAAkB,EAAE,IAAU,EAAE,EAAQ,EAAE,MAAc;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAG1B,MAAM,YAAY,GACjB,MAAM,KAAK,KAAK;YACf,CAAC,CAAC,iCAAiC;YACnC,CAAC,CAAC,2EAA2E,CAAC;QAGhF,IAAI,KAAK,GAAG;KACT,YAAY;;yBAEQ,UAAU;iBAClB,MAAM;iBACN,IAAI;GAClB,CAAC;QAGF,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACtB,KAAK,IAAI,kBAAkB,MAAM,cAAc,CAAC;QACjD,CAAC;QAED,KAAK,IAAI,oBAAoB,CAAC;QAE9B,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAKO,UAAU,CACjB,GAAmD,EACnD,QAAsB;QAEtB,QAAQ,QAAQ,EAAE,CAAC;YAClB,KAAK,gCAAY,CAAC,IAAI,CAAC;YACvB,KAAK,gCAAY,CAAC,MAAM;gBACvB,OAAO,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC;YAEhC,KAAK,gCAAY,CAAC,IAAI;gBACrB,OAAO,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;YAEpE,KAAK,gCAAY,CAAC,IAAI,CAAC;YACvB,KAAK,gCAAY,CAAC,KAAK,CAAC;YACxB,KAAK,gCAAY,CAAC,KAAK,CAAC;YACxB,KAAK,gCAAY,CAAC,MAAM,CAAC;YACzB,KAAK,gCAAY,CAAC,GAAG,CAAC;YACtB,KAAK,gCAAY,CAAC,IAAI;gBACrB,OAAO,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAErE,KAAK,gCAAY,CAAC,KAAK;gBACtB,OAAO,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC;YAEhC;gBACC,OAAO,IAAI,CAAC;QACd,CAAC;IACF,CAAC;IAKO,gBAAgB,CAAC,IAAU,EAAE,EAAQ;QAC5C,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,UAAU,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAGpD,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACd,CAAC;QAGD,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACb,CAAC;QAGD,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACb,CAAC;QAGD,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACd,CAAC;QAGD,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA9KY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAIiC,gCAAc;GAH/C,yBAAyB,CA8KrC"}
+{"version":3,"file":"property-timeseries.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-timeseries.service.ts"],"names":[],"mappings":"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"}