kalong 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

kalong/__init__.py

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

kalong/config.py

@@ -7,11 +7,15 @@ defaults = {
     "protocol": "http",
     "host": "localhost",
     "port": 59999,
+    "front_host": "localhost",
     "front_port": 59999,
+    "ws_host": "localhost",
+    "ws_port": 59999,
     "log": "warn",
     "detached": False,
     "command": [],
     "inject": None,
+    "urlsocket": False,
 }
 
 
@@ -24,25 +28,45 @@ class Config:
         parser.add_argument(
             "--server",
             action="store_true",
-            help="Launch the kalong server. " "This option is used by kalong itself",
+            help="Launch the kalong server. This option is used by kalong itself",
         )
         parser.add_argument(
             "--protocol",
             default=self.protocol,
             help="Protocol for contacting kalong server",
         )
-        parser.add_argument("--host", default=self.host, help="Host of kalong server")
         parser.add_argument(
-            "--port", type=int, default=self.port, help="Port of kalong server"
+            "--host",
+            default=self.host,
+            help="Host of kalong server",
         )
-        front_port_default = (
-            {"default": self.port} if self.port != self.front_port else {}
+        parser.add_argument(
+            "--port",
+            type=int,
+            default=self.port,
+            help="Port of kalong server",
+        )
+        parser.add_argument(
+            "--front-host",
+            default=self.front_host,
+            help="Host of kalong frontend, defaults to host option",
         )
         parser.add_argument(
             "--front-port",
             type=int,
+            default=self.front_port,
             help="Port of kalong frontend, defaults to port option",
-            **front_port_default,
+        )
+        parser.add_argument(
+            "--ws-host",
+            default=self.ws_host,
+            help="Host of kalong websocket server, defaults to host option",
+        )
+        parser.add_argument(
+            "--ws-port",
+            type=int,
+            default=self.ws_port,
+            help="Port of kalong websocket server, defaults to port option",
         )
         parser.add_argument(
             "--log",
@@ -66,6 +90,11 @@ class Config:
             action="store_true",
             help="Break at the start of the python file",
         )
+        parser.add_argument(
+            "--urlsocket",
+            type=str,
+            help="Path of the socket into which to feed the url for docker browser opening",
+        )
         parser.add_argument(
             "command",
             nargs=REMAINDER,
@@ -76,8 +105,14 @@ class Config:
 
     def parse_args(self):
         args = self.get_parser().parse_args()
+        if not args.front_host:
+            args.front_host = args.host
         if not args.front_port:
             args.front_port = args.port
+        if not args.ws_host:
+            args.ws_host = args.host
+        if not args.ws_port:
+            args.ws_port = args.port
         return args
 
     def from_args(self):
@@ -90,8 +125,14 @@ class Config:
             if value:
                 setattr(self, name, type(name)(value))
 
+        if os.getenv("KALONG_HOST") and not os.getenv("KALONG_FRONT_HOST"):
+            self.front_host = self.host
         if os.getenv("KALONG_PORT") and not os.getenv("KALONG_FRONT_PORT"):
             self.front_port = self.port
+        if os.getenv("KALONG_HOST") and not os.getenv("KALONG_WS_HOST"):
+            self.ws_host = self.host
+        if os.getenv("KALONG_PORT") and not os.getenv("KALONG_WS_PORT"):
+            self.ws_port = self.port
 
     def get_args_for_server(self):
         yield "--server"

kalong/server.py

@@ -29,6 +29,25 @@ def maybe_bail(app):
         )
 
 
+def index():
+    index.__content__ = getattr(index, "__content__", None)
+    if not index.__content__:
+        with open(Path(__file__).parent / "static" / "index.html", "rb") as f:
+            index.__content__ = f.read()
+        if config.ws_port != config.port or config.ws_host != config.host:
+            index.__content__ = index.__content__.replace(
+                b"</body>",
+                f"""
+            <script>
+                window.KALONG_WS_HOST = "{config.ws_host}";
+                window.KALONG_WS_PORT = {config.ws_port};
+            </script>
+        </body>
+        """.encode(),
+            )
+    return web.Response(body=index.__content__, content_type="text/html")
+
+
 async def shutdown(app):
     log.info("App shutdown, closing remaining websockets.")
     await asyncio.gather(
@@ -60,7 +79,7 @@ async def websocket(request):
     state = ws.can_prepare(request)
     if not state.ok:
         log.debug(f"Sending {side} app for {origin}")
-        return web.FileResponse(Path(__file__).parent / "static" / "index.html")
+        return index()
 
     await ws.prepare(request)