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

package/dist/modules/scenes/services/scene-tool.service.js.map

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

package/dist/modules/scenes/services/scenes-bulk.service.d.ts

@@ -0,0 +1,9 @@
+import { BulkResultModel } from '../../api/models/bulk.model';
+import { ScenesService } from './scenes.service';
+export declare class ScenesBulkService {
+    private readonly scenesService;
+    private readonly logger;
+    constructor(scenesService: ScenesService);
+    remove(ids: string[]): Promise<BulkResultModel>;
+    setEnabled(ids: string[], enabled: boolean): Promise<BulkResultModel>;
+}

package/dist/modules/scenes/services/scenes-bulk.service.js

@@ -0,0 +1,42 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScenesBulkService = void 0;
+const common_1 = require("@nestjs/common");
+const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const bulk_utils_1 = require("../../api/utils/bulk.utils");
+const scenes_constants_1 = require("../scenes.constants");
+const scenes_exceptions_1 = require("../scenes.exceptions");
+const scenes_service_1 = require("./scenes.service");
+let ScenesBulkService = class ScenesBulkService {
+    constructor(scenesService) {
+        this.scenesService = scenesService;
+        this.logger = (0, extension_logger_service_1.createExtensionLogger)(scenes_constants_1.SCENES_MODULE_NAME, 'ScenesBulkService');
+    }
+    async remove(ids) {
+        const result = await (0, bulk_utils_1.runBulkOperation)(ids, (id) => this.scenesService.remove(id), { fallbackReason: 'Scene could not be removed', safeErrors: [scenes_exceptions_1.ScenesException], logger: this.logger });
+        this.logger.debug(`Bulk removal finished succeeded=${result.succeeded.length} failed=${result.failed.length}`);
+        return result;
+    }
+    async setEnabled(ids, enabled) {
+        const result = await (0, bulk_utils_1.runBulkOperation)(ids, async (id) => {
+            await this.scenesService.update(id, { enabled });
+        }, { fallbackReason: 'Scene could not be updated', safeErrors: [scenes_exceptions_1.ScenesException], logger: this.logger });
+        this.logger.debug(`Bulk enabled=${String(enabled)} finished succeeded=${result.succeeded.length} failed=${result.failed.length}`);
+        return result;
+    }
+};
+exports.ScenesBulkService = ScenesBulkService;
+exports.ScenesBulkService = ScenesBulkService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [scenes_service_1.ScenesService])
+], ScenesBulkService);
+//# sourceMappingURL=scenes-bulk.service.js.map

package/dist/modules/scenes/services/scenes-bulk.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scenes-bulk.service.js","sourceRoot":"","sources":["../../../../src/modules/scenes/services/scenes-bulk.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,8FAAwF;AAExF,2DAA8D;AAC9D,0DAAyD;AACzD,4DAAuD;AAEvD,qDAAiD;AAU1C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAG7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAFxC,WAAM,GAAG,IAAA,gDAAqB,EAAC,qCAAkB,EAAE,mBAAmB,CAAC,CAAC;IAE7B,CAAC;IAE7D,KAAK,CAAC,MAAM,CAAC,GAAa;QACzB,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAgB,EACpC,GAAG,EAGH,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EACrC,EAAE,cAAc,EAAE,4BAA4B,EAAE,UAAU,EAAE,CAAC,mCAAe,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CACpG,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,MAAM,CAAC,SAAS,CAAC,MAAM,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/G,OAAO,MAAM,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAa,EAAE,OAAgB;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAgB,EACpC,GAAG,EACH,KAAK,EAAE,EAAE,EAAE,EAAE;YACZ,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAClD,CAAC,EACD,EAAE,cAAc,EAAE,4BAA4B,EAAE,UAAU,EAAE,CAAC,mCAAe,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CACpG,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,gBAAgB,MAAM,CAAC,OAAO,CAAC,uBAAuB,MAAM,CAAC,SAAS,CAAC,MAAM,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAC9G,CAAC;QAEF,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AAlCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAIgC,8BAAa;GAH7C,iBAAiB,CAkC7B"}

package/dist/modules/scenes/services/scenes.service.d.ts

