@fastybird/smart-panel-backend 0.1.0-alpha.5 → 0.1.0-alpha.7

package/dist/plugins/devices-shelly-ng/dto/create-device.dto.js

@@ -18,8 +18,8 @@ const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
 let CreateShellyNgDeviceDto = class CreateShellyNgDeviceDto extends create_device_dto_1.CreateDeviceDto {
     constructor() {
         super(...arguments);
-        this.hostname = null;
         this.password = null;
+        this.wifiAddress = null;
     }
 };
 exports.CreateShellyNgDeviceDto = CreateShellyNgDeviceDto;
@@ -36,28 +36,27 @@ __decorate([
 ], CreateShellyNgDeviceDto.prototype, "type", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)({
-        description: 'Device hostname or IP address',
-        example: '192.168.1.100',
+        description: 'Device password',
+        example: 'password123',
         nullable: true,
     }),
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsString)({
-        message: '[{"field":"hostname","reason":"Hostname attribute must be a valid IP address or network hostname."}]',
-    }),
+    (0, class_validator_1.IsString)({ message: '[{"field":"password","reason":"Password attribute must be a valid string."}]' }),
     __metadata("design:type", String)
-], CreateShellyNgDeviceDto.prototype, "hostname", void 0);
+], CreateShellyNgDeviceDto.prototype, "password", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)({
-        description: 'Device password',
-        example: 'password123',
+        description: 'WiFi IP address or hostname of the device',
+        example: '192.168.1.100',
         nullable: true,
+        name: 'wifi_address',
     }),
-    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Expose)({ name: 'wifi_address' }),
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsString)({ message: '[{"field":"password","reason":"Password attribute must be a valid string."}]' }),
+    (0, class_validator_1.IsString)({ message: '[{"field":"wifi_address","reason":"WiFi address must be a valid string."}]' }),
     __metadata("design:type", String)
-], CreateShellyNgDeviceDto.prototype, "password", void 0);
+], CreateShellyNgDeviceDto.prototype, "wifiAddress", void 0);
 exports.CreateShellyNgDeviceDto = CreateShellyNgDeviceDto = __decorate([
     (0, swagger_1.ApiSchema)({ name: 'DevicesShellyNgPluginCreateDevice' })
 ], CreateShellyNgDeviceDto);

package/dist/plugins/devices-shelly-ng/dto/create-device.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-device.dto.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/dto/create-device.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAuD;AAEvD,6CAA8E;AAE9E,sFAAiF;AACjF,gFAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,mCAAe;IAArD;;QAqBN,aAAQ,GAAkB,IAAI,CAAC;QAU/B,aAAQ,GAAmB,IAAI,CAAC;IACjC,CAAC;CAAA,CAAA;AAhCY,0DAAuB;AAS1B;IARR,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,oDAAsB;QAC/B,OAAO,EAAE,oDAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,wEAAwE,EAAE,CAAC;;qDACnD;AAY7C;IAVC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,+BAA+B;QAC5C,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC;QACT,OAAO,EAAE,sGAAsG;KAC/G,CAAC;;yDAC6B;AAU/B;IARC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,8EAA8E,EAAE,CAAC;;yDACtE;kCA/BpB,uBAAuB;IADnC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,mCAAmC,EAAE,CAAC;GAC5C,uBAAuB,CAgCnC"}
+{"version":3,"file":"create-device.dto.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/dto/create-device.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAuD;AAEvD,6CAA8E;AAE9E,sFAAiF;AACjF,gFAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,mCAAe;IAArD;;QAmBN,aAAQ,GAAmB,IAAI,CAAC;QAWhC,gBAAW,GAAmB,IAAI,CAAC;IACpC,CAAC;CAAA,CAAA;AA/BY,0DAAuB;AAS1B;IARR,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,oDAAsB;QAC/B,OAAO,EAAE,oDAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,wEAAwE,EAAE,CAAC;;qDACnD;AAU7C;IARC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,8EAA8E,EAAE,CAAC;;yDACtE;AAWhC;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,2CAA2C;QACxD,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,cAAc;KACpB,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAChC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,4EAA4E,EAAE,CAAC;;4DACjE;kCA9BvB,uBAAuB;IADnC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,mCAAmC,EAAE,CAAC;GAC5C,uBAAuB,CA+BnC"}

