kalong 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

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/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/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/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/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/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.dist-info → kalong-0.8.2.dist-info}/METADATA

@@ -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.dist-info → kalong-0.8.2.dist-info}/RECORD

@@ -1,28 +1,28 @@
-kalong/__init__.py,sha256=eZZSFzpKbIbklP3XEIXyyIf8byKZVr1i0yDU1Xf6kFE,3371
+kalong/__init__.py,sha256=jy-fjO2olDVmMiGVFs_r050K3qn7GcBjIcgvRlkH3Lw,3371
 kalong/__main__.py,sha256=rhd3QnCaDRx26Y1oEEoIUVYhzIhrddXMuZhDh1s1wyo,63
 kalong/communication.py,sha256=He17EOKx-1mZt-RA3wjbC7K6mVHqzAE3iyqxE8bgrhM,7460
-kalong/config.py,sha256=1uCDHvcZ7u9ZWBINm4HOkHFnvBFhnxmn7Fc4FCNBzIw,4997
+kalong/config.py,sha256=6Jr6NOi3FPOU4ld-r5t2Ylc00-tnhX2I7gpPCpEwyfk,5265
 kalong/debugger.py,sha256=pbwshEmzidhycYiF-cEZCH16okYaqGs6daNyZFviwF8,13397
 kalong/errors.py,sha256=3uUIdb_Vk046fZu7kvUNSIWStKUb2Lw9lzSr4KYjydQ,394
-kalong/forking.py,sha256=F3cKnoyKz2aPa7e_VTELORoIfe8OPLdpMP2ROozOz0I,941
+kalong/forking.py,sha256=aSlX4dCaw_b6b8r6EGFN2wdUiHlOHkAAEPUajMFSOw4,941
 kalong/loops.py,sha256=J1d0dpswZjE4yCqhI6NaPFETJvU7E9BRgaayE6RCNKc,1458
-kalong/server.py,sha256=N8MEqLPmDZDoK7XRKRvA6H2k_NIbCwGiXuFwGfux2UI,4989
+kalong/server.py,sha256=9iTyCCK2Fbewne5j5BhqQVIfQ3wpIsQpI87kY1lt45M,5081
 kalong/stepping.py,sha256=0f2eWfAZ8cTdy6eyNE5mo4E4WoQI6HjF0PQogC2mCCM,2457
 kalong/tracing.py,sha256=KvOM-XeYbfQNHFA3FKYrElsOQp9hzzc9SiEhVTGOel4,4284
-kalong/websockets.py,sha256=WOTxhBR1lpIUK_k3ikgdVN3LjHS_ds6ZfL5uoRDL0Lw,3162
+kalong/websockets.py,sha256=aeyZNBDVYekG2HsyYrHTj2yx-98oX4INQt93YzSeHS0,3249
 kalong/static/index.html,sha256=AobRsmnjVGSbKAan_65UaPvOE5FiRyokVl1vV1qsdPs,449
 kalong/static/assets/FiraCode-Bold-DzhvDiv4.woff2,sha256=13jBmAPGctKUZj6Sg8e3UswSWrJm8N245TsDnaksr2c,107788
 kalong/static/assets/FiraCode-Regular-jAL9VymT.woff2,sha256=ps5ZUguQ4V1wYv_vIU-UyK3VpAhcC7sWg2Au8iek0f4,103240
 kalong/static/assets/favicon-DBiNgszC.svg,sha256=fFK1c_uInX-1NvYVQEiweHwXfNCWqBxEUmXWg4daSb8,596
 kalong/static/assets/index-JJdLKGIu.js,sha256=ZOpMatpvby7625BY5MtUhUv94-P6T9V2Wz2QO82dvS0,1024900
-kalong/utils/__init__.py,sha256=mNTGjQU_aQOOauOtGvEWQcfy4ebfEQayHG0WPY1SaAo,3581
+kalong/utils/__init__.py,sha256=xXzqZGmkTJPlCCZi4qvQa9fniA-d1xrDT4W4xVU0kBs,3661
 kalong/utils/io.py,sha256=lPxXFDErqVHDHAFKyIAjHH7WSFfY8HRKIRyXB1_6IkU,1533
 kalong/utils/iterators.py,sha256=6fbv-9hZ-7a3i1oJvLCzLXm7Ihc66CgSO2u87nZzxrg,1045
 kalong/utils/obj.py,sha256=FXm98nx7l60mBN3LzwdmuiAckw36-3F96tJqo1K5R6A,4385
 kalong/utils/doc_lookup/__init__.py,sha256=Bf0hv0Enkk46TTIlBfyDlGMf9LHhp4wNPDgBl_TVM1s,685
 kalong/utils/doc_lookup/lookup.json,sha256=Xvfd7njY3dyQ7i4IRoOs_5CAlTk0TWEAL4a5kiuObU0,997017
-kalong-0.8.1.dist-info/METADATA,sha256=WJXJ9XtDW_7eemlfCGRG7-vP9C3kADDSJVJwKd9qbjY,815
-kalong-0.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-kalong-0.8.1.dist-info/entry_points.txt,sha256=ATxUxSsaDx2Ggw96-oG3rFA59uxPOK_R7o7-yJn7tlo,39
-kalong-0.8.1.dist-info/licenses/LICENSE,sha256=pXYsRuhMNEdOP2Mtt6hP9twpETOg_5R2wMYDrz7Z0ms,36836
-kalong-0.8.1.dist-info/RECORD,,
+kalong-0.8.2.dist-info/METADATA,sha256=9fnOvgsCoUNZiHEiV2hkrnS9ehNSNXOdWI5rbIjLpaQ,815
+kalong-0.8.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+kalong-0.8.2.dist-info/entry_points.txt,sha256=ATxUxSsaDx2Ggw96-oG3rFA59uxPOK_R7o7-yJn7tlo,39
+kalong-0.8.2.dist-info/licenses/LICENSE,sha256=pXYsRuhMNEdOP2Mtt6hP9twpETOg_5R2wMYDrz7Z0ms,36836
+kalong-0.8.2.dist-info/RECORD,,