iobroker.nexowatt-ui 0.7.55 → 0.8.5
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/ems/consumers/evcs.js +17 -0
- package/ems/consumers/generic-load.js +17 -0
- package/ems/consumers/generic-setpoint.js +17 -0
- package/ems/consumers/index.js +17 -0
- package/ems/consumers/sg-ready.js +17 -0
- package/ems/datapoints.js +18 -1
- package/ems/engine.js +17 -0
- package/ems/module-manager.js +46 -11
- package/ems/modules/ai-advisor.js +68 -8
- package/ems/modules/base.js +17 -0
- package/ems/modules/bhkw-control.js +17 -0
- package/ems/modules/charging-management.js +1661 -87
- package/ems/modules/core-limits.js +632 -50
- package/ems/modules/generator-control.js +17 -0
- package/ems/modules/grid-constraints.js +17 -0
- package/ems/modules/heating-rod-control.js +1535 -1
- package/ems/modules/multi-use.js +17 -0
- package/ems/modules/para14a.js +17 -0
- package/ems/modules/peak-shaving.js +18 -1
- package/ems/modules/pv-forecast.js +17 -0
- package/ems/modules/storage-control.js +17 -0
- package/ems/modules/storage-mapping.js +17 -0
- package/ems/modules/tarif-vis.js +17 -0
- package/ems/modules/thermal-control.js +17 -0
- package/ems/modules/threshold-control.js +17 -0
- package/ems/nexologic-engine.js +17 -0
- package/ems/reasons.js +17 -0
- package/io-package.json +22 -22
- package/lib/ts-mirrors/adapter/api-set.js +81 -0
- package/lib/ts-mirrors/adapter/api-state.js +75 -0
- package/lib/ts-mirrors/adapter/connection-state.js +25 -0
- package/lib/ts-mirrors/adapter/index.js +74 -0
- package/lib/ts-mirrors/adapter/settings-writes.js +103 -0
- package/lib/ts-mirrors/adapter/state-cache.js +202 -0
- package/lib/ts-mirrors/backend/api-state/api-set-helpers.js +96 -0
- package/lib/ts-mirrors/backend/api-state/api-state-envelope.js +61 -0
- package/lib/ts-mirrors/backend/connection/connection-state.js +56 -0
- package/lib/ts-mirrors/backend/feature-visibility/feature-visibility.js +94 -0
- package/lib/ts-mirrors/backend/license/license-key-safety.js +101 -0
- package/lib/ts-mirrors/backend/main-helpers/api-state-main.js +70 -0
- package/lib/ts-mirrors/backend/main-helpers/info-connection-main.js +43 -0
- package/lib/ts-mirrors/backend/main-helpers/license-key-main.js +53 -0
- package/lib/ts-mirrors/backend/main-helpers/settings-write-main.js +101 -0
- package/lib/ts-mirrors/backend/main-helpers/state-cache-main.js +98 -0
- package/lib/ts-mirrors/backend/main-runtime/main-runtime-helpers.js +363 -0
- package/lib/ts-mirrors/backend/state-cache/state-cache.js +155 -0
- package/lib/ts-mirrors/bridges/feature-visibility-shadow.js +96 -0
- package/lib/ts-mirrors/ems/ai-advisor/ai-advisor-payload.js +170 -0
- package/lib/ts-mirrors/ems/charging-management/charging-allocation.js +670 -0
- package/lib/ts-mirrors/ems/charging-management/charging-budget.js +234 -0
- package/lib/ts-mirrors/ems/charging-management/charging-control.js +277 -0
- package/lib/ts-mirrors/ems/charging-management/charging-management-runtime.js +196 -0
- package/lib/ts-mirrors/ems/charging-management/charging-management.js +250 -0
- package/lib/ts-mirrors/ems/charging-management/charging-normal-source.js +324 -0
- package/lib/ts-mirrors/ems/charging-management/charging-write-plan.js +305 -0
- package/lib/ts-mirrors/ems/core-limits/core-budget.js +711 -0
- package/lib/ts-mirrors/ems/heating-rod/heating-rod-decision.js +261 -0
- package/lib/ts-mirrors/energy-flow/resolvers/energy-flow-resolver.js +287 -0
- package/lib/ts-mirrors/energy-flow/utils/energy-flow.js +351 -0
- package/lib/ts-mirrors/energy-flow/utils/number.js +154 -0
- package/lib/ts-mirrors/main/api-set.js +190 -0
- package/lib/ts-mirrors/main/api-shadow.js +131 -0
- package/lib/ts-mirrors/main/api-state.js +124 -0
- package/lib/ts-mirrors/main/index.js +56 -0
- package/lib/ts-mirrors/main/info-connection.js +39 -0
- package/lib/ts-mirrors/main/license-key.js +66 -0
- package/lib/ts-mirrors/main/state-cache.js +168 -0
- package/lib/ts-mirrors/utils/number.js +153 -0
- package/main.js +2916 -62
- package/package.json +211 -7
- package/www/admin-guard.js +17 -0
- package/www/app.js +231 -2
- package/www/auth.js +17 -0
- package/www/cockpit-shell.js +40 -0
- package/www/ems-apps.html +4 -2
- package/www/ems-apps.js +989 -27
- package/www/evcs-report.html +1 -1
- package/www/evcs-report.js +18 -1
- package/www/evcs.js +17 -0
- package/www/history.html +3 -3
- package/www/history.js +17 -0
- package/www/index.html +4 -4
- package/www/logic.js +17 -0
- package/www/manifest.webmanifest +2 -2
- package/www/nw-shell.js +41 -0
- package/www/para14a-report.html +1 -1
- package/www/para14a-report.js +17 -0
- package/www/report-common.js +17 -0
- package/www/rfid-report.html +1 -1
- package/www/rfid-report.js +17 -0
- package/www/settings.html +2 -2
- package/www/simulation.html +1 -1
- package/www/simulation.js +17 -0
- package/www/smarthome-config.html +1 -1
- package/www/smarthome-config.js +18 -1
- package/www/smarthome.html +1 -1
- package/www/smarthome.js +17 -0
- package/www/static/ts-mirrors/frontend/customer-feature-visibility.mjs +169 -0
- package/www/static/ts-mirrors/frontend/display-format-canary.mjs +114 -0
- package/www/static/ts-mirrors/frontend/display-format.mjs +177 -0
- package/www/static/ts-mirrors/frontend/feature-visibility-diagnostics.mjs +121 -0
- package/www/static/ts-mirrors/frontend/feature-visibility-shadow-compare.mjs +129 -0
- package/www/static/ts-mirrors/frontend/history-controls.mjs +49 -0
- package/www/static/ts-mirrors/frontend/live-dashboard-format.mjs +138 -0
- package/www/static/ts-mirrors/frontend/runtime-shadow.mjs +127 -0
- package/www/storagefarm.html +3 -3
- package/www/storagefarm.js +17 -0
- package/www/styles.css +197 -0
- package/www/sw.js +18 -1
- package/www/tariff-report.html +1 -1
- package/www/tariff-report.js +17 -0
- package/www/year-report.html +1 -1
- package/www/year-report.js +17 -0
- package/admin/license-generator.html +0 -66
- package/admin/react/assets/index-5U6VbS3e.js +0 -26
- package/admin/react/assets/index-C0R0Rq6s.js +0 -26
- package/admin/react/assets/index-C532gq63.js +0 -26
- package/admin/react/assets/index-D_pBipZx.js +0 -26
- package/docs/ARCHITECTURE_DE.md +0 -186
- package/docs/CODEMAP_DE.md +0 -29
- package/docs/CODE_CONTRACTS_DE.md +0 -146
- package/docs/COMMENTING_PASS_0754_DE.md +0 -101
- package/docs/COMMENTING_STANDARD_DE.md +0 -21
- package/docs/CRITICAL_RULES_DE.md +0 -89
- package/docs/DATAFLOW_DE.md +0 -215
- package/docs/MODULE_CHECKLISTS_DE.md +0 -97
- package/docs/STATES_AND_DATAPOINTS_DE.md +0 -124
- package/docs/TYPESCRIPT_MIGRATION_DE.md +0 -131
package/ems/consumers/evcs.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/consumers/evcs.ts
|
|
5
|
+
* Quell-Hash: sha256:48ca0a91c8f4702eed6fe899a632895f984c3d01e7e7d7ad9496634b31e4b96a
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/consumers/evcs.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/consumers/generic-load.ts
|
|
5
|
+
* Quell-Hash: sha256:2824e04268d2b975b5e12f97b6b007e7d599ed6b53a64c65935dd4b6b29d1738
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/consumers/generic-load.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/consumers/generic-setpoint.ts
|
|
5
|
+
* Quell-Hash: sha256:38c3caf0628ab679ff6d5e5ca033d2184e6db9349a06925142a2ecaec15931df
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/consumers/generic-setpoint.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
package/ems/consumers/index.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/consumers/index.ts
|
|
5
|
+
* Quell-Hash: sha256:9aaf779c432cd5d7c691b09f155bb5e4ac1adfcc8d0b7ed76a1cc3d8d25cb2e5
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/consumers/index.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/consumers/sg-ready.ts
|
|
5
|
+
* Quell-Hash: sha256:7de8b525bf1cdb28aa21bb288ef4724ffe7e674519d655b39f47e98df531bbc4
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/consumers/sg-ready.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
package/ems/datapoints.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/datapoints.ts
|
|
5
|
+
* Quell-Hash: sha256:db71372e6239581262d608c8e9e8e9df4530b2ea23412baaacfd080d58752fc0
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/datapoints.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -1010,4 +1027,4 @@ class DatapointRegistry {
|
|
|
1010
1027
|
}
|
|
1011
1028
|
}
|
|
1012
1029
|
|
|
1013
|
-
module.exports = { DatapointRegistry };
|
|
1030
|
+
module.exports = { DatapointRegistry };
|
package/ems/engine.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/engine.ts
|
|
5
|
+
* Quell-Hash: sha256:014052ee674d87a81e6e45baf0ca2e0794912e725375a3b654c723ef10669c9c
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/engine.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
package/ems/module-manager.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/module-manager.ts
|
|
5
|
+
* Quell-Hash: sha256:138e498ef2823e48e9bd755091453e05f6f30b5fc63aa8c8c7e9af3683d97126
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/module-manager.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -95,6 +112,23 @@ class ModuleManager {
|
|
|
95
112
|
* Zusammenhang: Teil von EMS-Kern: Engine, Module, Datenpunkte; Aufrufstellen und abhängige States/APIs beim Ändern mitprüfen.
|
|
96
113
|
* TypeScript: Parameter, Rückgabewert und verwendete Config-/State-Objekte später explizit typisieren.
|
|
97
114
|
*/
|
|
115
|
+
_licenseEdition() {
|
|
116
|
+
const info = this.adapter && this.adapter._nwLicenseInfo && typeof this.adapter._nwLicenseInfo === 'object' ? this.adapter._nwLicenseInfo : {};
|
|
117
|
+
if (info && info.ok === true) {
|
|
118
|
+
const e = String(info.edition || 'eos').toLowerCase();
|
|
119
|
+
return e === 'hems' ? 'hems' : 'eos';
|
|
120
|
+
}
|
|
121
|
+
return 'none';
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
_licenseAllowsApp(appId) {
|
|
125
|
+
const edition = this._licenseEdition();
|
|
126
|
+
if (edition === 'eos') return true;
|
|
127
|
+
if (edition !== 'hems') return false;
|
|
128
|
+
const hemsApps = new Set(['charging', 'storage', 'thermal', 'heatingrod', 'threshold', 'relay', 'aiAdvisor', 'tariff', 'para14a']);
|
|
129
|
+
return hemsApps.has(String(appId || ''));
|
|
130
|
+
}
|
|
131
|
+
|
|
98
132
|
_getDiagCfg() {
|
|
99
133
|
const cfg = (this.adapter && this.adapter.config && this.adapter.config.diagnostics) ? this.adapter.config.diagnostics : null;
|
|
100
134
|
const enabled = !!(cfg && cfg.enabled);
|
|
@@ -189,14 +223,14 @@ class ModuleManager {
|
|
|
189
223
|
this.modules.push({
|
|
190
224
|
key: 'gridConstraints',
|
|
191
225
|
instance: new GridConstraintsModule(this.adapter, this.dp),
|
|
192
|
-
enabledFn: () => !!this.adapter.config.enableGridConstraints,
|
|
226
|
+
enabledFn: () => this._licenseAllowsApp('grid') && !!this.adapter.config.enableGridConstraints,
|
|
193
227
|
});
|
|
194
228
|
|
|
195
229
|
// Peak shaving
|
|
196
230
|
this.modules.push({
|
|
197
231
|
key: 'peakShaving',
|
|
198
232
|
instance: new PeakShavingModule(this.adapter, this.dp),
|
|
199
|
-
enabledFn: () => !!this.adapter.config.enablePeakShaving || !!(this.adapter.config.peakShaving && this.adapter.config.peakShaving.atypical && this.adapter.config.peakShaving.atypical.enabled),
|
|
233
|
+
enabledFn: () => this._licenseAllowsApp('peak') && (!!this.adapter.config.enablePeakShaving || !!(this.adapter.config.peakShaving && this.adapter.config.peakShaving.atypical && this.adapter.config.peakShaving.atypical.enabled)),
|
|
200
234
|
});
|
|
201
235
|
|
|
202
236
|
// §14a EnWG (steuerbare Verbrauchseinrichtungen)
|
|
@@ -204,7 +238,7 @@ class ModuleManager {
|
|
|
204
238
|
this.modules.push({
|
|
205
239
|
key: 'para14a',
|
|
206
240
|
instance: new Para14aModule(this.adapter, this.dp),
|
|
207
|
-
enabledFn: () => !!(this.adapter?.config?.installerConfig?.para14a),
|
|
241
|
+
enabledFn: () => this._licenseAllowsApp('para14a') && !!(this.adapter?.config?.installerConfig?.para14a),
|
|
208
242
|
});
|
|
209
243
|
|
|
210
244
|
// Tarif (VIS) – stellt Ladepark-Deckel bereit
|
|
@@ -234,6 +268,7 @@ class ModuleManager {
|
|
|
234
268
|
key: 'chargingManagement',
|
|
235
269
|
instance: new ChargingManagementModule(this.adapter, this.dp),
|
|
236
270
|
enabledFn: () => {
|
|
271
|
+
if (!this._licenseAllowsApp('charging')) return false;
|
|
237
272
|
// Backwards compatible default:
|
|
238
273
|
// Older installations may not have the new EMS config persisted yet.
|
|
239
274
|
// If the flag is missing (undefined/null), we enable the module so the
|
|
@@ -266,7 +301,7 @@ class ModuleManager {
|
|
|
266
301
|
// das Modul nicht explizit aktiviert hat, der Endkunde aber den dynamischen Tarif
|
|
267
302
|
// (VIS) nutzt. Die eigentliche Schreiblogik entscheidet im Modul selbst, ob
|
|
268
303
|
// tatsächlich Setpoints geschrieben werden (Failsafe).
|
|
269
|
-
enabledFn: () =>
|
|
304
|
+
enabledFn: () => this._licenseAllowsApp('storage'),
|
|
270
305
|
});
|
|
271
306
|
|
|
272
307
|
// Thermische Steuerung (Wärmepumpe/Klima)
|
|
@@ -275,7 +310,7 @@ class ModuleManager {
|
|
|
275
310
|
this.modules.push({
|
|
276
311
|
key: 'thermalControl',
|
|
277
312
|
instance: new ThermalControlModule(this.adapter, this.dp),
|
|
278
|
-
enabledFn: () => !!this.adapter.config.enableThermalControl,
|
|
313
|
+
enabledFn: () => this._licenseAllowsApp('thermal') && !!this.adapter.config.enableThermalControl,
|
|
279
314
|
});
|
|
280
315
|
|
|
281
316
|
// Gestufte Heizstäbe (native 1..12 Stufen)
|
|
@@ -284,20 +319,20 @@ class ModuleManager {
|
|
|
284
319
|
this.modules.push({
|
|
285
320
|
key: 'heatingRodControl',
|
|
286
321
|
instance: new HeatingRodControlModule(this.adapter, this.dp),
|
|
287
|
-
enabledFn: () => !!this.adapter.config.enableHeatingRodControl,
|
|
322
|
+
enabledFn: () => this._licenseAllowsApp('heatingrod') && !!this.adapter.config.enableHeatingRodControl,
|
|
288
323
|
});
|
|
289
324
|
|
|
290
325
|
// BHKW Steuerung (Start/Stop, SoC-geführt)
|
|
291
326
|
this.modules.push({
|
|
292
327
|
key: 'bhkwControl',
|
|
293
328
|
instance: new BhkwControlModule(this.adapter, this.dp),
|
|
294
|
-
enabledFn: () => !!this.adapter.config.enableBhkwControl,
|
|
329
|
+
enabledFn: () => this._licenseAllowsApp('bhkw') && !!this.adapter.config.enableBhkwControl,
|
|
295
330
|
});
|
|
296
331
|
|
|
297
332
|
this.modules.push({
|
|
298
333
|
key: 'generatorControl',
|
|
299
334
|
instance: new GeneratorControlModule(this.adapter, this.dp),
|
|
300
|
-
enabledFn: () => !!this.adapter.config.enableGeneratorControl,
|
|
335
|
+
enabledFn: () => this._licenseAllowsApp('generator') && !!this.adapter.config.enableGeneratorControl,
|
|
301
336
|
});
|
|
302
337
|
|
|
303
338
|
// Schwellwertsteuerung (generische Regeln)
|
|
@@ -305,7 +340,7 @@ class ModuleManager {
|
|
|
305
340
|
this.modules.push({
|
|
306
341
|
key: 'thresholdControl',
|
|
307
342
|
instance: new ThresholdControlModule(this.adapter, this.dp),
|
|
308
|
-
enabledFn: () => !!this.adapter.config.enableThresholdControl,
|
|
343
|
+
enabledFn: () => this._licenseAllowsApp('threshold') && !!this.adapter.config.enableThresholdControl,
|
|
309
344
|
});
|
|
310
345
|
|
|
311
346
|
// KI‑Energieberater / KI‑Optimierung (advisory only)
|
|
@@ -313,14 +348,14 @@ class ModuleManager {
|
|
|
313
348
|
this.modules.push({
|
|
314
349
|
key: 'aiAdvisor',
|
|
315
350
|
instance: new AiAdvisorModule(this.adapter, this.dp),
|
|
316
|
-
enabledFn: () => !!(this.adapter.config.enableAiAdvisor || this.adapter.config.enableAiOptimization),
|
|
351
|
+
enabledFn: () => this._licenseAllowsApp('aiAdvisor') && !!(this.adapter.config.enableAiAdvisor || this.adapter.config.enableAiOptimization),
|
|
317
352
|
});
|
|
318
353
|
|
|
319
354
|
// Multi use (future)
|
|
320
355
|
this.modules.push({
|
|
321
356
|
key: 'multiUse',
|
|
322
357
|
instance: new MultiUseModule(this.adapter, this.dp),
|
|
323
|
-
enabledFn: () => !!this.adapter.config.enableMultiUse,
|
|
358
|
+
enabledFn: () => this._licenseAllowsApp('multiuse') && !!this.adapter.config.enableMultiUse,
|
|
324
359
|
});
|
|
325
360
|
|
|
326
361
|
// Init modules
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/modules/ai-advisor.ts
|
|
5
|
+
* Quell-Hash: sha256:d31b6ba497101bd4c495d99cf7e4b44a7c19b3570ce8052ed87e2523f8df546a
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/modules/ai-advisor.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -42,6 +59,26 @@
|
|
|
42
59
|
|
|
43
60
|
|
|
44
61
|
const { BaseModule } = require('./base');
|
|
62
|
+
/**
|
|
63
|
+
* Code-Teil: aiAdvisorPayloadTsMirror
|
|
64
|
+
*
|
|
65
|
+
* Zweck:
|
|
66
|
+
* Lädt den aus TypeScript erzeugten KI-Payload-Helfer. Dieser Helfer übernimmt ab
|
|
67
|
+
* 0.7.115 produktiv die sichere Ausgabe-Normalisierung für `aiAdvisor.*` States.
|
|
68
|
+
*
|
|
69
|
+
* Zusammenhang:
|
|
70
|
+
* Die fachlichen Vorschläge entstehen weiterhin in dieser JS-Datei. TypeScript formt
|
|
71
|
+
* daraus stabile JSON-/Top-/Count-/Severity-Werte für Dashboard und History.
|
|
72
|
+
*
|
|
73
|
+
* Fallback:
|
|
74
|
+
* Wenn der Spiegel fehlt oder Fehler wirft, bleibt die alte JS-Normalisierung aktiv.
|
|
75
|
+
*/
|
|
76
|
+
let aiAdvisorPayloadTsMirror = null;
|
|
77
|
+
try {
|
|
78
|
+
aiAdvisorPayloadTsMirror = require('../../lib/ts-mirrors/ems/ai-advisor/ai-advisor-payload.js');
|
|
79
|
+
} catch (_eAiAdvisorPayloadTsMirror) {
|
|
80
|
+
aiAdvisorPayloadTsMirror = null;
|
|
81
|
+
}
|
|
45
82
|
/**
|
|
46
83
|
* Code-Teil: num
|
|
47
84
|
* Zweck: Kapselt einen lokalen Verarbeitungsschritt, damit Aufrufer nicht direkt in Detaildaten eingreifen.
|
|
@@ -1817,12 +1854,34 @@ class AiAdvisorModule extends BaseModule {
|
|
|
1817
1854
|
*/
|
|
1818
1855
|
async _publish(snapshot, suggestions, cfg) {
|
|
1819
1856
|
const now = Date.now();
|
|
1820
|
-
const
|
|
1821
|
-
|
|
1822
|
-
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
1857
|
+
const jsScore = this._score(snapshot, suggestions);
|
|
1858
|
+
let normalizedSuggestions = Array.isArray(suggestions) ? suggestions : [];
|
|
1859
|
+
let aiPayload = null;
|
|
1860
|
+
try {
|
|
1861
|
+
if (aiAdvisorPayloadTsMirror && typeof aiAdvisorPayloadTsMirror.buildAiAdvisorPublishPayload === 'function') {
|
|
1862
|
+
aiPayload = aiAdvisorPayloadTsMirror.buildAiAdvisorPublishPayload({
|
|
1863
|
+
suggestions: normalizedSuggestions,
|
|
1864
|
+
score: jsScore,
|
|
1865
|
+
showInLive: cfg.showInLive,
|
|
1866
|
+
dailyPlanText: snapshot.dayPlan && snapshot.dayPlan.text || '',
|
|
1867
|
+
learning: this._lastLearning || {},
|
|
1868
|
+
maxSuggestions: 8,
|
|
1869
|
+
});
|
|
1870
|
+
if (aiPayload && aiPayload.ok && Array.isArray(aiPayload.suggestions)) {
|
|
1871
|
+
normalizedSuggestions = aiPayload.suggestions;
|
|
1872
|
+
}
|
|
1873
|
+
}
|
|
1874
|
+
} catch (e) {
|
|
1875
|
+
aiPayload = { ok: false, source: 'js-fallback', error: e && e.message ? e.message : String(e) };
|
|
1876
|
+
try { this.adapter && this.adapter.log && this.adapter.log.warn && this.adapter.log.warn('[ai-advisor-ts-payload] Fallback auf JS-Payload: ' + aiPayload.error); } catch (_eLog) {}
|
|
1877
|
+
}
|
|
1878
|
+
suggestions = normalizedSuggestions;
|
|
1879
|
+
const top = aiPayload && aiPayload.top ? aiPayload.top : (suggestions && suggestions.length ? suggestions[0] : null);
|
|
1880
|
+
const score = aiPayload && Number.isFinite(Number(aiPayload.score)) ? Number(aiPayload.score) : jsScore;
|
|
1881
|
+
const severity = aiPayload && aiPayload.severity ? String(aiPayload.severity) : (top ? String(top.severity || 'info') : 'neutral');
|
|
1882
|
+
const headline = aiPayload && aiPayload.headline ? String(aiPayload.headline) : (top ? `${top.icon || '💡'} ${top.title}` : 'KI-Energieberater bereit');
|
|
1883
|
+
const summary = aiPayload && aiPayload.summary ? String(aiPayload.summary) : (top ? String(top.text || '') : 'Keine aktuellen Hinweise.');
|
|
1884
|
+
const jsonSuggestions = aiPayload && aiPayload.suggestionsJson ? String(aiPayload.suggestionsJson) : safeJson(suggestions || [], '[]');
|
|
1826
1885
|
const peakReferenceLimitW = (finiteNumber(snapshot.gridConnectionLimitW) && snapshot.gridConnectionLimitW > 0)
|
|
1827
1886
|
? snapshot.gridConnectionLimitW
|
|
1828
1887
|
: ((finiteNumber(snapshot.peakLimitW) && snapshot.peakLimitW > 0) ? snapshot.peakLimitW : ((finiteNumber(snapshot.gridImportLimitEffectiveW) && snapshot.gridImportLimitEffectiveW > 0) ? snapshot.gridImportLimitEffectiveW : null));
|
|
@@ -1856,8 +1915,9 @@ class AiAdvisorModule extends BaseModule {
|
|
|
1856
1915
|
top,
|
|
1857
1916
|
suggestions,
|
|
1858
1917
|
raw: snapshot,
|
|
1918
|
+
tsPayload: aiPayload ? { source: aiPayload.source || 'unknown', ok: aiPayload.ok !== false, count: aiPayload.count || 0, fallback: aiPayload.ok === false } : { source: 'js-fallback', ok: false },
|
|
1859
1919
|
};
|
|
1860
|
-
const hash = makeHash({ suggestions, score, severity, show: cfg.showInLive, plan: dailyPlan.text || '', anomaly: learning.anomalyText || '', forecastQuality: learning.forecastQualityPct });
|
|
1920
|
+
const hash = makeHash(aiPayload && aiPayload.hashPayload ? aiPayload.hashPayload : { suggestions, score, severity, show: cfg.showInLive, plan: dailyPlan.text || '', anomaly: learning.anomalyText || '', forecastQuality: learning.forecastQualityPct });
|
|
1861
1921
|
const contentChanged = hash !== this._lastHash;
|
|
1862
1922
|
this._lastHash = hash;
|
|
1863
1923
|
|
|
@@ -1869,7 +1929,7 @@ class AiAdvisorModule extends BaseModule {
|
|
|
1869
1929
|
await this._set('aiAdvisor.severity', severity);
|
|
1870
1930
|
await this._set('aiAdvisor.headline', headline);
|
|
1871
1931
|
await this._set('aiAdvisor.summary', summary);
|
|
1872
|
-
await this._set('aiAdvisor.count', Array.isArray(suggestions) ? suggestions.length : 0);
|
|
1932
|
+
await this._set('aiAdvisor.count', aiPayload && Number.isFinite(Number(aiPayload.count)) ? Number(aiPayload.count) : (Array.isArray(suggestions) ? suggestions.length : 0));
|
|
1873
1933
|
await this._set('aiAdvisor.score', score);
|
|
1874
1934
|
await this._set('aiAdvisor.peakUsagePct', round(peakUsagePct, 1) || 0);
|
|
1875
1935
|
await this._set('aiAdvisor.peakStateText', peakStateText);
|
package/ems/modules/base.js
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/modules/base.ts
|
|
5
|
+
* Quell-Hash: sha256:6e73ee7e0983e21086668dd6572b8d9abcdc28ceba73c6dfabb1f6aa91064247
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/modules/base.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
|
+
*
|
|
4
|
+
* Quelle: src-ts/runtime-executables/ems/modules/bhkw-control.ts
|
|
5
|
+
* Quell-Hash: sha256:3c0bff1f8150baf04ac89904fc724d91f78d6087340b8569d411f8c7cdf6e1c2
|
|
6
|
+
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
|
+
*
|
|
8
|
+
* Zweck:
|
|
9
|
+
* Diese JavaScript-Datei ist das ausführbare Build-Artefakt für ems/modules/bhkw-control.js.
|
|
10
|
+
* Die fachliche Bearbeitung erfolgt ab 0.7.131 in der TypeScript-Quelle.
|
|
11
|
+
* Ab 0.7.132 sind doppelte Legacy-JS-Bäume wie .nwcore entfernt.
|
|
12
|
+
*
|
|
13
|
+
* Pflege-Regel:
|
|
14
|
+
* 1. Änderung zuerst in src-ts/runtime-executables/ vornehmen.
|
|
15
|
+
* 2. npm run sync:ts-runtime-executables ausführen.
|
|
16
|
+
* 3. npm run test:runtime-executables prüfen.
|
|
17
|
+
*/
|
|
1
18
|
/**
|
|
2
19
|
* NexoWatt Detail-Kommentar (DE)
|
|
3
20
|
* Zweck dieser Ergänzung:
|