Use local copy of connection manager

This commit is contained in:
Bill Thornton
2025-04-21 13:57:26 -04:00
parent 1ce3888825
commit a5f6be85f5
3 changed files with 905 additions and 2 deletions

1
src/apiclient.d.ts vendored
View File

@@ -1,4 +1,3 @@
// TODO: Move to jellyfin-apiclient
/* eslint-disable @typescript-eslint/no-explicit-any */
declare module 'jellyfin-apiclient' {
import type {

View File

@@ -2,9 +2,10 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { Api } from '@jellyfin/sdk';
import { MINIMUM_VERSION } from '@jellyfin/sdk/lib/versions';
import { ConnectionManager, Credentials, ApiClient } from 'jellyfin-apiclient';
import { Credentials, ApiClient } from 'jellyfin-apiclient';
import { appHost } from './apphost';
import ConnectionManager from 'lib/jellyfin-apiclient/connectionManager';
import Dashboard from '../utils/dashboard';
import Events from '../utils/events.ts';
import { setUserInfo } from '../scripts/settings/userSettings';

View File

@@ -0,0 +1,903 @@
import { ApiClient } from 'jellyfin-apiclient';
import events from 'utils/events';
const defaultTimeout = 20000;
const ConnectionMode = {
Local: 0,
Remote: 1,
Manual: 2
};
function getServerAddress(server, mode) {
switch (mode) {
case ConnectionMode.Local:
return server.LocalAddress;
case ConnectionMode.Manual:
return server.ManualAddress;
case ConnectionMode.Remote:
return server.RemoteAddress;
default:
return server.ManualAddress || server.LocalAddress || server.RemoteAddress;
}
}
function paramsToString(params) {
const values = [];
for (const key in params) {
const value = params[key];
if (value !== null && value !== undefined && value !== '') {
values.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
}
}
return values.join('&');
}
function resolveFailure(instance, resolve) {
resolve({
State: 'Unavailable'
});
}
function mergeServers(credentialProvider, list1, list2) {
for (let i = 0, length = list2.length; i < length; i++) {
credentialProvider.addOrUpdateServer(list1, list2[i]);
}
return list1;
}
function updateServerInfo(server, systemInfo) {
server.Name = systemInfo.ServerName;
if (systemInfo.Id) {
server.Id = systemInfo.Id;
}
if (systemInfo.LocalAddress) {
server.LocalAddress = systemInfo.LocalAddress;
}
}
function getEmbyServerUrl(baseUrl, handler) {
return `${baseUrl}/${handler}`;
}
function getFetchPromise(request) {
const headers = request.headers || {};
if (request.dataType === 'json') {
headers.accept = 'application/json';
}
const fetchRequest = {
headers,
method: request.type,
credentials: 'same-origin'
};
let 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;
}
if (!request.timeout) {
return fetch(request.url, fetchRequest);
}
return fetchWithTimeout(request.url, fetchRequest, request.timeout);
}
function fetchWithTimeout(url, options, timeoutMs) {
console.log(`fetchWithTimeout: timeoutMs: ${timeoutMs}, url: ${url}`);
return new Promise((resolve, reject) => {
const timeout = setTimeout(reject, timeoutMs);
options = options || {};
options.credentials = 'same-origin';
fetch(url, options).then(
(response) => {
clearTimeout(timeout);
console.log(`fetchWithTimeout: succeeded connecting to url: ${url}`);
resolve(response);
},
(error) => {
clearTimeout(timeout);
console.log(`fetchWithTimeout: timed out connecting to url: ${url}`, error);
reject();
}
);
});
}
function ajax(request) {
if (!request) {
throw new Error('Request cannot be null');
}
request.headers = request.headers || {};
console.log(`ConnectionManager requesting url: ${request.url}`);
return getFetchPromise(request).then(
(response) => {
console.log(`ConnectionManager response status: ${response.status}, url: ${request.url}`);
if (response.status < 400) {
if (request.dataType === 'json' || request.headers.accept === 'application/json') {
return response.json();
} else {
return response;
}
} else {
return Promise.reject(response);
}
},
(err) => {
console.log(`ConnectionManager request failed to url: ${request.url}`);
throw err;
}
);
}
function replaceAll(originalString, strReplace, strWith) {
const reg = new RegExp(strReplace, 'ig');
return originalString.replace(reg, strWith);
}
function normalizeAddress(address) {
// Attempt to correct bad input
address = address.trim();
// Seeing failures in iOS when protocol isn't lowercase
address = replaceAll(address, 'Http:', 'http:');
address = replaceAll(address, 'Https:', 'https:');
return address;
}
function stringEqualsIgnoreCase(str1, str2) {
return (str1 || '').toLowerCase() === (str2 || '').toLowerCase();
}
function compareVersions(a, b) {
// -1 a is smaller
// 1 a is larger
// 0 equal
a = a.split('.');
b = b.split('.');
for (let i = 0, length = Math.max(a.length, b.length); i < length; i++) {
const aVal = parseInt(a[i] || '0', 10);
const bVal = parseInt(b[i] || '0', 10);
if (aVal < bVal) {
return -1;
}
if (aVal > bVal) {
return 1;
}
}
return 0;
}
export default class ConnectionManager {
constructor(credentialProvider, appName, appVersion, deviceName, deviceId, capabilities) {
console.log('Begin ConnectionManager constructor');
const self = this;
this._apiClients = [];
self._minServerVersion = '3.2.33';
self.appVersion = () => appVersion;
self.appName = () => appName;
self.capabilities = () => capabilities;
self.deviceId = () => deviceId;
self.credentialProvider = () => credentialProvider;
self.getServerInfo = (id) => {
const servers = credentialProvider.credentials().Servers;
return servers.filter((s) => s.Id === id)[0];
};
self.getLastUsedServer = () => {
const servers = credentialProvider.credentials().Servers;
servers.sort((a, b) => (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0));
if (!servers.length) {
return null;
}
return servers[0];
};
self.addApiClient = (apiClient) => {
self._apiClients.push(apiClient);
const existingServers = credentialProvider
.credentials()
.Servers.filter(
(s) =>
stringEqualsIgnoreCase(s.ManualAddress, apiClient.serverAddress())
|| stringEqualsIgnoreCase(s.LocalAddress, apiClient.serverAddress())
|| stringEqualsIgnoreCase(s.RemoteAddress, apiClient.serverAddress())
);
const existingServer = existingServers.length ? existingServers[0] : apiClient.serverInfo();
existingServer.DateLastAccessed = new Date().getTime();
existingServer.LastConnectionMode = ConnectionMode.Manual;
existingServer.ManualAddress = apiClient.serverAddress();
if (apiClient.manualAddressOnly) {
existingServer.manualAddressOnly = true;
}
apiClient.serverInfo(existingServer);
apiClient.onAuthenticated = (instance, result) => onAuthenticated(instance, result, {}, true);
if (!existingServers.length) {
const credentials = credentialProvider.credentials();
credentials.Servers = [existingServer];
credentialProvider.credentials(credentials);
}
events.trigger(self, 'apiclientcreated', [apiClient]);
};
self.clearData = () => {
console.log('connection manager clearing data');
const credentials = credentialProvider.credentials();
credentials.Servers = [];
credentialProvider.credentials(credentials);
};
self._getOrAddApiClient = (server, serverUrl) => {
let apiClient = self.getApiClient(server.Id);
if (!apiClient) {
apiClient = new ApiClient(serverUrl, appName, appVersion, deviceName, deviceId);
self._apiClients.push(apiClient);
apiClient.serverInfo(server);
apiClient.onAuthenticated = (instance, result) => {
return onAuthenticated(instance, result, {}, true);
};
events.trigger(self, 'apiclientcreated', [apiClient]);
}
console.log('returning instance from getOrAddApiClient');
return apiClient;
};
self.getOrCreateApiClient = (serverId) => {
const credentials = credentialProvider.credentials();
const servers = credentials.Servers.filter((s) => stringEqualsIgnoreCase(s.Id, serverId));
if (!servers.length) {
throw new Error(`Server not found: ${serverId}`);
}
const server = servers[0];
return self._getOrAddApiClient(server, getServerAddress(server, server.LastConnectionMode));
};
function onAuthenticated(apiClient, result, options, saveCredentials) {
const credentials = credentialProvider.credentials();
const servers = credentials.Servers.filter((s) => s.Id === result.ServerId);
const server = servers.length ? servers[0] : apiClient.serverInfo();
if (options.updateDateLastAccessed !== false) {
server.DateLastAccessed = new Date().getTime();
}
server.Id = result.ServerId;
if (saveCredentials) {
server.UserId = result.User.Id;
server.AccessToken = result.AccessToken;
} else {
server.UserId = null;
server.AccessToken = null;
}
credentialProvider.addOrUpdateServer(credentials.Servers, server);
credentialProvider.credentials(credentials);
// set this now before updating server info, otherwise it won't be set in time
apiClient.enableAutomaticBitrateDetection = options.enableAutomaticBitrateDetection;
apiClient.serverInfo(server);
apiClient.setAuthenticationInfo(result.AccessToken, result.User.Id);
afterConnected(apiClient, options);
return onLocalUserSignIn(server, apiClient.serverAddress(), result.User);
}
function afterConnected(apiClient, options = {}) {
if (options.reportCapabilities !== false) {
apiClient.reportCapabilities(capabilities);
}
apiClient.enableAutomaticBitrateDetection = options.enableAutomaticBitrateDetection;
if (options.enableWebSocket !== false) {
console.log('calling apiClient.ensureWebSocket');
apiClient.ensureWebSocket();
}
}
function onLocalUserSignIn(server, serverUrl, user) {
// Ensure this is created so that listeners of the event can get the apiClient instance
self._getOrAddApiClient(server, serverUrl);
// This allows the app to have a single hook that fires before any other
const promise = self.onLocalUserSignedIn ? self.onLocalUserSignedIn.call(self, user) : Promise.resolve();
return promise.then(() => {
events.trigger(self, 'localusersignedin', [user]);
});
}
function validateAuthentication(server, serverUrl) {
return ajax({
type: 'GET',
url: getEmbyServerUrl(serverUrl, 'System/Info'),
dataType: 'json',
headers: {
'X-MediaBrowser-Token': server.AccessToken
}
}).then(
(systemInfo) => {
updateServerInfo(server, systemInfo);
return Promise.resolve();
},
() => {
server.UserId = null;
server.AccessToken = null;
return Promise.resolve();
}
);
}
function getImageUrl(localUser) {
if (localUser && localUser.PrimaryImageTag) {
const apiClient = self.getApiClient(localUser);
const url = apiClient.getUserImageUrl(localUser.Id, {
tag: localUser.PrimaryImageTag,
type: 'Primary'
});
return {
url,
supportsParams: true
};
}
return {
url: null,
supportsParams: false
};
}
self.user = (apiClient) =>
new Promise((resolve) => {
let localUser;
function onLocalUserDone() {
if (apiClient && apiClient.getCurrentUserId()) {
apiClient.getCurrentUser().then((u) => {
localUser = u;
const image = getImageUrl(localUser);
resolve({
localUser,
name: localUser ? localUser.Name : null,
imageUrl: image.url,
supportsImageParams: image.supportsParams
});
});
}
}
if (apiClient && apiClient.getCurrentUserId()) {
onLocalUserDone();
}
});
self.logout = () => {
const promises = [];
for (let i = 0, length = self._apiClients.length; i < length; i++) {
const apiClient = self._apiClients[i];
if (apiClient.accessToken()) {
promises.push(logoutOfServer(apiClient));
}
}
return Promise.all(promises).then(() => {
const credentials = credentialProvider.credentials();
const servers = credentials.Servers.filter((u) => u.UserLinkType !== 'Guest');
for (let j = 0, numServers = servers.length; j < numServers; j++) {
const server = servers[j];
server.UserId = null;
server.AccessToken = null;
server.ExchangeToken = null;
}
});
};
function logoutOfServer(apiClient) {
const serverInfo = apiClient.serverInfo() || {};
const logoutInfo = {
serverId: serverInfo.Id
};
return apiClient.logout().then(
() => {
events.trigger(self, 'localusersignedout', [logoutInfo]);
},
() => {
events.trigger(self, 'localusersignedout', [logoutInfo]);
}
);
}
self.getSavedServers = () => {
const credentials = credentialProvider.credentials();
const servers = credentials.Servers.slice(0);
servers.sort((a, b) => (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0));
return servers;
};
self.getAvailableServers = () => {
console.log('Begin getAvailableServers');
// Clone the array
const credentials = credentialProvider.credentials();
return Promise.all([findServers()]).then((responses) => {
const foundServers = responses[0];
const servers = credentials.Servers.slice(0);
mergeServers(credentialProvider, servers, foundServers);
servers.sort((a, b) => (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0));
credentials.Servers = servers;
credentialProvider.credentials(credentials);
return servers;
});
};
function findServers() {
return new Promise((resolve) => {
const onFinish = function (foundServers) {
const servers = foundServers.map((foundServer) => {
const info = {
Id: foundServer.Id,
LocalAddress: convertEndpointAddressToManualAddress(foundServer) || foundServer.Address,
Name: foundServer.Name
};
info.LastConnectionMode = info.ManualAddress ? ConnectionMode.Manual : ConnectionMode.Local;
return info;
});
resolve(servers);
};
if (window && window.NativeShell && typeof window.NativeShell.findServers === 'function') {
window.NativeShell.findServers(1e3).then(onFinish, function () {
onFinish([]);
});
} else {
resolve([]);
}
});
}
function convertEndpointAddressToManualAddress(info) {
if (info.Address && info.EndpointAddress) {
let address = info.EndpointAddress.split(':')[0];
// Determine the port, if any
const parts = info.Address.split(':');
if (parts.length > 1) {
const portString = parts[parts.length - 1];
if (!isNaN(parseInt(portString, 10))) {
address += `:${portString}`;
}
}
return normalizeAddress(address);
}
return null;
}
self.connectToServers = (servers, options) => {
console.log(`Begin connectToServers, with ${servers.length} servers`);
const firstServer = servers.length ? servers[0] : null;
// See if we have any saved credentials and can auto sign in
if (firstServer) {
return self.connectToServer(firstServer, options).then((result) => {
if (result.State === 'Unavailable') {
result.State = 'ServerSelection';
}
console.log('resolving connectToServers with result.State: ' + result.State);
return result;
});
}
return Promise.resolve({
Servers: servers,
State: 'ServerSelection'
});
};
function getTryConnectPromise(url, connectionMode, state, resolve, reject) {
console.log('getTryConnectPromise ' + url);
ajax({
url: getEmbyServerUrl(url, 'system/info/public'),
timeout: defaultTimeout,
type: 'GET',
dataType: 'json'
}).then(
(result) => {
if (!state.resolved) {
state.resolved = true;
console.log('Reconnect succeeded to ' + url);
resolve({
url: url,
connectionMode: connectionMode,
data: result
});
}
},
() => {
console.log('Reconnect failed to ' + url);
if (!state.resolved) {
state.rejects++;
if (state.rejects >= state.numAddresses) {
reject();
}
}
}
);
}
function tryReconnect(serverInfo) {
const addresses = [];
const addressesStrings = [];
// the timeouts are a small hack to try and ensure the remote address doesn't resolve first
// manualAddressOnly is used for the local web app that always connects to a fixed address
if (
!serverInfo.manualAddressOnly
&& serverInfo.LocalAddress
&& addressesStrings.indexOf(serverInfo.LocalAddress) === -1
) {
addresses.push({
url: serverInfo.LocalAddress,
mode: ConnectionMode.Local,
timeout: 0
});
addressesStrings.push(addresses[addresses.length - 1].url);
}
if (serverInfo.ManualAddress && addressesStrings.indexOf(serverInfo.ManualAddress) === -1) {
addresses.push({
url: serverInfo.ManualAddress,
mode: ConnectionMode.Manual,
timeout: 100
});
addressesStrings.push(addresses[addresses.length - 1].url);
}
if (
!serverInfo.manualAddressOnly
&& serverInfo.RemoteAddress
&& addressesStrings.indexOf(serverInfo.RemoteAddress) === -1
) {
addresses.push({
url: serverInfo.RemoteAddress,
mode: ConnectionMode.Remote,
timeout: 200
});
addressesStrings.push(addresses[addresses.length - 1].url);
}
console.log('tryReconnect: ' + addressesStrings.join('|'));
return new Promise((resolve, reject) => {
const state = {};
state.numAddresses = addresses.length;
state.rejects = 0;
addresses.forEach((url) => {
setTimeout(() => {
if (!state.resolved) {
getTryConnectPromise(url.url, url.mode, state, resolve, reject);
}
}, url.timeout);
});
});
}
self.connectToServer = (server, options) => {
console.log('begin connectToServer');
return new Promise((resolve) => {
options = options || {};
tryReconnect(server).then(
(result) => {
const serverUrl = result.url;
const connectionMode = result.connectionMode;
result = result.data;
if (compareVersions(self.minServerVersion(), result.Version) === 1) {
console.log('minServerVersion requirement not met. Server version: ' + result.Version);
resolve({
State: 'ServerUpdateNeeded',
Servers: [server]
});
} else if (server.Id && result.Id !== server.Id) {
console.log(
'http request succeeded, but found a different server Id than what was expected'
);
resolveFailure(self, resolve);
} else {
onSuccessfulConnection(server, result, connectionMode, serverUrl, true, resolve, options);
}
},
() => {
resolveFailure(self, resolve);
}
);
});
};
function onSuccessfulConnection(server, systemInfo, connectionMode, serverUrl, verifyLocalAuthentication, resolve, options = {}) {
const credentials = credentialProvider.credentials();
if (options.enableAutoLogin === false) {
server.UserId = null;
server.AccessToken = null;
} else if (server.AccessToken && verifyLocalAuthentication) {
void validateAuthentication(server, serverUrl).then(function () {
onSuccessfulConnection(server, systemInfo, connectionMode, serverUrl, false, resolve, options);
});
return;
}
updateServerInfo(server, systemInfo);
server.LastConnectionMode = connectionMode;
if (options.updateDateLastAccessed !== false) {
server.DateLastAccessed = new Date().getTime();
}
credentialProvider.addOrUpdateServer(credentials.Servers, server);
credentialProvider.credentials(credentials);
const result = {
Servers: []
};
result.ApiClient = self._getOrAddApiClient(server, serverUrl);
result.ApiClient.setSystemInfo(systemInfo);
result.SystemInfo = systemInfo;
result.State = server.AccessToken && options.enableAutoLogin !== false ? 'SignedIn' : 'ServerSignIn';
result.Servers.push(server);
// set this now before updating server info, otherwise it won't be set in time
result.ApiClient.enableAutomaticBitrateDetection = options.enableAutomaticBitrateDetection;
result.ApiClient.updateServerInfo(server, serverUrl);
result.ApiClient.setAuthenticationInfo(server.AccessToken, server.UserId);
const resolveActions = function () {
resolve(result);
events.trigger(self, 'connected', [result]);
};
if (result.State === 'SignedIn') {
afterConnected(result.ApiClient, options);
result.ApiClient.getCurrentUser().then((user) => {
onLocalUserSignIn(server, serverUrl, user).then(resolveActions, resolveActions);
}, resolveActions);
} else {
resolveActions();
}
}
function tryConnectToAddress(address, options) {
const server = {
ManualAddress: address,
LastConnectionMode: ConnectionMode.Manual
};
return self.connectToServer(server, options).then((result) => {
// connectToServer never rejects, but resolves with State='Unavailable'
if (result.State === 'Unavailable') {
return Promise.reject();
}
return result;
});
}
self.connectToAddress = function (address, options) {
if (!address) {
return Promise.reject();
}
address = normalizeAddress(address);
const urls = [];
if (/^[^:]+:\/\//.test(address)) {
// Protocol specified - connect as is
urls.push(address);
} else {
urls.push(`https://${address}`);
urls.push(`http://${address}`);
}
let i = 0;
function onFail() {
console.log(`connectToAddress ${urls[i]} failed`);
if (++i < urls.length) {
return tryConnectToAddress(urls[i], options).catch(onFail);
}
return Promise.resolve({
State: 'Unavailable'
});
}
return tryConnectToAddress(urls[i], options).catch(onFail);
};
self.deleteServer = (serverId) => {
if (!serverId) {
throw new Error('null serverId');
}
let server = credentialProvider.credentials().Servers.filter((s) => s.Id === serverId);
server = server.length ? server[0] : null;
return new Promise((resolve) => {
function onDone() {
const credentials = credentialProvider.credentials();
credentials.Servers = credentials.Servers.filter((s) => s.Id !== serverId);
credentialProvider.credentials(credentials);
resolve();
}
if (!server.ConnectServerId) {
onDone();
}
});
};
}
connect(options) {
console.log('Begin connect');
return this.getAvailableServers().then((servers) => {
return this.connectToServers(servers, options);
});
}
handleMessageReceived(msg) {
const serverId = msg.ServerId;
if (serverId) {
const apiClient = this.getApiClient(serverId);
if (apiClient) {
if (typeof msg.Data === 'string') {
try {
msg.Data = JSON.parse(msg.Data);
} catch (err) {
console.log('unable to parse json content: ' + err);
}
}
apiClient.handleMessageReceived(msg);
}
}
}
getApiClients() {
const servers = this.getSavedServers();
for (let i = 0, length = servers.length; i < length; i++) {
const server = servers[i];
if (server.Id) {
this._getOrAddApiClient(server, getServerAddress(server, server.LastConnectionMode));
}
}
return this._apiClients;
}
getApiClient(item) {
if (!item) {
throw new Error('item or serverId cannot be null');
}
// Accept string + object
if (item.ServerId) {
item = item.ServerId;
}
return this._apiClients.filter((a) => {
const serverInfo = a.serverInfo();
// We have to keep this hack in here because of the addApiClient method
return !serverInfo || serverInfo.Id === item;
})[0];
}
minServerVersion(val) {
if (val) {
this._minServerVersion = val;
}
return this._minServerVersion;
}
}