dsmq 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

dsmq/client.py

@@ -1,6 +1,7 @@
 import json
 import time
 from websockets.sync.client import connect as ws_connect
+from websockets.exceptions import ConnectionClosedError
 
 _default_host = "127.0.0.1"
 _default_port = 30008
@@ -39,7 +40,11 @@ class DSMQClientSideConnection:
     def get(self, topic):
         msg = {"action": "get", "topic": topic}
         self.websocket.send(json.dumps(msg))
-        msg_text = self.websocket.recv()
+        try:
+            msg_text = self.websocket.recv()
+        except ConnectionClosedError:
+            self.close()
+
         msg = json.loads(msg_text)
         return msg["message"]
 

dsmq/server.py

@@ -5,6 +5,7 @@ import sys
 from threading import Thread
 import time
 from websockets.sync.server import serve as ws_serve
+from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK
 
 _default_host = "127.0.0.1"
 _default_port = 30008
@@ -69,111 +70,120 @@ def request_handler(websocket):
     last_read_times = {}
     time_of_last_purge = time.time()
 
-    for msg_text in websocket:
-        msg = json.loads(msg_text)
-        topic = msg["topic"]
-        timestamp = time.time()
-
-        if msg["action"] == "put":
-            msg["timestamp"] = timestamp
+    try:
+        for msg_text in websocket:
+            msg = json.loads(msg_text)
+            topic = msg["topic"]
+            timestamp = time.time()
+
+            if msg["action"] == "put":
+                msg["timestamp"] = timestamp
+
+                # This block allows for multiple retries if the database
+                # is busy.
+                for i_retry in range(_n_retries):
+                    try:
+                        cursor.execute(
+                            """
+                            INSERT INTO messages (timestamp, topic, message)
+                            VALUES (:timestamp, :topic, :message)
+                            """,
+                            (msg),
+                        )
+                        sqlite_conn.commit()
+                    except sqlite3.OperationalError:
+                        wait_time = _first_retry * 2**i_retry
+                        time.sleep(wait_time)
+                        continue
+                    break
+
+            elif msg["action"] == "get":
+                try:
+                    last_read_time = last_read_times[topic]
+                except KeyError:
+                    last_read_times[topic] = client_creation_time
+                    last_read_time = last_read_times[topic]
+                msg["last_read_time"] = last_read_time
+
+                # This block allows for multiple retries if the database
+                # is busy.
+                for i_retry in range(_n_retries):
+                    try:
+                        cursor.execute(
+                            """
+                            SELECT message,
+                            timestamp
+                            FROM messages,
+                            (
+                            SELECT MIN(timestamp) AS min_time
+                            FROM messages
+                            WHERE topic = :topic
+                            AND timestamp > :last_read_time
+                            ) a
+                            WHERE topic = :topic
+                            AND timestamp = a.min_time
+                            """,
+                            msg,
+                        )
+                    except sqlite3.OperationalError:
+                        wait_time = _first_retry * 2**i_retry
+                        time.sleep(wait_time)
+                        continue
+                    break
 
-            # This block allows for multiple retries if the database
-            # is busy.
-            for i_retry in range(_n_retries):
                 try:
-                    cursor.execute(
-                        """
-INSERT INTO messages (timestamp, topic, message)
-VALUES (:timestamp, :topic, :message)
-                        """,
-                        (msg),
-                    )
-                    sqlite_conn.commit()
-                except sqlite3.OperationalError:
-                    wait_time = _first_retry * 2**i_retry
-                    time.sleep(wait_time)
-                    continue
+                    result = cursor.fetchall()[0]
+                    message = result[0]
+                    timestamp = result[1]
+                    last_read_times[topic] = timestamp
+                except IndexError:
+                    # Handle the case where no results are returned
+                    message = ""
+
+                websocket.send(json.dumps({"message": message}))
+            elif msg["action"] == "shutdown":
+                # Run this from a separate thread to prevent deadlock
+                global dsmq_server
+
+                def shutdown_gracefully(server_to_shutdown):
+                    server_to_shutdown.shutdown()
+
+                    filenames = os.listdir()
+                    for filename in filenames:
+                        if filename[: len(_db_name)] == _db_name:
+                            try:
+                                os.remove(filename)
+                            except FileNotFoundError:
+                                pass
+
+                Thread(target=shutdown_gracefully, args=(dsmq_server,)).start()
                 break
-
-        elif msg["action"] == "get":
-            try:
-                last_read_time = last_read_times[topic]
-            except KeyError:
-                last_read_times[topic] = client_creation_time
-                last_read_time = last_read_times[topic]
-            msg["last_read_time"] = last_read_time
-
-            # This block allows for multiple retries if the database
-            # is busy.
-            for i_retry in range(_n_retries):
+            else:
+                raise RuntimeWarning(
+                    "dsmq client action must either be 'put', 'get', or 'shutdown'"
+                )
+
+            # Periodically clean out messages from the queue that are
+            # past their sell buy date.
+            # This operation is pretty fast. I clock it at 12 us on my machine.
+            if time.time() - time_of_last_purge > _time_to_live:
                 try:
                     cursor.execute(
                         """
-SELECT message,
-timestamp
-FROM messages,
-(
-SELECT MIN(timestamp) AS min_time
-FROM messages
-WHERE topic = :topic
-AND timestamp > :last_read_time
-) a
-WHERE topic = :topic
-AND timestamp = a.min_time
+                        DELETE FROM messages
+                        WHERE timestamp < :time_threshold
                         """,
-                        msg,
+                        {"time_threshold": time_of_last_purge},
                     )