@@ -4,7 +4,39 @@ import { SpacesService } from '../../spaces/services/spaces.service';
 import { CreateSceneDto } from '../dto/create-scene.dto';
 import { UpdateSceneDto } from '../dto/update-scene.dto';
 import { SceneEntity } from '../entities/scenes.entity';
+import { SceneCategory } from '../scenes.constants';
 import { SceneActionsService } from './scene-actions.service';
+export interface SceneSummaryPage {
+    scenes: SceneEntity[];
+    total: number;
+}
+export interface SceneSearchSummary {
+    id: string;
+    name: string;
+    category: SceneCategory;
+    enabled: boolean;
+    triggerable: boolean;
+    primarySpaceId: string | null;
+    rankTier: number;
+    lexicalScore: number;
+}
+export interface SceneSearchSummaryInput {
+    match: string;
+    offset?: number;
+    limit: number;
+    rawQuery?: string;
+    normalizedQuery?: string;
+    normalizedTokens?: string[];
+    primarySpaceIds?: string[];
+    primarySpaceId?: string;
+    primarySpaceParentId?: string;
+    categories?: SceneCategory[];
+    candidateTrigger?: boolean;
+}
+export interface SceneSearchSummaryPage {
+    scenes: SceneSearchSummary[];
+    total: number;
+}
 export declare class ScenesService {
     private readonly repository;
     private readonly sceneActionsService;
@@ -17,6 +49,9 @@ export declare class ScenesService {
     findBySpace(primarySpaceId: string): Promise<SceneEntity[]>;
     getCount(): Promise<number>;
     findAll(): Promise<SceneEntity[]>;
+    findSummaryPage(limit: number, primarySpaceId?: string | string[]): Promise<SceneSummaryPage>;
+    searchSummaryPage(input: SceneSearchSummaryInput): Promise<SceneSearchSummaryPage>;
+    findTriggerableSummaryPage(limit: number): Promise<SceneSummaryPage>;
     findOne(id: string): Promise<SceneEntity | null>;
     findOneBy(column: 'id' | 'category' | 'name', value: string | number | boolean): Promise<SceneEntity | null>;
     create(createDto: CreateSceneDto): Promise<SceneEntity>;

package/dist/modules/scenes/services/scenes.service.js

@@ -25,6 +25,7 @@ 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 sqlite_fts_utils_1 = require("../../../common/utils/sqlite-fts.utils");
 const transform_utils_1 = require("../../../common/utils/transform.utils");
 const spaces_service_1 = require("../../spaces/services/spaces.service");
 const create_scene_dto_1 = require("../dto/create-scene.dto");
@@ -78,6 +79,122 @@ let ScenesService = class ScenesService {
         this.logger.debug(`[LOOKUP ALL] Found ${scenes.length} scenes`);
         return scenes;
     }
+    async findSummaryPage(limit, primarySpaceId) {
+        if (Array.isArray(primarySpaceId) && primarySpaceId.length === 0) {
+            return { scenes: [], total: 0 };
+        }
+        const query = this.repository
+            .createQueryBuilder('scene')
+            .select([
+            'scene.id',
+            'scene.name',
+            'scene.category',
+            'scene.enabled',
+            'scene.triggerable',
+            'scene.primarySpaceId',
+        ])
+            .orderBy('scene.name', 'ASC')
+            .take(limit);
+        if (Array.isArray(primarySpaceId)) {
+            query.where('scene.primarySpaceId IN (:...primarySpaceIds)', { primarySpaceIds: primarySpaceId });
+        }
+        else if (primarySpaceId) {
+            query.where('scene.primarySpaceId = :primarySpaceId', { primarySpaceId });
+        }
+        const [scenes, total] = await query.getManyAndCount();
+        return { scenes, total };
+    }
+    async searchSummaryPage(input) {
+        if (input.limit <= 0 || input.primarySpaceIds?.length === 0 || input.categories?.length === 0) {
+            return { scenes: [], total: 0 };
+        }
+        const predicates = ['home_context_entity_search_fts.entity_kind = ?', 'home_context_entity_search_fts MATCH ?'];
+        const parameters = ['scene', input.match];
+        const spacePredicates = [];
+        if (input.primarySpaceIds) {
+            spacePredicates.push(`scene."primarySpaceId" IN (${input.primarySpaceIds.map(() => '?').join(', ')})`);
+            parameters.push(...input.primarySpaceIds);
+        }
+        if (input.primarySpaceId) {
+            spacePredicates.push('scene."primarySpaceId" = ?');
+            parameters.push(input.primarySpaceId);
+        }
+        if (input.primarySpaceParentId) {
+            spacePredicates.push('scene."primarySpaceId" IN (SELECT scoped_space.id FROM spaces_module_spaces scoped_space ' +
+                'WHERE scoped_space."parentId" = ?)');
+            parameters.push(input.primarySpaceParentId);
+        }
+        if (spacePredicates.length > 0) {
+            predicates.push(`(${spacePredicates.join(' OR ')})`);
+        }
+        if (input.categories) {
+            predicates.push(`scene.category IN (${input.categories.map(() => '?').join(', ')})`);
+            parameters.push(...input.categories);
+        }
+        if (input.candidateTrigger === true) {
+            predicates.push('scene.enabled = 1');
+            predicates.push('scene.triggerable = 1');
+        }
+        const where = predicates.join('\n AND ');
+        const rank = (0, sqlite_fts_utils_1.buildSqliteFtsNameRankExpression)({
+            ftsTable: 'home_context_entity_search_fts',
+            vocabularyTable: 'home_context_entity_search_vocab',
+            entityIdExpression: 'scene.id',
+            rawQuery: input.rawQuery,
+            normalizedQuery: input.normalizedQuery,
+            normalizedTokens: input.normalizedTokens,
+        });
+        const [rows, countRows] = await Promise.all([
+            this.dataSource.query(`SELECT scene.id AS id,
+				        scene.name AS name,
+				        scene.category AS category,
+				        scene.enabled AS enabled,
+				        scene.triggerable AS triggerable,
+				        scene."primarySpaceId" AS "primarySpaceId",
+				        ${rank.sql} AS "rankTier",
+				        bm25(home_context_entity_search_fts) AS "lexicalScore"
+				 FROM home_context_entity_search_fts
+				 INNER JOIN scenes_module_scenes scene
+				   ON scene.id = home_context_entity_search_fts.entity_id
+				 WHERE ${where}
+				 ORDER BY "rankTier" ASC, "lexicalScore" ASC, LOWER(scene.name) ASC, scene.id ASC
+				 LIMIT ? OFFSET ?`, [...rank.parameters, ...parameters, input.limit, input.offset ?? 0]),
+            this.dataSource.query(`SELECT COUNT(*) AS total
+				 FROM home_context_entity_search_fts
+				 INNER JOIN scenes_module_scenes scene
+				   ON scene.id = home_context_entity_search_fts.entity_id
+				 WHERE ${where}`, parameters),
+        ]);
+        return {
+            scenes: rows.map((row) => ({
+                ...row,
+                enabled: Boolean(row.enabled),
+                triggerable: Boolean(row.triggerable),
+                rankTier: Number(row.rankTier),
+                lexicalScore: Number(row.lexicalScore),
+            })),
+            total: Number(countRows[0]?.total ?? 0),
+        };
+    }
+    async findTriggerableSummaryPage(limit) {
+        const [scenes, total] = await this.repository
+            .createQueryBuilder('scene')
+            .select([
+            'scene.id',
+            'scene.name',
+            'scene.category',
+            'scene.enabled',
+            'scene.triggerable',
+            'scene.primarySpaceId',
+        ])
+            .where('scene.enabled = :enabled', { enabled: true })
+            .andWhere('scene.triggerable = :triggerable', { triggerable: true })
+            .orderBy('scene.name', 'ASC')
+            .addOrderBy('scene.id', 'ASC')
+            .take(limit)
+            .getManyAndCount();
+        return { scenes, total };
+    }
     async findOne(id) {
         this.logger.debug(`[LOOKUP] Fetching scene with id=${id}`);
         const scene = await this.repository

package/dist/modules/scenes/services/scenes.service.js.map

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

package/dist/modules/scenes/validators/scene-exists-constraint.validator.js

@@ -30,7 +30,7 @@ let SceneExistsConstraintValidator = class SceneExistsConstraintValidator {
 exports.SceneExistsConstraintValidator = SceneExistsConstraintValidator;
 exports.SceneExistsConstraintValidator = SceneExistsConstraintValidator = __decorate([
     (0, common_1.Injectable)(),
-    (0, class_validator_1.ValidatorConstraint)({ name: 'SceneExistsValidation', async: false }),
+    (0, class_validator_1.ValidatorConstraint)({ name: 'SceneExistsValidation', async: true }),
     __metadata("design:paramtypes", [scenes_service_1.ScenesService])
 ], SceneExistsConstraintValidator);
 const ValidateSceneExists = (validationOptions) => {

package/dist/modules/scenes/validators/scene-exists-constraint.validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"scene-exists-constraint.validator.js","sourceRoot":"","sources":["../../../../src/modules/scenes/validators/scene-exists-constraint.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAMyB;AAEzB,2CAA4C;AAE5C,+DAA2D;AAIpD,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,QAAQ,CAAC,OAA2B;QACzC,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAG3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE9D,OAAO,CAAC,CAAC,WAAW,CAAC;IACtB,CAAC;IAED,cAAc,CAAC,IAAyB;QACvC,OAAO,cAAc,IAAI,CAAC,QAAQ,eAAe,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACtI,CAAC;CACD,CAAA;AAfY,wEAA8B;yCAA9B,8BAA8B;IAF1C,IAAA,mBAAU,GAAE;IACZ,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;qCAExB,8BAAa;GAD7C,8BAA8B,CAe1C;AAEM,MAAM,mBAAmB,GAAG,CAAC,iBAAqC,EAAE,EAAE;IAC5E,OAAO,UAAU,MAAc,EAAE,YAAoB;QACpD,IAAA,mCAAiB,EAAC;YACjB,IAAI,EAAE,qBAAqB;YAC3B,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,8BAA8B;SACzC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B"}
+{"version":3,"file":"scene-exists-constraint.validator.js","sourceRoot":"","sources":["../../../../src/modules/scenes/validators/scene-exists-constraint.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAMyB;AAEzB,2CAA4C;AAE5C,+DAA2D;AAIpD,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,QAAQ,CAAC,OAA2B;QACzC,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAG3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE9D,OAAO,CAAC,CAAC,WAAW,CAAC;IACtB,CAAC;IAED,cAAc,CAAC,IAAyB;QACvC,OAAO,cAAc,IAAI,CAAC,QAAQ,eAAe,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACtI,CAAC;CACD,CAAA;AAfY,wEAA8B;yCAA9B,8BAA8B;IAF1C,IAAA,mBAAU,GAAE;IACZ,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qCAEvB,8BAAa;GAD7C,8BAA8B,CAe1C;AAEM,MAAM,mBAAmB,GAAG,CAAC,iBAAqC,EAAE,EAAE;IAC5E,OAAO,UAAU,MAAc,EAAE,YAAoB;QACpD,IAAA,mCAAiB,EAAC;YACjB,IAAI,EAAE,qBAAqB;YAC3B,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,8BAA8B;SACzC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B"}

package/dist/modules/security/listeners/security-state.listener.d.ts

@@ -18,6 +18,7 @@ export declare class SecurityStateListener implements OnModuleInit, OnModuleDest
     constructor(channelRepository: Repository<ChannelEntity>, aggregator: SecurityAggregatorService, eventsService: SecurityEventsService, ackService: SecurityAlertAckService, eventEmitter: EventEmitter2);
     onModuleInit(): Promise<void>;
     onModuleDestroy(): void;
+    handlePropertyValueSet(property: ChannelPropertyEntity | null): Promise<void>;
     handlePropertyChanged(property: ChannelPropertyEntity | null): Promise<void>;
     handleChannelChanged(channel: ChannelEntity | null): void;
     handleDeviceChanged(_device: DeviceEntity | null): void;

package/dist/modules/security/listeners/security-state.listener.js

@@ -73,6 +73,9 @@ let SecurityStateListener = class SecurityStateListener {
             this.debounceTimer = null;
         }
     }
+    async handlePropertyValueSet(property) {
+        await this.handlePropertyChanged(property);
+    }
     async handlePropertyChanged(property) {
         if (!property) {
             this.scheduleStateRecalculation();
@@ -206,8 +209,13 @@ let SecurityStateListener = class SecurityStateListener {
 };
 exports.SecurityStateListener = SecurityStateListener;
 __decorate([
-    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_CREATED),
     (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_VALUE_SET),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
+    __metadata("design:returntype", Promise)
+], SecurityStateListener.prototype, "handlePropertyValueSet", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_CREATED),
     (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_UPDATED),
     (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_DELETED),
     (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_RESET),

package/dist/modules/security/listeners/security-state.listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"security-state.listener.js","sourceRoot":"","sources":["../../../../src/modules/security/listeners/security-state.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AAErC,2CAA2E;AAC3E,yDAA+D;AAC/D,6CAAmD;AAEnD,mDAA+D;AAC/D,uEAAmH;AACnH,0EAA2G;AAC3G,8DAAoG;AACpG,yFAAoF;AACpF,uFAAiF;AACjF,iFAA4E;AAK5E,MAAM,4BAA4B,GAAuB;IACxD,oCAAgB,CAAC,KAAK;IACtB,oCAAgB,CAAC,WAAW;IAC5B,oCAAgB,CAAC,SAAS;IAC1B,oCAAgB,CAAC,QAAQ;IACzB,oCAAgB,CAAC,MAAM;IACvB,oCAAgB,CAAC,KAAK;IACtB,oCAAgB,CAAC,UAAU;IAC3B,oCAAgB,CAAC,QAAQ;IACzB,oCAAgB,CAAC,aAAa;IAC9B,oCAAgB,CAAC,MAAM;CACvB,CAAC;AAKF,MAAM,2BAA2B,GAAsB;IACtD,mCAAe,CAAC,KAAK;IACrB,mCAAe,CAAC,KAAK;IACrB,mCAAe,CAAC,eAAe;IAC/B,mCAAe,CAAC,IAAI;IACpB,mCAAe,CAAC,GAAG;IACnB,mCAAe,CAAC,MAAM;IACtB,mCAAe,CAAC,SAAS;IACzB,mCAAe,CAAC,OAAO;CACvB,CAAC;AAGK,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAOjC,YAEC,iBAA6D,EAC5C,UAAqC,EACrC,aAAoC,EACpC,UAAmC,EACnC,YAA2B;QAJ3B,sBAAiB,GAAjB,iBAAiB,CAA2B;QAC5C,eAAU,GAAV,UAAU,CAA2B;QACrC,kBAAa,GAAb,aAAa,CAAuB;QACpC,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAAe;QAZ5B,WAAM,GAAG,IAAA,8BAAqB,EAAC,yCAAoB,EAAE,uBAAuB,CAAC,CAAC;QAEvF,kBAAa,GAA0B,IAAI,CAAC;QAC5C,mBAAc,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,WAAM,GAAG,KAAK,CAAC;IASpB,CAAC;IAEJ,KAAK,CAAC,YAAY;QACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAIzD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,KAAK,EAAE,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;IAED,eAAe;QACd,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;YAChC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC3B,CAAC;IACF,CAAC;IAOK,AAAN,KAAK,CAAC,qBAAqB,CAAC,QAAsC;QACjE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAElC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,KAAK,EAAE,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;IAKD,oBAAoB,CAAC,OAA6B;QACjD,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChF,OAAO;QACR,CAAC;QAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAID,mBAAmB,CAAC,OAA4B;QAC/C,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAGD,iBAAiB;QAChB,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,QAA+B;QAElE,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/D,OAAO;QACR,CAAC;QAMD,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,SAAS,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB;iBAC1C,kBAAkB,CAAC,SAAS,CAAC;iBAC7B,KAAK,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;iBAC/C,MAAM,EAAE,CAAC;YAEX,IAAI,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxE,OAAO;YACR,CAAC;QACF,CAAC;QAGD,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAMO,0BAA0B;QACjC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;YAChC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,KAAK,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,CAAC,EAAE,+CAA0B,CAAC,CAAC;IAChC,CAAC;IAOO,KAAK,CAAC,kBAAkB;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC;QACrC,IAAI,OAAO,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC;YACJ,MAAM,QAAQ,CAAC;YACf,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACzC,CAAC;gBAAS,CAAC;YACV,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACvC,IAAI,CAAC;YACJ,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC;YAG/E,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5G,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;YAClE,CAAC;YAKD,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;YAC1D,CAAC;YAGD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;YAGD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,8BAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAE1D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,KAAK,EAAE,CAAC,CAAC;QACvE,CAAC;IACF,CAAC;IAMO,KAAK,CAAC,wBAAwB,CACrC,MAAqE;QAErE,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEpC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpB,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;gBAE3B,SAAS;YACV,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC5C,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAE1D,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBAEtF,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACP,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YAC1C,CAAC;QACF,CAAC;IACF,CAAC;IAMO,KAAK,CAAC,cAAc,CAC3B,MAAqE,EACrE,cAAsB;QAItB,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAEzD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEpC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACpB,SAAS;gBACV,CAAC;gBAED,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC5C,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;gBAE1D,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;oBACtF,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBACjE,CAAC;YACF,CAAC;QACF,CAAC;QAKD,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;IACF,CAAC;CACD,CAAA;AAnPY,sDAAqB;AAwC3B;IALL,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;IACpD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,sBAAsB,CAAC;;qCACX,sCAAqB;;kEAY1D;AAKD;IAHC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,eAAe,CAAC;IACzC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,eAAe,CAAC;IACzC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,aAAa,CAAC;;qCACV,8BAAa;;iEAM1C;AAID;IAFC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,cAAc,CAAC;IACxC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,YAAY,CAAC;;qCACV,6BAAY;;gEAExC;AAGD;IADC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,YAAY,CAAC;;;;8DAGtC;gCA1EW,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IASV,WAAA,IAAA,0BAAgB,EAAC,8BAAa,CAAC,CAAA;qCACI,oBAAU;QACjB,uDAAyB;QACtB,+CAAqB;QACxB,oDAAuB;QACrB,6BAAa;GAbjC,qBAAqB,CAmPjC"}
+{"version":3,"file":"security-state.listener.js","sourceRoot":"","sources":["../../../../src/modules/security/listeners/security-state.listener.ts"],"names":[],"mappings":"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"}

package/dist/modules/security/providers/security-sensors.provider.d.ts

@@ -1,4 +1,6 @@
+import { ChannelsPropertiesService } from '../../devices/services/channels.properties.service';
 import { DevicesService } from '../../devices/services/devices.service';
+import { PropertyValueSourceRegistryService } from '../../devices/services/property-value-source.registry.service';
 import { SecurityAggregationContext } from '../contracts/security-aggregation-context.type';
 import { SecuritySignal } from '../contracts/security-signal.type';
 import { SecurityStateProviderInterface } from '../contracts/security-state-provider.interface';
@@ -6,11 +8,20 @@ import { DetectionRulesLoaderService } from '../spec/detection-rules-loader.serv
 export declare class SecuritySensorsProvider implements SecurityStateProviderInterface {
     private readonly devicesService;
     private readonly detectionRulesLoader;
+    private readonly channelsPropertiesService;
+    private readonly valueSourceRegistry;
     private readonly logger;
-    constructor(devicesService: DevicesService, detectionRulesLoader: DetectionRulesLoaderService);
+    constructor(devicesService: DevicesService, detectionRulesLoader: DetectionRulesLoaderService, channelsPropertiesService: ChannelsPropertiesService, valueSourceRegistry: PropertyValueSourceRegistryService);
     getKey(): string;
     getSignals(context?: SecurityAggregationContext): Promise<SecuritySignal>;
     private buildSignals;
+    private mapPropertiesToChannels;
+    private identifySensor;
+    private resolveOwningChannel;
+    private dedupeBySensor;
+    private speaksForTheAlertId;
+    private newerTimestamp;
+    private namesTheSensorBetter;
     private evaluateRule;
     private findProperty;
     private matchesCondition;

package/dist/modules/security/providers/security-sensors.provider.js

@@ -14,7 +14,9 @@ const common_1 = require("@nestjs/common");
 const logger_1 = require("../../../common/logger");
 const devices_entity_1 = require("../../devices/entities/devices.entity");
 const property_value_state_model_1 = require("../../devices/models/property-value-state.model");
+const channels_properties_service_1 = require("../../devices/services/channels.properties.service");
 const devices_service_1 = require("../../devices/services/devices.service");
+const property_value_source_registry_service_1 = require("../../devices/services/property-value-source.registry.service");
 const security_constants_1 = require("../security.constants");
 const detection_rules_loader_service_1 = require("../spec/detection-rules-loader.service");
 const INTRUSION_ALERT_TYPES = new Set([
@@ -22,9 +24,11 @@ const INTRUSION_ALERT_TYPES = new Set([
     security_constants_1.SecurityAlertType.ENTRY_OPEN,
 ]);
 let SecuritySensorsProvider = class SecuritySensorsProvider {
-    constructor(devicesService, detectionRulesLoader) {
+    constructor(devicesService, detectionRulesLoader, channelsPropertiesService, valueSourceRegistry) {
         this.devicesService = devicesService;
         this.detectionRulesLoader = detectionRulesLoader;
+        this.channelsPropertiesService = channelsPropertiesService;
+        this.valueSourceRegistry = valueSourceRegistry;
         this.logger = (0, logger_1.createExtensionLogger)(security_constants_1.SECURITY_MODULE_NAME, 'SecuritySensorsProvider');
     }
     getKey() {
@@ -48,7 +52,8 @@ let SecuritySensorsProvider = class SecuritySensorsProvider {
         const devices = context?.devices ?? (await this.devicesService.findAll());
         const rules = this.detectionRulesLoader.getSensorRules();
         const armedState = context?.armedState ?? null;
-        const alerts = [];
+        const channelOfProperty = this.mapPropertiesToChannels(devices);
+        const candidates = [];
         for (const device of devices) {
             const channels = device.channels ?? [];
             for (const channel of channels) {
@@ -62,17 +67,24 @@ let SecuritySensorsProvider = class SecuritySensorsProvider {
                 const result = this.evaluateRule(channel, rule);
                 if (result.triggered) {
                     const severity = this.adjustSeverityForArmedState(rule.alertType, rule.severity, armedState);
-                    alerts.push({
-                        id: `sensor:${device.id}:${rule.alertType}`,
-                        type: rule.alertType,
-                        severity,
-                        sourceDeviceId: device.id,
-                        timestamp: result.lastUpdated ?? new Date().toISOString(),
-                        acknowledged: false,
+                    const sensor = await this.identifySensor(channel, rule, channelOfProperty);
+                    candidates.push({
+                        alert: {
+                            id: `sensor:${device.id}:${rule.alertType}`,
+                            type: rule.alertType,
+                            severity,
+                            sourceDeviceId: device.id,
+                            timestamp: result.lastUpdated ?? new Date().toISOString(),
+                            acknowledged: false,
+                        },
+                        device,
+                        sensorId: sensor.id,
+                        isProjection: sensor.isProjection,
                     });
                 }
             }
         }
+        const alerts = this.dedupeBySensor(candidates);
         if (alerts.length === 0) {
             return {
                 highestSeverity: security_constants_1.Severity.INFO,
@@ -104,6 +116,112 @@ let SecuritySensorsProvider = class SecuritySensorsProvider {
             },
         };
     }
+    mapPropertiesToChannels(devices) {
+        const channelOfProperty = new Map();
+        for (const device of devices) {
+            for (const channel of device.channels ?? []) {
+                if (!(channel instanceof devices_entity_1.ChannelEntity)) {
+                    continue;
+                }
+                for (const property of channel.properties ?? []) {
+                    if (property instanceof devices_entity_1.ChannelPropertyEntity) {
+                        channelOfProperty.set(property.id, channel.id);
+                    }
+                }
+            }
+        }
+        return channelOfProperty;
+    }
+    async identifySensor(channel, rule, channelOfProperty) {
+        const sourceChannels = new Set();
+        for (const check of rule.properties) {
+            const property = this.findProperty(channel, check.property);
+            if (!property) {
+                continue;
+            }
+            const storageKey = this.valueSourceRegistry.resolve(property);
+            if (storageKey === property.id) {
+                continue;
+            }
+            sourceChannels.add((await this.resolveOwningChannel(storageKey, channelOfProperty)) ?? storageKey);
+        }
+        if (sourceChannels.size === 0) {
+            return { id: channel.id, isProjection: false };
+        }
+        return { id: Array.from(sourceChannels).sort().join('+'), isProjection: true };
+    }
+    async resolveOwningChannel(propertyId, channelOfProperty) {
+        const known = channelOfProperty.get(propertyId);
+        if (known !== undefined) {
+            return known;
+        }
+        try {
+            const property = await this.channelsPropertiesService.findOne(propertyId);
+            const channelId = typeof property?.channel === 'string' ? property.channel : property?.channel?.id;
+            channelOfProperty.set(propertyId, channelId ?? '');
+            return channelId ?? null;
+        }
+        catch (error) {
+            this.logger.warn(`Failed to resolve the channel of source property ${propertyId}: ${error}`);
+            return null;
+        }
+    }
+    dedupeBySensor(candidates) {
+        const bySensor = new Map();
+        for (const candidate of candidates) {
+            const key = `${candidate.sensorId}:${candidate.alert.type}`;
+            const held = bySensor.get(key);
+            if (!held) {
+                bySensor.set(key, { representative: candidate, alert: candidate.alert });
+                continue;
+            }
+            const representative = this.namesTheSensorBetter(candidate, held.representative)
+                ? candidate
+                : held.representative;
+            bySensor.set(key, {
+                representative,
+                alert: {
+                    ...representative.alert,
+                    timestamp: this.newerTimestamp(held.alert.timestamp, candidate.alert.timestamp),
+                    severity: security_constants_1.SEVERITY_RANK[candidate.alert.severity] > security_constants_1.SEVERITY_RANK[held.alert.severity]
+                        ? candidate.alert.severity
+                        : held.alert.severity,
+                },
+            });
+        }
+        const byId = new Map();
+        for (const { alert } of bySensor.values()) {
+            const held = byId.get(alert.id);
+            if (!held || this.speaksForTheAlertId(alert, held)) {
+                byId.set(alert.id, alert);
+            }
+        }
+        return Array.from(byId.values());
+    }
+    speaksForTheAlertId(alert, held) {
+        const severityDiff = security_constants_1.SEVERITY_RANK[alert.severity] - security_constants_1.SEVERITY_RANK[held.severity];
+        if (severityDiff !== 0) {
+            return severityDiff > 0;
+        }
+        return this.newerTimestamp(held.timestamp, alert.timestamp) === alert.timestamp;
+    }
+    newerTimestamp(held, candidate) {
+        const heldTime = new Date(held).getTime();
+        const candidateTime = new Date(candidate).getTime();
+        if (Number.isNaN(candidateTime)) {
+            return held;
+        }
+        return Number.isNaN(heldTime) || candidateTime > heldTime ? candidate : held;
+    }
+    namesTheSensorBetter(candidate, held) {
+        if (candidate.device.hidden !== held.device.hidden) {
+            return !candidate.device.hidden;
+        }
+        if (candidate.isProjection !== held.isProjection) {
+            return candidate.isProjection;
+        }
+        return candidate.device.id.localeCompare(held.device.id) < 0;
+    }
     evaluateRule(channel, rule) {
         for (const check of rule.properties) {
             const prop = this.findProperty(channel, check.property);
@@ -123,10 +241,10 @@ let SecuritySensorsProvider = class SecuritySensorsProvider {
                 }
             }
             if (this.matchesCondition(actual, check)) {
-                return { triggered: true, lastUpdated };
+                return { triggered: true, lastUpdated, property: prop };
             }
         }
-        return { triggered: false, lastUpdated: null };
+        return { triggered: false, lastUpdated: null, property: null };
     }
     findProperty(channel, category) {
         const properties = channel.properties ?? [];
@@ -174,6 +292,8 @@ exports.SecuritySensorsProvider = SecuritySensorsProvider;
 exports.SecuritySensorsProvider = SecuritySensorsProvider = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [devices_service_1.DevicesService,
-        detection_rules_loader_service_1.DetectionRulesLoaderService])
+        detection_rules_loader_service_1.DetectionRulesLoaderService,
+        channels_properties_service_1.ChannelsPropertiesService,
+        property_value_source_registry_service_1.PropertyValueSourceRegistryService])
 ], SecuritySensorsProvider);
 //# sourceMappingURL=security-sensors.provider.js.map