@fastybird/smart-panel-backend 1.1.0-alpha.40 → 1.1.0-alpha.41

package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js

@@ -8,68 +8,45 @@ 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.SpaceActivityListener = void 0;
-const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
-const typeorm_2 = require("@nestjs/typeorm");
 const logger_1 = require("../../../common/logger");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
-const space_entity_1 = require("../../../modules/spaces/entities/space.entity");
+const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
+const space_activity_service_1 = require("../../../modules/spaces/services/space-activity.service");
 const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
 let SpaceActivityListener = class SpaceActivityListener {
-    constructor(spaceRepository, channelRepository) {
-        this.spaceRepository = spaceRepository;
-        this.channelRepository = channelRepository;
+    constructor(propertyMetadata, activity) {
+        this.propertyMetadata = propertyMetadata;
+        this.activity = activity;
         this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceActivityListener');
     }
     onModuleInit() {
         this.logger.debug('Space activity listener initialized');
     }
     async handlePropertyUpdated(property) {
+        const observedAt = new Date();
+        const generation = this.activity.getGeneration();
         try {
-            await this.updateSpaceActivity(property);
+            if (!property.id)
+                return;
+            const metadata = await this.propertyMetadata.findOne(property.id);
+            const channel = metadata?.channel;
+            if (!channel || typeof channel === 'string')
+                return;
+            const device = channel.device;
+            if (!device || typeof device === 'string' || !device.roomId)
+                return;
+            this.activity.record(device.roomId, observedAt, generation);
         }
         catch (error) {
             const err = error;
             this.logger.warn(`Failed to update space activity on property update: ${err.message}`, err.stack);
         }
     }
-    async updateSpaceActivity(property) {
-        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
-        if (!channelId) {
-            this.logger.debug('Property has no channel, skipping activity update');
-            return;
-        }
-        const channel = await this.channelRepository
-            .createQueryBuilder('channel')
-            .innerJoinAndSelect('channel.device', 'device')
-            .where('channel.id = :channelId', { channelId })
-            .andWhere('device.roomId IS NOT NULL')
-            .getOne();
-        if (!channel) {
-            this.logger.debug('Channel not found or device has no room, skipping activity update');
-            return;
-        }
-        const device = channel.device;
-        if (!device.roomId) {
-            this.logger.debug('Device has no room, skipping activity update');
-            return;
-        }
-        const now = new Date();
-        await this.spaceRepository
-            .createQueryBuilder()
-            .update()
-            .set({ lastActivityAt: now })
-            .where('id = :roomId', { roomId: device.roomId })
-            .execute();
-        this.logger.debug(`Updated lastActivityAt for room=${device.roomId} to ${now.toISOString()}`);
-    }
 };
 exports.SpaceActivityListener = SpaceActivityListener;
 __decorate([
@@ -81,9 +58,7 @@ __decorate([
 ], SpaceActivityListener.prototype, "handlePropertyUpdated", null);
 exports.SpaceActivityListener = SpaceActivityListener = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_2.InjectRepository)(space_entity_1.SpaceEntity)),
-    __param(1, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
-    __metadata("design:paramtypes", [typeorm_1.Repository,
-        typeorm_1.Repository])
+    __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
+        space_activity_service_1.SpaceActivityService])
 ], SpaceActivityListener);
 //# sourceMappingURL=space-activity.listener.js.map

