up gorm logger & add share to guest by web client

resources/web/js/src/connection.ts

@@ -14,7 +14,8 @@ const HOSTS = [
   "rs-us.rustdesk.com",
 ];
 let HOST = localStorage.getItem("rendezvous-server") || HOSTS[0];
-const SCHEMA = "ws://";
+//根据协议设置为ws或wss
+const SCHEMA=location.protocol=="https:"?"wss://":"ws://";
 
 type MsgboxCallback = (type: string, title: string, text: string) => void;
 type DrawCallback = (data: Uint8Array) => void;
@@ -99,7 +100,7 @@ export default class Connection {
     ws.sendRendezvous({ punch_hole_request });
     const msg = (await ws.next()) as rendezvous.RendezvousMessage;
     ws.close();
-    console.log(new Date() + ": Got relay response");
+    console.log(new Date() + ": Got relay response", msg);
     const phr = msg.punch_hole_response;
     const rr = msg.relay_response;
     if (phr) {
@@ -236,8 +237,14 @@ export default class Connection {
   async msgLoop() {
     while (true) {
       const msg = (await this._ws?.next()) as message.Message;
+      // console.log("msg", msg);
       if (msg?.hash) {
         this._hash = msg?.hash;
+        const tmp = this.getOption('tmppwd')
+        if(!this._password && tmp){
+          this._password = Uint8Array.from(JSON.parse("[" + tmp + "]"));
+          this.setOption('tmppwd', '')
+        }
         if (!this._password)
           this.msgbox("input-password", "Password Required", "");
         this.login();

resources/web/js/src/ljw.js

@@ -0,0 +1,100 @@
+window._gwen = {}
+window._gwen.kv = {}
+const apiserver = localStorage.getItem('api-server')
+
+function stringToUint8Array(str) {
+    var arr = [];
+    for (var i = 0, j = str.length; i < j; ++i) {
+        arr.push(str.charCodeAt(i));
+    }
+
+    var tmpUint8Array = new Uint8Array(arr);
+    return tmpUint8Array
+}
+
+function getQueryVariable() {
+    const query = window.location.hash.substring(3);
+    const vars = query.split("&");
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        window._gwen.kv[pair[0]] = pair[1]
+    }
+}
+
+getQueryVariable()
+
+const id = window._gwen.kv.id || ''
+if (id) {
+    localStorage.setItem('remote-id', id)
+}
+const share_token = window._gwen.kv.share_token || ''
+if (share_token) {
+    fetch(apiserver + "/api/shared-peer", {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({share_token})
+    }).then(res => res.json()).then(res => {
+        if (res.code === 0) {
+            localStorage.setItem('custom-rendezvous-server', res.data.id_server)
+            localStorage.setItem('key', res.data.key)
+            const peer = res.data.peer
+            localStorage.setItem('remote-id', peer.info.id)
+            peer.tmppwd = stringToUint8Array(window.atob(peer.tmppwd)).toString()
+            const oldPeers = JSON.parse(localStorage.getItem('peers')) || {}
+            oldPeers[peer.info.id] = peer
+            localStorage.setItem('peers', JSON.stringify(oldPeers))
+        }
+    })
+}
+
+
+const autoWriteServer = () => {
+    return setTimeout(() => {
+        const token = localStorage.getItem('access_token')
+        if (token && apiserver) {
+            fetch(apiserver + "/api/server-config", {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Authorization': 'Bearer ' + token
+                    }
+                }
+            ).then(res => res.json()).then(res => {
+                if (res.code === 0) {
+                    if (!localStorage.getItem('custom-rendezvous-server') || !localStorage.getItem('key')) {
+                        localStorage.setItem('custom-rendezvous-server', res.data.id_server)
+                        localStorage.setItem('key', res.data.key)
+                    }
+
+                    if (res.data.peers) {
+                        const oldPeers = JSON.parse(localStorage.getItem('peers')) || {}
+                        let needUpdate = false
+                        Object.keys(res.data.peers).forEach(k => {
+                            if (!oldPeers[k]) {
+                                oldPeers[k] = res.data.peers[k]
+                                needUpdate = true
+                            } else {
+                                oldPeers[k].info = res.data.peers[k].info
+                            }
+                            if (oldPeers[k].info && oldPeers[k].info.hash && !oldPeers[k].password) {
+                                let p1 = window.atob(oldPeers[k].info.hash)
+                                const pwd = stringToUint8Array(p1)
+                                oldPeers[k].password = pwd.toString()
+                                oldPeers[k].remember = true
+                            }
+                        })
+                        localStorage.setItem('peers', JSON.stringify(oldPeers))
+                        if (needUpdate) {
+                            window.location.reload()
+                        }
+                    }
+                }
+            })
+        } else {
+            autoWriteServer()
+        }
+    }, 1000)
+}
+autoWriteServer()

resources/web/js/src/main.ts

@@ -1,2 +1,3 @@
+import "./ljw";
 import "./globals";
-import "./ui";
+import "./ui";