@fastybird/smart-panel-backend 1.0.0-beta.3 → 1.1.0-alpha.1

package/dist/modules/displays/dto/bulk-displays.dto.js

@@ -0,0 +1,53 @@
+"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.ReqBulkRemoveDisplaysDto = exports.BulkRemoveDisplaysDto = exports.BULK_DISPLAYS_MAX_IDS = void 0;
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const swagger_1 = require("@nestjs/swagger");
+exports.BULK_DISPLAYS_MAX_IDS = 500;
+let BulkRemoveDisplaysDto = class BulkRemoveDisplaysDto {
+};
+exports.BulkRemoveDisplaysDto = BulkRemoveDisplaysDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Identifiers of the displays to remove',
+        type: 'array',
+        items: { type: 'string', format: 'uuid' },
+        example: ['f1e09ba1-429f-4c6a-a2fd-aca6a7c4a8c6'],
+    }),
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsArray)({ message: '[{"field":"ids","reason":"Ids must be an array."}]' }),
+    (0, class_validator_1.ArrayNotEmpty)({ message: '[{"field":"ids","reason":"At least one display identifier is required."}]' }),
+    (0, class_validator_1.ArrayMaxSize)(exports.BULK_DISPLAYS_MAX_IDS, {
+        message: `[{"field":"ids","reason":"At most ${exports.BULK_DISPLAYS_MAX_IDS} display identifiers can be sent in one request."}]`,
+    }),
+    (0, class_validator_1.IsUUID)('4', { each: true, message: '[{"field":"ids","reason":"Each display identifier must be a valid UUID."}]' }),
+    __metadata("design:type", Array)
+], BulkRemoveDisplaysDto.prototype, "ids", void 0);
+exports.BulkRemoveDisplaysDto = BulkRemoveDisplaysDto = __decorate([
+    (0, swagger_1.ApiSchema)({ name: 'DisplaysModuleBulkRemoveDisplays' })
+], BulkRemoveDisplaysDto);
+let ReqBulkRemoveDisplaysDto = class ReqBulkRemoveDisplaysDto {
+};
+exports.ReqBulkRemoveDisplaysDto = ReqBulkRemoveDisplaysDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Bulk removal data', type: () => BulkRemoveDisplaysDto }),
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsDefined)({ message: '[{"field":"data","reason":"Bulk removal data is required."}]' }),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => BulkRemoveDisplaysDto),
+    __metadata("design:type", BulkRemoveDisplaysDto)
+], ReqBulkRemoveDisplaysDto.prototype, "data", void 0);
+exports.ReqBulkRemoveDisplaysDto = ReqBulkRemoveDisplaysDto = __decorate([
+    (0, swagger_1.ApiSchema)({ name: 'DisplaysModuleReqBulkRemoveDisplays' })
+], ReqBulkRemoveDisplaysDto);
+//# sourceMappingURL=bulk-displays.dto.js.map

package/dist/modules/displays/dto/bulk-displays.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bulk-displays.dto.js","sourceRoot":"","sources":["../../../../src/modules/displays/dto/bulk-displays.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAA0G;AAE1G,6CAAyD;AAM5C,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAGlC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAejC,CAAA;AAfY,sDAAqB;AAcjC;IAbC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,uCAAuC;QACpD,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE;QACzC,OAAO,EAAE,CAAC,sCAAsC,CAAC;KACjD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,EAAC,EAAE,OAAO,EAAE,oDAAoD,EAAE,CAAC;IAC1E,IAAA,+BAAa,EAAC,EAAE,OAAO,EAAE,2EAA2E,EAAE,CAAC;IACvG,IAAA,8BAAY,EAAC,6BAAqB,EAAE;QACpC,OAAO,EAAE,qCAAqC,6BAAqB,qDAAqD;KACxH,CAAC;IACD,IAAA,wBAAM,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,4EAA4E,EAAE,CAAC;;kDACrG;gCAdF,qBAAqB;IADjC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,kCAAkC,EAAE,CAAC;GAC3C,qBAAqB,CAejC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAOpC,CAAA;AAPY,4DAAwB;AAMpC;IALC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;IACpF,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,EAAC,EAAE,OAAO,EAAE,8DAA8D,EAAE,CAAC;IACtF,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC;8BAC5B,qBAAqB;sDAAC;mCANhB,wBAAwB;IADpC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,qCAAqC,EAAE,CAAC;GAC9C,wBAAwB,CAOpC"}

package/dist/modules/displays/guards/registration.guard.d.ts

@@ -1,4 +1,5 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { ClientAddressService } from '../../api/services/client-address.service';
 import { TokensService } from '../../auth/services/tokens.service';
 import { ConfigService } from '../../config/services/config.service';
 import { DisplaysService } from '../services/displays.service';
@@ -8,8 +9,10 @@ export declare class RegistrationGuard implements CanActivate {
     private readonly permitJoinService;
     private readonly displaysService;
     private readonly tokensService;
+    private readonly clientAddressService;
     private readonly logger;
-    constructor(configService: ConfigService, permitJoinService: PermitJoinService, displaysService: DisplaysService, tokensService: TokensService);
+    constructor(configService: ConfigService, permitJoinService: PermitJoinService, displaysService: DisplaysService, tokensService: TokensService, clientAddressService: ClientAddressService);
     private getConfig;
     canActivate(context: ExecutionContext): boolean;
+    private describeNonLocalReason;
 }

