From 0c24652a95d292c3da9b78ad0363c26d5fba06d5 Mon Sep 17 00:00:00 2001
From: volar <stanislav.volar@petitpress.sk>
Date: Wed, 3 Jan 2024 23:41:37 +0100
Subject: [PATCH] usewebsocket update

---
 .../composables/damNotifications.ts           | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/components/damImage/uploadQueue/composables/damNotifications.ts b/src/components/damImage/uploadQueue/composables/damNotifications.ts
index 78b5d2f2..22d52d63 100644
--- a/src/components/damImage/uploadQueue/composables/damNotifications.ts
+++ b/src/components/damImage/uploadQueue/composables/damNotifications.ts
@@ -1,12 +1,12 @@
 import { useWebSocket } from '@vueuse/core'
 import { ref } from 'vue'
 import { i18n } from '@/plugins/i18n'
-import { useAlerts } from '@/composables/system/alerts'
 import {
   type DamNotification,
   useDamNotificationsEventBus,
 } from '@/components/damImage/uploadQueue/composables/damNotificationsEventBus'
 import { useCommonAdminCoreDamOptionsGlobal } from '@/components/dam/assetSelect/composables/commonAdminCoreDamOptions'
+import { useAlerts } from '@/composables/system/alerts'
 
 const { t } = i18n.global || i18n
 
@@ -17,38 +17,34 @@ export function initDamNotifications() {
 
   const enabled = notification.enabled && notification.webSocketUrl.length > 0
 
-  const { open, ws } = useWebSocket(notification.webSocketUrl, {
+  const eventBus = useDamNotificationsEventBus()
+
+  const { open } = useWebSocket(notification.webSocketUrl, {
     immediate: false,
+    autoClose: false,
     autoReconnect: {
       retries: 10,
       delay: 5000,
     },
-    heartbeat: {
-      interval: 4000,
+    onMessage(ws, event) {
+      if (!enabled) return
+      const message = JSON.parse(event.data as string)
+      const data = message.data.length ? JSON.parse(message.data) : undefined
+      eventBus.emit({ name: message.eventName, data })
+    },
+    onError() {
+      if (!enabled) return
+      const { showWarning } = useAlerts()
+      setTimeout(() => {
+        showWarning(t('common.damImage.notificationsNotConnected'), -1)
+      }, 3000)
     },
   })
 
   const openConnection = () => {
     damNotificationsInitialized.value = true
     if (!enabled) return
-    const eventBus = useDamNotificationsEventBus()
     open()
-    if (!ws.value) return
-    // important: if you remove ws.value.onopen, it will stop working
-    ws.value.onopen = function () {
-      console.log('notification-server connected')
-    }
-    ws.value.onerror = function (this: WebSocket) {
-      const { showWarning } = useAlerts()
-      setTimeout(() => {
-        showWarning(t('common.damImage.notificationsNotConnected'), -1)
-      }, 3000)
-    }
-    ws.value.onmessage = function (this: WebSocket, event: MessageEvent) {
-      const message = JSON.parse(event.data as string)
-      const data = message.data.length ? JSON.parse(message.data) : undefined
-      eventBus.emit({ name: message.eventName, data })
-    }
   }
 
   return {