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

package/dist/modules/devices/validators/property-command-target-constraint.validator.js

@@ -0,0 +1,58 @@
+"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.ValidatePropertyCommandTarget = exports.PropertyCommandTargetConstraintValidator = void 0;
+const class_validator_1 = require("class-validator");
+const common_1 = require("@nestjs/common");
+const property_metadata_service_1 = require("../services/property-metadata.service");
+let PropertyCommandTargetConstraintValidator = class PropertyCommandTargetConstraintValidator {
+    constructor(propertyMetadata) {
+        this.propertyMetadata = propertyMetadata;
+    }
+    async validate(propertyId, args) {
+        const { device: deviceId, channel: channelId } = args.object;
+        if (typeof propertyId !== 'string' ||
+            !(0, class_validator_1.isUUID)(propertyId, '4') ||
+            typeof channelId !== 'string' ||
+            !(0, class_validator_1.isUUID)(channelId, '4') ||
+            typeof deviceId !== 'string' ||
+            !(0, class_validator_1.isUUID)(deviceId, '4'))
+            return false;
+        const property = await this.propertyMetadata.findOne(propertyId);
+        if (!property || typeof property.channel === 'string')
+            return false;
+        const channel = property.channel;
+        return channel.id === channelId && typeof channel.device !== 'string' && channel.device.id === deviceId;
+    }
+    defaultMessage(args) {
+        return `[{"field":"${args.property}","reason":"The property must belong to the specified channel and device."}]`;
+    }
+};
+exports.PropertyCommandTargetConstraintValidator = PropertyCommandTargetConstraintValidator;
+exports.PropertyCommandTargetConstraintValidator = PropertyCommandTargetConstraintValidator = __decorate([
+    (0, common_1.Injectable)(),
+    (0, class_validator_1.ValidatorConstraint)({ name: 'PropertyCommandTargetValidation', async: true }),
+    __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService])
+], PropertyCommandTargetConstraintValidator);
+const ValidatePropertyCommandTarget = (validationOptions) => {
+    return function (object, propertyName) {
+        (0, class_validator_1.registerDecorator)({
+            name: 'ValidatePropertyCommandTarget',
+            target: object.constructor,
+            propertyName,
+            options: validationOptions,
+            constraints: [],
+            validator: PropertyCommandTargetConstraintValidator,
+        });
+    };
+};
+exports.ValidatePropertyCommandTarget = ValidatePropertyCommandTarget;
+//# sourceMappingURL=property-command-target-constraint.validator.js.map

package/dist/modules/devices/validators/property-command-target-constraint.validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"property-command-target-constraint.validator.js","sourceRoot":"","sources":["../../../../src/modules/devices/validators/property-command-target-constraint.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAOyB;AAEzB,2CAA4C;AAE5C,qFAAgF;AAKzE,IAAM,wCAAwC,GAA9C,MAAM,wCAAwC;IACpD,YAA6B,gBAAyC;QAAzC,qBAAgB,GAAhB,gBAAgB,CAAyB;IAAG,CAAC;IAG1E,KAAK,CAAC,QAAQ,CAAC,UAAmB,EAAE,IAAyB;QAC5D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAiC,CAAC;QAExF,IACC,OAAO,UAAU,KAAK,QAAQ;YAC9B,CAAC,IAAA,wBAAM,EAAC,UAAU,EAAE,GAAG,CAAC;YACxB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,IAAA,wBAAM,EAAC,SAAS,EAAE,GAAG,CAAC;YACvB,OAAO,QAAQ,KAAK,QAAQ;YAC5B,CAAC,IAAA,wBAAM,EAAC,QAAQ,EAAE,GAAG,CAAC;YAEtB,OAAO,KAAK,CAAC;QAEd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAEjC,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;IACzG,CAAC;IAED,cAAc,CAAC,IAAyB;QACvC,OAAO,cAAc,IAAI,CAAC,QAAQ,8EAA8E,CAAC;IAClH,CAAC;CACD,CAAA;AA3BY,4FAAwC;mDAAxC,wCAAwC;IAFpD,IAAA,mBAAU,GAAE;IACZ,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,iCAAiC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qCAE9B,mDAAuB;GAD1D,wCAAwC,CA2BpD;AAEM,MAAM,6BAA6B,GAAG,CAAC,iBAAqC,EAAE,EAAE;IACtF,OAAO,UAAU,MAAc,EAAE,YAAoB;QACpD,IAAA,mCAAiB,EAAC;YACjB,IAAI,EAAE,+BAA+B;YACrC,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,wCAAwC;SACnD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,6BAA6B,iCAWxC"}

