mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-24 21:59:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Guard against the infinite that can take place when the ws server goes unavailable

Browse source
This commit is contained in:
Gabe Kangas 2020-06-09 10:51:12 -07:00
parent c107891505
commit 39be46d884
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
webroot/js/app.js
View file

@ -45,13 +45,12 @@ function setupApp() {
}); });
} }
async function getStatus() { async function getStatus() {
let url = "/status"; const url = "/status";
try { try {
let response = await fetch(url); const response = await fetch(url);
let status = await response.json(); // read response body and parse as JSON const status = await response.json(); // read response body and parse as JSON
app.streamStatus = status.online app.streamStatus = status.online
? "Stream is online." ? "Stream is online."
: "Stream is offline." : "Stream is offline."
@ -65,13 +64,16 @@ async function getStatus() {
} }
var websocketReconnectTimer
function setupWebsocket() { function setupWebsocket() {
clearTimeout(websocketReconnectTimer)
const protocol = location.protocol == "https:" ? "wss" : "ws" const protocol = location.protocol == "https:" ? "wss" : "ws"
var ws = new WebSocket(protocol + "://" + location.host + "/entry") var ws = new WebSocket(protocol + "://" + location.host + "/entry")
ws.onmessage = (e) => { ws.onmessage = (e) => {
var model = JSON.parse(e.data) const model = JSON.parse(e.data)
var message = new Message(model) const message = new Message(model)
const existing = this.messagesContainer.messages.filter(function (item) { const existing = this.messagesContainer.messages.filter(function (item) {
return item.id === message.id return item.id === message.id
@ -86,11 +88,14 @@ function setupWebsocket() {
ws.onclose = (e) => { ws.onclose = (e) => {
// connection closed, discard old websocket and create a new one in 5s // connection closed, discard old websocket and create a new one in 5s
ws = null ws = null
setTimeout(setupWebsocket, 5000) console.log("Websocket closed.")
websocketReconnectTimer = setTimeout(setupWebsocket, 5000)
} }
// On ws error just close the socket and let it re-connect again for now.
ws.onerror = (e) => { ws.onerror = (e) => {
setTimeout(setupWebsocket, 5000) console.log("Websocket error: ", e)
ws.close()
} }
window.ws = ws window.ws = ws
@ -102,8 +107,8 @@ setupWebsocket()
setInterval(getStatus, 5000) setInterval(getStatus, 5000)
// HLS Video setup // HLS Video setup
var video = document.getElementById("video") const video = document.getElementById("video")
var videoSrc = "hls/stream.m3u8" const videoSrc = "hls/stream.m3u8"
if (Hls.isSupported()) { if (Hls.isSupported()) {
var hls = new Hls() var hls = new Hls()
hls.loadSource(videoSrc) hls.loadSource(videoSrc)
@ -133,7 +138,7 @@ else if (video.canPlayType("application/vnd.apple.mpegurl")) {
} }
function scrollSmoothToBottom(id) { function scrollSmoothToBottom(id) {
var div = document.getElementById(id) const div = document.getElementById(id)
$('#' + id).animate({ $('#' + id).animate({
scrollTop: div.scrollHeight - div.clientHeight scrollTop: div.scrollHeight - div.clientHeight
}, 500) }, 500)
@ -141,7 +146,7 @@ function scrollSmoothToBottom(id) {
function uuidv4() { function uuidv4() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8); const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16); return v.toString(16);
}); });
} }