A most inelegant hack.

This commit is contained in:
Raelon Masters
2020-08-10 13:19:35 -04:00
parent 6f06796cba
commit 3f99c15038
2 changed files with 23 additions and 4 deletions

View File

@@ -19,6 +19,9 @@ async def echo(websocket, path):
elif message == "ping":
print("<<[{}]".format(message))
tx = pong(message)
elif message == "importBooks":
print("<<[{} cmd rcvd]\n Starting import".format(message))
tx = "Starting Import . . ."
await websocket.send(tx)

View File

@@ -171,9 +171,8 @@ $(document).ready(function(){
$('#pop_over_0').dialog("open");
});
$(document).on('click', '.logout-btn', function(){window.location.href = '/logout'});
$(document).on('click', '.import-btn', function(){
let connection = PyshelfServer(server);
//ping(socket);
$(document).on('click', '.import-btn', async function(){
let connection = await ImportBooks(server);
});
$('#coll_button').on('click', function(){
var isopen = $('#pop_over_0').dialog("isOpen");
@@ -281,14 +280,31 @@ function OpenSocket(address) {
resolve(connection);
});
}
function ImportBooks(address) {
return new Promise(resolve => {
const connection = new WebSocket(address);
connection.onopen = function(e){
sock_tx(connection,'importBooks')
};
connection.onmessage = function(rcvd){
sock_rx(rcvd)
};
resolve(connection);
});
}
async function PyshelfServer(address){
console.log("--[ Starting Connection ]")
return await OpenSocket(address)
}
function sock_rx(rcvd) {
if (rcvd.data == 'pong') { pong(rcvd.data) }
if (rcvd.data == 'pong') { pong(rcvd) }
else { console.log("<<[rx] :"+rcvd.data) }
}
function sock_tx(connection, msg) {
connection.send(msg);
}
function sock_status(connection) {
let buffered = connection.bufferedAmmount;
let ready = connection.readyState;