iobroker.eos-admin 7.9.93 → 7.9.96
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.
- package/INSTALL_TEST_V7.9.96.md +11 -0
- package/MERGE_UPDATE_README_V7.9.96.md +5 -0
- package/NEXOWATT_EOS_BUILD_INFO.json +19 -19
- package/NexoWatt_EOS_Admin_EMS_OVERVIEW_MERGE_VALIDATION.md +44 -0
- package/PUBLISH_STABLE_V7.9.96.md +10 -0
- package/RC73_EOS_ADMIN_MERGE_VALIDATION.md +78 -0
- package/README_EMS_OVERVIEW_MERGE.md +45 -0
- package/README_STABILITY_V7.9.96.md +11 -0
- package/RELEASE_ACCEPTANCE_V7.9.96.md +10 -0
- package/RELEASE_NOTES_V7.9.96.md +12 -0
- package/VALIDATION_EMS_OVERVIEW_MERGE.md +35 -0
- package/adminWww/assets/Adapters-B5_jQ7DE-v84.js +1 -1
- package/adminWww/assets/Intro-DkwRiz1n-v84.js +2 -2
- package/adminWww/assets/index-D2ymscJA-v84.js +1 -1
- package/adminWww/css/eos-ems-overview.css +62 -0
- package/adminWww/css/nexowatt-native-shell.css +104 -158
- package/adminWww/index.html +15 -11
- package/adminWww/js/eos-account-management.js +1 -1
- package/adminWww/js/eos-assistant.js +5 -556
- package/adminWww/js/eos-basic-settings.js +1 -1
- package/adminWww/js/eos-branding-sanitizer.js +1 -3
- package/adminWww/js/eos-ems-overview.js +140 -0
- package/adminWww/js/eos-native-security.js +1 -1
- package/adminWww/js/eos-policy-client.js +1 -1
- package/adminWww/js/eos-role-bootstrap.js +4 -4
- package/adminWww/js/eos-role-ui.js +34 -38
- package/adminWww/js/nexowatt-native-shell.js +11 -6
- package/adminWww/static/js/nexowatt-stable-login.js +79 -0
- package/adminWww/static/js/nexowatt-stable-v96.js +82 -0
- package/build/lib/chat/assistantKnowledge.js +6 -21
- package/build/lib/chat/chatOrchestrator.js +38 -33
- package/build/lib/chat/mcpClientManager.js +1 -1
- package/build/lib/nexowattStableAuth.js +74 -0
- package/build/lib/web.js +24 -7
- package/build/main.js +123 -308
- package/io-package.json +25 -16
- package/package.json +32 -15
- package/tools/nexowatt-account-management-selftest.cjs +2 -3
- package/tools/nexowatt-apply-ems-overview.cjs +115 -0
- package/tools/nexowatt-clean-legacy-runtime.cjs +4 -0
- package/tools/nexowatt-ems-overview-selftest.cjs +35 -0
- package/tools/nexowatt-internal-reserve-selftest.cjs +1 -3
- package/tools/nexowatt-login-layout-selftest.cjs +43 -22
- package/tools/nexowatt-merge-update-selftest.cjs +69 -0
- package/tools/nexowatt-modern-ui-selftest.cjs +4 -5
- package/tools/nexowatt-stable-v96-selftest.cjs +13 -0
- package/tools/nexowatt-sync-release-version.cjs +181 -0
- package/tools/nexowatt-ui-overview-runtime-selftest.cjs +16 -0
- package/tools/nexowatt-validate-package.cjs +41 -10
- package/tools/nexowatt-version-sync-selftest.cjs +86 -0
- package/INSTALL_TEST_V7.9.93.md +0 -12
- package/PUBLISH_STABLE_V7.9.93.md +0 -19
- package/README_STABILITY_V7.9.93.md +0 -15
- package/RELEASE_ACCEPTANCE_V7.9.93.md +0 -15
- package/RELEASE_NOTES_V7.9.93.md +0 -10
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
'use strict';
|
|
3
|
+
|
|
4
|
+
const fs = require('node:fs');
|
|
5
|
+
const path = require('node:path');
|
|
6
|
+
|
|
7
|
+
function readJson(file) {
|
|
8
|
+
return JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
function writeJson(file, value) {
|
|
12
|
+
fs.writeFileSync(file, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
function setValue(changes, label, object, key, value) {
|
|
16
|
+
if (object[key] !== value) {
|
|
17
|
+
changes.push({ label, previous: object[key], value });
|
|
18
|
+
object[key] = value;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function syncReleaseVersion(rootDir) {
|
|
23
|
+
const root = path.resolve(rootDir);
|
|
24
|
+
const packageFile = path.join(root, 'package.json');
|
|
25
|
+
if (!fs.existsSync(packageFile)) {
|
|
26
|
+
throw new Error(`package.json not found in ${root}`);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const pkg = readJson(packageFile);
|
|
30
|
+
const version = String(pkg.version || '').trim();
|
|
31
|
+
if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(version)) {
|
|
32
|
+
throw new Error(`Invalid package.json version: ${version || '<missing>'}`);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const releaseNo = version.match(/^7\.9\.(\d+)/)?.[1] || version.replace(/[^0-9A-Za-z]+/g, '-');
|
|
36
|
+
const expectedBase = `https://unpkg.com/iobroker.eos-admin@${version}`;
|
|
37
|
+
const changes = [];
|
|
38
|
+
|
|
39
|
+
// Keep the human-readable release policy aligned with the package version.
|
|
40
|
+
if (pkg.nexowattReleasePolicy && typeof pkg.nexowattReleasePolicy === 'object') {
|
|
41
|
+
const purpose = String(pkg.nexowattReleasePolicy.purpose || '');
|
|
42
|
+
const nextPurpose = purpose
|
|
43
|
+
? purpose.replace(/\b7\.9\.\d+(?:-[0-9A-Za-z.-]+)?\b/g, version)
|
|
44
|
+
: `accepted NexoWatt EOS release ${version}`;
|
|
45
|
+
setValue(changes, 'package.json nexowattReleasePolicy.purpose', pkg.nexowattReleasePolicy, 'purpose', nextPurpose);
|
|
46
|
+
if (version.includes('-')) {
|
|
47
|
+
setValue(changes, 'package.json nexowattReleasePolicy.acceptedPrerelease', pkg.nexowattReleasePolicy, 'acceptedPrerelease', version);
|
|
48
|
+
} else if (Object.prototype.hasOwnProperty.call(pkg.nexowattReleasePolicy, 'acceptedPrerelease')) {
|
|
49
|
+
changes.push({
|
|
50
|
+
label: 'package.json nexowattReleasePolicy.acceptedPrerelease',
|
|
51
|
+
previous: pkg.nexowattReleasePolicy.acceptedPrerelease,
|
|
52
|
+
value: '<removed>',
|
|
53
|
+
});
|
|
54
|
+
delete pkg.nexowattReleasePolicy.acceptedPrerelease;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
writeJson(packageFile, pkg);
|
|
58
|
+
|
|
59
|
+
const jsonTargets = [
|
|
60
|
+
{
|
|
61
|
+
file: 'package-lock.json',
|
|
62
|
+
update(json) {
|
|
63
|
+
setValue(changes, 'package-lock.json version', json, 'version', version);
|
|
64
|
+
if (json.packages?.['']) {
|
|
65
|
+
setValue(changes, 'package-lock.json packages[""] version', json.packages[''], 'version', version);
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
file: 'io-package.json',
|
|
71
|
+
update(json) {
|
|
72
|
+
setValue(changes, 'io-package.json top-level version', json, 'version', version);
|
|
73
|
+
json.common ||= {};
|
|
74
|
+
setValue(changes, 'io-package.json common.version', json.common, 'version', version);
|
|
75
|
+
setValue(changes, 'io-package.json common.extIcon', json.common, 'extIcon', `${expectedBase}/admin/admin.svg`);
|
|
76
|
+
setValue(changes, 'io-package.json common.readme', json.common, 'readme', `${expectedBase}/README.md`);
|
|
77
|
+
setValue(changes, 'io-package.json common.meta', json.common, 'meta', `${expectedBase}/io-package.json`);
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
file: 'src-admin/package.json',
|
|
82
|
+
update(json) {
|
|
83
|
+
setValue(changes, 'src-admin/package.json version', json, 'version', version);
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
file: 'src-admin/package-lock.json',
|
|
88
|
+
update(json) {
|
|
89
|
+
setValue(changes, 'src-admin/package-lock.json version', json, 'version', version);
|
|
90
|
+
if (json.packages?.['']) {
|
|
91
|
+
setValue(changes, 'src-admin/package-lock.json packages[""] version', json.packages[''], 'version', version);
|
|
92
|
+
}
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
file: 'src-admin/src/version.json',
|
|
97
|
+
update(json) {
|
|
98
|
+
setValue(changes, 'src-admin/src/version.json version', json, 'version', version);
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
file: 'NEXOWATT_EOS_BUILD_INFO.json',
|
|
103
|
+
update(json) {
|
|
104
|
+
setValue(changes, 'NEXOWATT_EOS_BUILD_INFO.json version', json, 'version', version);
|
|
105
|
+
setValue(changes, 'NEXOWATT_EOS_BUILD_INFO.json label', json, 'label', `v${releaseNo}`);
|
|
106
|
+
setValue(
|
|
107
|
+
changes,
|
|
108
|
+
'NEXOWATT_EOS_BUILD_INFO.json repositoryEntry',
|
|
109
|
+
json,
|
|
110
|
+
'repositoryEntry',
|
|
111
|
+
`nexowatt-eos-admin-repository-entry-v${releaseNo}.json`,
|
|
112
|
+
);
|
|
113
|
+
},
|
|
114
|
+
},
|
|
115
|
+
];
|
|
116
|
+
|
|
117
|
+
for (const target of jsonTargets) {
|
|
118
|
+
const file = path.join(root, target.file);
|
|
119
|
+
if (!fs.existsSync(file)) {
|
|
120
|
+
throw new Error(`${target.file} is missing`);
|
|
121
|
+
}
|
|
122
|
+
const json = readJson(file);
|
|
123
|
+
target.update(json);
|
|
124
|
+
writeJson(file, json);
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
// Keep one canonical repository entry for the current release. When a new
|
|
128
|
+
// patch version is merged over an older folder, the entry is created from
|
|
129
|
+
// the previous canonical entry and then normalized.
|
|
130
|
+
const buildInfo = readJson(path.join(root, 'NEXOWATT_EOS_BUILD_INFO.json'));
|
|
131
|
+
const targetEntryName = buildInfo.repositoryEntry;
|
|
132
|
+
const targetEntryFile = path.join(root, targetEntryName);
|
|
133
|
+
let entry;
|
|
134
|
+
if (fs.existsSync(targetEntryFile)) {
|
|
135
|
+
entry = readJson(targetEntryFile);
|
|
136
|
+
} else {
|
|
137
|
+
const candidates = fs
|
|
138
|
+
.readdirSync(root)
|
|
139
|
+
.filter(name => /^nexowatt-eos-admin-repository-entry-v.+\.json$/.test(name))
|
|
140
|
+
.sort((a, b) => fs.statSync(path.join(root, b)).mtimeMs - fs.statSync(path.join(root, a)).mtimeMs);
|
|
141
|
+
if (!candidates.length) {
|
|
142
|
+
throw new Error('No repository entry template found');
|
|
143
|
+
}
|
|
144
|
+
entry = readJson(path.join(root, candidates[0]));
|
|
145
|
+
changes.push({ label: targetEntryName, previous: '<missing>', value: 'created' });
|
|
146
|
+
}
|
|
147
|
+
entry['eos-admin'] ||= {};
|
|
148
|
+
setValue(changes, `${targetEntryName} version`, entry['eos-admin'], 'version', version);
|
|
149
|
+
setValue(changes, `${targetEntryName} meta`, entry['eos-admin'], 'meta', `${expectedBase}/io-package.json`);
|
|
150
|
+
setValue(changes, `${targetEntryName} icon`, entry['eos-admin'], 'icon', `${expectedBase}/admin/admin.png`);
|
|
151
|
+
setValue(changes, `${targetEntryName} extIcon`, entry['eos-admin'], 'extIcon', `${expectedBase}/admin/admin.svg`);
|
|
152
|
+
setValue(changes, `${targetEntryName} readme`, entry['eos-admin'], 'readme', `${expectedBase}/README.md`);
|
|
153
|
+
writeJson(targetEntryFile, entry);
|
|
154
|
+
|
|
155
|
+
return { root, version, changes, repositoryEntry: targetEntryName };
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
if (require.main === module) {
|
|
159
|
+
const args = process.argv.slice(2);
|
|
160
|
+
const quiet = args.includes('--quiet');
|
|
161
|
+
const rootArg = args.find(arg => !arg.startsWith('--'));
|
|
162
|
+
try {
|
|
163
|
+
const result = syncReleaseVersion(rootArg || path.resolve(__dirname, '..'));
|
|
164
|
+
if (!quiet) {
|
|
165
|
+
if (result.changes.length) {
|
|
166
|
+
console.log(
|
|
167
|
+
`[NexoWatt EOS version sync] repaired ${result.changes.length} release value(s) for ${result.version}: ${result.changes
|
|
168
|
+
.map(change => change.label)
|
|
169
|
+
.join(', ')}`,
|
|
170
|
+
);
|
|
171
|
+
} else {
|
|
172
|
+
console.log(`[NexoWatt EOS version sync] OK (${result.version}; all release files match)`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
} catch (error) {
|
|
176
|
+
console.error(`[NexoWatt EOS version sync] ${error instanceof Error ? error.message : String(error)}`);
|
|
177
|
+
process.exit(1);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
module.exports = { syncReleaseVersion };
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
'use strict';
|
|
3
|
+
const fs=require('node:fs');const path=require('node:path');const root=path.resolve(__dirname,'..');
|
|
4
|
+
const read=rel=>fs.readFileSync(path.join(root,rel),'utf8');const fail=msg=>{console.error(`[NexoWatt EOS UI overview runtime] ${msg}`);process.exit(1)};
|
|
5
|
+
const runtime=read('adminWww/js/eos-ems-overview.js');const source=read('src-admin/public/js/eos-ems-overview.js');const css=read('adminWww/css/eos-ems-overview.css');const index=read('adminWww/index.html');const role=read('adminWww/js/eos-role-ui.js');const shell=read('adminWww/js/nexowatt-native-shell.js');const intro=read('src-admin/src/tabs/Intro.tsx');const app=read('src-admin/src/App.tsx');const bundle=read('adminWww/assets/index-D2ymscJA-v84.js');
|
|
6
|
+
if(runtime!==source)fail('runtime source/build drift');
|
|
7
|
+
for(const marker of ['nexowatt-ems-overview-v1','nexowatt-ui.*.info.adminOverview.*','system.adapter.nexowatt-ui.*.alive','POLL_MS = 5000','STALE_MS = 20000','getForeignStates','Keine Kachel besitzt Schreibhoheit','currentDecisions','§14a-Fallback'])if(!runtime.includes(marker))fail(`runtime marker missing: ${marker}`);
|
|
8
|
+
for(const forbidden of ['setForeignState','setState(','sendToHost','writeFile','extendObject'])if(runtime.includes(forbidden))fail(`read-only runtime contains ${forbidden}`);
|
|
9
|
+
for(const marker of ['eos-ems-overview.css?v=96','eos-ems-overview.js?v=96','nexowatt-stable-v96.js?v=96'])if(!index.includes(marker))fail(`index marker missing: ${marker}`);
|
|
10
|
+
if(!css.includes('#eos-ems-overview-runtime')||!css.includes('.eos-ems-overview-metrics'))fail('EMS card CSS incomplete');
|
|
11
|
+
if(role.includes("overview.innerHTML = `")||!role.includes('never cover the real Admin Intro'))fail('obsolete role overview still active');
|
|
12
|
+
if(!shell.includes("label: 'Installateur'")||!shell.includes("label: 'Endkunde'"))fail('native hero is not role-aware');
|
|
13
|
+
if(!intro.includes('<NexoWattEmsOverview')||!intro.includes('getOverviewRoleConfig')||!intro.includes('admin ? this.getButtons() : null'))fail('React Intro integration incomplete');
|
|
14
|
+
if(!app.includes('NEXOWATT_EOS_ADMIN_SOCKET = new Connection'))fail('source socket exposure missing');
|
|
15
|
+
if(!bundle.includes('window.NEXOWATT_EOS_ADMIN_SOCKET=new M({'))fail('prebuilt socket exposure missing');
|
|
16
|
+
console.log('[NexoWatt EOS UI overview runtime] OK');
|
|
@@ -35,9 +35,16 @@ if (prerelease) {
|
|
|
35
35
|
if (pkg.scripts['prepare:eos-release-defaults'] !== 'node tools/nexowatt-ensure-release-defaults.cjs') fail('release-default preparation script is missing');
|
|
36
36
|
if (pkg.scripts['test:eos-release-defaults'] !== 'node tools/nexowatt-release-defaults-selftest.cjs') fail('release-default selftest script is missing');
|
|
37
37
|
if (pkg.scripts['check:eos-publish-channel'] !== 'node tools/nexowatt-publish-channel-guard.cjs') fail('publish channel guard script is missing');
|
|
38
|
-
|
|
39
|
-
if (pkg.scripts['
|
|
40
|
-
if (pkg.scripts['
|
|
38
|
+
|
|
39
|
+
if (pkg.scripts['sync:eos-version'] !== 'node tools/nexowatt-sync-release-version.cjs') fail('sync:eos-version script is missing or incorrect');
|
|
40
|
+
if (pkg.scripts['test:eos-version-sync'] !== 'node tools/nexowatt-version-sync-selftest.cjs') fail('version sync selftest script is missing or incorrect');
|
|
41
|
+
if (pkg.scripts['verify:eos-merge'] !== 'node tools/nexowatt-merge-update-selftest.cjs') fail('merge update selftest script is missing or incorrect');
|
|
42
|
+
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-version-sync-selftest.cjs')) fail('version sync selftest is not part of check:eos-stability');
|
|
43
|
+
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-merge-update-selftest.cjs')) fail('merge update selftest is not part of check:eos-stability');
|
|
44
|
+
if (pkg.scripts['check:eos-stable-v96'] !== 'node tools/nexowatt-stable-v96-selftest.cjs') fail('stable v96 selftest script is missing or incorrect');
|
|
45
|
+
if (!pkg.scripts.prepublishOnly?.startsWith('npm run sync:eos-version && npm run prepare:eos-release-defaults && npm run check:eos-publish-channel')) fail('prepublishOnly must synchronize versions and normalize release defaults before the publish channel guard');
|
|
46
|
+
if (pkg.scripts['precheck:eos-package'] !== 'npm run sync:eos-version && npm run prepare:eos-release-defaults && npm run clean:eos-runtime') fail('precheck:eos-package must synchronize versions, normalize release defaults and clean stale runtime files');
|
|
47
|
+
if (pkg.scripts['precheck:eos-stability'] !== 'npm run sync:eos-version && npm run prepare:eos-release-defaults && npm run clean:eos-runtime') fail('precheck:eos-stability must synchronize versions, normalize release defaults and clean stale runtime files');
|
|
41
48
|
if (pkg.scripts['test:eos-publish-channel'] !== 'node tools/nexowatt-publish-channel-selftest.cjs') fail('publish channel selftest script is missing');
|
|
42
49
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-publish-channel-selftest.cjs')) fail('stability check must execute the publish channel selftest');
|
|
43
50
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-release-defaults-selftest.cjs')) fail('stability check must execute the release-default selftest');
|
|
@@ -103,10 +110,14 @@ for (const file of [
|
|
|
103
110
|
'LICENSE',
|
|
104
111
|
'NEXOWATT_PROPRIETARY_LICENSE.md',
|
|
105
112
|
'THIRD_PARTY_NOTICES.md',
|
|
106
|
-
'README_STABILITY_V7.9.
|
|
107
|
-
'
|
|
108
|
-
'
|
|
109
|
-
'
|
|
113
|
+
'README_STABILITY_V7.9.96.md',
|
|
114
|
+
'RELEASE_NOTES_V7.9.96.md',
|
|
115
|
+
'PUBLISH_STABLE_V7.9.96.md',
|
|
116
|
+
'INSTALL_TEST_V7.9.96.md',
|
|
117
|
+
'RELEASE_ACCEPTANCE_V7.9.96.md',
|
|
118
|
+
'MERGE_UPDATE.ps1',
|
|
119
|
+
'MERGE_UPDATE.cmd',
|
|
120
|
+
'MERGE_UPDATE_README_V7.9.96.md',
|
|
110
121
|
'tools/nexowatt-patch-built-frontend.cjs',
|
|
111
122
|
'tools/nexowatt-native-shell-selftest.cjs',
|
|
112
123
|
'tools/nexowatt-clean-legacy-runtime.cjs',
|
|
@@ -121,6 +132,16 @@ for (const file of [
|
|
|
121
132
|
'tools/nexowatt-login-layout-selftest.cjs',
|
|
122
133
|
'tools/nexowatt-internal-reserve-selftest.cjs',
|
|
123
134
|
'tools/nexowatt-branding-selftest.cjs',
|
|
135
|
+
'tools/nexowatt-sync-release-version.cjs',
|
|
136
|
+
'tools/nexowatt-version-sync-selftest.cjs',
|
|
137
|
+
'tools/nexowatt-merge-update-selftest.cjs',
|
|
138
|
+
'tools/nexowatt-stable-v96-selftest.cjs',
|
|
139
|
+
'tools/nexowatt-ems-overview-selftest.cjs',
|
|
140
|
+
'tools/nexowatt-ui-overview-runtime-selftest.cjs',
|
|
141
|
+
'adminWww/js/eos-ems-overview.js',
|
|
142
|
+
'adminWww/css/eos-ems-overview.css',
|
|
143
|
+
'adminWww/static/js/nexowatt-stable-v96.js',
|
|
144
|
+
'src-admin/src/components/Intro/NexoWattEmsOverview.tsx',
|
|
124
145
|
'tools/nexowatt-publish-channel-guard.cjs',
|
|
125
146
|
'tools/nexowatt-publish-channel-selftest.cjs',
|
|
126
147
|
'tools/nexowatt-ensure-release-defaults.cjs',
|
|
@@ -130,6 +151,11 @@ for (const file of [
|
|
|
130
151
|
repositoryEntryFile,
|
|
131
152
|
]) if (!exists(file)) fail(`missing required file: ${file}`);
|
|
132
153
|
|
|
154
|
+
for (const file of pkg.files || []) {
|
|
155
|
+
const normalized = String(file).replace(/\\/g, '/').replace(/\/\*\*\/\*$/, '');
|
|
156
|
+
if (!/[?*]/.test(normalized) && !exists(normalized.replace(/\/$/, ''))) fail(`package.json files entry does not exist: ${file}`);
|
|
157
|
+
}
|
|
158
|
+
|
|
133
159
|
const index = read('adminWww/index.html');
|
|
134
160
|
const refs = [...index.matchAll(/(?:src|href)="\.\/([^"?#]+)(?:\?[^"#]*)?"/g)].map(m => m[1]);
|
|
135
161
|
const missing = refs.filter(ref => !exists(path.join('adminWww', ref)));
|
|
@@ -155,6 +181,9 @@ if (!index.includes(`eos-branding-sanitizer.js?v=${shellTag}`)) fail('branding s
|
|
|
155
181
|
if (!index.includes(`eos-role-ui.js?v=${shellTag}`)) fail('role UI cache key mismatch');
|
|
156
182
|
if (!index.includes(`eos-account-management.js?v=${shellTag}`)) fail('account management cache key mismatch');
|
|
157
183
|
if (!index.includes(`eos-assistant.js?v=${shellTag}`)) fail('EOS Assist cache key mismatch');
|
|
184
|
+
if (!index.includes(`eos-ems-overview.js?v=${shellTag}`)) fail('EMS overview cache key mismatch');
|
|
185
|
+
if (!index.includes(`eos-ems-overview.css?v=${shellTag}`)) fail('EMS overview CSS cache key mismatch');
|
|
186
|
+
if (!index.includes(`nexowatt-stable-v96.js?v=${shellTag}`)) fail('stable v96 cache key mismatch');
|
|
158
187
|
if (index.indexOf(`eos-manual-write-policy.js?v=${shellTag}`) > index.indexOf(`hostInit-${runtime}.js?v=${runtimeNumber}`)) fail('manual-write policy must load before the React runtime');
|
|
159
188
|
if (!index.includes('class="eos-native-shell"')) fail('native NexoWatt shell class missing');
|
|
160
189
|
for (const legacy of ['eos-branding.js', 'eos-security-ui.js', 'eos-console-quiet.js', 'eos-objects-state-tools.js']) {
|
|
@@ -203,12 +232,12 @@ if (accountManagement.includes("launcher.className = 'eos-account-management-lau
|
|
|
203
232
|
if (accountManagement.includes('new MutationObserver')) fail('account-management runtime adds a second broad DOM observer');
|
|
204
233
|
if (read('src-admin/public/js/eos-account-management.js') !== accountManagement) fail('account-management source/build drift');
|
|
205
234
|
const roleBootstrap = read('adminWww/js/eos-role-bootstrap.js');
|
|
206
|
-
if (!roleBootstrap.includes('installIntegratedFirstLogin') || !roleBootstrap.includes('
|
|
235
|
+
if (!roleBootstrap.includes('installIntegratedFirstLogin') || !roleBootstrap.includes('v96 compact normal-login first activation')) fail('compact integrated first-login is incomplete');
|
|
207
236
|
if (/data-eos-account=|selector\.innerHTML/.test(roleBootstrap)) fail('login role buttons must not enlarge the normal login card');
|
|
208
237
|
if (!roleBootstrap.includes('nexowatt/account/passwordless-status') || !roleBootstrap.includes('eligibility.allowed')) fail('server-checked first-login eligibility is incomplete');
|
|
209
238
|
if (roleBootstrap.includes('installPasswordlessFirstLoginLauncher')) fail('old first-login launcher remains active');
|
|
210
239
|
const assistant = read('adminWww/js/eos-assistant.js');
|
|
211
|
-
if (!assistant.includes('
|
|
240
|
+
if (!assistant.includes('NEXOWATT_EOS_ASSIST_DISABLED')) fail('EOS Assist must be disabled in stable');
|
|
212
241
|
|
|
213
242
|
const mf = read('adminWww/mf-manifest.json');
|
|
214
243
|
if (!mf.includes(`remoteEntry-${runtime}.js`) || !mf.includes(`index-D2ymscJA-${runtime}.js`)) fail('module federation manifest is not on the active runtime');
|
|
@@ -227,7 +256,7 @@ if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-esm-syntax-selftest.
|
|
|
227
256
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-import-integrity-selftest.cjs')) fail('import integrity selftest is not part of check:eos-stability');
|
|
228
257
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-entrypoint-smoke-selftest.cjs')) fail('entrypoint smoke selftest is not part of check:eos-stability');
|
|
229
258
|
if (pkg.scripts['clean:eos-runtime'] !== 'node tools/nexowatt-clean-legacy-runtime.cjs') fail('clean:eos-runtime script is missing or incorrect');
|
|
230
|
-
if (pkg.scripts.prepack !== 'node tools/nexowatt-clean-legacy-runtime.cjs --quiet') fail('prepack must silently clean stale runtime files');
|
|
259
|
+
if (pkg.scripts.prepack !== 'node tools/nexowatt-sync-release-version.cjs --quiet && node tools/nexowatt-clean-legacy-runtime.cjs --quiet') fail('prepack must silently synchronize versions and clean stale runtime files');
|
|
231
260
|
if (!pkg.scripts.build?.includes('npm run clean:eos-runtime')) fail('build must finish with runtime cleanup');
|
|
232
261
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-role-access-selftest.cjs')) fail('role access selftest is not part of check:eos-stability');
|
|
233
262
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-first-login-selftest.cjs')) fail('first-login selftest is not part of check:eos-stability');
|
|
@@ -241,6 +270,8 @@ if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-native-shell-selftes
|
|
|
241
270
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-assistant-separation-selftest.cjs')) fail('assistant separation selftest is not part of check:eos-stability');
|
|
242
271
|
if (!exists('adminWww/img/eos/nexowatt-eos-brand-wide.png')) fail('new NexoWatt EOS brand logo asset missing');
|
|
243
272
|
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-runtime-cleanup-selftest.cjs')) fail('runtime cleanup selftest is not part of check:eos-stability');
|
|
273
|
+
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-ems-overview-selftest.cjs')) fail('EMS React overview selftest is not part of check:eos-stability');
|
|
274
|
+
if (!pkg.scripts['check:eos-stability']?.includes('nexowatt-ui-overview-runtime-selftest.cjs')) fail('EMS runtime selftest is not part of check:eos-stability');
|
|
244
275
|
if (!read('tasks.mts').includes('patchNexoWattBuiltFrontend')) fail('tasks.mts does not execute the EOS post-build frontend patch');
|
|
245
276
|
|
|
246
277
|
console.log('[NexoWatt EOS package validation] OK');
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
'use strict';
|
|
3
|
+
|
|
4
|
+
const fs = require('node:fs');
|
|
5
|
+
const os = require('node:os');
|
|
6
|
+
const path = require('node:path');
|
|
7
|
+
const { syncReleaseVersion } = require('./nexowatt-sync-release-version.cjs');
|
|
8
|
+
|
|
9
|
+
const root = path.resolve(__dirname, '..');
|
|
10
|
+
const temp = fs.mkdtempSync(path.join(os.tmpdir(), 'nexowatt-eos-version-sync-'));
|
|
11
|
+
const fail = message => {
|
|
12
|
+
console.error(`[NexoWatt EOS version sync selftest] ${message}`);
|
|
13
|
+
fs.rmSync(temp, { recursive: true, force: true });
|
|
14
|
+
process.exit(1);
|
|
15
|
+
};
|
|
16
|
+
const readJson = file => JSON.parse(fs.readFileSync(path.join(temp, file), 'utf8'));
|
|
17
|
+
const writeJson = (file, value) => {
|
|
18
|
+
const target = path.join(temp, file);
|
|
19
|
+
fs.mkdirSync(path.dirname(target), { recursive: true });
|
|
20
|
+
fs.writeFileSync(target, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
try {
|
|
24
|
+
const currentPkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
|
|
25
|
+
const version = currentPkg.version;
|
|
26
|
+
writeJson('package.json', currentPkg);
|
|
27
|
+
writeJson('package-lock.json', { name: currentPkg.name, version: '7.9.92', packages: { '': { version: '7.9.92' } } });
|
|
28
|
+
writeJson('io-package.json', {
|
|
29
|
+
version: '7.9.92',
|
|
30
|
+
common: {
|
|
31
|
+
version: '7.9.92',
|
|
32
|
+
extIcon: 'https://unpkg.com/iobroker.eos-admin@7.9.92/admin/admin.svg',
|
|
33
|
+
readme: 'https://unpkg.com/iobroker.eos-admin@7.9.92/README.md',
|
|
34
|
+
meta: 'https://unpkg.com/iobroker.eos-admin@7.9.92/io-package.json',
|
|
35
|
+
},
|
|
36
|
+
native: {},
|
|
37
|
+
});
|
|
38
|
+
writeJson('src-admin/package.json', { name: 'src-rx', version: '7.9.92' });
|
|
39
|
+
writeJson('src-admin/package-lock.json', { name: 'src-rx', version: '7.9.92', packages: { '': { version: '7.9.92' } } });
|
|
40
|
+
writeJson('src-admin/src/version.json', { version: '7.9.92' });
|
|
41
|
+
writeJson('NEXOWATT_EOS_BUILD_INFO.json', { version: '7.9.92', label: 'v92', repositoryEntry: 'nexowatt-eos-admin-repository-entry-v92.json' });
|
|
42
|
+
writeJson('nexowatt-eos-admin-repository-entry-v92.json', {
|
|
43
|
+
'eos-admin': {
|
|
44
|
+
version: '7.9.92',
|
|
45
|
+
meta: 'https://unpkg.com/iobroker.eos-admin@7.9.92/io-package.json',
|
|
46
|
+
icon: 'https://unpkg.com/iobroker.eos-admin@7.9.92/admin/admin.png',
|
|
47
|
+
extIcon: 'https://unpkg.com/iobroker.eos-admin@7.9.92/admin/admin.svg',
|
|
48
|
+
readme: 'https://unpkg.com/iobroker.eos-admin@7.9.92/README.md',
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
const result = syncReleaseVersion(temp);
|
|
53
|
+
if (result.version !== version) fail(`expected ${version}, got ${result.version}`);
|
|
54
|
+
|
|
55
|
+
const io = readJson('io-package.json');
|
|
56
|
+
const lock = readJson('package-lock.json');
|
|
57
|
+
const src = readJson('src-admin/package.json');
|
|
58
|
+
const srcLock = readJson('src-admin/package-lock.json');
|
|
59
|
+
const srcVersion = readJson('src-admin/src/version.json');
|
|
60
|
+
const build = readJson('NEXOWATT_EOS_BUILD_INFO.json');
|
|
61
|
+
const entry = readJson(build.repositoryEntry)['eos-admin'];
|
|
62
|
+
const expectedBase = `https://unpkg.com/iobroker.eos-admin@${version}`;
|
|
63
|
+
|
|
64
|
+
for (const [label, actual] of [
|
|
65
|
+
['io top-level', io.version],
|
|
66
|
+
['io common', io.common.version],
|
|
67
|
+
['lock', lock.version],
|
|
68
|
+
['lock root', lock.packages[''].version],
|
|
69
|
+
['src package', src.version],
|
|
70
|
+
['src lock', srcLock.version],
|
|
71
|
+
['src lock root', srcLock.packages[''].version],
|
|
72
|
+
['src version', srcVersion.version],
|
|
73
|
+
['build version', build.version],
|
|
74
|
+
['entry version', entry.version],
|
|
75
|
+
]) {
|
|
76
|
+
if (actual !== version) fail(`${label} was not synchronized: ${actual}`);
|
|
77
|
+
}
|
|
78
|
+
if (io.common.meta !== `${expectedBase}/io-package.json`) fail('io-package URL was not synchronized');
|
|
79
|
+
if (entry.meta !== `${expectedBase}/io-package.json`) fail('repository entry URL was not synchronized');
|
|
80
|
+
if (!fs.existsSync(path.join(temp, build.repositoryEntry))) fail('current repository entry was not created');
|
|
81
|
+
|
|
82
|
+
fs.rmSync(temp, { recursive: true, force: true });
|
|
83
|
+
console.log(`[NexoWatt EOS version sync selftest] OK (${version}; stale 7.9.92 merge repaired)`);
|
|
84
|
+
} catch (error) {
|
|
85
|
+
fail(error instanceof Error ? error.stack || error.message : String(error));
|
|
86
|
+
}
|
package/INSTALL_TEST_V7.9.93.md
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
# Installationstest 7.9.93
|
|
2
|
-
|
|
3
|
-
```bash
|
|
4
|
-
cd /opt/iobroker
|
|
5
|
-
iobroker backup
|
|
6
|
-
iobroker stop eos-admin.0
|
|
7
|
-
npm install --no-save --omit=dev /PFAD/iobroker.eos-admin-7.9.93.tgz
|
|
8
|
-
iobroker upload eos-admin
|
|
9
|
-
iobroker restart eos-admin.0
|
|
10
|
-
```
|
|
11
|
-
|
|
12
|
-
Prüfen: Login ohne Scrollbalken, Modul-Suche `[NexoWatt]`, EOS-Assist-Konfiguration als Admin, Live-Fragen mit allen drei Rollen, Dienste-/Reservefilter, Neustart und Backup-Rücklesetest.
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
# npm-Freigabe 7.9.93
|
|
2
|
-
|
|
3
|
-
Nach erfolgreichem Realtest:
|
|
4
|
-
|
|
5
|
-
```powershell
|
|
6
|
-
npm login
|
|
7
|
-
npm whoami
|
|
8
|
-
npm run check:eos-package
|
|
9
|
-
npm run check:eos-stability
|
|
10
|
-
npm publish --dry-run --tag latest
|
|
11
|
-
npm publish --tag latest
|
|
12
|
-
```
|
|
13
|
-
|
|
14
|
-
Kontrolle:
|
|
15
|
-
|
|
16
|
-
```powershell
|
|
17
|
-
npm view iobroker.eos-admin@latest version
|
|
18
|
-
npm dist-tag ls iobroker.eos-admin
|
|
19
|
-
```
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
# NexoWatt EOS Admin 7.9.93 – Testkandidat
|
|
2
|
-
|
|
3
|
-
Dieser Stand basiert auf der freigegebenen Admin-7-Linie und ist für den abschließenden Realtest vorgesehen.
|
|
4
|
-
|
|
5
|
-
## Änderungen
|
|
6
|
-
|
|
7
|
-
- kompakte Anmeldung ohne internen Scrollbalken
|
|
8
|
-
- sichtbarer Herausgeber „NexoWatt“ in der Modulinstallation
|
|
9
|
-
- EOS Assist mit authentifizierter, rollenabhängiger Live-Systemabfrage
|
|
10
|
-
- EOS Assist bleibt schreibgeschützt und respektiert die Rechte von Admin, Installateur und Endkunde
|
|
11
|
-
- technischer Paketname `iobroker.eos-admin` bleibt für Installation und Kompatibilität unverändert
|
|
12
|
-
|
|
13
|
-
## Freigabe
|
|
14
|
-
|
|
15
|
-
Erst nach bestandenem Anlagen-, Rollen-, Reboot- und Backup-Test darf 7.9.93 auf npm `latest` gesetzt werden.
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
# Release-Abnahme 7.9.93
|
|
2
|
-
|
|
3
|
-
- [ ] Login-Karte ohne inneren Scrollbalken
|
|
4
|
-
- [ ] sichtbare Modulbezeichnung `eos-admin [NexoWatt]`
|
|
5
|
-
- [ ] technischer Paketname bleibt installierbar
|
|
6
|
-
- [ ] EOS Assist durch Admin/Service konfigurierbar
|
|
7
|
-
- [ ] EOS Assist liest reale Systemdaten statt statischer Texte
|
|
8
|
-
- [ ] Admin erhält vollständige lesende Systemauskunft
|
|
9
|
-
- [ ] Installateur erhält nur freigegebene Inbetriebnahme-/Diagnosedaten
|
|
10
|
-
- [ ] Endkunde erhält nur freigegebene Smart-Home-/Betriebsdaten
|
|
11
|
-
- [ ] EOS Assist kann keine Zustände oder Einstellungen schreiben
|
|
12
|
-
- [ ] `admin.0` und `backitup.0` bleiben für Nicht-Admins verborgen
|
|
13
|
-
- [ ] NexoWatt Backup funktioniert
|
|
14
|
-
- [ ] Controller-Neustart bestanden
|
|
15
|
-
- [ ] Rollback auf 7.9.86 bestanden
|
package/RELEASE_NOTES_V7.9.93.md
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
# Release Notes – NexoWatt EOS Admin 7.9.93
|
|
2
|
-
|
|
3
|
-
## Anmeldung
|
|
4
|
-
Der unnötige vertikale Scrollbalken in der kompakten Login-Karte wurde entfernt.
|
|
5
|
-
|
|
6
|
-
## Sichtbarer Herausgeber
|
|
7
|
-
In der Modulinstallation erscheint bei `eos-admin` sichtbar nur noch `[NexoWatt]`. Die technische npm-Kennung bleibt intern unverändert.
|
|
8
|
-
|
|
9
|
-
## EOS Assist
|
|
10
|
-
EOS Assist verwendet jetzt den angemeldeten Benutzer, dessen EOS-Rolle und die freigegebenen Lesewerkzeuge. Nach Konfiguration von Anbieter, Zugang und Modell durch Admin/Service kann der Assistent Fragen zu realen Modulen, Diensten, Einstellungen, Geräten, Datenpunkten, Räumen/Funktionen, Logs, Historie und Sicherungen beantworten. Schreibzugriffe sind in diesem Stand nicht zulässig.
|