package/dist/modules/displays/guards/registration.guard.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistrationGuard = void 0;
 const common_1 = require("@nestjs/common");
 const logger_1 = require("../../../common/logger");
+const client_address_service_1 = require("../../api/services/client-address.service");
 const tokens_service_1 = require("../../auth/services/tokens.service");
 const config_service_1 = require("../../config/services/config.service");
 const displays_constants_1 = require("../displays.constants");
@@ -20,11 +21,12 @@ const displays_service_1 = require("../services/displays.service");
 const permit_join_service_1 = require("../services/permit-join.service");
 const ip_utils_1 = require("../utils/ip.utils");
 let RegistrationGuard = class RegistrationGuard {
-    constructor(configService, permitJoinService, displaysService, tokensService) {
+    constructor(configService, permitJoinService, displaysService, tokensService, clientAddressService) {
         this.configService = configService;
         this.permitJoinService = permitJoinService;
         this.displaysService = displaysService;
         this.tokensService = tokensService;
+        this.clientAddressService = clientAddressService;
         this.logger = (0, logger_1.createExtensionLogger)(displays_constants_1.DISPLAYS_MODULE_NAME, 'RegistrationGuard');
     }
     getConfig() {
@@ -42,14 +44,15 @@ let RegistrationGuard = class RegistrationGuard {
     }
     canActivate(context) {
         const request = context.switchToHttp().getRequest();
-        const clientIp = (0, ip_utils_1.extractClientIp)(request);
+        const resolved = this.clientAddressService.resolve(request);
+        const clientIp = resolved.address;
         const config = this.getConfig();
         const mode = config.deploymentMode;
-        if ((0, ip_utils_1.isLocalhost)(clientIp)) {
+        if ((0, ip_utils_1.isLocalhost)(clientIp) && !resolved.forwarded && !resolved.ignoredForwardedHeaders) {
             return true;
         }
         if (mode === displays_constants_1.DeploymentMode.ALL_IN_ONE) {
-            this.logger.warn(`Rejected: IP ${clientIp} is not localhost in all-in-one mode`);
+            this.logger.warn(`Rejected: ${this.describeNonLocalReason(resolved)} in all-in-one mode`);
             throw new common_1.ForbiddenException('Only localhost registrations are allowed in all-in-one mode');
         }
         if (!this.permitJoinService.isPermitJoinActive()) {
@@ -58,6 +61,15 @@ let RegistrationGuard = class RegistrationGuard {
         }
         return true;
     }
+    describeNonLocalReason(resolved) {
+        if (resolved.ignoredForwardedHeaders) {
+            return `forwarding headers from an untrusted peer (${resolved.peer})`;
+        }
+        if (resolved.forwarded) {
+            return `a forwarded address (${resolved.address} via trusted peer ${resolved.peer})`;
+        }
+        return `IP ${resolved.address} is not localhost`;
+    }
 };
 exports.RegistrationGuard = RegistrationGuard;
 exports.RegistrationGuard = RegistrationGuard = __decorate([
@@ -65,6 +77,7 @@ exports.RegistrationGuard = RegistrationGuard = __decorate([
     __metadata("design:paramtypes", [config_service_1.ConfigService,
         permit_join_service_1.PermitJoinService,
         displays_service_1.DisplaysService,
-        tokens_service_1.TokensService])
+        tokens_service_1.TokensService,
+        client_address_service_1.ClientAddressService])
 ], RegistrationGuard);
 //# sourceMappingURL=registration.guard.js.map

package/dist/modules/displays/guards/registration.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"registration.guard.js","sourceRoot":"","sources":["../../../../src/modules/displays/guards/registration.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAA+F;AAE/F,mDAA+D;AAC/D,uEAAmE;AACnE,yEAAqE;AACrE,8DAA6E;AAC7E,yDAA6D;AAC7D,mEAA+D;AAC/D,yEAAoE;AACpE,gDAAiE;AAG1D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAG7B,YACkB,aAA4B,EAC5B,iBAAoC,EACpC,eAAgC,EAChC,aAA4B;QAH5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAN7B,WAAM,GAAG,IAAA,8BAAqB,EAAC,yCAAoB,EAAE,mBAAmB,CAAC,CAAC;IAOxF,CAAC;IAKI,SAAS;QAChB,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,yCAAoB,CAAC,CAAC;QACtF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,uDAAuD,EACvD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAC9C,CAAC;YAGF,MAAM,aAAa,GAAG,IAAI,kCAAmB,EAAE,CAAC;YAChD,aAAa,CAAC,IAAI,GAAG,yCAAoB,CAAC;YAC1C,aAAa,CAAC,cAAc,GAAG,mCAAc,CAAC,QAAQ,CAAC;YACvD,aAAa,CAAC,oBAAoB,GAAG,MAAM,CAAC;YAE5C,OAAO,aAAa,CAAC;QACtB,CAAC;IACF,CAAC;IAED,WAAW,CAAC,OAAyB;QACpC,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;QAKnC,IAAI,IAAA,sBAAW,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACb,CAAC;QAGD,IAAI,IAAI,KAAK,mCAAc,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,QAAQ,sCAAsC,CAAC,CAAC;YACjF,MAAM,IAAI,2BAAkB,CAAC,6DAA6D,CAAC,CAAC;QAC7F,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YACxD,MAAM,IAAI,2BAAkB,CAC3B,0FAA0F,CAC1F,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA5DY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAKqB,8BAAa;QACT,uCAAiB;QACnB,kCAAe;QACjB,8BAAa;GAPlC,iBAAiB,CA4D7B"}
+{"version":3,"file":"registration.guard.js","sourceRoot":"","sources":["../../../../src/modules/displays/guards/registration.guard.ts"],"names":[],"mappings":"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"}

package/dist/modules/displays/models/displays-response.model.d.ts

@@ -1,4 +1,5 @@
 import { BaseSuccessResponseModel } from '../../api/models/api-response.model';
+import { BulkResultModel } from '../../api/models/bulk.model';
 import { LongLiveTokenEntity } from '../../auth/entities/auth.entity';
 import { DisplayEntity } from '../entities/displays.entity';
 export declare class DisplayResponseModel extends BaseSuccessResponseModel<DisplayEntity> {
@@ -49,3 +50,6 @@ export declare class RegistrationStatusDataModel {
 export declare class RegistrationStatusResponseModel extends BaseSuccessResponseModel<RegistrationStatusDataModel> {
     data: RegistrationStatusDataModel;
 }
+export declare class BulkResultResponseModel extends BaseSuccessResponseModel<BulkResultModel> {
+    data: BulkResultModel;
+}

package/dist/modules/displays/models/displays-response.model.js

@@ -9,10 +9,11 @@ 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.RegistrationStatusResponseModel = exports.RegistrationStatusDataModel = exports.PermitJoinStatusResponseModel = exports.PermitJoinStatusDataModel = exports.PermitJoinResponseModel = exports.PermitJoinDataModel = exports.DisplayTokenRefreshResponseModel = exports.DisplayTokenRefreshDataModel = exports.DisplayTokensResponseModel = exports.DisplayRegistrationResponseModel = exports.DisplayRegistrationDataModel = exports.DisplaysResponseModel = exports.DisplayResponseModel = void 0;
+exports.BulkResultResponseModel = exports.RegistrationStatusResponseModel = exports.RegistrationStatusDataModel = exports.PermitJoinStatusResponseModel = exports.PermitJoinStatusDataModel = exports.PermitJoinResponseModel = exports.PermitJoinDataModel = exports.DisplayTokenRefreshResponseModel = exports.DisplayTokenRefreshDataModel = exports.DisplayTokensResponseModel = exports.DisplayRegistrationResponseModel = exports.DisplayRegistrationDataModel = exports.DisplaysResponseModel = exports.DisplayResponseModel = void 0;
 const class_transformer_1 = require("class-transformer");
 const swagger_1 = require("@nestjs/swagger");
 const api_response_model_1 = require("../../api/models/api-response.model");
+const bulk_model_1 = require("../../api/models/bulk.model");
 const auth_entity_1 = require("../../auth/entities/auth.entity");
 const displays_entity_1 = require("../entities/displays.entity");
 let DisplayResponseModel = class DisplayResponseModel extends api_response_model_1.BaseSuccessResponseModel {
@@ -308,4 +309,18 @@ __decorate([
 exports.RegistrationStatusResponseModel = RegistrationStatusResponseModel = __decorate([
     (0, swagger_1.ApiSchema)({ name: 'DisplaysModuleResRegistrationStatus' })
 ], RegistrationStatusResponseModel);
+let BulkResultResponseModel = class BulkResultResponseModel extends api_response_model_1.BaseSuccessResponseModel {
+};
+exports.BulkResultResponseModel = BulkResultResponseModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'The actual data payload returned by the API',
+        type: () => bulk_model_1.BulkResultModel,
+    }),
+    (0, class_transformer_1.Expose)(),
+    __metadata("design:type", bulk_model_1.BulkResultModel)
+], BulkResultResponseModel.prototype, "data", void 0);
+exports.BulkResultResponseModel = BulkResultResponseModel = __decorate([
+    (0, swagger_1.ApiSchema)({ name: 'DisplaysModuleResBulkResult' })
+], BulkResultResponseModel);
 //# sourceMappingURL=displays-response.model.js.map

package/dist/modules/displays/models/displays-response.model.js.map

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

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

@@ -0,0 +1,8 @@
+import { BulkResultModel } from '../../api/models/bulk.model';
+import { DisplaysService } from './displays.service';
+export declare class DisplaysBulkService {
+    private readonly displaysService;
+    private readonly logger;
+    constructor(displaysService: DisplaysService);
+    remove(ids: string[]): Promise<BulkResultModel>;
+}

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

@@ -0,0 +1,39 @@
+"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.DisplaysBulkService = void 0;
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const bulk_utils_1 = require("../../api/utils/bulk.utils");
+const displays_constants_1 = require("../displays.constants");
+const displays_exceptions_1 = require("../displays.exceptions");
+const displays_service_1 = require("./displays.service");
+let DisplaysBulkService = class DisplaysBulkService {
+    constructor(displaysService) {
+        this.displaysService = displaysService;
+        this.logger = (0, logger_1.createExtensionLogger)(displays_constants_1.DISPLAYS_MODULE_NAME, 'DisplaysBulkService');
+    }
+    async remove(ids) {
+        const result = await (0, bulk_utils_1.runBulkOperation)(ids, (id) => this.displaysService.remove(id), {
+            fallbackReason: 'Display could not be removed',
+            safeErrors: [displays_exceptions_1.DisplaysNotFoundException],
+            logger: this.logger,
+        });
+        this.logger.debug(`Bulk removal finished succeeded=${result.succeeded.length} failed=${result.failed.length}`);
+        return result;
+    }
+};
+exports.DisplaysBulkService = DisplaysBulkService;
+exports.DisplaysBulkService = DisplaysBulkService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [displays_service_1.DisplaysService])
+], DisplaysBulkService);
+//# sourceMappingURL=displays-bulk.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"displays-bulk.service.js","sourceRoot":"","sources":["../../../../src/modules/displays/services/displays-bulk.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,mDAA+D;AAE/D,2DAA8D;AAC9D,8DAA6D;AAC7D,gEAAmE;AAEnE,yDAAqD;AAU9C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAG/B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;QAF5C,WAAM,GAAG,IAAA,8BAAqB,EAAC,yCAAoB,EAAE,qBAAqB,CAAC,CAAC;IAE7B,CAAC;IAEjE,KAAK,CAAC,MAAM,CAAC,GAAa;QACzB,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAgB,EACpC,GAAG,EAGH,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EACvC;YACC,cAAc,EAAE,8BAA8B;YAC9C,UAAU,EAAE,CAAC,+CAAyB,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;SACnB,CACD,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;CACD,CAAA;AAtBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAIkC,kCAAe;GAHjD,mBAAmB,CAsB/B"}

package/dist/modules/displays/utils/ip.utils.d.ts

@@ -1,3 +1 @@
-import { Request } from 'express';
-export declare function extractClientIp(request: Request): string;
 export declare function isLocalhost(ip: string): boolean;

package/dist/modules/displays/utils/ip.utils.js

@@ -1,31 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractClientIp = extractClientIp;
 exports.isLocalhost = isLocalhost;
-function extractClientIp(request) {
-    const xForwardedFor = request.headers['x-forwarded-for'];
-    if (xForwardedFor) {
-        const ips = Array.isArray(xForwardedFor) ? xForwardedFor[0] : xForwardedFor.split(',')[0];
-        if (ips && typeof ips === 'string') {
-            return ips.trim();
-        }
-    }
-    const xRealIp = request.headers['x-real-ip'];
-    if (xRealIp && typeof xRealIp === 'string') {
-        return xRealIp.trim();
-    }
-    const cfConnectingIp = request.headers['cf-connecting-ip'];
-    if (cfConnectingIp && typeof cfConnectingIp === 'string') {
-        return cfConnectingIp.trim();
-    }
-    if (request.socket?.remoteAddress) {
-        return request.socket.remoteAddress;
-    }
-    if (request.connection?.remoteAddress) {
-        return request.connection.remoteAddress;
-    }
-    return 'unknown';
-}
 function isLocalhost(ip) {
     if (!ip || ip === 'unknown') {
         return false;

package/dist/modules/displays/utils/ip.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ip.utils.js","sourceRoot":"","sources":["../../../../src/modules/displays/utils/ip.utils.ts"],"names":[],"mappings":";;AAKA,0CAmCC;AAKD,kCAuBC;AA/DD,SAAgB,eAAe,CAAC,OAAgB;IAE/C,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzD,IAAI,aAAa,EAAE,CAAC;QAEnB,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;IACF,CAAC;IAGD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC3D,IAAI,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;QAC1D,OAAO,cAAc,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAGD,IAAI,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC;QACnC,OAAO,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;IACrC,CAAC;IAID,IAAK,OAAuD,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QACxF,OAAQ,OAAuD,CAAC,UAAU,CAAC,aAAa,CAAC;IAC1F,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAKD,SAAgB,WAAW,CAAC,EAAU;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;IAG7C,IAAI,YAAY,KAAK,WAAW,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACb,CAAC;IAGD,IAAI,YAAY,KAAK,KAAK,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC;IACb,CAAC;IAGD,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}
+{"version":3,"file":"ip.utils.js","sourceRoot":"","sources":["../../../../src/modules/displays/utils/ip.utils.ts"],"names":[],"mappings":";;AAGA,kCAuBC;AAvBD,SAAgB,WAAW,CAAC,EAAU;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;IAG7C,IAAI,YAAY,KAAK,WAAW,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACb,CAAC;IAGD,IAAI,YAAY,KAAK,KAAK,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC;IACb,CAAC;IAGD,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}

package/dist/modules/energy/energy.module.js

@@ -15,6 +15,7 @@ const typeorm_1 = require("@nestjs/typeorm");
 const extension_logger_service_1 = require("../../common/logger/extension-logger.service");
 const config_module_1 = require("../config/config.module");
 const modules_type_mapper_service_1 = require("../config/services/modules-type-mapper.service");
+const devices_module_1 = require("../devices/devices.module");
 const devices_entity_1 = require("../devices/entities/devices.entity");
 const extensions_module_1 = require("../extensions/extensions.module");
 const extensions_service_1 = require("../extensions/services/extensions.service");
@@ -33,6 +34,7 @@ const energy_ingestion_listener_1 = require("./listeners/energy-ingestion.listen
 const config_model_1 = require("./models/config.model");
 const delta_computation_service_1 = require("./services/delta-computation.service");
 const energy_cache_service_1 = require("./services/energy-cache.service");
+const energy_claim_registry_service_1 = require("./services/energy-claim.registry.service");
 const energy_cleanup_service_1 = require("./services/energy-cleanup.service");
 const energy_data_service_1 = require("./services/energy-data.service");
 const energy_metrics_service_1 = require("./services/energy-metrics.service");
@@ -117,7 +119,8 @@ exports.EnergyModule = EnergyModule = __decorate([
     }),
     (0, common_1.Module)({
         imports: [
-            typeorm_1.TypeOrmModule.forFeature([energy_delta_entity_1.EnergyDeltaEntity, devices_entity_1.ChannelEntity]),
+            typeorm_1.TypeOrmModule.forFeature([energy_delta_entity_1.EnergyDeltaEntity, devices_entity_1.ChannelEntity, devices_entity_1.ChannelPropertyEntity]),
+            devices_module_1.DevicesModule,
             swagger_module_1.SwaggerModule,
             config_module_1.ConfigModule,
             extensions_module_1.ExtensionsModule,
@@ -125,6 +128,7 @@ exports.EnergyModule = EnergyModule = __decorate([
         providers: [
             energy_metrics_service_1.EnergyMetricsService,
             delta_computation_service_1.DeltaComputationService,
+            energy_claim_registry_service_1.EnergyClaimRegistryService,
             energy_data_service_1.EnergyDataService,
             energy_cache_service_1.EnergyCacheService,
             energy_ingestion_listener_1.EnergyIngestionListener,
@@ -132,7 +136,7 @@ exports.EnergyModule = EnergyModule = __decorate([
             module_reset_service_1.EnergyModuleResetService,
         ],
         controllers: [energy_controller_1.EnergyController, energy_spaces_controller_1.EnergySpacesController, energy_home_controller_1.EnergyHomeController],
-        exports: [energy_data_service_1.EnergyDataService],
+        exports: [energy_data_service_1.EnergyDataService, energy_claim_registry_service_1.EnergyClaimRegistryService],
     }),
     __metadata("design:paramtypes", [swagger_models_registry_service_1.SwaggerModelsRegistryService,
         extensions_service_1.ExtensionsService,

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

@@ -1 +1 @@
-{"version":3,"file":"energy.module.js","sourceRoot":"","sources":["../../../src/modules/energy/energy.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsD;AACtD,6CAAgD;AAEhD,2FAAqF;AACrF,2DAAuD;AACvD,gGAA0F;AAC1F,uEAAmE;AACnE,uEAAmE;AACnE,kFAA8E;AAC9E,+EAAiE;AACjE,yGAAmG;AACnG,8DAA0D;AAC1D,sGAAgG;AAEhG,iFAA4E;AAC5E,qFAAgF;AAChF,uEAAmE;AACnE,+DAAgE;AAChE,yDAAuH;AACvH,qDAA+D;AAC/D,wEAAmE;AACnE,qFAAgF;AAChF,wDAA0D;AAC1D,oFAA+E;AAC/E,0EAAqE;AACrE,8EAAyE;AACzE,wEAAmE;AACnE,8EAAyE;AACzE,0EAA2E;AA0BpE,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGxB,YACkB,eAA6C,EAC7C,iBAAoC,EACpC,oBAA8C,EAC9C,WAAqC,EACrC,oBAAiD;QAJjD,oBAAe,GAAf,eAAe,CAA8B;QAC7C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAA0B;QAC9C,gBAAW,GAAX,WAAW,CAA0B;QACrC,yBAAoB,GAApB,oBAAoB,CAA6B;QAPlD,WAAM,GAAG,IAAA,gDAAqB,EAAC,qCAAkB,EAAE,cAAc,CAAC,CAAC;IAQjF,CAAC;IAEJ,YAAY;QAEX,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CACjC,qCAAkB,EAClB,KAAK,IAAoD,EAAE;YAC1D,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC,EACD,GAAG,CACH,CAAC;QAEF,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAA2C;YACnF,IAAI,EAAE,qCAAkB;YACxB,KAAK,EAAE,gCAAiB;YACxB,SAAS,EAAE,yCAAqB;SAChC,CAAC,CAAC;QAEH,KAAK,MAAM,KAAK,IAAI,4CAA2B,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;YAC7C,IAAI,EAAE,qCAAkB;YACxB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,8FAA8F;YAC3G,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yFAoC8E;YACtF,KAAK,EAAE;gBACN,aAAa,EAAE,wCAAwC;gBACvD,UAAU,EAAE,0CAA0C;aACtD;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;CACD,CAAA;AAjFY,oCAAY;uBAAZ,YAAY;IAxBxB,IAAA,0BAAM,EAAC;QACP,OAAO,EAAE,qCAAkB;QAC3B,WAAW,EAAE,6CAA0B;QACvC,WAAW,EAAE,oDAAiC;KAC9C,CAAC;IACD,IAAA,eAAM,EAAC;QACP,OAAO,EAAE;YACR,uBAAa,CAAC,UAAU,CAAC,CAAC,uCAAiB,EAAE,8BAAa,CAAC,CAAC;YAC5D,8BAAa;YACb,4BAAY;YACZ,oCAAgB;SAChB;QACD,SAAS,EAAE;YACV,6CAAoB;YACpB,mDAAuB;YACvB,uCAAiB;YACjB,yCAAkB;YAClB,mDAAuB;YACvB,6CAAoB;YACpB,+CAAwB;SACxB;QACD,WAAW,EAAE,CAAC,oCAAgB,EAAE,iDAAsB,EAAE,6CAAoB,CAAC;QAC7E,OAAO,EAAE,CAAC,uCAAiB,CAAC;KAC5B,CAAC;qCAKkC,8DAA4B;QAC1B,sCAAiB;QACd,sDAAwB;QACjC,+CAAwB;QACf,4DAA2B;GARvD,YAAY,CAiFxB"}
+{"version":3,"file":"energy.module.js","sourceRoot":"","sources":["../../../src/modules/energy/energy.module.ts"],"names":[],"mappings":"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"}

package/dist/modules/energy/energy.openapi.d.ts

@@ -1,7 +1,9 @@
+import { UpdateEnergyConfigDto } from './dto/update-config.dto';
 import { EnergyDeltaEntity } from './entities/energy-delta.entity';
+import { EnergyConfigModel } from './models/config.model';
 import { EnergyBreakdownItemModel } from './models/energy-breakdown-item.model';
 import { EnergyHomeBreakdownResponseModel, EnergyHomeTimeseriesResponseModel } from './models/energy-home-response.model';
 import { EnergySummaryResponseModel } from './models/energy-response.model';
 import { EnergySummaryModel } from './models/energy-summary.model';
 import { EnergyTimeseriesPointModel } from './models/energy-timeseries-point.model';
-export declare const ENERGY_SWAGGER_EXTRA_MODELS: (typeof EnergyBreakdownItemModel | typeof EnergyTimeseriesPointModel | typeof EnergyHomeTimeseriesResponseModel | typeof EnergyHomeBreakdownResponseModel | typeof EnergyDeltaEntity | typeof EnergySummaryModel | typeof EnergySummaryResponseModel)[];
+export declare const ENERGY_SWAGGER_EXTRA_MODELS: (typeof EnergyBreakdownItemModel | typeof EnergyTimeseriesPointModel | typeof EnergyHomeTimeseriesResponseModel | typeof EnergyHomeBreakdownResponseModel | typeof EnergyConfigModel | typeof EnergyDeltaEntity | typeof EnergySummaryModel | typeof EnergySummaryResponseModel | typeof UpdateEnergyConfigDto)[];

package/dist/modules/energy/energy.openapi.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ENERGY_SWAGGER_EXTRA_MODELS = void 0;
+const update_config_dto_1 = require("./dto/update-config.dto");
 const energy_delta_entity_1 = require("./entities/energy-delta.entity");
+const config_model_1 = require("./models/config.model");
 const energy_breakdown_item_model_1 = require("./models/energy-breakdown-item.model");
 const energy_delta_model_1 = require("./models/energy-delta.model");
 const energy_home_response_model_1 = require("./models/energy-home-response.model");
@@ -11,6 +13,8 @@ const energy_space_summary_model_1 = require("./models/energy-space-summary.mode
 const energy_summary_model_1 = require("./models/energy-summary.model");
 const energy_timeseries_point_model_1 = require("./models/energy-timeseries-point.model");
 exports.ENERGY_SWAGGER_EXTRA_MODELS = [
+    config_model_1.EnergyConfigModel,
+    update_config_dto_1.UpdateEnergyConfigDto,
     energy_response_model_1.EnergySummaryResponseModel,
     energy_response_model_1.EnergyDeltasResponseModel,
     energy_space_response_model_1.EnergySpaceSummaryResponseModel,

package/dist/modules/energy/energy.openapi.js.map

@@ -1 +1 @@
-{"version":3,"file":"energy.openapi.js","sourceRoot":"","sources":["../../../src/modules/energy/energy.openapi.ts"],"names":[],"mappings":";;;AAGA,wEAAmE;AACnE,sFAAgF;AAChF,oEAAmE;AACnE,oFAI6C;AAC7C,0EAAuG;AACvG,sFAI8C;AAC9C,oFAA8E;AAC9E,wEAAmE;AACnE,0FAAoF;AAEvE,QAAA,2BAA2B,GAAG;IAE1C,kDAA0B;IAC1B,iDAAyB;IACzB,6DAA+B;IAC/B,gEAAkC;IAClC,+DAAiC;IACjC,2DAA8B;IAC9B,8DAAiC;IACjC,6DAAgC;IAEhC,yCAAkB;IAClB,yCAAoB;IACpB,oDAAuB;IACvB,0DAA0B;IAC1B,sDAAwB;IACxB,uCAAiB;CACjB,CAAC"}
+{"version":3,"file":"energy.openapi.js","sourceRoot":"","sources":["../../../src/modules/energy/energy.openapi.ts"],"names":[],"mappings":";;;AAGA,+DAAgE;AAChE,wEAAmE;AACnE,wDAA0D;AAC1D,sFAAgF;AAChF,oEAAmE;AACnE,oFAI6C;AAC7C,0EAAuG;AACvG,sFAI8C;AAC9C,oFAA8E;AAC9E,wEAAmE;AACnE,0FAAoF;AAEvE,QAAA,2BAA2B,GAAG;IAE1C,gCAAiB;IACjB,yCAAqB;IAErB,kDAA0B;IAC1B,iDAAyB;IACzB,6DAA+B;IAC/B,gEAAkC;IAClC,+DAAiC;IACjC,2DAA8B;IAC9B,8DAAiC;IACjC,6DAAgC;IAEhC,yCAAkB;IAClB,yCAAoB;IACpB,oDAAuB;IACvB,0DAA0B;IAC1B,sDAAwB;IACxB,uCAAiB;CACjB,CAAC"}

package/dist/modules/energy/listeners/energy-ingestion.listener.d.ts

@@ -1,18 +1,25 @@
 import { Repository } from 'typeorm';
 import { OnModuleInit } from '@nestjs/common';
 import { ChannelEntity, ChannelPropertyEntity } from '../../devices/entities/devices.entity';
+import { PropertyValueSourceRegistryService } from '../../devices/services/property-value-source.registry.service';
 import { DeltaComputationService } from '../services/delta-computation.service';
+import { EnergyClaimRegistryService } from '../services/energy-claim.registry.service';
 import { EnergyDataService } from '../services/energy-data.service';
 import { EnergyMetricsService } from '../services/energy-metrics.service';
 export declare class EnergyIngestionListener implements OnModuleInit {
     private readonly channelRepository;
+    private readonly channelPropertyRepository;
     private readonly deltaComputation;
     private readonly energyData;
     private readonly metrics;
+    private readonly valueSourceRegistry;
+    private readonly energyClaims;
     private readonly logger;
-    constructor(channelRepository: Repository<ChannelEntity>, deltaComputation: DeltaComputationService, energyData: EnergyDataService, metrics: EnergyMetricsService);
+    constructor(channelRepository: Repository<ChannelEntity>, channelPropertyRepository: Repository<ChannelPropertyEntity>, deltaComputation: DeltaComputationService, energyData: EnergyDataService, metrics: EnergyMetricsService, valueSourceRegistry: PropertyValueSourceRegistryService, energyClaims: EnergyClaimRegistryService);
     onModuleInit(): void;
     handlePropertyValueSet(property: ChannelPropertyEntity): Promise<void>;
     private processPropertyValue;
+    private resolveAccounting;
+    private resolveClaim;
     private extractNumericValue;
 }

package/dist/modules/energy/listeners/energy-ingestion.listener.js

@@ -20,38 +20,22 @@ const typeorm_2 = require("@nestjs/typeorm");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const devices_constants_1 = require("../../devices/devices.constants");
 const devices_entity_1 = require("../../devices/entities/devices.entity");
+const property_value_source_registry_service_1 = require("../../devices/services/property-value-source.registry.service");
 const energy_constants_1 = require("../energy.constants");
 const delta_computation_service_1 = require("../services/delta-computation.service");
+const energy_claim_registry_service_1 = require("../services/energy-claim.registry.service");
 const energy_data_service_1 = require("../services/energy-data.service");
 const energy_metrics_service_1 = require("../services/energy-metrics.service");
-const SOURCE_TYPE_MAP = [
-    {
-        channelCategory: devices_constants_1.ChannelCategory.ELECTRICAL_ENERGY,
-        propertyCategory: devices_constants_1.PropertyCategory.CONSUMPTION,
-        sourceType: energy_constants_1.EnergySourceType.CONSUMPTION_IMPORT,
-    },
-    {
-        channelCategory: devices_constants_1.ChannelCategory.ELECTRICAL_GENERATION,
-        propertyCategory: devices_constants_1.PropertyCategory.PRODUCTION,
-        sourceType: energy_constants_1.EnergySourceType.GENERATION_PRODUCTION,
-    },
-    {
-        channelCategory: devices_constants_1.ChannelCategory.ELECTRICAL_ENERGY,
-        propertyCategory: devices_constants_1.PropertyCategory.GRID_IMPORT,
-        sourceType: energy_constants_1.EnergySourceType.GRID_IMPORT,
-    },
-    {
-        channelCategory: devices_constants_1.ChannelCategory.ELECTRICAL_ENERGY,
-        propertyCategory: devices_constants_1.PropertyCategory.GRID_EXPORT,
-        sourceType: energy_constants_1.EnergySourceType.GRID_EXPORT,
-    },
-];
+const energy_source_type_utils_1 = require("../utils/energy-source-type.utils");
 let EnergyIngestionListener = class EnergyIngestionListener {
-    constructor(channelRepository, deltaComputation, energyData, metrics) {
+    constructor(channelRepository, channelPropertyRepository, deltaComputation, energyData, metrics, valueSourceRegistry, energyClaims) {
         this.channelRepository = channelRepository;
+        this.channelPropertyRepository = channelPropertyRepository;
         this.deltaComputation = deltaComputation;
         this.energyData = energyData;
         this.metrics = metrics;
+        this.valueSourceRegistry = valueSourceRegistry;
+        this.energyClaims = energyClaims;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(energy_constants_1.ENERGY_MODULE_NAME, 'EnergyIngestionListener');
     }
     onModuleInit() {
@@ -92,13 +76,16 @@ let EnergyIngestionListener = class EnergyIngestionListener {
             this.logger.debug(`Channel ${channelId} not found, skipping`);
             return;
         }
-        const mapping = SOURCE_TYPE_MAP.find((m) => m.channelCategory === channel.category && m.propertyCategory === property.category);
+        const mapping = (0, energy_source_type_utils_1.findEnergySourceType)(channel.category, property.category);
         if (!mapping) {
             return;
         }
         const device = channel.device;
-        const deviceId = device.id;
-        const roomId = device.roomId ?? null;
+        const accounting = await this.resolveAccounting(property, channel, device, mapping.sourceType);
+        if (!accounting) {
+            return;
+        }
+        const { meter, deviceId, roomId } = accounting;
         let timestamp = new Date();
         if (property.value?.lastUpdated) {
             const parsed = new Date(property.value.lastUpdated);
@@ -110,7 +97,7 @@ let EnergyIngestionListener = class EnergyIngestionListener {
             }
         }
         this.metrics.recordSampleProcessed();
-        const delta = this.deltaComputation.computeDelta(deviceId, channel.id, mapping.sourceType, numericValue, timestamp);
+        const delta = this.deltaComputation.computeDelta(meter.deviceId, meter.channelId, mapping.sourceType, numericValue, timestamp);
         if (!delta) {
             return;
         }
@@ -124,6 +111,59 @@ let EnergyIngestionListener = class EnergyIngestionListener {
             intervalEnd: delta.intervalEnd,
         });
     }
+    async resolveAccounting(property, channel, device, sourceType) {
+        const sourcePropertyId = this.valueSourceRegistry.resolve(property);
+        if (sourcePropertyId === property.id) {
+            const claim = await this.resolveClaim(property.id, sourceType);
+            return {
+                meter: { deviceId: device.id, channelId: channel.id },
+                deviceId: claim?.deviceId ?? device.id,
+                roomId: claim ? claim.roomId : (device.roomId ?? null),
+            };
+        }
+        const source = await this.channelPropertyRepository
+            .createQueryBuilder('property')
+            .innerJoinAndSelect('property.channel', 'channel')
+            .innerJoinAndSelect('channel.device', 'device')
+            .where('property.id = :sourcePropertyId', { sourcePropertyId })
+            .getOne();
+        if (!source) {
+            this.logger.debug(`Source property ${sourcePropertyId} of projection ${property.id} not found`);
+            return {
+                meter: { deviceId: device.id, channelId: channel.id },
+                deviceId: device.id,
+                roomId: device.roomId ?? null,
+            };
+        }
+        const sourceChannel = source.channel;
+        const sourceDevice = sourceChannel.device;
+        if ((0, energy_source_type_utils_1.findEnergySourceType)(sourceChannel.category, source.category) !== null) {
+            return null;
+        }
+        const claim = await this.energyClaims.resolveClaim(source.id);
+        if (claim !== null && claim.propertyId !== property.id) {
+            return null;
+        }
+        return {
+            meter: { deviceId: sourceDevice.id, channelId: sourceChannel.id },
+            deviceId: device.id,
+            roomId: device.roomId ?? null,
+        };
+    }
+    async resolveClaim(meterPropertyId, sourceType) {
+        const claim = await this.energyClaims.resolveClaim(meterPropertyId).catch((error) => {
+            this.logger.error(`Failed to resolve the energy claim on property ${meterPropertyId}, attributing to the meter: ${error.message}`);
+            return null;
+        });
+        if (claim === null) {
+            return null;
+        }
+        if (claim.sourceType !== sourceType) {
+            this.logger.warn(`Energy claimant ${claim.propertyId} of property ${meterPropertyId} no longer presents ${sourceType}, attributing to the meter`);
+            return null;
+        }
+        return claim;
+    }
     extractNumericValue(property) {
         if (!property.value || property.value.value === null || property.value.value === undefined) {
             return null;
@@ -147,9 +187,13 @@ __decorate([
 exports.EnergyIngestionListener = EnergyIngestionListener = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
+    __param(1, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelPropertyEntity)),
     __metadata("design:paramtypes", [typeorm_1.Repository,
+        typeorm_1.Repository,
         delta_computation_service_1.DeltaComputationService,
         energy_data_service_1.EnergyDataService,
-        energy_metrics_service_1.EnergyMetricsService])
+        energy_metrics_service_1.EnergyMetricsService,
+        property_value_source_registry_service_1.PropertyValueSourceRegistryService,
+        energy_claim_registry_service_1.EnergyClaimRegistryService])
 ], EnergyIngestionListener);
 //# sourceMappingURL=energy-ingestion.listener.js.map