mrok 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

mrok/proxy/app.py

@@ -59,6 +59,6 @@ class ProxyApp(ForwardAppBase):
         headers: dict[str, str],
     ) -> tuple[StreamReader, StreamWriter] | tuple[None, None]:
         target_name = self.get_target_name(headers)
-        sock = self._ziti_socket_cache.get_or_create(target_name)
+        sock = await self._ziti_socket_cache.get_or_create(target_name)
         reader, writer = await asyncio.open_connection(sock=sock)
         return reader, writer

mrok/proxy/ziti.py

@@ -1,5 +1,6 @@
 import asyncio
 import contextlib
+import logging
 from asyncio import Task
 from pathlib import Path
 
@@ -8,6 +9,8 @@ from aiocache import Cache
 from openziti.context import ZitiContext
 from openziti.zitisock import ZitiSocket
 
+logger = logging.getLogger("mrok.proxy")
+
 
 class ZitiSocketCache:
     def __init__(
@@ -42,22 +45,24 @@ class ZitiSocketCache:
         sock = await self._cache.get(key)
 
         if sock:
-            await self._cache.set(key, sock, ttl_seconds=self._ttl_seconds)
+            await self._cache.expire(key, self._ttl_seconds)
             self._active_sockets[key] = sock
+            logger.debug(f"Ziti socket found for service {key}")
             return sock
 
         sock = await self._create_socket(key)
-        await self._cache.set(key, sock, ttl_seconds=self._ttl_seconds)
+        await self._cache.set(key, sock, self._ttl_seconds)
         self._active_sockets[key] = sock
+        logger.info(f"New Ziti socket created for service {key}")
         return sock
 
-    async def invalidate(self, key: str):
-        sock = await self._cache.get(key)
-        if sock:
-            await self._close_socket(sock)
+    # async def invalidate(self, key: str):
+    #     sock = await self._cache.get(key)
+    #     if sock:
+    #         await self._close_socket(sock)
 
-        await self._cache.delete(key)
-        self._active_sockets.pop(key, None)
+    #     await self._cache.delete(key)
+    #     self._active_sockets.pop(key, None)
 
     async def start(self):
         self._cleanup_task = asyncio.create_task(self._periodic_cleanup())
@@ -65,9 +70,6 @@ class ZitiSocketCache:
         self._get_ziti_ctx()
 
     async def stop(self):
-        """
-        Cleanup: stop background task + close all sockets.
-        """
         self._cleanup_task.cancel()
         with contextlib.suppress(Exception):
             await self._cleanup_task
@@ -92,12 +94,9 @@ class ZitiSocketCache:
             return
 
     async def _cleanup_once(self):
-        keys_now = set(await self._cache.keys())
-        known_keys = set(self._active_sockets.keys())
-
-        expired = known_keys - keys_now
-
+        expired = {key for key in self._active_sockets.keys() if not self._cache.exists(key)}
         for key in expired:
+            logger.debug(f"Cleaning up expired socket connection {key}")
             sock = self._active_sockets.pop(key, None)
             if sock:
                 await self._close_socket(sock)

{mrok-0.4.3.dist-info → mrok-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.4.3
+Version: 0.4.4
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License

{mrok-0.4.3.dist-info → mrok-0.4.4.dist-info}/RECORD

@@ -71,9 +71,9 @@ mrok/http/server.py,sha256=Mj7C85fc-DXp-WTBWaOd7ag808oliLmFBH5bf-G2FHg,370
 mrok/http/types.py,sha256=XpNrvbfpANKvmjOBYtLF1FmDHoJF3z_MIMQHXoJlvmE,1302
 mrok/http/utils.py,sha256=sOixYu3R9-nNoMFYdifrreYvcFRIHYVtb6AAmtVzaLE,2125
 mrok/proxy/__init__.py,sha256=vWXyImroqM1Eq8e_oFPBup8VJ3reyp8SVjFTbLzRkI8,51
-mrok/proxy/app.py,sha256=-xmHKSSqQhNdwISRXQCUVLI1n6HWs3d46cgKQ6_NC3A,2157
+mrok/proxy/app.py,sha256=yulfBdTdxesVxF1h2lli_5zjd5wP-jTx17FRdbkaV7A,2163
 mrok/proxy/main.py,sha256=ZXpticE6J4FABaslDB_8J5qklPsf3e7xIFSZmcPAAjQ,1588
-mrok/proxy/ziti.py,sha256=Ce02EimVJNffyluFr1nhOMXh6kZ0kY2nt6Shg58wkBw,3206
+mrok/proxy/ziti.py,sha256=rKgIXpOvtBeVopZkQlNUZa3Fdci9jgiog_i6egb17ps,3318
 mrok/ziti/__init__.py,sha256=20OWMiexRhOovZOX19zlX87-V78QyWnEnSZfyAftUdE,263
 mrok/ziti/api.py,sha256=KvGiT9d4oSgC3JbFWLDQyuHcLX2HuZJoJ8nHmWtCDkY,16154
 mrok/ziti/bootstrap.py,sha256=QIDhlkIxPW2QRuumFq2D1WDbD003P5f3z24pAUsyeBI,2696
@@ -82,8 +82,8 @@ mrok/ziti/errors.py,sha256=yYCbVDwktnR0AYduqtynIjo73K3HOhIrwA_vQimvEd4,368
 mrok/ziti/identities.py,sha256=1BcwfqAJHMBhc3vRaf0aLaIkoHskj5Xe2Lsq2lO9Vs8,6735
 mrok/ziti/pki.py,sha256=o2tySqHC8-7bvFuI2Tqxg9vX6H6ZSxWxfP_9x29e19M,1954
 mrok/ziti/services.py,sha256=zR1PEBYwXVou20iJK4euh0ZZFAo9UB8PZk8f6SDmiUE,3194
-mrok-0.4.3.dist-info/METADATA,sha256=rfG5MT0fAz27oU7Jzr8RFD3LLA9Syci51df1gHFSgLI,15836
-mrok-0.4.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mrok-0.4.3.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.4.3.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.4.3.dist-info/RECORD,,
+mrok-0.4.4.dist-info/METADATA,sha256=nzjalRGet1yhkJf1L4t022A-NTDG-xQ9a5cWZfbDkdg,15836
+mrok-0.4.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mrok-0.4.4.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.4.4.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.4.4.dist-info/RECORD,,