iobroker.admin 5.4.2 → 5.4.6

package/README.md

@@ -90,7 +90,11 @@ The icons may not be reused in other projects without the proper flaticon licens
 -->
 
 ## Changelog
-### 5.4.2 (2022-05-05)
+### 5.4.6 (2022-05-09)
+* (bluefox) Corrected readLogs command
+* (bluefox) Corrected file deletion
+
+### 5.4.3 (2022-05-06)
 * (bluefox) Used common sockets (could be buggy)
 * (bluefox) Added chips to JSON config
 
@@ -105,10 +109,6 @@ The icons may not be reused in other projects without the proper flaticon licens
 * (bluefox) Corrected the host selector in "add instance" dialog
 * (bluefox) corrected display of "null" values, e.g. by time/date
 
-### 5.3.4 (2022-03-27)
-* (Apollon77) Fix some crash cases reported by Sentry
-* (bluefox) Corrected user tab
-
 ## License
 The MIT License (MIT)
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "admin",
-    "version": "5.4.2",
+    "version": "5.4.6",
     "titleLang": {
       "en": "Admin",
       "de": "Admin",
@@ -18,6 +18,30 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
+      "5.4.6": {
+        "en": "Corrected readLogs command\nCorrected file deletion",
+        "de": "readLogs-Befehl korrigiert\nKorrigierte Dateilöschung",
+        "ru": "Исправлена команда readLogs\nИсправлено удаление файла",
+        "pt": "Comando readLogs corrigido\nExclusão de arquivo corrigida",
+        "nl": "Gecorrigeerde readLogs-opdracht\nGecorrigeerde bestandsverwijdering",
+        "fr": "Commande readLogs corrigée\nSuppression de fichier corrigée",
+        "it": "Corretto il comando readLogs\nEliminazione file corretta",
+        "es": "Comando readLogs corregido\nEliminación de archivos corregidos",
+        "pl": "Poprawiono polecenie readLogs\nPoprawione usuwanie plików",
+        "zh-cn": "更正了 readLogs 命令\n更正文件删除"
+      },
+      "5.4.3": {
+        "en": "Used common sockets (could be buggy)\nAdded chips to JSON config",
+        "de": "Gebrauchte gemeinsame Steckdosen (könnte fehlerhaft sein)\nChips zur JSON-Konfiguration hinzugefügt",
+        "ru": "Использовались обычные розетки (могут глючить)\nДобавлены фишки в конфиг JSON",
+        "pt": "Soquetes comuns usados (podem estar com bugs)\nChips adicionados à configuração JSON",
+        "nl": "Gebruikte gemeenschappelijke stopcontacten (kan buggy zijn)\nChips toegevoegd aan JSON-configuratie",
+        "fr": "Prises communes utilisées (pourraient être boguées)\nAjout de puces à la configuration JSON",
+        "it": "Prese comuni usate (potrebbero essere difettose)\nAggiunti chip alla configurazione JSON",
+        "es": "Enchufes comunes usados (podrían tener errores)\nChips agregados a la configuración JSON",
+        "pl": "Używane wspólne gniazda (mogą być wadliwe)\nDodano chipy do konfiguracji JSON",
+        "zh-cn": "使用过的普通插座（可能有问题）\n将芯片添加到 JSON 配置"
+      },
       "5.4.2": {
         "en": "Used common sockets (could be buggy)\nAdded chips to JSON config",
         "de": "Gebrauchte gemeinsame Steckdosen (könnte fehlerhaft sein)\nChips zur JSON-Konfiguration hinzugefügt",
@@ -77,30 +101,6 @@
         "es": "Se corrigió el selector de host en el cuadro de diálogo \"agregar instancia\".\nvisualización corregida de valores \"nulos\", p. por hora/fecha",
         "pl": "Poprawiono selektor hosta w oknie dialogowym „dodaj instancję”\npoprawione wyświetlanie wartości „null”, m.in. według czasu/daty",
         "zh-cn": "更正了“添加实例”对话框中的主机选择器\n更正了“空”值的显示，例如按时间/日期"
-      },
-      "5.3.4": {
-        "en": "Fix some crash cases reported by Sentry\nCorrected user tab",
-        "de": "Einige von Sentry gemeldete Absturzfälle behoben\nBenutzerregisterkarte korrigiert",
-        "ru": "Исправьте некоторые случаи сбоев, о которых сообщил Sentry.\nИсправлена вкладка пользователя",
-        "pt": "Corrija alguns casos de travamento relatados pelo Sentinela\nAba de usuário corrigida",
-        "nl": "Enkele door Sentry gemelde crashgevallen oplossen\nGecorrigeerd gebruikerstabblad",
-        "fr": "Correction de certains cas de plantage signalés par Sentry\nOnglet utilisateur corrigé",
-        "it": "Risolvi alcuni casi di crash segnalati da Sentry\nScheda utente corretta",
-        "es": "Solucionar algunos casos de fallas informados por Sentry\nPestaña de usuario corregida",
-        "pl": "Napraw niektóre przypadki awarii zgłoszone przez Sentry\nPoprawiona zakładka użytkownika",
-        "zh-cn": "修复 Sentry 报告的一些崩溃案例\n更正了用户选项卡"
-      },
-      "5.3.3": {
-        "en": "Implemented the objects coloring depends on other states",
-        "de": "Die implementierte Objektfarbe hängt von anderen Zuständen ab",
-        "ru": "Реализована окраска объектов в зависимости от других состояний",
-        "pt": "Implementado a coloração dos objetos depende de outros estados",
-        "nl": "Geïmplementeerd de objecten kleuren is afhankelijk van andere staten",
-        "fr": "Implémenté la coloration des objets dépend d'autres états",
-        "it": "Implementata la colorazione degli oggetti dipende da altri stati",
-        "es": "Implementado el coloreado de los objetos depende de otros estados.",
-        "pl": "Zaimplementowane kolory obiektów zależą od innych stanów",
-        "zh-cn": "实现对象着色取决于其他状态"
       }
     },
     "desc": {

package/main.js

@@ -18,7 +18,7 @@ const axios       = require('axios');
 const fs          = require('fs');
 
 const utils       = require('@iobroker/adapter-core'); // Get common adapter utils
-const tools 	  = require('@iobroker/js-controller-common').tools;
+const tools 	  = require(utils.controllerDir + '/lib/tools.js');
 const SocketAdmin = require('@iobroker/socket-classes').SocketAdmin;
 const ws          = require('@iobroker/ws-server');
 
@@ -83,6 +83,10 @@ function startAdapter(options) {
         socket && socket.stateChange(id, state);
     });
 
