From f689bea219e04fc8d57ca501750cfc41ac1f2df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sun, 9 May 2021 21:06:09 +0200
Subject: [PATCH] make websocket connect async.

---
 src/component/internal/websocket.ts | 43 ++++++++++++++---------------
 src/component/main.vue              |  8 +++---
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/component/internal/websocket.ts b/src/component/internal/websocket.ts
index 212f5274..1bfae8cd 100644
--- a/src/component/internal/websocket.ts
+++ b/src/component/internal/websocket.ts
@@ -49,7 +49,7 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
     return typeof this._ws !== 'undefined' && this._ws.readyState === WebSocket.OPEN
   }
 
-  public connect() {
+  public async connect() {
     if (this.connected) {
       throw new Error('attempting to create websocket while connection open')
     }
@@ -66,15 +66,24 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
       url += '?token=' + encodeURIComponent(this._token)
     }
 
-    this._ws = new WebSocket(url)
-    this._log.info(`connecting`)
+    await new Promise<void>((res, rej) => {
+      this._ws = new WebSocket(url)
+      this._log.info(`connecting`)
 
-    this._ws.onopen = this.onConnected.bind(this)
-    this._ws.onclose = this.onClose.bind(this)
-    this._ws.onerror = this.onError.bind(this)
-    this._ws.onmessage = this.onMessage.bind(this)
+      this._ws.onclose = rej.bind(this, new Error('connection close'))
+      this._ws.onerror = rej.bind(this, new Error('connection error'))
+      this._ws.onmessage = this.onMessage.bind(this)
 
-    this._connTimer = setTimeout(this.onTimeout.bind(this), connTimeout)
+      this._ws.onopen = () => {
+        this._ws!.onclose = this.onClose.bind(this, 'close')
+        this._ws!.onerror = this.onClose.bind(this, 'error')
+
+        this.onConnected()
+        res()
+      }
+
+      this._connTimer = setTimeout(rej.bind(this, new Error('connection timeout')), connTimeout)
+    })
   }
 
   public disconnect(reason?: Error) {
@@ -145,21 +154,9 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
     this._reconnTimeout = reconnTimeout
   }
 
-  private onTimeout() {
-    this._log.info(`connection timeout`)
-    this.disconnect(new Error('connection timeout'))
-    this.tryReconnect()
-  }
-
-  private onError() {
-    this._log.info(`connection error`)
-    this.disconnect(new Error('connection error'))
-    this.tryReconnect()
-  }
-
-  private onClose() {
-    this._log.info(`connection closed`)
-    this.disconnect(new Error('connection closed'))
+  private onClose(reason: string) {
+    this._log.info(`connection ${reason}`)
+    this.disconnect(new Error(`connection ${reason}`))
     this.tryReconnect()
   }
 
diff --git a/src/component/main.vue b/src/component/main.vue
index cdd2c3bb..6ea8144e 100644
--- a/src/component/main.vue
+++ b/src/component/main.vue
@@ -207,7 +207,7 @@
         Vue.set(this.state.connection, 'authenticated', true)
 
         if (this.autoconnect) {
-          this.websocket.connect()
+          await this.websocket.connect()
         }
       }
     }
@@ -230,7 +230,7 @@
       Vue.set(this.state.connection, 'authenticated', true)
 
       if (this.autoconnect) {
-        this.websocket.connect()
+        await this.websocket.connect()
       }
     }
 
@@ -257,7 +257,7 @@
       }
     }
 
-    public websocketConnect() {
+    public async websocketConnect() {
       if (!this.authenticated) {
         throw new Error('client not authenticated')
       }
@@ -266,7 +266,7 @@
         throw new Error('client already connected to websocket')
       }
 
-      this.websocket.connect()
+      await this.websocket.connect()
     }
 
     public websocketDisconnect() {