npm - iobroker.eos-admin - Versions diffs - 7.9.35 → 7.9.36 - Mend

iobroker.eos-admin 7.9.35 → 7.9.36

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 (10) hide show

package/adminWww/css/eos-branding.css +52 -0
package/adminWww/index.html +4 -5
package/adminWww/js/eos-branding.js +47 -14
package/adminWww/js/eos-hard-logout.js +15 -162
package/adminWww/js/eos-security-ui.js +4 -1
package/build/lib/web.js +48 -64
package/io-package.json +10 -10
package/package.json +1 -1
package/public/404.html +12 -0
package/tools/nexowatt-validate-package.cjs +6 -3

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

@@ -3319,3 +3319,55 @@ html.eos-app #eos-assist-root {
     html.eos-app .eos-assist-root,
     html.eos-app #eos-assist-root { right: 96px !important; }
 }
+/* === NexoWatt EOS v36: native adapter configuration safe mode =============
+   Custom adapter configuration pages (React/HTML/jsonConfig) must be fully
+   controlled by the adapter itself. EOS shell decoration is disabled inside the
+   content area so buttons such as "Gerät hinzufügen" and "Gerät bearbeiten" stay
+   clickable and dialogs/popovers are not hidden behind overlays. */
+html.eos-app.eos-adapter-config-surface #app-paper,
+html.eos-app.eos-adapter-config-surface #app-paper * {
+    pointer-events: auto !important;
+}
+html.eos-app.eos-adapter-config-surface #app-paper button,
+html.eos-app.eos-adapter-config-surface #app-paper [role="button"],
+html.eos-app.eos-adapter-config-surface #app-paper a,
+html.eos-app.eos-adapter-config-surface #app-paper input,
+html.eos-app.eos-adapter-config-surface #app-paper select,
+html.eos-app.eos-adapter-config-surface #app-paper textarea,
+html.eos-app.eos-adapter-config-surface #app-paper .MuiButton-root,
+html.eos-app.eos-adapter-config-surface #app-paper .MuiIconButton-root,
+html.eos-app.eos-adapter-config-surface #app-paper .MuiMenuItem-root {
+    pointer-events: auto !important;
+    user-select: auto !important;
+}
+html.eos-app.eos-adapter-config-surface .eos-assist-root,
+html.eos-app.eos-adapter-config-surface #eos-assist-root,
+html.eos-app.eos-adapter-config-surface .eos-assist-config-hidden {
+    display: none !important;
+    visibility: hidden !important;
+    pointer-events: none !important;
+}
+html.eos-app.eos-adapter-config-surface .MuiDialog-root,
+html.eos-app.eos-adapter-config-surface .MuiModal-root,
+html.eos-app.eos-adapter-config-surface .MuiPopover-root,
+html.eos-app.eos-adapter-config-surface .MuiMenu-root,
+html.eos-app.eos-adapter-config-surface .MuiDialog-container {
+    pointer-events: auto !important;
+    z-index: 4200 !important;
+}
+html.eos-app.eos-adapter-config-surface .MuiDialog-paper,
+html.eos-app.eos-adapter-config-surface .MuiPopover-paper,
+html.eos-app.eos-adapter-config-surface .MuiMenu-paper {
+    pointer-events: auto !important;
+}
+html.eos-app.eos-adapter-config-surface #app-paper .eos-protected-delete-control,
+html.eos-app.eos-adapter-config-surface #app-paper .eos-security-hidden-delete,
+html.eos-app.eos-adapter-config-surface #app-paper .eos-protected-adapter-row {
+    display: revert !important;
+    visibility: visible !important;
+    opacity: 1 !important;
+    filter: none !important;
+    pointer-events: auto !important;
+}

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=35" />
+        <link rel="stylesheet" href="./css/eos-branding.css?v=36" />
         <link
             rel="manifest"
             href="manifest.json"
@@ -154,10 +154,9 @@
       <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=35"></script>
-            <script defer src="./js/eos-security-ui.js?v=35"></script>
-            <script defer src="./js/eos-hard-logout.js?v=35"></script>
-            <script defer src="./js/eos-assistant.js?v=35"></script>
+            <script defer src="./js/eos-branding.js?v=36"></script>
+            <script defer src="./js/eos-security-ui.js?v=36"></script>
+            <script defer src="./js/eos-assistant.js?v=36"></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 = 'v35-login-config-fix';
+    window.NEXOWATT_EOS_UI_VERSION = 'v36-native-config-session-fix';
     const BRAND = 'NexoWatt EOS';
     const EOS_MEANING = 'Energy Operation System';
