Ethica/Termix
1
0
Fork 0
mirror of https://github.com/Termix-SSH/Termix.git synced 2026-08-30 02:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: support macOS VNC connections (#1311)

Browse Source
This commit is contained in:
ZacharyZcR
2026-08-24 03:59:37 +08:00
committed by GitHub
parent ad266956cc
commit fa0fa7f836
6 changed files with 225 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/lib/connection-origin.ts
+6 -4
View File
@@ -80,17 +80,17 @@ export async function buildOriginWsUrl({
localPort,
localPath,
remotePath,
includeLocalJwt = true,
includeJwt = true,
}: {
origin: ConnectionOrigin;
localPort: number;
localPath: string;
remotePath: string;
includeLocalJwt?: boolean;
includeJwt?: boolean;
}): Promise<string | null> {
if (origin === "local") {
let url = `ws://127.0.0.1:${localPort}${localPath}`;
if (includeLocalJwt) {
if (includeJwt) {
const token = localStorage.getItem("jwt");
if (token) url += `?token=${encodeURIComponent(token)}`;
}
@@ -107,6 +107,8 @@ export async function buildOriginWsUrl({
.replace(/^https?:\/\//, "")
.replace(/\/$/, "");
let url = `${wsProtocol}${wsHost}${remotePath}`;
if (remote.jwt) url += `?token=${encodeURIComponent(remote.jwt)}`;
if (includeJwt && remote.jwt) {
url += `?token=${encodeURIComponent(remote.jwt)}`;
}
return url;
}