package/dist/plugins/devices-shelly-ng/dto/update-device.dto.d.ts

@@ -3,5 +3,6 @@ import { DEVICES_SHELLY_NG_TYPE } from '../devices-shelly-ng.constants';
 export declare class UpdateShellyNgDeviceDto extends UpdateDeviceDto {
     type: typeof DEVICES_SHELLY_NG_TYPE;
     password?: string | null;
-    hostname?: string | null;
+    wifiAddress?: string | null;
+    ethernetAddress?: string | null;
 }

package/dist/plugins/devices-shelly-ng/dto/update-device.dto.js

@@ -42,17 +42,32 @@ __decorate([
 ], UpdateShellyNgDeviceDto.prototype, "password", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)({
-        description: 'Device hostname or IP address',
+        description: 'WiFi interface IP address',
+        name: 'wifi_address',
         example: '192.168.1.100',
         nullable: true,
     }),
-    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Expose)({ name: 'wifi_address' }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)({
+        message: '[{"field":"wifi_address","reason":"WiFi address must be a valid IP address or network hostname."}]',
+    }),
+    __metadata("design:type", String)
+], UpdateShellyNgDeviceDto.prototype, "wifiAddress", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({
+        description: 'Ethernet interface IP address',
+        name: 'ethernet_address',
+        example: '192.168.1.101',
+        nullable: true,
+    }),
+    (0, class_transformer_1.Expose)({ name: 'ethernet_address' }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)({
-        message: '[{"field":"hostname","reason":"Hostname attribute must be a valid IP address or network hostname."}]',
+        message: '[{"field":"ethernet_address","reason":"Ethernet address must be a valid IP address or network hostname."}]',
     }),
     __metadata("design:type", String)
-], UpdateShellyNgDeviceDto.prototype, "hostname", void 0);
+], UpdateShellyNgDeviceDto.prototype, "ethernetAddress", void 0);
 exports.UpdateShellyNgDeviceDto = UpdateShellyNgDeviceDto = __decorate([
     (0, swagger_1.ApiSchema)({ name: 'DevicesShellyNgPluginUpdateDevice' })
 ], UpdateShellyNgDeviceDto);

package/dist/plugins/devices-shelly-ng/dto/update-device.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-device.dto.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/dto/update-device.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAuD;AAEvD,6CAA8E;AAE9E,sFAAiF;AACjF,gFAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,mCAAe;CAgC3D,CAAA;AAhCY,0DAAuB;AASnC;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,oDAAsB;QAC/B,OAAO,EAAE,oDAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,wEAAwE,EAAE,CAAC;;qDAC5D;AAUpC;IARC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,8EAA8E,EAAE,CAAC;;yDAC7E;AAYzB;IAVC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,+BAA+B;QAC5C,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC;QACT,OAAO,EAAE,sGAAsG;KAC/G,CAAC;;yDACuB;kCA/Bb,uBAAuB;IADnC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,mCAAmC,EAAE,CAAC;GAC5C,uBAAuB,CAgCnC"}
+{"version":3,"file":"update-device.dto.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/dto/update-device.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAuD;AAEvD,6CAA8E;AAE9E,sFAAiF;AACjF,gFAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,mCAAe;CA+C3D,CAAA;AA/CY,0DAAuB;AASnC;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,aAAa;QAC1B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,oDAAsB;QAC/B,OAAO,EAAE,oDAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,wEAAwE,EAAE,CAAC;;qDAC5D;AAUpC;IARC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,8EAA8E,EAAE,CAAC;;yDAC7E;AAazB;IAXC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAChC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC;QACT,OAAO,EAAE,oGAAoG;KAC7G,CAAC;;4DAC0B;AAc5B;IAZC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,+BAA+B;QAC5C,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,eAAe;QACxB,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IACpC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC;QACT,OAAO,EACN,4GAA4G;KAC7G,CAAC;;gEAC8B;kCA9CpB,uBAAuB;IADnC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,mCAAmC,EAAE,CAAC;GAC5C,uBAAuB,CA+CnC"}

