1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Use URL API for better readability

This commit is contained in:
Sky-High 2023-09-10 20:11:02 +02:00
parent 4076148580
commit d773790439

View file

@ -336,22 +336,22 @@ class CastPlayer {
/* If serverAddress is localhost,this address can not be used for the cast receiver device. /* If serverAddress is localhost,this address can not be used for the cast receiver device.
* Use the local address (ULA, Unique Local Address) in that case. * Use the local address (ULA, Unique Local Address) in that case.
*/ */
const srvAddress = apiClient.serverAddress(); const serverAddress = apiClient.serverAddress();
const prefix = 'http' + ':' + '//'; const hostname = (new URL(serverAddress)).hostname;
const checkLocalhost = srvAddress.startsWith(prefix + 'localhost') || srvAddress.startsWith(prefix + '127.') || srvAddress.startsWith(prefix + '[::1]'); const isLocalhost = hostname === 'localhost' || hostname.startsWith('127.') || hostname === '[::1]';
const srvLocalAddress = checkLocalhost ? apiClient.serverInfo().LocalAddress : srvAddress; const serverLocalAddress = isLocalhost ? apiClient.serverInfo().LocalAddress : serverAddress;
message = Object.assign(message, { message = Object.assign(message, {
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
deviceId: apiClient.deviceId(), deviceId: apiClient.deviceId(),
accessToken: apiClient.accessToken(), accessToken: apiClient.accessToken(),
serverAddress: srvLocalAddress, serverAddress: serverLocalAddress,
serverId: apiClient.serverId(), serverId: apiClient.serverId(),
serverVersion: apiClient.serverVersion(), serverVersion: apiClient.serverVersion(),
receiverName: receiverName receiverName: receiverName
}); });
console.debug('cc: message{' + message.command + '; ' + srvAddress + ' -> ' + srvLocalAddress + '}'); console.debug('cc: message{' + message.command + '; ' + serverAddress + ' -> ' + serverLocalAddress + '}');
const bitrateSetting = appSettings.maxChromecastBitrate(); const bitrateSetting = appSettings.maxChromecastBitrate();
if (bitrateSetting) { if (bitrateSetting) {