+                    sqlite_conn.commit()
+                    time_of_last_purge = time.time()
                 except sqlite3.OperationalError:
-                    wait_time = _first_retry * 2**i_retry
-                    time.sleep(wait_time)
-                    continue
-                break
-
-            try:
-                result = cursor.fetchall()[0]
-                message = result[0]
-                timestamp = result[1]
-                last_read_times[topic] = timestamp
-            except IndexError:
-                # Handle the case where no results are returned
-                message = ""
-
-            websocket.send(json.dumps({"message": message}))
-        elif msg["action"] == "shutdown":
-            # Run this from a separate thread to prevent deadlock
-            global dsmq_server
-
-            def shutdown_gracefully(server_to_shutdown):
-                server_to_shutdown.shutdown()
-
-                filenames = os.listdir()
-                for filename in filenames:
-                    if filename[: len(_db_name)] == _db_name:
-                        try:
-                            os.remove(filename)
-                        except FileNotFoundError:
-                            pass
-
-            Thread(target=shutdown_gracefully, args=(dsmq_server,)).start()
-            break
-        else:
-            raise RuntimeWarning(
-                "dsmq client action must either be 'put', 'get', or 'shutdown'"
-            )
-
-        # Periodically clean out messages from the queue that are
-        # past their sell buy date.
-        # This operation is pretty fast. I clock it at 12 us on my machine.
-        if time.time() - time_of_last_purge > _time_to_live:
-            cursor.execute(
-                """
-DELETE FROM messages
-WHERE timestamp < :time_threshold
-                """,
-                {"time_threshold": time_of_last_purge},
-            )
-            sqlite_conn.commit()
-            time_of_last_purge = time.time()
+                    # Database may be locked. Try again next time.
+                    pass
+    except (ConnectionClosedError, ConnectionClosedOK):
+        # Something happened on the other end and this handler
+        # is no longer needed.
+        pass
 
     sqlite_conn.close()
 

dsmq/tests/integration_test.py

@@ -1,6 +1,5 @@
 import multiprocessing as mp
 import time
-from websockets.exceptions import ConnectionClosed
 from dsmq.server import serve
 from dsmq.client import connect
 

{dsmq-1.2.2.dist-info → dsmq-1.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsmq
-Version: 1.2.2
+Version: 1.2.4
 Summary: A dead simple message queue
 License-File: LICENSE
 Requires-Python: >=3.10

dsmq-1.2.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+dsmq/__init__.py,sha256=YCgbnQAk8YbtHRyMcU0v2O7RdRhPhlT-vS_q40a7Q6g,50
+dsmq/client.py,sha256=p6irQZOE4b2fpTUwSrEUraPmrJzvT8QSU01ak9qpGCQ,2351
+dsmq/demo.py,sha256=K53cC5kN7K4kNJlPq7c5OTIMHRCKTo9hYX2aIos57rU,542
+dsmq/example_get_client.py,sha256=PvAsDGEAH1kVBifLVg2rx8ZxnAZmvzVCvZq13VgpLds,301
+dsmq/example_put_client.py,sha256=QxDc3i7KAjjhpwxRRpI0Ke5KTNSPuBf9kkcGyTvUEaw,353
+dsmq/server.py,sha256=5c4mHWz6yslSxpOwrZ3vOCMcx_cm8zMF8iJNnQF8ft0,7249
+dsmq/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dsmq/tests/integration_test.py,sha256=dLsQGCmpXv4zRb93TriccH7TbUyD9MHcLckAQqfDOK4,5980
+dsmq-1.2.4.dist-info/METADATA,sha256=CswX8bQph2pF-k-VMCLAPqaho3Mhny4xDLJ70xwWa9I,4730
+dsmq-1.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dsmq-1.2.4.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
+dsmq-1.2.4.dist-info/RECORD,,

dsmq-1.2.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-dsmq/__init__.py,sha256=YCgbnQAk8YbtHRyMcU0v2O7RdRhPhlT-vS_q40a7Q6g,50
-dsmq/client.py,sha256=1fQLRExDkdLogu8M5aofkYp3-Qy5a2y3aMYy7qC3NkE,2214
-dsmq/demo.py,sha256=K53cC5kN7K4kNJlPq7c5OTIMHRCKTo9hYX2aIos57rU,542
-dsmq/example_get_client.py,sha256=PvAsDGEAH1kVBifLVg2rx8ZxnAZmvzVCvZq13VgpLds,301
-dsmq/example_put_client.py,sha256=QxDc3i7KAjjhpwxRRpI0Ke5KTNSPuBf9kkcGyTvUEaw,353
-dsmq/server.py,sha256=kCqBzgikvJlCgAfLHd18LS7fmkYW6e0RhmdwqdeXJ7Q,6079
-dsmq/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsmq/tests/integration_test.py,sha256=lC97LAzdQixv75OwjqjKTvYnSZpsP0zuzFP8ocUnjl8,6031
-dsmq-1.2.2.dist-info/METADATA,sha256=1n3_ZM8haJ5U99_fx6vZWpVYzfSR1RLUn_Ich87HaBo,4730
-dsmq-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dsmq-1.2.2.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
-dsmq-1.2.2.dist-info/RECORD,,