@fastybird/smart-panel-backend 0.1.0-alpha.6 → 0.3.0-alpha.0

package/dist/modules/system/services/update.service.js

@@ -124,9 +124,18 @@ let UpdateService = UpdateService_1 = class UpdateService {
             error: this.updateStatus.error,
         });
     }
-    async checkServerUpdate(channel = 'latest') {
-        const cached = this.cachedServerInfo.get(channel);
-        const cacheTime = this.serverCacheTimestamp.get(channel) ?? 0;
+    detectChannel(version) {
+        const v = version ?? this.getCurrentVersion();
+        if (v.includes('-alpha'))
+            return 'alpha';
+        if (v.includes('-beta'))
+            return 'beta';
+        return 'latest';
+    }
+    async checkServerUpdate(channel) {
+        const resolvedChannel = channel ?? this.detectChannel();
+        const cached = this.cachedServerInfo.get(resolvedChannel);
+        const cacheTime = this.serverCacheTimestamp.get(resolvedChannel) ?? 0;
         if (cached && Date.now() - cacheTime < this.CACHE_TTL_MS) {
             return cached;
         }
@@ -135,10 +144,10 @@ let UpdateService = UpdateService_1 = class UpdateService {
         try {
             let latestVersion = null;
             if (installType === 'image') {
-                latestVersion = await this.fetchLatestVersionFromGitHub(channel);
+                latestVersion = await this.fetchLatestVersionFromGitHub(resolvedChannel);
             }
             else {
-                latestVersion = await this.fetchLatestVersionFromNpm(channel);
+                latestVersion = await this.fetchLatestVersionFromNpm(resolvedChannel);
             }
             let updateAvailable = false;
             let updateType = null;
@@ -155,8 +164,8 @@ let UpdateService = UpdateService_1 = class UpdateService {
                 updateAvailable,
                 updateType,
             };
-            this.cachedServerInfo.set(channel, result);
-            this.serverCacheTimestamp.set(channel, Date.now());
+            this.cachedServerInfo.set(resolvedChannel, result);
+            this.serverCacheTimestamp.set(resolvedChannel, Date.now());
             return result;
         }
         catch (error) {
@@ -172,16 +181,25 @@ let UpdateService = UpdateService_1 = class UpdateService {
     }
     async fetchLatestVersionFromGitHub(channel) {
         if (channel === 'latest') {
-            const response = await fetch(this.GITHUB_VERSION_JSON_URL, {
-                headers: { 'User-Agent': 'FastyBird-SmartPanel' },
-                signal: AbortSignal.timeout(UpdateService_1.FETCH_TIMEOUT_MS),
-            });
-            if (!response.ok) {
-                throw new Error(`GitHub version.json returned ${response.status}`);
+            try {
+                const response = await fetch(this.GITHUB_VERSION_JSON_URL, {
+                    headers: { 'User-Agent': 'FastyBird-SmartPanel' },
+                    signal: AbortSignal.timeout(UpdateService_1.FETCH_TIMEOUT_MS),
+                });
+                if (response.ok) {
+                    const data = (await response.json());
+                    return data.version?.replace(/^v/, '') ?? null;
+                }
+                this.logger.debug(`Direct version.json returned ${response.status}, falling back to releases API`);
+            }
+            catch {
+                this.logger.debug('Direct version.json fetch failed, falling back to releases API');
             }
-            const data = (await response.json());
-            return data.version?.replace(/^v/, '') ?? null;
+            return this.fetchVersionFromReleasesApi(channel, false);
         }
+        return this.fetchVersionFromReleasesApi(channel, true);
+    }
+    async fetchVersionFromReleasesApi(channel, prereleaseOnly) {
         const response = await fetch(`${this.GITHUB_PRERELEASE_API_URL}?per_page=20`, {
             headers: {
                 Accept: 'application/vnd.github.v3+json',
@@ -194,7 +212,9 @@ let UpdateService = UpdateService_1 = class UpdateService {
         }
         const releases = (await response.json());
         for (const release of releases) {
-            if (!release.prerelease)
+            if (prereleaseOnly && !release.prerelease)
+                continue;
+            if (!prereleaseOnly && release.prerelease)
                 continue;
             const versionAsset = release.assets.find((a) => a.name === 'version.json');
             if (!versionAsset)
@@ -263,7 +283,7 @@ let UpdateService = UpdateService_1 = class UpdateService {
             this.logger.warn(`No assets found in release v${cleanVersion}`);
             return null;
         }
-        const backendAsset = assets.find((a) => a.name.includes('backend') && a.name.endsWith('.tar.gz'));
+        const backendAsset = assets.find((a) => a.name.startsWith('smart-panel-server-') && a.name.endsWith('.tar.gz'));
         if (!backendAsset) {
             this.logger.warn(`No backend tarball found in release v${cleanVersion}`);
             return null;

package/dist/modules/system/services/update.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2BAAyE;AACzE,+BAA4B;AAE5B,2CAA4C;AAC5C,yDAAsD;AACtD,+CAAwC;AAExC,mDAA+D;AAC/D,yDAA4E;AAC5E,0DAAmG;AAuC5F,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAiCzB,YAA6B,YAA2B;QAA3B,iBAAY,GAAZ,YAAY,CAAe;QAhCvC,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,eAAe,CAAC,CAAC;QAEpE,qBAAgB,GAAG,mDAAmD,CAAC;QACvE,mBAAc,GAAG,6DAA6D,CAAC;QAC/E,4BAAuB,GACvC,gFAAgF,CAAC;QACjE,8BAAyB,GAAG,6DAA6D,CAAC;QAEnG,qBAAgB,GAA6B,IAAI,GAAG,EAAE,CAAC;QACvD,oBAAe,GAAkC,IAAI,GAAG,EAAE,CAAC;QAC3D,yBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;QACtD,wBAAmB,GAAwB,IAAI,GAAG,EAAE,CAAC;QACrD,uBAAkB,GAA8B,IAAI,GAAG,EAAE,CAAC;QACjD,iBAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAE5C,iBAAY,GAAqB;YACxC,MAAM,EAAE,mCAAgB,CAAC,IAAI;YAC7B,KAAK,EAAE,IAAI;YACX,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;SACf,CAAC;QAEM,yBAAoB,GAAkB,IAAI,CAAC;QAClC,2BAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAOE,CAAC;IAE5D,iBAAiB;QAChB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAEvG,CAAC;YAEF,OAAO,OAAO,CAAC,OAAO,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,OAAO,CAAC;QAChB,CAAC;IACF,CAAC;IAMD,cAAc;QACb,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,IAAA,iBAAY,EAAC,eAAa,CAAC,kBAAkB,CAAC,CAAC;YAIrE,MAAM,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;gBAChD,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,IAAA,WAAI,EAAC,eAAa,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;YAErD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,eAAa,CAAC,iBAAiB,CAAC,CAAC;YAEtE,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,OAAO,OAAO,CAAC;YAChB,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;QAGD,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,eAAa,CAAC,kBAAkB,EAAE,eAAa,CAAC,iBAAiB,CAAC,CAAC;YAE3F,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,OAAO,OAAO,CAAC;YAChB,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAMD,oBAAoB;QACnB,IAAI,CAAC;YACJ,OAAO,IAAA,gBAAW,EAAC,eAAa,CAAC,cAAc,CAAC;iBAC9C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAChD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;iBACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAa,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IAED,eAAe;QACd,OAAO,eAAa,CAAC,cAAc,CAAC;IACrC,CAAC;IAED,SAAS;QACR,OAAO,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IACjC,CAAC;IAED,kBAAkB;QACjB,IAAI,IAAI,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC1E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;YACjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAEzB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iBAAiB;QAChB,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,SAAS,CAAC,OAAkC;QAC3C,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,OAAO,EAAE,CAAC;QAEzD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,4BAAS,CAAC,oBAAoB,EAAE;YACtD,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;YAChC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK;YAC9B,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YACnD,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO;YAClC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK;SAC9B,CAAC,CAAC;IACJ,CAAC;IAMD,aAAa,CAAC,OAAgB;QAC7B,MAAM,CAAC,GAAG,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAE9C,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,OAAO,CAAC;QACzC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,OAAO,MAAM,CAAC;QAEvC,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAqC;QAC5D,MAAM,eAAe,GAAG,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEtE,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1D,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1C,IAAI,CAAC;YACJ,IAAI,aAAa,GAAkB,IAAI,CAAC;YAExC,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;gBAE7B,aAAa,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBAEP,aAAa,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;YACvE,CAAC;YAED,IAAI,eAAe,GAAG,KAAK,CAAC;YAC5B,IAAI,UAAU,GAAuC,IAAI,CAAC;YAE1D,IAAI,aAAa,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAA,sBAAa,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;gBAEhE,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;oBACpB,eAAe,GAAG,IAAI,CAAC;oBACvB,UAAU,GAAG,IAAA,sBAAa,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;gBAC3D,CAAC;YACF,CAAC;YAED,MAAM,MAAM,GAAgB;gBAC3B,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,aAAa;gBACrB,eAAe;gBACf,UAAU;aACV,CAAC;YAEF,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YACnD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAE3D,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAExE,OAAO;gBACN,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,IAAI;gBACZ,eAAe,EAAE,KAAK;gBACtB,UAAU,EAAE,IAAI;aAChB,CAAC;QACH,CAAC;IACF,CAAC;IAQO,KAAK,CAAC,4BAA4B,CAAC,OAAoC;QAC9E,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YAE1B,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE;oBAC1D,OAAO,EAAE,EAAE,YAAY,EAAE,sBAAsB,EAAE;oBACjD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;iBAC3D,CAAC,CAAC;gBAEH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACjB,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA2C,CAAC;oBAE/E,OAAO,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;gBAChD,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,QAAQ,CAAC,MAAM,gCAAgC,CAAC,CAAC;YACpG,CAAC;YAAC,MAAM,CAAC;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACrF,CAAC;YAGD,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;QAGD,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAKO,KAAK,CAAC,2BAA2B,CACxC,OAAoC,EACpC,cAAuB;QAEvB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,yBAAyB,cAAc,EAAE;YAC7E,OAAO,EAAE;gBACR,MAAM,EAAE,gCAAgC;gBACxC,YAAY,EAAE,sBAAsB;aACpC;YACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;SAC3D,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAIrC,CAAC;QAEH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,IAAI,cAAc,IAAI,CAAC,OAAO,CAAC,UAAU;gBAAE,SAAS;YACpD,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU;gBAAE,SAAS;YAEpD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY;gBAAE,SAAS;YAE5B,IAAI,CAAC;gBACJ,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,oBAAoB,EAAE;oBACpE,OAAO,EAAE,EAAE,YAAY,EAAE,sBAAsB,EAAE;oBACjD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;iBAC3D,CAAC,CAAC;gBAEH,IAAI,CAAC,aAAa,CAAC,EAAE;oBAAE,SAAS;gBAEhC,MAAM,WAAW,GAAG,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAA2C,CAAC;gBAE3F,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBACrC,OAAO,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;gBACvD,CAAC;YACF,CAAC;YAAC,MAAM,CAAC;gBACR,SAAS;YACV,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAKO,KAAK,CAAC,yBAAyB,CAAC,OAAoC;QAC3E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACnD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;SAC3D,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA6C,CAAC;QAEjF,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,MAAM,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAiB;YAC9B,OAAO,EAAE,YAAY;YACrB,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,0DAA0D,YAAY,EAAE;YAC7E,WAAW,EAAE,IAAI;SACjB,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAE5D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,MAAM,GAAiB;YAC5B,OAAO,EAAE,YAAY;YACrB,IAAI,EAAG,OAAoC,CAAC,IAAI,IAAI,IAAI;YACxD,GAAG,EAAG,OAAiC,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG;YAChE,WAAW,EAAG,OAA4C,CAAC,YAAY,IAAI,IAAI;SAC/E,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAElD,OAAO,MAAM,CAAC;IACf,CAAC;IAKD,KAAK,CAAC,uBAAuB,CAAC,OAAe;QAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAE5D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,MAAM,GAAI,OAA4F,CAAC,MAAM,CAAC;QAEpH,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAC;YAEhE,OAAO,IAAI,CAAC;QACb,CAAC;QAGD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QAEhH,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,YAAY,EAAE,CAAC,CAAC;YAEzE,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO;YACN,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,WAAW,EAAE,YAAY,CAAC,oBAAoB;YAC9C,IAAI,EAAE,YAAY,CAAC,IAAI;SACvB,CAAC;IACH,CAAC;IAKO,KAAK,CAAC,kBAAkB,CAAC,YAAoB;QACpD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,cAAc,UAAU,YAAY,EAAE,CAAC;QAE3D,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBACjC,OAAO,EAAE;oBACR,MAAM,EAAE,gCAAgC;oBACxC,YAAY,EAAE,sBAAsB;iBACpC;gBACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;aAC3D,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,CAAC,MAAM,iBAAiB,YAAY,EAAE,CAAC,CAAC;gBAExF,OAAO,IAAI,CAAC;YACb,CAAC;YAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA4B,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAErF,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,oBAAoB;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEpD,IAAI,CAAC;YACJ,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAE7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAE5C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,OAAO,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;YAC7F,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;IAED,qBAAqB;QACpB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAsB,KAAK;QACjD,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE9D,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1D,OAAO,MAAM,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,SAAS,CAAC;YAChG,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBACjC,OAAO,EAAE;oBACR,MAAM,EAAE,gCAAgC;oBACxC,YAAY,EAAE,sBAAsB;iBACpC;gBACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;aAC3D,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,OAA0G,CAAC;YAE/G,IAAI,UAAU,EAAE,CAAC;gBAChB,MAAM,QAAQ,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAoD,CAAC;gBAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAEjD,IAAI,CAAC,KAAK,EAAE,CAAC;oBACZ,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBACrC,CAAC;gBAED,OAAO,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACP,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAmB,CAAC;YACrD,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAE9C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC3C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAEnD,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEvE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACrC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE/C,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,UAAU,YAAY,EAAE,EAAE;gBAC5E,OAAO,EAAE;oBACR,MAAM,EAAE,gCAAgC;oBACxC,YAAY,EAAE,sBAAsB;iBACpC;gBACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAa,CAAC,gBAAgB,CAAC;aAC3D,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,gBAAgB,YAAY,EAAE,CAAC,CAAC;gBAExF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YACrC,CAAC;YAED,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAGrC,CAAC;YAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,YAAY,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEnF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACrC,CAAC;IACF,CAAC;IAEO,gBAAgB,CAAC,OAGxB;QACA,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAClF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,WAAW,EAAE,CAAC,CAAC,oBAAoB;YACnC,IAAI,EAAE,CAAC,CAAC,IAAI;SACZ,CAAC,CAAC,CAAC;QAEL,OAAO;YACN,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1C,MAAM,EAAE,WAAW;SACnB,CAAC;IACH,CAAC;;AAxiBW,sCAAa;AA2BD,8BAAgB,GAAG,MAAM,AAAT,CAAU;AAE1B,4BAAc,GAAG,kBAAkB,AAArB,CAAsB;AACpC,gCAAkB,GAAG,0BAA0B,AAA7B,CAA8B;AAChD,+BAAiB,GAAG,gBAAgB,AAAnB,CAAoB;AA4YvD;IADL,IAAA,eAAI,EAAC,cAAc,CAAC;;;;yDAiBpB;wBA3bW,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAkC+B,6BAAa;GAjC5C,aAAa,CAyiBzB"}

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

@@ -5,6 +5,7 @@ import { DeviceConnectivityService } from '../../../modules/devices/services/dev
 import { DevicesService } from '../../../modules/devices/services/devices.service';
 import { ShellyNgChannelEntity, ShellyNgChannelPropertyEntity, ShellyNgDeviceEntity } from '../entities/devices-shelly-ng.entity';
 import { PropertyMappingStorageService, TransformerRegistry } from '../mappings';
+import { DeviceAddressService } from '../services/device-address.service';
 import { DeviceManagerService } from '../services/device-manager.service';
 import { ShellyDeviceDelegate } from './shelly-device.delegate';
 type MaybeNet = {
@@ -21,6 +22,7 @@ export declare class DelegatesManagerService {
     private readonly channelsPropertiesService;
     private readonly deviceConnectivityService;
     private readonly deviceManagerService;
+    private readonly deviceAddressService;
     private readonly propertyMappingStorage;
     private readonly transformerRegistry;
     private readonly logger;
@@ -33,9 +35,14 @@ export declare class DelegatesManagerService {
     private readonly pendingWrites;
     private readonly propertiesMap;
     private readonly delegateDeviceIds;
+    private readonly delegateToIdentifier;
+    private readonly identifierToDelegates;
+    private readonly delegateConnectedState;
     private readonly insertGeneration;
     private readonly deviceLocks;
-    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, deviceConnectivityService: DeviceConnectivityService, deviceManagerService: DeviceManagerService, propertyMappingStorage: PropertyMappingStorageService, transformerRegistry: TransformerRegistry);
+    private readonly canonicalMacLocks;
+    private readonly connectedDelegatesPerDevice;
+    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, deviceConnectivityService: DeviceConnectivityService, deviceManagerService: DeviceManagerService, deviceAddressService: DeviceAddressService, propertyMappingStorage: PropertyMappingStorageService, transformerRegistry: TransformerRegistry);
     get(id: Device['id']): ShellyDeviceDelegate | undefined;
     insert(shelly: Device & MaybeNet, force?: boolean): Promise<ShellyDeviceDelegate>;
     private performInsert;
@@ -53,8 +60,11 @@ export declare class DelegatesManagerService {
     private handleNumericChange;
     private scheduleWrite;
     private writeValueToProperty;
+    private resolvePropertyHandler;
+    private resolveChannelHandler;
     detach(): void;
     destroy(): void;
+    private withCanonicalMacLock;
     private withDeviceLock;
 }
 export {};

package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js

@@ -24,16 +24,18 @@ const devices_shelly_ng_exceptions_1 = require("../devices-shelly-ng.exceptions"
 const update_channel_property_dto_1 = require("../dto/update-channel-property.dto");
 const mappings_1 = require("../mappings");
 const transformers_1 = require("../mappings/transformers/transformers");
+const device_address_service_1 = require("../services/device-address.service");
 const device_manager_service_1 = require("../services/device-manager.service");
 const transform_utils_2 = require("../utils/transform.utils");
 const shelly_device_delegate_1 = require("./shelly-device.delegate");
 let DelegatesManagerService = class DelegatesManagerService {
-    constructor(devicesService, channelsService, channelsPropertiesService, deviceConnectivityService, deviceManagerService, propertyMappingStorage, transformerRegistry) {
+    constructor(devicesService, channelsService, channelsPropertiesService, deviceConnectivityService, deviceManagerService, deviceAddressService, propertyMappingStorage, transformerRegistry) {
         this.devicesService = devicesService;
         this.channelsService = channelsService;
         this.channelsPropertiesService = channelsPropertiesService;
         this.deviceConnectivityService = deviceConnectivityService;
         this.deviceManagerService = deviceManagerService;
+        this.deviceAddressService = deviceAddressService;
         this.propertyMappingStorage = propertyMappingStorage;
         this.transformerRegistry = transformerRegistry;
         this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'DelegatesManagerService');
@@ -46,8 +48,13 @@ let DelegatesManagerService = class DelegatesManagerService {
         this.pendingWrites = new Map();
         this.propertiesMap = new Map();
         this.delegateDeviceIds = new Map();
+        this.delegateToIdentifier = new Map();
+        this.identifierToDelegates = new Map();
+        this.delegateConnectedState = new Map();
         this.insertGeneration = new Map();
         this.deviceLocks = new Map();
+        this.canonicalMacLocks = new Map();
+        this.connectedDelegatesPerDevice = new Map();
     }
     get(id) {
         return this.delegates.get(id);
@@ -68,34 +75,57 @@ let DelegatesManagerService = class DelegatesManagerService {
         this.insertGeneration.set(shelly.id, generation);
         const delegate = new shelly_device_delegate_1.ShellyDeviceDelegate(shelly);
         this.delegates.set(shelly.id, delegate);
-        const hostname = shelly.wifi?.sta_ip ?? shelly.ethernet?.ip ?? null;
-        if (hostname === null) {
+        const wifiIp = shelly.wifi?.sta_ip ?? null;
+        const ethernetIp = shelly.ethernet?.ip ?? null;
+        if (ethernetIp === null && wifiIp === null) {
             throw new devices_shelly_ng_exceptions_1.DevicesShellyNgException('Missing device hostname or IP address');
         }
-        let device = await this.devicesService.findOneBy('identifier', shelly.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-        let isNewDevice = false;
-        if (device === null) {
-            try {
-                device = await this.devicesService.create({
-                    type: devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE,
-                    category: this.determineCategory(delegate),
-                    identifier: shelly.id,
-                    hostname,
-                    name: shelly.system.config.device.name ?? shelly.modelName,
-                });
-                isNewDevice = true;
+        const canonicalMac = shelly.system?.config?.device?.mac ?? null;
+        const { device: resolvedDevice, isNewDevice } = await this.withCanonicalMacLock(canonicalMac, async () => {
+            let dev = await this.devicesService.findOneBy('identifier', shelly.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            if (!dev && canonicalMac) {
+                dev = (await this.deviceAddressService.findDeviceByCanonicalMac(canonicalMac)) ?? null;
+                if (dev) {
+                    this.logger.log(`Device=${shelly.id} matched existing device=${dev.identifier} by canonical MAC=${canonicalMac} (multi-interface merge)`, { resource: dev.id });
+                }
             }
-            catch (error) {
-                device = await this.devicesService.findOneBy('identifier', shelly.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-                if (device === null) {
-                    throw error;
+            let created = false;
+            if (dev === null) {
+                try {
+                    dev = await this.devicesService.create({
+                        type: devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE,
+                        category: this.determineCategory(delegate),
+                        identifier: shelly.id,
+                        name: shelly.system.config.device.name ?? shelly.modelName,
+                    });
+                    created = true;
+                }
+                catch (error) {
+                    dev = await this.devicesService.findOneBy('identifier', shelly.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+                    if (!dev && canonicalMac) {
+                        dev = (await this.deviceAddressService.findDeviceByCanonicalMac(canonicalMac)) ?? null;
+                    }
+                    if (dev === null) {
+                        throw error;
+                    }
                 }
             }
-        }
+            if (canonicalMac && dev.canonicalMac !== (0, device_address_service_1.normalizeMac)(canonicalMac)) {
+                await this.deviceAddressService.setCanonicalMac(dev.id, canonicalMac);
+            }
+            return { device: dev, isNewDevice: created };
+        });
+        let device = resolvedDevice;
         this.delegateDeviceIds.set(delegate.id, device.id);
-        if (isNewDevice) {
+        this.delegateToIdentifier.set(delegate.id, device.identifier);
+        const delegateSet = this.identifierToDelegates.get(device.identifier) ?? new Set();
+        delegateSet.add(delegate.id);
+        this.identifierToDelegates.set(device.identifier, delegateSet);
+        await this.deviceAddressService.syncAddresses(device.id, wifiIp, ethernetIp);
+        const existingChannel = await this.channelsService.findOneBy('category', devices_constants_1.ChannelCategory.DEVICE_INFORMATION, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+        if (isNewDevice || existingChannel === null) {
             await this.deviceManagerService.createOrUpdate(device.id);
-            device = await this.devicesService.findOneBy('identifier', shelly.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            device = await this.devicesService.findOne(device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
             if (device === null) {
                 throw new devices_shelly_ng_exceptions_1.DevicesShellyNgException('Device not found after provisioning');
             }
@@ -839,27 +869,84 @@ let DelegatesManagerService = class DelegatesManagerService {
         delegate.on('value', valueHandler);
         this.delegateValueHandlers.set(delegate.id, valueHandler);
         const connectionHandler = (state) => {
-            this.deviceConnectivityService
-                .setConnectionState(device.id, {
-                state: state === null ? devices_constants_1.ConnectionState.UNKNOWN : state ? devices_constants_1.ConnectionState.CONNECTED : devices_constants_1.ConnectionState.DISCONNECTED,
-            })
-                .then(() => {
-                if (state) {
+            const deviceDbId = this.delegateDeviceIds.get(delegate.id) ?? device.id;
+            const wasConnected = this.delegateConnectedState.get(delegate.id) ?? false;
+            if (state === true) {
+                if (wasConnected)
+                    return;
+                this.delegateConnectedState.set(delegate.id, true);
+                const count = (this.connectedDelegatesPerDevice.get(deviceDbId) ?? 0) + 1;
+                this.connectedDelegatesPerDevice.set(deviceDbId, count);
+                this.deviceConnectivityService
+                    .setConnectionState(deviceDbId, { state: devices_constants_1.ConnectionState.CONNECTED })
+                    .catch((err) => {
+                    this.logger.error(`Failed to set state=${devices_constants_1.ConnectionState.CONNECTED} for device=${delegate.id}`, {
+                        resource: deviceDbId,
+                        message: err.message,
+                        stack: err.stack,
+                    });
+                });
+            }
+            else if (state === false) {
+                if (!wasConnected)
+                    return;
+                this.delegateConnectedState.set(delegate.id, false);
+                const count = Math.max(0, (this.connectedDelegatesPerDevice.get(deviceDbId) ?? 1) - 1);
+                this.connectedDelegatesPerDevice.set(deviceDbId, count);
+                if (count === 0) {
+                    this.deviceConnectivityService
+                        .setConnectionState(deviceDbId, { state: devices_constants_1.ConnectionState.DISCONNECTED })
+                        .catch((err) => {
+                        this.logger.error(`Failed to set state=DISCONNECTED for device=${delegate.id}`, {
+                            resource: deviceDbId,
+                            message: err.message,
+                            stack: err.stack,
+                        });
+                    });
                 }
                 else {
+                    this.logger.debug(`Device=${delegate.id} disconnected but ${count} other delegate(s) still connected`, {
+                        resource: deviceDbId,
+                    });
                 }
-            })
-                .catch((err) => {
-                this.logger.error(`Failed to set state=${state ? devices_constants_1.ConnectionState.CONNECTED : devices_constants_1.ConnectionState.DISCONNECTED} for device=${delegate.id}`, {
-                    resource: device.id,
-                    message: err.message,
-                    stack: err.stack,
-                });
-            });
+            }
+            else {
+                const identifier = this.delegateToIdentifier.get(delegate.id);
+                const siblingDelegates = identifier ? this.identifierToDelegates.get(identifier) : undefined;
+                const otherDelegatesRemain = siblingDelegates ? siblingDelegates.size > 1 : false;
+                const targetState = otherDelegatesRemain ? devices_constants_1.ConnectionState.DISCONNECTED : devices_constants_1.ConnectionState.UNKNOWN;
+                if (wasConnected) {
+                    const count = Math.max(0, (this.connectedDelegatesPerDevice.get(deviceDbId) ?? 1) - 1);
+                    this.connectedDelegatesPerDevice.set(deviceDbId, count);
+                    if (count === 0) {
+                        this.deviceConnectivityService
+                            .setConnectionState(deviceDbId, { state: targetState })
+                            .catch((err) => {
+                            this.logger.error(`Failed to set state=${targetState} for device=${delegate.id}`, {
+                                resource: deviceDbId,
+                                message: err.message,
+                                stack: err.stack,
+                            });
+                        });
+                    }
+                }
+                else if ((this.connectedDelegatesPerDevice.get(deviceDbId) ?? 0) === 0) {
+                    this.deviceConnectivityService.setConnectionState(deviceDbId, { state: targetState }).catch((err) => {
+                        this.logger.error(`Failed to set state=${targetState} for device=${delegate.id}`, {
+                            resource: deviceDbId,
+                            message: err.message,
+                            stack: err.stack,
+                        });
+                    });
+                }
+                this.delegateConnectedState.delete(delegate.id);
+            }
         };
         delegate.on('connected', connectionHandler);
         this.delegateConnectionHandlers.set(delegate.id, connectionHandler);
-        connectionHandler(true);
+        if (delegate.connected) {
+            connectionHandler(true);
+        }
         this.logger.log(`Attached Shelly device=${delegate.id}`, { resource: device.id });
         return delegate;
     }
@@ -881,15 +968,21 @@ let DelegatesManagerService = class DelegatesManagerService {
         }
         else {
             const deviceDbId = this.delegateDeviceIds.get(deviceId) ?? deviceId;
-            void this.deviceConnectivityService
-                .setConnectionState(deviceDbId, { state: devices_constants_1.ConnectionState.UNKNOWN })
-                .catch((err) => {
-                this.logger.warn(`Failed to mark device=${delegate.id} as disconnected while removing delegate`, {
-                    resource: delegate.id,
-                    message: err.message,
-                    stack: err.stack,
+            if ((this.connectedDelegatesPerDevice.get(deviceDbId) ?? 0) === 0) {
+                const identifier = this.delegateToIdentifier.get(deviceId);
+                const siblingDelegates = identifier ? this.identifierToDelegates.get(identifier) : undefined;
+                const otherDelegatesRemain = siblingDelegates ? siblingDelegates.size > 1 : false;
+                const targetState = otherDelegatesRemain ? devices_constants_1.ConnectionState.DISCONNECTED : devices_constants_1.ConnectionState.UNKNOWN;
+                void this.deviceConnectivityService
+                    .setConnectionState(deviceDbId, { state: targetState })
+                    .catch((err) => {
+                    this.logger.warn(`Failed to mark device=${delegate.id} as ${targetState} while removing delegate`, {
+                        resource: delegate.id,
+                        message: err.message,
+                        stack: err.stack,
+                    });
                 });
-            });
+            }
         }
         if (valueHandler) {
             delegate.off('value', valueHandler);
@@ -914,6 +1007,20 @@ let DelegatesManagerService = class DelegatesManagerService {
                 this.setChannelsHandlers.delete(key);
             }
         }
+        const identifier = this.delegateToIdentifier.get(deviceId);
+        if (identifier) {
+            const delegateSet = this.identifierToDelegates.get(identifier);
+            if (delegateSet) {
+                delegateSet.delete(deviceId);
+                if (delegateSet.size === 0) {
+                    this.identifierToDelegates.delete(identifier);
+                    const deviceDbId = this.delegateDeviceIds.get(deviceId);
+                    if (deviceDbId) {
+                        this.connectedDelegatesPerDevice.delete(deviceDbId);
+                    }
+                }
+            }
+        }
         const ids = this.propertiesMap.get(deviceId);
         if (ids) {
             for (const pid of ids) {
@@ -923,12 +1030,13 @@ let DelegatesManagerService = class DelegatesManagerService {
             this.propertiesMap.delete(deviceId);
         }
         this.delegateDeviceIds.delete(deviceId);
+        this.delegateToIdentifier.delete(deviceId);
         this.insertGeneration.delete(deviceId);
         this.delegates.delete(deviceId);
         this.logger.log(`Detached Shelly device=${deviceId}`, { resource: deviceId });
     }
     async setChannelValue(device, channel, updates) {
-        const handler = this.setChannelsHandlers.get(`${device.identifier}|${channel.id}`);
+        const handler = this.resolveChannelHandler(device.identifier, channel.id);
         if (!handler) {
             return Promise.reject(new devices_shelly_ng_exceptions_1.DevicesShellyNgNotImplementedException('Multiple property writes are not supported by the component.'));
         }
@@ -946,7 +1054,7 @@ let DelegatesManagerService = class DelegatesManagerService {
         return handler(transformedUpdates);
     }
     async setPropertyValue(device, property, value) {
-        const handler = this.setPropertiesHandlers.get(`${device.identifier}|${property.id}`);
+        const handler = this.resolvePropertyHandler(device.identifier, property.id);
         if (!handler) {
             this.logger.warn(`Trying to write to device=${device.identifier} to not writable property=${property.id} value=${value}`, { resource: device.id });
             return Promise.resolve(false);
@@ -1067,10 +1175,51 @@ let DelegatesManagerService = class DelegatesManagerService {
             value,
         }));
     }
+    resolvePropertyHandler(deviceIdentifier, propertyId) {
+        const delegateIds = this.identifierToDelegates.get(deviceIdentifier);
+        if (!delegateIds)
+            return undefined;
+        let fallback;
+        for (const delegateId of delegateIds) {
+            const handler = this.setPropertiesHandlers.get(`${delegateId}|${propertyId}`);
+            if (!handler)
+                continue;
+            if (this.delegateConnectedState.get(delegateId))
+                return handler;
+            fallback ??= handler;
+        }
+        return fallback;
+    }
+    resolveChannelHandler(deviceIdentifier, channelId) {
+        const delegateIds = this.identifierToDelegates.get(deviceIdentifier);
+        if (!delegateIds)
+            return undefined;
+        let fallback;
+        for (const delegateId of delegateIds) {
+            const handler = this.setChannelsHandlers.get(`${delegateId}|${channelId}`);
+            if (!handler)
+                continue;
+            if (this.delegateConnectedState.get(delegateId))
+                return handler;
+            fallback ??= handler;
+        }
+        return fallback;
+    }
     detach() {
-        for (const [deviceId] of this.delegates.entries()) {
-            this.performRemove(deviceId);
+        for (const [, delegate] of this.delegates.entries()) {
+            const valueHandler = this.delegateValueHandlers.get(delegate.id);
+            const connectionHandler = this.delegateConnectionHandlers.get(delegate.id);
+            if (valueHandler) {
+                delegate.off('value', valueHandler);
+            }
+            if (connectionHandler) {
+                delegate.off('connected', connectionHandler);
+            }
         }
+        this.delegates.clear();
+        this.delegateValueHandlers.clear();
+        this.delegateConnectionHandlers.clear();
+        this.delegateDeviceIds.clear();
         this.changeHandlers.clear();
         this.setPropertiesHandlers.clear();
         this.setChannelsHandlers.clear();
@@ -1080,10 +1229,37 @@ let DelegatesManagerService = class DelegatesManagerService {
         }
         this.pendingWrites.clear();
         this.deviceLocks.clear();
+        this.canonicalMacLocks.clear();
+        this.connectedDelegatesPerDevice.clear();
+        this.delegateToIdentifier.clear();
+        this.identifierToDelegates.clear();
+        this.delegateConnectedState.clear();
+        this.insertGeneration.clear();
     }
     destroy() {
         this.detach();
     }
+    async withCanonicalMacLock(canonicalMac, fn) {
+        if (!canonicalMac) {
+            return fn();
+        }
+        const pending = this.canonicalMacLocks.get(canonicalMac) ?? Promise.resolve();
+        let resolveLock;
+        const lock = new Promise((r) => {
+            resolveLock = r;
+        });
+        this.canonicalMacLocks.set(canonicalMac, lock);
+        await pending.catch(() => { });
+        try {
+            return await fn();
+        }
+        finally {
+            resolveLock();
+            if (this.canonicalMacLocks.get(canonicalMac) === lock) {
+                this.canonicalMacLocks.delete(canonicalMac);
+            }
+        }
+    }
     async withDeviceLock(deviceId, fn) {
         const pending = this.deviceLocks.get(deviceId) ?? Promise.resolve();
         let resolveLock;
@@ -1111,6 +1287,7 @@ exports.DelegatesManagerService = DelegatesManagerService = __decorate([
         channels_properties_service_1.ChannelsPropertiesService,
         device_connectivity_service_1.DeviceConnectivityService,
         device_manager_service_1.DeviceManagerService,
+        device_address_service_1.DeviceAddressService,
         mappings_1.PropertyMappingStorageService,
         mappings_1.TransformerRegistry])
 ], DelegatesManagerService);