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

rework apiclient startup

Browse Source
This commit is contained in:
Luke Pulverenti 2014-09-24 18:47:03 -04:00
parent edb99f6ba2
commit 91cb173176
2 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1162,7 +1162,7 @@ var Dashboard = {
alert(Globalize.translate('MessageBrowserDoesNotSupportWebSockets')); alert(Globalize.translate('MessageBrowserDoesNotSupportWebSockets'));
} }
window.ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion); window.ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion, MediaBrowser.ApiClient.generateDeviceName(), MediaBrowser.ApiClient.generateDeviceId());
$(ApiClient).on("websocketopen", Dashboard.onWebSocketOpened) $(ApiClient).on("websocketopen", Dashboard.onWebSocketOpened)
.on("websocketmessage", Dashboard.onWebSocketMessageReceived); .on("websocketmessage", Dashboard.onWebSocketMessageReceived);

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

@ -53,30 +53,7 @@ if (!window.MediaBrowser) {
window.MediaBrowser = {}; window.MediaBrowser = {};
} }
MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window, FileReader, store) { MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window, FileReader) {
function generateDeviceId() {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
var randomId = '';
// Since the above is not guaranteed to be unique per device, add a little more
randomId = store.getItem('randomId');
if (!randomId) {
randomId = new Date().getTime();
store.setItem('randomId', randomId.toString());
}
keys.push(randomId);
return MediaBrowser.SHA1(keys.join('|'));
}
/** /**
* Creates a new api client instance * Creates a new api client instance
@ -84,15 +61,13 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
* @param {String} clientName * @param {String} clientName
* @param {String} applicationVersion * @param {String} applicationVersion
*/ */
return function (serverAddress, clientName, applicationVersion) { return function (serverAddress, clientName, applicationVersion, deviceName, deviceId) {
if (!serverAddress) { if (!serverAddress) {
throw new Error("Must supply a serverAddress"); throw new Error("Must supply a serverAddress");
} }
var self = this; var self = this;
var deviceName = "Web Browser";
var deviceId = generateDeviceId();
var currentUserId; var currentUserId;
var accessToken; var accessToken;
var webSocket; var webSocket;
@ -128,42 +103,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
accessToken = token; accessToken = token;
}; };
deviceName = (function () {
var name = "";
if ($.browser.chrome) {
name = "Chrome";
} else if ($.browser.safari) {
name = "Safari";
} else if ($.browser.webkit) {
name = "WebKit";
} else if ($.browser.msie) {
name = "Internet Explorer";
} else if ($.browser.opera) {
name = "Opera";
} else if ($.browser.firefox || $.browser.mozilla) {
name = "Firefox";
}
if (name) {
if ($.browser.version) {
name += " " + $.browser.version;
}
} else {
name = "Web Browser";
}
if ($.browser.ipad) {
name += " Ipad";
} else if ($.browser.iphone) {
name += " Iphone";
} else if ($.browser.android) {
name += " Android";
}
return name;
}());
self.deviceName = function () { self.deviceName = function () {
return deviceName; return deviceName;
}; };
@ -3274,12 +3213,71 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
}; };
}(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window, window.FileReader, window.store); }(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window, window.FileReader);
(function (store) {
MediaBrowser.ApiClient.generateDeviceId = function() {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
var randomId = '';
// Since the above is not guaranteed to be unique per device, add a little more
randomId = store.getItem('randomId');
if (!randomId) {
randomId = new Date().getTime();
store.setItem('randomId', randomId.toString());
}
keys.push(randomId);
return MediaBrowser.SHA1(keys.join('|'));
};
MediaBrowser.ApiClient.generateDeviceName = function () {
var name = "Web Browser";
if ($.browser.chrome) {
name = "Chrome";
} else if ($.browser.safari) {
name = "Safari";
} else if ($.browser.webkit) {
name = "WebKit";
} else if ($.browser.msie) {
name = "Internet Explorer";
} else if ($.browser.opera) {
name = "Opera";
} else if ($.browser.firefox || $.browser.mozilla) {
name = "Firefox";
}
if ($.browser.version) {
name += " " + $.browser.version;
}
if ($.browser.ipad) {
name += " Ipad";
} else if ($.browser.iphone) {
name += " Iphone";
} else if ($.browser.android) {
name += " Android";
}
return name;
};
})(window.store);
/** /**
* Provides a friendly way to create an api client instance using information from the browser's current url * Provides a friendly way to create an api client instance using information from the browser's current url
*/ */
MediaBrowser.ApiClient.create = function (clientName, applicationVersion) { MediaBrowser.ApiClient.create = function (clientName, applicationVersion, deviceName, deviceId) {
var loc = window.location; var loc = window.location;
@ -3289,7 +3287,7 @@ MediaBrowser.ApiClient.create = function (clientName, applicationVersion) {
address += ':' + loc.port; address += ':' + loc.port;
} }
return new MediaBrowser.ApiClient(address, clientName, applicationVersion); return new MediaBrowser.ApiClient(address, clientName, applicationVersion, deviceName, deviceId);
}; };
/** /**