+    adapter.on('fileChange', (id, fileName, size) => {
+        socket && socket.fileChange(id, fileName, size);
+    });
+
     adapter.on('ready', () => {
         adapter.getForeignObject('system.config', (err, obj) => {
             if (!err && obj) {
@@ -105,6 +109,8 @@ function startAdapter(options) {
                 adapter.config.secret = secret;
                 adapter.log.error('Cannot find object system.config');
             }
+
+            // adapter.subscribeForeignFiles('*', '*');
         });
     });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.admin",
   "description": "The adapter opens a webserver for the ioBroker admin UI.",
-  "version": "5.4.2",
+  "version": "5.4.6",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.0",
     "@iobroker/ws-server": "^2.0.0",
-    "@iobroker/socket-classes": "^0.1.7",
+    "@iobroker/socket-classes": ">=0.2.0",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
     "connect-flash": "^0.1.1",

package/www-react/asset-manifest.json

@@ -9,8 +9,8 @@
     "static/js/3.a2a63ebe.chunk.js": "./static/js/3.a2a63ebe.chunk.js",
     "static/js/3.a2a63ebe.chunk.js.map": "./static/js/3.a2a63ebe.chunk.js.map",
     "main.css": "./static/css/main.a362ebcf.chunk.css",
-    "main.js": "./static/js/main.331bd3ac.chunk.js",
-    "main.js.map": "./static/js/main.331bd3ac.chunk.js.map",
+    "main.js": "./static/js/main.002094c6.chunk.js",
+    "main.js.map": "./static/js/main.002094c6.chunk.js.map",
     "runtime-main.js": "./static/js/runtime-main.30dbb973.js",
     "runtime-main.js.map": "./static/js/runtime-main.30dbb973.js.map",
     "static/css/6.bf6a767f.chunk.css": "./static/css/6.bf6a767f.chunk.css",
@@ -469,7 +469,7 @@
     "static/js/2.a09bf46c.chunk.js.LICENSE.txt": "./static/js/2.a09bf46c.chunk.js.LICENSE.txt",
     "static/js/6.d1f21f08.chunk.js.LICENSE.txt": "./static/js/6.d1f21f08.chunk.js.LICENSE.txt",
     "static/js/8.428bbe53.chunk.js.LICENSE.txt": "./static/js/8.428bbe53.chunk.js.LICENSE.txt",
-    "static/js/main.331bd3ac.chunk.js.LICENSE.txt": "./static/js/main.331bd3ac.chunk.js.LICENSE.txt",
+    "static/js/main.002094c6.chunk.js.LICENSE.txt": "./static/js/main.002094c6.chunk.js.LICENSE.txt",
     "static/media/Alarm Systems.svg": "./static/media/Alarm Systems.857ab9a8.svg",
     "static/media/Amplifier.svg": "./static/media/Amplifier.6f5d1804.svg",
     "static/media/Anteroom.svg": "./static/media/Anteroom.93a74213.svg",
@@ -638,6 +638,6 @@
     "static/css/6.bf6a767f.chunk.css",
     "static/js/6.d1f21f08.chunk.js",
     "static/css/main.a362ebcf.chunk.css",
-    "static/js/main.331bd3ac.chunk.js"
+    "static/js/main.002094c6.chunk.js"
   ]
 }

