From f5f3376aeae2f312fc15e15a08f974922352a119 Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Wed, 24 Jan 2024 15:50:27 -0400
Subject: [PATCH] Refactor event handling in EventsController and App.vue

---
 src/controllers/EventsController.ts | 6 +++---
 src/jobs.ts                         | 2 +-
 web/src/App.vue                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controllers/EventsController.ts b/src/controllers/EventsController.ts
index ddc90f5..fc8859e 100644
--- a/src/controllers/EventsController.ts
+++ b/src/controllers/EventsController.ts
@@ -36,13 +36,13 @@ export class EventsController {
     })
   }
 
-  static async sendEvent(event: string, data: any = null) {
+  static async sendEvent(data: any = null) {
     this.clients.forEach(client => {
       log.info(
         new Date().toLocaleString(),
-        `Sending event ${event} to ${client.id}`
+        `Sending event message to ${client.id}`
       )
-      client.res.write(`event: ${event}\n`)
+      client.res.write(`event: message\n`)
       client.res.write(`data: ${JSON.stringify(data)}\n\n`)
     })
   }
diff --git a/src/jobs.ts b/src/jobs.ts
index d5a670a..b68f62c 100644
--- a/src/jobs.ts
+++ b/src/jobs.ts
@@ -23,5 +23,5 @@ export const jobs = new Bree({
 
 jobs.on('worker deleted', name => {
   if (name == 'updatePrinterStatus')
-    EventsController.sendEvent('printerStatusUpdated', { status: 'success' })
+    EventsController.sendEvent({ status: 'success' })
 })
diff --git a/web/src/App.vue b/web/src/App.vue
index aba4ffb..f9f0d18 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -36,8 +36,8 @@ onBeforeMount(async () => {
   const events = new EventSource(eventURI)
 
   events.onmessage = async event => {
-    await appStore.fetchPrinters()
     console.log('Event:', event)
+    await appStore.fetchPrinters()
   }
 })
 </script>