iobroker.eos-admin 7.9.26 → 7.9.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.eos-admin",
   "description": "NexoWatt EOS Admin standalone interface for Energy Operation System",
-  "version": "7.9.26",
+  "version": "7.9.28",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",
@@ -41,7 +41,6 @@
     "express": "^5.2.1",
     "express-fileupload": "^1.5.2",
     "express-session": "^1.19.0",
-    "iobroker.mcp": "^1.0.0",
     "json5": "^2.2.3",
     "mime": "^3.0.0",
     "semver": "^7.8.3"
@@ -102,7 +101,8 @@
     "tools/nexowatt-generate-repo-entry.cjs",
     "tools/nexowatt-patch-repo.cjs",
     "NEXOWATT_EOS_STANDALONE.md",
-    "tools/nexowatt-generate-eos-admin-repo-entry.cjs"
+    "tools/nexowatt-generate-eos-admin-repo-entry.cjs",
+    "tools/nexowatt-repair-eos-admin-update.cjs"
   ],
   "scripts": {
     "npm": "npm i -f && cd src-admin && npm i -f",
@@ -135,7 +135,8 @@
     "update-packages": "npx -y npm-check-updates --upgrade && cd src-admin && npx -y npm-check-updates --upgrade",
     "check:eos-package": "node tools/nexowatt-validate-package.cjs",
     "nexowatt:repo-entry": "node tools/nexowatt-generate-repo-entry.cjs",
-    "nexowatt:patch-repo": "node tools/nexowatt-patch-repo.cjs"
+    "nexowatt:patch-repo": "node tools/nexowatt-patch-repo.cjs",
+    "nexowatt:repair-update": "node tools/nexowatt-repair-eos-admin-update.cjs"
   },
   "author": "NexoWatt",
   "private": false,

package/tools/nexowatt-generate-eos-admin-repo-entry.cjs

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
+'use strict';
 const pkg = require('../package.json');
 const io = require('../io-package.json');
 const version = io.common.version || pkg.version;
