cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

update connect scripts

Browse Source
This commit is contained in:
Luke Pulverenti 2014-10-27 17:45:50 -04:00
parent b96c70cb0a
commit 8cf3aba7e0
6 changed files with 170 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dashboard-ui/scripts/site.js
View File

@ -772,12 +772,7 @@ var Dashboard = {
ensureWebSocket: function () {
if (!("WebSocket" in window)) {
// Not supported by the browser
return;
}
if (ApiClient.isWebSocketOpenOrConnecting()) {
if (ApiClient.isWebSocketOpenOrConnecting() || !ApiClient.isWebSocketSupported()) {
return;
}

18
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View File

@ -1,22 +1,22 @@
if (!window.MediaBrowser) {
window.MediaBrowser = {};
(function (globalScope, $) {
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
MediaBrowser.ConnectionManager = function ($) {
MediaBrowser.ConnectionState = {
globalScope.MediaBrowser.ConnectionState = {
Unavilable: 0,
ServerSelection: 1,
ServerSignIn: 2,
SignedIn: 3
};
MediaBrowser.ConnectionMode = {
globalScope.MediaBrowser.ConnectionMode = {
Local: 0,
Remote: 1
};
return function (credentialProvider, appName, applicationVersion, deviceName, deviceId, capabilities) {
globalScope.MediaBrowser.ConnectionManager = function (credentialProvider, appName, applicationVersion, deviceName, deviceId, capabilities) {
var self = this;
var apiClients = [];
@ -178,7 +178,7 @@ MediaBrowser.ConnectionManager = function ($) {
function ensureWebSocket(apiClient) {
if (!apiClient.isWebSocketOpenOrConnecting) {
if (!apiClient.isWebSocketOpenOrConnecting && apiClient.isWebSocketSupported()) {
apiClient.openWebSocket();
}
}
@ -793,4 +793,4 @@ MediaBrowser.ConnectionManager = function ($) {
};
};
}(jQuery);
})(window, jQuery);

33
dashboard-ui/thirdparty/apiclient/credentials.js vendored
View File

@ -1,10 +1,10 @@
if (!window.MediaBrowser) {
window.MediaBrowser = {};
(function (globalScope, store, JSON) {
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
MediaBrowser.CredentialProvider = function (store) {
return function () {
globalScope.MediaBrowser.CredentialProvider = function () {
var self = this;
var credentials;
@ -46,34 +46,27 @@ MediaBrowser.CredentialProvider = function (store) {
return s.Id == server.Id;
})[0];
if (existing)
{
if (existing) {
// Merge the data
existing.DateLastAccessed = Math.max(existing.DateLastAccessed || 0, server.DateLastAccessed || 0, new Date().getTime());
if (server.AccessToken)
{
if (server.AccessToken) {
existing.AccessToken = server.AccessToken;
existing.UserId = server.UserId;
}
if (server.ExchangeToken)
{
if (server.ExchangeToken) {
existing.ExchangeToken = server.ExchangeToken;
}
if (server.RemoteAddress)
{
if (server.RemoteAddress) {
existing.RemoteAddress = server.RemoteAddress;
}
if (server.LocalAddress)
{
if (server.LocalAddress) {
existing.LocalAddress = server.LocalAddress;
}
if (server.Name)
{
if (server.Name) {
existing.Name = server.Name;
}
if (server.WakeOnLanInfos && server.WakeOnLanInfos.length)
{
if (server.WakeOnLanInfos && server.WakeOnLanInfos.length) {
existing.WakeOnLanInfos = server.WakeOnLanInfos;
}
}
@ -83,4 +76,4 @@ MediaBrowser.CredentialProvider = function (store) {
};
};
}(window.store);
})(window, store, window.JSON);

12
dashboard-ui/thirdparty/apiclient/device.js vendored
View File

@ -1,10 +1,10 @@
if (!window.MediaBrowser) {
window.MediaBrowser = {};
(function (globalScope, store) {
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
(function (store) {
MediaBrowser.generateDeviceId = function () {
globalScope.MediaBrowser.generateDeviceId = function () {
var keys = [];
@ -27,4 +27,4 @@
return sha1(keys.join('|'));
};
})(store);
})(window, store);

135
dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js vendored
View File

@ -1,8 +1,8 @@
if (!window.MediaBrowser) {
window.MediaBrowser = {};
}
(function (globalScope, $, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) {
MediaBrowser.ApiClient = function ($, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) {
if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {};
}
/**
* Creates a new api client instance
@ -10,7 +10,7 @@ MediaBrowser.ApiClient = function ($, JSON, WebSocket, setTimeout, devicePixelRa
* @param {String} clientName
* @param {String} applicationVersion
*/
return function (serverAddress, clientName, applicationVersion, deviceName, deviceId, capabilities) {
globalScope.MediaBrowser.ApiClient = function (serverAddress, clientName, applicationVersion, deviceName, deviceId, capabilities) {
if (!serverAddress) {
throw new Error("Must supply a serverAddress");
@ -122,7 +122,123 @@ MediaBrowser.ApiClient = function ($, JSON, WebSocket, setTimeout, devicePixelRa
}
}
if (!self.enableAutomaticNetwork) {
return $.ajax(request);
}
var deferred = $.Deferred();
self.ajaxWithFailover(request, deferred);
return deferred.promise();
};
function tryReconnectInternal(deferred, connectionMode, currentRetryCount) {
if (connectionMode == null) {
connectionMode = self.connectionMode;
}
var url = connectionMode == MediaBrowser.ConnectionMode.Local ?
self.serverInfo().LocalAddress :
self.serverInfo().RemoteAddress;
$.ajax({
type: "GET",
url: url + "/mediabrowser/system/info/public",
dataType: "json",
error: function () {
},
timeout: 3000
}).done(function () {
self.connectionMode = connectionMode;
deferred.resolve();
}).fail(function () {
currentRetryCount = currentRetryCount || 0;
if (currentRetryCount <= 6) {
var newConnectionMode;
if (connectionMode == MediaBrowser.ConnectionMode.Local && serverInfo.RemoteAddress) {
newConnectionMode = MediaBrowser.ConnectionMode.Remote;
}
else if (connectionMode == MediaBrowser.ConnectionMode.Remote && serverInfo.LocalAddress) {
newConnectionMode = MediaBrowser.ConnectionMode.Local;
}
else {
newConnectionMode = connectionMode;
}
tryReconnectInternal(deferred, newConnectionMode, currentRetryCount + 1);
} else {
deferred.reject();
}
});
}
function tryReconnect() {
var deferred = $.Deferred();
tryReconnectInternal(deferred);
return deferred.promise();
}
function replaceServerAddress(url, newBaseUrl) {
var index = url.toLowerCase().indexOf("/mediabrowser");
if (index != -1) {
return newBaseUrl + url.substring(index);
}
return url;
}
self.ajaxWithFailover = function (request, deferred, enableReconnection, replaceUrl) {
// Stop global error handlers
request.error = function () { };
if (replaceUrl) {
var baseUrl = connectionMode == MediaBrowser.ConnectionMode.Local ?
self.serverInfo().LocalAddress :
self.serverInfo().RemoteAddress;
request.url = replaceServerAddress(request.url, baseUrl);
}
$.ajax(request).done(function (response) {
deferred.resolveWith(null, [response]);
}).fail(function () {
if (enableReconnection !== false) {
tryReconnect().done(function () {
self.ajaxWithFailover(request, deferred, false, true);
}).fail(function () {
// TODO: Make sure global ajax error handlers fire
deferred.reject();
});
} else {
// TODO: Make sure global ajax error handlers fire
deferred.reject();
}
});
};
self.getJSON = function (url) {
@ -158,6 +274,13 @@ MediaBrowser.ApiClient = function ($, JSON, WebSocket, setTimeout, devicePixelRa
self.enableAutomaticNetworking = function (server, connectionMode) {
self.serverInfo(server);
self.connectionMode = connectionMode;
self.enableAutomaticNetwork = true;
};
self.isWebSocketSupported = function () {
return WebSocket != null;
};
self.openWebSocket = function () {
@ -3194,4 +3317,4 @@ MediaBrowser.ApiClient = function ($, JSON, WebSocket, setTimeout, devicePixelRa
};
}(jQuery, window.JSON, window.WebSocket, setTimeout, window.devicePixelRatio, window.FileReader);
})(window, jQuery, window.JSON, window.WebSocket, window.setTimeout, window.devicePixelRatio, window.FileReader);

8
dashboard-ui/thirdparty/apiclient/store.js vendored
View File

@ -1,4 +1,4 @@
(function (window) {
(function (globalScope, localStorage, sessionStorage) {
function myStore(defaultObject) {
@ -44,7 +44,7 @@
};
}
window.store = new myStore(window.localStorage);
window.sessionStore = new myStore(window.sessionStorage);
globalScope.store = new myStore(localStorage);
globalScope.sessionStore = new myStore(sessionStorage);
})(window);
})(window, window.localStorage, window.sessionStorage);