kalong 0.8.1__tar.gz → 0.8.2__tar.gz

{kalong-0.8.1 → kalong-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kalong
-Version: 0.8.1
+Version: 0.8.2
 Summary: A new take on python debugging
 Author-email: Florian Mounier <paradoxxx.zero@gmail.com>
 License-Expression: GPL-3.0-or-later

{kalong-0.8.1 → kalong-0.8.2}/kalong/__init__.py

@@ -1,6 +1,6 @@
 """A new take on debugging"""
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"
 import os
 import sys
 from pathlib import Path

{kalong-0.8.1 → kalong-0.8.2}/kalong/config.py

@@ -13,6 +13,7 @@ defaults = {
     "front_port": 59999,
     "ws_host": "localhost",
     "ws_port": 59999,
+    "base_path": "/",
     "log": "warn",
     "detached": False,
     "command": [],
@@ -92,9 +93,16 @@ class Config:
             action="store_true",
             help="Break at the start of the python file",
         )
+        parser.add_argument(
+            "--base-path",
+            type=str,
+            default=self.base_path,
+            help="Base path of the frontend url (for use with a proxy for instance)",
+        )
         parser.add_argument(
             "--urlsocket",
             type=str,
+            default=self.urlsocket,
             help="Path of the socket into which to feed the url for docker browser opening",
         )
         parser.add_argument(

{kalong-0.8.1 → kalong-0.8.2}/kalong/forking.py

@@ -15,7 +15,7 @@ def forkserver():
     kalong_dir = Path(__file__).parent.parent
     env = dict(os.environ)
     env["PYTHONPATH"] = (
-        f'{kalong_dir}:{env["PYTHONPATH"]}' if env.get("PYTHONPATH") else kalong_dir
+        f"{kalong_dir}:{env['PYTHONPATH']}" if env.get("PYTHONPATH") else kalong_dir
     )
 
     popen_args = (

{kalong-0.8.1 → kalong-0.8.2}/kalong/server.py

@@ -145,9 +145,10 @@ def serve():
     app["front"] = {}
     app["back"] = {}
     app.on_shutdown.append(shutdown)
-    app.router.add_get(r"/{side:(front|back)}/{origin}", websocket)
+    base_path = f"/{config.base_path.strip('/')}/".replace("//", "/")
+    app.router.add_get(base_path + r"{side:(front|back)}/{origin}", websocket)
     assets = Path(__file__).parent / "static" / "assets"
-    app.router.add_static("/front/assets/", assets)
+    app.router.add_static(base_path + "front/assets/", assets)
     try:
         loop = asyncio.get_event_loop()
     except RuntimeError:

{kalong-0.8.1 → kalong-0.8.2}/kalong/utils/__init__.py

@@ -61,7 +61,8 @@ def url(side):
     host = config.front_host if side == "front" else config.host
     port = config.front_port if side == "front" else config.port
     protocol = config.protocol
-    return f"{protocol}://{host}:{port}/{side}/{origin}"
+    base_path = f"/{config.base_path.strip('/')}/".replace("//", "/")
+    return f"{protocol}://{host}:{port}{base_path}{side}/{origin}"
 
 
 def human_readable_side(side):

{kalong-0.8.1 → kalong-0.8.2}/kalong/websockets.py

@@ -1,12 +1,12 @@
 import asyncio
 import logging
 import os
-import webbrowser
 import socket
+import webbrowser
 from threading import Lock
 
 from aiohttp import ClientSession
-from aiohttp.client_exceptions import ClientConnectorError
+from aiohttp.client_exceptions import ClientConnectorError, WSServerHandshakeError
 
 from .errors import NoServerFoundError
 from .forking import forkserver
@@ -41,7 +41,7 @@ async def websocket_state():
         try:
             ws = await sessions[origin].ws_connect(url("back"), **websocket_options)
             log.info("Found existing kalong server")
-        except ClientConnectorError:
+        except (ClientConnectorError, WSServerHandshakeError):
             # If there are no server available, fork one
             log.info("No kalong server, starting one")
             forkserver()
@@ -57,18 +57,20 @@ async def websocket_state():
             else:
                 raise NoServerFoundError()
 
+        external_url = url("front")
+
         if os.getenv("KALONG_URLSOCKET"):
             try:
                 sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                 sock.connect(os.getenv("KALONG_URLSOCKET"))
-                sock.send(url("front").encode("utf-8"))
+                sock.send(external_url.encode("utf-8"))
                 sock.shutdown(socket.SHUT_WR)
             finally:
                 sock.close()
         # webbrowser.open should be in the mutex too, it's not thread safe
-        elif os.getenv("KALONG_NO_BROWSER") or not webbrowser.open(url("front")):
+        elif os.getenv("KALONG_NO_BROWSER") or not webbrowser.open(external_url):
             log.warning(
-                f"Please open your browser to the following url: {url('front')}"
+                f"Please open your browser to the following url: {external_url}"
             )
 
     websockets[origin] = ws

{kalong-0.8.1 → kalong-0.8.2}/pyproject.toml

@@ -30,7 +30,11 @@ disassembly = ["uncompyle6>=3.9.2"]
 recursive = ["nest-asyncio>=1.6.0"]
 
 [dependency-groups]
-dev = ["pre-commit>=3.5.0", "sphinx>=7.1.2"]
+dev = [
+    "pre-commit>=3.5.0",
+    "ruff>=0.15.0",
+    "sphinx>=7.1.2",
+]
 
 [build-system]
 requires = ["hatchling"]