npm - iobroker.eos-admin - Versions diffs - 7.9.42 → 7.9.47 - Mend

iobroker.eos-admin 7.9.42 → 7.9.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.md +4 -0
package/adminWww/assets/Adapters-B5_jQ7DE.js +2 -2
package/adminWww/assets/Instances-YdaGnS5a.js +1 -1
package/adminWww/index.html +5 -5
package/adminWww/js/eos-branding.js +40 -33
package/adminWww/js/eos-objects-state-tools.js +1 -1
package/adminWww/js/eos-security-ui.js +46 -62
package/build/lib/web.js +6 -19
package/build/main.js +85 -7
package/io-package.json +25 -4
package/package.json +1 -1

package/adminWww/index.html CHANGED Viewed

@@ -31,7 +31,7 @@
             rel="stylesheet"
             href="css/leaflet.css"
         />
-        <link rel="stylesheet" href="./css/eos-branding.css?v=42" />
+        <link rel="stylesheet" href="./css/eos-branding.css?v=47" />
         <link
             rel="manifest"
             href="manifest.json"
@@ -154,10 +154,10 @@
       <script type="module" crossorigin src="./assets/index-CQZugZ1z.js"></script>
       <link rel="modulepreload" crossorigin href="./assets/preload-helper-BDBacUwf.js">
       <link rel="modulepreload" crossorigin href="./assets/iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js">
-            <script defer src="./js/eos-branding.js?v=42"></script>
-            <script defer src="./js/eos-security-ui.js?v=42"></script>
-            <script defer src="./js/eos-assistant.js?v=42"></script>
-            <script defer src="./js/eos-objects-state-tools.js?v=42"></script>
+            <script defer src="./js/eos-branding.js?v=47"></script>
+            <script defer src="./js/eos-security-ui.js?v=47"></script>
+            <script defer src="./js/eos-assistant.js?v=47"></script>
+            <script defer src="./js/eos-objects-state-tools.js?v=47"></script>
     </head>
     <body>
         <noscript>You need to enable JavaScript to run this app.</noscript>

package/adminWww/js/eos-branding.js CHANGED Viewed

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
-    window.NEXOWATT_EOS_UI_VERSION = 'v40-update-package-mapping';
+    window.NEXOWATT_EOS_UI_VERSION = 'v47-delete-logquiet-fix';
     const BRAND = 'NexoWatt EOS';
     const EOS_MEANING = 'Energy Operation System';
@@ -308,11 +308,9 @@
     ];
     const normalizeSecurityPolicy = policy => {
+        // v47: delete protection is fixed to EOS core adapters. Dynamic policy entries
+        // from older settings are ignored, otherwise normal Dienste can be blocked.
         const protectedAdapters = new Set(CORE_PROTECTED_ADAPTERS);
-        (Array.isArray(policy?.protectedAdapters) ? policy.protectedAdapters : []).forEach(item => {
-            const adapter = typeof item === 'string' ? normalizeIdentifier(item) : normalizeIdentifier(item?.adapter || item?.name);
-            if (adapter) protectedAdapters.add(adapter);
-        });
         const isAdmin = !!(policy?.isAdmin || policy?.isAdminGroup || policy?.isEosAdminGroup || policy?.isAdministrator);
         return {
             loaded: true,
@@ -378,6 +376,18 @@
             .some(el => pattern.test(textOfElement(el)));
     };
+    const SECURITY_SCOPE_MAX_TEXT = 1400;
+    const SECURITY_SCOPE_MAX_CONTROLS = 18;
+    const isSingleSecurityScope = container => {
+        if (!container || !container.querySelectorAll) return false;
+        const text = textOfElement(container);
+        if (!text || text.length > SECURITY_SCOPE_MAX_TEXT) return false;
+        const controls = container.querySelectorAll('button,[role="button"],a,.MuiIconButton-root').length;
+        if (controls > SECURITY_SCOPE_MAX_CONTROLS) return false;
+        const nested = container.querySelectorAll('[role="row"],tr,.MuiDataGrid-row,.MuiListItem-root,.MuiCard-root,.MuiAccordion-root').length;
+        return nested <= 4;
+    };
     const getSecurityContainers = () => Array.from(document.querySelectorAll([
         '#app-paper .MuiCard-root',
         '#app-paper tr.MuiTableRow-root',
@@ -390,7 +400,7 @@
         '#app-paper .MuiFormControlLabel-root',
         '#app-paper .MuiListItem-root',
         '#app-paper .MuiListItemButton-root',
-    ].join(','))).filter(el => !el.closest('.MuiDialog-paper'));
+    ].join(','))).filter(el => !el.closest('.MuiDialog-paper') && isSingleSecurityScope(el));
     const isDeleteControl = el => {
         const text = normalize(el.textContent || el.getAttribute?.('title') || el.getAttribute?.('aria-label') || '');
@@ -399,18 +409,26 @@
         return !!svg || /\b(delete|remove|uninstall|del|loschen|entfernen|deinstallieren)\b/.test(`${text} ${title}`);
     };
