npm - iobroker.eos-admin - Versions diffs - 7.9.32 → 7.9.34 - Mend

iobroker.eos-admin 7.9.32 → 7.9.34

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

package/adminWww/assets/Adapters-B5_jQ7DE.js +2 -2
package/adminWww/assets/bootstrap-COulQZax.js +1 -1
package/adminWww/css/eos-branding.css +55 -0
package/adminWww/index.html +6 -5
package/adminWww/js/eos-assistant.js +1 -1
package/adminWww/js/eos-branding.js +75 -1
package/adminWww/js/eos-hard-logout.js +163 -0
package/build/lib/web.js +75 -23
package/docs/NEXOWATT_EOS_UI_V33_ASSIST_POSITION_DE.md +11 -0
package/docs/NEXOWATT_EOS_UI_V34_UPDATE_HARD_LOGOUT_DE.md +23 -0
package/io-package.json +8 -8
package/package.json +1 -1
package/tools/nexowatt-validate-package.cjs +14 -0

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=32" />
+        <link rel="stylesheet" href="./css/eos-branding.css?v=34" />
         <link
             rel="manifest"
             href="manifest.json"
@@ -154,12 +154,13 @@
       <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=32"></script>
-            <script defer src="./js/eos-security-ui.js?v=32"></script>
-            <script defer src="./js/eos-assistant.js?v=32"></script>
+            <script defer src="./js/eos-branding.js?v=34"></script>
+            <script defer src="./js/eos-security-ui.js?v=34"></script>
+            <script defer src="./js/eos-hard-logout.js?v=34"></script>
+            <script defer src="./js/eos-assistant.js?v=34"></script>
     </head>
     <body>
         <noscript>You need to enable JavaScript to run this app.</noscript>
         <div id="root"></div>
-    </body>
+</body>
 </html>

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

@@ -2,5 +2,5 @@
     'use strict';
     // v31: EOS Assist is rendered by eos-branding.js so it can share route/security state.
     // This file stays as a lightweight compatibility hook for cache-safe deployments.
-    window.NEXOWATT_EOS_ASSIST_VERSION = 'v31-integrated-ai-ready';
+    window.NEXOWATT_EOS_ASSIST_VERSION = 'v33-assist-position-fix';
 })();

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

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
-    window.NEXOWATT_EOS_UI_VERSION = 'v32-nav-toggle-tile-fix';
+    window.NEXOWATT_EOS_UI_VERSION = 'v33-assist-position-fix';
     const BRAND = 'NexoWatt EOS';
     const EOS_MEANING = 'Energy Operation System';
@@ -510,6 +510,78 @@
         window.location.assign(cleanRoot);
     };
