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

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-context-snapshot.service.d.ts

@@ -1,10 +1,10 @@
 import { OnModuleInit } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import { CoversRole, LightingRole } from '../spaces.constants';
+import { SpacesService } from '../../../modules/spaces/services/spaces.service';
+import { CoversRole, LightingRole } from '../spaces-home-control.constants';
 import { ClimateState, SpaceClimateStateService } from './space-climate-state.service';
 import { SpaceCoversRoleService } from './space-covers-role.service';
 import { SpaceLightingRoleService } from './space-lighting-role.service';
-import { SpacesService } from './spaces.service';
 export interface LightStateSnapshot {
     deviceId: string;
     deviceName: string;

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-context-snapshot.service.js

@@ -47,12 +47,13 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const color_utils_1 = require("../../../common/utils/color.utils");
-const devices_constants_1 = require("../../devices/devices.constants");
-const spaces_constants_1 = require("../spaces.constants");
+const devices_constants_1 = require("../../../modules/devices/devices.constants");
+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_state_service_1 = require("./space-climate-state.service");
 const space_covers_role_service_1 = require("./space-covers-role.service");
 const space_lighting_role_service_1 = require("./space-lighting-role.service");
-const spaces_service_1 = require("./spaces.service");
 let SpaceContextSnapshotService = class SpaceContextSnapshotService {
     constructor(spacesService, moduleRef, lightingRoleService, coversRoleService, climateStateService) {
         this.spacesService = spacesService;
@@ -78,13 +79,13 @@ let SpaceContextSnapshotService = class SpaceContextSnapshotService {
         const primaryThermostatId = primaryDevices.find((d) => d.heaterSetpointProperty || d.coolerSetpointProperty)?.device.id ?? null;
         const defaultClimateState = {
             hasClimate: false,
-            mode: spaces_constants_1.ClimateMode.OFF,
+            mode: spaces_home_control_constants_1.ClimateMode.OFF,
             currentTemperature: null,
             currentHumidity: null,
             heatingSetpoint: null,
             coolingSetpoint: null,
-            minSetpoint: spaces_constants_1.DEFAULT_MIN_SETPOINT,
-            maxSetpoint: spaces_constants_1.DEFAULT_MAX_SETPOINT,
+            minSetpoint: spaces_home_control_constants_1.DEFAULT_MIN_SETPOINT,
+            maxSetpoint: spaces_home_control_constants_1.DEFAULT_MAX_SETPOINT,
             supportsHeating: false,
             supportsCooling: false,
             isHeating: false,

package/dist/plugins/spaces-home-control/services/space-context-snapshot.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-context-snapshot.service.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/services/space-context-snapshot.service.ts"],"names":[],"mappings":"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"}

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-covers-role.service.d.ts

@@ -1,10 +1,10 @@
 import { Repository } from 'typeorm';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { DeviceEntity } from '../../devices/entities/devices.entity';
+import { DeviceEntity } from '../../../modules/devices/entities/devices.entity';
+import { SpacesService } from '../../../modules/spaces/services/spaces.service';
 import { SetCoversRoleDto } from '../dto/covers-role.dto';
 import { SpaceCoversRoleEntity } from '../entities/space-covers-role.entity';
-import { CoversRole } from '../spaces.constants';
-import { SpacesService } from './spaces.service';
+import { CoversRole } from '../spaces-home-control.constants';
 export interface CoversTargetInfo {
     deviceId: string;
     deviceName: string;

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-covers-role.service.js

@@ -18,12 +18,13 @@ 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("../../devices/devices.constants");
-const devices_entity_1 = require("../../devices/entities/devices.entity");
+const devices_constants_1 = require("../../../modules/devices/devices.constants");
+const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const spaces_service_1 = require("../../../modules/spaces/services/spaces.service");
+const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
+const spaces_exceptions_1 = require("../../../modules/spaces/spaces.exceptions");
 const space_covers_role_entity_1 = require("../entities/space-covers-role.entity");
-const spaces_constants_1 = require("../spaces.constants");
-const spaces_exceptions_1 = require("../spaces.exceptions");
-const spaces_service_1 = require("./spaces.service");
+const spaces_home_control_constants_1 = require("../spaces-home-control.constants");
 let SpaceCoversRoleService = class SpaceCoversRoleService {
     constructor(repository, deviceRepository, spacesService, eventEmitter) {
         this.repository = repository;
@@ -80,19 +81,21 @@ let SpaceCoversRoleService = class SpaceCoversRoleService {
             else {
                 hasChanges = true;
             }
-            await transactionalManager.upsert(space_covers_role_entity_1.SpaceCoversRoleEntity, {
-                spaceId,
-                deviceId: dto.deviceId,
-                channelId: dto.channelId,
-                role: newRole,
-                priority: newPriority,
-            }, {
-                conflictPaths: ['spaceId', 'deviceId', 'channelId'],
-                skipUpdateIfNoValuesChanged: true,
-            });
-            roleEntity = await transactionalManager.findOne(space_covers_role_entity_1.SpaceCoversRoleEntity, {
-                where: { spaceId, deviceId: dto.deviceId, channelId: dto.channelId },
-            });
+            if (existingRole) {
+                existingRole.role = newRole;
+                existingRole.priority = newPriority;
+                roleEntity = await transactionalManager.save(existingRole);
+            }
+            else {
+                const newEntity = transactionalManager.create(space_covers_role_entity_1.SpaceCoversRoleEntity, {
+                    spaceId,
+                    deviceId: dto.deviceId,
+                    channelId: dto.channelId,
+                    role: newRole,
+                    priority: newPriority,
+                });
+                roleEntity = await transactionalManager.save(newEntity);
+            }
         });
         if (!roleEntity) {
             throw new spaces_exceptions_1.SpacesValidationException(`Failed to save covers role for device=${dto.deviceId} channel=${dto.channelId}`);
@@ -100,7 +103,7 @@ let SpaceCoversRoleService = class SpaceCoversRoleService {
         if (hasChanges) {
             const eventPayload = await this.buildCoversTargetEventPayload(spaceId, dto.deviceId, dto.channelId, dto.role, dto.priority ?? 0);
             if (eventPayload) {
-                const eventType = isUpdate ? spaces_constants_1.EventType.COVERS_TARGET_UPDATED : spaces_constants_1.EventType.COVERS_TARGET_CREATED;
+                const eventType = isUpdate ? spaces_home_control_constants_1.EventType.COVERS_TARGET_UPDATED : spaces_home_control_constants_1.EventType.COVERS_TARGET_CREATED;
                 this.eventEmitter.emit(eventType, eventPayload);
             }
         }
@@ -146,7 +149,7 @@ let SpaceCoversRoleService = class SpaceCoversRoleService {
         const role = await this.findOne(spaceId, deviceId, channelId);
         if (role) {
             await this.repository.remove(role);
-            this.eventEmitter.emit(spaces_constants_1.EventType.COVERS_TARGET_DELETED, {
+            this.eventEmitter.emit(spaces_home_control_constants_1.EventType.COVERS_TARGET_DELETED, {
                 id: `${deviceId}:${channelId}`,
                 space_id: spaceId,
                 device_id: deviceId,
@@ -211,22 +214,22 @@ let SpaceCoversRoleService = class SpaceCoversRoleService {
         defaultRoles.push({
             deviceId: coversTargets[0].deviceId,
             channelId: coversTargets[0].channelId,
-            role: spaces_constants_1.CoversRole.PRIMARY,
+            role: spaces_home_control_constants_1.CoversRole.PRIMARY,
             priority: 0,
         });
         for (let i = 1; i < coversTargets.length; i++) {
             const target = coversTargets[i];
-            let inferredRole = spaces_constants_1.CoversRole.PRIMARY;
+            let inferredRole = spaces_home_control_constants_1.CoversRole.PRIMARY;
             if (typeof target.coverType === 'string') {
                 const typeStr = target.coverType.toLowerCase();
                 if (typeStr.includes('blackout') || typeStr.includes('roller')) {
-                    inferredRole = spaces_constants_1.CoversRole.BLACKOUT;
+                    inferredRole = spaces_home_control_constants_1.CoversRole.BLACKOUT;
                 }
                 else if (typeStr.includes('sheer') || typeStr.includes('curtain')) {
-                    inferredRole = spaces_constants_1.CoversRole.SHEER;
+                    inferredRole = spaces_home_control_constants_1.CoversRole.SHEER;
                 }
                 else if (typeStr.includes('outdoor') || typeStr.includes('awning') || typeStr.includes('shutter')) {
-                    inferredRole = spaces_constants_1.CoversRole.OUTDOOR;
+                    inferredRole = spaces_home_control_constants_1.CoversRole.OUTDOOR;
                 }
             }
             defaultRoles.push({

package/dist/plugins/spaces-home-control/services/space-covers-role.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-covers-role.service.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/services/space-covers-role.service.ts"],"names":[],"mappings":"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"}

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-covers-state.service.d.ts

@@ -1,10 +1,10 @@
-import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../devices/entities/devices.entity';
-import { IntentTimeseriesService } from '../../intents/services/intent-timeseries.service';
-import { CoversMode, CoversRole } from '../spaces.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 { CoversMode, CoversRole } from '../spaces-home-control.constants';
 import { IntentSpecLoaderService } from '../spec';
 import { SpaceCoversRoleService } from './space-covers-role.service';
 import { SpaceIntentBaseService } from './space-intent-base.service';
-import { SpacesService } from './spaces.service';
 export interface CoverDevice {
     device: DeviceEntity;
     coverChannel: ChannelEntity;

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-covers-state.service.js

@@ -12,13 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpaceCoversStateService = void 0;
 const common_1 = require("@nestjs/common");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
-const devices_constants_1 = require("../../devices/devices.constants");
-const intent_timeseries_service_1 = require("../../intents/services/intent-timeseries.service");
-const spaces_constants_1 = require("../spaces.constants");
+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 spec_1 = require("../spec");
 const space_covers_role_service_1 = require("./space-covers-role.service");
 const space_intent_base_service_1 = require("./space-intent-base.service");
-const spaces_service_1 = require("./spaces.service");
 let SpaceCoversStateService = class SpaceCoversStateService extends space_intent_base_service_1.SpaceIntentBaseService {
     constructor(spacesService, coversRoleService, intentTimeseriesService, intentSpecLoaderService) {
         super();
@@ -62,7 +63,7 @@ let SpaceCoversStateService = class SpaceCoversStateService extends space_intent
         const roleGroups = new Map();
         const coversByRole = {};
         for (const cover of covers) {
-            const role = cover.role ?? spaces_constants_1.CoversRole.PRIMARY;
+            const role = cover.role ?? spaces_home_control_constants_1.CoversRole.PRIMARY;
             if (!roleGroups.has(role)) {
                 roleGroups.set(role, []);
             }
@@ -100,7 +101,7 @@ let SpaceCoversStateService = class SpaceCoversStateService extends space_intent
         const tiltResult = this.getUniformValue(allTilts);
         const lastApplied = await this.intentTimeseriesService.getLastCoversMode(spaceId);
         const lastAppliedMode = lastApplied?.mode
-            ? Object.values(spaces_constants_1.CoversMode).includes(lastApplied.mode)
+            ? Object.values(spaces_home_control_constants_1.CoversMode).includes(lastApplied.mode)
                 ? lastApplied.mode
                 : null
             : null;
@@ -189,7 +190,7 @@ let SpaceCoversStateService = class SpaceCoversStateService extends space_intent
         const allModes = this.intentSpecLoaderService.getAllCoversModeOrchestrations();
         let bestMatch = null;
         for (const modeId of allModes.keys()) {
-            if (!Object.values(spaces_constants_1.CoversMode).includes(modeId)) {
+            if (!Object.values(spaces_home_control_constants_1.CoversMode).includes(modeId)) {
                 continue;
             }
             const match = this.matchMode(modeId, roleStates);
@@ -278,7 +279,7 @@ let SpaceCoversStateService = class SpaceCoversStateService extends space_intent
                 const roleKey = `${device.id}:${coverChannel.id}`;
                 const roleEntity = roleMap.get(roleKey);
                 const role = roleEntity?.role ?? null;
-                if (role === spaces_constants_1.CoversRole.HIDDEN) {
+                if (role === spaces_home_control_constants_1.CoversRole.HIDDEN) {
                     this.logger.debug(`Skipping HIDDEN cover deviceId=${device.id} channelId=${coverChannel.id}`);
                     continue;
                 }

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

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

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-intent-base.service.d.ts

@@ -1,4 +1,4 @@
-import { ChannelPropertyEntity } from '../../devices/entities/devices.entity';
+import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
 export interface IntentExecutionResult {
     success: boolean;
     affectedDevices: number;

package/dist/plugins/spaces-home-control/services/space-intent-base.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-intent-base.service.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/services/space-intent-base.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/spaces-home-control/services/space-intent.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-intent.service.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/services/space-intent.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAM5C,qEAAmG;AACnG,mEAA+F;AAC/F,uEAAkE;AAMlE,qEAAiG;AAAvD,8HAAA,mBAAmB,OAAA;AAC7D,iEAA+F;AAArD,4HAAA,mBAAmB,OAAA;AAYtD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC9B,YACkB,qBAA4C,EAC5C,oBAA0C,EAC1C,mBAAwC;QAFxC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAcJ,KAAK,CAAC,qBAAqB,CAAC,OAAe,EAAE,MAAyB;QACrE,OAAO,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IAcD,KAAK,CAAC,eAAe,CAAC,OAAe;QACpC,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAWD,KAAK,CAAC,oBAAoB,CAAC,OAAe,EAAE,MAAwB;QACnE,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAcD,KAAK,CAAC,cAAc,CAAC,OAAe;QACnC,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAWD,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,MAAuB;QACjE,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;CACD,CAAA;AAhFY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAG6B,+CAAqB;QACtB,6CAAoB;QACrB,2CAAmB;GAJ9C,kBAAkB,CAgF9B"}

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-lighting-role.service.d.ts

@@ -1,10 +1,10 @@
 import { Repository } from 'typeorm';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { DeviceEntity } from '../../devices/entities/devices.entity';
+import { DeviceEntity } from '../../../modules/devices/entities/devices.entity';
+import { SpacesService } from '../../../modules/spaces/services/spaces.service';
 import { SetLightingRoleDto } from '../dto/lighting-role.dto';
 import { SpaceLightingRoleEntity } from '../entities/space-lighting-role.entity';
-import { LightingRole } from '../spaces.constants';
-import { SpacesService } from './spaces.service';
+import { LightingRole } from '../spaces-home-control.constants';
 export interface LightTargetInfo {
     deviceId: string;
     deviceName: string;

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-lighting-role.service.js

@@ -18,12 +18,13 @@ 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("../../devices/devices.constants");
-const devices_entity_1 = require("../../devices/entities/devices.entity");
+const devices_constants_1 = require("../../../modules/devices/devices.constants");
+const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
+const spaces_service_1 = require("../../../modules/spaces/services/spaces.service");
+const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
+const spaces_exceptions_1 = require("../../../modules/spaces/spaces.exceptions");
 const space_lighting_role_entity_1 = require("../entities/space-lighting-role.entity");
-const spaces_constants_1 = require("../spaces.constants");
-const spaces_exceptions_1 = require("../spaces.exceptions");
-const spaces_service_1 = require("./spaces.service");
+const spaces_home_control_constants_1 = require("../spaces-home-control.constants");
 let SpaceLightingRoleService = class SpaceLightingRoleService {
     constructor(repository, deviceRepository, spacesService, eventEmitter) {
         this.repository = repository;
@@ -80,19 +81,21 @@ let SpaceLightingRoleService = class SpaceLightingRoleService {
             else {
                 hasChanges = true;
             }
-            await transactionalManager.upsert(space_lighting_role_entity_1.SpaceLightingRoleEntity, {
-                spaceId,
-                deviceId: dto.deviceId,
-                channelId: dto.channelId,
-                role: newRole,
-                priority: newPriority,
-            }, {
-                conflictPaths: ['spaceId', 'deviceId', 'channelId'],
-                skipUpdateIfNoValuesChanged: true,
-            });
-            roleEntity = await transactionalManager.findOne(space_lighting_role_entity_1.SpaceLightingRoleEntity, {
-                where: { spaceId, deviceId: dto.deviceId, channelId: dto.channelId },
-            });
+            if (existingRole) {
+                existingRole.role = newRole;
+                existingRole.priority = newPriority;
+                roleEntity = await transactionalManager.save(existingRole);
+            }
+            else {
+                const newEntity = transactionalManager.create(space_lighting_role_entity_1.SpaceLightingRoleEntity, {
+                    spaceId,
+                    deviceId: dto.deviceId,
+                    channelId: dto.channelId,
+                    role: newRole,
+                    priority: newPriority,
+                });
+                roleEntity = await transactionalManager.save(newEntity);
+            }
         });
         if (!roleEntity) {
             throw new spaces_exceptions_1.SpacesValidationException(`Failed to save lighting role for device=${dto.deviceId} channel=${dto.channelId}`);
@@ -100,7 +103,7 @@ let SpaceLightingRoleService = class SpaceLightingRoleService {
         if (hasChanges) {
             const eventPayload = await this.buildLightTargetEventPayload(spaceId, dto.deviceId, dto.channelId, dto.role, dto.priority ?? 0);
             if (eventPayload) {
-                const eventType = isUpdate ? spaces_constants_1.EventType.LIGHT_TARGET_UPDATED : spaces_constants_1.EventType.LIGHT_TARGET_CREATED;
+                const eventType = isUpdate ? spaces_home_control_constants_1.EventType.LIGHT_TARGET_UPDATED : spaces_home_control_constants_1.EventType.LIGHT_TARGET_CREATED;
                 this.eventEmitter.emit(eventType, eventPayload);
             }
         }
@@ -146,7 +149,7 @@ let SpaceLightingRoleService = class SpaceLightingRoleService {
         const role = await this.findOne(spaceId, deviceId, channelId);
         if (role) {
             await this.repository.remove(role);
-            this.eventEmitter.emit(spaces_constants_1.EventType.LIGHT_TARGET_DELETED, {
+            this.eventEmitter.emit(spaces_home_control_constants_1.EventType.LIGHT_TARGET_DELETED, {
                 id: `${deviceId}:${channelId}`,
                 space_id: spaceId,
                 device_id: deviceId,
@@ -209,14 +212,14 @@ let SpaceLightingRoleService = class SpaceLightingRoleService {
         defaultRoles.push({
             deviceId: lightTargets[0].deviceId,
             channelId: lightTargets[0].channelId,
-            role: spaces_constants_1.LightingRole.MAIN,
+            role: spaces_home_control_constants_1.LightingRole.MAIN,
             priority: 0,
         });
         for (let i = 1; i < lightTargets.length; i++) {
             defaultRoles.push({
                 deviceId: lightTargets[i].deviceId,
                 channelId: lightTargets[i].channelId,
-                role: spaces_constants_1.LightingRole.AMBIENT,
+                role: spaces_home_control_constants_1.LightingRole.AMBIENT,
                 priority: i,
             });
         }

package/dist/plugins/spaces-home-control/services/space-lighting-role.service.js.map

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

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-lighting-state.service.d.ts

@@ -1,8 +1,8 @@
-import { IntentTimeseriesService } from '../../intents/services/intent-timeseries.service';
-import { LightingMode, LightingRole } from '../spaces.constants';
+import { IntentTimeseriesService } from '../../../modules/intents/services/intent-timeseries.service';
+import { SpacesService } from '../../../modules/spaces/services/spaces.service';
+import { LightingMode, LightingRole } from '../spaces-home-control.constants';
 import { IntentSpecLoaderService } from '../spec';
 import { SpaceLightingRoleService } from './space-lighting-role.service';
-import { SpacesService } from './spaces.service';
 export interface RoleLastIntent {
     brightness: number | null;
 }

package/dist/{modules/spaces → plugins/spaces-home-control}/services/space-lighting-state.service.js

@@ -13,12 +13,13 @@ exports.SpaceLightingStateService = void 0;
 const common_1 = require("@nestjs/common");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const color_utils_1 = require("../../../common/utils/color.utils");
-const devices_constants_1 = require("../../devices/devices.constants");
-const intent_timeseries_service_1 = require("../../intents/services/intent-timeseries.service");
-const spaces_constants_1 = require("../spaces.constants");
+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 spec_1 = require("../spec");
 const space_lighting_role_service_1 = require("./space-lighting-role.service");
-const spaces_service_1 = require("./spaces.service");
 let SpaceLightingStateService = class SpaceLightingStateService {
     constructor(spacesService, lightingRoleService, intentTimeseriesService, intentSpecLoaderService) {
         this.spacesService = spacesService;
@@ -40,7 +41,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         }
         const lastApplied = await this.intentTimeseriesService.getLastLightingMode(spaceId);
         const lastAppliedMode = lastApplied?.mode
-            ? Object.values(spaces_constants_1.LightingMode).includes(lastApplied.mode)
+            ? Object.values(spaces_home_control_constants_1.LightingMode).includes(lastApplied.mode)
                 ? lastApplied.mode
                 : null
             : null;
@@ -89,7 +90,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
             for (const channel of lightChannels) {
                 const lightState = this.extractLightState(device, channel, roleMap);
                 if (lightState) {
-                    if (lightState.role === spaces_constants_1.LightingRole.HIDDEN) {
+                    if (lightState.role === spaces_home_control_constants_1.LightingRole.HIDDEN) {
                         continue;
                     }
                     lights.push(lightState);
@@ -132,7 +133,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         const roleStates = {};
         const roleGroups = new Map();
         for (const light of lights) {
-            if (light.role === null || light.role === spaces_constants_1.LightingRole.HIDDEN) {
+            if (light.role === null || light.role === spaces_home_control_constants_1.LightingRole.HIDDEN) {
                 continue;
             }
             if (!roleGroups.has(light.role)) {
@@ -140,7 +141,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
             }
             roleGroups.get(light.role).push(light);
         }
-        const nightFallbackActive = lastAppliedMode === spaces_constants_1.LightingMode.NIGHT && !roleGroups.has(spaces_constants_1.LightingRole.NIGHT);
+        const nightFallbackActive = lastAppliedMode === spaces_home_control_constants_1.LightingMode.NIGHT && !roleGroups.has(spaces_home_control_constants_1.LightingRole.NIGHT);
         for (const [role, roleLights] of roleGroups) {
             roleStates[role] = this.aggregateLightGroup(role, roleLights, lastAppliedMode, nightFallbackActive);
         }
@@ -290,7 +291,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         }
         const rule = config.roles[role];
         if (!rule) {
-            if (role === spaces_constants_1.LightingRole.OTHER) {
+            if (role === spaces_home_control_constants_1.LightingRole.OTHER) {
                 return {
                     brightness: config.mvpBrightness,
                 };
@@ -326,7 +327,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         const allModes = this.intentSpecLoaderService.getAllLightingModeOrchestrations();
         let bestMatch = null;
         for (const modeId of allModes.keys()) {
-            if (!Object.values(spaces_constants_1.LightingMode).includes(modeId)) {
+            if (!Object.values(spaces_home_control_constants_1.LightingMode).includes(modeId)) {
                 continue;
             }
             const match = this.matchMode(modeId, roleStates, otherState);
@@ -345,7 +346,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         const onLights = lights.filter((l) => l.isOn);
         if (onLights.length === 0) {
             return {
-                mode: spaces_constants_1.LightingMode.OFF,
+                mode: spaces_home_control_constants_1.LightingMode.OFF,
                 confidence: 'exact',
                 matchPercentage: 100,
             };
@@ -358,10 +359,10 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         const allModes = this.intentSpecLoaderService.getAllLightingModeOrchestrations();
         const mvpModes = [];
         for (const [modeId, config] of allModes) {
-            if (!Object.values(spaces_constants_1.LightingMode).includes(modeId)) {
+            if (!Object.values(spaces_home_control_constants_1.LightingMode).includes(modeId)) {
                 continue;
             }
-            if (modeId === spaces_constants_1.LightingMode.OFF) {
+            if (modeId === spaces_home_control_constants_1.LightingMode.OFF) {
                 continue;
             }
             if (config.mvpBrightness !== undefined && config.mvpBrightness !== null) {
@@ -410,8 +411,8 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         for (const [roleStr, rule] of Object.entries(rules)) {
             const role = roleStr;
             let roleState = roleStates[role];
-            if (role === spaces_constants_1.LightingRole.OTHER) {
-                roleState = this.getCombinedOtherState(roleStates[spaces_constants_1.LightingRole.OTHER], otherState);
+            if (role === spaces_home_control_constants_1.LightingRole.OTHER) {
+                roleState = this.getCombinedOtherState(roleStates[spaces_home_control_constants_1.LightingRole.OTHER], otherState);
             }
             if (!roleState) {
                 continue;
@@ -450,7 +451,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         }
         if (!hasExplicit && hasUnassigned) {
             return {
-                role: spaces_constants_1.LightingRole.OTHER,
+                role: spaces_home_control_constants_1.LightingRole.OTHER,
                 isOn: otherState.isOn,
                 isOnMixed: otherState.isOnMixed,
                 brightness: otherState.brightness,
@@ -528,7 +529,7 @@ let SpaceLightingStateService = class SpaceLightingStateService {
             white = explicitOther.white ?? otherState.white;
         }
         return {
-            role: spaces_constants_1.LightingRole.OTHER,
+            role: spaces_home_control_constants_1.LightingRole.OTHER,
             isOn,
             isOnMixed,
             brightness,
@@ -548,8 +549,8 @@ let SpaceLightingStateService = class SpaceLightingStateService {
         if (!config.fallbackRoles || config.fallbackRoles.length === 0) {
             return false;
         }
-        if (mode === spaces_constants_1.LightingMode.NIGHT) {
-            const nightState = roleStates[spaces_constants_1.LightingRole.NIGHT];
+        if (mode === spaces_home_control_constants_1.LightingMode.NIGHT) {
+            const nightState = roleStates[spaces_home_control_constants_1.LightingRole.NIGHT];
             return !nightState || nightState.devicesCount === 0;
         }
         return false;