-const base = process.argv[2] || 'https://iobroker.live/repo/eos-admin';
+const base = (process.argv[2] || `https://unpkg.com/iobroker.eos-admin@${version}`).replace(/\/$/, '');
 const entry = {
   'eos-admin': {
     name: 'eos-admin',
@@ -10,8 +11,26 @@ const entry = {
     title: 'NexoWatt EOS Admin',
     titleLang: io.common.titleLang,
     desc: io.common.desc,
+    news: io.common.news,
     meta: `${base}/io-package.json`,
-    icon: /unpkg\.com\/iobroker\.eos-admin@/i.test(base) ? `${base}/admin/admin.png` : `${base}/admin.png`
+    icon: `${base}/admin/admin.png`,
+    extIcon: `${base}/admin/admin.svg`,
+    type: io.common.type || 'general',
+    mode: io.common.mode || 'daemon',
+    platform: io.common.platform || 'Javascript/Node.js',
+    connectionType: io.common.connectionType || 'local',
+    dataSource: io.common.dataSource || 'push',
+    adminUI: io.common.adminUI || { config: 'json' },
+    license: io.common.license || 'NexoWatt Proprietary',
+    licenseInformation: io.common.licenseInformation,
+    dependencies: io.common.dependencies || [{ 'js-controller': '>=6.0.11' }],
+    stopBeforeUpdate: false,
+    dontDelete: false,
+    nondeletable: false,
+    readme: `${base}/README.md`,
+    npmPackage: 'iobroker.eos-admin',
+    allowAdapterUpdate: true,
+    allowAdapterDelete: false,
   }
 };
 console.log(JSON.stringify(entry, null, 2));

package/tools/nexowatt-generate-repo-entry.cjs

@@ -1,33 +1,3 @@
 #!/usr/bin/env node
 'use strict';
-
-const pkg = require('../package.json');
-const io = require('../io-package.json');
-
-if (pkg.name !== 'iobroker.eos-admin') {
-  throw new Error(`Unexpected package name: ${pkg.name}`);
-}
-if (!io.common || io.common.name !== 'eos-admin') {
-  throw new Error('io-package.json common.name must be eos-admin for the standalone EOS Admin adapter');
-}
-if (pkg.version !== io.common.version) {
-  throw new Error(`Version mismatch: package.json=${pkg.version}, io-package=${io.common.version}`);
-}
-
-const defaultBaseUrl = `https://unpkg.com/${pkg.name}@${pkg.version}`;
-const baseUrl = (process.argv[2] || defaultBaseUrl).replace(/\/$/, '');
-const iconUrl = /\/admin$/i.test(baseUrl) ? `${baseUrl}/admin.png` : `${baseUrl}/admin/admin.png`;
-
-const entry = {
-  'eos-admin': {
-    name: 'eos-admin',
-    version: pkg.version,
-    title: 'NexoWatt EOS Admin',
-    titleLang: io.common.titleLang,
-    desc: io.common.desc,
-    meta: `${baseUrl}/io-package.json`,
-    icon: iconUrl
-  }
-};
-
-console.log(JSON.stringify(entry, null, 2));
+require('./nexowatt-generate-eos-admin-repo-entry.cjs');

package/tools/nexowatt-patch-repo.cjs

@@ -1,30 +1,53 @@
 #!/usr/bin/env node
 'use strict';
-
 const fs = require('fs');
+const path = require('path');
 const input = process.argv[2];
 const output = process.argv[3] || input;
 const version = process.argv[4] || require('../package.json').version;
 const baseUrl = (process.argv[5] || `https://unpkg.com/iobroker.eos-admin@${version}`).replace(/\/$/, '');
-
 if (!input) {
   console.error('Usage: node tools/nexowatt-patch-repo.cjs <repo-nexowatt.json> [output.json] [version] [base-url]');
   process.exit(2);
 }
-
-const io = require('../io-package.json');
 const repo = JSON.parse(fs.readFileSync(input, 'utf8'));
+const ioPath = path.join(__dirname, '..', 'io-package.json');
+const io = JSON.parse(fs.readFileSync(ioPath, 'utf8'));
 repo['eos-admin'] = {
   ...(repo['eos-admin'] || {}),
   name: 'eos-admin',
   version,
   title: 'NexoWatt EOS Admin',
   titleLang: io.common.titleLang,
-  desc: io.common.desc,
+  desc: {
+    de: 'Eigenständige NexoWatt EOS Administrationsoberfläche mit zuverlässigem In-App-Updatepfad für Energy Operation System Installationen.',
+    en: 'Standalone NexoWatt EOS administration interface with reliable in-app update flow for Energy Operation System installations.',
+  },
+  news: io.common.news,
   meta: `${baseUrl}/io-package.json`,
-  icon: /\/admin$/i.test(baseUrl) ? `${baseUrl}/admin.png` : `${baseUrl}/admin/admin.png`
+  icon: `${baseUrl}/admin/admin.png`,
+  extIcon: `${baseUrl}/admin/admin.svg`,
+  type: 'general',
+  mode: 'daemon',
+  platform: 'Javascript/Node.js',
+  connectionType: 'local',
+  dataSource: 'push',
+  adminUI: { config: 'json' },
+  license: 'NexoWatt Proprietary',
+  licenseInformation: io.common.licenseInformation,
+  dependencies: [{ 'js-controller': '>=6.0.11' }],
+  stopBeforeUpdate: false,
+  dontDelete: false,
+  nondeletable: false,
+  readme: `${baseUrl}/README.md`,
+  npmPackage: 'iobroker.eos-admin',
+  allowAdapterUpdate: true,
+  allowAdapterDelete: false,
 };
-
 fs.writeFileSync(output, JSON.stringify(repo, null, 2) + '\n');
 console.log(`Patched ${input} -> ${output}`);
-console.log(`repo["eos-admin"].version=${repo['eos-admin'].version}`);
+console.log(`repo["eos-admin"].version=${version}`);
+console.log(`repo["eos-admin"].meta=${repo['eos-admin'].meta}`);
+console.log('repo["eos-admin"].stopBeforeUpdate=false');
+console.log('repo["eos-admin"].dontDelete=false');
+console.log('repo["eos-admin"].nondeletable=false');

package/tools/nexowatt-repair-eos-admin-update.cjs

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+'use strict';
+/** Repair installed EOS Admin flags that can block in-app updates from older builds. */
+const cp = require('node:child_process');
+function run(cmd) {
+  console.log(`$ ${cmd}`);
+  cp.execFileSync('/bin/sh', ['-lc', cmd], { stdio: 'inherit' });
+}
+run('iobroker object set system.adapter.eos-admin common.stopBeforeUpdate=false || true');
+run('iobroker object set system.adapter.eos-admin common.dontDelete=false || true');
+run('iobroker object set system.adapter.eos-admin common.nondeletable=false || true');
+run('iobroker object set system.adapter.eos-admin.0 common.dontDelete=false || true');
+run('iobroker object set system.adapter.eos-admin.0 common.nondeletable=false || true');
+console.log('EOS Admin update flags repaired. Deletion protection remains enforced by EOS ACL/UI guard, while updates stay possible.');
+console.log('Next: iobroker upgrade eos-admin https://iobroker.live/repo/repo-nexowatt.json');

package/tools/nexowatt-validate-package.cjs

@@ -18,6 +18,9 @@ if (pkg.private !== false) fail('package.json private must be false for npm publ
 if (pkg.version !== io.common.version) fail(`package.json and io-package.json versions differ: ${pkg.version} vs ${io.common.version}`);
 if (io.common.name !== 'eos-admin') fail(`io-package common.name must be eos-admin, got ${io.common.name}`);
 if (io.native.port !== 8091 && io.native.port !== 8081) fail(`unexpected default port ${io.native.port}`);
+if (io.common.stopBeforeUpdate !== false) fail('io-package common.stopBeforeUpdate must be false so EOS Admin can self-update from older UI builds');
+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');
 
 for (const file of [
   'adminWww/index.html',