iobroker.metermaster 0.9.1 → 0.9.3

package/README.md

@@ -2,7 +2,7 @@
 
 [![MeterMaster Banner](https://github.com/MPunktBPunkt/ioBroker.metermaster/raw/main/github-banner.svg)](https://github.com/MPunktBPunkt/ioBroker.metermaster)
 
-[![Version](https://img.shields.io/badge/version-0.9.1-blue.svg)](https://github.com/MPunktBPunkt/ioBroker.metermaster)
+[![Version](https://img.shields.io/badge/version-0.9.3-blue.svg)](https://github.com/MPunktBPunkt/ioBroker.metermaster)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/MPunktBPunkt/ioBroker.metermaster/blob/main/LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D22-brightgreen.svg)](https://nodejs.org)
 
@@ -247,6 +247,14 @@ iobroker restart metermaster.0
 
 ## Changelog
 
+### 0.9.3
+- Fix state roles for ioBroker object structure check (repochecker E1008/E1009/E1011)
+- Migration of existing objects on adapter start
+
+### 0.9.2
+- Adapter checker compliance: npm news cleanup, devDependencies, trusted publishing
+- npm publish via GitHub Actions with provenance
+
 ### 0.9.1
 - Lowered admin dependency to >=7.6.20 (fixes startup when admin 7.7.x is installed)
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "metermaster",
-    "version": "0.9.1",
+    "version": "0.9.3",
     "news": {
+      "0.9.3": {
+        "en": "Fix state roles for ioBroker object structure check (date, text, json, info.firmware)",
+        "de": "State-Rollen für ioBroker-Objektstruktur-Prüfung korrigiert (date, text, json, info.firmware)",
+        "ru": "Исправлены роли states для проверки структуры объектов ioBroker",
+        "pt": "Corrigidas roles de states para verificação da estrutura de objetos ioBroker",
+        "nl": "State-rollen gecorrigeerd voor ioBroker objectstructuurcontrole",
+        "fr": "Rôles des states corrigés pour la vérification de structure d'objets ioBroker",
+        "it": "Corrette le role degli state per il controllo struttura oggetti ioBroker",
+        "es": "Corregidos roles de states para verificación de estructura de objetos ioBroker",
+        "pl": "Poprawiono role states dla kontroli struktury obiektów ioBroker",
+        "uk": "Виправлено ролі states для перевірки структури об'єктів ioBroker",
+        "zh-cn": "修复 state 角色以通过 ioBroker 对象结构检查"
+      },
+      "0.9.2": {
+        "en": "Adapter checker compliance: npm news cleanup, devDependencies, trusted publishing",
+        "de": "Adapter-Checker-Konformität: npm-News bereinigt, devDependencies, Trusted Publishing",
+        "ru": "Соответствие adapter checker: очистка npm news, devDependencies, trusted publishing",
+        "pt": "Conformidade com adapter checker: limpeza npm news, devDependencies, trusted publishing",
+        "nl": "Adapter-checker conformiteit: npm news opgeschoond, devDependencies, trusted publishing",
+        "fr": "Conformité adapter checker : nettoyage npm news, devDependencies, trusted publishing",
+        "it": "Conformità adapter checker: pulizia npm news, devDependencies, trusted publishing",
+        "es": "Conformidad adapter checker: limpieza npm news, devDependencies, trusted publishing",
+        "pl": "Zgodność z adapter checker: czyszczenie npm news, devDependencies, trusted publishing",
+        "uk": "Відповідність adapter checker: очищення npm news, devDependencies, trusted publishing",
+        "zh-cn": "适配器检查器合规：清理 npm news、devDependencies、trusted publishing"
+      },
       "0.9.1": {
         "en": "Lowered admin dependency to >=7.6.20 (fixes startup with admin 7.7.x)",
         "de": "Admin-Abhängigkeit auf >=7.6.20 gesenkt (behebt Start mit admin 7.7.x)",
@@ -15,84 +41,6 @@
         "pl": "Obniżono zależność admin do >=7.6.20 (naprawia start z admin 7.7.x)",
         "uk": "Знижено залежність admin до >=7.6.20 (виправлено запуск з admin 7.7.x)",
         "zh-cn": "降低 admin 依赖至 >=7.6.20（修复 admin 7.7.x 下无法启动）"
-      },
-      "0.9.0": {
-        "en": "Finalized for ioBroker repository: CI/CD testing, adapter checker compliance, English README, updated dependencies",
-        "de": "Finalisiert für ioBroker-Repository: CI/CD-Tests, Adapter-Checker-Konformität, englisches README, aktualisierte Abhängigkeiten",
-        "ru": "Финализация для репозитория ioBroker: CI/CD-тестирование, соответствие проверке адаптера, README на английском, обновлённые зависимости",
-        "pt": "Finalizado para o repositório ioBroker: testes CI/CD, conformidade com o verificador de adaptadores, README em inglês, dependências atualizadas",
-        "nl": "Afgerond voor ioBroker-repository: CI/CD-tests, naleving adapter-checker, Engelstalige README, bijgewerkte afhankelijkheden",
-        "fr": "Finalisé pour le dépôt ioBroker : tests CI/CD, conformité au vérificateur d'adaptateurs, README en anglais, dépendances mises à jour",
-        "it": "Finalizzato per il repository ioBroker: test CI/CD, conformità al checker degli adapter, README in inglese, dipendenze aggiornate",
-        "es": "Finalizado para el repositorio ioBroker: pruebas CI/CD, cumplimiento del verificador de adaptadores, README en inglés, dependencias actualizadas",
-        "pl": "Sfinalizowano dla repozytorium ioBroker: testy CI/CD, zgodność z adapter checker, angielskie README, zaktualizowane zależności",
-        "uk": "Фіналізовано для репозиторію ioBroker: CI/CD-тестування, відповідність перевірці адаптера, README англійською, оновлені залежності",
-        "zh-cn": "为 ioBroker 仓库完成最终化：CI/CD 测试、适配器检查器合规、英文 README、更新依赖项"
-      },
-      "0.8.3": {
-        "en": "Chart: linear time axis, yearly consumption projection toggle, README screenshots",
-        "de": "Chart: lineare Zeitachse, Jahresverbrauch-Hochrechnung, README-Screenshots",
-        "ru": "График: линейная временная ось, переключатель годового прогноза потребления, скриншоты README",
-        "pt": "Gráfico: eixo de tempo linear, alternância de projeção de consumo anual, capturas de tela no README",
-        "nl": "Grafiek: lineaire tijdas, schakelaar voor jaarlijks verbruiksprognose, README-screenshots",
-        "fr": "Graphique : axe temporel linéaire, bascule de projection de consommation annuelle, captures README",
-        "it": "Grafico: asse temporale lineare, opzione proiezione consumo annuale, screenshot README",
-        "es": "Gráfico: eje de tiempo lineal, alternancia de proyección de consumo anual, capturas README",
-        "pl": "Wykres: liniowa oś czasu, przełącznik prognozy rocznego zużycia, zrzuty ekranu README",
-        "uk": "Графік: лінійна часова вісь, перемикач річного прогнозу споживання, скріншоти README",
-        "zh-cn": "图表：线性时间轴、年度消耗预测切换、README 截图"
-      },
-      "0.8.2": {
-        "en": "Bugfix: chart modal close button and range filters (modals moved before script init)",
-        "de": "Bugfix: Chart-Modal X-Schliessen und Zeitraum-Buttons (Modals vor Script-Init)",
-        "ru": "Исправление: кнопка закрытия модального окна графика и фильтры диапазона",
-        "pt": "Correção: botão de fechar do modal do gráfico e filtros de intervalo",
-        "nl": "Bugfix: sluitknop grafiekmodal en bereikfilters",
-        "fr": "Correction : bouton de fermeture du modal graphique et filtres de plage",
-        "it": "Bugfix: pulsante chiusura modale grafico e filtri intervallo",
-        "es": "Corrección: botón cerrar del modal de gráfico y filtros de rango",
-        "pl": "Poprawka: przycisk zamykania modala wykresu i filtry zakresu",
-        "uk": "Виправлення: кнопка закриття модального вікна графіка та фільтри діапазону",
-        "zh-cn": "修复：图表模态框关闭按钮和范围过滤器"
-      },
-      "0.8.1": {
-        "en": "Bugfix: literal newline in CSV export JS broke entire Web-UI (SyntaxError)",
-        "de": "Bugfix: Literal-Zeilenumbruch im CSV-Export-JS brach gesamte Web-UI (SyntaxError)",
-        "ru": "Исправление: литеральный перевод строки в JS экспорта CSV ломал Web-UI",
-        "pt": "Correção: quebra de linha literal no JS de exportação CSV quebrava a Web-UI",
-        "nl": "Bugfix: letterlijke regeleinde in CSV-export-JS brak de hele Web-UI",
-        "fr": "Correction : saut de ligne littéral dans le JS d'export CSV cassait la Web-UI",
-        "it": "Bugfix: newline letterale nel JS di export CSV rompeva l'intera Web-UI",
-        "es": "Corrección: salto de línea literal en JS de exportación CSV rompía la Web-UI",
-        "pl": "Poprawka: dosłowny znak nowej linii w JS eksportu CSV psuł całą Web-UI",
-        "uk": "Виправлення: літеральний перенос рядка в JS експорту CSV ламав Web-UI",
-        "zh-cn": "修复：CSV 导出 JS 中的字面换行符导致 Web-UI 语法错误"
-      },
-      "0.8.0": {
-        "en": "Charts per meter (Chart.js modal), consumption KPI, CSV export, DE/EN language switch, TotalWater/HeatMeter icons",
-        "de": "Charts pro Zaehler (Chart.js-Modal), Verbrauchs-KPI, CSV-Export, Sprachumschalter DE/EN, TotalWater/HeatMeter Icons",
-        "ru": "Графики по счётчикам, KPI потребления, экспорт CSV, переключатель DE/EN, иконки TotalWater/HeatMeter",
-        "pt": "Gráficos por medidor, KPI de consumo, exportação CSV, alternância DE/EN, ícones TotalWater/HeatMeter",
-        "nl": "Grafieken per meter, verbruiks-KPI, CSV-export, DE/EN-taalschakelaar, TotalWater/HeatMeter-iconen",
-        "fr": "Graphiques par compteur, KPI de consommation, export CSV, bascule DE/EN, icônes TotalWater/HeatMeter",
-        "it": "Grafici per contatore, KPI consumo, export CSV, switch lingua DE/EN, icone TotalWater/HeatMeter",
-        "es": "Gráficos por medidor, KPI de consumo, exportación CSV, cambio DE/EN, iconos TotalWater/HeatMeter",
-        "pl": "Wykresy na licznik, KPI zużycia, eksport CSV, przełącznik DE/EN, ikony TotalWater/HeatMeter",
-        "uk": "Графіки на лічильник, KPI споживання, експорт CSV, перемикач DE/EN, іконки TotalWater/HeatMeter",
-        "zh-cn": "每表图表、消耗 KPI、CSV 导出、DE/EN 语言切换、TotalWater/HeatMeter 图标"
-      },
-      "0.7.6": {
-        "en": "Login modal for auth (no more browser prompt), newest logs on top",
-        "de": "Login-Modal fuer Auth (kein Browser-Prompt mehr), neueste Logs oben",
-        "ru": "Модальное окно входа для аутентификации, новейшие логи сверху",
-        "pt": "Modal de login para autenticação, logs mais recentes no topo",
-        "nl": "Loginmodal voor auth, nieuwste logs bovenaan",
-        "fr": "Modal de connexion pour l'auth, journaux les plus récents en haut",
-        "it": "Modale login per auth, log più recenti in alto",
-        "es": "Modal de inicio de sesión para auth, logs más recientes arriba",
-        "pl": "Modal logowania dla auth, najnowsze logi na górze",
-        "uk": "Модальне вікно входу для auth, найновіші логи зверху",
-        "zh-cn": "登录模态框认证，最新日志在顶部"
       }
     },
     "titleLang": {
@@ -158,8 +106,7 @@
       {
         "admin": ">=7.6.20"
       }
-    ],
-    "installedFrom": "MPunktBPunkt/ioBroker.metermaster#78e6ba943660d68a56ac762643cc99976c985ceb"
+    ]
   },
   "native": {
     "port": 8089,

package/main.js

@@ -6,7 +6,7 @@ const crypto = require('node:crypto');
 const https  = require('node:https');
 const { exec } = require('node:child_process');
 
-const CURRENT_VERSION = '0.9.1';
+const CURRENT_VERSION = '0.9.3';
 const GITHUB_REPO     = 'MPunktBPunkt/ioBroker.metermaster';
 const GITHUB_URL      = 'https://github.com/MPunktBPunkt/ioBroker.metermaster';
 
@@ -81,6 +81,7 @@ adapter.on('ready', async () => {
     // In-Memory-Cache aus gespeicherten ioBroker-States wiederherstellen
     await restoreCacheFromStates();
     await restoreNodesFromStates();
+    await migrateStateRoles();
 
     // ESP32-Node-States beobachten (Heartbeat-Erkennung via simple-api)
     adapter.subscribeStates('nodes.*');
@@ -215,11 +216,11 @@ async function ensureNodeStates(mac) {
     await ensureChannel(base,         `ESP32 Node ${mac}`);
     await ensureState(`${base}.ip`,        { name: 'IP-Adresse',           type: 'string', role: 'info.ip',      read: true, write: false });
     await ensureState(`${base}.name`,      { name: 'Gerätename',           type: 'string', role: 'info.name',    read: true, write: false });
-    await ensureState(`${base}.version`,   { name: 'Firmware-Version',     type: 'string', role: 'info.version', read: true, write: false });
-    await ensureState(`${base}.lastSeen`,  { name: 'Zuletzt gesehen (ms)', type: 'number', role: 'value.time',   read: true, write: false });
-    await ensureState(`${base}.config`,    { name: 'Konfiguration (JSON)', type: 'string', role: 'value',        read: true, write: true  });
-    await ensureState(`${base}.configAck`, { name: 'Config-Quittierung',   type: 'string', role: 'value',        read: true, write: false });
-    await ensureState(`${base}.cmd`,       { name: 'Befehl (JSON)',         type: 'string', role: 'value',        read: true, write: true  });
+    await ensureState(`${base}.version`,   { name: 'Firmware-Version',     type: 'string', role: 'info.firmware', read: true, write: false });
+    await ensureState(`${base}.lastSeen`,  { name: 'Zuletzt gesehen (ms)', type: 'number', role: 'value.time',    read: true, write: false });
+    await ensureState(`${base}.config`,    { name: 'Konfiguration (JSON)', type: 'string', role: 'json',          read: true, write: true  });
+    await ensureState(`${base}.configAck`, { name: 'Config-Quittierung',   type: 'string', role: 'json',          read: true, write: false });
+    await ensureState(`${base}.cmd`,       { name: 'Befehl (JSON)',         type: 'string', role: 'json',          read: true, write: true  });
 }
 
 // ─── HTTP-Server ──────────────────────────────────────────────────────────────
@@ -478,10 +479,10 @@ async function storeReading(data) {
     if (isNew) log(LVL.INFO, CAT.DATAPOINT, `Neuer Zähler`, `metermaster.0.${base}`);
 
     const dpNew = await ensureState(`${base}.readings.latest`,     { name: `${data.meter} – Letzter Wert`, type: 'number', role: 'value', unit: data.unit||'', read: true, write: false });
-    await ensureState(`${base}.readings.latestDate`, { name: 'Ablesedatum',          type: 'string', role: 'value.datetime', read: true, write: false });
-    await ensureState(`${base}.name`,                { name: 'Zählername',           type: 'string', role: 'info.name',      read: true, write: false });
-    await ensureState(`${base}.unit`,                { name: 'Einheit',              type: 'string', role: 'value.unit',     read: true, write: false });
-    await ensureState(`${base}.typeName`,            { name: 'Zählertyp',            type: 'string', role: 'info.type',      read: true, write: false });
+    await ensureState(`${base}.readings.latestDate`, { name: 'Ablesedatum',          type: 'string', role: 'date',      read: true, write: false });
+    await ensureState(`${base}.name`,                { name: 'Zählername',           type: 'string', role: 'info.name', read: true, write: false });
+    await ensureState(`${base}.unit`,                { name: 'Einheit',              type: 'string', role: 'text',      read: true, write: false });
+    await ensureState(`${base}.typeName`,            { name: 'Zählertyp',            type: 'string', role: 'text',      read: true, write: false });
     await ensureState(`${base}.readings.history`,    { name: 'Historische Ablesungen', type: 'array', role: 'list',          read: true, write: false });
 
     if (dpNew) log(LVL.INFO, CAT.DATAPOINT, `Datenpunkte angelegt`, `${base}.readings.{latest,latestDate,history} + name/unit/typeName`);
@@ -532,20 +533,72 @@ async function ensureChannel(id, name) {
     return true;
 }
 async function ensureState(id, common) {
+    const fullCommon = {
+        ...common,
+        read:  common.read  !== undefined ? common.read  : true,
+        write: common.write !== undefined ? common.write : false,
+        def:   common.type  === 'number'  ? 0 : (common.type === 'array' ? '[]' : '')
+    };
     const ex = await adapter.getObjectAsync(id).catch(() => null);
-    if (ex) return false;
+    if (ex) {
+        const patch = {};
+        for (const key of ['role', 'type', 'read', 'write', 'unit']) {
+            if (fullCommon[key] !== undefined && ex.common[key] !== fullCommon[key]) {
+                patch[key] = fullCommon[key];
+            }
+        }
+        if (Object.keys(patch).length) {
+            await adapter.extendObjectAsync(id, { common: patch });
+        }
+        return false;
+    }
     await adapter.setObjectNotExistsAsync(id, {
         type: 'state',
-        common: { ...common,
-            read:  common.read  !== undefined ? common.read  : true,
-            write: common.write !== undefined ? common.write : false,
-            def:   common.type  === 'number'  ? 0 : (common.type === 'array' ? '[]' : '')
-        },
+        common: fullCommon,
         native: {}
     });
     return true;
 }
 
+// ─── State-Rollen-Migration (deprecated → ioBroker-Rollenkatalog) ───────────────
+const DEPRECATED_ROLE_MAP = {
+    'value.datetime': 'date',
+    'value.unit':     'text',
+    'info.type':      'text',
+    'info.version':   'info.firmware',
+};
+
+function resolveMigratedRole(id, common) {
+    if (DEPRECATED_ROLE_MAP[common.role]) {
+        return DEPRECATED_ROLE_MAP[common.role];
+    }
+    if (common.role === 'value' && common.type === 'string') {
+        const field = id.split('.').pop();
+        if (field === 'config' || field === 'configAck' || field === 'cmd') {
+            return 'json';
+        }
+    }
+    return null;
+}
+
+async function migrateStateRoles() {
+    try {
+        const objects = await adapter.getForeignObjectsAsync('*', { type: 'state' });
+        if (!objects) return;
+        let fixed = 0;
+        for (const [id, obj] of Object.entries(objects)) {
+            const newRole = resolveMigratedRole(id, obj.common || {});
+            if (newRole && obj.common.role !== newRole) {
+                await adapter.extendObjectAsync(id, { common: { role: newRole } });
+                fixed++;
+            }
+        }
+        if (fixed) log(LVL.INFO, CAT.SYSTEM, 'State-Rollen migriert', `${fixed} Objekte`);
+    } catch (e) {
+        log(LVL.WARN, CAT.SYSTEM, 'State-Rollen-Migration fehlgeschlagen', e.message);
+    }
+}
+
 // ─── API Endpunkte ────────────────────────────────────────────────────────────
 function serveDataJson(res) {
     sendJson(res, 200, { data: receivedData, receivedTotal: readingsReceived });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.metermaster",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "ioBroker adapter for the MeterMaster Android app – receives meter readings and manages ESP32 display nodes",
   "author": {
     "name": "MPunktBPunkt",
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/MPunktBPunkt/ioBroker.metermaster.git"
+    "url": "git+https://github.com/MPunktBPunkt/ioBroker.metermaster.git"
   },
   "bugs": {
     "url": "https://github.com/MPunktBPunkt/ioBroker.metermaster/issues"
@@ -39,7 +39,11 @@
   "devDependencies": {
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.3.4",
-    "@iobroker/testing": "^5.2.2"
+    "@iobroker/testing": "^5.3.0",
+    "@types/node": ">=22"
+  },
+  "publishConfig": {
+    "provenance": true
   },
   "files": [
     "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",