package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.d.ts

@@ -1,8 +1,13 @@
 import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
+import { ShellyNgDeviceAddressEntity } from './shelly-ng-device-address.entity';
 export declare class ShellyNgDeviceEntity extends DeviceEntity {
     get type(): string;
     password: string | null;
-    hostname: string | null;
+    canonicalMac: string | null;
+    hasEthernet: boolean;
+    wifiAddress?: string | null;
+    ethernetAddress?: string | null;
+    addresses: ShellyNgDeviceAddressEntity[];
     toString(): string;
 }
 export declare class ShellyNgChannelEntity extends ChannelEntity {

package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js

@@ -16,11 +16,13 @@ const typeorm_1 = require("typeorm");
 const swagger_1 = require("@nestjs/swagger");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
 const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
+const shelly_ng_device_address_entity_1 = require("./shelly-ng-device-address.entity");
 let ShellyNgDeviceEntity = class ShellyNgDeviceEntity extends devices_entity_1.DeviceEntity {
     constructor() {
         super(...arguments);
         this.password = null;
-        this.hostname = null;
+        this.canonicalMac = null;
+        this.hasEthernet = false;
     }
     get type() {
         return devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE;
@@ -56,17 +58,47 @@ __decorate([
 ], ShellyNgDeviceEntity.prototype, "password", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)({
-        description: 'Device hostname or IP address',
+        description: 'Canonical MAC address from Shelly device info, used for deduplication of multi-interface devices',
+        name: 'canonical_mac',
         type: 'string',
-        example: '192.168.1.100',
+        example: 'A8032ABE5084',
         nullable: true,
     }),
-    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Expose)({ name: 'canonical_mac' }),
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, typeorm_1.Column)({ nullable: true, default: null }),
+    (0, typeorm_1.Column)({ nullable: true, default: null, unique: true }),
     __metadata("design:type", String)
-], ShellyNgDeviceEntity.prototype, "hostname", void 0);
+], ShellyNgDeviceEntity.prototype, "canonicalMac", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Whether the device has an Ethernet interface (Pro devices)',
+        name: 'has_ethernet',
+        type: 'boolean',
+        example: false,
+    }),
+    (0, class_transformer_1.Expose)({ name: 'has_ethernet' }),
+    (0, class_validator_1.IsBoolean)(),
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], ShellyNgDeviceEntity.prototype, "hasEthernet", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'wifi_address' }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], ShellyNgDeviceEntity.prototype, "wifiAddress", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)({ name: 'ethernet_address' }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], ShellyNgDeviceEntity.prototype, "ethernetAddress", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, typeorm_1.OneToMany)(() => shelly_ng_device_address_entity_1.ShellyNgDeviceAddressEntity, (addr) => addr.device, { eager: true }),
+    __metadata("design:type", Array)
+], ShellyNgDeviceEntity.prototype, "addresses", void 0);
 exports.ShellyNgDeviceEntity = ShellyNgDeviceEntity = __decorate([
     (0, swagger_1.ApiSchema)({ name: 'DevicesShellyNgPluginDataDevice' }),
     (0, typeorm_1.ChildEntity)()

package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js.map

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

package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.d.ts

@@ -0,0 +1,10 @@
+import { BaseEntity } from '../../../common/entities/base.entity';
+import { AddressType } from '../devices-shelly-ng.constants';
+import { ShellyNgDeviceEntity } from './devices-shelly-ng.entity';
+export declare class ShellyNgDeviceAddressEntity extends BaseEntity {
+    deviceId: string;
+    device: ShellyNgDeviceEntity;
+    interfaceType: AddressType;
+    address: string;
+    toString(): string;
+}

package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js

@@ -0,0 +1,69 @@
+"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.ShellyNgDeviceAddressEntity = void 0;
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const typeorm_1 = require("typeorm");
+const swagger_1 = require("@nestjs/swagger");
+const base_entity_1 = require("../../../common/entities/base.entity");
+const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
+const devices_shelly_ng_entity_1 = require("./devices-shelly-ng.entity");
+let ShellyNgDeviceAddressEntity = class ShellyNgDeviceAddressEntity extends base_entity_1.BaseEntity {
+    toString() {
+        return `Shelly Address [${this.interfaceType}:${this.address}] -> Device [${this.deviceId}]`;
+    }
+};
+exports.ShellyNgDeviceAddressEntity = ShellyNgDeviceAddressEntity;
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Device ID this address belongs to',
+        type: 'string',
+        format: 'uuid',
+    }),
+    (0, class_transformer_1.Expose)({ name: 'device_id' }),
+    (0, class_validator_1.IsString)(),
+    (0, typeorm_1.Column)({ type: 'varchar' }),
+    __metadata("design:type", String)
+], ShellyNgDeviceAddressEntity.prototype, "deviceId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => devices_shelly_ng_entity_1.ShellyNgDeviceEntity, (device) => device.addresses, { onDelete: 'CASCADE' }),
+    (0, typeorm_1.JoinColumn)({ name: 'deviceId' }),
+    __metadata("design:type", devices_shelly_ng_entity_1.ShellyNgDeviceEntity)
+], ShellyNgDeviceAddressEntity.prototype, "device", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Network interface type',
+        enum: devices_shelly_ng_constants_1.AddressType,
+        example: devices_shelly_ng_constants_1.AddressType.ETHERNET,
+    }),
+    (0, class_transformer_1.Expose)({ name: 'interface_type' }),
+    (0, class_validator_1.IsEnum)(devices_shelly_ng_constants_1.AddressType),
+    (0, typeorm_1.Column)({ type: 'varchar' }),
+    __metadata("design:type", String)
+], ShellyNgDeviceAddressEntity.prototype, "interfaceType", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'IP address of the device on this interface',
+        type: 'string',
+        example: '192.168.1.100',
+    }),
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsString)(),
+    (0, typeorm_1.Column)({ type: 'varchar' }),
+    __metadata("design:type", String)
+], ShellyNgDeviceAddressEntity.prototype, "address", void 0);
+exports.ShellyNgDeviceAddressEntity = ShellyNgDeviceAddressEntity = __decorate([
+    (0, swagger_1.ApiSchema)({ name: 'DevicesShellyNgPluginDataDeviceAddress' }),
+    (0, typeorm_1.Entity)('devices_shelly_ng_addresses'),
+    (0, typeorm_1.Unique)('UQ_shelly_ng_device_interface', ['deviceId', 'interfaceType'])
+], ShellyNgDeviceAddressEntity);
+//# sourceMappingURL=shelly-ng-device-address.entity.js.map