@@ -398,6 +398,9 @@
     const applySecurityUiGuard = () => safe(() => {
         const policy = state.securityPolicy;
         applySecurityClasses();
+        // 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;
         if (!policy.loaded) return;
         if (isAdminUser()) {
             document.querySelectorAll('.eos-hidden-legacy-admin, .eos-protected-adapter-row').forEach(el => {
@@ -470,16 +473,33 @@
     };
+    const isAdapterConfigSurface = () => document.documentElement.classList.contains('eos-adapter-config-surface');
     const markAdapterConfigSurface = () => safe(() => {
-        const text = textOfElement(document.querySelector('#app-paper') || document.body).slice(0, 1500);
-        const isConfig = /Instanzeinstellungen:|Instance settings:|Gerät hinzufügen|Gerät bearbeiten|Adapterkonfiguration|json exportieren/i.test(text)
-            || /tab-instances/i.test(window.location.hash || '');
+        const app = document.querySelector('#app-paper') || document.body;
+        const text = textOfElement(app).slice(0, 3500);
+        const isConfig = /Instanzeinstellungen:|Instance settings:|Gerät hinzufügen|Gerät bearbeiten|Geräteliste|Adapterkonfiguration|json exportieren|json importieren|Speichern und schließen|Save and close/i.test(text);
         document.documentElement.classList.toggle('eos-adapter-config-surface', !!isConfig);
         if (!isConfig) return;
-        // Do not let EOS decorative layers influence adapter specific buttons/dialogs.
-        document.querySelectorAll('#app-paper button, #app-paper [role="button"], #app-paper a, #app-paper input, #app-paper select, #app-paper textarea').forEach(control => {
+        // Native adapter configuration UIs are owned by the adapter. EOS must never
+        // block, rewrite or intercept their controls. This is critical for custom
+        // React/HTML configuration pages such as nexowatt-devices.
+        document.querySelectorAll('#app-paper button, #app-paper [role="button"], #app-paper a, #app-paper input, #app-paper select, #app-paper textarea, #app-paper [tabindex]').forEach(control => {
             if (control.closest('.eos-assist-root, #eos-assist-root, .eos-standalone-nav-toggle')) return;
             control.style.pointerEvents = 'auto';
+            control.removeAttribute('aria-disabled');
+        });
+        document.querySelectorAll('#app-paper .eos-protected-delete-control, #app-paper .eos-security-hidden-delete, #app-paper .eos-protected-adapter-row').forEach(el => {
+            el.classList.remove('eos-protected-delete-control', 'eos-security-hidden-delete', 'eos-protected-adapter-row');
+            el.removeAttribute('aria-disabled');
+            if (el.style) {
+                el.style.pointerEvents = '';
+                el.style.display = '';
+                el.style.visibility = '';
+                el.style.opacity = '';
+            }
+            if ('disabled' in el && !el.dataset.eosOriginalDisabled) el.disabled = false;
         });
     });
@@ -592,13 +612,10 @@
     }
     const installHardLogoutWatchdog = () => {
-        if (hardLogoutInstalled) return;
+        // v36: disabled. Upstream ioBroker Admin session handling is used again so
+        // the configured admin TTL is respected and native adapter config pages are
+        // not interrupted by duplicate EOS timers.
         hardLogoutInstalled = true;
-        window.addEventListener('focus', () => checkHardLogoutSession(), { passive: true });
-        document.addEventListener('visibilitychange', () => {
-            if (!document.hidden) checkHardLogoutSession();
-        }, { passive: true });
-        scheduleHardLogoutCheck(2500);
     };
     const ensureBrandBadge = toolbar => {
@@ -1009,6 +1026,11 @@
             document.querySelectorAll('.eos-assist-launcher,.eos-assist-panel:not(#eos-assist-root .eos-assist-panel)').forEach(el => el.remove());
             return;
         }
+        if (isAdapterConfigSurface()) {
+            const existing = document.getElementById('eos-assist-root');
+            if (existing) existing.classList.add('eos-assist-config-hidden');
+            return;
+        }
         let root = document.getElementById('eos-assist-root');
         if (!root) {
@@ -1042,6 +1064,7 @@
             document.body.appendChild(root);
         }
+        root.classList.remove('eos-assist-config-hidden');
         const ctx = assistContext();
         const button = root.querySelector('.eos-assist-button');
         const input = root.querySelector('.eos-assist-input');
@@ -1203,8 +1226,17 @@
         hideNativeLogoutNav();
         hideOfficialNexoWattRepoWarning();
         applySecurityUiGuard();
-        patchTextNodes(document.body || document.documentElement);
-        patchAttributes(document.body || document.documentElement);
+        if (isAdapterConfigSurface()) {
+            ['.MuiAppBar-root', '.MuiDrawer-paper', 'nav', '.eos-brand-badge', '.eos-top-toolbar'].forEach(selector => {
+                document.querySelectorAll(selector).forEach(scope => {
+                    patchTextNodes(scope);
+                    patchAttributes(scope);
+                });
+            });
+        } else {
+            patchTextNodes(document.body || document.documentElement);
+            patchAttributes(document.body || document.documentElement);
+        }
     };
     const scopePatch = () => {
@@ -1228,6 +1260,7 @@
         applySecurityUiGuard();
         for (const scope of scopes.slice(0, 80)) {
             if (!scope || !scope.isConnected) continue;
+            if (isAdapterConfigSurface() && (scope.id === 'app-paper' || scope.closest?.('#app-paper'))) continue;
             patchTextNodes(scope);
             patchAttributes(scope);
         }

package/adminWww/js/eos-hard-logout.js CHANGED Viewed

@@ -1,165 +1,18 @@
 (function () {
     'use strict';
-    const LOG_PREFIX = '[NexoWatt EOS hard logout]';
-    const VERSION = '35';
-    const MIN_POLL_MS = 15_000;
-    const MAX_TIMER_MS = 2_147_000_000;
-    const MIN_TTL_SEC = 5;
-    const STORAGE_KEY = `nexowatt:eos:hardLogoutAt:${location.host}:root`;
-    let logoutTimer = null;
-    let pollTimer = null;
-    let logoutStarted = false;
-    function isLoginPage() {
-        const path = String(window.location.pathname || '').toLowerCase();
-        const search = String(window.location.search || '').toLowerCase();
-        return path.endsWith('/login') || path.includes('/login/') || search.includes('login');
-    }
-    function clearStoredTokens() {
-        const storages = [window.localStorage, window.sessionStorage, window._localStorage, window._sessionStorage]
-            .filter(Boolean)
-            .filter((storage, index, array) => array.indexOf(storage) === index);
-        const tokenKeyPattern = /(access[_-]?token|refresh[_-]?token|token[_-]?expires|expires[_-]?in|oauth|bearer|auth|connection)/i;
-        for (const storage of storages) {
-            try {
-                const keys = [];
-                for (let i = 0; i < storage.length; i++) {
-                    const key = storage.key(i);
-                    if (key && (tokenKeyPattern.test(key) || key === STORAGE_KEY)) {
-                        keys.push(key);
-                    }
-                }
-                keys.forEach(key => storage.removeItem(key));
-            } catch (e) {
-                // ignore blocked storage
-            }
-        }
-    }
-    function clearAuthCookies() {
-        const cookieNames = ['access_token', 'refresh_token', 'connect.sid', 'ioBroker.sid'];
-        const paths = ['/', window.location.pathname.replace(/\/[^/]*$/, '/') || '/'];
-        for (const name of cookieNames) {
-            for (const path of paths) {
-                document.cookie = `${name}=; Max-Age=0; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=${path}; SameSite=Lax`;
-            }
-        }
-    }
-    function readDeadline() {
-        try {
-            const value = Number(window.localStorage.getItem(STORAGE_KEY));
-            return Number.isFinite(value) && value > 0 ? value : 0;
-        } catch (e) {
-            return 0;
-        }
-    }
-    function writeDeadline(deadline) {
-        try {
-            window.localStorage.setItem(STORAGE_KEY, String(deadline));
-        } catch (e) {
-            // ignore blocked storage
-        }
-    }
-    function hardLogout(reason) {
-        if (logoutStarted || isLoginPage()) return;
-        logoutStarted = true;
-        try { console.warn(LOG_PREFIX, reason || 'session expired'); } catch (e) {}
-        if (logoutTimer) {
-            clearTimeout(logoutTimer);
-            logoutTimer = null;
-        }
-        if (pollTimer) {
-            clearInterval(pollTimer);
-            pollTimer = null;
-        }
-        clearStoredTokens();
-        clearAuthCookies();
-        const logoutUrl = new URL('logout', window.location.origin + '/');
-        logoutUrl.searchParams.set('hard', '1');
-        logoutUrl.searchParams.set('ts', String(Date.now()));
-        window.location.replace(logoutUrl.href);
-    }
-    function scheduleHardLogout(deadline) {
-        const ms = Math.min(Math.max(deadline - Date.now() + 250, 250), MAX_TIMER_MS);
-        if (logoutTimer) clearTimeout(logoutTimer);
-        logoutTimer = setTimeout(() => hardLogout('configured login timeout reached'), ms);
-    }
-    function applyServerExpiration(expireInSec) {
-        const seconds = Number(expireInSec);
-        if (!Number.isFinite(seconds)) return;
-        if (seconds <= 0) {
-            hardLogout('server reported expired session');
-            return;
-        }
-        if (seconds < MIN_TTL_SEC) return;
-        const now = Date.now();
-        const candidateDeadline = now + seconds * 1000;
-        const storedDeadline = readDeadline();
-        // Set the hard deadline once. If the server reports an earlier expiration later,
-        // tighten the deadline. Never extend it through refresh-token based renewal.
-        const deadline = !storedDeadline || candidateDeadline < storedDeadline - 5000 ? candidateDeadline : storedDeadline;
-        if (deadline !== storedDeadline) writeDeadline(deadline);
-        if (now >= deadline) {
-            hardLogout('stored hard deadline reached');
-        } else {
-            scheduleHardLogout(deadline);
-        }
-    }
-    async function checkSession() {
-        if (logoutStarted) return;
-        if (isLoginPage()) {
-            clearStoredTokens();
-            clearAuthCookies();
-            return;
-        }
-        const storedDeadline = readDeadline();
-        if (storedDeadline && Date.now() >= storedDeadline) {
-            hardLogout('stored hard deadline reached');
-            return;
-        }
-        try {
-            const response = await fetch('./session?hard=1&ts=' + Date.now(), {
-                credentials: 'include',
-                cache: 'no-store',
-                headers: { Accept: 'application/json' },
-            });
-            if (!response.ok) return;
-            const session = await response.json();
-            if (typeof session.expireInSec === 'number') {
-                applyServerExpiration(session.expireInSec);
-            }
-        } catch (e) {
-            // During update/restart the endpoint can be unavailable. Do not logout just because of a network error.
-        }
-    }
-    function start() {
-        checkSession();
-        pollTimer = setInterval(checkSession, MIN_POLL_MS);
-        window.addEventListener('focus', checkSession, { passive: true });
-        document.addEventListener('visibilitychange', () => {
-            if (!document.hidden) checkSession();
-        });
-    }
-    window.NEXOWATT_EOS_HARD_LOGOUT = { version: VERSION, checkSession, hardLogout, clearStoredTokens, clearAuthCookies };
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', start, { once: true });
-    } else {
-        start();
-    }
+    // NexoWatt EOS v36: compatibility stub.
+    // The custom hard-logout timer was removed because it could expire sessions
+    // earlier than the configured admin TTL and broke native adapter dialogs.
+    // Session handling is now delegated to the same OAuth/session flow as the
+    // upstream ioBroker Admin.
+    const VERSION = '36';
+    function noop() {}
+    window.NEXOWATT_EOS_HARD_LOGOUT = {
+        version: VERSION,
+        checkSession: noop,
+        hardLogout: noop,
+        clearStoredTokens: noop,
+        clearAuthCookies: noop,
+        disabled: true,
+    };
 })();

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

@@ -220,6 +220,7 @@
     };
     const applyPolicyToDom = () => {
+        if (isAdapterConfigSurface()) return;
         const admin = isAdminUser();
         document.documentElement.classList.toggle('eos-security-admin-user', admin);
         document.documentElement.classList.toggle('eos-security-non-admin-user', !admin);
@@ -230,6 +231,8 @@
         hideEosSecuritySettingsForNonAdmins();
     };
+    const isAdapterConfigSurface = () => document.documentElement.classList.contains('eos-adapter-config-surface') || /Instanzeinstellungen:|Instance settings:|Geräteliste|Gerät hinzufügen|Gerät bearbeiten/i.test(document.body?.textContent || '');
     const scheduleApply = () => {
         if (state.scheduled) return;
         state.scheduled = true;
@@ -267,7 +270,7 @@
     document.addEventListener('click', event => {
         const target = event.target?.closest?.('button,[role="button"],a,[role="menuitem"],.MuiMenuItem-root');
-        if (!target || isAdminUser()) return;
+        if (!target || isAdminUser() || isAdapterConfigSurface()) return;
         const label = normalizeFlat(`${target.textContent || ''} ${target.getAttribute?.('title') || ''} ${target.getAttribute?.('aria-label') || ''}`);
         if (/loschen|delete|remove|deinstall|uninstall/.test(label)) {
             target.classList.add('eos-security-hidden-delete');

package/build/lib/web.js CHANGED Viewed

@@ -583,6 +583,16 @@ class Web {
             this.server.app.get('/version', (_req, res) => {
                 res.status(200).send(this.adapter.version);
             });
+            // v36: Repair stale/broken URLs generated by older EOS hard-logout builds.
+            this.server.app.use((req, res, next) => {
+                const requested = String(req.originalUrl || req.url || '');
+                if (/(?:%2f|%252f)(?:%23|%2523)|\/login\/|\/logout\/|hard=1/i.test(requested)
+                    && /index\.html|login|hard=1|origin=|%23|%2523/i.test(requested)) {
+                    res.redirect(this.LOGIN_PAGE);
+                    return;
+                }
+                next();
+            });
             // replace socket.io
             this.server.app.use((req, res, next) => {
                 const url = req.url.split('?')[0];
@@ -633,38 +643,12 @@ class Web {
                 this.server.app.use(cookieParser());
                 this.server.app.use(bodyParser.urlencoded({ extended: true }));
                 this.server.app.use(bodyParser.json());
-                // NexoWatt EOS: enforce the configured login timeout as a hard logout.
-                // We remove refresh tokens from OAuth responses so the admin client cannot silently extend sessions.
-                const eosHardLogout = false; // v35: keep OAuth refresh flow alive; hard timeout is enforced client-side by an absolute deadline.
-                if (eosHardLogout) {
-                    this.server.app.use('/oauth/token', (req, res, next) => {
-                        const grantType = String(req.body?.grant_type || '');
-                        if (req.method === 'POST' && grantType === 'refresh_token') {
-                            res.status(401).json({
-                                error: 'invalid_grant',
-                                error_description: 'EOS session expired. Please log in again.',
-                                eosHardLogout: true,
-                            });
-                            return;
-                        }
-                        const originalJson = res.json.bind(res);
-                        res.json = body => {
-                            if (body && typeof body === 'object' && body.access_token && body.expires_in) {
-                                const expiresIn = Math.max(1, Math.round(Number(body.expires_in) || Number(this.settings.ttl) || 3600));
-                                body.refresh_token = '';
-                                body.refresh_token_expires_in = expiresIn;
-                                body.eosHardLogout = true;
-                            }
-                            return originalJson(body);
-                        };
-                        next();
-                    });
-                }
+                // v36: OAuth/session handling intentionally follows upstream ioBroker Admin.
                 this.oauth2Model = (0, webserver_1.createOAuth2Server)(this.adapter, {
                     app: this.server.app,
                     secure: this.settings.secure,
                     accessLifetime: this.settings.ttl,
-                    refreshLifetime: this.settings.ttl,
+                    refreshLifetime: 60 * 60 * 24 * 7, // 1 week, same as upstream admin
                     noBasicAuth: this.settings.noBasicAuth,
                     loginPage: (req) => {
                         const isDev = req.url.includes('?dev');
@@ -676,44 +660,44 @@ class Web {
                     },
                 });
                 this.server.app.get('/session', (req, res) => {
-                    res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
-                    res.setHeader('Content-Type', 'application/json; charset=utf-8');
-                    if (!this.settings.auth) {
-                        res.json({ expireInSec: Math.max(120, this.settings.ttl || 3600), hardLogout: true, auth: false });
-                        return;
-                    }
-                    const tokenValue = this.readAccessTokenFromRequest(req);
-                    if (!tokenValue) {
-                        res.json({ expireInSec: 0, hardLogout: true, error: 'Cannot find session token' });
-                        return;
-                    }
-                    const candidates = new Set();
-                    candidates.add(tokenValue);
-                    candidates.add(tokenValue.startsWith('a:') ? tokenValue : `a:${tokenValue}`);
-                    if (tokenValue.length > 1) candidates.add(`a:${tokenValue[1]}`);
-                    const ids = Array.from(candidates);
-                    const readNext = (index) => {
-                        const id = ids[index];
-                        if (!id) {
-                            res.json({ expireInSec: 0, hardLogout: true, error: 'Cannot find session' });
+                    // v36: Follow upstream admin semantics again. Do not run a second
+                    // EOS hard-logout timer here; the official OAuth/session handling
+                    // already uses the configured access lifetime.
+                    if (req.headers.cookie) {
+                        const cookies = req.headers.cookie.split(';').find(c => c.trim().startsWith('access_token='));
+                        let tokenCookie = cookies?.split('=')[1];
+                        if (!tokenCookie && req.headers.authorization?.startsWith('Bearer ')) {
+                            tokenCookie = req.headers.authorization.split(' ')[1];
+                        }
+                        else if (!tokenCookie && req.query?.token) {
+                            tokenCookie = req.query.token;
+                        }
+                        if (tokenCookie) {
+                            const candidates = new Set();
+                            candidates.add(tokenCookie.startsWith('a:') ? tokenCookie : `a:${tokenCookie}`);
+                            if (tokenCookie.length > 1)
+                                candidates.add(`a:${tokenCookie[1]}`);
+                            const ids = Array.from(candidates);
+                            const readNext = (index) => {
+                                const id = ids[index];
+                                if (!id) {
+                                    res.json({ expireInSec: 0 });
+                                    return;
+                                }
+                                void this.adapter.getSession(id, (token) => {
+                                    if (!token?.user) {
+                                        readNext(index + 1);
+                                    }
+                                    else {
+                                        res.json({ expireInSec: Math.round((token.aExp - Date.now()) / 1000) });
+                                    }
+                                });
+                            };
+                            readNext(0);
                             return;
                         }
-                        void this.adapter.getSession(id, (token) => {
-                            if (!token?.user) {
-                                readNext(index + 1);
-                                return;
-                            }
-                            const now = Date.now();
-                            const expirations = [Number(token.aExp), Number(token.rExp), Number(token.expire), Number(token.expires), Number(token.expiresAt)].filter(value => Number.isFinite(value) && value > 0);
-                            const expiresAt = expirations.length ? Math.min(...expirations) : now + (this.settings.ttl || 3600) * 1000;
-                            res.json({
-                                expireInSec: Math.max(0, Math.floor((expiresAt - now) / 1000)),
-                                hardLogout: true,
-                                user: token.user,
-                            });
-                        });
-                    };
-                    readNext(0);
+                    }
+                    res.json({ error: 'Cannot find session' });
                 });
                 this.server.app.get(/.*\/nexowatt\/security\/(?:context|session)$/, (req, res) => {
                     void this.sendEosSecuritySession(req, res).catch(e => {

package/io-package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.35",
+    "version": "7.9.36",
     "titleLang": {
       "en": "NexoWatt EOS Admin",
       "de": "NexoWatt EOS Admin",
@@ -18,9 +18,13 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
+      "7.9.36": {
+        "en": "Restores official admin session handling, fixes bad login redirect paths, and enables full native adapter configuration compatibility without EOS overlays blocking adapter UI actions.",
+        "de": "Stellt die offizielle Admin-Sitzungslogik wieder her, korrigiert fehlerhafte Login-Redirect-Pfade und aktiviert volle native Adapter-Konfigurationskompatibilität ohne blockierende EOS-Overlays."
+      },
       "7.9.35": {
-        "en": "Fixed repository metadata for reliable EOS Admin updates and enforced hard logout after the configured login timeout.",
-        "de": "Repository-Metadaten für zuverlässige EOS-Admin-Updates korrigiert und harte Abmeldung nach der eingestellten Abmeldezeit erzwungen."
+        "en": "Fixes EOS Admin login redirect/logout origin handling and restores reliable interaction with adapter instance configuration dialogs.",
+        "de": "Korrigiert den EOS-Admin Login-/Logout-Redirect und stellt die Bedienung von Adapter-Instanzkonfigurationen wieder zuverlässig her."
       },
       "7.9.31": {
         "en": "UI cleanup: fixes EOS Security German text encoding, removes the logout tile next to the compact navigation arrow, and expands EOS Assist with AI-ready multi-path setup guidance.",
@@ -165,10 +169,6 @@
         "pl": "Rozszerzony plik konfiguracyjny JSON do adaptera fregata",
         "uk": "Розширений налаштування JSON для адаптера фригату",
         "zh-cn": "JSON 护卫舰适配器扩展配置"
-      },
-      "7.9.35": {
-        "en": "Fixes EOS Admin login redirect/logout origin handling and restores reliable interaction with adapter instance configuration dialogs.",
-        "de": "Korrigiert den EOS-Admin Login-/Logout-Redirect und stellt die Bedienung von Adapter-Instanzkonfigurationen wieder zuverlässig her."
       }
     },
     "desc": {
@@ -206,7 +206,7 @@
     "icon": "admin.svg",
     "messagebox": true,
     "enabled": true,
-    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.35/admin/admin.svg",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.36/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -217,7 +217,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.35/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.36/README.md",
     "authors": [
       "bluefox <bluefox@ccu.io>",
       "hobbyquaker <hq@ccu.io>"
@@ -286,7 +286,7 @@
     "nondeletable": false,
     "allowAdapterUpdate": true,
     "allowAdapterDelete": false,
-    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.35/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.36/io-package.json",
     "npmPackage": "iobroker.eos-admin"
   },
   "native": {

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.eos-admin",
   "description": "NexoWatt EOS Admin standalone interface for Energy Operation System",
-  "version": "7.9.35",
+  "version": "7.9.36",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",

package/public/404.html CHANGED Viewed

@@ -64,6 +64,18 @@
             color: #fff;
         }
     </style>
+<script id="NEXOWATT_EOS_BAD_PATH_FIX">
+(function () {
+  try {
+    var u = String(location.pathname + location.search + location.hash);
+    if (/(%2F%23|%252F%2523|hard=1|\/login\/|\/logout\/)/i.test(u)) {
+      location.replace('/index.html?login');
+    }
+  } catch (e) {}
+})();
+</script>
 </head>
 <body>

package/tools/nexowatt-validate-package.cjs CHANGED Viewed

@@ -56,8 +56,11 @@ if (!bootstrap.includes('window.adapterName="eos-admin"')) fail('frontend bootst
 if (bootstrap.includes('window.adapterName="admin"')) fail('frontend bootstrap still contains window.adapterName="admin"');
 const webBuild = fs.readFileSync(path.join(root, 'build/lib/web.js'), 'utf8');
-if (!webBuild.includes("body.refresh_token = '';")) fail('build/lib/web.js does not remove OAuth refresh tokens for hard logout');
-if (!webBuild.includes("grantType === 'refresh_token'")) fail('build/lib/web.js does not reject refresh_token grants');
-if (!webBuild.includes('refreshLifetime: this.settings.ttl')) fail('build/lib/web.js does not bind refresh lifetime to ttl');
+const branding = fs.readFileSync(path.join(root, 'adminWww/js/eos-branding.js'), 'utf8');
+if (!webBuild.includes('refreshLifetime: 60 * 60 * 24 * 7')) fail('build/lib/web.js must keep upstream-compatible refresh lifetime');
+if (!webBuild.includes('Follow upstream admin semantics again')) fail('build/lib/web.js does not contain the v36 session compatibility fix');
+if (index.includes('eos-hard-logout.js')) fail('adminWww/index.html must not load the removed custom hard-logout timer');
+if (!branding.includes('isAdapterConfigSurface')) fail('eos-branding.js lacks native adapter config safe-mode detection');
+if (!branding.includes('Adapter UIs must remain 100% functional')) fail('eos-branding.js lacks native adapter config interaction guard');
 console.log('[NexoWatt EOS package validation] OK');