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

pause/play for stream + ip bugfix

Browse Source
This commit is contained in:
NoobishSVK
2024-01-28 21:51:34 +01:00
parent 325e80db92
commit 857615acfc
4 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
index.js
View File

@@ -54,12 +54,14 @@ wss.on('connection', (ws, request) => {
response.on('end', () => {
try {
const locationInfo = JSON.parse(data);
if(locationInfo.country == 'undefined') {
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
console.log(locationInfo.country);
if(locationInfo.country === undefined) {
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]\x1b[0m`);
} else {
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]\x1b[0m Location: ${locationInfo.city}, ${locationInfo.region}, ${locationInfo.country}`);
}
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}] Location: ${locationInfo.city}, ${locationInfo.region}, ${locationInfo.country}`);
} catch (error) {
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
logInfo(`Web client \x1b[32mconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]\x1b[0m`);
}
});
});

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

@@ -80,6 +80,51 @@ var _3LAS = /** @class */ (function () {
throw new Error();
}
};
_3LAS.prototype.Stop = function () {
try {
// Close WebSocket connection
if (this.WebSocket) {
this.WebSocket.Close();
this.WebSocket.OnClose();
this.WebSocket = null;
this.Logger.Log("WebSocket connection closed.");
}
// Stop WakeLock if it exists and is an Android device
if (isAndroid && this.WakeLock) {
this.WakeLock.End();
this.Logger.Log("WakeLock stopped.");
}
// Reset WebRTC if it exists
if (this.WebRTC) {
this.WebRTC.OnSocketDisconnect();
this.WebRTC.Reset();
this.WebRTC.Stop();
this.Logger.Log("WebRTC reset.");
}
// Reset Fallback if it exists
if (this.Fallback) {
this.Fallback.OnSocketDisconnect();
this.Fallback.Stop();
this.Fallback.Reset();
this.Logger.Log("Fallback reset.");
}
// Reset connectivity flag
if (this.ConnectivityFlag) {
this.ConnectivityFlag = null;
if (this.ConnectivityCallback) {
this.ConnectivityCallback(null);
}
}
this.Logger.Log("3LAS stopped successfully.");
} catch (e) {
this.Logger.Log("Error while stopping 3LAS: " + e);
}
};
_3LAS.prototype.OnActivity = function () {
if (this.ActivityCallback)
this.ActivityCallback();

15
web/js/3las/main.js
View File

@@ -34,16 +34,17 @@ function OnConnectivityCallback(isConnected) {
function OnPlayButtonClick(_ev) {
try {
Stream.Start();
$('#playbutton').prop('disabled', true);
$('#playbutton').find('.fa-solid').removeClass('fa-play').addClass('fa-pause');
if (Stream.ConnectivityFlag) {
Stream.Stop();
$('#playbutton').find('.fa-solid').removeClass('fa-pause').addClass('fa-play');
} else {
Stream.Start();
$('#playbutton').find('.fa-solid').removeClass('fa-play').addClass('fa-pause');
}
}
catch (_ex) {
}
}
function updateVolume() {
Stream.Volume = $(this).val();
}
var lastTapTime = -1;
}

5
web/js/3las/util/3las.websocketclient.js
View File

@@ -69,6 +69,11 @@ var WebSocketClient = /** @class */ (function () {
this.DisconnectCallback();
}
};
WebSocketClient.prototype.Close = function () {
if (this.Socket) {
this.Socket.close();
}
};
// Handle incomping data
WebSocketClient.prototype.OnMessage = function (ev) {
// Trigger callback