mrok 0.4.3__tar.gz → 0.4.4__tar.gz

{mrok-0.4.3 → mrok-0.4.4}/PKG-INFO

@@ -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 → mrok-0.4.4}/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-0.4.3 → mrok-0.4.4}/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 → mrok-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mrok"
-version = "0.4.3"
+version = "0.4.4"
 description = "MPT Extensions OpenZiti Orchestrator"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [