Handle Playlist Error

patrickbs96 · Dec 7, 2021 · 5b22687 · 5b22687
1 parent d734ffb
commit 5b22687
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/twinkly.js b/lib/twinkly.js
@@ -1131,7 +1131,7 @@ class Twinkly {
 
     /**
      * Get playlist
-     * @return {Promise<{playlist: {unique_id: String, entries: {id: Number, handle: Number, name: String, unique_id: String, duration: Number}[]}, code: Number}>}
+     * @return {Promise<{playlist: {unique_id: String, name: String, entries: {id: Number, handle: Number, name: String, unique_id: String, duration: Number}[]}, code: Number}>}
      * @see <a href="https://xled-docs.readthedocs.io/en/latest/rest_api.html#get-playlist">REST-API</a>
      */
     async getPlaylist() {
@@ -1140,10 +1140,10 @@ class Twinkly {
             const response = await this._get('playlist');
 
             /**
-             * @type {{unique_id: String, entries:{id: Number, handle: Number, name: String, unique_id: String, duration: Number}[]}}
+             * @type {{unique_id: String, name: String, entries:{id: Number, handle: Number, name: String, unique_id: String, duration: Number}[]}}
              */
             const playlist = {};
-            this.getObjectByArray('playlist', playlist, response, ['unique_id', 'entries']);
+            this.getObjectByArray('playlist', playlist, response, ['unique_id', 'name', 'entries']);
 
             // Liste füllen
             for (const entry of playlist.entries) {
@@ -1152,11 +1152,6 @@ class Twinkly {
 
             return {playlist: playlist, code: response['code']};
         } catch (e) {
-            // Wenn keine Playlist existiert, kommt hier eine Exception
-            // HTTP Error (204) No Content: {"code":1102}
-            if (e.message && (e.message.includes('ECONNRESET') || e.message.includes('(204)')))
-                return {playlist: {unique_id: '', entries: []}, code: HTTPCodes.values.ok};
-
             throw Error(e.message);
         }
     }
@@ -1207,6 +1202,11 @@ class Twinkly {
 
             return {playlist : playlist , code: response['code']};
         } catch (e) {
+            // Wenn keine Playlist existiert, kommt hier eine Exception
+            // HTTP Error (204) No Content: {"code":1102}
+            if (e.message && (e.message.includes('ECONNRESET') || e.message.includes('(204)')))
+                return {playlist: {id: -1, unique_id: '', name: '', duration: 0}, code: HTTPCodes.values.ok};
+
             throw Error(e.message);
         }
     }