Added comments to src/client.js src/index.js
Added more comments. Changed '/login' post to check if the data isn't null
This commit is contained in:
@@ -1,21 +1,22 @@
|
||||
const vid = document.querySelector('video')
|
||||
const vid = document.querySelector('video');
|
||||
const socket = new WebSocket(`ws://${window.location.hostname}:${window.location.port}`);
|
||||
|
||||
// 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 PAUSED_THRESH = 0.01
|
||||
const PLAYING_THRESH = 1;
|
||||
const PAUSED_THRESH = 0.01;
|
||||
|
||||
// local state
|
||||
let video_playing = false
|
||||
let last_updated = 0
|
||||
let client_uid = null
|
||||
let video_playing = false;
|
||||
let last_updated = 0;
|
||||
let client_uid = null;
|
||||
|
||||
// clocks sync variables
|
||||
const num_time_sync_cycles = 10
|
||||
let over_estimates = new Array()
|
||||
let under_estimates = new Array()
|
||||
let over_estimate = 0
|
||||
let under_estimate = 0
|
||||
let correction = 0
|
||||
const num_time_sync_cycles = 10;
|
||||
let over_estimates = new Array();
|
||||
let under_estimates = new Array();
|
||||
let over_estimate = 0;
|
||||
let under_estimate = 0;
|
||||
let correction = 0;
|
||||
|
||||
|
||||
// Connection opened
|
||||
@@ -26,6 +27,7 @@ socket.addEventListener('open', function (event) {
|
||||
// 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);
|
||||
@@ -37,6 +39,8 @@ socket.addEventListener("message", (event) => {
|
||||
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);
|
||||
@@ -46,6 +50,8 @@ socket.addEventListener("message", (event) => {
|
||||
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));
|
||||
|
||||
@@ -55,21 +61,21 @@ socket.addEventListener("message", (event) => {
|
||||
}
|
||||
|
||||
// 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)
|
||||
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')
|
||||
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.currentTime = proposed_time;
|
||||
}
|
||||
vid.play()
|
||||
} else {
|
||||
vid.pause()
|
||||
// condition to prevent an unnecessary seek
|
||||
if (gap > PAUSED_THRESH) {
|
||||
vid.currentTime = proposed_time
|
||||
vid.currentTime = proposed_time;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,10 +85,12 @@ socket.addEventListener("message", (event) => {
|
||||
// Connection closed
|
||||
socket.addEventListener('close', function (event) {
|
||||
console.log('Disconnected from the WS Server');
|
||||
client_uid = null
|
||||
client_uid = null;
|
||||
});
|
||||
|
||||
|
||||
// Send video state update to the server
|
||||
// event: the video event (ex: seeking, pause play)
|
||||
function state_change_handler(event) {
|
||||
if (event !== null && event !== undefined) {
|
||||
if (event.type === 'pause')
|
||||
@@ -99,9 +107,9 @@ function state_change_handler(event) {
|
||||
playing: video_playing,
|
||||
global_timestamp: get_global_time(correction),
|
||||
client_uid: client_uid
|
||||
}
|
||||
};
|
||||
|
||||
socket.send(`state_update_from_client ${JSON.stringify(state_image)}`)
|
||||
socket.send(`state_update_from_client ${JSON.stringify(state_image)}`);
|
||||
}
|
||||
|
||||
// assigning event handlers
|
||||
@@ -118,12 +126,16 @@ vid.onended = () => {
|
||||
}
|
||||
|
||||
|
||||
// Helper Functions
|
||||
//// Helper Functions ////
|
||||
|
||||
// Get
|
||||
function get_global_time(delta = 0) {
|
||||
let d = new Date();
|
||||
return d.getTime() + delta;
|
||||
}
|
||||
|
||||
|
||||
// Get the saved settings from settings.json
|
||||
async function get_settings() {
|
||||
let s = null;
|
||||
await fetch('settings.json')
|
||||
@@ -134,6 +146,8 @@ async function get_settings() {
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
// Find the median of an array
|
||||
function median(values) {
|
||||
if (values.length === 0) {
|
||||
return 0;
|
||||
@@ -147,21 +161,25 @@ function median(values) {
|
||||
return (values[half - 1] + values[half]) / 2.0;
|
||||
}
|
||||
|
||||
|
||||
// Wait certain given amount of miliseconds
|
||||
function timeout(ms) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
|
||||
// Send the backward update request to the server
|
||||
function do_time_sync_one_cycle_backward() {
|
||||
socket.send("time_sync_request_backward");
|
||||
}
|
||||
|
||||
// Send the forward update request to the server
|
||||
function do_time_sync_one_cycle_forward() {
|
||||
socket.send(`time_sync_request_forward ${get_global_time()}`);
|
||||
}
|
||||
|
||||
|
||||
// time requests are made every second
|
||||
// Sync the client and the server, using backward and forward syncing
|
||||
async function do_time_sync() {
|
||||
for (let i = 0; i < num_time_sync_cycles; i++) {
|
||||
await timeout(500);
|
||||
|
||||
Reference in New Issue
Block a user