-    const lockDeleteControls = container => {
-        Array.from(container.querySelectorAll('button, [role="button"], a')).forEach(control => {
-            if (!isDeleteControl(control)) return;
-            control.classList.add('eos-protected-delete-control');
-            control.setAttribute('aria-disabled', 'true');
-            control.setAttribute('title', 'Geschütztes EOS-Systemmodul darf nicht gelöscht werden');
-            if ('disabled' in control) control.disabled = true;
-            control.addEventListener('click', event => {
-                event.preventDefault();
-                event.stopImmediatePropagation();
-            }, true);
+    const unlockDeleteControls = () => safe(() => {
+        // v47: clean up classes/attributes created by older EOS delete guards. We do not
+        // install capture listeners anymore; React handlers enforce the core protection list.
+        document.querySelectorAll('#app-paper .eos-protected-delete-control, #app-paper .eos-security-hidden-delete, #app-paper [data-eos-delete-guard-bound="true"]').forEach(control => {
+            control.classList.remove('eos-protected-delete-control', 'eos-security-hidden-delete');
+            control.removeAttribute('data-eos-delete-guard-bound');
+            control.removeAttribute('aria-disabled');
+            control.style.display = '';
+            control.style.pointerEvents = '';
+            control.style.visibility = '';
+            control.style.opacity = '';
+            if (control.hasAttribute('disabled')) control.removeAttribute('disabled');
+            if ('disabled' in control) control.disabled = false;
         });
+    });
+    const lockDeleteControls = container => {
+        // v47: Intentionally no DOM click blocking. Stale capture listeners and disabled
+        // attributes were the reason normal services could not be deleted via trash icon.
+        unlockDeleteControls();
     };
@@ -460,22 +478,9 @@
     });
     const protectDeleteDialogs = () => {
-        if (state.securityPolicy.restrictProtectedAdapterControls === false) return;
-        const protectedAdapters = state.securityPolicy.protectedAdapters || [];
-        Array.from(document.querySelectorAll('.MuiDialog-paper, [role="dialog"]')).forEach(dialog => {
-            const text = textOfElement(dialog);
-            if (!/(delete|remove|loschen|entfernen|deinstallieren|del\s+)/i.test(text)) return;
-            const protectedHit = protectedAdapters.some(adapter => containerMentionsAdapter(dialog, adapter));
-            if (!protectedHit) return;
-            dialog.classList.add('eos-protected-delete-dialog');
-            Array.from(dialog.querySelectorAll('button')).forEach(button => {
-                const label = normalize(button.textContent || button.getAttribute('aria-label') || '');
-                if (/^(ok|ja|yes|delete|remove|loschen|entfernen|deinstallieren)$/.test(label)) {
-                    button.disabled = true;
-                    button.classList.add('eos-protected-delete-control');
-                }
-            });
-        });
+        // v47: Do not disable delete confirmation dialogs in the DOM. The delete command
+        // guard is handled in React and keeps the fixed EOS core list protected.
+        unlockDeleteControls();
     };
     const hideSecuritySettingsForNonAdmin = () => {
@@ -523,6 +528,7 @@
         const policy = state.securityPolicy;
         applySecurityClasses();
         releaseNotificationControls();
+        unlockDeleteControls();
         // Do not apply EOS security decoration inside native adapter configuration pages.
         // Adapter UIs must remain 100% functional; backend/role checks still protect EOS actions.
         if (isAdapterConfigSurface()) return;
@@ -535,6 +541,7 @@
         const containers = getSecurityContainers();
         containers.forEach(container => {
+            if (!isSingleSecurityScope(container)) return;
             if (!isAdminUser() && policy.hideLegacyAdminForNonAdmins !== false && isLegacyAdminContainer(container)) {
                 container.classList.add('eos-hidden-legacy-admin');
                 container.setAttribute('aria-hidden', 'true');

package/adminWww/js/eos-objects-state-tools.js CHANGED Viewed

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
-    window.NEXOWATT_EOS_OBJECTS_STATE_TOOLS_VERSION = 'v42-force-version-delete-dp-fix';
+    window.NEXOWATT_EOS_OBJECTS_STATE_TOOLS_VERSION = 'v45-delete-services-hardfix';
     const ACTIVE_CLASS = 'eos-objects-surface';
     const safe = fn => { try { return fn(); } catch (e) { return undefined; } };

package/adminWww/js/eos-security-ui.js CHANGED Viewed

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
-    const VERSION = 'v42-force-version-delete-dp-fix';
+    const VERSION = 'v47-delete-logquiet-fix';
     const LEGACY_ADMIN = 'admin';
     const LEGACY_ADMIN_INSTANCE = 'admin.0';
     const CORE_PROTECTED_ADAPTERS = ['admin', 'eos-admin', 'backitup', 'nexowatt-devices', 'nexowatt-device', 'nexowatt-dev', 'nexowatt-ui'];
@@ -65,9 +65,9 @@
     const isAdminUser = () => !!(state.policy?.isAdmin || state.policy?.isEosAdminGroup || state.policy?.isAdministrator);
     const protectedAdapters = () => {
-        const names = new Set([LEGACY_ADMIN, ...CORE_PROTECTED_ADAPTERS].map(normalizeAdapter).filter(Boolean));
-        (state.policy?.protectedAdapters || []).map(normalizeAdapter).filter(Boolean).forEach(adapter => names.add(adapter));
-        return names;
+        // v47: hard delete protection only for EOS core adapters. Dynamic/stale
+        // policy entries must never block ordinary installed adapters.
+        return new Set([LEGACY_ADMIN, ...CORE_PROTECTED_ADAPTERS].map(normalizeAdapter).filter(Boolean));
     };
     const isProtectedAdapter = value => {
@@ -89,7 +89,26 @@
         },
     };
-    const closestPanel = el => el?.closest?.('.MuiCard-root, .MuiPaper-root, [role="row"], tr, .MuiListItem-root, .MuiBox-root') || null;
+    const SECURITY_SCOPE_MAX_TEXT = 1400;
+    const SECURITY_SCOPE_MAX_CONTROLS = 18;
+    const isSingleSecurityScope = el => {
+        if (!el || !el.querySelectorAll) return false;
+        const text = normalize(el.textContent || '');
+        if (!text || text.length > SECURITY_SCOPE_MAX_TEXT) return false;
+        const controls = el.querySelectorAll('button,[role="button"],a,.MuiIconButton-root').length;
+        if (controls > SECURITY_SCOPE_MAX_CONTROLS) return false;
+        const nested = el.querySelectorAll('[role="row"],tr,.MuiDataGrid-row,.MuiListItem-root,.MuiCard-root,.MuiAccordion-root').length;
+        return nested <= 4;
+    };
+    const closestPanel = el => {
+        let node = el?.closest?.('.MuiCard-root, .MuiPaper-root, [role="row"], tr, .MuiListItem-root, .MuiBox-root') || null;
+        while (node && node !== document.body && node !== document.documentElement) {
+            if (isSingleSecurityScope(node)) return node;
+            node = node.parentElement?.closest?.('.MuiCard-root, .MuiPaper-root, [role="row"], tr, .MuiListItem-root, .MuiBox-root') || null;
+        }
+        return null;
+    };
     const markHidden = el => {
         if (!el || el.classList?.contains('eos-security-keep-visible')) return;
         el.classList.add('eos-security-hidden');
@@ -128,39 +147,29 @@
         });
     };
-    const hideProtectedDeleteControls = () => {
-        if (!state.policy?.restrictProtectedAdapterControls) return;
-        const protectedSet = protectedAdapters();
-        if (!protectedSet.size) return;
-        document.querySelectorAll('.MuiCard-root, .MuiPaper-root, [role="row"], tr, .MuiListItem-root').forEach(panel => {
-            let adapter = '';
-            const icon = panel.querySelector('img[src*="/adapter/"], img[src*="adapter/"]');
-            const src = icon ? String(icon.getAttribute('src') || '') : '';
-            const match = src.match(/adapter\/([^\/]+)\//i);
-            if (match) adapter = normalizeAdapter(match[1]);
-            const text = normalizeFlat(panel.textContent || '');
-            if (!adapter) {
-                for (const protectedName of protectedSet) {
-                    if (new RegExp(`\\b${protectedName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(?:\\.\\d+)?\\b`, 'i').test(text)) {
-                        adapter = protectedName;
-                        break;
-                    }
-                }
-            }
-            if (!adapter || !protectedSet.has(adapter)) return;
-            panel.classList.add('eos-security-protected-adapter');
-            panel.querySelectorAll('button,[role="button"],a').forEach(button => {
-                const label = normalizeFlat(`${button.textContent || ''} ${button.getAttribute('title') || ''} ${button.getAttribute('aria-label') || ''}`);
-                if (/loschen|delete|remove|deinstall|uninstall/.test(label)) {
-                    button.classList.add('eos-security-hidden-delete');
-                    button.setAttribute('disabled', 'disabled');
-                    button.setAttribute('aria-disabled', 'true');
-                    button.style.display = 'none';
-                }
-            });
+    const releaseDeleteControls = () => {
+        // v47: undo markers from older EOS DOM guards. Only touch controls that were
+        // marked by EOS scripts, not native Admin disabled states.
+        document.querySelectorAll('.eos-security-hidden-delete, .eos-protected-delete-control, [data-eos-security-locked-delete="true"]').forEach(control => {
+            control.classList?.remove('eos-security-hidden-delete', 'eos-protected-delete-control');
+            control.removeAttribute?.('data-eos-security-locked-delete');
+            control.removeAttribute?.('aria-disabled');
+            control.style.display = '';
+            control.style.visibility = '';
+            control.style.pointerEvents = '';
+            if (control.hasAttribute?.('disabled')) control.removeAttribute('disabled');
+            if ('disabled' in control) control.disabled = false;
         });
     };
+    const hideProtectedDeleteControls = () => {
+        // v47: Do not hide or capture trash buttons in the DOM. The shipped React
+        // source/bundles already block protected EOS core adapters before executing
+        // the ioBroker del command. DOM blocking caused stale/virtualized rows to make
+        // normal services undeletable.
+        releaseDeleteControls();
+    };
     const replaceTextNodes = () => {
         const map = new Map([
             ['EOS security', 'EOS Sicherheit'],
@@ -293,33 +302,8 @@
         state.observer.observe(document.documentElement, { childList: true, subtree: true });
     };
-    document.addEventListener('click', event => {
-        const target = event.target?.closest?.('button,[role="button"],a,[role="menuitem"],.MuiMenuItem-root');
-        if (!target || isAdapterConfigSurface()) return;
-        // Native Admin dialogs, install/autocomplete poppers and adapter-owned menus must stay untouched.
-        if (target.closest?.('.MuiDialog-root,.MuiModal-root,.MuiPopover-root,.MuiPopper-root,.MuiMenu-root,.MuiAutocomplete-popper,[role="dialog"],[role="listbox"],[role="menu"]')) return;
-        const label = normalizeFlat(`${target.textContent || ''} ${target.getAttribute?.('title') || ''} ${target.getAttribute?.('aria-label') || ''}`);
-        if (!/loschen|delete|remove|deinstall|uninstall/.test(label)) return;
-        const panel = closestPanel(target);
-        if (!panel) return;
-        const protectedSet = protectedAdapters();
-        const icon = panel.querySelector('img[src*="/adapter/"], img[src*="adapter/"]');
-        const src = icon ? String(icon.getAttribute('src') || '') : '';
-        const match = src.match(/adapter\/([^\/]+)\//i);
-        const adapterFromIcon = match ? normalizeAdapter(match[1]) : '';
-        const text = normalizeFlat(panel.textContent || '');
-        const protectedHit = adapterFromIcon
-            ? isProtectedAdapter(adapterFromIcon)
-            : [...protectedSet].some(adapter => new RegExp(`\\b${adapter.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(?:\\.\\d+)?\\b`, 'i').test(text));
-        if (!protectedHit) return;
-        target.classList.add('eos-security-hidden-delete');
-        target.setAttribute?.('aria-disabled', 'true');
-        target.style.display = 'none';
-        event.preventDefault();
-        event.stopImmediatePropagation();
-    }, true);
+    // v47: No global capture listener for delete buttons. Protected adapter deletion is
+    // handled in the React delete handlers; global DOM interception broke normal Dienste.
     const start = () => {
         loadPolicy();

package/build/lib/web.js CHANGED Viewed

@@ -34,6 +34,7 @@ let uuid;
 const page404 = (0, node_fs_1.readFileSync)(`${__dirname}/../../public/404.html`).toString('utf8');
 const logTemplate = (0, node_fs_1.readFileSync)(`${__dirname}/../../public/logTemplate.html`).toString('utf8');
 const CORE_PROTECTED_ADAPTER_NAMES = [
+    'admin',
     'eos-admin',
     'backitup',
     'nexowatt-devices',
@@ -411,23 +412,9 @@ class Web {
         return [...groups].sort();
     }
     getEosProtectedAdapterNames() {
-        const names = new Set(CORE_PROTECTED_ADAPTER_NAMES);
-        const add = value => {
-            if (!value) return;
-            if (Array.isArray(value)) {
-                value.forEach(add);
-                return;
-            }
-            if (typeof value === 'object') {
-                if (value.enabled === false) return;
-                add(value.adapter || value.name);
-                return;
-            }
-            const adapter = this.normalizeEosAdapterName(String(value));
-            if (adapter) names.add(adapter);
-        };
-        if (this.settings.eosProtectAdapterDeletion !== false) add(this.settings.eosProtectedAdapters);
-        return [...names].sort();
+        // v47: frontend delete protection is core-only. Ignore old eosProtectedAdapters
+        // settings so normal installed adapters/instances remain deletable.
+        return [...new Set(CORE_PROTECTED_ADAPTER_NAMES)].sort();
     }
     async getEosGroupsForUser(userId) {
         const groups = new Set();
@@ -720,7 +707,7 @@ class Web {
                             hideLegacyAdminForNonAdmins: true,
                             hideLegacyAdminFromNonAdmins: true,
                             restrictProtectedAdapterControls: true,
-                            protectedAdapters: ['eos-admin'],
+                            protectedAdapters: this.getEosProtectedAdapterNames(),
                         });
                     });
                 });
@@ -809,7 +796,7 @@ class Web {
                         hideLegacyAdminForNonAdmins: true,
                         hideLegacyAdminFromNonAdmins: true,
                         restrictProtectedAdapterControls: true,
-                        protectedAdapters: ['eos-admin'],
+                        protectedAdapters: this.getEosProtectedAdapterNames(),
                     });
                 });
             };

package/build/main.js CHANGED Viewed

@@ -164,6 +164,8 @@ class Admin extends adapter_core_1.Adapter {
     eosSecurityDebounce = null;
     /** Avoid concurrent policy writes while the guard corrects objects. */
     eosSecurityRunning = false;
+    /** v47: stale delete-lock cleanup is a one-shot migration, not a repeating guard. */
+    eosDeleteLockRepairFinished = false;
     constructor(options = {}) {
         options = {
             ...options,
@@ -816,12 +818,10 @@ class Admin extends adapter_core_1.Adapter {
         return configured || DEFAULT_LEGACY_ADMIN_LOCK_BIND;
     }
     getProtectedAdapterNames() {
-        const configured = normalizeProtectedAdapters(this.config.eosProtectedAdapters);
-        const result = new Set(CORE_PROTECTED_ADAPTER_NAMES);
-        configured.forEach(adapter => result.add(adapter));
-        // EOS Admin and the core NexoWatt runtime adapters must always stay protected through ACL/UI policy,
-        // but never via common.dontDelete/common.nondeletable. Those flags can interfere with ioBroker updates
-        // because updates may replace adapter objects.
+        // v47: delete protection is intentionally limited to the fixed EOS core list.
+        // Older installations may have stored additional entries in eosProtectedAdapters;
+        // those must not make ordinary runtime adapters undeletable in Dienste/Module.
+        const result = new Set([LEGACY_ADMIN_ADAPTER_NAME, ...CORE_PROTECTED_ADAPTER_NAMES]);
         return [...result].sort();
     }
     scheduleEosSecurityGuard(reason) {
@@ -874,6 +874,80 @@ class Admin extends adapter_core_1.Adapter {
         }
         return changed;
     }
+    async clearStaleAdapterDeleteLocks(id, protectedAdapters) {
+        const obj = await this.getForeignObjectAsync(id);
+        if (!obj?.common) {
+            return false;
+        }
+        const adapter = String(id)
+            .replace(/^system\.adapter\./, '')
+            .replace(/\.\d+$/, '');
+        const isProtected = protectedAdapters.has(adapter);
+        // v47: never "repair" the fixed protected core adapters here. On some systems
+        // ioBroker or another guard restores their delete flags immediately, which created
+        // a repair/reapply loop and filled the log every debounce cycle.
+        if (isProtected) {
+            return false;
+        }
+        let changed = false;
+        obj.common = obj.common || {};
+        // v45/v47: old builds could leave common.dontDelete/common.nondeletable on normal
+        // adapter or instance objects. Those flags block ioBroker del even if the UI allows it.
+        if (obj.common.dontDelete === true) {
+            delete obj.common.dontDelete;
+            changed = true;
+        }
+        if (obj.common.nondeletable === true) {
+            obj.common.nondeletable = false;
+            changed = true;
+        }
+        // Also undo stale admin-only ACLs for adapters that are no longer protected by the
+        // hard core list. UI protection remains for real core modules.
+        if (!isProtected && obj.acl) {
+            const targetAcl = this.getAdminOnlyAcl();
+            const acl = obj.acl;
+            if (acl.owner === targetAcl.owner && acl.ownerGroup === targetAcl.ownerGroup && acl.object === targetAcl.object) {
+                delete obj.acl;
+                changed = true;
+            }
+        }
+        if (changed) {
+            await this.setForeignObjectAsync(id, obj);
+        }
+        return changed;
+    }
+    async repairStaleAdapterDeleteLocks() {
+        const protectedAdapters = new Set(this.getProtectedAdapterNames());
+        const ids = new Set();
+        const collect = async (type) => {
+            try {
+                const view = await this.getObjectViewAsync('system', type, {
+                    startkey: 'system.adapter.',
+                    endkey: 'system.adapter.香',
+                });
+                for (const row of view.rows || []) {
+                    if (row.id) {
+                        ids.add(row.id);
+                    }
+                }
+            }
+            catch (e) {
+                this.log.warn(`Cannot scan ${type} objects for stale delete locks: ${e instanceof Error ? e.message : e}`);
+            }
+        };
+        await collect('adapter');
+        await collect('instance');
+        let changed = 0;
+        for (const id of ids) {
+            if (await this.clearStaleAdapterDeleteLocks(id, protectedAdapters)) {
+                changed++;
+            }
+        }
+        if (changed) {
+            this.log.debug(`EOS delete guard repaired stale delete locks on ${changed} adapter/instance object(s)`);
+        }
+    }
     async ensureProtectedAdapter(adapter) {
         if (!adapter || adapter === LEGACY_ADMIN_ADAPTER_NAME) {
             return;
@@ -905,7 +979,7 @@ class Admin extends adapter_core_1.Adapter {
             this.log.warn(`Cannot protect instances of adapter "${adapter}": ${e instanceof Error ? e.message : e}`);
         }
         if (changed) {
-            this.log.info(`EOS ACL/UI delete guard applied to adapter "${adapter}"`);
+            this.log.debug(`EOS ACL/UI delete guard applied to adapter "${adapter}"`);
         }
     }
     async ensureLegacyAdminLocked() {
@@ -949,6 +1023,10 @@ class Admin extends adapter_core_1.Adapter {
         try {
             await this.ensureLegacyAdminLocked();
             await this.ensureLegacyAdminVisibleOnlyToAdmins();
+            if (!this.eosDeleteLockRepairFinished) {
+                this.eosDeleteLockRepairFinished = true;
+                await this.repairStaleAdapterDeleteLocks();
+            }
             if (this.config.eosProtectAdapterDeletion !== false) {
                 for (const adapter of this.getProtectedAdapterNames()) {
                     await this.ensureProtectedAdapter(adapter);

package/io-package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.42",
+    "version": "7.9.47",
     "titleLang": {
       "en": "NexoWatt EOS Admin",
       "de": "NexoWatt EOS Admin",
@@ -18,6 +18,14 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
+      "7.9.47": {
+        "en": "Quiet delete guard fix: stale delete-lock repair runs once and skips protected core adapters, preventing repeated log entries while service deletion remains functional.",
+        "de": "Leiser Delete-Guard-Fix: Reparatur alter Löschsperren läuft nur einmal und überspringt geschützte Core-Adapter, wodurch wiederholte Logeinträge verhindert werden; Dienste löschen bleibt funktionsfähig."
+      },
+      "7.9.44": {
+        "en": "Fix service/instance delete button: core-only protection, stale lock repair, guarded DOM scope.",
+        "de": "Fix für Dienste/Instanzen löschen: Schutz nur für EOS-Core, Reparatur alter Locks, enger DOM-Schutz."
+      },
       "7.9.42": {
         "en": "Forced visible update package with cache-busting version markers; adapter/instance deletion is blocked only for Admin/EOS Admin, BackItUp/Backup, NexoWatt Devices and NexoWatt UI; writable datapoints keep reliable command writes.",
         "de": "Sichtbares Force-Update mit Cache-Busting-Versionen; Adapter-/Instanz-Löschung bleibt nur für Admin/EOS Admin, BackItUp/Backup, NexoWatt Devices und NexoWatt UI gesperrt; beschreibbare Datenpunkte schreiben Befehlswerte weiterhin zuverlässig."
@@ -189,6 +197,19 @@
       "7.9.40": {
         "en": "Fixed repository update package mapping by adding packetName and preserved technical npm/ioBroker package output in command dialogs.",
         "de": "Repository-Update-Mapping korrigiert: packetName ergänzt und technische npm/ioBroker-Paketausgaben in Befehlsdialogen unverändert gelassen."
+      },
+      "7.9.45": {
+        "en": "Hard fix for service/module deletion: DOM security scripts no longer capture trash clicks, stale delete locks are repaired, and only EOS core adapters remain protected.",
+        "de": "Hardfix für Dienste-/Module-Löschung: DOM-Security-Skripte fangen Mülleimer-Klicks nicht mehr ab, alte Löschsperren werden repariert und nur EOS-Core-Adapter bleiben geschützt.",
+        "ru": "Исправление удаления служб/модулей: DOM security больше не перехватывает клики по корзине, устаревшие блокировки удаления исправляются, защищены только основные адаптеры EOS.",
+        "pt": "Correção de exclusão de serviços/módulos: scripts DOM security não capturam mais cliques na lixeira, bloqueios antigos são reparados e apenas adaptadores EOS core ficam protegidos.",
+        "nl": "Hardfix voor verwijderen van diensten/modules: DOM-securityscripts vangen prullenbakklikken niet meer af, oude verwijderblokkades worden hersteld en alleen EOS-coreadapters blijven beschermd.",
+        "fr": "Correctif suppression services/modules : les scripts DOM security ne capturent plus les clics corbeille, les anciens verrous sont réparés et seuls les adaptateurs cœur EOS restent protégés.",
+        "it": "Fix eliminazione servizi/moduli: gli script DOM security non intercettano più i clic sul cestino, i vecchi blocchi vengono riparati e solo gli adattatori core EOS restano protetti.",
+        "es": "Corrección de eliminación de servicios/módulos: los scripts DOM security ya no capturan clics de papelera, se reparan bloqueos antiguos y solo adaptadores core EOS quedan protegidos.",
+        "pl": "Poprawka usuwania usług/modułów: skrypty DOM security nie przechwytują kliknięć kosza, stare blokady są naprawiane i chronione pozostają tylko adaptery rdzeniowe EOS.",
+        "uk": "Виправлення видалення служб/модулів: DOM security більше не перехоплює кліки кошика, старі блокування виправляються, захищені лише основні адаптери EOS.",
+        "zh-cn": "服务/模块删除硬修复：DOM security 脚本不再拦截垃圾桶点击，会修复旧删除锁，仅 EOS 核心适配器受保护。"
       }
     },
     "desc": {
@@ -226,7 +247,7 @@
     "icon": "admin.svg",
     "messagebox": true,
     "enabled": true,
-    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.42/admin/admin.svg",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.47/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -237,7 +258,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.42/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.47/README.md",
     "authors": [
       "bluefox <bluefox@ccu.io>",
       "hobbyquaker <hq@ccu.io>"
@@ -306,7 +327,7 @@
     "nondeletable": false,
     "allowAdapterUpdate": true,
     "allowAdapterDelete": false,
-    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.42/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.47/io-package.json",
     "npmPackage": "iobroker.eos-admin",
     "packetName": "iobroker.eos-admin"
   },

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.eos-admin",
   "description": "NexoWatt EOS Admin interface with reliable repository update mapping and technical log preservation.",
-  "version": "7.9.42",
+  "version": "7.9.47",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",