1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-03 09:49:28 +02:00
Daniel Neto 2025-05-09 18:19:21 -03:00
parent 777977c1ad
commit bca1025a86

View file

@ -8,6 +8,8 @@ var users_id_online = undefined;
var socketConnectRetryTimeout = 15000; var socketConnectRetryTimeout = 15000;
var connWS;
function processSocketJson(json) { function processSocketJson(json) {
if (json && typeof json.autoUpdateOnHTML !== 'undefined') { if (json && typeof json.autoUpdateOnHTML !== 'undefined') {
socketAutoUpdateOnHTML(json.autoUpdateOnHTML); socketAutoUpdateOnHTML(json.autoUpdateOnHTML);
@ -124,7 +126,7 @@ function socketConnectOld() {
setSocketIconStatus('loading'); setSocketIconStatus('loading');
console.trace(); console.trace();
conn.onopen = function (e) { connWS.onopen = function (e) {
socketConnectRequested = 0; socketConnectRequested = 0;
socketConnectRetryTimeout = 2000; // Reset retry timer socketConnectRetryTimeout = 2000; // Reset retry timer
clearTimeout(socketConnectTimeout); clearTimeout(socketConnectTimeout);
@ -133,7 +135,7 @@ function socketConnectOld() {
return false; return false;
}; };
conn.onmessage = function (e) { connWS.onmessage = function (e) {
try { try {
var json = JSON.parse(e.data); var json = JSON.parse(e.data);
console.log("Socket onmessage received:", json); console.log("Socket onmessage received:", json);
@ -159,14 +161,14 @@ function socketConnectOld() {
} }
}; };
conn.onclose = function (e) { connWS.onclose = function (e) {
socketConnectRequested = 0; socketConnectRequested = 0;
if (e.code === 1006) { if (e.code === 1006) {
console.error('WebSocket closed unexpectedly with code 1006. Investigating possible causes...'); console.error('WebSocket closed unexpectedly with code 1006. Investigating possible causes...');
// Check the WebSocket readyState to understand the closure phase // Check the WebSocket readyState to understand the closure phase
switch (conn.readyState) { switch (connWS.readyState) {
case WebSocket.CONNECTING: case WebSocket.CONNECTING:
console.error('WebSocket was in CONNECTING state. The connection attempt failed.'); console.error('WebSocket was in CONNECTING state. The connection attempt failed.');
break; break;
@ -236,7 +238,7 @@ function socketConnectOld() {
} }
conn.onerror = function (err) { connWS.onerror = function (err) {
socketConnectRequested = 0; socketConnectRequested = 0;
console.error('Socket encountered error: ', err, 'URL:', url); console.error('Socket encountered error: ', err, 'URL:', url);
if (err.target.readyState === WebSocket.CLOSED) { if (err.target.readyState === WebSocket.CLOSED) {
@ -246,7 +248,7 @@ function socketConnectOld() {
} else if (err.target.readyState === WebSocket.CONNECTING) { } else if (err.target.readyState === WebSocket.CONNECTING) {
console.error('WebSocket is in CONNECTING state. Check server status or network issues.'); console.error('WebSocket is in CONNECTING state. Check server status or network issues.');
} }
conn.close(); connWS.close();
}; };
} }
@ -386,29 +388,32 @@ function sendSocketMessageToNone(msg, callback) {
sendSocketMessageToUser(msg, callback, -1); sendSocketMessageToUser(msg, callback, -1);
} }
function sendSocketMessageToUser(msg, callback, to_users_id) { function sendSocketMessage(payload) {
if (conn.readyState === 1) { if (useSocketIO) {
conn.send(JSON.stringify({ msg: msg, webSocketToken: webSocketToken, callback: callback, to_users_id: to_users_id })); if (typeof socket !== 'undefined' && socket.connected) {
socket.emit('message', payload);
} else {
setTimeout(() => sendSocketMessage(payload), 1000);
}
} else { } else {
//console.log('Socket not ready send message in 1 second'); if (connWS && connWS.readyState === 1) {
setTimeout(function () { connWS.send(JSON.stringify(payload));
sendSocketMessageToUser(msg, to_users_id, callback); } else {
}, 1000); setTimeout(() => sendSocketMessage(payload), 1000);
} }
}
function sendSocketMessageToResourceId(msg, callback, resourceId) {
if (conn.readyState === 1) {
conn.send(JSON.stringify({ msg: msg, webSocketToken: webSocketToken, callback: callback, resourceId: resourceId }));
} else {
//console.log('Socket not ready send message in 1 second');
setTimeout(function () {
sendSocketMessageToUser(msg, to_users_id, callback);
}, 1000);
} }
} }
function sendSocketMessageToUser(msg, callback, to_users_id) {
sendSocketMessage({ msg, webSocketToken, callback, to_users_id });
}
function sendSocketMessageToResourceId(msg, callback, resourceId) {
sendSocketMessage({ msg, webSocketToken, callback, resourceId });
}
function isSocketActive() { function isSocketActive() {
return isOnline() && ((typeof conn != 'undefined' && conn.readyState === 1) || (typeof socket != 'undefined' && socket.connected)); return isOnline() && ((typeof conn != 'undefined' && connWS.readyState === 1) || (typeof socket != 'undefined' && socket.connected));
} }
function defaultCallback(json) { function defaultCallback(json) {