Compare commits

2 Commits
orb/22 ... main

5 changed files with 116 additions and 81 deletions

View File

@@ -1,8 +1,8 @@
{ {
"server_ip": "0.0.0.0", "server_ip": "0.0.0.0",
"server_port": 8080, "server_port": 8080,
"video_path": "videos/Orb-22.mp4", "video_path": "videos/Orb-21.mp4",
"subtitles_path": "videos/Orb-22.vtt", "subtitles_path": "videos/Orb-21.vtt",
"bg_path": "videos/chisato_peak.jpg", "bg_path": "videos/bg-20.png",
"password": "password" "password": "password"
} }

View File

@@ -1,6 +1,106 @@
const vid = document.querySelector('video'); const vid = document.querySelector('video');
const wsProto = window.location.protocol === 'https:' ? 'wss' : 'ws'; const wsProto = window.location.protocol === 'https:' ? 'wss' : 'ws';
const socket = new WebSocket(`${wsProto}://${window.location.hostname}:${window.location.port}`); let socket = null; // Initialize socket as null
let retryInterval = 1000; // Initial retry interval in milliseconds
const maxRetryInterval = 30000; // Maximum retry interval
function createWebSocket() {
socket = new WebSocket(`${wsProto}://${window.location.hostname}:${window.location.port}`);
// Connection opened
socket.addEventListener('open', function (event) {
console.log('Connected to WS Server');
retryInterval = 1000; // Reset retry interval on successful connection
});
// Got message from the server
socket.addEventListener("message", (event) => {
// Reload the page if the server sends a reload request
if (event.data.startsWith("reload_request")) {
console.log("Reloading the page as requested by the server");
setTimeout(() => window.location.reload(), 1000);
return;
}
// Time syncing backward server-response
if (event.data.startsWith("time_sync_response_backward")) {
let time_at_server = Number(event.data.slice("time_sync_response_backward".length + 1));
let under_estimate_latest = time_at_server - get_global_time(0);
under_estimates.push(under_estimate_latest);
under_estimate = median(under_estimates);
correction = (under_estimate + over_estimate) / 2;
console.log(`%c Updated val for under_estimate is ${under_estimate}`, "color:green");
console.log(`%c New correction time is ${correction} miliseconds`, 'color:red; font-size:12px');
}
// Time syncing forward server-response
if (event.data.startsWith("time_sync_response_forward")) {
let calculated_diff = Number(event.data.slice("time_sync_response_forward".length + 1));
over_estimates.push(calculated_diff);
over_estimate = median(over_estimates);
correction = (under_estimate + over_estimate) / 2;
console.log(`%c Updated val for over_estimate is ${over_estimate}`, "color:green");
console.log(`%c New correction time is ${correction} miliseconds`, 'color:red; font-size:12px');
}
// Video state update from server
if (event.data.startsWith("state_update_from_server")) {
let state = JSON.parse(event.data.slice("state_update_from_server".length + 1));
// Whenever the client connects or reconnects
if (client_uid == null) {
client_uid = state.client_uid;
}
// calculating the new timestamp for both cases - when the video is playing and when it is paused
let proposed_time = (state.playing) ? ((get_global_time(correction) - state.global_timestamp) / 1000 + state.video_timestamp) : (state.video_timestamp);
let gap = Math.abs(proposed_time - vid.currentTime);
console.log(`%cGap was ${proposed_time - vid.currentTime}`, 'font-size:12px; color:purple');
if (state.playing) {
// tolerance while the video is playing
if (gap > PLAYING_THRESH) {
vid.currentTime = proposed_time;
}
vid.play()
} else {
vid.pause()
// condition to prevent an unnecessary seek
if (gap > PAUSED_THRESH) {
vid.currentTime = proposed_time;
}
}
}
});
// Connection closed
socket.addEventListener('close', function (event) {
console.log('Disconnected from the WS Server');
client_uid = null;
retryWebSocketConnection(); // Attempt to reconnect
});
// Connection error
socket.addEventListener('error', function (event) {
console.error('WebSocket error:', event);
socket.close(); // Ensure the socket is closed on error
});
}
function retryWebSocketConnection() {
console.log(`Attempting to reconnect in ${retryInterval / 1000} seconds...`);
setTimeout(() => {
retryInterval = Math.min(retryInterval * 2, maxRetryInterval); // Exponential backoff
createWebSocket(); // Recreate the WebSocket connection
}, retryInterval);
}
// Initial WebSocket connection
createWebSocket();
// if the new tms is within this margin of the current tms, then the change is ignored for smoother viewing // if the new tms is within this margin of the current tms, then the change is ignored for smoother viewing
const PLAYING_THRESH = 1; const PLAYING_THRESH = 1;
@@ -19,78 +119,6 @@ let over_estimate = 0;
let under_estimate = 0; let under_estimate = 0;
let correction = 0; let correction = 0;
// Connection opened
socket.addEventListener('open', function (event) {
console.log('Connected to WS Server');
});
// Got message from the server
socket.addEventListener("message", (event) => {
// Time syncing backward server-response
if (event.data.startsWith("time_sync_response_backward")) {
let time_at_server = Number(event.data.slice("time_sync_response_backward".length + 1));
let under_estimate_latest = time_at_server - get_global_time(0);
under_estimates.push(under_estimate_latest);
under_estimate = median(under_estimates);
correction = (under_estimate + over_estimate) / 2;
console.log(`%c Updated val for under_estimate is ${under_estimate}`, "color:green");
console.log(`%c New correction time is ${correction} miliseconds`, 'color:red; font-size:12px');
}
// Time syncing forward server-response
if (event.data.startsWith("time_sync_response_forward")) {
let calculated_diff = Number(event.data.slice("time_sync_response_forward".length + 1));
over_estimates.push(calculated_diff);
over_estimate = median(over_estimates);
correction = (under_estimate + over_estimate) / 2;
console.log(`%c Updated val for over_estimate is ${over_estimate}`, "color:green");
console.log(`%c New correction time is ${correction} miliseconds`, 'color:red; font-size:12px');
}
// Video state update from server
if (event.data.startsWith("state_update_from_server")) {
let state = JSON.parse(event.data.slice("state_update_from_server".length + 1));
// Whenever the client connects or reconnects
if (client_uid == null) {
client_uid = state.client_uid;
}
// calculating the new timestamp for both cases - when the video is playing and when it is paused
let proposed_time = (state.playing) ? ((get_global_time(correction) - state.global_timestamp) / 1000 + state.video_timestamp) : (state.video_timestamp);
let gap = Math.abs(proposed_time - vid.currentTime);
console.log(`%cGap was ${proposed_time - vid.currentTime}`, 'font-size:12px; color:purple');
if (state.playing) {
// tolerance while the video is playing
if (gap > PLAYING_THRESH) {
vid.currentTime = proposed_time;
}
vid.play()
} else {
vid.pause()
// condition to prevent an unnecessary seek
if (gap > PAUSED_THRESH) {
vid.currentTime = proposed_time;
}
}
}
});
// Connection closed
socket.addEventListener('close', function (event) {
console.log('Disconnected from the WS Server');
client_uid = null;
setTimeout(() => window.location.reload(), 1000);
});
// Send video state update to the server // Send video state update to the server
// event: the video event (ex: seeking, pause play) // event: the video event (ex: seeking, pause play)
function state_change_handler(event) { function state_change_handler(event) {
@@ -111,7 +139,9 @@ function state_change_handler(event) {
client_uid: client_uid client_uid: client_uid
}; };
socket.send(`state_update_from_client ${JSON.stringify(state_image)}`); if (socket.readyState === WebSocket.OPEN) {
socket.send(`state_update_from_client ${JSON.stringify(state_image)}`);
}
} }
// assigning event handlers // assigning event handlers
@@ -213,3 +243,4 @@ document.addEventListener('DOMContentLoaded', function() {
style.textContent = `::cue { font-size: ${size} !important; }`; style.textContent = `::cue { font-size: ${size} !important; }`;
}); });
}); });

View File

@@ -129,7 +129,7 @@ app.post("/login", function (req, res) {
// video streaming // video streaming
app.get("/video-3", function (req, res) { app.get("/video", function (req, res) {
// Ensure there is a range given for the video // Ensure there is a range given for the video
const range = req.headers.range; const range = req.headers.range;
if (!range) { if (!range) {
@@ -187,7 +187,10 @@ server.listen(settings.server_port, settings.server_ip,
process.on('SIGINT', () => { process.on('SIGINT', () => {
console.log("Shutting down server..."); console.log("Shutting down server...");
// wss.close(); // wss.close();
wss.clients.forEach(client => client.terminate()); wss.clients.forEach(client => {
client.send("reload_request");
client.terminate();
});
server.close(() => { server.close(() => {
console.log("Server closed"); console.log("Server closed");
process.exit(0); process.exit(0);

View File

@@ -39,6 +39,7 @@ header {
video { video {
/*height:;*/ /*height:;*/
max-width: 100%; max-width: 100%;
max-height: 80vh;
/*max-height: 400px;*/ /*max-height: 400px;*/
/*position: absolute;*/ /*position: absolute;*/
/*top: 0;*/ /*top: 0;*/

View File

@@ -9,7 +9,7 @@
<link rel="icon" href="/icon.png" type="image/png"> <link rel="icon" href="/icon.png" type="image/png">
<!-- Open Graph Meta Tags --> <!-- Open Graph Meta Tags -->
<meta property="og:title" content="The Orboverse"> <meta property="og:title" content="The Orboverse">
<meta property="og:description" content="Join the heliocentrism ☀️ gang. 🔫."> <meta property="og:description" content="Join the funny. 🔫.">
<meta property="og:image" content="/stars.jpg"> <meta property="og:image" content="/stars.jpg">
<meta property="og:url" content="https://anistream.cazzzer.com"> <meta property="og:url" content="https://anistream.cazzzer.com">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
@@ -20,7 +20,7 @@
<h1>Welcome to the Orboverse</h1> <h1>Welcome to the Orboverse</h1>
</header> </header>
<video id="videoPlayer" muted controls controlsList="nodownload noplaybackrate"> <video id="videoPlayer" muted controls controlsList="nodownload noplaybackrate">
<source src="/video-3" type="video/mp4" /> <source src="/video" type="video/mp4" />
<!-- subtitle track--> <!-- subtitle track-->
<track kind="subtitles" src="/subtitles" srclang="en" label="English" default> <track kind="subtitles" src="/subtitles" srclang="en" label="English" default>
<p>Your browser does not support the video tag.</p> <p>Your browser does not support the video tag.</p>