package/dist/modules/spaces/services/module-reset.service.d.ts

@@ -1,9 +1,13 @@
 import { Repository } from 'typeorm';
+import { PropertyMetadataService } from '../../devices/services/property-metadata.service';
 import { SpaceEntity } from '../entities/space.entity';
+import { SpaceActivityService } from './space-activity.service';
 export declare class SpacesModuleResetService {
     private readonly spacesRepository;
+    private readonly activity;
+    private readonly propertyMetadata;
     private readonly logger;
-    constructor(spacesRepository: Repository<SpaceEntity>);
+    constructor(spacesRepository: Repository<SpaceEntity>, activity: SpaceActivityService, propertyMetadata: PropertyMetadataService);
     reset(): Promise<{
         success: boolean;
         reason?: string;

package/dist/modules/spaces/services/module-reset.service.js

@@ -17,17 +17,23 @@ const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const typeorm_2 = require("@nestjs/typeorm");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const property_metadata_service_1 = require("../../devices/services/property-metadata.service");
 const space_entity_1 = require("../entities/space.entity");
 const spaces_constants_1 = require("../spaces.constants");
+const space_activity_service_1 = require("./space-activity.service");
 let SpacesModuleResetService = class SpacesModuleResetService {
-    constructor(spacesRepository) {
+    constructor(spacesRepository, activity, propertyMetadata) {
         this.spacesRepository = spacesRepository;
+        this.activity = activity;
+        this.propertyMetadata = propertyMetadata;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpacesModuleResetService');
     }
     async reset() {
         this.logger.log('[RESET] Starting spaces module factory reset');
         try {
             await this.spacesRepository.clear();
+            this.propertyMetadata.invalidate();
+            this.activity.clear();
             this.logger.log('[RESET] Spaces module factory reset completed successfully');
             return { success: true };
         }
@@ -42,6 +48,8 @@ exports.SpacesModuleResetService = SpacesModuleResetService;
 exports.SpacesModuleResetService = SpacesModuleResetService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_2.InjectRepository)(space_entity_1.SpaceEntity)),
-    __metadata("design:paramtypes", [typeorm_1.Repository])
+    __metadata("design:paramtypes", [typeorm_1.Repository,
+        space_activity_service_1.SpaceActivityService,
+        property_metadata_service_1.PropertyMetadataService])
 ], SpacesModuleResetService);
 //# sourceMappingURL=module-reset.service.js.map

package/dist/modules/spaces/services/module-reset.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-reset.service.js","sourceRoot":"","sources":["../../../../src/modules/spaces/services/module-reset.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AAErC,2CAA4C;AAC5C,6CAAmD;AAEnD,8FAAwF;AACxF,2DAAuD;AACvD,0DAAyD;AAGlD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGpC,YAEC,gBAA0D;QAAzC,qBAAgB,GAAhB,gBAAgB,CAAyB;QAJ1C,WAAM,GAAG,IAAA,gDAAqB,EAAC,qCAAkB,EAAE,0BAA0B,CAAC,CAAC;IAK7F,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAEhE,IAAI,CAAC;YAEJ,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAEpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YAE9E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEhF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;QAChD,CAAC;IACF,CAAC;CACD,CAAA;AA1BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAKV,WAAA,IAAA,0BAAgB,EAAC,0BAAW,CAAC,CAAA;qCACK,oBAAU;GALlC,wBAAwB,CA0BpC"}
+{"version":3,"file":"module-reset.service.js","sourceRoot":"","sources":["../../../../src/modules/spaces/services/module-reset.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AAErC,2CAA4C;AAC5C,6CAAmD;AAEnD,8FAAwF;AACxF,gGAA2F;AAC3F,2DAAuD;AACvD,0DAAyD;AAEzD,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGpC,YAEC,gBAA0D,EACzC,QAA8B,EAC9B,gBAAyC;QAFzC,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,aAAQ,GAAR,QAAQ,CAAsB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAyB;QAN1C,WAAM,GAAG,IAAA,gDAAqB,EAAC,qCAAkB,EAAE,0BAA0B,CAAC,CAAC;IAO7F,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAEhE,IAAI,CAAC;YAEJ,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAEpC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YAE9E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEhF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;QAChD,CAAC;IACF,CAAC;CACD,CAAA;AA/BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAKV,WAAA,IAAA,0BAAgB,EAAC,0BAAW,CAAC,CAAA;qCACK,oBAAU;QAClB,6CAAoB;QACZ,mDAAuB;GAP/C,wBAAwB,CA+BpC"}

package/dist/modules/spaces/services/space-activity.service.d.ts

@@ -0,0 +1,14 @@
+import { OnModuleDestroy } from '@nestjs/common';
+import { SpaceEntity } from '../entities/space.entity';
+export declare class SpaceActivityService implements OnModuleDestroy {
+    private readonly activity;
+    private readonly deletedGenerations;
+    private generation;
+    private clearGeneration;
+    getGeneration(): number;
+    record(spaceId: string, observedAt: Date, generation?: number): void;
+    readLatest(space: Pick<SpaceEntity, 'id' | 'lastActivityAt'>): Date | string | null;
+    delete(spaceId: string): void;
+    clear(): void;
+    onModuleDestroy(): void;
+}

package/dist/modules/spaces/services/space-activity.service.js

@@ -0,0 +1,56 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpaceActivityService = void 0;
+const common_1 = require("@nestjs/common");
+let SpaceActivityService = class SpaceActivityService {
+    constructor() {
+        this.activity = new Map();
+        this.deletedGenerations = new Map();
+        this.generation = 0;
+        this.clearGeneration = 0;
+    }
+    getGeneration() {
+        return this.generation;
+    }
+    record(spaceId, observedAt, generation = this.generation) {
+        const deletedGeneration = this.deletedGenerations.get(spaceId) ?? 0;
+        if (generation < this.clearGeneration || generation < deletedGeneration)
+            return;
+        const timestamp = observedAt.getTime();
+        if (!Number.isFinite(timestamp))
+            return;
+        this.activity.set(spaceId, Math.max(timestamp, this.activity.get(spaceId) ?? timestamp));
+    }
+    readLatest(space) {
+        const recorded = this.activity.get(space.id);
+        if (recorded === undefined)
+            return space.lastActivityAt;
+        const persisted = space.lastActivityAt instanceof Date ? space.lastActivityAt.getTime() : Date.parse(space.lastActivityAt ?? '');
+        return new Date(Number.isFinite(persisted) ? Math.max(recorded, persisted) : recorded);
+    }
+    delete(spaceId) {
+        this.generation += 1;
+        this.deletedGenerations.set(spaceId, this.generation);
+        this.activity.delete(spaceId);
+    }
+    clear() {
+        this.generation += 1;
+        this.clearGeneration = this.generation;
+        this.deletedGenerations.clear();
+        this.activity.clear();
+    }
+    onModuleDestroy() {
+        this.clear();
+    }
+};
+exports.SpaceActivityService = SpaceActivityService;
+exports.SpaceActivityService = SpaceActivityService = __decorate([
+    (0, common_1.Injectable)()
+], SpaceActivityService);
+//# sourceMappingURL=space-activity.service.js.map

package/dist/modules/spaces/services/space-activity.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-activity.service.js","sourceRoot":"","sources":["../../../../src/modules/spaces/services/space-activity.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6D;AAUtD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QACW,aAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QACrC,uBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACxD,eAAU,GAAG,CAAC,CAAC;QACf,oBAAe,GAAG,CAAC,CAAC;IAyC7B,CAAC;IAvCA,aAAa;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,OAAe,EAAE,UAAgB,EAAE,UAAU,GAAG,IAAI,CAAC,UAAU;QAErE,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,UAAU,GAAG,IAAI,CAAC,eAAe,IAAI,UAAU,GAAG,iBAAiB;YAAE,OAAO;QAChF,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO;QACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,UAAU,CAAC,KAAiD;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC,cAAc,CAAC;QAExD,MAAM,SAAS,GACd,KAAK,CAAC,cAAc,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QAChH,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,CAAC,OAAe;QACrB,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QAErB,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,eAAe;QACd,IAAI,CAAC,KAAK,EAAE,CAAC;IACd,CAAC;CACD,CAAA;AA7CY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CA6ChC"}

package/dist/modules/spaces/spaces.module.js

@@ -38,6 +38,7 @@ const space_role_entity_1 = require("./entities/space-role.entity");
 const space_entity_1 = require("./entities/space.entity");
 const config_model_1 = require("./models/config.model");
 const module_reset_service_1 = require("./services/module-reset.service");
+const space_activity_service_1 = require("./services/space-activity.service");
 const space_create_builder_registry_service_1 = require("./services/space-create-builder-registry.service");
 const space_relations_loader_registry_service_1 = require("./services/space-relations-loader-registry.service");
 const space_roles_type_mapper_service_1 = require("./services/space-roles-type-mapper.service");
@@ -46,6 +47,7 @@ const spaces_type_mapper_service_1 = require("./services/spaces-type-mapper.serv
 const spaces_service_1 = require("./services/spaces.service");
 const spaces_constants_1 = require("./spaces.constants");
 const spaces_openapi_1 = require("./spaces.openapi");
+const space_activity_subscriber_1 = require("./subscribers/space-activity.subscriber");
 let SpacesModule = class SpacesModule {
     constructor(swaggerRegistry, extensionsService, modulesMapperService, moduleReset, factoryResetRegistry) {
         this.swaggerRegistry = swaggerRegistry;
@@ -139,6 +141,8 @@ exports.SpacesModule = SpacesModule = __decorate([
         controllers: [spaces_controller_1.SpacesController, spaces_domain_controller_1.SpacesDomainController],
         providers: [
             spaces_service_1.SpacesService,
+            space_activity_service_1.SpaceActivityService,
+            space_activity_subscriber_1.SpaceActivitySubscriber,
             spaces_bulk_service_1.SpacesBulkService,
             spaces_type_mapper_service_1.SpacesTypeMapperService,
             space_roles_type_mapper_service_1.SpaceRolesTypeMapperService,
@@ -148,6 +152,7 @@ exports.SpacesModule = SpacesModule = __decorate([
         ],
         exports: [
             spaces_service_1.SpacesService,
+            space_activity_service_1.SpaceActivityService,
             spaces_bulk_service_1.SpacesBulkService,
             spaces_type_mapper_service_1.SpacesTypeMapperService,
             space_roles_type_mapper_service_1.SpaceRolesTypeMapperService,

package/dist/modules/spaces/spaces.module.js.map

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

package/dist/modules/spaces/subscribers/space-activity.subscriber.d.ts

@@ -0,0 +1,17 @@
+import { DataSource, EntitySubscriberInterface, RemoveEvent, TransactionCommitEvent, TransactionRollbackEvent, TransactionStartEvent } from 'typeorm';
+import { OnModuleDestroy } from '@nestjs/common';
+import { SpaceEntity } from '../entities/space.entity';
+import { SpaceActivityService } from '../services/space-activity.service';
+export declare class SpaceActivitySubscriber implements EntitySubscriberInterface<SpaceEntity>, OnModuleDestroy {
+    private readonly activity;
+    private readonly dataSource;
+    private readonly pendingRemovals;
+    constructor(activity: SpaceActivityService, dataSource: DataSource);
+    listenTo(): typeof SpaceEntity;
+    afterLoad(space: SpaceEntity): void;
+    afterTransactionStart(event: TransactionStartEvent): void;
+    afterRemove(event: RemoveEvent<SpaceEntity>): void;
+    afterTransactionCommit(event: TransactionCommitEvent): void;
+    afterTransactionRollback(event: TransactionRollbackEvent): void;
+    onModuleDestroy(): void;
+}

package/dist/modules/spaces/subscribers/space-activity.subscriber.js

@@ -0,0 +1,89 @@
+"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.SpaceActivitySubscriber = void 0;
+const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
+const space_entity_1 = require("../entities/space.entity");
+const space_activity_service_1 = require("../services/space-activity.service");
+let SpaceActivitySubscriber = class SpaceActivitySubscriber {
+    constructor(activity, dataSource) {
+        this.activity = activity;
+        this.dataSource = dataSource;
+        this.pendingRemovals = new WeakMap();
+        this.dataSource.subscribers.push(this);
+    }
+    listenTo() {
+        return space_entity_1.SpaceEntity;
+    }
+    afterLoad(space) {
+        space.lastActivityAt = this.activity.readLatest(space);
+    }
+    afterTransactionStart(event) {
+        const levels = this.pendingRemovals.get(event.queryRunner) ?? [];
+        levels.push(new Set());
+        this.pendingRemovals.set(event.queryRunner, levels);
+    }
+    afterRemove(event) {
+        const id = typeof event.entityId === 'string' ? event.entityId : (event.entity?.id ?? event.databaseEntity?.id);
+        if (event.queryRunner.isTransactionActive) {
+            const levels = this.pendingRemovals.get(event.queryRunner) ?? [new Set()];
+            const pending = levels.at(-1);
+            if (pending === null)
+                return;
+            if (id)
+                pending.add(id);
+            else
+                levels[levels.length - 1] = null;
+            this.pendingRemovals.set(event.queryRunner, levels);
+            return;
+        }
+        if (id)
+            this.activity.delete(id);
+        else
+            this.activity.clear();
+    }
+    afterTransactionCommit(event) {
+        const levels = this.pendingRemovals.get(event.queryRunner);
+        const pending = levels?.pop();
+        if (levels?.length) {
+            const parent = levels.at(-1);
+            if (pending === null)
+                levels[levels.length - 1] = null;
+            else
+                pending?.forEach((id) => parent?.add(id));
+            return;
+        }
+        this.pendingRemovals.delete(event.queryRunner);
+        if (pending === null)
+            this.activity.clear();
+        else
+            pending?.forEach((id) => this.activity.delete(id));
+    }
+    afterTransactionRollback(event) {
+        const levels = this.pendingRemovals.get(event.queryRunner);
+        levels?.pop();
+        if (!levels?.length)
+            this.pendingRemovals.delete(event.queryRunner);
+    }
+    onModuleDestroy() {
+        const index = this.dataSource.subscribers.indexOf(this);
+        if (index >= 0)
+            this.dataSource.subscribers.splice(index, 1);
+    }
+};
+exports.SpaceActivitySubscriber = SpaceActivitySubscriber;
+exports.SpaceActivitySubscriber = SpaceActivitySubscriber = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [space_activity_service_1.SpaceActivityService,
+        typeorm_1.DataSource])
+], SpaceActivitySubscriber);
+//# sourceMappingURL=space-activity.subscriber.js.map

package/dist/modules/spaces/subscribers/space-activity.subscriber.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"space-activity.subscriber.js","sourceRoot":"","sources":["../../../../src/modules/spaces/subscribers/space-activity.subscriber.ts"],"names":[],"mappings":"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"}

package/dist/modules/websocket/services/ws-auth.service.js

@@ -15,7 +15,6 @@ const jwt_1 = require("@nestjs/jwt");
 const logger_1 = require("../../../common/logger");
 const transform_utils_1 = require("../../../common/utils/transform.utils");
 const auth_constants_1 = require("../../auth/auth.constants");
-const auth_entity_1 = require("../../auth/entities/auth.entity");
 const tokens_service_1 = require("../../auth/services/tokens.service");
 const token_utils_1 = require("../../auth/utils/token.utils");
 const mcp_constants_1 = require("../../mcp/mcp.constants");
@@ -64,22 +63,17 @@ let WsAuthService = class WsAuthService {
         return this.validateLongLiveToken(client, token);
     }
     async validateUserAccessToken(client, token, userId) {
-        const storedAccessToken = await this.tokensService.findAccessTokenByOwnerAndHash(userId, (0, token_utils_1.hashToken)(token));
+        const storedAccessToken = await this.tokensService.findAuthenticationAccessToken(userId, (0, token_utils_1.hashToken)(token));
         if (!storedAccessToken) {
             this.logger.warn('Access token not found in database');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Token not found');
         }
-        if (storedAccessToken.revoked || storedAccessToken.refreshToken.revoked) {
+        if (storedAccessToken.revoked || storedAccessToken.refreshRevoked) {
             this.logger.warn('Access token is revoked');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Token revoked');
         }
-        let user;
-        try {
-            user = await this.usersService.getOneOrThrow(userId);
-        }
-        catch (error) {
-            const err = error;
-            this.logger.warn('Token valid, but user not found', { message: err.message, stack: err.stack });
+        const user = storedAccessToken.owner;
+        if (!user || user.id !== userId) {
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Invalid user');
         }
         client.data['user'] = (0, transform_utils_1.toInstance)(client_user_dto_1.ClientUserDto, { id: user.id, role: user.role, type: 'user' });
@@ -87,14 +81,7 @@ let WsAuthService = class WsAuthService {
         return true;
     }
     async validateDisplayToken(client, token, displayId) {
-        const displayTokens = await this.tokensService.findByOwnerId(displayId, auth_constants_1.TokenOwnerType.DISPLAY);
-        let storedToken = null;
-        for (const displayToken of displayTokens) {
-            if ((0, token_utils_1.hashToken)(token) === displayToken.hashedToken) {
-                storedToken = displayToken;
-                break;
-            }
-        }
+        const storedToken = await this.tokensService.findAuthenticationTokenByHash((0, token_utils_1.hashToken)(token));
         if (!storedToken) {
             this.logger.warn('Display token not found in database');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Token not found');
@@ -107,6 +94,9 @@ let WsAuthService = class WsAuthService {
             this.logger.warn('Display token is expired');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Token expired');
         }
+        if (storedToken.ownerType !== auth_constants_1.TokenOwnerType.DISPLAY || storedToken.ownerId !== displayId) {
+            throw new websocket_exceptions_1.WebsocketNotAllowedException('Invalid display token owner');
+        }
         client.data['user'] = (0, transform_utils_1.toInstance)(client_user_dto_1.ClientUserDto, {
             id: storedToken.ownerId,
             role: users_constants_1.UserRole.USER,
@@ -116,18 +106,9 @@ let WsAuthService = class WsAuthService {
         });
         this.logger.debug(`Display authentication successful for display=${displayId}`);
         return true;
-        this.logger.debug(`Token authentication successful (ownerType=${storedToken.ownerType})`);
-        return true;
     }
     async validateLongLiveToken(client, token) {
-        const storedLongLiveTokens = await this.tokensService.findAll(auth_entity_1.LongLiveTokenEntity);
-        let storedLongLiveToken = null;
-        for (const longLiveToken of storedLongLiveTokens) {
-            if ((0, token_utils_1.hashToken)(token) === longLiveToken.hashedToken) {
-                storedLongLiveToken = longLiveToken;
-                break;
-            }
-        }
+        const storedLongLiveToken = await this.tokensService.findAuthenticationTokenByHash((0, token_utils_1.hashToken)(token));
         if (!storedLongLiveToken) {
             this.logger.warn('Long-live token not found');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Unknown token');
@@ -140,6 +121,9 @@ let WsAuthService = class WsAuthService {
             this.logger.warn('Long-live token is expired');
             throw new websocket_exceptions_1.WebsocketNotAllowedException('Token expired');
         }
+        if (storedLongLiveToken.ownerType === auth_constants_1.TokenOwnerType.MCP) {
+            throw new websocket_exceptions_1.WebsocketNotAllowedException('MCP credentials cannot authenticate WebSocket connections');
+        }
         let role = users_constants_1.UserRole.USER;
         if (storedLongLiveToken.ownerType === auth_constants_1.TokenOwnerType.USER && storedLongLiveToken.ownerId) {
             const user = await this.usersService.findOne(storedLongLiveToken.ownerId);

package/dist/modules/websocket/services/ws-auth.service.js.map

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

package/dist/plugins/devices-virtual/platforms/virtual-device.platform.d.ts

@@ -1,17 +1,12 @@
 import { IDevicePlatform, IDevicePropertyData } from '../../../modules/devices/platforms/device.platform';
-import { ChannelsPropertiesService } from '../../../modules/devices/services/channels.properties.service';
-import { ChannelsService } from '../../../modules/devices/services/channels.service';
-import { DevicesService } from '../../../modules/devices/services/devices.service';
+import { DeviceCommandGraphService } from '../../../modules/devices/services/device-command-graph.service';
 import { PlatformRegistryService } from '../../../modules/devices/services/platform.registry.service';
 export declare class VirtualDevicePlatform implements IDevicePlatform {
-    private readonly devicesService;
-    private readonly channelsService;
-    private readonly channelsPropertiesService;
+    private readonly graphs;
     private readonly platformRegistryService;
     private readonly logger;
-    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, platformRegistryService: PlatformRegistryService);
+    constructor(graphs: DeviceCommandGraphService, platformRegistryService: PlatformRegistryService);
     getType(): string;
     process(data: IDevicePropertyData): Promise<boolean>;
     processBatch(updates: IDevicePropertyData[]): Promise<boolean>;
-    private resolveSource;
 }

package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js

@@ -13,17 +13,13 @@ exports.VirtualDevicePlatform = void 0;
 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 channels_properties_service_1 = require("../../../modules/devices/services/channels.properties.service");
-const channels_service_1 = require("../../../modules/devices/services/channels.service");
-const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const device_command_graph_service_1 = require("../../../modules/devices/services/device-command-graph.service");
 const platform_registry_service_1 = require("../../../modules/devices/services/platform.registry.service");
 const devices_virtual_constants_1 = require("../devices-virtual.constants");
 const devices_virtual_entity_1 = require("../entities/devices-virtual.entity");
 let VirtualDevicePlatform = class VirtualDevicePlatform {
-    constructor(devicesService, channelsService, channelsPropertiesService, platformRegistryService) {
-        this.devicesService = devicesService;
-        this.channelsService = channelsService;
-        this.channelsPropertiesService = channelsPropertiesService;
+    constructor(graphs, platformRegistryService) {
+        this.graphs = graphs;
         this.platformRegistryService = platformRegistryService;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_virtual_constants_1.DEVICES_VIRTUAL_PLUGIN_NAME, 'VirtualDevicePlatform');
     }
@@ -54,8 +50,9 @@ let VirtualDevicePlatform = class VirtualDevicePlatform {
                 this.logger.warn(`Property id=${property.id} has no source, it was deleted`);
                 return false;
             }
-            const resolved = await this.resolveSource(property.sourcePropertyId);
+            const resolved = await this.graphs.findPropertyTarget(property.sourcePropertyId);
             if (!resolved) {
+                this.logger.warn(`Source property id=${property.sourcePropertyId} has no complete device graph`);
                 return false;
             }
             const { device, channel, property: sourceProperty } = resolved;
@@ -89,38 +86,11 @@ let VirtualDevicePlatform = class VirtualDevicePlatform {
         }
         return true;
     }
-    async resolveSource(sourcePropertyId) {
-        const property = await this.channelsPropertiesService.findOne(sourcePropertyId);
-        if (!property) {
-            this.logger.warn(`Source property id=${sourcePropertyId} not found`);
-            return null;
-        }
-        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
-        const parent = typeof property.channel === 'string' ? await this.channelsService.findOne(property.channel) : property.channel;
-        if (!parent) {
-            this.logger.warn(`Source channel for property id=${sourcePropertyId} not found`);
-            return null;
-        }
-        const deviceId = typeof parent.device === 'string' ? parent.device : parent.device?.id;
-        const device = deviceId ? await this.devicesService.findOne(deviceId) : null;
-        if (!device) {
-            this.logger.warn(`Source device for property id=${sourcePropertyId} not found`);
-            return null;
-        }
-        const channel = device.channels.find((candidate) => candidate.id === channelId);
-        if (!channel) {
-            this.logger.warn(`Source channel for property id=${sourcePropertyId} is no longer on device id=${device.id}`);
-            return null;
-        }
-        return { device, channel, property };
-    }
 };
 exports.VirtualDevicePlatform = VirtualDevicePlatform;
 exports.VirtualDevicePlatform = VirtualDevicePlatform = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [devices_service_1.DevicesService,
-        channels_service_1.ChannelsService,
-        channels_properties_service_1.ChannelsPropertiesService,
+    __metadata("design:paramtypes", [device_command_graph_service_1.DeviceCommandGraphService,
         platform_registry_service_1.PlatformRegistryService])
 ], VirtualDevicePlatform);
 //# sourceMappingURL=virtual-device.platform.js.map

package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-device.platform.js","sourceRoot":"","sources":["../../../../src/plugins/devices-virtual/platforms/virtual-device.platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"virtual-device.platform.js","sourceRoot":"","sources":["../../../../src/plugins/devices-virtual/platforms/virtual-device.platform.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,12 @@
-import { Repository } from 'typeorm';
 import { OnModuleInit } from '@nestjs/common';
-import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
-import { SpaceEntity } from '../../../modules/spaces/entities/space.entity';
+import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
+import { SpaceActivityService } from '../../../modules/spaces/services/space-activity.service';
 export declare class SpaceActivityListener implements OnModuleInit {
-    private readonly spaceRepository;
-    private readonly channelRepository;
+    private readonly propertyMetadata;
+    private readonly activity;
     private readonly logger;
-    constructor(spaceRepository: Repository<SpaceEntity>, channelRepository: Repository<ChannelEntity>);
+    constructor(propertyMetadata: PropertyMetadataService, activity: SpaceActivityService);
     onModuleInit(): void;
     handlePropertyUpdated(property: ChannelPropertyEntity): Promise<void>;
-    private updateSpaceActivity;
 }