tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed client websocket URL converter TLS

Browse Source
This commit is contained in:
Donkie
2023-10-18 19:24:27 +02:00
parent f064ea589c
commit 6324979913
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/components/liveProvider.ts
View File

@@ -15,7 +15,7 @@ interface Event {
/** /**
* Converts an API URL to a WebSocket URL. * Converts an API URL to a WebSocket URL.
* E.g. "https://example.com/api/v1/..." -> "ws://example.com/api/v1/..." * E.g. "https://example.com/api/v1/..." -> "wss://example.com/api/v1/..."
* or "/api/v1/..." -> "ws://example.com/api/v1/..." * or "/api/v1/..." -> "ws://example.com/api/v1/..."
* @param apiUrl The API URL to convert * @param apiUrl The API URL to convert
* @returns The WebSocket URL * @returns The WebSocket URL
@@ -29,10 +29,14 @@ function toWebsocketURL(apiUrl: string) {
// Split the URL to separate the protocol, host, and path // Split the URL to separate the protocol, host, and path
const urlParts = currentURL.split("/"); const urlParts = currentURL.split("/");
const protocol = urlParts[0];
const host = urlParts[2]; const host = urlParts[2];
// Create the WebSocket URL by adding "ws://" as the protocol and the relative URL as the path if (protocol === "https:") {
return `ws://${host}${apiUrl}`; return `wss://${host}${apiUrl}`;
} else {
return `ws://${host}${apiUrl}`;
}
} else { } else {
// Absolute URL, e.g. "https://example.com/api/v1/..." // Absolute URL, e.g. "https://example.com/api/v1/..."