From b15f956ac7de0cdbe52518e799568ee3e9357189 Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Fri, 6 Dec 2024 22:52:53 +0000
Subject: [PATCH] Go back to response thread

---
 trustgraph-flow/trustgraph/gateway/command.py | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/trustgraph-flow/trustgraph/gateway/command.py b/trustgraph-flow/trustgraph/gateway/command.py
index 7c6897e2..57460fbb 100644
--- a/trustgraph-flow/trustgraph/gateway/command.py
+++ b/trustgraph-flow/trustgraph/gateway/command.py
@@ -27,16 +27,16 @@ class CommandEndpoint(SocketEndpoint):
     async def start(self):
         pass
 
-    async def ASDasync_thread(self, ws, running):
+    async def async_thread(self, ws, running):
 
         while running.get():
 
             try:
-                svc, request = await asyncio.wait_for(self.q.get(), 1)
+                id, svc, request = await asyncio.wait_for(self.q.get(), 1)
             except TimeoutError:
                 continue
             except Exception as e:
-                await ws.send_json({"error": str(e)})
+                await ws.send_json({"id": id, "error": str(e)})
 
             try:
 
@@ -46,7 +46,7 @@ class CommandEndpoint(SocketEndpoint):
 
                 resp = await requestor.process(request)
 
-                await ws.send_json({ "response": resp })
+                await ws.send_json({"id": id, "response": resp })
 
             except Exception as e:
 
@@ -54,26 +54,6 @@ class CommandEndpoint(SocketEndpoint):
 
         running.stop()
 
-    async def processor(self, ws, id, service, request):
-
-        try:
-
-            print(id, service, request)
-
-            requestor = self.services[service]
-
-            resp = await requestor.process(request)
-
-            await ws.send_json({"id": id, "response": resp })
-
-        except Exception as e:
-
-            await ws.send_json({"id": id, "error": str(e)})
-
-    async def async_thread(self, ws, running):
-        while running.get():
-            await asyncio.sleep(1)
-
     async def listener(self, ws, running):
         
         async for msg in ws:
@@ -96,10 +76,8 @@ class CommandEndpoint(SocketEndpoint):
                     if "id" not in data:
                         raise RuntimeError("Bad message")
 
-                    asyncio.create_task(
-                        self.processor(
-                            ws, data["id"], data["service"], data["request"]
-                        )
+                    await self.q.put(
+                        (data["id"], data["service"], data["request"])
                     )
 
                 except Exception as e: