milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

connect updates

Browse source
This commit is contained in:
Luke Pulverenti 2014-10-25 14:32:58 -04:00
parent 90082ed4bc
commit 83d7b945d7
25 changed files with 686 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

189
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -16,7 +16,7 @@ MediaBrowser.ConnectionManager = function (store) {
Remote: 1
};
return function (credentialProvider, appName, applicationVersion, deviceName, deviceId) {
return function (credentialProvider, appName, applicationVersion, deviceName, deviceId, capabilities) {
var self = this;
var apiClients = [];
@ -77,6 +77,34 @@ MediaBrowser.ConnectionManager = function (store) {
return connectUser;
};
self.appVersion = function() {
return applicationVersion;
};
self.deviceId = function () {
return deviceId;
};
self.currentApiClient = function () {
return apiClients[0];
};
self.addApiClient = function (apiClient) {
apiClients.push(apiClient);
apiClient.getPublicSystemInfo().done(function (systemInfo) {
var server = {};
updateServerInfo(server, systemInfo);
apiClient.serverInfo(server);
$(this).trigger('apiclientcreated', [apiClient]);
});
};
function onConnectAuthenticated(user) {
connectUser = user;
@ -91,23 +119,27 @@ MediaBrowser.ConnectionManager = function (store) {
var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress;
apiClient = new MediaBrowser.ApiClient(url, appName, applicationVersion, deviceName, deviceId);
apiClient = new MediaBrowser.ApiClient(url, appName, applicationVersion, deviceName, deviceId, capabilities);
apiClients.push(apiClient);
apiClient.serverInfo(server);
$(apiClient).on('authenticated', function (e, result) {
onLocalAuthenticated(this, result);
});
$(this).trigger('apiclientcreated', [apiClient]);
}
if (!server.accessToken) {
if (!server.AccessToken) {
apiClient.clearAuthenticationInfo();
}
else {
apiClient.setAuthenticationInfo(server.accessToken, server.userId);
apiClient.setAuthenticationInfo(server.AccessToken, server.UserId);
}
return apiClient;
@ -152,10 +184,7 @@ MediaBrowser.ConnectionManager = function (store) {
var deferred = $.Deferred();
if (self.isLoggedIntoConnect()) {
deferred.resolveWith(null, [[]]);
} else {
if (self.isLoggedIntoConnect() && !connectUser) {
getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).done(function (user) {
onConnectAuthenticated(user);
@ -165,6 +194,9 @@ MediaBrowser.ConnectionManager = function (store) {
deferred.resolveWith(null, [[]]);
});
} else {
deferred.resolveWith(null, [[]]);
}
return deferred.promise();
@ -172,7 +204,7 @@ MediaBrowser.ConnectionManager = function (store) {
function getConnectUser(userId, accessToken) {
var url = "https://connect.mediabrowser.tv/service/user?userId=" + userId;
var url = "https://connect.mediabrowser.tv/service/user?id=" + userId;
return $.ajax({
type: "GET",
@ -281,6 +313,79 @@ MediaBrowser.ConnectionManager = function (store) {
return deferred.promise();
}
function getImageUrl(localUser) {
if (connectUser && connectUser.ImageUrl) {
return {
url: connectUser.ImageUrl
};
}
if (localUser.PrimaryImageTag) {
var apiClient = self.getApiClient(localUser);
var url = apiClient.getUserImageUrl(localUser.Id, {
tag: localUser.PrimaryImageTag,
type: "Primary"
});
return {
url: url,
supportsImageParams: true
};
}
return {
url: null,
supportsImageParams: false
};
}
self.user = function() {
var deferred = $.Deferred();
var localUser;
function onLocalUserDone() {
var image = getImageUrl(localUser);
deferred.resolveWith(null, [
{
connectUser: connectUser,
localUser: localUser,
name: connectUser ? connectUser.Name : localUser.Name,
canManageServer: localUser && localUser.Configuration.IsAdministrator,
imageUrl: image.url,
supportsImageParams: image.supportsParams
}]);
}
function onEnsureConnectUserDone() {
var apiClient = self.currentApiClient();
if (apiClient && apiClient.getCurrentUserId()) {
apiClient.getUser(apiClient.getCurrentUserId()).done(function (u) {
localUser = u;
}).always(onLocalUserDone);
} else {
onLocalUserDone();
}
}
var credentials = credentialProvider.credentials();
if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
ensureConnectUser(credentials).always(onEnsureConnectUserDone);
} else {
onEnsureConnectUserDone();
}
return deferred.promise();
};
self.isLoggedIntoConnect = function () {
return self.connectToken() && self.connectUserId();
@ -383,6 +488,10 @@ MediaBrowser.ConnectionManager = function (store) {
var newList = mergeServers(servers, result);
newList.sort(function (a, b) {
return b.DateLastAccessed - a.DateLastAccessed;
});
deferred.resolveWith(null, [newList]);
credentials.servers = newList;
@ -413,12 +522,10 @@ MediaBrowser.ConnectionManager = function (store) {
var deferred = $.Deferred();
servers.sort(function (a, b) {
return b.DateLastAccessed - a.DateLastAccessed;
});
if (servers.length == 1) {
if (!servers[0].DateLastAccessed && !self.connectUser()) {
if (!servers[0].DateLastAccessed && !self.connectUserId()) {
deferred.resolveWith(null, [
{
Servers: servers,
@ -426,24 +533,30 @@ MediaBrowser.ConnectionManager = function (store) {
ConnectUser: self.connectUser()
}
]);
} else {
self.connectToServer(servers[0]).done(function (result) {
if (result.State == MediaBrowser.ConnectionState.Unavailable) {
result.State = MediaBrowser.ConnectionState.ServerSelection;
}
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.resolveWith(null, [
{
Servers: servers,
State: MediaBrowser.ConnectionState.ServerSelection,
ConnectUser: self.connectUser()
}
]);
});
}
self.connectToServer(servers[0]).done(function (result) {
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.resolveWith(null, [
{
Servers: servers,
State: MediaBrowser.ConnectionState.ServerSelection,
ConnectUser: self.connectUser()
}
]);
});
} else {
// Find the first server with a saved access token
@ -468,10 +581,11 @@ MediaBrowser.ConnectionManager = function (store) {
});
} else {
deferred.resolveWith(null, [
{
Servers: servers,
State: servers.length ? MediaBrowser.ConnectionState.ServerSelection : MediaBrowser.ConnectionState.Unavailable,
State: (!servers.length && !self.connectUser()) ? MediaBrowser.ConnectionState.Unavailable : MediaBrowser.ConnectionState.ServerSelection,
ConnectUser: self.connectUser()
}]);
}
@ -576,6 +690,7 @@ MediaBrowser.ConnectionManager = function (store) {
if (server.LocalAddress) {
//onLocalTestDone();
// Try to connect to the local address
tryConnect(server.LocalAddress).done(function (result) {
@ -657,8 +772,16 @@ MediaBrowser.ConnectionManager = function (store) {
self.getApiClient = function (item) {
// TODO: accept string + objet
return apiClients[0];
// Accept string + object
if (item.ServerId) {
item = item.ServerId;
}
return apiClients.filter(function (a) {
return a.serverInfo().Id = item;
})[0];
};
};

5
dashboard-ui/thirdparty/apiclient/credentials.js vendored
View file

@ -26,6 +26,11 @@ MediaBrowser.CredentialProvider = function (store) {
store.setItem('servercredentials', JSON.stringify(get()));
}
self.clear = function() {
credentials = null;
store.removeItem('servercredentials');
};
self.credentials = function (data) {
if (data) {

64
dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js vendored
View file

@ -10,7 +10,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
* @param {String} clientName
* @param {String} applicationVersion
*/
return function (serverAddress, clientName, applicationVersion, deviceName, deviceId) {
return function (serverAddress, clientName, applicationVersion, deviceName, deviceId, capabilities) {
if (!serverAddress) {
throw new Error("Must supply a serverAddress");
@ -26,6 +26,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
var currentUserId;
var accessToken;
var webSocket;
var serverInfo;
/**
* Gets the server address.
@ -40,6 +41,13 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
return "/mediabrowser";
};
self.serverInfo = function (info) {
serverInfo = info || serverInfo;
return serverInfo;
};
/**
* Gets or sets the current user id.
*/
@ -89,27 +97,29 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
/**
* Wraps around jQuery ajax methods to add additional info to the request.
*/
self.ajax = function (request) {
self.ajax = function (request, includeAuthorization) {
if (!request) {
throw new Error("Request cannot be null");
}
if (clientName) {
if (includeAuthorization !== false) {
if (clientName) {
var auth = 'MediaBrowser Client="' + clientName + '", Device="' + deviceName + '", DeviceId="' + deviceId + '", Version="' + applicationVersion + '"';
var auth = 'MediaBrowser Client="' + clientName + '", Device="' + deviceName + '", DeviceId="' + deviceId + '", Version="' + applicationVersion + '"';
if (currentUserId) {
auth += ', UserId="' + currentUserId + '"';
if (currentUserId) {
auth += ', UserId="' + currentUserId + '"';
}
request.headers = {
Authorization: auth
};
}
request.headers = {
Authorization: auth
};
}
if (accessToken) {
request.headers['X-MediaBrowser-Token'] = accessToken;
if (accessToken) {
request.headers['X-MediaBrowser-Token'] = accessToken;
}
}
return $.ajax(request);
@ -146,7 +156,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
return url;
};
self.enableAutomaticNetworking = function(server, connectionMode) {
self.enableAutomaticNetworking = function (server, connectionMode) {
};
@ -171,6 +181,8 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion + "|" + deviceName);
self.reportCapabilities(capabilities);
$(self).trigger("websocketopen");
}, 500);
@ -848,6 +860,21 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
});
};
/**
* Gets the current server status
*/
self.getPublicSystemInfo = function () {
var url = self.getUrl("System/Info/Public");
return self.ajax({
type: "GET",
url: url,
dataType: "json"
}, false);
};
self.getInstantMixFromSong = function (itemId, options) {
var url = self.getUrl("Songs/" + itemId + "/InstantMix", options);
@ -2049,7 +2076,8 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
type: "GET",
url: url,
dataType: "json"
});
}, false);
};
/**
@ -2081,7 +2109,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
};
var supportsWebP = false;
self.supportsWebP = function(val) {
self.supportsWebP = function (val) {
if (val != null) {
supportsWebP = val;
@ -2264,7 +2292,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
dataType: "json",
contentType: "application/json"
}).done(function(result) {
}).done(function (result) {
$(self).trigger('authenticated', [result]);
@ -3170,7 +3198,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
(function (store) {
MediaBrowser.ApiClient.generateDeviceId = function() {
MediaBrowser.ApiClient.generateDeviceId = function () {
var keys = [];