iobroker.eos-admin 7.10.1 → 7.10.2

package/build/lib/eosPassword.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeEosPasswordTarget = normalizeEosPasswordTarget;
-exports.setEosUserPasswordWithVerification = setEosUserPasswordWithVerification;
-exports.verifyEosUserPasswordCredential = verifyEosUserPasswordCredential;
-function normalizeEosPasswordTarget(value) {
-    const raw = String(value || '').trim();
-    const userId = raw.startsWith('system.user.') ? raw : `system.user.${raw}`;
-    const userName = userId.replace(/^system\.user\./, '').trim();
-    if (!userName || userName.includes('.') || !/^system\.user\.[^.]+$/.test(userId)) throw new Error('invalidPasswordTarget');
-    return { userId, userName };
-}
-const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
-const accepted = result => result === true || (Array.isArray(result) && result[0] === true);
-async function readPasswordHash(adapter, userId) {
-    if (typeof adapter.getForeignObjectAsync !== 'function') return '';
-    try {
-        const object = await adapter.getForeignObjectAsync(userId);
-        return typeof object?.common?.password === 'string' ? object.common.password : '';
-    }
-    catch { return ''; }
-}
-async function callPasswordApi(adapter, target, password, serviceUser, withOptions) {
-    const options = withOptions ? { user: serviceUser } : null;
-    if (typeof adapter.setPasswordAsync === 'function') { await adapter.setPasswordAsync(target, password, options); return; }
-    if (typeof adapter.setPassword === 'function') {
-        await new Promise((resolve, reject) => adapter.setPassword?.(target, password, options, error => error ? reject(error) : resolve()));
-        return;
-    }
-    throw new Error('passwordApiUnavailable');
-}
-async function verifyAfterWrite(adapter, normalized, password, serviceUser) {
-    const hasCredentialCheck = typeof adapter.checkPasswordAsync === 'function';
-    for (let attempt = 0; attempt < 12; attempt++) {
-        if (hasCredentialCheck) {
-            for (const candidate of [normalized.userId, normalized.userName]) {
-                try {
-                    if (accepted(await adapter.checkPasswordAsync?.(candidate, password, { user: serviceUser }))) return;
-                }
-                catch { }
-            }
-        }
-        else if (await readPasswordHash(adapter, normalized.userId)) return;
-        if (attempt < 11) await delay(55 + attempt * 35);
-    }
-    throw new Error(hasCredentialCheck ? 'passwordVerificationFailed' : 'passwordNotPersisted');
-}
-async function verifyEosUserPasswordCredential(adapter, target, password, serviceUser = 'system.user.admin') {
-    const normalized = normalizeEosPasswordTarget(target);
-    await verifyAfterWrite(adapter, normalized, password, serviceUser);
-    return normalized;
-}
-async function setEosUserPasswordWithVerification(adapter, target, password, serviceUser = 'system.user.admin') {
-    const normalized = normalizeEosPasswordTarget(target);
-    const attempts = [
-        { apiTarget: normalized.userId, withOptions: true },
-        { apiTarget: normalized.userName, withOptions: true },
-        { apiTarget: normalized.userId, withOptions: false },
-        { apiTarget: normalized.userName, withOptions: false },
-    ];
-    let lastError = null;
-    for (const attempt of attempts) {
-        try {
-            await callPasswordApi(adapter, attempt.apiTarget, password, serviceUser, attempt.withOptions);
-            await verifyAfterWrite(adapter, normalized, password, serviceUser);
-            return { ...normalized, apiTarget: attempt.apiTarget };
-        }
-        catch (error) { lastError = error; }
-    }
-    if (lastError instanceof Error) throw lastError;
-    throw new Error('passwordNotPersisted');
-}

