iobroker.yamaha 0.5.0 → 0.5.3

package/.github/workflows/test-and-release.yml

@@ -50,7 +50,7 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
-                node-version: [12.x, 14.x, 16.x]
+                node-version: [12.x, 14.x, 16.x, 18.x]
                 os: [ubuntu-latest, windows-latest, macos-latest]
 
         steps:

package/README.md

@@ -43,6 +43,16 @@ You have to enable "network standby" function in the configuration of your recei
 
 
 ## Changelog
+### 0.5.3 (2022-06-17)
+* (Apollon77) Fix crash cases reported by Sentry
+
+### 0.5.2 (2022-04-23)
+* (Apollon77) Fix crash cases reported by Sentry
+
+### 0.5.1 (2022-03-29)
+* (Apollon77) Fix crash cases reported by Sentry
+* (Sneak-L8) fix type of pureDirect
+
 ### 0.5.0 (2022-03-08)
 * IMPORTANT: js-controller 2.0 is needed at least
 * (Apollon77) Add Sentry for crash reporting

package/io-package.json

@@ -1,8 +1,44 @@
 {
   "common": {
     "name": "yamaha",
-    "version": "0.5.0",
+    "version": "0.5.3",
     "news": {
+      "0.5.3": {
+        "en": "Fix crash cases reported by Sentry",
+        "de": "Reparieren Crashfälle gemeldet von Sentry",
+        "ru": "Исправление случаев аварии, описанных Sentry",
+        "pt": "Corrigir casos de acidente relatados por Sentry",
+        "nl": "Vertaling:",
+        "fr": "Troubles de crash signalés par Sentry",
+        "it": "Correzione dei casi di crash segnalati da Sentry",
+        "es": "Casos de accidente fijo reportados por Sentry",
+        "pl": "Sprawy katastrofy Fix podane przez Sentry’a",
+        "zh-cn": "Sentry所报告的六例事故"
+      },
+      "0.5.2": {
+        "en": "Fix crash cases reported by Sentry",
+        "de": "Von Sentry gemeldete Absturzfälle beheben",
+        "ru": "Исправить случаи сбоев, о которых сообщил Sentry",
+        "pt": "Corrigir casos de travamento relatados pelo Sentinela",
+        "nl": "Herstel crashgevallen gemeld door Sentry",
+        "fr": "Correction des cas de plantage signalés par Sentry",
+        "it": "Risolvi i casi di crash segnalati da Sentry",
+        "es": "Solucionar casos de fallas informados por Sentry",
+        "pl": "Napraw przypadki awarii zgłoszone przez Sentry",
+        "zh-cn": "修复 Sentry 报告的崩溃案例"
+      },
+      "0.5.1": {
+        "en": "Fix crash cases reported by Sentry\nfix type of pureDirect",
+        "de": "Von Sentry gemeldete Absturzfälle beheben\nfixer Typ von pureDirect",
+        "ru": "Исправить случаи сбоев, о которых сообщил Sentry\nисправить тип pureDirect",
+        "pt": "Corrigir casos de travamento relatados pelo Sentinela\ncorrigir tipo de pureDirect",
+        "nl": "Herstel crashgevallen gemeld door Sentry\nfix type pureDirect",
+        "fr": "Correction des cas de plantage signalés par Sentry\ncorrection du type de pureDirect",
+        "it": "Risolvi i casi di crash segnalati da Sentry\ncorreggere il tipo di pureDirect",
+        "es": "Solucionar casos de fallas informados por Sentry\ncorregir el tipo de pureDirect",
+        "pl": "Napraw przypadki awarii zgłoszone przez Sentry\nnapraw typ pureDirect",
+        "zh-cn": "修复 Sentry 报告的崩溃案例\n修复 pureDirect 的类型"
+      },
       "0.5.0": {
         "en": "IMPORTANT: js-controller 2.0 is needed at least\nAdd Sentry for crash reporting",
         "de": "WICHTIG: js-controller 2.0 wird mindestens benötigt\nFügen Sie Sentry für Absturzberichte hinzu",
@@ -50,42 +86,6 @@
         "es": "Se corrigió el bloqueo en lib / soef.js (Garfonso) \n meta información actualizada. (Garfonso)",
         "pl": "naprawiono awarię w lib / soef.js (Garfonso) \naktualizowano meta informacje. (Garfonso)",
         "zh-cn": "修复了lib / soef.js（Garfonso）\n更新的元信息中的崩溃。 （加方索）"
-      },
-      "0.3.19": {
-        "en": "Changelog added to readme",
-        "de": "Changelog der readme hinzugefügt",
-        "ru": "Список изменений добавлен в readme",
-        "pt": "Changelog adicionado ao leia-me",
-        "nl": "Changelog toegevoegd aan readme",
-        "fr": "Changelog ajouté au fichier readme",
-        "it": "Changelog aggiunto al readme",
-        "es": "Registro de cambios agregado a Léame",
-        "pl": "Dziennik zmian dodany do readme",
-        "zh-cn": "更改日志添加到自述文件"
-      },
-      "0.3.18": {
-        "en": "Update utils.js and usage, CI Testing and deps (Apollon77)",
-        "de": "utils.js und Benutzung erneuert, CI Testing (Apollon77)",
-        "ru": "Обновите utils.js и использование, тестирование CI и deps (Apollon77)",
-        "pt": "Atualize utils.js e uso, teste de CI e deps (Apollon77)",
-        "nl": "Update utils.js en gebruik, CI-testen en deps (Apollon77)",
-        "fr": "Mise à jour utils.js et utilisation, CI Testing et deps (Apollon77)",
-        "it": "Aggiorna utils.js e utilizzo, test CI e deps (Apollon77)",
-        "es": "Actualice utils.js y uso, pruebas de CI y dependencias (Apollon77)",
-        "pl": "Zaktualizuj utils.js i wykorzystanie, CI Testing i deps (Apollon77)",
-        "zh-cn": "更新 utils.js 和用法、CI 测试和 deps (Apollon77)"
-      },
-      "0.3.17": {
-        "en": "update basic package-file testing (Apollon77)",
-        "de": "Erweiterung der Tests (Apollon77)",
-        "ru": "обновить базовое тестирование файла пакета (Apollon77)",
-        "pt": "atualizar o teste básico de arquivo de pacote (Apollon77)",
-        "nl": "update basispakketbestand testen (Apollon77)",
-        "fr": "mise à jour des tests de base du fichier de package (Apollon77)",
-        "it": "aggiornare il test di base del file di pacchetto (Apollon77)",
-        "es": "actualizar las pruebas básicas de archivos de paquetes (Apollon77)",
-        "pl": "aktualizacja podstawowego testowania plików pakietu (Apollon77)",
-        "zh-cn": "更新基本包文件测试（Apollon77）"
       }
     },
     "title": "Yamaha",
@@ -605,11 +605,11 @@
       "type": "state",
       "common": {
         "name": "pureDirect",
-        "type": "boolean",
+        "type": "string",
         "role": "state",
         "read": true,
         "write": true,
-        "def": false,
+        "def": "not available",
         "desc": "Pure Direct"
       },
       "native": {}

package/lib/soef.js

@@ -304,7 +304,7 @@ var njs = {
 
                                     function deld() {
                                         if (d >= devices.length) {
-                                            callback();
+                                            callback && callback();
                                             return;
                                         }
                                         var did = devices[d++]._id;
@@ -597,7 +597,7 @@ function Devices (_adapter, _callback) {
             list = that.list;
             that.list = {};
         }
-        if (!list) return callback(-1);
+        if (!list) return callback && callback(-1);
         if (Array.isArray(list)) {
             for (var i=0; i<list.length; i++) {
                 var objName = Object.keys( list[i] )[ 0 ];
@@ -665,7 +665,7 @@ function Devices (_adapter, _callback) {
 
     this.readAllExistingObjects = function (callback) {
         adapter.getForeignStates(adapter.namespace + '.*', {}, function(err, states) {
-            if (err || !states) return callback(-1);
+            if (err || !states) return callback && callback(-1);
             var namespacelen = adapter.namespace.length + 1;
             for (var fullId in states) {
                 var id = fullId.substr(namespacelen),
@@ -1013,14 +1013,14 @@ function checkIfUpdated(doUpdateCallback, callback) {
             if (typeof doUpdateCallback == 'function') {
                 doUpdateCallback(prevVersion, aktVersion, function (err) {
                     savePrevVersion();
-                    callback();
+                    callback && callback();
                 });
                 return;
             } else {
                 savePrevVersion();
             }
         }
-        callback();
+        callback && callback();
     });
 }
 
@@ -1063,7 +1063,7 @@ function _main (_adapter, options, callback ) {
 
     switchToDebug();
     _devices.init(_adapter, function(err) {
-        callback();
+        callback && callback();
     });
 };
 exports.main = _main;
@@ -1093,9 +1093,9 @@ exports.Adapter = function (_args) {
     if (!options.unload) {
         options.unload = function (callback) {
             try {
-                fns.onUnload ? onUnload(calback) : callback();
+                fns.onUnload ? onUnload(callback) : callback && callback();
             } catch (e) {
-                callback();
+                callback && callback();
             }
         }
     }
@@ -1147,7 +1147,7 @@ function changeAdapterConfig (_adapter, changeCallback, doneCallback) {
         if (!err && obj && !obj.native) obj['native'] = {};
         if (!err && obj && changeCallback(obj.native) !== false) {
             _adapter.setForeignObject(obj._id, obj, {}, function (err, s_obj) {
-                _adapter.log.info("soef.changeAdapterConfig: changed");
+                _adapter.log.debug("soef.changeAdapterConfig: changed");
                 //_adapter.config = obj.native;   //?!?  nrmalisieren fehlt dann!!
                 //_adapter.normalizeConfig ...
                 if (doneCallback) doneCallback(err, obj);

package/main.js

@@ -79,7 +79,7 @@ if (!YAMAHA.prototype.sendCommand) {
 
     YAMAHA.prototype.sendCommand = function (command, zone) {
         zone = getZone(zone);
-        var command = '<YAMAHA_AV cmd="PUT"><' + zone + '>' + command + '</' + zone + '></YAMAHA_AV>';
+        var command = `<YAMAHA_AV cmd="PUT"><${zone}>${command}</${zone}></YAMAHA_AV>`;
         return this.SendXMLToReceiver(command);
     };
 
@@ -97,7 +97,7 @@ if (!YAMAHA.prototype.sendCommand) {
         //var command = '<YAMAHA_AV cmd="PUT"><System><Misc><Remote_Signal><Receive><Code>' + code + '</Code></Receive></Remote_Signal></Misc></System></YAMAHA_AV>';
         //var command = '<YAMAHA_AV cmd="PUT"><System><Remote_Signal><Receive><Code>' + code + '</Code></Receive></Remote_Signal></System></YAMAHA_AV>';
 
-        var command = '<YAMAHA_AV cmd="PUT"><System><Remote_Control><RC_Code>' + code + '</RC_Code></Remote_Control></System></YAMAHA_AV>';
+        var command = `<YAMAHA_AV cmd="PUT"><System><Remote_Control><RC_Code>${code}</RC_Code></Remote_Control></System></YAMAHA_AV>`;
         return this.SendXMLToReceiver(command);
     };
 
@@ -105,11 +105,11 @@ if (!YAMAHA.prototype.sendCommand) {
         return this.sendCommand('<Sound_Video><Pure_Direct><Mode>' + (bo ? 'On' : 'Off') + '</Mode></Pure_Direct></Sound_Video>');
     };
     YAMAHA.prototype.setHDMIOutput = function (no, bo) {
-        return this.sendCommand('<Sound_Video><HDMI><Output><OUT_' + no + '>' + (bo ? 'On' : 'Off') + '</OUT_' + no + '></Output></HDMI></Sound_Video>', 'System');
+        return this.sendCommand(`<Sound_Video><HDMI><Output><OUT_${no}>${bo ? 'On' : 'Off'}</OUT_${no}></Output></HDMI></Sound_Video>`, 'System');
     };
     YAMAHA.prototype.scene = function (no) {
         adapter.setState('scene', '', true);
-        return this.sendCommand('<Scene><Scene_Load>Scene ' + no + '</Scene_Load></Scene>');
+        return this.sendCommand(`<Scene><Scene_Load>Scene ${no}</Scene_Load></Scene>`);
     };
     YAMAHA.prototype.power = function (bo, zone) {
         return this.sendCommand('<Power_Control><Power>' + (bo ? 'On' : 'Standby') + '</Power></Power_Control>', zone);
@@ -124,7 +124,7 @@ if (!YAMAHA.prototype.sendCommand) {
         else if (val < 90) val = '60 min';
         else if (val < 120) val = '90 min';
         else val = '120 min';
-        return this.sendCommand('<Power_Control><Sleep>' + val + '</Sleep></Power_Control>', zone);
+        return this.sendCommand(`<Power_Control><Sleep>${val}</Sleep></Power_Control>`, zone);
     };
 
 }
@@ -132,7 +132,7 @@ if (!YAMAHA.prototype.sendCommand) {
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 YAMAHA.prototype.setSurround = function (val) {
-    return this.sendCommand('<Surround><Program_Sel><Current><Sound_Program>' + val + '</Sound_Program></Current></Program_Sel></Surround>', zone);
+    return this.sendCommand(`<Surround><Program_Sel><Current><Sound_Program>${val}</Sound_Program></Current></Program_Sel></Surround>`, zone);
 };
 
 YAMAHA.prototype.YPAOVolume = function(bo){
@@ -162,7 +162,7 @@ YAMAHA.prototype.toggleMute = function () {
     if (obj && typeof obj.val == 'boolean') {
         this.setMute(! obj.val);
     } else {
-        adapter.log.warn("unknown mute value: " + obj.val);
+        adapter.log.warn(`unknown mute value: ${obj.val}`);
     }
 };
 
@@ -269,13 +269,13 @@ var defaultParams = {
         return (this.val === 'true') || !!(this.val >> 0);
     },
     get szVal() {
-        return this.val.toString ();
+        return this.val === null ? '': this.val.toString();
     },
     get zone() {
         return zone;
     },
     result: function(idx) {
-        return this [idx] !== undefined ? this [idx] : idx;
+        return this [idx] !== undefined ? this[idx] : idx;
     }
 };
 
@@ -288,7 +288,7 @@ YAMAHA.prototype.execCommand = function (id, val) {
     var p = defaultParams;
     p.val = val;
 
-    adapter.log.debug('execCommand: id=' + id + ' val=' + val);
+    adapter.log.debug(`execCommand: id=${id} val=${val}`);
     var commandName = ar[2];
 
     switch(commandName) {
@@ -311,7 +311,7 @@ YAMAHA.prototype.execCommand = function (id, val) {
                 case 'raw': cmd = p.szVal; break;
                 default:
                     var szVal = p.szVal;
-                    if (ar[4] === 'VOL' && szVal !== '?' && szVal.indexOf('.') < 0 && szVal.length < 4) szVal = szVal + '.0';
+                    if (ar[4] === 'VOL' && szVal !== '?' && szVal.indexOf('.') < 0 && szVal.length < 4) szVal = `${szVal}.0`;
                     cmd = soef.sprintf('@%s:%s=%s', ar[3], ar[4], szVal);
                     break;
             }
@@ -331,12 +331,20 @@ YAMAHA.prototype.execCommand = function (id, val) {
             if (p.bo) refreshStates();
             break;
         case "command":
+            if (typeof val !== 'string') {
+                adapter.log.warn(`command: val ${val}is not a string`);
+                return;
+            }
             var a = p.val.split(' ');
-            this.execCommand(adapter.namespace + "." + "commands" + "." + a[0], a.length > 1 ? a[1] : false);
+            this.execCommand(`${adapter.namespace}.commands.${a[0]}`, a.length > 1 ? a[1] : false);
             break;
         case "xmlCommand":
+            if (typeof val !== 'string') {
+                adapter.log.warn(`xmlCommand: val ${val}is not a string`);
+                return;
+            }
             val = val.replace(/\[/g, "<").replace(/]/g, ">");
-            var command = '<YAMAHA_AV cmd="PUT">' + val + '</YAMAHA_AV>';
+            var command = `<YAMAHA_AV cmd="PUT">${val}</YAMAHA_AV>`;
             return this.SendXMLToReceiver(command);
         case "zone":
             zone = val;
@@ -352,14 +360,12 @@ YAMAHA.prototype.execCommand = function (id, val) {
             if (cmd === undefined)
                 return;
             if (cmd.length > 0) {
-                adapter.log.info("command: " + cmd[0] + " type: " + typeof this[cmd[0]]);
                 if (! (typeof this[cmd[0]] === "function")) {
-                    adapter.log.info("Command " + cmd[0] + " not avaialable at the moment: " + typeof this[cmd[0]]);
+                    adapter.log.info(`Command ${cmd[0]} not available at the moment: ${typeof this[cmd[0]]}`);
                     return;
                 }
             }
             if (cmd.length === 1) {
-                adapter.log.info("command: " + cmd[0]);
                 this [cmd[0]] ();
             } else if (cmd.length === 2) {
                 this [cmd[0]] (p.result(cmd[1]));
@@ -413,7 +419,7 @@ function callWithCatch(origPromise, onSucess, onError){
             onConnectionTimeout();
         }
         if (errorCount++ === 0) {
-            adapter.log.error('Can not connect to yamaha receiver at ' + adapter.config.ip + ' ' + error.message);
+            adapter.log.error(`Can not connect to yamaha receiver at ${adapter.config.ip} ${error.message}`);
         }
         safeCallback(onError);
     });
@@ -615,11 +621,11 @@ function runRealtimeFunction() {
     y5.onData = function(data) {
         setOnline(true);
         data = data.toString().replace(/^@|\r|\n/g, '');
-        adapter.log.debug('Rawdata: ' + data);
+        adapter.log.debug(`Rawdata: ${data}`);
         var ar = data.split('@');
         ar.forEach(function (v) {
             dev.setChannel();
-            dev.set('raw', '@' + v);
+            dev.set('raw', `@${v}`);
             handleRealtimeEvent(v);
             //var a = /^@(.*):(.*)=(.*)/.exec(v);
             var a = /(.*):(.*)=(.*)/.exec(v);
@@ -665,10 +671,11 @@ function normalizeConfig() {
 
 
 function setPossibleStates(id, objarr, options, cb) {
-    if (options === undefined) options = {};
     if (typeof options === 'function') {
         cb = options;
         options = {};
+    } else if (options === undefined) {
+        options = {};
     }
     adapter.getObject(id, function(err, obj) {
         if (err || !obj) return;
@@ -694,7 +701,7 @@ function setPossibleStates(id, objarr, options, cb) {
 }
 
 function loadDesc() {
-    var url = 'http://' + adapter.config.ip + '/YamahaRemoteControl/desc.xml';
+    var url = `http://${adapter.config.ip}/YamahaRemoteControl/desc.xml`;
     soef.getHttpData(url, {xml2json2: true }, function(err, data) {
         if (err || !data) return;
         var soundPrograms = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.yamaha",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "description": "ioBroker Yamaha Adapter",
   "author": {
     "name": "soef",
@@ -39,27 +39,27 @@
     "yamaha-nodejs-soef": "^0.7.4"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.5.6",
-    "@alcalzone/release-script-plugin-iobroker": "^3.5.6",
-    "@alcalzone/release-script-plugin-license": "^3.5.3",
-    "@iobroker/testing": "^2.5.6",
-    "@types/chai": "^4.3.0",
+    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.5.9",
+    "@iobroker/testing": "^3.0.2",
+    "@types/chai": "^4.3.1",
     "@types/chai-as-promised": "^7.1.5",
     "@types/gulp": "^4.0.9",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.0.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.11",
     "@types/sinon-chai": "^3.2.8",
-    "axios": "^0.26.0",
+    "axios": "^0.27.2",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.10.0",
+    "eslint": "^8.17.0",
     "gulp": "^4.0.2",
-    "mocha": "^9.2.1",
+    "mocha": "^9.2.2",
     "proxyquire": "^2.1.3",
     "sinon-chai": "^3.7.0",
-    "sinon": "^13.0.1"
+    "sinon": "^14.0.0"
   },
   "repository": {
     "type": "git",