+    let hardLogoutTimer = 0;
+    let hardLogoutPollTimer = 0;
+    let hardLogoutInstalled = false;
+    const clearAuthStorage = () => safe(() => {
+        const storageKeys = [
+            'App.refreshToken', 'App.accessToken', 'App.token', 'tokens', 'iobroker.admin.token',
+            'access_token', 'refresh_token', 'oidc_id_token', 'oidc_access_token', 'oidc_refresh_token'
+        ];
+        storageKeys.forEach(key => {
+            window.localStorage?.removeItem(key);
+            window.sessionStorage?.removeItem(key);
+            window._localStorage?.removeItem?.(key);
+        });
+        ['access_token', 'refresh_token', 'connect.sid', 'io', 'sid'].forEach(name => {
+            document.cookie = `${name}=; Max-Age=0; path=/; SameSite=Lax`;
+            document.cookie = `${name}=; Max-Age=0; path=${new URL(ASSET_BASE).pathname || '/'}; SameSite=Lax`;
+        });
+    });
+    const hardLogout = () => {
+        clearAuthStorage();
+        const loginUrl = new URL('index.html?login', ASSET_BASE);
+        loginUrl.searchParams.set('eosLogout', 'timeout');
+        window.location.replace(loginUrl.href);
+    };
+    const scheduleHardLogoutCheck = delay => {
+        if (hardLogoutPollTimer) window.clearTimeout(hardLogoutPollTimer);
+        hardLogoutPollTimer = window.setTimeout(checkHardLogoutSession, Math.max(1000, delay || 15000));
+    };
+    async function checkHardLogoutSession() {
+        if (isLoginView() || !document.getElementById('app-paper')) {
+            scheduleHardLogoutCheck(10000);
+            return;
+        }
+        try {
+            const response = await fetch(new URL('session', ASSET_BASE).href, {
+                credentials: 'same-origin',
+                cache: 'no-store',
+                headers: { accept: 'application/json' },
+            });
+            const data = await response.json().catch(() => ({}));
+            const expireInSec = Number(data?.expireInSec);
+            if (Number.isFinite(expireInSec) && expireInSec <= 0) {
+                hardLogout();
+                return;
+            }
+            if (Number.isFinite(expireInSec) && expireInSec > 0) {
+                if (hardLogoutTimer) window.clearTimeout(hardLogoutTimer);
+                hardLogoutTimer = window.setTimeout(hardLogout, Math.max(1200, expireInSec * 1000 + 500));
+                scheduleHardLogoutCheck(Math.min(Math.max(5000, expireInSec * 500), 30000));
+                return;
+            }
+        } catch (_) {
+            // Network reconnects happen during updates/restarts. Do not log out on a transient request failure.
+        }
+        scheduleHardLogoutCheck(30000);
+    }
+    const installHardLogoutWatchdog = () => {
+        if (hardLogoutInstalled) return;
+        hardLogoutInstalled = true;
+        window.addEventListener('focus', () => checkHardLogoutSession(), { passive: true });
+        document.addEventListener('visibilitychange', () => {
+            if (!document.hidden) checkHardLogoutSession();
+        }, { passive: true });
+        scheduleHardLogoutCheck(2500);
+    };
     const ensureBrandBadge = toolbar => {
         if (!toolbar) return;
         document.querySelectorAll('.eos-brand-badge').forEach(existing => {
@@ -1104,6 +1176,7 @@
         ensureStandaloneNavToggle();
         installAssistDelegatedClick();
         ensureEosAssist();
+        installHardLogoutWatchdog();
         ensureRightsHelper();
         ensurePermissionPresets();
         ensureSettingsDialogClasses();
@@ -1125,6 +1198,7 @@
         ensureStandaloneNavToggle();
         installAssistDelegatedClick();
         ensureEosAssist();
+        installHardLogoutWatchdog();
         ensureRightsHelper();
         ensurePermissionPresets();
         ensureSettingsDialogClasses();

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

@@ -0,0 +1,163 @@
+(function () {
+    'use strict';
+    const LOG_PREFIX = '[NexoWatt EOS hard logout]';
+    const VERSION = '34';
+    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}:${location.pathname.split('/')[1] || '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 origin = encodeURIComponent((window.location.pathname || '/') + (window.location.search || '') + (window.location.hash || ''));
+        window.location.href = './logout?origin=' + origin + '&hard=1';
+    }
+    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();
+    }
+})();

package/build/lib/web.js CHANGED Viewed

@@ -450,12 +450,18 @@ class Web {
         if (!token && req.query?.token) token = req.query.token;
         if (!token) return null;
         try {
-            return decodeURIComponent(token);
+            token = decodeURIComponent(token);
         }
         catch {
-            return token;
+            // keep raw token
         }
+        token = token.trim();
+        if (token.startsWith('Bearer ')) token = token.substring('Bearer '.length).trim();
+        if (token.startsWith('s:')) token = token.substring(2);
+        if (token.includes('.') && !token.startsWith('eyJ')) token = token.substring(0, token.indexOf('.'));
+        return token || null;
     }
     readSession(id) {
         return new Promise(resolve => this.adapter.getSession(id, token => resolve(token)));
     }
@@ -576,11 +582,38 @@ 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 = this.adapter.config.nexowattHardLogout !== false;
+                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();
+                    });
+                }
                 this.oauth2Model = (0, webserver_1.createOAuth2Server)(this.adapter, {
                     app: this.server.app,
                     secure: this.settings.secure,
                     accessLifetime: this.settings.ttl,
-                    refreshLifetime: 60 * 60 * 24 * 7, // 1 week (Maybe adjustable?)
+                    refreshLifetime: this.settings.ttl,
                     noBasicAuth: this.settings.noBasicAuth,
                     loginPage: (req) => {
                         const isDev = req.url.includes('?dev');
@@ -598,28 +631,44 @@ class Web {
                     },
                 });
                 this.server.app.get('/session', (req, res) => {
-                    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) {
-                            void this.adapter.getSession(`a:${tokenCookie[1]}`, (token) => {
-                                if (!token?.user) {
-                                    res.json({ expireInSec: 0 });
-                                }
-                                else {
-                                    res.json({ expireInSec: Math.round((token.aExp - Date.now()) / 1000) });
-                                }
-                            });
+                    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' });
                             return;
                         }
-                    }
-                    res.json({ error: 'Cannot find session' });
+                        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);
                 });
                 this.server.app.get(/.*\/nexowatt\/security\/(?:context|session)$/, (req, res) => {
                     void this.sendEosSecuritySession(req, res).catch(e => {
@@ -648,6 +697,9 @@ class Web {
                             origin = origin.substring(0, pos);
                         }
                     }
+                    for (const cookieName of ['access_token', 'refresh_token', 'connect.sid', 'io', 'ioBroker.sid', 'eos-admin.sid']) {
+                        res.clearCookie(cookieName, { path: '/' });
+                    }
                     if (isDev) {
                         res.redirect('http://127.0.0.1:3000/index.html?login');
                     }

package/docs/NEXOWATT_EOS_UI_V33_ASSIST_POSITION_DE.md ADDED Viewed

@@ -0,0 +1,11 @@
+# NexoWatt EOS Admin v33 – EOS Assist Position
+Diese Version verschiebt den EOS Assist Launcher weiter nach links, damit der Bereich unten rechts für den Seiten-Einstellbutton, Floating-Action-Buttons und Slider frei bleibt.
+## Änderungen
+- Version auf `7.9.33` erhöht.
+- EOS Assist bleibt unten rechts sichtbar, sitzt aber mit Sicherheitsabstand zum rechten Rand.
+- Der native Seiten-Einstellbutton und andere Floating-Action-Buttons erhalten eine höhere Bedienpriorität.
+- Mobile Ansicht berücksichtigt kleinere Abstände.
+- Keine Backend-, MCP- oder Server-Abhängigkeiten geändert.

package/docs/NEXOWATT_EOS_UI_V34_UPDATE_HARD_LOGOUT_DE.md ADDED Viewed

@@ -0,0 +1,23 @@
+# NexoWatt EOS Admin v34
+## Zweck
+Version 7.9.34 korrigiert zwei produktive Punkte:
+1. Repository-/Update-Metadaten zeigen vollständig auf die aktuelle npm-Version.
+2. Die konfigurierte Abmeldezeit wird als harte Sitzungslaufzeit erzwungen.
+## Update-Fix
+In vorherigen Paketen konnten `common.meta`, `common.extIcon` und `common.readme` noch auf ältere unpkg-Versionen zeigen. Das konnte dazu führen, dass das Repository zwar eine neue Version anzeigt, der Admin beim Aktualisieren aber alte Metadaten nachlädt.
+v34 setzt diese Felder synchron auf `7.9.34`.
+## Harte Abmeldung
+Der Upstream-Admin-Client verlängert OAuth-Tokens normalerweise automatisch. Für EOS wird das deaktiviert:
+- erfolgreiche OAuth-Responses enthalten keinen nutzbaren Refresh-Token mehr,
+- alte Refresh-Token-Versuche werden mit `401 invalid_grant` beantwortet,
+- der Client muss nach Ablauf der eingestellten Abmeldezeit neu anmelden.

package/io-package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.32",
+    "version": "7.9.34",
     "titleLang": {
       "en": "NexoWatt EOS Admin",
       "de": "NexoWatt EOS Admin",
@@ -18,6 +18,10 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
+      "7.9.34": {
+        "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."
+      },
       "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.",
         "de": "UI-Feinschliff: korrigiert deutsche EOS-Sicherheitsbeschriftungen, entfernt die Abmelden-Kachel neben dem Kompaktpfeil und erweitert EOS Assist um KI-bereite Mehrwege-Einrichtungshilfe."
@@ -161,10 +165,6 @@
         "pl": "Rozszerzony plik konfiguracyjny JSON do adaptera fregata",
         "uk": "Розширений налаштування JSON для адаптера фригату",
         "zh-cn": "JSON 护卫舰适配器扩展配置"
-      },
-      "7.9.32": {
-        "en": "Fixed the EOS navigation compact toggle: the decorative left tile was removed while the arrow button remains visible and usable.",
-        "de": "EOS Navigationsumschalter korrigiert: Die dekorative linke Kachel wurde entfernt, der Pfeilbutton bleibt sichtbar und nutzbar."
       }
     },
     "desc": {
@@ -202,7 +202,7 @@
     "icon": "admin.svg",
     "messagebox": true,
     "enabled": true,
-    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.30/admin/admin.png",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.34/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -213,7 +213,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.30/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.34/README.md",
     "authors": [
       "bluefox <bluefox@ccu.io>",
       "hobbyquaker <hq@ccu.io>"
@@ -282,7 +282,7 @@
     "nondeletable": false,
     "allowAdapterUpdate": true,
     "allowAdapterDelete": false,
-    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.30/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.34/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.32",
+  "version": "7.9.34",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",

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

@@ -22,6 +22,15 @@ if (io.common.stopBeforeUpdate !== false) fail('io-package common.stopBeforeUpda
 if (io.common.dontDelete === true) fail('io-package common.dontDelete must not be true because it blocks clean updates');
 if (io.common.nondeletable === true) fail('io-package common.nondeletable must not be true because it blocks updates');
+const expectedBase = `https://unpkg.com/iobroker.eos-admin@${pkg.version}`;
+for (const [field, expected] of Object.entries({
+  extIcon: `${expectedBase}/admin/admin.svg`,
+  readme: `${expectedBase}/README.md`,
+  meta: `${expectedBase}/io-package.json`,
+})) {
+  if (io.common[field] !== expected) fail(`io-package common.${field} must be ${expected}, got ${io.common[field]}`);
+}
 for (const file of [
   'adminWww/index.html',
   'adminWww/js/eos-branding.js',
@@ -46,4 +55,9 @@ const bootstrap = bootstrapFiles.map(f => fs.readFileSync(path.join(root, 'admin
 if (!bootstrap.includes('window.adapterName="eos-admin"')) fail('frontend bootstrap does not set window.adapterName="eos-admin"');
 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');
 console.log('[NexoWatt EOS package validation] OK');