From fb888c1c3d9f708b563e2d662d4954b581fa57f5 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 16 Mar 2023 16:32:22 +0200
Subject: [PATCH] refactor: reorder and rename methods

---
 __init__.py           |  2 +-
 nostr/nostr_client.py | 52 ++++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/__init__.py b/__init__.py
index 7ae1a3a..7e80766 100644
--- a/__init__.py
+++ b/__init__.py
@@ -42,7 +42,7 @@ def nostrmarket_start():
     async def _subscribe_to_nostr_client():
         # wait for 'nostrclient' extension to initialize
         await asyncio.sleep(10)
-        await nostr_client.subscribe_to_nostr_client()
+        await nostr_client.run_forever()
 
     async def _wait_for_nostr_events():
         # wait for this extension to initialize
diff --git a/nostr/nostr_client.py b/nostr/nostr_client.py
index 2204ba1..e47af98 100644
--- a/nostr/nostr_client.py
+++ b/nostr/nostr_client.py
@@ -18,13 +18,6 @@ class NostrClient:
         self.send_req_queue: Queue = Queue()
         self.ws: WebSocketApp = None
 
-    async def get_event(self):
-        return await self.recieve_event_queue.get()
-
-    async def publish_nostr_event(self, e: NostrEvent):
-        print("### publish_nostr_event", e.dict())
-        await self.send_req_queue.put(["EVENT", e.dict()])
-
     async def connect_to_nostrclient_ws(
         self, on_open: Callable, on_message: Callable
     ) -> WebSocketApp:
@@ -45,23 +38,10 @@ class NostrClient:
 
         return ws
 
-    async def subscribe_to_direct_messages(self, public_key: str, since: int):
-        in_messages_filter = {"kind": 4, "#p": [public_key]}
-        out_messages_filter = {"kind": 4, "authors": [public_key]}
-        if since != 0:
-            in_messages_filter["since"] = since
-            out_messages_filter["since"] = since
-        print("### in_messages_filter", in_messages_filter)
-        print("### out_messages_filter", out_messages_filter)
+    async def get_event(self):
+        return await self.recieve_event_queue.get()
 
-        await self.send_req_queue.put(
-            ["REQ", f"direct-messages-in:{public_key}", in_messages_filter]
-        )
-        await self.send_req_queue.put(
-            ["REQ", f"direct-messages-out:{public_key}", out_messages_filter]
-        )
-
-    async def subscribe_to_nostr_client(self):
+    async def run_forever(self):
         def on_open(_):
             logger.info("Connected to 'nostrclient' websocket")
 
@@ -85,6 +65,32 @@ class NostrClient:
                 self.ws = None  # todo close
                 await asyncio.sleep(5)
 
+    async def publish_nostr_event(self, e: NostrEvent):
+        print("### publish_nostr_event", e.dict())
+        await self.send_req_queue.put(["EVENT", e.dict()])
+
+    async def subscribe_to_direct_messages(self, public_key: str, since: int):
+        in_messages_filter = {"kind": 4, "#p": [public_key]}
+        out_messages_filter = {"kind": 4, "authors": [public_key]}
+        if since != 0:
+            in_messages_filter["since"] = since
+            out_messages_filter["since"] = since
+        print("### in_messages_filter", in_messages_filter)
+        print("### out_messages_filter", out_messages_filter)
+
+        await self.send_req_queue.put(
+            ["REQ", f"direct-messages-in:{public_key}", in_messages_filter]
+        )
+        await self.send_req_queue.put(
+            ["REQ", f"direct-messages-out:{public_key}", out_messages_filter]
+        )
+
     async def unsubscribe_from_direct_messages(self, public_key: str):
         await self.send_req_queue.put(["CLOSE", f"direct-messages-in:{public_key}"])
         await self.send_req_queue.put(["CLOSE", f"direct-messages-out:{public_key}"])
+
+    def stop(self):
+        try:
+            self.ws.close()
+        except Exception as ex:
+            logger.warning(ex)