From 529b8dc895bc7f58cc37c55f1069a67639ed8158 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 31 Jan 2022 13:15:18 +0800
Subject: [PATCH] bug fix

---
 src/globals.js | 14 +++++++-------
 src/websock.ts |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/globals.js b/src/globals.js
index 3c3013a8f..dd2204684 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -40,14 +40,10 @@ export function pushEvent(name, payload) {
   events.push(payload);
 }
 
-const yuvWorker = new Worker("./yuv.js");
-
-yuvWorker.onmessage = (e) => {
-  currentFrame = e.data;
-}
+let yuvWorker;
 
 export function draw(frame) {
-  yuvWorker.postMessage(frame);
+  if (yuvvWorker) yuvWorker.postMessage(frame);
 }
 
 export function setConn(conn) {
@@ -240,7 +236,7 @@ function getPeersForDart() {
   for (const [key, value] of Object.entries(getPeers())) {
     if (!key) continue;
     const tm = value['tm'];
-    const info = values['info'];
+    const info = value['info'];
     if (!tm || !info) continue;
     peers.push([tm, id, info]);
   }
@@ -282,6 +278,10 @@ function _getByName(name, arg) {
 }
 
 window.init = async () => {
+  yuvWorker = new Worker("./yuv.js");
+  yuvWorker.onmessage = (e) => {
+    currentFrame = e.data;
+  }
   loadOpus(() => { });
   loadVp9(() => { });
   await initZstd();
diff --git a/src/websock.ts b/src/websock.ts
index 5eda025d6..71b84fba4 100644
--- a/src/websock.ts
+++ b/src/websock.ts
@@ -97,13 +97,14 @@ export default class Websock {
       };
       this._websocket.onclose = (e) => {
         if (this._status == "open") {
-          reject(e);
+          // e.code 1000 means that the connection was closed normally.
+          reject('Reset by the peer');
         }
         this._status = e;
         console.error("WebSock.onclose: " + e);
         this._eventHandlers.close(e);
       };
-      this._websocket.onerror = (e) => {
+      this._websocket.onerror = (e: any) => {
         if (!this._status) {
           reject("Failed to connect to " + this._uri);
           return;
@@ -111,7 +112,7 @@ export default class Websock {
         this._status = e;
         console.error("WebSock.onerror: " + e);
         this._eventHandlers.error(e);
-        reject(e);
+        reject(e['data']);
       };
     });
   }