package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shelly-ng-device-address.entity.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAmD;AACnD,qCAAwE;AAExE,6CAAyD;AAEzD,sEAAkE;AAClE,gFAA6D;AAE7D,yEAAkE;AAK3D,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,wBAAU;IAmC1D,QAAQ;QACP,OAAO,mBAAmB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,gBAAgB,IAAI,CAAC,QAAQ,GAAG,CAAC;IAC9F,CAAC;CACD,CAAA;AAtCY,kEAA2B;AASvC;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,mCAAmC;QAChD,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,MAAM;KACd,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC7B,IAAA,0BAAQ,GAAE;IACV,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;6DACX;AAIjB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,+CAAoB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC5F,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;8BACzB,+CAAoB;2DAAC;AAU7B;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,yCAAW;QACjB,OAAO,EAAE,yCAAW,CAAC,QAAQ;KAC7B,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;IAClC,IAAA,wBAAM,EAAC,yCAAW,CAAC;IACnB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kEACD;AAU3B;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,4CAA4C;QACzD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,eAAe;KACxB,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;4DACZ;sCAjCJ,2BAA2B;IAHvC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,wCAAwC,EAAE,CAAC;IAC7D,IAAA,gBAAM,EAAC,6BAA6B,CAAC;IACrC,IAAA,gBAAM,EAAC,+BAA+B,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;GAC1D,2BAA2B,CAsCvC"}

