JellyfinApi static class for server information

src/components/commandHandler.ts

@@ -11,8 +11,8 @@ import { getReportingParams } from '../helpers';
 
 import {
     displayItem,
-    displayUserInfo,
-    reportPlaybackProgress
+    reportPlaybackProgress,
+    startBackdropInterval
 } from './jellyfinActions';
 
 import {
@@ -92,13 +92,7 @@ export class commandHandler {
 
     displayContentHandler(data: DataMessage): void {
         if (!this.playbackManager.isPlaying()) {
-            displayItem(
-                $scope,
-                data.serverAddress,
-                data.accessToken,
-                data.userId,
-                data.options.ItemId
-            );
+            displayItem(data.options.ItemId);
         }
     }
 
@@ -122,7 +116,7 @@ export class commandHandler {
     }
 
     setSubtitleStreamIndexHandler(data: DataMessage): void {
-        setSubtitleStreamIndex($scope, data.options.index, data.serverAddress);
+        setSubtitleStreamIndex($scope, data.options.index);
     }
 
     // VolumeUp, VolumeDown and ToggleMute commands seem to be handled on the sender in the current implementation.
@@ -147,12 +141,7 @@ export class commandHandler {
 
     IdentifyHandler(data: DataMessage): void {
         if (!this.playbackManager.isPlaying()) {
-            displayUserInfo(
-                $scope,
-                data.serverAddress,
-                data.accessToken,
-                data.userId
-            );
+            startBackdropInterval();
         } else {
             // When a client connects send back the initial device state (volume etc) via a playbackstop message
             reportPlaybackProgress(

src/components/fetchhelper.js

@@ -1,22 +1,25 @@
-/* eslint-disable */
-
 export function getFetchPromise(request) {
     var headers = request.headers || {};
     'json' === request.dataType && (headers.accept = 'application/json');
     var fetchRequest = {
-            headers: headers,
-            method: request.type,
-            credentials: 'same-origin'
-        },
-        contentType = request.contentType;
-    request.data &&
-        ('string' == typeof request.data
-            ? (fetchRequest.body = request.data)
-            : ((fetchRequest.body = paramsToString(request.data)),
-              (contentType =
-                  contentType ||
-                  'application/x-www-form-urlencoded; charset=UTF-8'))),
-        contentType && (headers['Content-Type'] = contentType);
+        headers: headers,
+        method: request.type,
+        credentials: 'same-origin'
+    };
+    var contentType = request.contentType;
+    if (request.data) {
+        if (typeof request.data == 'string') {
+            fetchRequest.body = request.data;
+        } else {
+            fetchRequest.body = paramsToString(request.data);
+            contentType =
+                contentType ||
+                'application/x-www-form-urlencoded; charset=UTF-8';
+        }
+    }
+    if (contentType) {
+        headers['Content-Type'] = contentType;
+    }
     var url = request.url;
     if (request.query) {
         var paramString = paramsToString(request.query);
@@ -34,26 +37,24 @@ export function fetchWithTimeout(url, options, timeoutMs) {
         ),
         new Promise(function (resolve, reject) {
             var timeout = setTimeout(reject, timeoutMs);
-            (options = options || {}),
-                (options.credentials = 'same-origin'),
-                fetch(url, options).then(
-                    function (response) {
-                        clearTimeout(timeout),
-                            console.log(
-                                'fetchWithTimeout: succeeded connecting to url: ' +
-                                    url
-                            ),
-                            resolve(response);
-                    },
-                    function (error) {
-                        clearTimeout(timeout),
-                            console.log(
-                                'fetchWithTimeout: timed out connecting to url: ' +
-                                    url
-                            ),
-                            reject();
-                    }
-                );
+            options = options || {};
+            options.credentials = 'same-origin';
+            fetch(url, options).then(
+                function (response) {
+                    clearTimeout(timeout);
+                    console.log(
+                        'fetchWithTimeout: succeeded connecting to url: ' + url
+                    );
+                    resolve(response);
+                },
+                function () {
+                    clearTimeout(timeout);
+                    console.log(
+                        'fetchWithTimeout: timed out connecting to url: ' + url
+                    );
+                    reject();
+                }
+            );
         })
     );
 }
@@ -74,42 +75,39 @@ export function paramsToString(params) {
 
 export function ajax(request) {
     if (!request) throw new Error('Request cannot be null');
-    return (
-        (request.headers = request.headers || {}),
-        console.log('requesting url: ' + request.url),
-        getFetchPromise(request).then(
-            function (response) {
-                return (
-                    console.log(
-                        'response status: ' +
-                            response.status +
-                            ', url: ' +
-                            request.url
-                    ),
-                    response.status < 400
-                        ? 'json' === request.dataType ||
-                          'application/json' === request.headers.accept
-                            ? response.json()
-                            : 'text' === request.dataType ||
-                              0 ===
-                                  (response.headers.get('Content-Type') || '')
-                                      .toLowerCase()
-                                      .indexOf('text/')
-                            ? response.text()
-                            : response
-                        : Promise.reject(response)
-                );
-            },
-            function (err) {
-                throw (
-                    (console.log('request failed to url: ' + request.url), err)
-                );
+    request.headers = request.headers || {};
+    console.log('requesting url: ' + request.url);
+
+    return getFetchPromise(request).then(
+        function (response) {
+            console.log(
+                'response status: ' + response.status + ', url: ' + request.url
+            );
+            if (response.status >= 400) {
+                return Promise.reject(response);
+            } else if (
+                request.dataType === 'json' ||
+                request.headers.accept === 'application/json'
+            ) {
+                return response.json();
+            } else if (
+                request.dataType === 'text' ||
+                (response.headers.get('Content-Type') || '')
+                    .toLowerCase()
+                    .indexOf('text/') === 0
+            ) {
+                return response.text();
+            } else {
+                return response;
             }
-        )
+        },
+        function (err) {
+            console.log('request failed to url: ' + request.url);
+            throw err;
+        }
     );
 }
 
 export default {
-    getFetchPromise,
     ajax
 };