adjust websocket code
Iris Lightshard nilix@nilfm.cc
PGP Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmSuV5oACgkQO3+8IhRO Y5haiQ/8DjpmxVFtg8mFtQ3chhRe1H6sICPDRf7pFeb16VbtmHdaE5YOsvokYo5Y ECC8raAEoLS60YirhxKQv1N9HTm0INZkMxq43D2N5PkXX+xANzlmxQ9jEO9TOI1V vNPDfgrnaxNUAq6NFLdlSD7inIpThFZrjI1X0V1IBxZoX6b51yjnSZQF0IAVe2Bb EQW0sw4abOh76khqttrbwORfIQSZqkai/5uwg+x2u4sKZ9aQkRvZCsMpNmw7kO/J UEeU6yJWmh9+fxKklcV2Y9YzctPj/xs7mFBYHSr7TgRnMZi99BAX8+vCtiLkN+zG G0x7tBn8vTZJRfgdk6jxobQvS45m1bvoYQaOIrN2aNt4Zmq80Kuf1Y4Vk0VomQSj XVt1uZkaELU3YXEuik0Hc1EbrUOieg02CYH5QalTHODB3MmqBNMiazLuDF37DIpS u5vV2STwSXVUnJm/UL0rUybksUXgCo90YXemiNcVDJ/KnFO4WvlH5XcduOYwBVOc C4nnmsHlvFI/y5qmfB2kK4hNYNd3N2mk4a8VKPjEC5oSQcRbrAfF29NENFd0DUBv BGquxmL75vaE78ll778diqhIT9zR1RmpkXW3wZleVQMNYKnTKG7eIuTUTaz6ELxt 4GtOI35fJFkbqrZ+Aq6rXUDBhL2RlkKEgI2LSIZnWvXkP8rg82A= =DVmY -----END PGP SIGNATURE-----
1 files changed,
4 insertions(+),
4 deletions(-)
jump to
M
static/socket.js
→
static/socket.js
@@ -163,12 +163,12 @@
if (conn) { conn.close(1000); } - conn = new WebSocket(`ws://${location.host}/subscribe`, `${tableKey.name}.${tableKey.passcode}`); + const wsProto = location.protocol == "https:" ? "wss" : "ws"; + conn = new WebSocket(`${wsProto}://${location.host}/subscribe`, `${tableKey.name}.${tableKey.passcode}`); conn.addEventListener("close", e => { - if (e.code == 1006) { + if (e.code == 1006 && e.wasClean) { setErr("Table not found - check the name and passcode are correct"); } else if (e.code > 1001) { - // TODO: add message to let user know they are reconnecting setErr("Websocket error: trying to reconnect"); setTimeout(dial, 1000) } else {@@ -186,7 +186,7 @@ mapImg = null;
} }); conn.addEventListener("open", e => { - // TODO: add message to let user know they are at the table + closeErr(); tabletop = document.getElementById("tabletop"); if (tabletop) { tabletop.style.display = "block";