From 5291270e6a473ea688df91ed0dab163d1674233a Mon Sep 17 00:00:00 2001
From: lejianwen <84855512@qq.com>
Date: Sun, 17 Nov 2024 17:34:51 +0800
Subject: [PATCH] up ws connect in https #12

---
 resources/web2/index.html       |  2 +-
 resources/web2/js/dist/index.js | 24 ++++++++++++++++--------
 resources/web2/js/dist/ljw.js   |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/resources/web2/index.html b/resources/web2/index.html
index af2d74d..ed7e2df 100644
--- a/resources/web2/index.html
+++ b/resources/web2/index.html
@@ -32,7 +32,7 @@
     <title>RustDesk</title>
     <script src="/webclient-config/index.js"></script>
     <link rel="manifest" href="manifest.json" />
-    <script type="module" crossorigin src="js/dist/index.js?v=3"></script>
+    <script type="module" crossorigin src="js/dist/index.js?v=4"></script>
     <link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e" />
     <style>
       html,
diff --git a/resources/web2/js/dist/index.js b/resources/web2/js/dist/index.js
index 4e0f684..9e4f670 100644
--- a/resources/web2/js/dist/index.js
+++ b/resources/web2/js/dist/index.js
@@ -1,4 +1,4 @@
-import {getServerConf} from "./ljw.js?v=3"
+import {getServerConf} from "./ljw.js?v=4"
 import {F as $t, J as Yt, L as Re, l as P4, m as r, P as ua, s as Xt, z as H4} from "./vendor.js?v=0b990c6e";
 
 var Zt = Object.defineProperty;
@@ -38987,22 +38987,30 @@ function S4(u = !1) {
 }
 
 function z4(u, e = !1, i = 0) {
-    if (vn()) return "wss://" + kn(u) + "/ws/" + (e ? "relay" : "id");
-    if (u.indexOf(":") > 0) {
-        const o = u.split(":"), a = parseInt(o[1]);
-        u = o[0] + ":" + (a + (e ? i || 3 : 2))
+    const p = vn() ? "wss://" : "ws://"
+    const domain = uriDomain(u)
+    const uriport = uriPort(u)
+    if (vn() && (!uriport || uriport == '443')){
+        return p + domain + "/ws/" + (e ? "relay" : "id");
+    }
+
+    if (uriport) {
+        const a = parseInt(uriport);
+        u = domain + ":" + (a + (e ? i || 3 : 2))
     } else u += ":" + (Pt + (e ? 3 : 2));
-    return "ws://" + u
+    return p + u
 }
 
 function vn() {
     return window.location.protocol === "https:"
 }
 
-function kn(u) {
+function uriDomain(u) {
     return u.indexOf(":") > 0 ? u.split(":")[0] : u
 }
-
+function uriPort(u){
+    return u.indexOf(":") > 0 ? u.split(":")[1] : ''
+}
 const $i = (u, e, i) => e && u.type == "SharedAb" ? Z(Gu([u.value, i.salt])) === Z(e) : !1,
     ut = (u, e) => e && u.type == "PersonalAb" ? Z(u.value) === Z(e) : !1;
 
diff --git a/resources/web2/js/dist/ljw.js b/resources/web2/js/dist/ljw.js
index 8e4a317..7751380 100644
--- a/resources/web2/js/dist/ljw.js
+++ b/resources/web2/js/dist/ljw.js
@@ -1,6 +1,6 @@
 window._gwen = {}
 window._gwen.kv = {}
-const apiserver = localStorage.getItem('api-server')
+const apiserver = localStorage.getItem('wc-api-server')
 
 function stringToUint8Array(str) {
     var arr = [];