package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"space-activity.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-activity.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AAErC,2CAA0D;AAC1D,yDAAgD;AAChD,6CAAmD;AAEnD,mDAA+D;AAC/D,kFAA2F;AAC3F,qFAAsH;AACtH,gFAA4E;AAC5E,+EAA8E;AAGvE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YAEC,eAAyD,EAEzD,iBAA6D;QAF5C,oBAAe,GAAf,eAAe,CAAyB;QAExC,sBAAiB,GAAjB,iBAAiB,CAA2B;QAN7C,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,uBAAuB,CAAC,CAAC;IAO1F,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAC1D,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,QAA+B;QAC1D,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,QAA+B;QAEhE,MAAM,SAAS,GAAG,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAEjG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACvE,OAAO;QACR,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB;aAC1C,kBAAkB,CAAC,SAAS,CAAC;aAC7B,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,CAAC;aAC9C,KAAK,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAC/C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,MAAM,EAAE,CAAC;QAEX,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,OAAO;QACR,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAsB,CAAC;QAE9C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,OAAO;QACR,CAAC;QAGD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,MAAM,IAAI,CAAC,eAAe;aACxB,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,GAAG,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;aAC5B,KAAK,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;aAChD,OAAO,EAAE,CAAC;QAEZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC/F,CAAC;CACD,CAAA;AAlEY,sDAAqB;AAgB3B;IAFL,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;;qCACf,sCAAqB;;kEAO1D;gCAvBW,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAKV,WAAA,IAAA,0BAAgB,EAAC,0BAAW,CAAC,CAAA;IAE7B,WAAA,IAAA,0BAAgB,EAAC,8BAAa,CAAC,CAAA;qCADE,oBAAU;QAER,oBAAU;GAPnC,qBAAqB,CAkEjC"}
+{"version":3,"file":"space-activity.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-activity.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,yDAAgD;AAEhD,mDAA+D;AAC/D,kFAA2F;AAC3F,qFAAyF;AACzF,2GAAsG;AACtG,oGAA+F;AAC/F,+EAA8E;AAGvE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YACkB,gBAAyC,EACzC,QAA8B;QAD9B,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,aAAQ,GAAR,QAAQ,CAAsB;QAJ/B,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,uBAAuB,CAAC,CAAC;IAK1F,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAC1D,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,QAA+B;QAC1D,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QACjD,IAAI,CAAC;YACJ,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;YAGzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;YAClC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;gBAAE,OAAO;YACpD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,OAAO;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;CACD,CAAA;AAhCY,sDAAqB;AAc3B;IAFL,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;;qCACf,sCAAqB;;kEAiB1D;gCA/BW,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAKwB,mDAAuB;QAC/B,6CAAoB;GALpC,qBAAqB,CAgCjC"}

package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.d.ts

