iobroker.squeezeboxrpc 1.3.14 → 1.3.15

package/README.md

@@ -201,6 +201,11 @@ For more information visit the CLI-documentation:
   Placeholder for the next version (at the beginning of the line):
    ### **WORK IN PROGRESS**
 -->
+### 1.3.15 (2024-08-09)
+
+-   due to a adapter checker issue i have to remove the release 1.3.13 from npm.
+    but changes from 1.3.13 are included in 1.3.14
+
 ### 1.3.14 (2024-08-05)
 
 -   fix formatting

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "squeezeboxrpc",
-    "version": "1.3.14",
+    "version": "1.3.15",
     "news": {
+      "1.3.15": {
+        "en": "-   due to a adapter checker issue i have to remove the release 1.3.13 from npm.\n    but changes from 1.3.13 are included in 1.3.14",
+        "de": "- wegen eines adapter-checker-problems muss ich das release 1.3.13 von npm entfernen.\nänderungen von 1.3.13 sind in 1.3.14 enthalten",
+        "ru": "- из-за проблемы с адаптером, я должен удалить выпуск 1.3.13 из npm.\nно изменения от 1.3.13 включены в подраздел 1.3.14",
+        "pt": "- devido a um problema do verificador do adaptador eu tenho que remover a liberação 1.3.13 da npm.\nmas as alterações de 1.3.13 estão incluídas em 1.3.14",
+        "nl": "- vanwege een probleem met de adaptercontrole moet ik de release 1.3.13 van npm verwijderen.\nmaar wijzigingen van 1.3.13 zijn opgenomen in 1.3.14",
+        "fr": "- en raison d'un problème d'adaptateur, je dois supprimer la version 1.3.13 de npm.\nmais les changements par rapport au 1.3.13 sont inclus dans le 1.3.14",
+        "it": "- a causa di un problema dell'adattatore checker devo rimuovere il rilascio 1.3.13 da npm.\nma le modifiche da 1.3.13 sono incluse in 1.3.14",
+        "es": "- debido a un problema de control de adaptador tengo que eliminar la liberación 1.3.13 de npm.\npero los cambios de 1.3.13 se incluyen en 1.3.14",
+        "pl": "- ze względu na problem sprawdzania adaptera muszę usunąć zwolnienie 1.3.13 z npm.\nale zmiany z 1.3.13 są zawarte w 1.3.14",
+        "uk": "- через проблему перевірки адаптера я повинен видалити реліз 1.3.13 з npm.\nале зміни від 1.3.13 включені в 1.3.14",
+        "zh-cn": "- 因为适配器检查器的问题,我不得不从npm中移除1.3.13的发布.\n但从1.3.13到1.3.14的变动已包括在内"
+      },
       "1.3.14": {
         "en": "fix formatting",
         "de": "fixe formatierung",
@@ -16,19 +29,6 @@
         "uk": "фіксувати форматування",
         "zh-cn": "固定格式化"
       },
-      "1.3.13": {
-        "en": "revert the fix for artist handling due to negative effect of spotify",
-        "de": "die fix für die künstlerhandhabung aufgrund negativer wirkung von spotify",
-        "ru": "возвратить фиксацию для работы с художником из-за негативного эффекта спотификации",
-        "pt": "reverter a correção para manipulação de artista devido ao efeito negativo de identificar",
-        "nl": "terugzetten van de fix voor artist handling als gevolg van negatief effect van spotify",
-        "fr": "retourner la correction pour la manipulation de l'artiste en raison de l'effet négatif de spotify",
-        "it": "ripristinare la correzione per la gestione dell'artista a causa dell'effetto negativo di spotify",
-        "es": "revertir la fijación para el manejo del artista debido al efecto negativo de spotify",
-        "pl": "revert fix do obsługi artysty ze względu na negatywny efekt spotify",
-        "uk": "перевернути фіксацію для обробки художника через негативний ефект плямистості",
-        "zh-cn": "恢复对艺术家处理的固定,因为发现有负面影响"
-      },
       "1.3.12": {
         "en": "improve cmdGoto handling by kairauer, close PR #74\nfix issues from adapter checker\nintegrate squeezenode lib",
         "de": "verbessern cmd Goto Handling von kairauer, close PR #74\nprobleme von adapter checker beheben\npressnode lib integrieren",

package/lib/iosbplayer.js

@@ -499,9 +499,11 @@ function ioSBPlayer(server, playerdata) {
 
         }
     };
-    this.init = function (playerdata) {
+    this.init = async function (playerdata) {
         this.doPlayerStatus(playerdata);
         this.logdebug("New Player found: " + this.playername + " with id " + this.playerid);
+        await this.createFolder(this.statePath);
+        await this.createDevice(this.playername, this.statePath);
         const delay = this.playerindex || 0;
         setTimeout(this.doObserverPlayer.bind(this), delay * 190);
     };
@@ -821,7 +823,7 @@ function ioSBPlayer(server, playerdata) {
     };
     this.createState = function (stateTemplate, level1path = false, level2path = false) {
         const name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + stateTemplate.name;
-        this.logsilly("Create Key " + name);
+        this.logsilly("Create state " + name);
         if (!this.currentStates[name]) this.adapter.createState(level1path, level2path, stateTemplate.name, stateTemplate);
         stateTemplate.exist = true;
         return stateTemplate;
@@ -860,6 +862,52 @@ function ioSBPlayer(server, playerdata) {
             this.adapter.setState(name, value, true);
         }
     };
+    this.createFolder = async function (foldername, level1path, level2path) {
+        const id = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + foldername;
+        this.logsilly("createFolder " + id);
+        if (await this.existsObjectAsync(id)) {
+            this.logsilly("Folder exists: " + id);
+        } else {
+            const obj = {
+                type: "folder",
+                common: {
+                    name: foldername
+                },
+                native: {}
+            };
+            this.adapter.setObject(id, obj);
+        }
+    };
+    this.createDevice = async function (devicename, level1path, level2path) {
+        const id = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + devicename;
+        this.logsilly("createDevice " + id);
+        if (await this.existsObjectAsync(id)) {
+            this.logsilly("Device exists: " + id);
+        } else {
+            const obj = {
+                type: "device",
+                common: {
+                    name: devicename
+                },
+                native: {}
+            };
+            this.adapter.setObject(id, obj);
+        }
+    };
+    this.existsObjectAsync = function (id) {
+        return new Promise((resolve, reject) => {
+            id = this.adapter.namespace + "." + id;
+
+            this.adapter.getForeignObject(id, (err, obj) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(!!obj);
+                }
+
+            });
+        });
+    };
     this.convertState = function (stateTemplate, value) {
         if (stateTemplate.type == "string") return String(value);
         if (stateTemplate.type == "number") return Number(value);

package/lib/iosbserver.js

@@ -1,207 +1,206 @@
-/* eslint-disable quotes */
-'use strict';
+"use strict";
 
 //const utils = require('@iobroker/adapter-core');
-const dgram = require('dgram');
-const SqueezeServerNew = require(__dirname + '/squeezenode/squeezeserver');
-const ioSBPlayer = require(__dirname + '/iosbplayer');
+const dgram = require("dgram");
+const SqueezeServerNew = require(__dirname + "/squeezenode/squeezeserver");
+const ioSBPlayer = require(__dirname + "/iosbplayer");
 
 function IoSbServer(adapter) {
 
 
     this.sbServerStatus = {
-        'lastscan': {
-            name: 'LastScan',
+        "lastscan": {
+            name: "LastScan",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'version': {
-            name: 'Version',
+        "version": {
+            name: "Version",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'uuid': {
-            name: 'uuid',
+        "uuid": {
+            name: "uuid",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'name': {
-            name: 'Name',
+        "name": {
+            name: "Name",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'mac': {
-            name: 'mac',
+        "mac": {
+            name: "mac",
             read: true,
             write: false,
-            type: 'string',
-            role: 'info.mac',
+            type: "string",
+            role: "info.mac",
             exist: false
         },
-        'info total albums': {
-            name: 'TotalAlbums',
+        "info total albums": {
+            name: "TotalAlbums",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'info total artists': {
-            name: 'TotalArtists',
+        "info total artists": {
+            name: "TotalArtists",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'info total genres': {
-            name: 'TotalGenres',
+        "info total genres": {
+            name: "TotalGenres",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'info total songs': {
-            name: 'TotalSongs',
+        "info total songs": {
+            name: "TotalSongs",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'info total duration': {
-            name: 'TotalDuration',
+        "info total duration": {
+            name: "TotalDuration",
             read: true,
             write: false,
-            type: 'number',
-            role: 'media.duration',
+            type: "number",
+            role: "media.duration",
             exist: false
         },
-        'player count': {
-            name: 'PlayerCount',
+        "player count": {
+            name: "PlayerCount",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'sn player count': {
-            name: 'PlayerCountSN',
+        "sn player count": {
+            name: "PlayerCountSN",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'other player count': {
-            name: 'PlayerCountOther',
+        "other player count": {
+            name: "PlayerCountOther",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'syncgroups': {
-            name: 'SyncGroups',
+        "syncgroups": {
+            name: "SyncGroups",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'otherServers': {
-            name: 'otherServers',
+        "otherServers": {
+            name: "otherServers",
             read: true,
             write: true,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'getFavorites': {
-            name: 'getFavorites',
+        "getFavorites": {
+            name: "getFavorites",
             read: true,
             write: true,
-            type: 'boolean',
-            role: 'button',
+            type: "boolean",
+            role: "button",
             def: false,
             exist: false
         }
     };
     this.sbFavoritesState = {
-        'name': {
-            name: 'Name',
+        "name": {
+            name: "Name",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'type': {
-            name: 'type',
+        "type": {
+            name: "type",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'id': {
-            name: 'id',
+        "id": {
+            name: "id",
             read: true,
             write: false,
-            type: 'string',
-            role: 'value',
+            type: "string",
+            role: "value",
             exist: false
         },
-        'hasitems': {
-            name: 'hasitems',
+        "hasitems": {
+            name: "hasitems",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         },
-        'url': {
-            name: 'url',
+        "url": {
+            name: "url",
             read: true,
             write: false,
-            type: 'string',
-            role: 'media.url',
+            type: "string",
+            role: "media.url",
             exist: false
         },
-        'image': {
-            name: 'image',
+        "image": {
+            name: "image",
             read: true,
             write: false,
-            type: 'string',
-            role: 'url.icon',
+            type: "string",
+            role: "url.icon",
             exist: false
         },
-        'isaudio': {
-            name: 'isaudio',
+        "isaudio": {
+            name: "isaudio",
             read: true,
             write: false,
-            type: 'number',
-            role: 'value',
+            type: "number",
+            role: "value",
             exist: false
         }
     };
 
-    this.ServerStatePath = 'Server';
-    this.FavoritesStatePath = 'Favorites';
-    this.PlayersStatePath = 'Players';
+    this.ServerStatePath = "Server";
+    this.FavoritesStatePath = "Favorites";
+    this.PlayersStatePath = "Players";
 
     this.currentStates = {};
     this.players = [];
@@ -209,10 +208,10 @@ function IoSbServer(adapter) {
 
     this.adapter = adapter;
 
-    this.adapter.setState('info.connection', false, true);
-    this.adapter.subscribeStates('*');
+    this.adapter.setState("info.connection", false, true);
+    this.adapter.subscribeStates("*");
 
-    this.sbServer = (adapter.config.username != "") ? new SqueezeServerNew('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port), adapter.config.username, adapter.config.password) : new SqueezeServerNew('http://' + this.adapter.config.server, Number.parseInt(this.adapter.config.port));
+    this.sbServer = (adapter.config.username != "") ? new SqueezeServerNew("http://" + this.adapter.config.server, Number.parseInt(this.adapter.config.port), adapter.config.username, adapter.config.password) : new SqueezeServerNew("http://" + this.adapter.config.server, Number.parseInt(this.adapter.config.port));
 
     this.log = {};
     this.islogsilly = this.adapter.config.outputserversilly;
@@ -225,16 +224,17 @@ function IoSbServer(adapter) {
     this.telnet = null;
     this.otherserver = [];
 
-    this.init = function () {
-        this.setState('connection', true, 'info');
+    this.init = async function () {
+        this.logdebug("server init");
+        this.setState("connection", true, "info");
         this.doObserverServer();
         this.doObserverFavorites();
         this.doTelnet();
     };
     this.doObserverServer = function () {
-        this.logsilly('doObserverServer');
+        this.logdebug("doObserverServer");
         this.getServerstatus();
-        this.setTimeout('serverstatus', this.doObserverServer.bind(this), this.adapter.config.serverrefresh * 1000);
+        this.setTimeout("serverstatus", this.doObserverServer.bind(this), this.adapter.config.serverrefresh * 1000);
     };
     this.processMessages = function (msg) {
         this.logdebug("processMessages " + JSON.stringify(msg));
@@ -249,7 +249,7 @@ function IoSbServer(adapter) {
         for (const [, srv] of Object.entries(this.otherserver)) {
             data.push({ label: `${srv.NAME}/${srv.ADDRESS}`, value: srv.ADDRESS });
         }
-        this.adapter.sendTo(msg.from, msg.command, [{ value: '', label: '---' }, ...data], msg.callback);
+        this.adapter.sendTo(msg.from, msg.command, [{ value: "", label: "---" }, ...data], msg.callback);
     };
     this.setTimeout = function (id, callback, time) {
         this.clearTimeout(id);
@@ -268,32 +268,31 @@ function IoSbServer(adapter) {
         delete this.observers[id];
     };
     this.doObserverFavorites = function () {
-        this.logsilly('doObserverFavorites');
-
-        if (!this.adapter.config.usefavorites) {
-            this.newdelFavorites();
+        this.logdebug("doObserverFavorites");
+        this.delFavorites();
+        if (this.adapter.config.usefavorites) {
+            this.setFavorites();
             return;
         }
-        this.newgetFavorites();
-        this.setTimeout('favorites', this.doObserverFavorites.bind(this), this.adapter.config.favoriterefresh * 60 * 1000);
+        this.setTimeout("favorites", this.doObserverFavorites.bind(this), this.adapter.config.favoriterefresh * 60 * 1000);
     };
     this.getDiscoverServers = () => {
-        this.logsilly('getDiscoverServers');
+        this.logdebug("getDiscoverServers");
         const that = this;
         if (!this.adapter.config.usediscovery) {
-            this.delState(this.ServerStatePath, this.sbServerStatus['otherServers'].name, function () {
-                that.delObject(that.ServerStatePath, that.sbServerStatus['otherServers'].name);
+            this.delState(this.ServerStatePath, this.sbServerStatus["otherServers"].name, function () {
+                that.delObject(that.ServerStatePath, that.sbServerStatus["otherServers"].name);
             });
             return;
         }
-        this.server = dgram.createSocket({ type: 'udp4', reuseAddr: true });
+        this.server = dgram.createSocket({ type: "udp4", reuseAddr: true });
         const broadcastPort = 3483;
-        this.server.bind(broadcastPort, '0.0.0.0', function () {
+        this.server.bind(broadcastPort, "0.0.0.0", function () {
             that.server && that.server.setBroadcast(true);
         }.bind(this));
-        this.server.on('message', function (data, rinfo) {
-            that.logsilly('getDiscoverServers: Message resceived ' + escape(data));
-            if (data.toString().charAt() == 'E') {
+        this.server.on("message", async function (data, rinfo) {
+            that.logsilly("getDiscoverServers: Message resceived " + escape(data));
+            if (data.toString().charAt() == "E") {
                 let msg = data.toString();
                 msg = msg.substr(1);
                 const srv = {};
@@ -307,23 +306,24 @@ function IoSbServer(adapter) {
                     len = len - len2 - 5;
                     srv[tag] = val;
                 }
-                srv['ADDRESS'] = rinfo.address;
-                srv['TIMESTAMP'] = Date.now();
-                that.otherserver[srv['ADDRESS']] = srv;
+                srv["ADDRESS"] = rinfo.address;
+                srv["TIMESTAMP"] = Date.now();
+                that.otherserver[srv["ADDRESS"]] = srv;
                 const state = {};
-                Object.assign(state, that.sbServerStatus['otherServers']);
-                state.name = srv['ADDRESS'].replace(/\./g, '-');
+                Object.assign(state, that.sbServerStatus["otherServers"]);
+                state.name = srv["ADDRESS"].replace(/\./g, "-");
                 state.def = JSON.stringify(srv);
-                that.createObject(state, that.ServerStatePath, that.sbServerStatus['otherServers'].name, function () {
-                    that.setState(srv['ADDRESS'].replace(/\./g, '-'), JSON.stringify(srv), that.ServerStatePath, that.sbServerStatus['otherServers'].name, false);
+                await that.createFolder(that.sbServerStatus["otherServers"].name, that.ServerStatePath);
+                that.createObject(state, that.ServerStatePath, that.sbServerStatus["otherServers"].name, function () {
+                    that.setState(srv["ADDRESS"].replace(/\./g, "-"), JSON.stringify(srv), that.ServerStatePath, that.sbServerStatus["otherServers"].name, false);
                 });
-                that.logdebug('Autodiscover: Server found ' + srv['NAME'] + ' IP: ' + srv['ADDRESS'] + ' Port ' + srv['JSON'] + ' UUID ' + srv['UUID']);
+                that.logdebug("Autodiscover: Server found " + srv["NAME"] + " IP: " + srv["ADDRESS"] + " Port " + srv["JSON"] + " UUID " + srv["UUID"]);
             }
         }.bind(this));
-        this.server.on('error', function (err) {
-            that.log.error("Error with Server discovery " + err.message);
+        this.server.on("error", function (err) {
+            that.logerror("Error with Server discovery " + err.message);
             if (err.message.includes("EADDRINUSE")) {
-                that.log.info("use 'lsof -i -P' to check for ports used.");
+                that.loginfo("use 'lsof -i -P' to check for ports used.");
             }
             try {
                 that.server && that.server.close(function () {
@@ -331,23 +331,23 @@ function IoSbServer(adapter) {
                     that.server = null;
                 });
             } catch (err) {
-                that.log.error("server.close() " + err.message);
+                that.logerror("server.close() " + err.message);
             }
         });
         setTimeout(this.doDiscoverServerSearch, 1000);
     };
     this.doDiscoverServerSearch = () => {
-        this.logsilly('doDiscoverServerSearch');
+        this.logdebug("doDiscoverServerSearch");
         const that = this;
-        const msg = Buffer.from('eIPAD\0NAME\0JSON\0UUID\0VERS');
-        const broadcastAddress = '255.255.255.255';
+        const msg = Buffer.from("eIPAD\0NAME\0JSON\0UUID\0VERS");
+        const broadcastAddress = "255.255.255.255";
         const broadcastPort = 3483;
-        this.getStates('*', this.ServerStatePath, this.sbServerStatus['otherServers'].name, function (err, states) {
+        this.getStates("*", this.ServerStatePath, this.sbServerStatus["otherServers"].name, function (err, states) {
             for (const id in states) {
-                const srv = JSON.parse(states[id].val);
+                const srv = JSON.parse(states[id]?.val || "{}");
                 if (((Date.now() - srv.TIMESTAMP) / 1000) > 60) {
                     that.delObject(id);
-                    that.logdebug('Autodiscover: Server removed ' + srv['NAME'] + ' IP: ' + srv['ADDRESS'] + ' Port ' + srv['JSON'] + ' UUID ' + srv['UUID']);
+                    that.logdebug("Autodiscover: Server removed " + srv["NAME"] + " IP: " + srv["ADDRESS"] + " Port " + srv["JSON"] + " UUID " + srv["UUID"]);
                 }
             }
         }.bind(this));
@@ -361,81 +361,84 @@ function IoSbServer(adapter) {
                 if (err) that.log.error(err);
             }
         );
-        this.setTimeout('discover', this.doDiscoverServerSearch.bind(this), this.adapter.config.discoveryrefresh * 1000);
+        this.setTimeout("discover", this.doDiscoverServerSearch.bind(this), this.adapter.config.discoveryrefresh * 1000);
     };
     this.doDiscoverServerClose = function () {
-        this.logdebug('doDiscoverServerClose');
+        this.logdebug("doDiscoverServerClose");
         this.server && this.server.close();
     };
     this.doTelnet = () => {
+        this.logdebug("doTelnet");
         if (!this.adapter.config.usetelnet) return;
-        const net = require('net');
+        const net = require("net");
         this.telnet = net.createConnection({ host: this.adapter.config.server, port: this.adapter.config.telnetport }, () => {
-            this.logdebug('doTelnet connected to server!');
-            this.telnet.write('login ' + this.adapter.config.username + ' ' + this.adapter.config.password + '\r\n');
-            this.telnet.write('listen 1\r\n');
+            this.logdebug("doTelnet connected to server!");
+            this.telnet.write("login " + this.adapter.config.username + " " + this.adapter.config.password + "\r\n");
+            this.telnet.write("listen 1\r\n");
         });
-        this.telnet.on('data', (data) => {
-            this.logdebug('doTelnet received Data: ' + data.toString());
+        this.telnet.on("data", (data) => {
+            this.logdebug("doTelnet received Data: " + data.toString());
             const regex = /^((?:[0-9A-Fa-f]{2}[:-]){5}(?:[0-9A-Fa-f]{2}))\s*(.*)/gm;
             let m;
             if ((m = regex.exec(decodeURIComponent(data.toString()))) !== null) {
-                if (m[2] == 'client reconnect') {
-                    this.logdebug('doTelnet received reconnect for : ' + m[1]);
+                if (m[2] == "client reconnect") {
+                    this.logdebug("doTelnet received reconnect for : " + m[1]);
                     this.getServerstatus();
                 }
-                if (m[2] == 'client disconnect') {
-                    this.logdebug('doTelnet received disconnect for : ' + m[1]);
+                if (m[2] == "client disconnect") {
+                    this.logdebug("doTelnet received disconnect for : " + m[1]);
                     this.getServerstatus();
                 }
-                if (m[2] == 'client new') {
-                    this.logdebug('doTelnet received disconnect for : ' + m[1]);
+                if (m[2] == "client new") {
+                    this.logdebug("doTelnet received disconnect for : " + m[1]);
                     this.getServerstatus();
                 }
-                if (m[2] == 'power 0') {
-                    this.logdebug('doTelnet received power off : ' + m[1]);
+                if (m[2] == "power 0") {
+                    this.logdebug("doTelnet received power off : " + m[1]);
                     this.getServerstatus();
                 }
-                if (m[2] == 'power 1') {
-                    this.logdebug('doTelnet received power on : ' + m[1]);
+                if (m[2] == "power 1") {
+                    this.logdebug("doTelnet received power on : " + m[1]);
                     this.getServerstatus();
                 }
             }
         });
-        this.telnet.on('end', () => {
-            this.logdebug('doTelnet disconnected from server');
+        this.telnet.on("end", () => {
+            this.logdebug("doTelnet disconnected from server");
         });
-        this.telnet.on('timeout', () => {
-            this.logdebug('doTelnet Socket timeout, closing');
+        this.telnet.on("timeout", () => {
+            this.logdebug("doTelnet Socket timeout, closing");
             this.telnet.close();
         });
-        this.telnet.on('error', (err) => {
-            this.logdebug('doTelnet Socket error: ' + err.message);
+        this.telnet.on("error", (err) => {
+            this.logdebug("doTelnet Socket error: " + err.message);
         });
-        this.telnet.on('close', (err) => {
-            this.logdebug('doTelnet Socket closed ' + err.message);
+        this.telnet.on("close", (err) => {
+            this.logdebug("doTelnet Socket closed " + err.message);
         });
     };
     this.doTelnetClose = function () {
-        this.logdebug('doTelnetClose');
+        this.logdebug("doTelnetClose");
         this.telnet.end();
     };
     this.closeConnections = function () {
+        this.logdebug("closeConnections");
         if (this.adapter.config.usetelnet) this.doTelnetClose();
         if (this.adapter.config.usediscovery) this.doDiscoverServerClose();
     };
     this.getServerstatus = function () {
-        this.logsilly('getServerstatus');
-        this.request('', ['serverstatus', '0', '888'], this.doServerstatus.bind(this));
-        this.request('', ['syncgroups', '?'], this.doSyncgroups.bind(this));
+        this.logdebug("getServerstatus");
+        this.request("", ["serverstatus", "0", "888"], this.doServerstatus.bind(this));
+        this.request("", ["syncgroups", "?"], this.doSyncgroups.bind(this));
     };
     this.doSyncgroups = function (result) {
+        this.logdebug("doSyncgroups");
         if (result.result && result.result.syncgroups_loop) {
-            this.setState(this.sbServerStatus['syncgroups'].name, JSON.stringify(result.result.syncgroups_loop), this.ServerStatePath);
+            this.setState(this.sbServerStatus["syncgroups"].name, JSON.stringify(result.result.syncgroups_loop), this.ServerStatePath);
         }
     };
     this.doServerstatus = function (result) {
-        this.logsilly('doServerstatus');
+        this.logdebug("doServerstatus");
         this.checkServerstatusStates(result);
         for (const key in this.sbServerStatus) {
             if (Object.prototype.hasOwnProperty.call(result.result, key)) {
@@ -445,63 +448,37 @@ function IoSbServer(adapter) {
         this.checkNewPlayer(result.result.players_loop);
         this.checkPlayer(result.result.players_loop);
     };
-    this.newgetFavorites = function () {
-        this.logsilly('newgetFavorites');
-        this.newgetFavoritesDP(
-            (states) => this.newdelFavoritesDP(states,
-                () => this.newgetFavoritesLMS('',
-                    (result) => this.newsetFavoritesDP(result)
-                )
-            )
-        );
-    };
-    this.newdelFavorites = function () {
-        this.logsilly('newgetFavorites');
-        this.newgetFavoritesDP(
-            (states) => this.newdelFavoritesDP(states)
+    this.setFavorites = async function () {
+        this.logdebug("setFavorites");
+        this.getFavoritesLMS("",
+            (result) => this.setFavoritesDP(result)
         );
     };
-    this.newgetFavoritesDP = function (callback) {
-        this.logsilly('newgetFavoritesDPs');
-
-        const id = this.FavoritesStatePath;
-        this.adapter.getStates(id + '*', (err, states) => {
-            if (!err) {
-                callback(states);
-            } else this.log.info(err);
-        });
+    this.delFavorites = async function () {
+        this.logdebug("delFavorites");
+        let favobj = await this.getObjects(this.FavoritesStatePath);
+        favobj = favobj.rows.filter(obj => obj.value.type === "folder");
+        for (let i = 0; i < favobj.length; i++) {
+            await this.adapter.delForeignObjectAsync(favobj[i].id);
+        }
     };
-    this.newgetFavoritesLMS = function (id = '', callback) {
-        this.logsilly('newgetFavoritesLMS');
-        this.request('', ['favorites', 'items', '0', '888', 'want_url:1', 'item_id:' + id],
+    this.getFavoritesLMS = function (id = "", callback) {
+        this.logdebug("getFavoritesLMS");
+        this.request("", ["favorites", "items", "0", "888", "want_url:1", "item_id:" + id],
             (result) => callback(result.result.loop_loop)//.bind(this);
         );
     };
-    this.newdelFavoritesDP = (states, callback) => {
-        const that = this;
-        this.logsilly('newdelFavoritesDP');
-        const promises = [];
-        for (const id in states) {
-            this.logdebug(`Start to delete object => ${id}`);
-            promises.push(new Promise(function (resolve) {
-                that.delObject(id, false, false, resolve);
-            }.bind(this)));
-        }
-        Promise.all(promises).then(function () {
-            that.logdebug(`All favorite objects deleted`);
-            if (callback) callback();
-        }.bind(this));
-    };
-    this.newsetFavoritesDP = function (favorites) {
-        this.logsilly('newsetFavoritesDP');
+    this.setFavoritesDP = async function (favorites) {
+        this.logdebug("setFavoritesDP");
+        await this.createFolder(this.FavoritesStatePath);
         for (const favkey in favorites) {
             const favorite = favorites[favkey];
-            const oid = this.getFavId(favorite['id'], false);
-            const id = this.getFavId(favorite['id']);
+            const oid = this.getFavId(favorite["id"], false);
+            const id = this.getFavId(favorite["id"]);
             for (const key in this.sbFavoritesState) {
                 if (Object.prototype.hasOwnProperty.call(favorite, key)) {
-                    if (key == 'id') favorite['id'] = oid;
-                    if (key == 'image') {
+                    if (key == "id") favorite["id"] = oid;
+                    if (key == "image") {
                         const regex = /imageproxy\/(.*)\/[^/]/gm;
                         const m = regex.exec(favorite[key]);
                         if (m && m.index > 0) {
@@ -509,98 +486,73 @@ function IoSbServer(adapter) {
                         }
                     }
                     const stateTemplate = this.sbFavoritesState[key];
+                    await this.createFolder(id, this.FavoritesStatePath);
                     this.createObject(stateTemplate, this.FavoritesStatePath, id,
                         () => this.setState(this.sbFavoritesState[key].name, this.convertState(this.sbFavoritesState[key], favorite[key]), this.FavoritesStatePath, id, false)
                     );
                 }
             }
-            if (favorite['hasitems'] > 0) this.newgetFavoritesLMS(oid,
-                (result) => this.newsetFavoritesDP(result)
+            if (favorite["hasitems"] > 0) this.getFavoritesLMS(oid,
+                (result) => this.setFavoritesDP(result)
             );
         }
     };
-    /*
-        this.getFavorites = function(id='') {
-            this.logsilly('getFavorites');
-            this.deleteFavorites(id,function() {
-                this.request('',['favorites', 'items', '0', '888','want_url:1','item_id:' + id], this.doFavorites1.bind(this));
-            }.bind(this));
-        };
-        this.doFavorites1 = function(result){
-            this.logsilly('doFavorites1');
-            const favorites = result.result.loop_loop;
-            this.checkFavoriteStates(favorites);
-        };
-        this.doFavorites2 = function(favorites){
-            this.logsilly('doFavorites2');
-            for (const favkey in favorites) {
-                const favorite = favorites[favkey];
-                const oid = this.getFavId(favorite['id'],false);
-                const id = this.getFavId(favorite['id']);
-                for (const key in this.sbFavoritesState){
-                    if (favorite.hasOwnProperty(key)) {
-                        if (key=='id') favorite['id'] = oid;
-                        if (key == 'image' ) {
-                            const regex = /imageproxy\/(.*)\/[^\/]/gm;
-                            let m = regex.exec(favorite[key]);
-                            if (m && m.index>0) {
-                                favorite[key] = decodeURIComponent(m[1]);
-                            }
-                        }
-                        this.setState(this.sbFavoritesState[key].name,favorite[key],this.FavoritesStatePath,id,false);
-                    }
-                }
-                if (favorite['hasitems']>0) this.getFavorites(oid);
-            }
-        };
-        this.checkFavoriteStates = function(favorites) {
-            this.logsilly('checkFavoriteStates');
-            for (const favkey in favorites) {
-                const favorite = favorites[favkey];
-                const id = this.getFavId(favorite['id']);
-                for (const key in this.sbFavoritesState){
-                    if (favorite.hasOwnProperty(key)) {
-                        const stateTemplate = this.sbFavoritesState[key];
-                        this.createObject(stateTemplate,this.FavoritesStatePath,id);
-                    }
-                }
-            }
-            this.doFavorites2(favorites);
-        };
-        this.deleteFavorites = function(typ,callback) {
-            if (typ!='') {
-                callback();
-                return;
-            }
-            var id = this.FavoritesStatePath;
-            this.adapter.getStates(id + '*', (err, states) => {
-                if(!err) {
-                    let promises = [];
-                    for (const id in states) {
-                        this.logdebug(`Delete state => ${id}`);
-                        promises.push( new Promise(function(resolve){
-                            this.delObject(id,false,false,resolve);
-                        }.bind(this)));
-                    }
-                    Promise.all(promises).then(function(){
-                        callback();
-                    });
+    /*     this.newgetFavorites = function () {
+            this.logsilly("newgetFavorites");
+            this.newgetFavoritesDP(
+                (states) => this.newdelFavoritesDP(states,
+                    () => this.newgetFavoritesLMS("",
+                        (result) => this.setFavoritesDP(result)
+                    )
+                )
+            );
+        }; */
+    /*     this.newdelFavorites = function () {
+            this.logsilly("newgetFavorites");
+            this.newgetFavoritesDP(
+                (states) => this.newdelFavoritesDP(states)
+            );
+        }; */
+    /*     this.newgetFavoritesDP = function (callback) {
+            this.logsilly("newgetFavoritesDPs");
+
+            const id = this.FavoritesStatePath;
+            this.adapter.getStates(id + "*", (err, states) => {
+                if (!err) {
+                    callback(states);
                 } else this.log.info(err);
             });
         };
-    */
+
+        this.newdelFavoritesDP = (states, callback) => {
+            const that = this;
+            this.logsilly("newdelFavoritesDP");
+            const promises = [];
+            for (const id in states) {
+                this.logdebug(`Start to delete object => ${id}`);
+                promises.push(new Promise(function (resolve) {
+                    that.delObject(id, false, false, resolve);
+                }.bind(this)));
+            }
+            Promise.all(promises).then(function () {
+                that.logdebug(`All favorite objects deleted`);
+                if (callback) callback();
+            }.bind(this));
+        }; */
+
     this.getFavId = function (id, replace = true) {
         let ret;
-        if (id.indexOf('.') == 8) {
+        if (id.indexOf(".") == 8) {
             ret = id.substr(9);
         } else {
             ret = id;
         }
-        if (replace) ret = ret.replace(/\./g, '-');
+        if (replace) ret = ret.replace(/\./g, "-");
         return ret;
     };
-    this.checkServerstatusStates = function (result) {
-        this.logsilly('checkServerstatusStates');
+    this.checkServerstatusStates = async function (result) {
+        this.logdebug("checkServerstatusStates");
+        await this.createDevice(this.ServerStatePath);
         for (const key in this.sbServerStatus) {
             if (Object.prototype.hasOwnProperty.call(result.result, key)) {
                 const stateTemplate = this.sbServerStatus[key];
@@ -611,18 +563,19 @@ function IoSbServer(adapter) {
                 }
             }
         }
-        let key = 'getFavorites';
+        let key = "getFavorites";
         let stateTemplate = this.sbServerStatus[key];
         if (!stateTemplate.exist) {
             this.sbServerStatus[key] = this.createObject(stateTemplate, this.ServerStatePath);
         }
-        key = 'syncgroups';
+        key = "syncgroups";
         stateTemplate = this.sbServerStatus[key];
         if (!stateTemplate.exist) {
             this.sbServerStatus[key] = this.createObject(stateTemplate, this.ServerStatePath);
         }
     };
     this.checkNewPlayer = function (playersdata) {
+        this.logdebug("checkNewPlayer");
         for (const key in playersdata) {
             if (!Object.prototype.hasOwnProperty.call(this.players, playersdata[key].playerid)) {
                 this.players[playersdata[key].playerid] = new ioSBPlayer(this, playersdata[key]);
@@ -630,6 +583,7 @@ function IoSbServer(adapter) {
         }
     };
     this.checkPlayer = function (playersdata) {
+        this.logdebug("checkPlayer");
         for (const key in playersdata) {
             if (this.players[playersdata[key].playerid].connected != playersdata[key].connected) {
                 if (playersdata[key].connected == 0) {
@@ -642,11 +596,12 @@ function IoSbServer(adapter) {
         }
     };
     this.stateChange = function (id, state) {
+        this.logsilly("stateChange");
         // Warning, state can be null if it was deleted
         if (!id || !state || state.ack) {
             return;
         }
-        const idParts = id.split('.');
+        const idParts = id.split(".");
         idParts.shift();
         idParts.shift();
         if (idParts[0] == this.ServerStatePath) this.doServerStateChange(idParts, state);
@@ -654,16 +609,22 @@ function IoSbServer(adapter) {
         if (idParts[0] == this.PlayersStatePath) this.doPlayersStateChange(idParts, state);
     };
     this.doServerStateChange = function (idParts, state) {
+        this.logdebug("doServerStateChange");
         idParts.shift();
-        if (idParts[0] == 'getFavorites') {
-            if (state.val == true) this.newgetFavorites();
+        if (idParts[0] == "getFavorites") {
+            if (state.val == true) {
+                this.delFavorites();
+                this.setFavorites();
+            }
         }
     };
     this.doFavoritesStateChange = function (idParts, state) {
+        this.logdebug("doFavoritesStateChange");
         idParts.shift();
         if (state) return;
     };
     this.doPlayersStateChange = function (idParts, state) {
+        this.logsilly("doPlayersStateChange");
         idParts.shift();
         const player = this.findPlayerByName(idParts[0]);
         if (player) player.doStateChange(idParts, state);
@@ -674,6 +635,7 @@ function IoSbServer(adapter) {
         }
     };
     this.request = function (playerid, params, callback) {
+        this.logsilly("request");
         const that = this;
         this.sbServer.request(playerid, params, function (callback, result) {
             if (result.ok) {
@@ -693,70 +655,80 @@ function IoSbServer(adapter) {
         }.bind(this, callback));
     };
     this.disconnect = () => {
-        this.logdebug('Server disconnect');
+        this.logdebug("Server disconnect");
         this.firstStart = false;
         this.connected = 0;
-        this.clearTimeout('serverstatus');
-        this.clearTimeout('favorites');
-        if (this.connected == 0 && this.observers['checkserver']) return;
-        this.setState('connection', false, 'info');
+        this.clearTimeout("serverstatus");
+        this.clearTimeout("favorites");
+        if (this.connected == 0 && this.observers["checkserver"]) return;
+        this.setState("connection", false, "info");
         for (const key in this.players) {
             this.players[key].disconnect();
         }
-        this.setInterval('checkserver', this.doCheckServer.bind(this), 10 * 1000);
+        this.setInterval("checkserver", this.doCheckServer.bind(this), 10 * 1000);
     };
     this.connect = () => {
-        this.logdebug('Server connect');
-        this.clearInterval('checkserver');
-        this.setState('connection', true, 'info');
+        this.logdebug("Server connect");
+        this.clearInterval("checkserver");
+        this.setState("connection", true, "info");
         this.connected = 1;
         this.init();
     };
     this.doCheckServer = () => {
         const that = this;
-        this.logsilly('doCheckServer');
-        this.request('', ['serverstatus', '0', '888'], function (result) {
+        this.logdebug("doCheckServer");
+        this.request("", ["serverstatus", "0", "888"], function (result) {
             if (result.ok) {
                 that.connect();
             }
         }.bind(this));
     };
     this.setState = function (name, value, level1path, level2path, check = true, callback) {
-        name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + name;
+        name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + name;
         if (this.currentStates[name] !== value && check) {
             this.currentStates[name] = value;
-            this.logsilly('setState name: ' + name + ' value: ' + value);
+            this.logsilly("setState name: " + name + " value: " + value);
             this.adapter.setState(name, value, true, callback);
         } else {
             this.currentStates[name] = value;
-            this.logsilly('setState name: ' + name + ' value: ' + value);
+            this.logsilly("setState name: " + name + " value: " + value);
             this.adapter.setState(name, value, true, callback);
         }
     };
     this.getState = function (name, level1path = false, level2path = false, callback) {
-        name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + name;
+        name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + name;
+        this.logsilly("getState " + name);
         this.adapter.getState(name, callback);
     };
     this.delObject = function (name, level1path, level2path, callback) {
-        name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + name;
+        name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + name;
+        this.logsilly("delObject " + name);
         delete this.currentStates[name];
         this.adapter.delObject(name, callback);
     };
     this.delState = function (name, level1path, level2path, callback) {
-        name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + name;
+        name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + name;
+        this.logsilly("delObject " + name);
         delete this.currentStates[name];
         this.adapter.delState(name, callback);
     };
     this.getStates = function (pattern, level1path, level2path, callback) {
-        const name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + pattern;
+        const name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + pattern;
         this.adapter.getStates(name, callback);
     };
+    this.getObjects = async function (level1path, level2path) {
+        const name = this.adapter.namespace + "." + (level1path ? level1path + "." : "") + (level2path ? level2path : "");
+        return await this.adapter.getObjectListAsync({
+            startkey: name,
+            endkey: name + "\u9999"
+        });
+    };
     this.createObject = function (stateTemplate, level1path, level2path, callback) {
-        const name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + stateTemplate.name;
-        this.logdebug('createObject ' + name);
+        const name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + stateTemplate.name;
+        this.logsilly("createObject " + name);
         this.adapter.getObject(name, (err, obj) => {
             const newobj = {
-                type: 'state',
+                type: "state",
                 common: stateTemplate,
                 native: {}
             };
@@ -770,16 +742,62 @@ function IoSbServer(adapter) {
         return stateTemplate;
     };
     this.createState = function (stateTemplate, level1path = false, level2path = false, callback) {
-        const name = (level1path ? level1path + '.' : '') + (level2path ? level2path + '.' : '') + stateTemplate.name;
-        this.logsilly('Create Key ' + name);
+        const name = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + stateTemplate.name;
+        this.logsilly("Create state " + name);
         this.adapter.createState(level1path, level2path, stateTemplate.name, stateTemplate, callback);
         stateTemplate.exist = true;
         return stateTemplate;
     };
+    this.createFolder = async function (foldername, level1path, level2path) {
+        const id = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + foldername;
+        this.logsilly("createFolder " + id);
+        if (await this.existsObjectAsync(id)) {
+            this.logsilly("Folder exists: " + id);
+        } else {
+            const obj = {
+                type: "folder",
+                common: {
+                    name: foldername
+                },
+                native: {}
+            };
+            this.adapter.setObject(id, obj);
+        }
+    };
+    this.createDevice = async function (devicename, level1path, level2path) {
+        const id = (level1path ? level1path + "." : "") + (level2path ? level2path + "." : "") + devicename;
+        this.logsilly("createDevice " + id);
+        if (await this.existsObjectAsync(id)) {
+            this.logsilly("Device exists: " + id);
+        } else {
+            const obj = {
+                type: "device",
+                common: {
+                    name: devicename
+                },
+                native: {}
+            };
+            this.adapter.setObject(id, obj);
+        }
+    };
+    this.existsObjectAsync = function (id) {
+        return new Promise((resolve, reject) => {
+            id = this.adapter.namespace + "." + id;
+
+            this.adapter.getForeignObject(id, (err, obj) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(!!obj);
+                }
+
+            });
+        });
+    };
     this.convertState = function (stateTemplate, value) {
         if (stateTemplate.type == "string") return String(value);
         if (stateTemplate.type == "number") return Number(value);
-        this.logdebug('Missing conversion function for type ' + stateTemplate.type + ' Please report.');
+        this.logdebug("Missing conversion function for type " + stateTemplate.type + " Please report.");
         return value;
     };
     this.logsilly = (s) => {
@@ -796,6 +814,6 @@ function IoSbServer(adapter) {
         this.adapter.log.info(s);
     };
     this.getDiscoverServers();
-    this.sbServer.on('register', this.init.bind(this));
+    this.sbServer.on("register", this.init.bind(this));
 }
 module.exports = IoSbServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.squeezeboxrpc",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "ioBroker Logitech Squeezebox Adapter over JSON/RPC-Protocol",
   "author": {
     "name": "oweitman",