package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.d.ts

@@ -1,10 +1,12 @@
 import { DeviceDiscoverer, DeviceIdentifiers } from 'shellies-ds9';
 import { DevicesService } from '../../../modules/devices/services/devices.service';
+import { DeviceAddressService } from './device-address.service';
 export declare class DatabaseDiscovererService extends DeviceDiscoverer {
     private readonly devicesService;
+    private readonly deviceAddressService;
     private readonly logger;
     private readonly emitInterval;
-    constructor(devicesService: DevicesService);
+    constructor(devicesService: DevicesService, deviceAddressService: DeviceAddressService);
     run(): Promise<void>;
     protected emitDevice(identifiers: DeviceIdentifiers): Promise<void>;
 }

package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.js

@@ -15,25 +15,36 @@ const common_1 = require("@nestjs/common");
 const logger_1 = require("../../../common/logger");
 const devices_service_1 = require("../../../modules/devices/services/devices.service");
 const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
+const device_address_service_1 = require("./device-address.service");
 let DatabaseDiscovererService = class DatabaseDiscovererService extends shellies_ds9_1.DeviceDiscoverer {
-    constructor(devicesService) {
+    constructor(devicesService, deviceAddressService) {
         super();
         this.devicesService = devicesService;
+        this.deviceAddressService = deviceAddressService;
         this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'DatabaseDiscovererService');
         this.emitInterval = 20;
     }
     async run() {
-        for (const d of await this.devicesService.findAll(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE)) {
-            if (d.enabled === false) {
-                continue;
-            }
+        const devices = await this.devicesService.findAll(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+        const enabledDevices = devices.filter((d) => {
+            if (d.enabled === false)
+                return false;
             if (d.identifier === null) {
                 this.logger.error(`Failed to prepare device to be managed by Shelly manager. Missing identifier for device=${d.id}`);
+                return false;
+            }
+            return true;
+        });
+        const preferredAddresses = await this.deviceAddressService.getPreferredAddresses(enabledDevices.map((d) => d.id));
+        for (const d of enabledDevices) {
+            const hostname = preferredAddresses.get(d.id) ?? (await this.deviceAddressService.getPreferredAddressOrMigrate(d.id));
+            if (hostname === null) {
+                this.logger.warn(`No address found for device=${d.id}, skipping discovery emit`);
                 continue;
             }
             await this.emitDevice({
                 deviceId: d.identifier,
-                hostname: d.hostname,
+                hostname,
             });
         }
     }
@@ -49,6 +60,7 @@ let DatabaseDiscovererService = class DatabaseDiscovererService extends shellies
 exports.DatabaseDiscovererService = DatabaseDiscovererService;
 exports.DatabaseDiscovererService = DatabaseDiscovererService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [devices_service_1.DevicesService])
+    __metadata("design:paramtypes", [devices_service_1.DevicesService,
+        device_address_service_1.DeviceAddressService])
 ], DatabaseDiscovererService);
 //# sourceMappingURL=database-discoverer.service.js.map

