From 357e763c3e0777f24a719f4918bfef5df242ac38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@gmail.com>
Date: Mon, 4 Dec 2023 21:57:29 +0100
Subject: [PATCH] chore: stop re-establishing websocket connection upon
 application close

---
 .../services/src/Domain/Api/WebsocketsService.ts     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/services/src/Domain/Api/WebsocketsService.ts b/packages/services/src/Domain/Api/WebsocketsService.ts
index 777cb6cb7..3c2f844dd 100644
--- a/packages/services/src/Domain/Api/WebsocketsService.ts
+++ b/packages/services/src/Domain/Api/WebsocketsService.ts
@@ -9,6 +9,7 @@ import { StorageKey } from '../Storage/StorageKeys'
 import { Result } from '@standardnotes/domain-core'
 
 export class WebSocketsService extends AbstractService<WebSocketsServiceEvent, DomainEventInterface> {
+  private CLOSE_CONNECTION_CODE = 3123
   private webSocket?: WebSocket
 
   constructor(
@@ -63,7 +64,7 @@ export class WebSocketsService extends AbstractService<WebSocketsServiceEvent, D
   }
 
   public closeWebSocketConnection(): void {
-    this.webSocket?.close()
+    this.webSocket?.close(this.CLOSE_CONNECTION_CODE, 'Closing application')
   }
 
   private onWebSocketMessage(messageEvent: MessageEvent) {
@@ -89,7 +90,14 @@ export class WebSocketsService extends AbstractService<WebSocketsServiceEvent, D
     }
   }
 
-  private onWebSocketClose() {
+  private onWebSocketClose(event: CloseEvent) {
+    const closedByApplication = event.code === this.CLOSE_CONNECTION_CODE
+    if (closedByApplication) {
+      this.webSocket = undefined
+
+      return
+    }
+
     if (this.webSocket?.readyState === WebSocket.CLOSED) {
       void this.startWebSocketConnection()
     }