@fastybird/smart-panel-backend 1.1.0-alpha.6 → 1.1.0-alpha.60

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

@@ -47,6 +47,10 @@ let PropertyCommandWindowService = class PropertyCommandWindowService {
     get(canonicalPropertyId) {
         return this.toSnapshot(this.getCurrent(canonicalPropertyId, Date.now()));
     }
+    peekGeneration(canonicalPropertyId) {
+        const current = this.windows.get(canonicalPropertyId);
+        return current !== undefined && current.expiresAt > Date.now() ? current.generation : undefined;
+    }
     confirm(handle, receipt) {
         const current = this.getCurrent(handle.canonicalPropertyId, Date.now());
         if (current === undefined || current.generation !== handle.generation) {
@@ -133,7 +137,9 @@ let PropertyCommandWindowService = class PropertyCommandWindowService {
         return true;
     }
     cancelRecovery(canonicalPropertyId) {
+        const recovery = this.recoveries.get(canonicalPropertyId);
         this.recoveries.delete(canonicalPropertyId);
+        return recovery !== undefined && recovery.deadlineAt > Date.now();
     }
     cancel(canonicalPropertyId) {
         this.windows.delete(canonicalPropertyId);

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

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

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

@@ -5,12 +5,14 @@ import { UpdateChannelPropertyDto } from '../dto/update-channel-property.dto';
 import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
 import { PropertyValueState } from '../models/property-value-state.model';
 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 { CommandLatencyTraceCollectorService } from './command-latency-trace-collector.service';
+import { DeviceCommandGraphService } from './device-command-graph.service';
 import { PlatformRegistryService } from './platform.registry.service';
 import { PropertyCommandDispatchService } from './property-command-dispatch.service';
 import { PropertyCommandWindowHandle, PropertyCommandWindowService } from './property-command-window.service';
+import { PropertyMetadataService } from './property-metadata.service';
+import { PropertyValueService } from './property-value.service';
 export interface PropertyCommandExecutionOptions {
     requestId?: string;
     context?: IntentContext;
@@ -39,15 +41,17 @@ export interface PropertyBatchCommandResult {
     results: SinglePropertyCommandResult[];
 }
 export declare class PropertyCommandService {
-    private readonly devicesService;
+    private readonly deviceGraphs;
     private readonly channelsService;
-    private readonly channelsPropertiesService;
+    private readonly propertyMetadata;
+    private readonly propertyValues;
     private readonly platformRegistryService;
     private readonly intentsService;
     private readonly propertyCommandDispatchService;
     private readonly propertyCommandWindowService;
+    private readonly commandLatencyTraceCollector;
     private readonly logger;
-    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, platformRegistryService: PlatformRegistryService, intentsService: IntentsService, propertyCommandDispatchService: PropertyCommandDispatchService, propertyCommandWindowService: PropertyCommandWindowService);
+    constructor(deviceGraphs: DeviceCommandGraphService, channelsService: ChannelsService, propertyMetadata: PropertyMetadataService, propertyValues: PropertyValueService, platformRegistryService: PlatformRegistryService, intentsService: IntentsService, propertyCommandDispatchService: PropertyCommandDispatchService, propertyCommandWindowService: PropertyCommandWindowService, commandLatencyTraceCollector?: CommandLatencyTraceCollectorService);
     handleInternal(user: ClientUserDto, payload?: object): Promise<{
         success: boolean;
         results: Array<{

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

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyCommandService = void 0;
 const class_validator_1 = require("class-validator");
@@ -22,21 +25,25 @@ 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");
+const command_latency_trace_collector_service_1 = require("./command-latency-trace-collector.service");
+const device_command_graph_service_1 = require("./device-command-graph.service");
 const platform_registry_service_1 = require("./platform.registry.service");
 const property_command_dispatch_service_1 = require("./property-command-dispatch.service");
 const property_command_window_service_1 = require("./property-command-window.service");
+const property_metadata_service_1 = require("./property-metadata.service");
+const property_value_service_1 = require("./property-value.service");
 let PropertyCommandService = class PropertyCommandService {
-    constructor(devicesService, channelsService, channelsPropertiesService, platformRegistryService, intentsService, propertyCommandDispatchService, propertyCommandWindowService) {
-        this.devicesService = devicesService;
+    constructor(deviceGraphs, channelsService, propertyMetadata, propertyValues, platformRegistryService, intentsService, propertyCommandDispatchService, propertyCommandWindowService, commandLatencyTraceCollector = new command_latency_trace_collector_service_1.CommandLatencyTraceCollectorService()) {
+        this.deviceGraphs = deviceGraphs;
         this.channelsService = channelsService;
-        this.channelsPropertiesService = channelsPropertiesService;
+        this.propertyMetadata = propertyMetadata;
+        this.propertyValues = propertyValues;
         this.platformRegistryService = platformRegistryService;
         this.intentsService = intentsService;
         this.propertyCommandDispatchService = propertyCommandDispatchService;
         this.propertyCommandWindowService = propertyCommandWindowService;
+        this.commandLatencyTraceCollector = commandLatencyTraceCollector;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_constants_1.DEVICES_MODULE_NAME, 'PropertyCommandService');
     }
     async handleInternal(user, payload) {
@@ -73,7 +80,7 @@ let PropertyCommandService = class PropertyCommandService {
         });
     }
     async executePropertyCommandById(propertyId, rawValue, options = {}) {
-        const property = await this.channelsPropertiesService.findOne(propertyId);
+        const property = await this.propertyMetadata.findOne(propertyId);
         if (!property) {
             return { device: '', success: false, reason: 'Property not found' };
         }
@@ -83,7 +90,7 @@ let PropertyCommandService = class PropertyCommandService {
             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;
+        const device = typeof channelDevice === 'string' ? await this.deviceGraphs.findOne(channelDevice) : channelDevice;
         if (!device) {
             return {
                 device: '',
@@ -140,7 +147,7 @@ let PropertyCommandService = class PropertyCommandService {
         const resolved = [];
         let targetDeviceId = null;
         for (const cmd of commands) {
-            const property = await this.channelsPropertiesService.findOne(cmd.propertyId);
+            const property = await this.propertyMetadata.findOne(cmd.propertyId);
             if (!property) {
                 return {
                     success: false,
@@ -166,7 +173,7 @@ let PropertyCommandService = class PropertyCommandService {
                 };
             }
             const channelDevice = channel.device;
-            const device = typeof channelDevice === 'string' ? await this.devicesService.findOne(channelDevice) : channelDevice;
+            const device = typeof channelDevice === 'string' ? await this.deviceGraphs.findOne(channelDevice) : channelDevice;
             if (!device) {
                 return {
                     success: false,
@@ -275,6 +282,11 @@ let PropertyCommandService = class PropertyCommandService {
             ttlMs,
         });
         this.logger.log(`Created intent ${intent.id} for ${targets.length} target(s)${options.requestId ? ` requestId=${options.requestId}` : ''}`);
+        this.commandLatencyTraceCollector.observeCommand({
+            requestId: options.requestId,
+            intentId: intent.id,
+            properties: commands,
+        });
         const results = [];
         try {
             for (const deviceId of Object.keys(groupedProperties)) {
@@ -319,9 +331,17 @@ let PropertyCommandService = class PropertyCommandService {
         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 });
+                const command = commands[0];
+                const property = command ? await this.propertyMetadata.findOne(command.property) : null;
+                const channel = property?.channel;
+                const device = channel && typeof channel !== 'string' ? channel.device : null;
+                if (channel &&
+                    typeof channel !== 'string' &&
+                    channel.id === command.channel &&
+                    device &&
+                    typeof device !== 'string' &&
+                    device.id === deviceId) {
+                    executions.push({ device: { id: device.id, type: device.type }, commandCount: commands.length });
                 }
             }
             catch {
@@ -331,7 +351,7 @@ let PropertyCommandService = class PropertyCommandService {
         return this.platformRegistryService.getCommandTtlMs(executions, intents_constants_1.DEFAULT_TTL_DEVICE_COMMAND);
     }
     async processDeviceCommands(deviceId, commands, dispatchOptions) {
-        const device = await this.devicesService.findOne(deviceId);
+        const device = await this.deviceGraphs.findOne(deviceId);
         if (!device) {
             this.logger.warn(`Device not found id=${deviceId}`);
             return { device: deviceId, success: false, reason: 'Device not found' };
@@ -347,13 +367,14 @@ let PropertyCommandService = class PropertyCommandService {
         }
         const propertyUpdates = [];
         for (const command of commands) {
-            const channel = await this.channelsService.findOne(command.channel, device.id);
+            const channel = device.channels.find((candidate) => candidate.id === command.channel);
             if (!channel) {
                 this.logger.warn(`Channel not found id=${command.channel} for deviceId=${device.id}`);
                 return { device: deviceId, success: false, reason: 'Channel not found' };
             }
-            const property = await this.channelsPropertiesService.findOne(command.property, channel.id);
-            if (!property) {
+            const property = await this.propertyMetadata.findOne(command.property);
+            const propertyChannelId = typeof property?.channel === 'string' ? property.channel : property?.channel.id;
+            if (!property || propertyChannelId !== channel.id) {
                 this.logger.warn(`Property not found id=${command.property} for channelId=${channel.id}`);
                 return { device: deviceId, success: false, reason: 'Property not found' };
             }
@@ -366,6 +387,15 @@ let PropertyCommandService = class PropertyCommandService {
                 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' };
             }
+            try {
+                property.value = await this.propertyValues.readLatest(property);
+            }
+            catch (error) {
+                this.logger.error(`Failed to load command property value id=${property.id}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            if (typeof property.channel !== 'string' && typeof property.channel.device !== 'string') {
+                property.channel.device.status = device.status;
+            }
             this.logger.log(`Adding command for propertyId=${property.id} value=${validation.value}`);
             propertyUpdates.push({ device, channel, property, value: validation.value });
         }
@@ -391,7 +421,7 @@ let PropertyCommandService = class PropertyCommandService {
     }
     async prepareApiPropertyCommand(device, channel, property, value) {
         try {
-            const resolvedDevice = typeof device === 'string' ? await this.devicesService.findOne(device) : device;
+            const resolvedDevice = typeof device === 'string' ? await this.deviceGraphs.findOne(device) : device;
             if (resolvedDevice === null) {
                 return null;
             }
@@ -410,7 +440,7 @@ let PropertyCommandService = class PropertyCommandService {
         this.propertyCommandWindowService.fail(receipt.handle);
     }
     async usesAuthoritativePropertyReadback(device, property, update) {
-        const resolvedDevice = typeof device === 'string' ? await this.devicesService.findOne(device) : device;
+        const resolvedDevice = typeof device === 'string' ? await this.deviceGraphs.findOne(device) : device;
         const effectiveProperty = update
             ? Object.setPrototypeOf({ ...property, ...update }, Reflect.getPrototypeOf(property))
             : property;
@@ -421,12 +451,15 @@ let PropertyCommandService = class PropertyCommandService {
 exports.PropertyCommandService = PropertyCommandService;
 exports.PropertyCommandService = PropertyCommandService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [devices_service_1.DevicesService,
+    __param(8, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [device_command_graph_service_1.DeviceCommandGraphService,
         channels_service_1.ChannelsService,
-        channels_properties_service_1.ChannelsPropertiesService,
+        property_metadata_service_1.PropertyMetadataService,
+        property_value_service_1.PropertyValueService,
         platform_registry_service_1.PlatformRegistryService,
         intents_service_1.IntentsService,
         property_command_dispatch_service_1.PropertyCommandDispatchService,
-        property_command_window_service_1.PropertyCommandWindowService])
+        property_command_window_service_1.PropertyCommandWindowService,
+        command_latency_trace_collector_service_1.CommandLatencyTraceCollectorService])
 ], PropertyCommandService);
 //# sourceMappingURL=property-command.service.js.map

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-metadata.service.d.ts

@@ -0,0 +1,38 @@
+import { DataSource, EntitySubscriberInterface, InsertEvent, RemoveEvent, TransactionCommitEvent, TransactionRollbackEvent, UpdateEvent } from 'typeorm';
+import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { ConfigService as NestConfigService } from '@nestjs/config';
+import { ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
+export declare class PropertyMetadataService implements EntitySubscriberInterface, OnModuleInit, OnModuleDestroy {
+    private readonly dataSource;
+    private readonly logger;
+    private readonly enabled;
+    private generation;
+    private readonly catalog;
+    private readonly loading;
+    private readonly deviceGraphs;
+    private readonly loadingGraphs;
+    private readonly dirtyTransactions;
+    constructor(dataSource: DataSource, configService?: NestConfigService);
+    onModuleInit(): Promise<void>;
+    onModuleDestroy(): void;
+    findOne(id: string): Promise<ChannelPropertyEntity | null>;
+    findDevice(id: string): Promise<DeviceEntity | null>;
+    beforeInsert(event: InsertEvent<unknown>): void;
+    afterInsert(event: InsertEvent<unknown>): void;
+    beforeUpdate(event: UpdateEvent<unknown>): void;
+    afterUpdate(event: UpdateEvent<unknown>): void;
+    beforeRemove(event: RemoveEvent<unknown>): void;
+    afterRemove(event: RemoveEvent<unknown>): void;
+    afterTransactionCommit(event: TransactionCommitEvent): void;
+    afterTransactionRollback(event: TransactionRollbackEvent): void;
+    private structuralMutation;
+    private transactionSettled;
+    getGeneration(): number;
+    invalidate(): void;
+    private findCached;
+    private loadCached;
+    private isEagerGraphDependency;
+    private copyGraph;
+    private query;
+    private copy;
+}

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

@@ -0,0 +1,210 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PropertyMetadataService = void 0;
+const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const logger_1 = require("../../../common/logger");
+const config_utils_1 = require("../../../common/utils/config.utils");
+const space_entity_1 = require("../../spaces/entities/space.entity");
+const devices_constants_1 = require("../devices.constants");
+const device_zone_entity_1 = require("../entities/device-zone.entity");
+const devices_entity_1 = require("../entities/devices.entity");
+const device_graph_query_utils_1 = require("../utils/device-graph-query.utils");
+const property_metadata_utils_1 = require("../utils/property-metadata.utils");
+let PropertyMetadataService = class PropertyMetadataService {
+    constructor(dataSource, configService = new config_1.ConfigService()) {
+        this.dataSource = dataSource;
+        this.logger = (0, logger_1.createExtensionLogger)(devices_constants_1.DEVICES_MODULE_NAME, 'PropertyMetadataService');
+        this.generation = 0;
+        this.catalog = new Map();
+        this.loading = new Map();
+        this.deviceGraphs = new Map();
+        this.loadingGraphs = new Map();
+        this.dirtyTransactions = new WeakSet();
+        this.enabled = !(0, config_utils_1.getEnvValue)(configService, 'FB_PROPERTY_VALUE_LOCKS_ENABLED', false);
+        this.dataSource.subscribers.push(this);
+    }
+    async onModuleInit() {
+        if (!this.enabled)
+            return;
+        try {
+            const generation = this.generation;
+            const properties = await this.query().getMany();
+            if (generation === this.generation) {
+                for (const property of properties)
+                    this.catalog.set(property.id, property);
+            }
+        }
+        catch (error) {
+            this.logger.warn(`Could not preload property metadata: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    onModuleDestroy() {
+        const index = this.dataSource.subscribers.indexOf(this);
+        if (index >= 0)
+            this.dataSource.subscribers.splice(index, 1);
+        this.invalidate();
+    }
+    async findOne(id) {
+        const property = this.enabled
+            ? await this.findCached(id)
+            : await this.query().where('property.id = :id', { id }).getOne();
+        if (!property)
+            return null;
+        const result = this.copy(property);
+        result.permissions = [...property.permissions];
+        if (Array.isArray(property.format))
+            result.format = property.format.slice();
+        if (typeof property.channel !== 'string') {
+            result.channel = this.copy(property.channel);
+            if (typeof property.channel.device !== 'string')
+                result.channel.device = this.copy(property.channel.device);
+        }
+        result.unit = (0, property_metadata_utils_1.resolvePropertyUnit)(result);
+        return result;
+    }
+    async findDevice(id) {
+        const query = () => (0, device_graph_query_utils_1.buildDeviceGraphQuery)(this.dataSource.getRepository(devices_entity_1.DeviceEntity))
+            .callListeners(false)
+            .where('device.id = :id', { id })
+            .getOne();
+        const device = this.enabled
+            ? await this.loadCached(id, this.deviceGraphs, this.loadingGraphs, query)
+            : await query();
+        return device ? this.copyGraph(device) : null;
+    }
+    beforeInsert(event) {
+        this.structuralMutation(event);
+    }
+    afterInsert(event) {
+        this.structuralMutation(event);
+    }
+    beforeUpdate(event) {
+        this.structuralMutation(event);
+    }
+    afterUpdate(event) {
+        this.structuralMutation(event);
+    }
+    beforeRemove(event) {
+        this.structuralMutation(event);
+    }
+    afterRemove(event) {
+        this.structuralMutation(event);
+    }
+    afterTransactionCommit(event) {
+        this.transactionSettled(event);
+    }
+    afterTransactionRollback(event) {
+        this.transactionSettled(event);
+    }
+    structuralMutation(event) {
+        if (!event.metadata.inheritanceTree.some((type) => [
+            devices_entity_1.ChannelPropertyEntity,
+            devices_entity_1.ChannelEntity,
+            devices_entity_1.DeviceEntity,
+            devices_entity_1.ChannelControlEntity,
+            devices_entity_1.DeviceControlEntity,
+            device_zone_entity_1.DeviceZoneEntity,
+            space_entity_1.SpaceEntity,
+        ].includes(type)) &&
+            !this.isEagerGraphDependency(event.metadata))
+            return;
+        if (event.queryRunner.isTransactionActive)
+            this.dirtyTransactions.add(event.queryRunner);
+        this.invalidate();
+    }
+    transactionSettled(event) {
+        if (!this.dirtyTransactions.has(event.queryRunner))
+            return;
+        this.invalidate();
+        if (!event.queryRunner.isTransactionActive)
+            this.dirtyTransactions.delete(event.queryRunner);
+    }
+    getGeneration() {
+        return this.generation;
+    }
+    invalidate() {
+        this.generation += 1;
+        this.catalog.clear();
+        this.deviceGraphs.clear();
+    }
+    findCached(id) {
+        return this.loadCached(id, this.catalog, this.loading, () => this.query().where('property.id = :id', { id }).getOne());
+    }
+    async loadCached(id, catalog, pending, query) {
+        while (true) {
+            const cached = catalog.get(id);
+            if (cached)
+                return cached;
+            const generation = this.generation;
+            if (pending.get(id)?.generation !== generation) {
+                pending.set(id, { generation, promise: query() });
+            }
+            const loading = pending.get(id);
+            try {
+                const entity = await loading.promise;
+                if (generation === this.generation) {
+                    if (entity)
+                        catalog.set(id, entity);
+                    return entity;
+                }
+            }
+            finally {
+                if (pending.get(id) === loading)
+                    pending.delete(id);
+            }
+        }
+    }
+    isEagerGraphDependency(metadata) {
+        return (this.dataSource.entityMetadatas ?? []).some((entity) => entity.inheritanceTree.includes(devices_entity_1.DeviceEntity) &&
+            entity.relations.some((relation) => relation.isEager &&
+                relation.inverseEntityMetadata.inheritanceTree.some((type) => metadata.inheritanceTree.includes(type))));
+    }
+    copyGraph(value, seen = new Map()) {
+        if (value === null || typeof value !== 'object')
+            return value;
+        if (value instanceof Date)
+            return new Date(value.getTime());
+        if (seen.has(value))
+            return seen.get(value);
+        const prototype = Object.getPrototypeOf(value);
+        const result = (Array.isArray(value) ? [] : Object.create(prototype));
+        seen.set(value, result);
+        for (const [key, child] of Object.entries(value))
+            result[key] = this.copyGraph(child, seen);
+        return result;
+    }
+    query() {
+        return this.dataSource
+            .getRepository(devices_entity_1.ChannelPropertyEntity)
+            .createQueryBuilder('property')
+            .innerJoinAndSelect('property.channel', 'channel')
+            .innerJoinAndSelect('channel.device', 'device')
+            .callListeners(false);
+    }
+    copy(entity) {
+        const prototype = Object.getPrototypeOf(entity);
+        return Object.assign(Object.create(prototype), entity);
+    }
+};
+exports.PropertyMetadataService = PropertyMetadataService;
+exports.PropertyMetadataService = PropertyMetadataService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(1, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        config_1.ConfigService])
+], PropertyMetadataService);
+//# sourceMappingURL=property-metadata.service.js.map