Skip to content

Support WSS when using Filaman over HTTPS #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gunnypatel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support WSS when using Filaman over HTTPS #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion html/rfid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ function initWebSocket() {
}

try {
socket = new WebSocket('ws://' + window.location.host + '/ws');
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
socket = new WebSocket(protocol + '//' + window.location.host + '/ws');

socket.onopen = function() {
isConnected = true;
Expand Down
3 changes: 2 additions & 1 deletion html/upgrade.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ <h2>2) Webpage Update</h2>
let wsReconnectTimer = null;

function connectWebSocket() {
ws = new WebSocket('ws://' + window.location.host + '/ws');
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
ws = new WebSocket(protocol + '//' + window.location.host + '/ws');

ws.onmessage = function(event) {
try {
Expand Down
3 changes: 2 additions & 1 deletion html/waage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ <h5 class="card-title">Calibration done</h5>
const statusMessage = document.getElementById('statusMessage');

function connectWebSocket() {
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
ws = new WebSocket(`${protocol}//${window.location.host}/ws`);

ws.onopen = () => {
console.log('WebSocket verbunden');
Expand Down