package/dist/plugins/devices-shelly-ng/services/database-discoverer.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-discoverer.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/database-discoverer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmE;AAEnE,2CAA4C;AAE5C,mDAAuF;AACvF,uFAAmF;AACnF,gFAAuG;AAIhG,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,+BAAgB;IAQ9D,YAA6B,cAA8B;QAC1D,KAAK,EAAE,CAAC;QADoB,mBAAc,GAAd,cAAc,CAAgB;QAP1C,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,2BAA2B,CAC3B,CAAC;QAEe,iBAAY,GAAG,EAAE,CAAC;IAInC,CAAC;IAED,KAAK,CAAC,GAAG;QACR,KAAK,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,EAAE,CAAC;YACjG,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBACzB,SAAS;YACV,CAAC;YAED,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,2FAA2F,CAAC,CAAC,EAAE,EAAE,CACjG,CAAC;gBAEF,SAAS;YACV,CAAC;YAED,MAAM,IAAI,CAAC,UAAU,CAAC;gBACrB,QAAQ,EAAE,CAAC,CAAC,UAAU;gBACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACpB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAKS,UAAU,CAAC,WAA8B;QAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,UAAU,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;gBAEzC,OAAO,EAAE,CAAC;YACX,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA7CY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCASiC,gCAAc;GAR/C,yBAAyB,CA6CrC"}
+{"version":3,"file":"database-discoverer.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/database-discoverer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmE;AAEnE,2CAA4C;AAE5C,mDAAuF;AACvF,uFAAmF;AACnF,gFAAuG;AAGvG,qEAAgE;AAGzD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,+BAAgB;IAQ9D,YACkB,cAA8B,EAC9B,oBAA0C;QAE3D,KAAK,EAAE,CAAC;QAHS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,yBAAoB,GAApB,oBAAoB,CAAsB;QAT3C,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,2BAA2B,CAC3B,CAAC;QAEe,iBAAY,GAAG,EAAE,CAAC;IAOnC,CAAC;IAED,KAAK,CAAC,GAAG;QACR,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;QAEhG,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3C,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK;gBAAE,OAAO,KAAK,CAAC;YAEtC,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,2FAA2F,CAAC,CAAC,EAAE,EAAE,CACjG,CAAC;gBAEF,OAAO,KAAK,CAAC;YACd,CAAC;YAED,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;QAGH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAElH,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;YAEhC,MAAM,QAAQ,GACb,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAEtG,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC,EAAE,2BAA2B,CAAC,CAAC;gBAEjF,SAAS;YACV,CAAC;YAED,MAAM,IAAI,CAAC,UAAU,CAAC;gBACrB,QAAQ,EAAE,CAAC,CAAC,UAAU;gBACtB,QAAQ;aACR,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAKS,UAAU,CAAC,WAA8B;QAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,UAAU,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;gBAEzC,OAAO,EAAE,CAAC;YACX,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAjEY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAUsB,gCAAc;QACR,6CAAoB;GAVhD,yBAAyB,CAiErC"}

package/dist/plugins/devices-shelly-ng/services/device-address.service.d.ts

@@ -0,0 +1,22 @@
+import { Repository } from 'typeorm';
+import { AddressType } from '../devices-shelly-ng.constants';
+import { ShellyNgDeviceEntity } from '../entities/devices-shelly-ng.entity';
+import { ShellyNgDeviceAddressEntity } from '../entities/shelly-ng-device-address.entity';
+export declare function normalizeMac(mac: string): string;
+export declare class DeviceAddressService {
+    private readonly addressRepository;
+    private readonly deviceRepository;
+    private readonly logger;
+    constructor(addressRepository: Repository<ShellyNgDeviceAddressEntity>, deviceRepository: Repository<ShellyNgDeviceEntity>);
+    upsertAddress(deviceId: string, interfaceType: AddressType, address: string): Promise<void>;
+    removeAddress(deviceId: string, interfaceType: AddressType): Promise<void>;
+    syncAddresses(deviceId: string, wifiIp: string | null, ethernetIp: string | null): Promise<void>;
+    getPreferredAddressOrMigrate(deviceId: string): Promise<string | null>;
+    getPreferredAddress(deviceId: string): Promise<string | null>;
+    getPreferredAddresses(deviceIds: string[]): Promise<Map<string, string>>;
+    getAddresses(deviceId: string): Promise<ShellyNgDeviceAddressEntity[]>;
+    findDeviceByCanonicalMac(canonicalMac: string): Promise<ShellyNgDeviceEntity | null>;
+    setCanonicalMac(deviceId: string, canonicalMac: string): Promise<void>;
+    setHasEthernet(deviceId: string, hasEthernet: boolean): Promise<void>;
+    getLegacyHostname(deviceId: string): Promise<string | null>;
+}

