From 9f8310fe102033515d198d97853b0a80bdcc1d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sat, 22 Apr 2023 14:23:06 +0200
Subject: [PATCH] ensure that close is not intercepted by any other event.
 (#29)

---
 src/component/internal/connection.ts | 11 +++++++++--
 src/page/main.vue                    |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/component/internal/connection.ts b/src/component/internal/connection.ts
index 71f61773..6871a0a2 100644
--- a/src/component/internal/connection.ts
+++ b/src/component/internal/connection.ts
@@ -23,6 +23,7 @@ export interface NekoConnectionEvents {
 
 export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
   private _open = false
+  private _closing = false
 
   public websocket = new NekoWebSocket()
   public logger = new NekoLoggerFactory(this.websocket)
@@ -204,18 +205,24 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
   }
 
   public close(error?: Error) {
-    if (this._open) {
+    // we want to make sure that close event is only emitted once
+    // and is not intercepted by any other close event
+    const active = this._open && !this._closing
+
+    if (active) {
       // set state to disconnected
       Vue.set(this._state.websocket, 'connected', false)
       Vue.set(this._state.webrtc, 'connected', false)
       Vue.set(this._state, 'status', 'disconnected')
+      this._closing = true
     }
 
     // close all reconnectors
     Object.values(this._reconnector).forEach((r) => r.close())
 
-    if (this._open) {
+    if (active) {
       this._open = false
+      this._closing = false
       this.emit('close', error)
     }
   }
diff --git a/src/page/main.vue b/src/page/main.vue
index 12708c2b..cd0c072e 100644
--- a/src/page/main.vue
+++ b/src/page/main.vue
@@ -442,7 +442,7 @@
       })
       this.neko.events.on('connection.closed', (error?: Error) => {
         if (error) {
-          alert('Connection closed with error:' + error.message)
+          alert('Connection closed with error: ' + error.message)
         } else {
           alert('Connection closed without error.')
         }