commit 479ca87de8cd21b661c3d81ae839c064cdb8eaea parent d68234411acdd784ca74e331ccaea86316b1a9df Author: Vetle Haflan <vetle@haflan.dev> Date: Wed, 27 Jan 2021 00:27:09 +0100 Allow using both WSS and WS (WS for dev) Diffstat:
| M | lipre.py | | | 11 | +++++++---- |
| M | ui/src/App.vue | | | 4 | +++- |
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/lipre.py b/lipre.py @@ -8,6 +8,7 @@ import re import sys import websocket +IGNOREFILE='.lpignore' ignorefilelist = [] def should_ignore(filename): @@ -35,15 +36,17 @@ def send_file(filename): program = sys.argv[0] if len(sys.argv) <= 1: - print(f'Use: {program} <room code>') + print(f'Use: {program} <room code> [host]') exit(1) room_code = sys.argv[1] -HOST='localhost:8088' -IGNOREFILE='.lpignore' +if len(sys.argv) >= 3: + HOST = sys.argv[2] +else: + HOST='ws://localhost:8088' ws = websocket.WebSocket() -ws.connect(f'ws://{HOST}/ws/pres/{room_code}') +ws.connect(f'{HOST}/ws/pres/{room_code}') if isfile(IGNOREFILE): ignorefilelist = [fn for fn in open(IGNOREFILE).read().split('\n') if fn] diff --git a/ui/src/App.vue b/ui/src/App.vue @@ -51,7 +51,9 @@ export default { this.connected = false return } - let url = `ws://${document.location.host}/ws/view/${roomCode}` + // Quick fix to determine whether to use WSS or not + let proto = window.location.href.startsWith("https://") ? "wss" : "ws" + let url = `${proto}://${document.location.host}/ws/view/${roomCode}` this.ws = new WebSocket(url) this.ws.onclose = () => { this.connected = false