bisocket 0.0.2a3__tar.gz → 0.0.2a4__tar.gz

{bisocket-0.0.2a3/bisocket.egg-info → bisocket-0.0.2a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bisocket
-Version: 0.0.2a3
+Version: 0.0.2a4
 Summary: bisocket is a high-level Python library for simple, secure, and truly bidirectional socket communication, using a dual-socket architecture to enable non-blocking, full-duplex I/O. It provides automatic AES-GCM encryption and supports both synchronous (threading) and asynchronous (asyncio) client-server applications
 Home-page: 
 Author: Daniel Olson

{bisocket-0.0.2a3 → bisocket-0.0.2a4}/bisocket/main.py

@@ -473,6 +473,8 @@ class Client:
 
 @dataclass
 class ServerRequest:
+    client_id: str
+    request_id: str
     method: str
     data: bytes
     send_data: Callable[[bytes], None]
@@ -529,7 +531,7 @@ class Server:
             pass
         return data
     
-    def handle_requests(self, s, q: queue.Queue, request_q: queue.Queue, loop=None):
+    def handle_requests(self, client_id: str, s, q: queue.Queue, request_q: queue.Queue, loop=None):
         method, request_id, data = self.decrypt(self.server_receive(s)).split(SPLIT_TOKEN)
         send(s, b'ok')
 
@@ -541,6 +543,8 @@ class Server:
                 
             request_q.put_nowait(
                 ServerRequest(
+                    client_id,
+                    request_id.decode(),
                     method.decode(), 
                     data, 
                     get_send_data_func(request_id)
@@ -577,7 +581,7 @@ class Server:
                 #     self.handler(ServerRequest(method.decode(), data, send_data))
                 #     method, request_id, data = self.decrypt(self.server_receive(s)).split(SPLIT_TOKEN)
 
-                t = threading.Thread(target=self.handle_requests, args=(s, q, request_q), daemon=True)
+                t = threading.Thread(target=self.handle_requests, args=(client_id, s, q, request_q), daemon=True)
                 t.start()
 
                 while (request := request_q.get()) is not None:
@@ -656,7 +660,7 @@ class Server:
             pass
         return data
     
-    async def ahandle_requests(self, s, q: asyncio.Queue, request_q: asyncio.Queue):
+    async def ahandle_requests(self, client_id: str, s, q: asyncio.Queue, request_q: asyncio.Queue):
         method, request_id, data = (await self.adecrypt(await self.aserver_receive(s))).split(SPLIT_TOKEN)
 
         while method != b'close':
@@ -667,7 +671,7 @@ class Server:
                     q.put_nowait(SPLIT_TOKEN.join([req_id, data]))
                 return send_data
                 
-            await request_q.put(ServerRequest(method.decode(), data, get_send_data_func(request_id)))
+            await request_q.put(ServerRequest(client_id, request_id.decode(), method.decode(), data, get_send_data_func(request_id)))
             # self.handler(ServerRequest(method.decode(), data, send_data))
             method, request_id, data = (await self.adecrypt(await self.aserver_receive(s))).split(SPLIT_TOKEN)
         
@@ -689,7 +693,7 @@ class Server:
                 await async_send(s, self.encrypt(b'ok'))
 
                 s.setblocking(True)
-                t = threading.Thread(target=self.handle_requests, args=(s, q, request_q, asyncio.get_running_loop()), daemon=True)
+                t = threading.Thread(target=self.handle_requests, args=(client_id, s, q, request_q, asyncio.get_running_loop()), daemon=True)
                 t.start()
                 # asyncio.create_task(self.ahandle_requests(s, q, request_q))
 

{bisocket-0.0.2a3 → bisocket-0.0.2a4/bisocket.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bisocket
-Version: 0.0.2a3
+Version: 0.0.2a4
 Summary: bisocket is a high-level Python library for simple, secure, and truly bidirectional socket communication, using a dual-socket architecture to enable non-blocking, full-duplex I/O. It provides automatic AES-GCM encryption and supports both synchronous (threading) and asynchronous (asyncio) client-server applications
 Home-page: 
 Author: Daniel Olson

{bisocket-0.0.2a3 → bisocket-0.0.2a4}/setup.py

@@ -20,7 +20,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="bisocket",
-    version="0.0.2-alpha3",
+    version="0.0.2-alpha4",
     author="Daniel Olson",
     author_email="daniel@orphos.cloud",
     description="bisocket is a high-level Python library for simple, secure, and truly bidirectional socket communication, using a dual-socket architecture to enable non-blocking, full-duplex I/O. It provides automatic AES-GCM encryption and supports both synchronous (threading) and asynchronous (asyncio) client-server applications",