From f4fd7183dd55412154d2d72911eafb8510d62fc8 Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Sun, 29 Dec 2024 18:05:42 +0000
Subject: [PATCH] Fix error responses in websockets

---
 trustgraph-flow/trustgraph/gateway/requestor.py | 10 ++++++++--
 trustgraph-flow/trustgraph/gateway/sender.py    |  8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/trustgraph-flow/trustgraph/gateway/requestor.py b/trustgraph-flow/trustgraph/gateway/requestor.py
index 5f6e2692..5bfedf1e 100644
--- a/trustgraph-flow/trustgraph/gateway/requestor.py
+++ b/trustgraph-flow/trustgraph/gateway/requestor.py
@@ -65,7 +65,10 @@ class ServiceRequestor:
                     raise RuntimeError("Timeout")
 
                 if resp.error:
-                    return { "error": resp.error.message }
+                    err = { "error": resp.error.message }
+                    if responder:
+                        await responder(err, True)
+                    return err
 
                 resp, fin = self.from_response(resp)
 
@@ -81,7 +84,10 @@ class ServiceRequestor:
 
             logging.error(f"Exception: {e}")
 
-            return { "error": str(e) }
+            err = { "error": str(e) }
+            if responder:
+                await responder(err, True)
+            return err
 
         finally:
             self.sub.unsubscribe(id)
diff --git a/trustgraph-flow/trustgraph/gateway/sender.py b/trustgraph-flow/trustgraph/gateway/sender.py
index 93f1164c..c5bb2e17 100644
--- a/trustgraph-flow/trustgraph/gateway/sender.py
+++ b/trustgraph-flow/trustgraph/gateway/sender.py
@@ -46,5 +46,11 @@ class ServiceSender:
 
             logging.error(f"Exception: {e}")
 
-            return { "error": str(e) }
+            err = { "error": str(e) }
+
+            if responder:
+                await responder(err, True)
+
+            return err
+