npm - @fastybird/smart-panel-backend - Versions diffs - 1.0.0-beta.2 → 1.1.0-alpha.0 - Mend

@fastybird/smart-panel-backend 1.0.0-beta.2 → 1.1.0-alpha.0

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 (1927) hide show

package/dist/modules/devices/services/channels.service.js CHANGED Viewed

@@ -28,15 +28,18 @@ const transform_utils_1 = require("../../../common/utils/transform.utils");
 const devices_constants_1 = require("../devices.constants");
 const devices_exceptions_1 = require("../devices.exceptions");
 const devices_entity_1 = require("../entities/devices.entity");
+const unique_constraint_utils_1 = require("../utils/unique-constraint.utils");
 const channels_type_mapper_service_1 = require("./channels-type-mapper.service");
 const channels_controls_service_1 = require("./channels.controls.service");
 const channels_properties_service_1 = require("./channels.properties.service");
+const device_structure_lock_service_1 = require("./device-structure-lock.service");
 let ChannelsService = class ChannelsService {
-    constructor(repository, channelsMapperService, channelsPropertiesService, channelsControlsService, dataSource, eventEmitter) {
+    constructor(repository, channelsMapperService, channelsPropertiesService, channelsControlsService, structureLock, dataSource, eventEmitter) {
         this.repository = repository;
         this.channelsMapperService = channelsMapperService;
         this.channelsPropertiesService = channelsPropertiesService;
         this.channelsControlsService = channelsControlsService;
+        this.structureLock = structureLock;
         this.dataSource = dataSource;
         this.eventEmitter = eventEmitter;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_constants_1.DEVICES_MODULE_NAME, 'ChannelsService');
@@ -88,6 +91,51 @@ let ChannelsService = class ChannelsService {
         this.logger.debug(`Found ${channels.length} channels`);
         return channels;
     }
+    async findSummaryPage(deviceId, limit) {
+        const query = this.repository
+            .createQueryBuilder('channel')
+            .innerJoin('channel.device', 'device')
+            .where('device.id = :deviceId', { deviceId })
+            .orderBy('channel.name', 'ASC')
+            .take(limit);
+        const [channels, total] = await query.getManyAndCount();
+        return { channels, total };
+    }
+    async findBoundedForDevices(deviceIds, categories, perDeviceLimit) {
+        if (deviceIds.length === 0 || categories.length === 0) {
+            return { channels: [], deviceIds: {}, truncated: false };
+        }
+        const devicePlaceholders = deviceIds.map(() => '?').join(', ');
+        const categoryPlaceholders = categories.map(() => '?').join(', ');
+        const idRows = await this.dataSource.query(`SELECT ranked."id" AS "id", ranked."deviceId" AS "deviceId", ranked."rowNumber" AS "rowNumber"
+			 FROM (
+			   SELECT channel."id" AS "id", channel."deviceId" AS "deviceId",
+			          ROW_NUMBER() OVER (
+			            PARTITION BY channel."deviceId"
+			            ORDER BY channel."name", channel."id"
+			          ) AS "rowNumber"
+			   FROM devices_module_channels channel
+			   WHERE channel."deviceId" IN (${devicePlaceholders})
+			   AND channel."category" IN (${categoryPlaceholders})
+			 ) ranked
+			 WHERE ranked."rowNumber" <= ?
+			 ORDER BY ranked."deviceId", ranked."rowNumber"`, [...deviceIds, ...categories, perDeviceLimit + 1]);
+        const selectedRows = idRows.filter((row) => Number(row.rowNumber) <= perDeviceLimit);
+        const channelIds = selectedRows.map((row) => row.id);
+        const truncated = idRows.length > selectedRows.length;
+        if (channelIds.length === 0) {
+            return { channels: [], deviceIds: {}, truncated };
+        }
+        const channels = await this.repository
+            .createQueryBuilder('channel')
+            .where('channel.id IN (:...channelIds)', { channelIds })
+            .getMany();
+        return {
+            channels,
+            deviceIds: Object.fromEntries(selectedRows.map((row) => [row.id, row.deviceId])),
+            truncated,
+        };
+    }
     async findOne(id, deviceId, type) {
         const mapping = type ? this.channelsMapperService.getMapping(type) : null;
         const repository = mapping ? this.dataSource.getRepository(mapping.class) : this.repository;
@@ -204,11 +252,54 @@ let ChannelsService = class ChannelsService {
         }
         const repository = this.dataSource.getRepository(mapping.class);
         const channel = repository.create((0, transform_utils_1.toInstance)(mapping.class, dtoInstance));
-        const raw = await repository.save(channel);
-        for (const propertyDtoInstance of createDto.properties ?? []) {
-            this.logger.debug(`Creating new property for channelId=${raw.id}`);
-            await this.channelsPropertiesService.create(raw.id, propertyDtoInstance);
+        if (channel.id) {
+            const existing = await this.repository.findOne({ where: { id: channel.id } });
+            if (existing) {
+                this.logger.error(`[VALIDATION FAILED] Channel id=${channel.id} already exists, refusing to create over it`);
+                throw new devices_exceptions_1.DevicesValidationException(`Channel with id=${channel.id} already exists. Creating a channel with an id already in use is not allowed.`);
+            }
         }
+        await this.structureLock.runExclusive(async () => {
+            await repository
+                .insert(channel)
+                .catch((error) => {
+                if ((0, unique_constraint_utils_1.isPrimaryKeyCollision)(error)) {
+                    this.logger.error(`[VALIDATION FAILED] Channel id=${channel.id} was created concurrently by another request`);
+                    throw new devices_exceptions_1.DevicesValidationException(`Channel with id=${channel.id} already exists. Creating a channel with an id already in use is not allowed.`);
+                }
+                throw error;
+            });
+            try {
+                for (const propertyDtoInstance of createDto.properties ?? []) {
+                    this.logger.debug(`Creating new property for channelId=${channel.id}`);
+                    await this.channelsPropertiesService.create(channel.id, propertyDtoInstance);
+                }
+            }
+            catch (error) {
+                this.logger.error(`Nested creation failed for channelId=${channel.id}, rolling the channel back`);
+                const orphaned = await this.channelsPropertiesService
+                    .findAll(channel.id)
+                    .catch((readError) => {
+                    this.logger.error(`Failed to read back properties for rolled-back channelId=${channel.id}`, readError instanceof Error ? readError : undefined);
+                    return [];
+                });
+                for (const property of orphaned) {
+                    try {
+                        await this.channelsPropertiesService.remove(property.id);
+                    }
+                    catch (cleanupError) {
+                        this.logger.error(`Failed to roll back property id=${property.id} for channelId=${channel.id}`, cleanupError instanceof Error ? cleanupError : undefined);
+                    }
+                }
+                const rollbackTarget = await repository.findOne({
+                    where: { id: channel.id },
+                });
+                if (rollbackTarget) {
+                    await repository.remove(rollbackTarget);
+                }
+                throw error;
+            }
+        });
         let savedChannel = (await this.getOneOrThrow(channel.id));
         if (mapping.afterCreate) {
             await mapping.afterCreate(savedChannel);
@@ -252,28 +343,36 @@ let ChannelsService = class ChannelsService {
         }
         const repository = this.dataSource.getRepository(mapping.class);
         const updateFields = (0, lodash_omitby_1.default)((0, transform_utils_1.toInstance)(mapping.class, dtoInstance), lodash_isundefined_1.default);
-        const entityFieldsChanged = Object.keys(updateFields).some((key) => {
-            const newValue = updateFields[key];
-            const existingValue = channel[key];
-            if (Array.isArray(newValue) && Array.isArray(existingValue)) {
-                return JSON.stringify(newValue) !== JSON.stringify(existingValue);
-            }
-            if (typeof newValue === 'object' &&
-                typeof existingValue === 'object' &&
-                newValue !== null &&
-                existingValue !== null) {
-                return JSON.stringify(newValue) !== JSON.stringify(existingValue);
-            }
-            if (newValue === null && existingValue === null) {
-                return false;
-            }
-            if (newValue === null || existingValue === null) {
-                return true;
+        const entityFieldsChanged = await this.structureLock.runExclusive(async () => {
+            const current = (await this.getOneOrThrow(id));
+            const previous = { ...current };
+            const entityFieldsChanged = Object.keys(updateFields).some((key) => {
+                const newValue = updateFields[key];
+                const existingValue = current[key];
+                if (Array.isArray(newValue) && Array.isArray(existingValue)) {
+                    return JSON.stringify(newValue) !== JSON.stringify(existingValue);
+                }
+                if (typeof newValue === 'object' &&
+                    typeof existingValue === 'object' &&
+                    newValue !== null &&
+                    existingValue !== null) {
+                    return JSON.stringify(newValue) !== JSON.stringify(existingValue);
+                }
+                if (newValue === null && existingValue === null) {
+                    return false;
+                }
+                if (newValue === null || existingValue === null) {
+                    return true;
+                }
+                return newValue !== existingValue;
+            });
+            Object.assign(current, updateFields);
+            if (mapping.beforeUpdate) {
+                await mapping.beforeUpdate(current, previous);
             }
-            return newValue !== existingValue;
+            await repository.save(current);
+            return entityFieldsChanged;
         });
-        Object.assign(channel, updateFields);
-        await repository.save(channel);
         let updatedChannel = (await this.getOneOrThrow(channel.id));
         if (mapping.afterUpdate) {
             await mapping.afterUpdate(updatedChannel);
@@ -373,6 +472,7 @@ exports.ChannelsService = ChannelsService = __decorate([
         channels_type_mapper_service_1.ChannelsTypeMapperService,
         channels_properties_service_1.ChannelsPropertiesService,
         channels_controls_service_1.ChannelsControlsService,
+        device_structure_lock_service_1.DeviceStructureLockService,
         typeorm_1.DataSource,
         event_emitter_1.EventEmitter2])
 ], ChannelsService);

package/dist/modules/devices/services/channels.service.js.map CHANGED Viewed

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

package/dist/modules/devices/services/device-connection-state.service.d.ts CHANGED Viewed

@@ -1,6 +1,11 @@
 import { StorageService } from '../../storage/services/storage.service';
 import { ConnectionState } from '../devices.constants';
 import { ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
+export interface DeviceConnectionStateValue {
+    online: boolean;
+    status: ConnectionState;
+    lastChanged: Date | null;
+}
 export declare class DeviceConnectionStateService {
     private readonly storageService;
     private readonly logger;
@@ -9,11 +14,15 @@ export declare class DeviceConnectionStateService {
     constructor(storageService: StorageService);
     getOnlineCountForDevices(currentDeviceIds: Set<DeviceEntity['id']>): Promise<number>;
     write(device: DeviceEntity, property: ChannelPropertyEntity, status: ConnectionState): Promise<void>;
-    readLatest(device: DeviceEntity): Promise<{
-        online: boolean;
-        status: ConnectionState;
-        lastChanged: Date | null;
-    }>;
+    readLatest(device: Pick<DeviceEntity, 'id'>): Promise<DeviceConnectionStateValue>;
+    readLatestStrict(device: Pick<DeviceEntity, 'id'>): Promise<DeviceConnectionStateValue>;
+    readLatestMany(devices: Array<Pick<DeviceEntity, 'id'>>): Promise<Map<DeviceEntity['id'], DeviceConnectionStateValue>>;
+    readLatestManyStrict(devices: Array<Pick<DeviceEntity, 'id'>>): Promise<Map<DeviceEntity['id'], DeviceConnectionStateValue>>;
+    private readLatestManyInternal;
+    private readLatestInternal;
+    private toStatus;
+    private unknownStatus;
+    private escapeTagValue;
     delete(device: DeviceEntity): Promise<void>;
     deleteByProperty(property: ChannelPropertyEntity): Promise<void>;
 }

package/dist/modules/devices/services/device-connection-state.service.js CHANGED Viewed

@@ -103,16 +103,85 @@ let DeviceConnectionStateService = class DeviceConnectionStateService {
         }
     }
     async readLatest(device) {
+        return this.readLatestInternal(device, false);
+    }
+    async readLatestStrict(device) {
+        return this.readLatestInternal(device, true);
+    }
+    async readLatestMany(devices) {
+        return this.readLatestManyInternal(devices, false);
+    }
+    async readLatestManyStrict(devices) {
+        return this.readLatestManyInternal(devices, true);
+    }
+    async readLatestManyInternal(devices, strict) {
+        const statuses = new Map();
+        const missingIds = [];
+        for (const device of devices) {
+            const cached = this.statusMap.get(device.id);
+            if (cached) {
+                statuses.set(device.id, cached);
+            }
+            else {
+                missingIds.push(device.id);
+            }
+        }
+        if (missingIds.length === 0) {
+            return statuses;
+        }
+        if (!this.storageService.isConnected()) {
+            if (strict) {
+                throw new Error('Device connection status storage is unavailable');
+            }
+            for (const id of missingIds) {
+                statuses.set(id, this.unknownStatus());
+            }
+            return statuses;
+        }
+        const predicate = missingIds.map((id) => `deviceId = '${this.escapeTagValue(id)}'`).join(' OR ');
+        const query = `
+        SELECT *
+        FROM device_status
+        WHERE (${predicate})
+        GROUP BY "deviceId"
+		ORDER BY time DESC
+		LIMIT 1
+      `;
+        try {
+            const rows = await this.storageService.queryStrict(query);
+            const rowByDevice = new Map(rows.map((row) => [row.deviceId, row]));
+            for (const id of missingIds) {
+                const row = rowByDevice.get(id);
+                const status = row ? this.toStatus(row) : this.unknownStatus();
+                this.statusMap.set(id, status);
+                statuses.set(id, status);
+            }
+            return statuses;
+        }
+        catch (error) {
+            const err = error;
+            this.logger.error(`Failed to batch read device statuses from storage error=${err.message}`, {
+                stack: err.stack,
+            });
+            if (strict) {
+                throw error;
+            }
+            for (const id of missingIds) {
+                statuses.set(id, this.unknownStatus());
+            }
+            return statuses;
+        }
+    }
+    async readLatestInternal(device, strict) {
         if (this.statusMap.has(device.id)) {
             this.logger.debug(`Loaded cached status for device id=${device.id}, status=${this.statusMap.get(device.id)?.status}`, { resource: device.id });
             return this.statusMap.get(device.id);
         }
         if (!this.storageService.isConnected()) {
-            return {
-                online: false,
-                status: devices_constants_1.ConnectionState.UNKNOWN,
-                lastChanged: null,
-            };
+            if (strict) {
+                throw new Error('Device connection status storage is unavailable');
+            }
+            return this.unknownStatus();
         }
         try {
             const query = `
@@ -122,21 +191,21 @@ let DeviceConnectionStateService = class DeviceConnectionStateService {
         LIMIT 1
       `;
             this.logger.debug(`Fetching latest status id=${device.id}`, { resource: device.id });
-            const result = await this.storageService.query(query);
+            const result = await (strict
+                ? this.storageService.queryStrict(query)
+                : this.storageService.query(query));
             if (!result.length) {
                 this.logger.debug(`No stored status found for id=${device.id}`, { resource: device.id });
-                return {
-                    online: false,
-                    status: devices_constants_1.ConnectionState.UNKNOWN,
-                    lastChanged: null,
-                };
+                return this.unknownStatus();
             }
             const latest = result[0];
-            const lastChanged = latest.time ? new Date(latest.time) : new Date();
+            const connectionState = this.toStatus(latest);
             this.logger.debug(`Read latest value id=${device.id} status=${latest.status}`, { resource: device.id });
-            this.statusMap.set(device.id, { online: latest.online, status: latest.status, lastChanged });
-            this.statusPropertyMap.set(device.id, latest.propertyId);
-            return { online: latest.online, status: latest.status, lastChanged };
+            this.statusMap.set(device.id, connectionState);
+            if (latest.propertyId) {
+                this.statusPropertyMap.set(device.id, latest.propertyId);
+            }
+            return connectionState;
         }
         catch (error) {
             const err = error;
@@ -144,13 +213,25 @@ let DeviceConnectionStateService = class DeviceConnectionStateService {
                 resource: device.id,
                 stack: err.stack,
             });
-            return {
-                online: false,
-                status: devices_constants_1.ConnectionState.UNKNOWN,
-                lastChanged: null,
-            };
+            if (strict) {
+                throw error;
+            }
+            return this.unknownStatus();
         }
     }
+    toStatus(row) {
+        return {
+            online: row.online ?? Number(row.onlineI ?? 0) > 0,
+            status: row.status ?? devices_constants_1.ConnectionState.UNKNOWN,
+            lastChanged: row.time ? new Date(row.time) : null,
+        };
+    }
+    unknownStatus() {
+        return { online: false, status: devices_constants_1.ConnectionState.UNKNOWN, lastChanged: null };
+    }
+    escapeTagValue(value) {
+        return value.replaceAll('\\', '\\\\').replaceAll("'", "\\'");
+    }
     async delete(device) {
         this.statusMap.delete(device.id);
         this.statusPropertyMap.delete(device.id);

package/dist/modules/devices/services/device-connection-state.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"device-connection-state.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-connection-state.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,8FAAwF;AACxF,4EAAwE;AACxE,4DAAiH;~~AAI1G~~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~~IAED~~,KAAK,CAAC,UAAU,~~CACf~~,~~MAAoB~~;~~QAGpB~~,~~IAAI~~,IAAI,CAAC,~~SAAS~~,CAAC,~~GAAG~~,CAAC,~~MAAM~~,CAAC,EAAE,CAAC,EAAE,CAAC;~~YACnC~~,IAAI,CAAC,~~MAAM~~,CAAC,KAAK,~~CAChB~~,~~sCAAsC~~,MAAM,CAAC,EAAE,~~YAAY~~,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,~~EAAE~~,MAAM,EAAE,~~EAClG~~,~~EAAE,~~QAAQ,~~EAAE~~,MAAM,CAAC,EAAE,EAAE,~~CACvB~~,CAAC;~~YAEF~~,~~OAAO~~,IAAI,CAAC,~~SAAS~~,CAAC,~~GAAG~~,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;~~QACtC~~,CAAC;~~QAGD~~,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,~~OAAO;gBACN~~,MAAM,EAAE,KAAK;~~gBACb~~,MAAM,EAAE,~~mCAAe~~,CAAC~~,OAAO~~;~~gBAC/B~~,~~WAAW~~,EAAE,IAAI;~~aACjB~~,CAAC;~~QACH~~,CAAC;QAED,IAAI,CAAC~~;YACJ~~,~~MAAM~~,~~KAAK~~,GAAG~~;;4BAEW~~,MAAM,CAAC,~~EAAE~~;;;~~OAG9B~~,CAAC;~~YAEL~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,~~6BAA6B~~,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,~~QAAQ~~,EAAE,MAAM,CAAC,~~EAAE~~,EAAE,CAAC,CAAC;~~YAErF~~,MAAM,MAAM,GAAG,~~MAAM~~,IAAI,CAAC,~~cAAc~~,CAAC,~~KAAK~~,~~CAO3C~~,~~KAAK~~,CAAC,CAAC;~~YAEV~~,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;~~gBACpB~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,~~iCAAiC~~,~~MAAM~~,CAAC,~~EAAE~~,EAAE,EAAE,EAAE,~~QAAQ~~,~~EAAE~~,~~MAAM~~,CAAC,~~EAAE~~,EAAE,CAAC,CAAC;~~gBAEzF~~,~~OAAO~~;~~oBACN~~,MAAM,EAAE,~~KAAK~~;~~oBACb~~,~~MAAM~~,EAAE,~~mCAAe~~,CAAC,OAAO;~~oBAC~~/B,~~WAAW~~,~~EAAE~~,~~IAAI~~;~~iBACjB~~,CAAC~~;YACH~~,CAAC;~~YAED~~,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;~~YACzB~~,~~MAAM~~,~~WAAW~~,GAAG,MAAM,CAAC,~~IAAI~~,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,~~IAAI~~,IAAI,EAAE,CAAC;~~YAErE~~,IAAI,CAAC,MAAM,CAAC,~~KAAK~~,CAAC,~~wBAAwB~~,MAAM,CAAC,~~EAAE~~,~~WAAW~~,MAAM,CAAC,~~MAAM~~,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;~~YAExG~~,IAAI,CAAC,~~SAAS~~,CAAC,~~GAAG~~,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,~~EAAE~~,MAAM,~~EAAE~~,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;~~YAC7F~~,IAAI,CAAC,~~iBAAiB~~,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,UAAU,~~CAAC~~,CAAC;~~YAEzD~~,~~OAAO~~,~~EAAE~~,~~MAAM~~,~~EAAE~~,~~MAAM~~,CAAC,MAAM,EAAE,~~MAAM,~~EAAE,MAAM,CAAC,~~MAAM~~,~~EAAE~~,~~WAAW~~,~~EAAE~~,CAAC;~~QACtE~~,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,EAAE;gBACnG,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;YAEH,OAAO;~~gBACN~~,MAAM,EAAE,~~KAAK~~;~~gBACb~~,MAAM,EAAE,mCAAe,CAAC,OAAO;~~gBAC/B~~,WAAW,EAAE,IAAI;~~aACjB~~,CAAC;~~QACH~~,CAAC;~~IACF~~,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAoB;QAEhC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,+CAA+C,MAAM,CAAC,EAAE,GAAG,CAAC;YAE1E,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,EAAE;gBACrG,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAA+B;QAErD,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpG,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,iDAAiD,QAAQ,CAAC,EAAE,GAAG,CAAC;YAE9E,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEvC,IAAI,CAAC,MAAM,CAAC,GAAG,CACd,wCAAwC,QAAQ,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAC/F,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CACtC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,QAAQ,CAAC,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,EAAE;gBAC/G,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD,CAAA;~~AAhQY~~,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,mBAAU,GAAE;qCAQiC,gCAAc;GAP/C,4BAA4B,~~CAgQxC~~"}
1	+ {"version":3,"file":"device-connection-state.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-connection-state.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/devices/services/device-connectivity.service.d.ts CHANGED Viewed

@@ -17,6 +17,11 @@ export declare class DeviceConnectivityService {
         reason?: string;
         ts?: number;
     }): Promise<void>;
+    trySetConnectionState(deviceId: DeviceEntity['id'], state: {
+        state: ConnectionState;
+        reason?: string;
+        ts?: number;
+    }): Promise<boolean>;
     private findOrCreateConnectionChannel;
     private findOrCreateConnectionProperty;
 }

package/dist/modules/devices/services/device-connectivity.service.js CHANGED Viewed

@@ -27,9 +27,12 @@ let DeviceConnectivityService = class DeviceConnectivityService {
         this.eventEmitter = eventEmitter;
     }
     async setConnectionState(deviceId, state) {
+        await this.trySetConnectionState(deviceId, state);
+    }
+    async trySetConnectionState(deviceId, state) {
         const device = await this.devicesService.findOne(deviceId);
         if (!device) {
-            return;
+            return false;
         }
         let channel;
         let property;
@@ -38,10 +41,10 @@ let DeviceConnectivityService = class DeviceConnectivityService {
             property = await this.findOrCreateConnectionProperty(channel, true);
         }
         catch {
-            return;
+            return false;
         }
         if (!property) {
-            return;
+            return false;
         }
         const last = property.value?.value;
         let changed = false;
@@ -54,7 +57,7 @@ let DeviceConnectivityService = class DeviceConnectivityService {
                 changed = true;
             }
             catch {
-                return;
+                return false;
             }
         }
         try {
@@ -65,7 +68,7 @@ let DeviceConnectivityService = class DeviceConnectivityService {
             }
         }
         catch {
-            return;
+            return false;
         }
         if (changed) {
             device.status.online = devices_constants_1.OnlineDeviceState.includes(state.state);
@@ -73,6 +76,7 @@ let DeviceConnectivityService = class DeviceConnectivityService {
             device.status.lastChanged = new Date();
             this.eventEmitter.emit(devices_constants_1.EventType.DEVICE_CONNECTION_CHANGED, { device, state: state.state, reason: state.reason });
         }
+        return true;
     }
     async findOrCreateConnectionChannel(device, create) {
         let channel = await this.channelsService.findOneBy('category', devices_constants_1.ChannelCategory.DEVICE_INFORMATION, device.id);

package/dist/modules/devices/services/device-connectivity.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"device-connectivity.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-connectivity.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAsD;AAEtD,4DAQ8B;AAC9B,8DAAiE;AAGjE,+EAA0E;AAC1E,yDAAqD;AACrD,uFAAiF;AACjF,uDAAmD;AAG5C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACrC,YACkB,cAA8B,EAC9B,eAAgC,EAChC,yBAAoD,EACpD,4BAA0D,EAC1D,YAA2B;QAJ3B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,iBAAY,GAAZ,YAAY,CAAe;IAC1C,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CACvB,QAA4B,EAC5B,KAA+D;QAE/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM,EAAE,CAAC;YAEb,OAAO;~~QACR~~,CAAC;QAED,IAAI,OAAsB,CAAC;QAC3B,IAAI,QAA+B,CAAC;QAEpC,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACjE,QAAQ,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrE,CAAC;QAAC,MAAM,CAAC;YAGR,OAAO;~~QACR~~,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEf,OAAO;~~QACR~~,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAEnC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;oBACxD,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;iBAC1B,CAAC,CAAC;gBAEH,OAAO,GAAG,IAAI,CAAC;YAChB,CAAC;YAAC,MAAM,CAAC;gBAER,OAAO;~~YACR~~,CAAC;QACF,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAE9E,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;gBACvC,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE7E,OAAO,GAAG,IAAI,CAAC;YAChB,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YAER,OAAO;~~QACR~~,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YAEb,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,qCAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;YAEvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,6BAAS,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACnH,CAAC;~~IACF~~,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,MAAoB,EAAE,MAAe;QAChF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,EAAE,mCAAe,CAAC,kBAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAE9G,IAAI,OAAO,KAAK,IAAI,IAAI,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC;gBACJ,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;oBAC3C,MAAM,EAAE,MAAM,CAAC,EAAE;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,UAAU,EAAE,oBAAoB;oBAChC,QAAQ,EAAE,mCAAe,CAAC,kBAAkB;oBAC5C,IAAI,EAAE,oBAAoB;iBAC1B,CAAC,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBAGR,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,EAAE,mCAAe,CAAC,kBAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3G,CAAC;QACF,CAAC;QAED,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,6CAAwB,CAAC,8BAA8B,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAC3C,OAAsB,EACtB,MAAe;QAEf,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,UAAU,EAAE,oCAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE/G,IAAI,QAAQ,KAAK,IAAI,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,CAAC;gBACJ,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE;oBAClE,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,UAAU,EAAE,kBAAkB;oBAC9B,IAAI,EAAE,kBAAkB;oBACxB,QAAQ,EAAE,oCAAgB,CAAC,MAAM;oBACjC,WAAW,EAAE,CAAC,kCAAc,CAAC,SAAS,CAAC;oBACvC,SAAS,EAAE,gCAAY,CAAC,IAAI;oBAC5B,MAAM,EAAE;wBACP,mCAAe,CAAC,SAAS;wBACzB,mCAAe,CAAC,YAAY;wBAC5B,mCAAe,CAAC,IAAI;wBACpB,mCAAe,CAAC,KAAK;wBACrB,mCAAe,CAAC,OAAO;wBACvB,mCAAe,CAAC,QAAQ;wBACxB,mCAAe,CAAC,OAAO;wBACvB,mCAAe,CAAC,IAAI;wBACpB,mCAAe,CAAC,KAAK;wBACrB,mCAAe,CAAC,OAAO;qBACvB;iBACD,CAAC,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBAGR,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,UAAU,EAAE,oCAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5G,CAAC;QACF,CAAC;QAED,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,6CAAwB,CAAC,+BAA+B,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD,CAAA;~~AAjJY~~,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAGsB,gCAAc;QACb,kCAAe;QACL,uDAAyB;QACtB,8DAA4B;QAC5C,6BAAa;GANjC,yBAAyB,~~CAiJrC~~"}
1	+ {"version":3,"file":"device-connectivity.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-connectivity.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/devices/services/device-control-tool.service.d.ts CHANGED Viewed

@@ -1,21 +1,13 @@
-import { IntentsService } from '../../intents/services/intents.service';
-import { LlmToolCall, ToolDefinition, ToolExecutionResult } from '../../tools/platforms/tool-provider.platform';
+import { LlmToolCall, ToolDefinition, ToolExecutionContext, ToolExecutionResult } from '../../tools/platforms/tool-provider.platform';
 import { BaseToolProviderService } from '../../tools/services/base-tool-provider.service';
 import { ShortIdMappingService } from '../../tools/services/short-id-mapping.service';
-import { ChannelsPropertiesService } from './channels.properties.service';
-import { DevicesService } from './devices.service';
-import { PlatformRegistryService } from './platform.registry.service';
+import { PropertyCommandService } from './property-command.service';
 export declare class DeviceControlToolService extends BaseToolProviderService {
-    private readonly intentsService;
-    private readonly devicesService;
-    private readonly channelsPropertiesService;
-    private readonly platformRegistry;
+    private readonly propertyCommandService;
     private readonly shortIdMapping;
     protected readonly logger: import("../../../common/logger").ExtensionLoggerService;
-    constructor(intentsService: IntentsService, devicesService: DevicesService, channelsPropertiesService: ChannelsPropertiesService, platformRegistry: PlatformRegistryService, shortIdMapping: ShortIdMappingService);
+    constructor(propertyCommandService: PropertyCommandService, shortIdMapping: ShortIdMappingService);
     getType(): string;
     getToolDefinitions(): ToolDefinition[];
-    protected handleToolCall(toolCall: LlmToolCall): Promise<ToolExecutionResult>;
-    private executeControlDevice;
-    private coerceValue;
+    protected handleToolCall(toolCall: LlmToolCall, context: ToolExecutionContext): Promise<ToolExecutionResult>;
 }