th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

client not waiting connection prior to ping

Browse Source
This commit is contained in:
Raelon Masters
2020-08-09 00:17:24 -04:00
parent f3d9d8160f
commit e0c79ff837
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/interface/static/js/pyshelf_ux.js
View File

@@ -172,7 +172,7 @@ $(document).ready(function(){
}); });
$(document).on('click', '.logout-btn', function(){window.location.href = '/logout'}); $(document).on('click', '.logout-btn', function(){window.location.href = '/logout'});
$(document).on('click', '.import-btn', function(){ $(document).on('click', '.import-btn', function(){
let socket = PyshelfSocket(server); let socket = PyshelfServer(server);
ping(socket); ping(socket);
}); });
$('#coll_button').on('click', function(){ $('#coll_button').on('click', function(){
@@ -268,27 +268,36 @@ function resize_search(win_width){
} }
} }
function PyshelfSocket(address) { function OpenSocket(address) {
const connection = new WebSocket(address); return new Promise(resolve => {
connection.onconnect = function(e){ const connection = new WebSocket(address);
ping(connection); connection.onconnect = function(e){
};
connection.onmessage = function(rcvd){ ping(connection);
sock_rx(rcvd) };
}; connection.onmessage = function(rcvd){
return connection; sock_rx(rcvd)
};
resolve(connection);
});
}
async function PyshelfServer(address){
console.log("--[ Starting Connection ]")
connection = await OpenSocket(address);
console.log('--[ Connection Established ]')
return connection
} }
function sock_rx(rcvd) { function sock_rx(rcvd) {
if (rcvd.data == 'pong') { pong(rcvd.data) } if (rcvd.data == 'pong') { pong(rcvd.data) }
else { console.log("<<[rx] :"+rcvd.data) } else { console.log("<<[rx] :"+rcvd.data) }
} }
function sock_status(sock) { function sock_status(connection) {
let buffered = sock.connection.bufferedAmmount; let buffered = connection.bufferedAmmount;
let ready = sock.connection.readyState; let ready = connection.readyState;
return [buffered, ready]; return [buffered, ready];
} }
function ping(sock) { function ping(connection) {
sock.send('ping') connection.send('ping')
} }
function pong(rcvd) { function pong(rcvd) {
console.log("<<["+rcvd.data+"] "+rcvd.data) console.log("<<["+rcvd.data+"] "+rcvd.data)