package/dist/plugins/devices-shelly-ng/services/device-address.service.js

@@ -0,0 +1,149 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceAddressService = void 0;
+exports.normalizeMac = normalizeMac;
+const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
+const typeorm_2 = require("@nestjs/typeorm");
+const logger_1 = require("../../../common/logger");
+const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
+const devices_shelly_ng_entity_1 = require("../entities/devices-shelly-ng.entity");
+const shelly_ng_device_address_entity_1 = require("../entities/shelly-ng-device-address.entity");
+function normalizeMac(mac) {
+    return mac.replace(/[:-]/g, '').toUpperCase();
+}
+let DeviceAddressService = class DeviceAddressService {
+    constructor(addressRepository, deviceRepository) {
+        this.addressRepository = addressRepository;
+        this.deviceRepository = deviceRepository;
+        this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'DeviceAddressService');
+    }
+    async upsertAddress(deviceId, interfaceType, address) {
+        const existing = await this.addressRepository.findOne({
+            where: { deviceId, interfaceType },
+        });
+        if (existing) {
+            if (existing.address !== address) {
+                existing.address = address;
+                await this.addressRepository.save(existing);
+                this.logger.log(`Updated ${interfaceType} address to ${address} for device=${deviceId}`, {
+                    resource: deviceId,
+                });
+            }
+        }
+        else {
+            try {
+                const entity = this.addressRepository.create({
+                    deviceId,
+                    interfaceType,
+                    address,
+                });
+                await this.addressRepository.save(entity);
+                this.logger.log(`Stored ${interfaceType} address ${address} for device=${deviceId}`, {
+                    resource: deviceId,
+                });
+            }
+            catch {
+                await this.addressRepository.update({ deviceId, interfaceType }, { address });
+            }
+        }
+    }
+    async removeAddress(deviceId, interfaceType) {
+        const result = await this.addressRepository.delete({ deviceId, interfaceType });
+        if (result.affected) {
+            this.logger.log(`Removed ${interfaceType} address for device=${deviceId}`, { resource: deviceId });
+        }
+    }
+    async syncAddresses(deviceId, wifiIp, ethernetIp) {
+        if (ethernetIp) {
+            await this.upsertAddress(deviceId, devices_shelly_ng_constants_1.AddressType.ETHERNET, ethernetIp);
+        }
+        if (wifiIp) {
+            await this.upsertAddress(deviceId, devices_shelly_ng_constants_1.AddressType.WIFI, wifiIp);
+        }
+    }
+    async getPreferredAddressOrMigrate(deviceId) {
+        const preferred = await this.getPreferredAddress(deviceId);
+        if (preferred !== null) {
+            return preferred;
+        }
+        const legacyHostname = await this.getLegacyHostname(deviceId);
+        if (legacyHostname) {
+            await this.upsertAddress(deviceId, devices_shelly_ng_constants_1.AddressType.WIFI, legacyHostname);
+            this.logger.log(`Migrated legacy hostname=${legacyHostname} to address table for device=${deviceId}`, {
+                resource: deviceId,
+            });
+            return legacyHostname;
+        }
+        return null;
+    }
+    async getPreferredAddress(deviceId) {
+        const addresses = await this.addressRepository.find({
+            where: { deviceId },
+        });
+        if (addresses.length === 0) {
+            return null;
+        }
+        addresses.sort((a, b) => (devices_shelly_ng_constants_1.ADDRESS_PRIORITY[a.interfaceType] ?? 99) - (devices_shelly_ng_constants_1.ADDRESS_PRIORITY[b.interfaceType] ?? 99));
+        return addresses[0].address;
+    }
+    async getPreferredAddresses(deviceIds) {
+        if (deviceIds.length === 0) {
+            return new Map();
+        }
+        const addresses = await this.addressRepository.find({
+            where: { deviceId: (0, typeorm_1.In)(deviceIds) },
+        });
+        const byDevice = new Map();
+        for (const addr of addresses) {
+            const list = byDevice.get(addr.deviceId) ?? [];
+            list.push(addr);
+            byDevice.set(addr.deviceId, list);
+        }
+        const result = new Map();
+        for (const [deviceId, addrs] of byDevice) {
+            addrs.sort((a, b) => (devices_shelly_ng_constants_1.ADDRESS_PRIORITY[a.interfaceType] ?? 99) - (devices_shelly_ng_constants_1.ADDRESS_PRIORITY[b.interfaceType] ?? 99));
+            result.set(deviceId, addrs[0].address);
+        }
+        return result;
+    }
+    async getAddresses(deviceId) {
+        return this.addressRepository.find({ where: { deviceId } });
+    }
+    async findDeviceByCanonicalMac(canonicalMac) {
+        return this.deviceRepository.findOne({
+            where: { canonicalMac: normalizeMac(canonicalMac) },
+        });
+    }
+    async setCanonicalMac(deviceId, canonicalMac) {
+        await this.deviceRepository.update(deviceId, { canonicalMac: normalizeMac(canonicalMac) });
+    }
+    async setHasEthernet(deviceId, hasEthernet) {
+        await this.deviceRepository.update(deviceId, { hasEthernet });
+    }
+    async getLegacyHostname(deviceId) {
+        const result = await this.deviceRepository.query('SELECT "hostname" FROM "devices_module_devices" WHERE "id" = ?', [deviceId]);
+        return result[0]?.hostname ?? null;
+    }
+};
+exports.DeviceAddressService = DeviceAddressService;
+exports.DeviceAddressService = DeviceAddressService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_2.InjectRepository)(shelly_ng_device_address_entity_1.ShellyNgDeviceAddressEntity)),
+    __param(1, (0, typeorm_2.InjectRepository)(devices_shelly_ng_entity_1.ShellyNgDeviceEntity)),
+    __metadata("design:paramtypes", [typeorm_1.Repository,
+        typeorm_1.Repository])
+], DeviceAddressService);
+//# sourceMappingURL=device-address.service.js.map