package/build/lib/nexowattStableAuth.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startNexowattStableAuth = startNexowattStableAuth;
-const START_PASSWORD = 'nexowatt';
-const MARKER_KEYS = ["eosFirstLoginPending", "eosMustChangePassword", "eosPasswordSetupRequired", "firstLoginRequired", "mustChangePassword", "nexowattFirstLoginPending", "nexowattMustChangePassword", "nexowattPasswordSetupRequired", "passwordChangeRequired"];
-const timers = new WeakMap();
-function pendingByNative(native) {
-    if (!native || typeof native !== 'object') return false;
-    return MARKER_KEYS.some(key => native[key] === true || native[key] === 'pending' || native[key] === 'required' || native[key] === 'starter');
-}
-async function setPassword(adapter, user, password) {
-    if (typeof adapter.setPasswordAsync === 'function') return adapter.setPasswordAsync(user, password, { user: 'system.user.admin' });
-    return new Promise((resolve, reject) => adapter.setPassword(user, password, { user: 'system.user.admin' }, err => err ? reject(err) : resolve()));
-}
-async function ensureGroupMembership(adapter, userId, groupId) {
-    const group = await adapter.getForeignObjectAsync(groupId);
-    if (!group || group.type !== 'group') return;
-    group.common = group.common || { name: groupId.split('.').pop(), members: [] };
-    group.common.members = Array.isArray(group.common.members) ? group.common.members : [];
-    if (!group.common.members.includes(userId)) {
-        group.common.members.push(userId);
-        await adapter.setForeignObjectAsync(groupId, group, { user: 'system.user.admin' });
-    }
-}
-async function createUser(adapter, name) {
-    const id = `system.user.${name}`;
-    await adapter.setForeignObjectAsync(id, {
-        _id: id, type: 'user',
-        common: { name, enabled: true, password: '' },
-        native: { nexowattManagedAccount: true, nexowattMustChangePassword: true, nexowattPasswordState: 'starter' }
-    }, { user: 'system.user.admin' });
-    return adapter.getForeignObjectAsync(id);
-}
-async function prepareOne(adapter, name, group, createMissing) {
-    const id = `system.user.${name}`;
-    let obj = await adapter.getForeignObjectAsync(id);
-    let created = false;
-    if (!obj && createMissing) { obj = await createUser(adapter, name); created = true; }
-    if (!obj || obj.type !== 'user') return;
-    obj.native = obj.native || {};
-    const empty = !obj.common || !obj.common.password;
-    const pending = created || empty || pendingByNative(obj.native) || obj.native.nexowattPasswordState === 'starter';
-    if (pending) {
-        await setPassword(adapter, name, START_PASSWORD);
-        obj = await adapter.getForeignObjectAsync(id) || obj;
-        obj.native = obj.native || {};
-        obj.native.nexowattManagedAccount = true;
-        obj.native.nexowattStarterPasswordActive = true;
-        obj.native.nexowattMustChangePassword = true;
-        obj.native.nexowattPasswordState = 'starter';
-        obj.native.nexowattStarterPasswordUpdatedAt = new Date().toISOString();
-        for (const key of MARKER_KEYS) {
-            if (/required|must|pending|first/i.test(key)) obj.native[key] = true;
-        }
-        await adapter.setForeignObjectAsync(id, obj, { user: 'system.user.admin' });
-    }
-    await ensureGroupMembership(adapter, id, group);
-}
-async function reconcile(adapter) {
-    try {
-        await prepareOne(adapter, 'installer', 'system.group.installer', true);
-        const guest = await adapter.getForeignObjectAsync('system.user.guest');
-        const user = await adapter.getForeignObjectAsync('system.user.user');
-        if (guest || !user) await prepareOne(adapter, 'guest', 'system.group.endkunden', true);
-        if (user) await prepareOne(adapter, 'user', 'system.group.endkunden', false);
-    } catch (e) { adapter.log.warn(`[NexoWatt EOS login] Starter-account reconciliation failed: ${e && e.message || e}`); }
-}
-function startNexowattStableAuth(adapter) {
-    if (timers.has(adapter)) return;
-    void reconcile(adapter);
-    const timer = setInterval(() => void reconcile(adapter), 5000);
-    if (timer.unref) timer.unref();
-    timers.set(adapter, timer);
-}

package/tools/nexowatt-stable-v7101-selftest.cjs

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-const fs=require('node:fs'),path=require('node:path');const root=path.resolve(__dirname,'..');const read=r=>fs.readFileSync(path.join(root,r),'utf8');const j=r=>JSON.parse(read(r));const must=(v,m)=>{if(!v){console.error('[NexoWatt EOS stable v7101] '+m);process.exit(1)}};
-const p=j('package.json'),io=j('io-package.json'),info=j('NEXOWATT_EOS_BUILD_INFO.json'),main=read('src/main.ts'),boot=read('adminWww/js/eos-role-bootstrap.js'),role=read('adminWww/js/eos-role-ui.js'),css=read('adminWww/css/nexowatt-native-shell.css'),index=read('adminWww/index.html'),ems=read('adminWww/js/eos-ems-overview.js'),intro=read('src-admin/src/tabs/Intro.tsx'),bundle=read('adminWww/assets/Intro-DkwRiz1n-v84.js'),stable=read('adminWww/static/js/nexowatt-stable-v7101.js'),auto=read('src/lib/eosAutoUpdate.ts');
-must(p.version==='7.10.1'&&io.version==='7.10.1'&&io.common.version==='7.10.1'&&info.version==='7.10.1','version drift');
-must(io.native.eosRequireFirstLoginPassword===false&&io.native.eosRequireFirstLoginPasswordChange===false,'forced first password still enabled');
-must(!index.includes('eos-account-management.js'),'custom reset UI still loaded');
-must(!boot.includes('installIntegratedFirstLogin(base);')&&!boot.includes('showFirstLoginPassword(resolved, base);'),'forced first-login UI still active');
-must(main.includes('standardPasswordMode: true')&&main.includes('nexowattPasswordChangeRequired: false'),'account migration missing');
-must(role.includes("route === 'tab-users'")&&main.includes("command === 'changePassword'"),'role-aware native password editing missing');
-must(css.includes('persistent native overview scrolling')&&stable.includes("overflow-y','scroll"),'persistent scroll missing');
-must(intro.includes('eos-overview-edit-controls')&&bundle.includes('eos-overview-edit-controls'),'edit control not in bottom grid');
-must(!ems.includes('Vollständige EMS-Diagnose öffnen'),'unsupported EMS link remains');
-must(index.includes('eos-auto-update.js?v=7101')&&auto.includes("const POLICY: NexoWattAutoUpdatePolicy = 'major'"),'auto update missing');
-console.log('[NexoWatt EOS stable v7101] OK');