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

bugfixes, refactor, code removal

Browse Source
This commit is contained in:
NoobishSVK
2024-03-25 23:23:14 +01:00
parent fc52b211b7
commit 7f483770f2
20 changed files with 342 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ var _3LAS_Settings = /** @class */ (function () {
function _3LAS_Settings() {
this.SocketHost = document.location.hostname ? document.location.hostname : "127.0.0.1";
this.SocketPath = "/";
this.WebRTC = new WebRTC_Settings();
this.Fallback = new Fallback_Settings();
}
return _3LAS_Settings;
@@ -14,24 +13,16 @@ var _3LAS = /** @class */ (function () {
this.Logger = new Logging(null, null);
}
this.Settings = settings;
try {
this.WebRTC = new WebRTC(this.Logger, this.Settings.WebRTC);
this.WebRTC.ActivityCallback = this.OnActivity.bind(this);
this.WebRTC.DisconnectCallback = this.OnSocketDisconnect.bind(this);
this.Fallback = new Fallback(this.Logger, this.Settings.Fallback);
this.Fallback.ActivityCallback = this.OnActivity.bind(this);
}
catch (_a) {
this.WebRTC = null;
catch (_b) {
this.Fallback = null;
}
if (this.WebRTC == null || this.WebRTC !== null) {
try {
this.Fallback = new Fallback(this.Logger, this.Settings.Fallback);
this.Fallback.ActivityCallback = this.OnActivity.bind(this);
}
catch (_b) {
this.Fallback = null;
}
}
if (this.WebRTC == null && this.Fallback == null) {
if (this.Fallback == null) {
this.Logger.Log('3LAS: Browser does not support either media handling methods.');
throw new Error();
}
@@ -41,31 +32,20 @@ var _3LAS = /** @class */ (function () {
}
Object.defineProperty(_3LAS.prototype, "Volume", {
get: function () {
if (this.WebRTC)
return this.WebRTC.Volume;
else
return this.Fallback.Volume;
},
set: function (value) {
if (this.WebRTC)
this.WebRTC.Volume = value;
else
this.Fallback.Volume = value;
},
enumerable: false,
configurable: true
});
_3LAS.prototype.CanChangeVolume = function () {
if (this.WebRTC)
return this.WebRTC.CanChangeVolume();
else
return true;
};
_3LAS.prototype.Start = function () {
this.ConnectivityFlag = false;
// This is stupid, but required for iOS/iPadOS... thanks Apple :(
if (this.Settings && this.Settings.WebRTC && this.Settings.WebRTC.AudioTag)
this.Settings.WebRTC.AudioTag.play();
// This is stupid, but required for Android.... thanks Google :(
if (this.WakeLock)
this.WakeLock.Begin();
@@ -100,14 +80,6 @@ var _3LAS = /** @class */ (function () {
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();
@@ -141,31 +113,16 @@ var _3LAS = /** @class */ (function () {
// Callback function from socket connection
_3LAS.prototype.OnSocketError = function (message) {
this.Logger.Log("Network error: " + message);
if (this.WebRTC)
this.WebRTC.OnSocketError(message);
else
this.Fallback.OnSocketError(message);
this.Fallback.OnSocketError(message);
};
_3LAS.prototype.OnSocketConnect = function () {
this.Logger.Log("Established connection with server.");
if (this.WebRTC)
this.WebRTC.OnSocketConnect();
else
this.Fallback.OnSocketConnect();
if (this.WebRTC)
this.WebRTC.Init(this.WebSocket);
else
this.Fallback.Init(this.WebSocket);
};
_3LAS.prototype.OnSocketDisconnect = function () {
this.Logger.Log("Lost connection to server.");
if (this.WebRTC)
this.WebRTC.OnSocketDisconnect();
else
this.Fallback.OnSocketDisconnect();
if (this.WebRTC)
this.WebRTC.Reset();
else
this.Fallback.Reset();
if (this.ConnectivityFlag) {
this.ConnectivityFlag = false;
@@ -175,10 +132,7 @@ var _3LAS = /** @class */ (function () {
this.Start();
};
_3LAS.prototype.OnSocketDataReady = function (data) {
if (this.WebRTC)
this.WebRTC.OnSocketDataReady(data);
else
this.Fallback.OnSocketDataReady(data);
this.Fallback.OnSocketDataReady(data);
};
return _3LAS;
}());

177
web/js/3las/3las.webrtc.js
View File

@@ -1,177 +0,0 @@
/*
RTC live audio is part of 3LAS (Low Latency Live Audio Streaming)
https://github.com/JoJoBond/3LAS
*/
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
var WebRTC_Settings = /** @class */ (function () {
function WebRTC_Settings() {
}
return WebRTC_Settings;
}());
var WebRTC = /** @class */ (function () {
function WebRTC(logger, settings) {
this.Logger = logger;
if (!this.Logger) {
this.Logger = new Logging(null, null);
}
this.AudioTag = settings.AudioTag;
// Create RTC peer connection
if (typeof RTCPeerConnection !== "undefined")
this.RtcPeer = new RTCPeerConnection(settings.RtcConfig);
else if (typeof webkitRTCPeerConnection !== "undefined")
this.RtcPeer = new webkitRTCPeerConnection(settings.RtcConfig);
else if (typeof mozRTCPeerConnection !== "undefined")
this.RtcPeer = new mozRTCPeerConnection(settings.RtcConfig);
else {
this.Logger.Log('3LAS: Browser does not support "WebRTC".');
throw new Error();
}
this.Logger.Log("Using WebRTC");
this.RtcPeer.addTransceiver('audio');
this.RtcPeer.ontrack = this.OnTrack.bind(this);
this.RtcPeer.oniceconnectionstatechange = this.OnConnectionStateChange.bind(this);
}
Object.defineProperty(WebRTC.prototype, "Volume", {
get: function () {
if (!this.CanChangeVolume()) {
if (this.AudioTag.muted == true)
return 0.0;
else
return 1.0;
}
return this.AudioTag.volume;
},
set: function (value) {
if (!this.CanChangeVolume()) {
if (value <= 0.0)
this.AudioTag.muted = true;
else
this.AudioTag.muted = false;
return;
}
this.AudioTag.volume = value;
},
enumerable: false,
configurable: true
});
WebRTC.prototype.CanChangeVolume = function () {
return !(isIOS || isIPadOS);
};
WebRTC.prototype.Init = function (webSocket) {
this.WebSocket = webSocket;
this.WebSocket.Send(JSON.stringify({
"type": "webrtc",
"data": null
}));
this.ActivityTimer = setInterval(this.OnActivityTimerTick.bind(this), 1000);
};
WebRTC.prototype.OnActivityTimerTick = function () {
if ((this.RtcPeer.iceConnectionState == "connected" || this.RtcPeer.iceConnectionState == "completed") && this.ActivityCallback)
this.ActivityCallback();
};
WebRTC.prototype.OnConnectionStateChange = function () {
if ((this.RtcPeer.iceConnectionState == "closed" ||
this.RtcPeer.iceConnectionState == "disconnected" ||
this.RtcPeer.iceConnectionState == "failed") && this.DisconnectCallback)
this.DisconnectCallback();
};
WebRTC.prototype.OnTrack = function (event) {
if (event.streams != null && event.streams.length > 0)
this.AudioTag.srcObject = event.streams[0];
else if (event.track != null)
this.AudioTag.srcObject = new MediaStream([event.track]);
this.AudioTag.play();
};
WebRTC.prototype.OnSocketError = function (message) {
};
WebRTC.prototype.OnSocketConnect = function () {
};
WebRTC.prototype.OnSocketDisconnect = function () {
};
WebRTC.prototype.Reset = function () {
if (this.ActivityTimer) {
clearInterval(this.ActivityTimer);
this.ActivityTimer = 0;
}
if (this.RtcPeer) {
this.RtcPeer.close();
delete this.RtcPeer;
this.RtcPeer = null;
}
this.WebSocket = null;
};
WebRTC.prototype.OnSocketDataReady = function (data) {
return __awaiter(this, void 0, void 0, function () {
var message, answer;
var _this = this;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
message = JSON.parse(data.toString());
if (!(message.type == "offer")) return [3 /*break*/, 4];
return [4 /*yield*/, this.RtcPeer.setRemoteDescription(new RTCSessionDescription(message.data))];
case 1:
_a.sent();
return [4 /*yield*/, this.RtcPeer.createAnswer()];
case 2:
answer = _a.sent();
return [4 /*yield*/, this.RtcPeer.setLocalDescription(new RTCSessionDescription(answer))];
case 3:
_a.sent();
this.WebSocket.Send(JSON.stringify({
"type": "answer",
"data": answer
}));
return [3 /*break*/, 5];
case 4:
if (message.type == "candidate") {
(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, this.RtcPeer.addIceCandidate(message.data)];
case 1: return [2 /*return*/, _a.sent()];
}
}); }); })();
}
_a.label = 5;
case 5: return [2 /*return*/];
}
});
});
};
return WebRTC;
}());

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

@@ -1,57 +1,42 @@
var Stream;
var DefaultVolume = 0.5;
const DefaultVolume = 0.5;
let Stream;
function Init(_ev) {
// Load default settings
var settings = new _3LAS_Settings();
if (typeof RtcConfig == 'undefined')
RtcConfig = {};
settings.WebRTC.RtcConfig = RtcConfig;
if (typeof SocketPort != 'undefined')
settings.SocketPort = SocketPort;
if (typeof SocketPath != 'undefined')
settings.SocketPath = SocketPath;
if (typeof AudioTagId == 'undefined')
settings.WebRTC.AudioTag = null;
else
settings.WebRTC.AudioTag = document.getElementById(AudioTagId);
try {
const settings = new _3LAS_Settings();
Stream = new _3LAS(null, settings);
}
catch (_ex) {
console.log(_ex);
} catch (error) {
console.log(error);
return;
}
Stream.ConnectivityCallback = OnConnectivityCallback;
$(".playbutton").on('click', OnPlayButtonClick);
$("#volumeSlider").on("change", updateVolume);
$("#volumeSlider").on("input", updateVolume);
}
function OnConnectivityCallback(isConnected) {
if (isConnected) {
Stream.Volume = 1.0;
}
Stream.Volume = isConnected ? 1.0 : DefaultVolume;
}
function OnPlayButtonClick(_ev) {
try {
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-stop');
$('.playbutton').addClass('bg-gray');
$('.playbutton').prop('disabled', true);
setTimeout(function() {
$('.playbutton').removeClass('bg-gray');
$('.playbutton').prop('disabled', false);
const $playbutton = $('.playbutton');
$playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
$playbutton.addClass('bg-gray').prop('disabled', true);
setTimeout(() => {
$playbutton.removeClass('bg-gray').prop('disabled', false);
}, 3000);
}
}
catch (_ex) {
} catch (error) {
console.error(error);
}
}
function updateVolume() {
Stream.Volume = $(this).val();
}
}