iobroker.pvnode 0.2.2 → 0.2.4
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/README.md +17 -1
- package/io-package.json +47 -3
- package/lib/states.js +1084 -121
- package/lib/svg.js +2 -2
- package/main.js +96 -160
- package/package.json +1 -1
package/lib/svg.js
CHANGED
|
@@ -74,7 +74,7 @@ function pathFrom(points) {
|
|
|
74
74
|
* @param {string[]} [opt.stringNames] names per string index
|
|
75
75
|
*/
|
|
76
76
|
function dayChart(p, now, opt = {}) {
|
|
77
|
-
const T = TEXT[opt.lang] || TEXT.
|
|
77
|
+
const T = TEXT[opt.lang] || TEXT.en;
|
|
78
78
|
const W = 1000;
|
|
79
79
|
const H = 360;
|
|
80
80
|
const m = { l: 56, r: 16, t: 34, b: 34 };
|
|
@@ -189,7 +189,7 @@ function dayChart(p, now, opt = {}) {
|
|
|
189
189
|
* @param {string} [opt.lang] 'de' | 'en'
|
|
190
190
|
*/
|
|
191
191
|
function daysChart(p, now, opt = {}) {
|
|
192
|
-
const T = TEXT[opt.lang] || TEXT.
|
|
192
|
+
const T = TEXT[opt.lang] || TEXT.en;
|
|
193
193
|
const today = localDate(now, p.tz);
|
|
194
194
|
const days = p.daily.filter(d => d.date >= today && typeof d.pv_energy_kwh === 'number');
|
|
195
195
|
const W = 600;
|
package/main.js
CHANGED
|
@@ -15,11 +15,13 @@
|
|
|
15
15
|
const utils = require('@iobroker/adapter-core');
|
|
16
16
|
const { PvnodeApi, PvnodeError } = require('./lib/api');
|
|
17
17
|
const { prepare, computeStates, chartSeries, WEATHER_FIELDS } = require('./lib/compute');
|
|
18
|
-
const { CHANNELS, commonFor } = require('./lib/states');
|
|
18
|
+
const { CHANNELS, FIXED, REFRESH_NAME, commonFor, channelName, stringChannelName } = require('./lib/states');
|
|
19
19
|
const { localDate, isoLocal } = require('./lib/time');
|
|
20
20
|
const { dayChart, daysChart } = require('./lib/svg');
|
|
21
21
|
|
|
22
22
|
const GRACE_MS = 30 * 1000;
|
|
23
|
+
// random extra delay per instance, so not all installations poll pvnode at the same second
|
|
24
|
+
const JITTER_MAX_MS = 90 * 1000;
|
|
23
25
|
const MIN_DELAY_MS = 60 * 1000;
|
|
24
26
|
const MAX_DELAY_MS = 24 * 3600 * 1000;
|
|
25
27
|
const FALLBACK_DELAY_MS = 3600 * 1000;
|
|
@@ -30,13 +32,28 @@ const MAX_STRINGS = 8;
|
|
|
30
32
|
const OPTIONAL_GROUPS = ['weather', 'irradiance', 'clearsky'];
|
|
31
33
|
|
|
32
34
|
function compass(deg) {
|
|
33
|
-
const names = ['N', '
|
|
35
|
+
const names = ['N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW'];
|
|
34
36
|
if (typeof deg !== 'number') {
|
|
35
37
|
return '?';
|
|
36
38
|
}
|
|
37
39
|
return names[Math.round((((deg % 360) + 360) % 360) / 45) % 8];
|
|
38
40
|
}
|
|
39
41
|
|
|
42
|
+
/**
|
|
43
|
+
* Quota header value as number: "unmetered" (plans without a cap) = -1, unknown = null.
|
|
44
|
+
*
|
|
45
|
+
* @param {unknown} v parsed header value
|
|
46
|
+
*/
|
|
47
|
+
function quotaNumber(v) {
|
|
48
|
+
if (typeof v === 'number' && Number.isFinite(v)) {
|
|
49
|
+
return v;
|
|
50
|
+
}
|
|
51
|
+
if (typeof v === 'string' && v.trim().toLowerCase() === 'unmetered') {
|
|
52
|
+
return -1;
|
|
53
|
+
}
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
|
|
40
57
|
class Pvnode extends utils.Adapter {
|
|
41
58
|
constructor(options = {}) {
|
|
42
59
|
super({ ...options, name: 'pvnode' });
|
|
@@ -53,8 +70,10 @@ class Pvnode extends utils.Adapter {
|
|
|
53
70
|
this.polling = false;
|
|
54
71
|
this.stopped = false;
|
|
55
72
|
this.created = new Set();
|
|
56
|
-
this.lang = '
|
|
73
|
+
this.lang = 'en';
|
|
57
74
|
this.stringNames = [];
|
|
75
|
+
this.pollOffsetMs = GRACE_MS + Math.floor(Math.random() * JITTER_MAX_MS);
|
|
76
|
+
this.customWarned = new Set();
|
|
58
77
|
|
|
59
78
|
this.on('ready', this.onReady.bind(this));
|
|
60
79
|
this.on('stateChange', this.onStateChange.bind(this));
|
|
@@ -76,7 +95,7 @@ class Pvnode extends utils.Adapter {
|
|
|
76
95
|
const sys = await this.getForeignObjectAsync('system.config');
|
|
77
96
|
this.lang = sys && sys.common && sys.common.language === 'de' ? 'de' : 'en';
|
|
78
97
|
} catch {
|
|
79
|
-
this.lang = '
|
|
98
|
+
this.lang = 'en';
|
|
80
99
|
}
|
|
81
100
|
|
|
82
101
|
const apiKey = String(this.config.apiKey || '').trim();
|
|
@@ -130,7 +149,7 @@ class Pvnode extends utils.Adapter {
|
|
|
130
149
|
const restored = await this.restoreCache();
|
|
131
150
|
if (restored && restored.nextPollAt && restored.nextPollAt > Date.now()) {
|
|
132
151
|
this.log.info(`Using cached forecast, next poll at ${new Date(restored.nextPollAt).toISOString()}`);
|
|
133
|
-
this.schedulePoll(restored.nextPollAt - Date.now() +
|
|
152
|
+
this.schedulePoll(restored.nextPollAt - Date.now() + this.pollOffsetMs);
|
|
134
153
|
} else {
|
|
135
154
|
await this.poll();
|
|
136
155
|
}
|
|
@@ -202,7 +221,9 @@ class Pvnode extends utils.Adapter {
|
|
|
202
221
|
this.pollTimer = null;
|
|
203
222
|
this.poll().catch(e => this.log.error(`Poll failed: ${e.message}`));
|
|
204
223
|
}, delay);
|
|
205
|
-
this.
|
|
224
|
+
this.setStateAsync('info.nextPoll', new Date(Date.now() + delay).toISOString(), true).catch(e =>
|
|
225
|
+
this.log.debug(`Could not write info.nextPoll: ${e.message}`),
|
|
226
|
+
);
|
|
206
227
|
this.log.debug(`Next poll in ${Math.round(delay / 60000)} min`);
|
|
207
228
|
}
|
|
208
229
|
|
|
@@ -273,7 +294,7 @@ class Pvnode extends utils.Adapter {
|
|
|
273
294
|
await this.setStateAsync('info.lastError', '', true);
|
|
274
295
|
|
|
275
296
|
const next = body.next_poll_at ? Date.parse(body.next_poll_at) : NaN;
|
|
276
|
-
this.schedulePoll(Number.isFinite(next) ? next - Date.now() +
|
|
297
|
+
this.schedulePoll(Number.isFinite(next) ? next - Date.now() + this.pollOffsetMs : FALLBACK_DELAY_MS);
|
|
277
298
|
if (manual) {
|
|
278
299
|
this.log.info('Manual refresh done');
|
|
279
300
|
}
|
|
@@ -318,7 +339,7 @@ class Pvnode extends utils.Adapter {
|
|
|
318
339
|
const until = Number.isFinite(reset) ? reset : Date.now() + MAX_DELAY_MS;
|
|
319
340
|
this.log.warn(`pvnode monthly request limit reached. Pausing until ${new Date(until).toISOString()}`);
|
|
320
341
|
await this.setStateAsync('info.stale', true, true);
|
|
321
|
-
this.schedulePoll(Math.min(until - Date.now() +
|
|
342
|
+
this.schedulePoll(Math.min(until - Date.now() + this.pollOffsetMs, MAX_DELAY_MS));
|
|
322
343
|
return;
|
|
323
344
|
}
|
|
324
345
|
|
|
@@ -385,21 +406,9 @@ class Pvnode extends utils.Adapter {
|
|
|
385
406
|
// charts are only rebuilt when a new payload arrives
|
|
386
407
|
const now = Date.now();
|
|
387
408
|
const today = localDate(now, tz);
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
name: { en: 'Full forecast series', de: 'Komplette Prognosekurve' },
|
|
392
|
-
});
|
|
393
|
-
await this.ensureState('json.today', {
|
|
394
|
-
type: 'string',
|
|
395
|
-
role: 'json',
|
|
396
|
-
name: { en: 'Forecast series today', de: 'Prognosekurve heute' },
|
|
397
|
-
});
|
|
398
|
-
await this.ensureState('json.daily', {
|
|
399
|
-
type: 'string',
|
|
400
|
-
role: 'json',
|
|
401
|
-
name: { en: 'Daily forecast', de: 'Tagesprognose' },
|
|
402
|
-
});
|
|
409
|
+
for (const id of ['json.forecast', 'json.today', 'json.daily']) {
|
|
410
|
+
await this.ensureState(id);
|
|
411
|
+
}
|
|
403
412
|
await this.setStateAsync('json.forecast', JSON.stringify(chartSeries(this.prepared)), true);
|
|
404
413
|
await this.setStateAsync(
|
|
405
414
|
'json.today',
|
|
@@ -446,19 +455,11 @@ class Pvnode extends utils.Adapter {
|
|
|
446
455
|
'html.days': () => daysChart(p, now, opt),
|
|
447
456
|
};
|
|
448
457
|
for (const [id, fn] of Object.entries(charts)) {
|
|
449
|
-
await this.ensureState(id
|
|
458
|
+
await this.ensureState(id);
|
|
450
459
|
await this.setStateAsync(id, fn(), true);
|
|
451
460
|
}
|
|
452
461
|
}
|
|
453
462
|
|
|
454
|
-
chartName(id) {
|
|
455
|
-
return {
|
|
456
|
-
'html.today': { en: 'SVG chart: power curve today', de: 'SVG-Diagramm: Leistungskurve heute' },
|
|
457
|
-
'html.tomorrow': { en: 'SVG chart: power curve tomorrow', de: 'SVG-Diagramm: Leistungskurve morgen' },
|
|
458
|
-
'html.days': { en: 'SVG chart: daily energy', de: 'SVG-Diagramm: Tagesertrag' },
|
|
459
|
-
}[id];
|
|
460
|
-
}
|
|
461
|
-
|
|
462
463
|
startComputeTimer() {
|
|
463
464
|
const now = Date.now();
|
|
464
465
|
const toNext = COMPUTE_INTERVAL_MS - (now % COMPUTE_INTERVAL_MS) + 2000;
|
|
@@ -474,94 +475,27 @@ class Pvnode extends utils.Adapter {
|
|
|
474
475
|
// ------------------------------------------------------------------ objects
|
|
475
476
|
|
|
476
477
|
async createBaseObjects() {
|
|
478
|
+
// extendObject (not setObjectNotExists) so that existing installations get updated names/types
|
|
477
479
|
for (const [ch, name] of Object.entries(CHANNELS)) {
|
|
478
|
-
await this.
|
|
480
|
+
await this.extendObjectAsync(ch, { type: 'channel', common: { name }, native: {} });
|
|
481
|
+
this.created.add(ch);
|
|
479
482
|
}
|
|
480
|
-
const
|
|
481
|
-
'info.
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
de: 'Prognose veraltet (letzte Abfrage fehlgeschlagen)',
|
|
492
|
-
},
|
|
493
|
-
},
|
|
494
|
-
'info.lastError': { type: 'string', role: 'text', name: { en: 'Last error', de: 'Letzter Fehler' } },
|
|
495
|
-
'info.lastUpdate': {
|
|
496
|
-
type: 'string',
|
|
497
|
-
role: 'date',
|
|
498
|
-
name: { en: 'Last successful request', de: 'Letzte erfolgreiche Abfrage' },
|
|
499
|
-
},
|
|
500
|
-
'info.computedAt': {
|
|
501
|
-
type: 'string',
|
|
502
|
-
role: 'text',
|
|
503
|
-
name: { en: 'Forecast computed at (pvnode)', de: 'Prognose berechnet um (pvnode)' },
|
|
504
|
-
},
|
|
505
|
-
'info.nextPoll': { type: 'string', role: 'date', name: { en: 'Next request', de: 'Nächste Abfrage' } },
|
|
506
|
-
'info.requestsLimit': {
|
|
507
|
-
type: 'mixed',
|
|
508
|
-
role: 'value',
|
|
509
|
-
name: { en: 'Monthly request limit', de: 'Monatliches Anfragelimit' },
|
|
510
|
-
},
|
|
511
|
-
'info.requestsUsed': {
|
|
512
|
-
type: 'number',
|
|
513
|
-
role: 'value',
|
|
514
|
-
name: { en: 'Requests used this month', de: 'Anfragen diesen Monat verbraucht' },
|
|
515
|
-
},
|
|
516
|
-
'info.requestsRemaining': {
|
|
517
|
-
type: 'mixed',
|
|
518
|
-
role: 'value',
|
|
519
|
-
name: { en: 'Requests remaining this month', de: 'Verbleibende Anfragen diesen Monat' },
|
|
520
|
-
},
|
|
521
|
-
'info.requestsReset': {
|
|
522
|
-
type: 'string',
|
|
523
|
-
role: 'date',
|
|
524
|
-
name: { en: 'Request counter reset', de: 'Zurücksetzung des Anfragezählers' },
|
|
525
|
-
},
|
|
526
|
-
'info.availableGroups': {
|
|
527
|
-
type: 'string',
|
|
528
|
-
role: 'text',
|
|
529
|
-
name: { en: 'Data groups allowed by plan', de: 'Vom Plan erlaubte Datengruppen' },
|
|
530
|
-
},
|
|
531
|
-
'info.variability': {
|
|
532
|
-
type: 'boolean',
|
|
533
|
-
role: 'indicator',
|
|
534
|
-
name: { en: 'Variability band available', de: 'Schwankungsband verfügbar' },
|
|
535
|
-
},
|
|
536
|
-
'info.forecastDays': {
|
|
537
|
-
type: 'number',
|
|
538
|
-
role: 'value',
|
|
539
|
-
name: { en: 'Number of forecast days', de: 'Anzahl Prognosetage' },
|
|
540
|
-
},
|
|
541
|
-
'info.cache': {
|
|
542
|
-
type: 'string',
|
|
543
|
-
role: 'json',
|
|
544
|
-
name: { en: 'Cached forecast (internal)', de: 'Zwischengespeicherte Prognose (intern)' },
|
|
545
|
-
},
|
|
546
|
-
'site.name': { type: 'string', role: 'text', name: { en: 'Site name', de: 'Name des Standorts' } },
|
|
547
|
-
'site.id': { type: 'string', role: 'text', name: { en: 'Site ID', de: 'Standort-ID' } },
|
|
548
|
-
'site.power_kw': {
|
|
549
|
-
type: 'number',
|
|
550
|
-
role: 'value',
|
|
551
|
-
unit: 'kWp',
|
|
552
|
-
name: { en: 'Installed power', de: 'Installierte Leistung' },
|
|
553
|
-
},
|
|
554
|
-
};
|
|
555
|
-
for (const [id, c] of Object.entries(info)) {
|
|
556
|
-
await this.ensureState(id, c);
|
|
483
|
+
for (const id of Object.keys(FIXED)) {
|
|
484
|
+
if (id.startsWith('info.') || id.startsWith('site.')) {
|
|
485
|
+
await this.ensureState(id);
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
// up to 0.2.2 requestsLimit/requestsRemaining were "mixed" and could hold the text "unmetered"
|
|
489
|
+
for (const id of ['info.requestsLimit', 'info.requestsRemaining']) {
|
|
490
|
+
const st = await this.getStateAsync(id);
|
|
491
|
+
if (st && st.val !== null && typeof st.val !== 'number') {
|
|
492
|
+
await this.setStateAsync(id, quotaNumber(st.val), true);
|
|
493
|
+
}
|
|
557
494
|
}
|
|
558
|
-
await this.
|
|
495
|
+
await this.extendObjectAsync('control.refresh', {
|
|
559
496
|
type: 'state',
|
|
560
497
|
common: {
|
|
561
|
-
name:
|
|
562
|
-
en: 'Refresh forecast now (costs one request)',
|
|
563
|
-
de: 'Prognose jetzt abrufen (kostet eine Anfrage)',
|
|
564
|
-
},
|
|
498
|
+
name: REFRESH_NAME,
|
|
565
499
|
type: 'boolean',
|
|
566
500
|
role: 'button',
|
|
567
501
|
read: false,
|
|
@@ -581,9 +515,9 @@ class Pvnode extends utils.Adapter {
|
|
|
581
515
|
for (let i = 2; i < parts.length; i++) {
|
|
582
516
|
const ch = parts.slice(0, i).join('.');
|
|
583
517
|
if (!this.created.has(ch)) {
|
|
584
|
-
await this.
|
|
518
|
+
await this.extendObjectAsync(ch, {
|
|
585
519
|
type: 'channel',
|
|
586
|
-
common: { name:
|
|
520
|
+
common: { name: channelName(ch) },
|
|
587
521
|
native: {},
|
|
588
522
|
});
|
|
589
523
|
this.created.add(ch);
|
|
@@ -596,30 +530,11 @@ class Pvnode extends utils.Adapter {
|
|
|
596
530
|
this.created.add(id);
|
|
597
531
|
}
|
|
598
532
|
|
|
599
|
-
channelName(ch) {
|
|
600
|
-
const [root, idx] = ch.split('.');
|
|
601
|
-
if (root === 'days') {
|
|
602
|
-
const n = Number(idx);
|
|
603
|
-
if (n === 0) {
|
|
604
|
-
return { en: 'Today', de: 'Heute' };
|
|
605
|
-
}
|
|
606
|
-
if (n === 1) {
|
|
607
|
-
return { en: 'Tomorrow', de: 'Morgen' };
|
|
608
|
-
}
|
|
609
|
-
return { en: `In ${n} days`, de: `In ${n} Tagen` };
|
|
610
|
-
}
|
|
611
|
-
if (root === 'strings') {
|
|
612
|
-
return { en: `String ${Number(idx) + 1}`, de: `String ${Number(idx) + 1}` };
|
|
613
|
-
}
|
|
614
|
-
return ch;
|
|
615
|
-
}
|
|
616
|
-
|
|
617
533
|
async removeSurplus(root, count, max) {
|
|
618
534
|
for (let i = count; i < max; i++) {
|
|
619
535
|
const id = `${root}.${i}`;
|
|
620
536
|
const obj = await this.getObjectAsync(id);
|
|
621
|
-
if (obj) {
|
|
622
|
-
await this.delObjectAsync(id, { recursive: true });
|
|
537
|
+
if (obj && (await this.deleteUnlessCustom(id, true))) {
|
|
623
538
|
for (const k of [...this.created]) {
|
|
624
539
|
if (k === id || k.startsWith(`${id}.`)) {
|
|
625
540
|
this.created.delete(k);
|
|
@@ -629,6 +544,38 @@ class Pvnode extends utils.Adapter {
|
|
|
629
544
|
}
|
|
630
545
|
}
|
|
631
546
|
|
|
547
|
+
/**
|
|
548
|
+
* Delete an own object (optionally with children), but keep it if it or one of its children
|
|
549
|
+
* has custom settings (e.g. history, influxdb, sql), so the user's configuration is not lost.
|
|
550
|
+
*
|
|
551
|
+
* @param {string} id relative id
|
|
552
|
+
* @param {boolean} recursive also delete children
|
|
553
|
+
* @returns {Promise<boolean>} true if deleted
|
|
554
|
+
*/
|
|
555
|
+
async deleteUnlessCustom(id, recursive) {
|
|
556
|
+
const obj = await this.getObjectAsync(id);
|
|
557
|
+
if (!obj) {
|
|
558
|
+
return false;
|
|
559
|
+
}
|
|
560
|
+
const objs = [obj];
|
|
561
|
+
if (recursive) {
|
|
562
|
+
const children = await this.getForeignObjectsAsync(`${this.namespace}.${id}.*`);
|
|
563
|
+
objs.push(...Object.values(children || {}));
|
|
564
|
+
}
|
|
565
|
+
const withCustom = objs.find(o => o && o.common && o.common.custom && Object.keys(o.common.custom).length);
|
|
566
|
+
if (withCustom) {
|
|
567
|
+
if (!this.customWarned.has(id)) {
|
|
568
|
+
this.customWarned.add(id);
|
|
569
|
+
this.log.warn(
|
|
570
|
+
`${withCustom._id || id} is no longer needed but has custom settings (e.g. history), so it is not deleted. Remove the custom settings or delete it manually.`,
|
|
571
|
+
);
|
|
572
|
+
}
|
|
573
|
+
return false;
|
|
574
|
+
}
|
|
575
|
+
await this.delObjectAsync(id, { recursive });
|
|
576
|
+
return true;
|
|
577
|
+
}
|
|
578
|
+
|
|
632
579
|
async cleanupOptionalWeather() {
|
|
633
580
|
const wanted = new Set();
|
|
634
581
|
if (this.config.includeWeather) {
|
|
@@ -646,22 +593,13 @@ class Pvnode extends utils.Adapter {
|
|
|
646
593
|
}
|
|
647
594
|
for (const f of WEATHER_FIELDS) {
|
|
648
595
|
if (!wanted.has(f)) {
|
|
649
|
-
|
|
650
|
-
if (obj) {
|
|
651
|
-
await this.delObjectAsync(`weather.${f}`);
|
|
652
|
-
}
|
|
596
|
+
await this.deleteUnlessCustom(`weather.${f}`, false);
|
|
653
597
|
}
|
|
654
598
|
}
|
|
655
599
|
if (!this.config.includeClearsky) {
|
|
656
|
-
|
|
657
|
-
if (await this.getObjectAsync(id)) {
|
|
658
|
-
await this.delObjectAsync(id);
|
|
659
|
-
}
|
|
660
|
-
}
|
|
600
|
+
await this.deleteUnlessCustom('now.power_clearsky', false);
|
|
661
601
|
for (let i = 0; i < MAX_DAYS; i++) {
|
|
662
|
-
|
|
663
|
-
await this.delObjectAsync(`days.${i}.energy_clearsky`);
|
|
664
|
-
}
|
|
602
|
+
await this.deleteUnlessCustom(`days.${i}.energy_clearsky`, false);
|
|
665
603
|
}
|
|
666
604
|
}
|
|
667
605
|
}
|
|
@@ -674,9 +612,9 @@ class Pvnode extends utils.Adapter {
|
|
|
674
612
|
await this.setStateAsync('site.power_kw', Math.round(total * 100) / 100, true);
|
|
675
613
|
const dirDe = {
|
|
676
614
|
N: 'Nord',
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
615
|
+
NE: 'Nordost',
|
|
616
|
+
E: 'Ost',
|
|
617
|
+
SE: 'Südost',
|
|
680
618
|
S: 'Süd',
|
|
681
619
|
SW: 'Südwest',
|
|
682
620
|
W: 'West',
|
|
@@ -684,9 +622,9 @@ class Pvnode extends utils.Adapter {
|
|
|
684
622
|
};
|
|
685
623
|
const dirEn = {
|
|
686
624
|
N: 'North',
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
625
|
+
NE: 'Northeast',
|
|
626
|
+
E: 'East',
|
|
627
|
+
SE: 'Southeast',
|
|
690
628
|
S: 'South',
|
|
691
629
|
SW: 'Southwest',
|
|
692
630
|
W: 'West',
|
|
@@ -701,9 +639,7 @@ class Pvnode extends utils.Adapter {
|
|
|
701
639
|
const ch = `strings.${i}`;
|
|
702
640
|
await this.extendObjectAsync(ch, {
|
|
703
641
|
type: 'channel',
|
|
704
|
-
common: {
|
|
705
|
-
name: `String ${i + 1}: ${compass(s.orientation)} ${s.orientation}°, ${s.slope}° Neigung, ${s.power_kw} kWp`,
|
|
706
|
-
},
|
|
642
|
+
common: { name: stringChannelName(i, s) },
|
|
707
643
|
native: { string_id: s.id },
|
|
708
644
|
});
|
|
709
645
|
this.created.add(ch);
|
|
@@ -720,9 +656,9 @@ class Pvnode extends utils.Adapter {
|
|
|
720
656
|
if (!q) {
|
|
721
657
|
return;
|
|
722
658
|
}
|
|
723
|
-
await this.setStateAsync('info.requestsLimit', q.limit
|
|
659
|
+
await this.setStateAsync('info.requestsLimit', quotaNumber(q.limit), true);
|
|
724
660
|
await this.setStateAsync('info.requestsUsed', typeof q.used === 'number' ? q.used : null, true);
|
|
725
|
-
await this.setStateAsync('info.requestsRemaining', q.remaining
|
|
661
|
+
await this.setStateAsync('info.requestsRemaining', quotaNumber(q.remaining), true);
|
|
726
662
|
await this.setStateAsync('info.requestsReset', q.reset || null, true);
|
|
727
663
|
}
|
|
728
664
|
}
|