package/www-react/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="admin - ioBroker"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="stylesheet" href="./css/leaflet.css"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./lib/js/socket.io.js"></script><script type="text/javascript" src="./lib/js/sparkline.js"></script><title>Admin</title><script>window.loginHideLogo="@@loginHideLogo@@",window.loginMotto="@@loginMotto@@",window.login="@@auth@@",window.loginLogo="@@loginLogo@@",window.loginLink="@@loginLink@@",window.loginTitle="@@loginTitle@@",window.vendorPrefix="@@vendorPrefix@@",window.loginBackgroundColor="@@loginBackgroundColor@@",window.disableDataReporting="@@disableDataReporting@@"</script><style>body{background-color:@@loginBackgroundColor@@;background-image:url(@@loginBackgroundImage@@);background-size:cover}.root{background-color:rgba(255,255,255,.87);border-radius:10px}.unsupported{width:200px;background-color:#aaa;margin:auto;margin-top:3rem;padding:10px;line-height:25px;border-radius:4px;text-align:center}.leaflet-container{height:400px;width:100%}</style><script>window.addEventListener("load",(function e(n){window.removeEventListener("load",e,!1);if(window.navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./)){const e=document.getElementById("root");e.classList.add("unsupported"),e.innerHTML="Browser is not supported. Please use Firefox or Chrome."}}),!1)</script><link href="./static/css/6.bf6a767f.chunk.css" rel="stylesheet"><link href="./static/css/main.a362ebcf.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,u=t[0],f=t[1],i=t[2],l=0,d=[];l<u.length;l++)o=u[l],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(s&&s(t);d.length;)d.shift()();return c.push.apply(c,i||[]),r()}function r(){for(var e,t=0;t<c.length;t++){for(var r=c[t],n=!0,o=1;o<r.length;o++){var f=r[o];0!==a[f]&&(n=!1)}n&&(c.splice(t--,1),e=u(u.s=r[0]))}return e}var n={},o={5:0},a={5:0},c=[];function u(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,u),r.l=!0,r.exports}u.e=function(e){var t=[];o[e]?t.push(o[e]):0!==o[e]&&{7:1}[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"31d6cfe0",3:"31d6cfe0",7:"41d5431a",8:"31d6cfe0",9:"31d6cfe0",10:"31d6cfe0",11:"31d6cfe0",12:"31d6cfe0",13:"31d6cfe0",14:"31d6cfe0",15:"31d6cfe0",16:"31d6cfe0"}[e]+".chunk.css",a=u.p+n,c=document.getElementsByTagName("link"),f=0;f<c.length;f++){var i=(s=c[f]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(i===n||i===a))return t()}var l=document.getElementsByTagName("style");for(f=0;f<l.length;f++){var s;if((i=(s=l[f]).getAttribute("data-href"))===n||i===a)return t()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=t,d.onerror=function(t){var n=t&&t.target&&t.target.src||a,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.code="CSS_CHUNK_LOAD_FAILED",c.request=n,delete o[e],d.parentNode.removeChild(d),r(c)},d.href=a,document.getElementsByTagName("head")[0].appendChild(d)})).then((function(){o[e]=0})));var r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,u.nc&&f.setAttribute("nonce",u.nc),f.src=function(e){return u.p+"static/js/"+({}[e]||e)+"."+{0:"c09b4f8b",1:"646c1242",2:"a09bf46c",3:"a2a63ebe",7:"74947acd",8:"428bbe53",9:"baa4a83c",10:"f7657bca",11:"68c631d8",12:"6fe66e07",13:"3ef7ca28",14:"8b22b82b",15:"d0aff369",16:"98a955aa"}[e]+".chunk.js"}(e);var i=new Error;c=function(t){f.onerror=f.onload=null,clearTimeout(l);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;i.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",i.name="ChunkLoadError",i.type=n,i.request=o,r[1](i)}a[e]=void 0}};var l=setTimeout((function(){c({type:"timeout",target:f})}),12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(t)},u.m=e,u.c=n,u.d=function(e,t,r){u.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},u.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,t){if(1&t&&(e=u(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(u.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)u.d(r,n,function(t){return e[t]}.bind(null,n));return r},u.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return u.d(t,"a",t),t},u.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},u.p="./",u.oe=function(e){throw console.error(e),e};var f=this["webpackJsonpsrc-rx"]=this["webpackJsonpsrc-rx"]||[],i=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var s=i;r()}([])</script><script src="./static/js/6.d1f21f08.chunk.js"></script><script src="./static/js/main.331bd3ac.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="admin - ioBroker"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="stylesheet" href="./css/leaflet.css"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./lib/js/socket.io.js"></script><script type="text/javascript" src="./lib/js/sparkline.js"></script><title>Admin</title><script>window.loginHideLogo="@@loginHideLogo@@",window.loginMotto="@@loginMotto@@",window.login="@@auth@@",window.loginLogo="@@loginLogo@@",window.loginLink="@@loginLink@@",window.loginTitle="@@loginTitle@@",window.vendorPrefix="@@vendorPrefix@@",window.loginBackgroundColor="@@loginBackgroundColor@@",window.disableDataReporting="@@disableDataReporting@@"</script><style>body{background-color:@@loginBackgroundColor@@;background-image:url(@@loginBackgroundImage@@);background-size:cover}.root{background-color:rgba(255,255,255,.87);border-radius:10px}.unsupported{width:200px;background-color:#aaa;margin:auto;margin-top:3rem;padding:10px;line-height:25px;border-radius:4px;text-align:center}.leaflet-container{height:400px;width:100%}</style><script>window.addEventListener("load",(function e(n){window.removeEventListener("load",e,!1);if(window.navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./)){const e=document.getElementById("root");e.classList.add("unsupported"),e.innerHTML="Browser is not supported. Please use Firefox or Chrome."}}),!1)</script><link href="./static/css/6.bf6a767f.chunk.css" rel="stylesheet"><link href="./static/css/main.a362ebcf.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,u=t[0],f=t[1],i=t[2],l=0,d=[];l<u.length;l++)o=u[l],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(s&&s(t);d.length;)d.shift()();return c.push.apply(c,i||[]),r()}function r(){for(var e,t=0;t<c.length;t++){for(var r=c[t],n=!0,o=1;o<r.length;o++){var f=r[o];0!==a[f]&&(n=!1)}n&&(c.splice(t--,1),e=u(u.s=r[0]))}return e}var n={},o={5:0},a={5:0},c=[];function u(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,u),r.l=!0,r.exports}u.e=function(e){var t=[];o[e]?t.push(o[e]):0!==o[e]&&{7:1}[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"31d6cfe0",3:"31d6cfe0",7:"41d5431a",8:"31d6cfe0",9:"31d6cfe0",10:"31d6cfe0",11:"31d6cfe0",12:"31d6cfe0",13:"31d6cfe0",14:"31d6cfe0",15:"31d6cfe0",16:"31d6cfe0"}[e]+".chunk.css",a=u.p+n,c=document.getElementsByTagName("link"),f=0;f<c.length;f++){var i=(s=c[f]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(i===n||i===a))return t()}var l=document.getElementsByTagName("style");for(f=0;f<l.length;f++){var s;if((i=(s=l[f]).getAttribute("data-href"))===n||i===a)return t()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=t,d.onerror=function(t){var n=t&&t.target&&t.target.src||a,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.code="CSS_CHUNK_LOAD_FAILED",c.request=n,delete o[e],d.parentNode.removeChild(d),r(c)},d.href=a,document.getElementsByTagName("head")[0].appendChild(d)})).then((function(){o[e]=0})));var r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,u.nc&&f.setAttribute("nonce",u.nc),f.src=function(e){return u.p+"static/js/"+({}[e]||e)+"."+{0:"c09b4f8b",1:"646c1242",2:"a09bf46c",3:"a2a63ebe",7:"74947acd",8:"428bbe53",9:"baa4a83c",10:"f7657bca",11:"68c631d8",12:"6fe66e07",13:"3ef7ca28",14:"8b22b82b",15:"d0aff369",16:"98a955aa"}[e]+".chunk.js"}(e);var i=new Error;c=function(t){f.onerror=f.onload=null,clearTimeout(l);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;i.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",i.name="ChunkLoadError",i.type=n,i.request=o,r[1](i)}a[e]=void 0}};var l=setTimeout((function(){c({type:"timeout",target:f})}),12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(t)},u.m=e,u.c=n,u.d=function(e,t,r){u.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},u.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,t){if(1&t&&(e=u(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(u.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)u.d(r,n,function(t){return e[t]}.bind(null,n));return r},u.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return u.d(t,"a",t),t},u.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},u.p="./",u.oe=function(e){throw console.error(e),e};var f=this["webpackJsonpsrc-rx"]=this["webpackJsonpsrc-rx"]||[],i=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var s=i;r()}([])</script><script src="./static/js/6.d1f21f08.chunk.js"></script><script src="./static/js/main.002094c6.chunk.js"></script></body></html>