kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-26 22:13:53 +01:00
Code Issues Activity

Merge pull request #18 from bkram/Bkram/ssl-detection-for-proxied-stream

Browse Source 
On https use /stream/ path instead of the audio port
This commit is contained in:
Marek Farkaš
2024-02-05 21:17:13 +01:00
committed by GitHub
parent f3a99e6adc 72a00288bf
commit 26889f4898
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/js/3las/3las.js
View File

@@ -71,7 +71,12 @@ var _3LAS = /** @class */ (function () {
if (this.WakeLock) if (this.WakeLock)
this.WakeLock.Begin(); this.WakeLock.Begin();
try { try {
this.WebSocket = new WebSocketClient(this.Logger, 'ws://' + this.Settings.SocketHost + ':' + this.Settings.SocketPort.toString() + this.Settings.SocketPath, this.OnSocketError.bind(this), this.OnSocketConnect.bind(this), this.OnSocketDataReady.bind(this), this.OnSocketDisconnect.bind(this)); if (window.location.protocol === 'https:') {
this.WebSocket = new WebSocketClient(this.Logger, 'wss://' + this.Settings.SocketHost + ':' + '/stream' + this.Settings.SocketPath, this.OnSocketError.bind(this), this.OnSocketConnect.bind(this), this.OnSocketDataReady.bind(this), this.OnSocketDisconnect.bind(this));
}
else {
this.WebSocket = new WebSocketClient(this.Logger, 'ws://' + this.Settings.SocketHost + ':' + this.Settings.SocketPort.toString() + this.Settings.SocketPath, this.OnSocketError.bind(this), this.OnSocketConnect.bind(this), this.OnSocketDataReady.bind(this), this.OnSocketDisconnect.bind(this));
}
this.Logger.Log("Init of WebSocketClient succeeded"); this.Logger.Log("Init of WebSocketClient succeeded");
this.Logger.Log("Trying to connect to server."); this.Logger.Log("Trying to connect to server.");
} }
@@ -86,16 +91,16 @@ var _3LAS = /** @class */ (function () {
if (this.WebSocket) { if (this.WebSocket) {
this.WebSocket.Close(); this.WebSocket.Close();
this.WebSocket.OnClose(); this.WebSocket.OnClose();
this.WebSocket = null; this.WebSocket = null;
this.Logger.Log("WebSocket connection closed."); this.Logger.Log("WebSocket connection closed.");
} }
// Stop WakeLock if it exists and is an Android device // Stop WakeLock if it exists and is an Android device
if (isAndroid && this.WakeLock) { if (isAndroid && this.WakeLock) {
this.WakeLock.End(); this.WakeLock.End();
this.Logger.Log("WakeLock stopped."); this.Logger.Log("WakeLock stopped.");
} }
// Reset WebRTC if it exists // Reset WebRTC if it exists
if (this.WebRTC) { if (this.WebRTC) {
this.WebRTC.OnSocketDisconnect(); this.WebRTC.OnSocketDisconnect();
@@ -103,7 +108,7 @@ var _3LAS = /** @class */ (function () {
this.WebRTC.Stop(); this.WebRTC.Stop();
this.Logger.Log("WebRTC reset."); this.Logger.Log("WebRTC reset.");
} }
// Reset Fallback if it exists // Reset Fallback if it exists
if (this.Fallback) { if (this.Fallback) {
this.Fallback.OnSocketDisconnect(); this.Fallback.OnSocketDisconnect();
@@ -111,7 +116,7 @@ var _3LAS = /** @class */ (function () {
this.Fallback.Reset(); this.Fallback.Reset();
this.Logger.Log("Fallback reset."); this.Logger.Log("Fallback reset.");
} }
// Reset connectivity flag // Reset connectivity flag
if (this.ConnectivityFlag) { if (this.ConnectivityFlag) {
this.ConnectivityFlag = null; this.ConnectivityFlag = null;
@@ -119,12 +124,12 @@ var _3LAS = /** @class */ (function () {
this.ConnectivityCallback(null); this.ConnectivityCallback(null);
} }
} }
this.Logger.Log("3LAS stopped successfully."); this.Logger.Log("3LAS stopped successfully.");
} catch (e) { } catch (e) {
this.Logger.Log("Error while stopping 3LAS: " + e); this.Logger.Log("Error while stopping 3LAS: " + e);
} }
}; };
_3LAS.prototype.OnActivity = function () { _3LAS.prototype.OnActivity = function () {
if (this.ActivityCallback) if (this.ActivityCallback)
this.ActivityCallback(); this.ActivityCallback();