package/dist/plugins/devices-shelly-ng/services/device-address.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-address.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/device-address.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-shelly-ng/services/device-manager.service.d.ts

@@ -4,6 +4,7 @@ import { DeviceProvisionQueueService } from '../../../modules/devices/services/d
 import { DevicesService } from '../../../modules/devices/services/devices.service';
 import { ShellyNgDeviceEntity } from '../entities/devices-shelly-ng.entity';
 import { MappingLoaderService, PropertyMappingStorageService, TransformerRegistry } from '../mappings';
+import { DeviceAddressService } from './device-address.service';
 import { ShellyRpcClientService } from './shelly-rpc-client.service';
 export declare class DeviceManagerService {
     private readonly shellyRpcClientService;
@@ -14,12 +15,13 @@ export declare class DeviceManagerService {
     private readonly transformerRegistry;
     private readonly propertyMappingStorage;
     private readonly provisionQueue;
+    private readonly deviceAddressService;
     private readonly logger;
     private readonly defaultManager;
     private readonly strictSchema;
     private timeoutSec;
     private rpcConcurrency;
-    constructor(shellyRpcClientService: ShellyRpcClientService, devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, mappingLoaderService: MappingLoaderService, transformerRegistry: TransformerRegistry, propertyMappingStorage: PropertyMappingStorageService, provisionQueue: DeviceProvisionQueueService);
+    constructor(shellyRpcClientService: ShellyRpcClientService, devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, mappingLoaderService: MappingLoaderService, transformerRegistry: TransformerRegistry, propertyMappingStorage: PropertyMappingStorageService, provisionQueue: DeviceProvisionQueueService, deviceAddressService: DeviceAddressService);
     getDeviceInfo(hostname: string, password: string | undefined): Promise<{
         id: string;
         name: string | null | undefined;