Skip to content

fix: the application uses http (not https) for all t... in AcodeX.js #153

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
anupamme wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: the application uses http (not https) for all t... in AcodeX.js #153

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
9 changes: 6 additions & 3 deletions src/AcodeX.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,8 @@ export default class AcodeX {
async attachSocketToRioTerm(port, pid) {
this.activeTerminalPid = pid;
this.$lastRioSize = null;
this.socket = new WebSocket(`ws://${this.terminalServerHost}:${port}/terminals/${pid}`);
const rioWsProtocol = window.location.protocol === "https:" ? "wss" : "ws";
this.socket = new WebSocket(`${rioWsProtocol}://${this.terminalServerHost}:${port}/terminals/${pid}`);
this.socket.binaryType = "arraybuffer";

this.socket.onmessage = (event) => {
Expand Down Expand Up @@ -1844,7 +1845,8 @@ export default class AcodeX {
};
this.socket.onclose = async () => {
try {
const response = await fetch(`http://${this.terminalServerHost}:${port}/`);
const protocol = window.location.protocol === "https:" ? "https" : "http";
const response = await fetch(`${protocol}://${this.terminalServerHost}:${port}/`);
if (!response.ok) {
console.warn("Server responded with an error:", response.status, response.statusText);
}
Expand All @@ -1867,7 +1869,8 @@ export default class AcodeX {
this.$terminalTitle.textContent = `${this.$terminalTitle.textContent} - ${title}`
});*/

this.socket = new WebSocket(`ws://${this.terminalServerHost}:${port}/terminals/${pid}`);
const xtermWsProtocol = window.location.protocol === "https:" ? "wss" : "ws";
this.socket = new WebSocket(`${xtermWsProtocol}://${this.terminalServerHost}:${port}/terminals/${pid}`);
this.socket.onopen = () => {
this.hasShownServerDisconnectAlert = false;
this.$attachAddon = new AttachAddon(this.socket);
Expand Down