@@ -1,15 +1,15 @@
-import { Repository } from 'typeorm';
 import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
 import { SpaceClimateStateService } from '../services/space-climate-state.service';
 export declare class SpaceClimateStateListener implements OnModuleInit, OnModuleDestroy {
-    private readonly channelRepository;
+    private readonly propertyMetadata;
     private readonly climateStateService;
     private readonly eventEmitter;
     private readonly logger;
     private readonly debounceTimers;
-    constructor(channelRepository: Repository<ChannelEntity>, climateStateService: SpaceClimateStateService, eventEmitter: EventEmitter2);
+    constructor(propertyMetadata: PropertyMetadataService, climateStateService: SpaceClimateStateService, eventEmitter: EventEmitter2);
     onModuleInit(): void;
     onModuleDestroy(): void;
     handlePropertyChanged(property: ChannelPropertyEntity): Promise<void>;

package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js

@@ -8,20 +8,16 @@ 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.SpaceClimateStateListener = void 0;
-const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
-const typeorm_2 = require("@nestjs/typeorm");
 const logger_1 = require("../../../common/logger");
 const transform_utils_1 = require("../../../common/utils/transform.utils");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_constants_2 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
 const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
 const spaces_response_model_1 = require("../models/spaces-response.model");
 const space_climate_state_service_1 = require("../services/space-climate-state.service");
@@ -42,8 +38,8 @@ const CLIMATE_PROPERTY_CATEGORIES = [
     devices_constants_1.PropertyCategory.LOCKED,
 ];
 let SpaceClimateStateListener = class SpaceClimateStateListener {
-    constructor(channelRepository, climateStateService, eventEmitter) {
-        this.channelRepository = channelRepository;
+    constructor(propertyMetadata, climateStateService, eventEmitter) {
+        this.propertyMetadata = propertyMetadata;
         this.climateStateService = climateStateService;
         this.eventEmitter = eventEmitter;
         this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceClimateStateListener');
@@ -68,27 +64,19 @@ let SpaceClimateStateListener = class SpaceClimateStateListener {
         }
     }
     async processClimatePropertyChange(property) {
-        if (!CLIMATE_PROPERTY_CATEGORIES.includes(property.category)) {
-            return;
-        }
-        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
-        if (!channelId) {
+        if (!property.id || !CLIMATE_PROPERTY_CATEGORIES.includes(property.category)) {
             return;
         }
-        const channel = await this.channelRepository
-            .createQueryBuilder('channel')
-            .innerJoinAndSelect('channel.device', 'device')
-            .where('channel.id = :channelId', { channelId })
-            .andWhere('device.roomId IS NOT NULL')
-            .getOne();
-        if (!channel) {
+        const metadata = await this.propertyMetadata.findOne(property.id);
+        const channel = metadata?.channel;
+        if (!channel || typeof channel === 'string') {
             return;
         }
         if (!CLIMATE_CHANNEL_CATEGORIES.includes(channel.category)) {
             return;
         }
         const device = channel.device;
-        const roomId = device.roomId;
+        const roomId = device && typeof device !== 'string' ? device.roomId : null;
         if (!roomId) {
             return;
         }
@@ -135,8 +123,7 @@ __decorate([
 ], SpaceClimateStateListener.prototype, "handlePropertyChanged", null);
 exports.SpaceClimateStateListener = SpaceClimateStateListener = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
-    __metadata("design:paramtypes", [typeorm_1.Repository,
+    __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
         space_climate_state_service_1.SpaceClimateStateService,
         event_emitter_1.EventEmitter2])
 ], SpaceClimateStateListener);

package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"space-climate-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-climate-state.listener.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"space-climate-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-climate-state.listener.ts"],"names":[],"mappings":"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"}

package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.d.ts

@@ -1,15 +1,15 @@
-import { Repository } from 'typeorm';
 import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
 import { SpaceLightingStateService } from '../services/space-lighting-state.service';
 export declare class SpaceLightingStateListener implements OnModuleInit, OnModuleDestroy {
-    private readonly channelRepository;
+    private readonly propertyMetadata;
     private readonly lightingStateService;
     private readonly eventEmitter;
     private readonly logger;
     private readonly debounceTimers;
-    constructor(channelRepository: Repository<ChannelEntity>, lightingStateService: SpaceLightingStateService, eventEmitter: EventEmitter2);
+    constructor(propertyMetadata: PropertyMetadataService, lightingStateService: SpaceLightingStateService, eventEmitter: EventEmitter2);
     onModuleInit(): void;
     onModuleDestroy(): void;
     handlePropertyChanged(property: ChannelPropertyEntity): Promise<void>;

package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js

@@ -8,19 +8,15 @@ 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.SpaceLightingStateListener = void 0;
-const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
-const typeorm_2 = require("@nestjs/typeorm");
 const logger_1 = require("../../../common/logger");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_constants_2 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
 const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
 const spaces_response_model_1 = require("../models/spaces-response.model");
 const space_lighting_state_service_1 = require("../services/space-lighting-state.service");
@@ -39,8 +35,8 @@ const LIGHTING_PROPERTY_CATEGORIES = [
     devices_constants_1.PropertyCategory.SATURATION,
 ];
 let SpaceLightingStateListener = class SpaceLightingStateListener {
-    constructor(channelRepository, lightingStateService, eventEmitter) {
-        this.channelRepository = channelRepository;
+    constructor(propertyMetadata, lightingStateService, eventEmitter) {
+        this.propertyMetadata = propertyMetadata;
         this.lightingStateService = lightingStateService;
         this.eventEmitter = eventEmitter;
         this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceLightingStateListener');
@@ -65,27 +61,19 @@ let SpaceLightingStateListener = class SpaceLightingStateListener {
         }
     }
     async processLightingPropertyChange(property) {
-        if (!LIGHTING_PROPERTY_CATEGORIES.includes(property.category)) {
-            return;
-        }
-        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
-        if (!channelId) {
+        if (!property.id || !LIGHTING_PROPERTY_CATEGORIES.includes(property.category)) {
             return;
         }
-        const channel = await this.channelRepository
-            .createQueryBuilder('channel')
-            .innerJoinAndSelect('channel.device', 'device')
-            .where('channel.id = :channelId', { channelId })
-            .andWhere('device.roomId IS NOT NULL')
-            .getOne();
-        if (!channel) {
+        const metadata = await this.propertyMetadata.findOne(property.id);
+        const channel = metadata?.channel;
+        if (!channel || typeof channel === 'string') {
             return;
         }
         if (!LIGHTING_CHANNEL_CATEGORIES.includes(channel.category)) {
             return;
         }
         const device = channel.device;
-        const roomId = device.roomId;
+        const roomId = device && typeof device !== 'string' ? device.roomId : null;
         if (!roomId) {
             return;
         }
@@ -134,8 +122,7 @@ __decorate([
 ], SpaceLightingStateListener.prototype, "handlePropertyChanged", null);
 exports.SpaceLightingStateListener = SpaceLightingStateListener = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
-    __metadata("design:paramtypes", [typeorm_1.Repository,
+    __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
         space_lighting_state_service_1.SpaceLightingStateService,
         event_emitter_1.EventEmitter2])
 ], SpaceLightingStateListener);

package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"space-lighting-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-lighting-state.listener.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"space-lighting-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-lighting-state.listener.ts"],"names":[],"mappings":"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"}

package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.d.ts

@@ -1,15 +1,15 @@
-import { Repository } from 'typeorm';
 import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
 import { SpaceSensorStateService } from '../services/space-sensor-state.service';
 export declare class SpaceSensorStateListener implements OnModuleInit, OnModuleDestroy {
-    private readonly channelRepository;
+    private readonly propertyMetadata;
     private readonly sensorStateService;
     private readonly eventEmitter;
     private readonly logger;
     private readonly debounceTimers;
-    constructor(channelRepository: Repository<ChannelEntity>, sensorStateService: SpaceSensorStateService, eventEmitter: EventEmitter2);
+    constructor(propertyMetadata: PropertyMetadataService, sensorStateService: SpaceSensorStateService, eventEmitter: EventEmitter2);
     onModuleInit(): void;
     onModuleDestroy(): void;
     handleSensorRoleChanged(payload: {

package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js

@@ -8,19 +8,15 @@ 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.SpaceSensorStateListener = void 0;
-const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
-const typeorm_2 = require("@nestjs/typeorm");
 const logger_1 = require("../../../common/logger");
 const transform_utils_1 = require("../../../common/utils/transform.utils");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
 const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
 const spaces_response_model_1 = require("../models/spaces-response.model");
 const space_sensor_state_service_1 = require("../services/space-sensor-state.service");
@@ -39,8 +35,8 @@ const SENSOR_PROPERTY_CATEGORIES = [
     devices_constants_1.PropertyCategory.PERCENTAGE,
 ];
 let SpaceSensorStateListener = class SpaceSensorStateListener {
-    constructor(channelRepository, sensorStateService, eventEmitter) {
-        this.channelRepository = channelRepository;
+    constructor(propertyMetadata, sensorStateService, eventEmitter) {
+        this.propertyMetadata = propertyMetadata;
         this.sensorStateService = sensorStateService;
         this.eventEmitter = eventEmitter;
         this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceSensorStateListener');
@@ -72,27 +68,19 @@ let SpaceSensorStateListener = class SpaceSensorStateListener {
         }
     }
     async processSensorPropertyChange(property) {
-        if (!SENSOR_PROPERTY_CATEGORIES.includes(property.category)) {
-            return;
-        }
-        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
-        if (!channelId) {
+        if (!property.id || !SENSOR_PROPERTY_CATEGORIES.includes(property.category)) {
             return;
         }
-        const channel = await this.channelRepository
-            .createQueryBuilder('channel')
-            .innerJoinAndSelect('channel.device', 'device')
-            .where('channel.id = :channelId', { channelId })
-            .andWhere('device.roomId IS NOT NULL')
-            .getOne();
-        if (!channel) {
+        const metadata = await this.propertyMetadata.findOne(property.id);
+        const channel = metadata?.channel;
+        if (!channel || typeof channel === 'string') {
             return;
         }
         if (!spaces_home_control_constants_1.SENSOR_CHANNEL_CATEGORIES.includes(channel.category)) {
             return;
         }
         const device = channel.device;
-        const roomId = device.roomId;
+        const roomId = device && typeof device !== 'string' ? device.roomId : null;
         if (!roomId) {
             return;
         }
@@ -147,8 +135,7 @@ __decorate([
 ], SpaceSensorStateListener.prototype, "handlePropertyChanged", null);
 exports.SpaceSensorStateListener = SpaceSensorStateListener = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
-    __metadata("design:paramtypes", [typeorm_1.Repository,
+    __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
         space_sensor_state_service_1.SpaceSensorStateService,
         event_emitter_1.EventEmitter2])
 ], SpaceSensorStateListener);

package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"space-sensor-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-sensor-state.listener.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"space-sensor-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-sensor-state.listener.ts"],"names":[],"mappings":"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"}

package/dist/plugins/spaces-home-control/services/space-climate-state.service.d.ts

@@ -1,10 +1,9 @@
 import { DeviceCategory } from '../../../modules/devices/devices.constants';
 import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
 import { IntentTimeseriesService } from '../../../modules/intents/services/intent-timeseries.service';
-import { SpacesService } from '../../../modules/spaces/services/spaces.service';
 import { ClimateMode, ClimateRole } from '../spaces-home-control.constants';
-import { SpaceClimateRoleService } from './space-climate-role.service';
 import { SpaceIntentBaseService } from './space-intent-base.service';
+import { SpaceStateReadService } from './space-state-read.service';
 export interface PrimaryClimateDevice {
     device: DeviceEntity;
     deviceCategory: DeviceCategory;
@@ -51,11 +50,10 @@ export interface ClimateState {
     lastAppliedAt: Date | null;
 }
 export declare class SpaceClimateStateService extends SpaceIntentBaseService {
-    private readonly spacesService;
-    private readonly climateRoleService;
+    private readonly stateReads;
     private readonly intentTimeseriesService;
     private readonly logger;
-    constructor(spacesService: SpacesService, climateRoleService: SpaceClimateRoleService, intentTimeseriesService: IntentTimeseriesService);
+    constructor(stateReads: SpaceStateReadService, intentTimeseriesService: IntentTimeseriesService);
     getClimateState(spaceId: string): Promise<ClimateState | null>;
     getPrimaryClimateDevicesInSpace(spaceId: string): Promise<PrimaryClimateDevice[]>;
     private extractPrimaryClimateDevices;

package/dist/plugins/spaces-home-control/services/space-climate-state.service.js

@@ -14,16 +14,14 @@ const common_1 = require("@nestjs/common");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const intent_timeseries_service_1 = require("../../../modules/intents/services/intent-timeseries.service");
-const spaces_service_1 = require("../../../modules/spaces/services/spaces.service");
 const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
 const spaces_home_control_constants_1 = require("../spaces-home-control.constants");
-const space_climate_role_service_1 = require("./space-climate-role.service");
 const space_intent_base_service_1 = require("./space-intent-base.service");
+const space_state_read_service_1 = require("./space-state-read.service");
 let SpaceClimateStateService = class SpaceClimateStateService extends space_intent_base_service_1.SpaceIntentBaseService {
-    constructor(spacesService, climateRoleService, intentTimeseriesService) {
+    constructor(stateReads, intentTimeseriesService) {
         super();
-        this.spacesService = spacesService;
-        this.climateRoleService = climateRoleService;
+        this.stateReads = stateReads;
         this.intentTimeseriesService = intentTimeseriesService;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceClimateStateService');
     }
@@ -47,11 +45,11 @@ let SpaceClimateStateService = class SpaceClimateStateService extends space_inte
             lastAppliedAt: null,
         };
         const [devices, roleMap] = await Promise.all([
-            this.spacesService.findDevicesBySpace(spaceId),
-            this.climateRoleService.getRoleMap(spaceId),
+            this.stateReads.findDevicesBySpace(spaceId),
+            this.stateReads.getClimateRoleMap(spaceId),
         ]);
         if (!devices || devices.length === 0) {
-            const space = await this.spacesService.findOne(spaceId);
+            const space = await this.stateReads.findOne(spaceId);
             if (!space) {
                 this.logger.warn(`Space not found id=${spaceId}`);
                 return null;
@@ -186,8 +184,8 @@ let SpaceClimateStateService = class SpaceClimateStateService extends space_inte
     }
     async getPrimaryClimateDevicesInSpace(spaceId) {
         const [devices, roleMap] = await Promise.all([
-            this.spacesService.findDevicesBySpace(spaceId),
-            this.climateRoleService.getRoleMap(spaceId),
+            this.stateReads.findDevicesBySpace(spaceId),
+            this.stateReads.getClimateRoleMap(spaceId),
         ]);
         return this.extractPrimaryClimateDevices(devices, roleMap);
     }
@@ -422,8 +420,7 @@ let SpaceClimateStateService = class SpaceClimateStateService extends space_inte
 exports.SpaceClimateStateService = SpaceClimateStateService;
 exports.SpaceClimateStateService = SpaceClimateStateService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [spaces_service_1.SpacesService,
-        space_climate_role_service_1.SpaceClimateRoleService,
+    __metadata("design:paramtypes", [space_state_read_service_1.SpaceStateReadService,
         intent_timeseries_service_1.IntentTimeseriesService])
 ], SpaceClimateStateService);
 //# sourceMappingURL=space-climate-state.service.js.map