Merge pull request #497 from takluyver/doc/callable-param-unix-sock

Document unix_socket as a parameter for callables in config

docs/source/server-process.md

@@ -152,8 +152,8 @@ For example, RStudio uses the term _frame origin_ and require the flag
 One of:
 
 - A dictionary of strings that are passed in as HTTP headers to the proxy
-  request. The strings `{port}` and `{base_url}` will be replaced as
-  for **command**.
+  request. The strings `{port}`, `{unix_socket}` and `{base_url}` will be
+  replaced as for **command**.
 - A callable that takes any {ref}`callable arguments <server-process:callable-arguments>`,
   and returns a dictionary of strings that are used & treated same as above.
 
@@ -181,9 +181,11 @@ server as raw stream data. This is similar to running a
 [websockify](https://github.com/novnc/websockify) wrapper.
 All other HTTP requests return 405.
 
-#### Callable arguments
+### Callable arguments
 
-Any time you specify a callable in the config, it can ask for any arguments it needs
+Certain config options accept callables, as documented above. This should return
+the same type of object that the option normally expects.
+When you use a callable this way, it can ask for any arguments it needs
 by simply declaring it - only arguments the callable asks for will be passed to it.
 
 For example, with the following config:
@@ -213,13 +215,18 @@ The `port` argument will be passed to the callable. This is a simple form of dep
 injection that helps us add more parameters in the future without breaking backwards
 compatibility.
 
-##### Available arguments
+#### Available arguments
 
-Currently, the following arguments are available:
+Unless otherwise documented for specific options, the arguments available for
+callables are:
 
 1. **port**
-   The port the command should listen on
-2. **base_url**
+   The TCP port on which the server should listen, or is listening.
+   This is 0 if a Unix socket is used instead of TCP.
+2. **unix_socket**
+   The path of a Unix socket on which the server should listen, or is listening.
+   This is an empty string if a TCP socket is used.
+3. **base_url**
    The base URL of the notebook
 
 If any of the returned strings, lists or dictionaries contain strings

jupyter_server_proxy/config.py

@@ -54,7 +54,11 @@ def _make_proxy_handler(sp: ServerProcess):
     Create an appropriate handler with given parameters
     """
     if sp.command:
-        cls = SuperviseAndRawSocketHandler if sp.raw_socket_proxy else SuperviseAndProxyHandler
+        cls = (
+            SuperviseAndRawSocketHandler
+            if sp.raw_socket_proxy
+            else SuperviseAndProxyHandler
+        )
         args = dict(state={})
     elif not (sp.port or isinstance(sp.unix_socket, str)):
         warn(
@@ -122,13 +126,7 @@ def make_handlers(base_url, server_processes):
         handler = _make_proxy_handler(sp)
         if not handler:
             continue
-        handlers.append(
-            (
-                ujoin(base_url, sp.name, r"(.*)"),
-                handler,
-                handler.kwargs
-            )
-        )
+        handlers.append((ujoin(base_url, sp.name, r"(.*)"), handler, handler.kwargs))
         handlers.append((ujoin(base_url, sp.name), AddSlashHandler))
     return handlers
 
@@ -159,9 +157,7 @@ def make_server_process(name, server_process_config, serverproxy_config):
             "rewrite_response",
             tuple(),
         ),
-        update_last_activity=server_process_config.get(
-            "update_last_activity", True
-        ),
+        update_last_activity=server_process_config.get("update_last_activity", True),
         raw_socket_proxy=server_process_config.get("raw_socket_proxy", False),
     )
 

jupyter_server_proxy/rawsocket.py

@@ -9,15 +9,17 @@
 
 import asyncio
 
-from .handlers import NamedLocalProxyHandler, SuperviseAndProxyHandler
 from tornado import web
 
+from .handlers import NamedLocalProxyHandler, SuperviseAndProxyHandler
+
 
 class RawSocketProtocol(asyncio.Protocol):
     """
     A protocol handler for the proxied stream connection.
     Sends any received blocks directly as websocket messages.
     """
+
     def __init__(self, handler):
         self.handler = handler
 
@@ -30,14 +32,18 @@ def data_received(self, data):
 
     def connection_lost(self, exc):
         "Close the websocket connection."
-        self.handler.log.info(f"Raw websocket {self.handler.name} connection lost: {exc}")
+        self.handler.log.info(
+            f"Raw websocket {self.handler.name} connection lost: {exc}"
+        )
         self.handler.close()
 
+
 class RawSocketHandler(NamedLocalProxyHandler):
     """
     HTTP handler that proxies websocket connections into a backend stream.
     All other HTTP requests return 405.
     """
+
     def _create_ws_connection(self, proto: asyncio.BaseProtocol):
         "Create the appropriate backend asyncio connection"
         loop = asyncio.get_running_loop()
@@ -46,17 +52,21 @@ def _create_ws_connection(self, proto: asyncio.BaseProtocol):
             return loop.create_unix_connection(proto, self.unix_socket)
         else:
             self.log.info(f"RawSocket {self.name} connecting to port {self.port}")
-            return loop.create_connection(proto, 'localhost', self.port)
+            return loop.create_connection(proto, "localhost", self.port)
 
     async def proxy(self, port, path):
-        raise web.HTTPError(405, "this raw_socket_proxy backend only supports websocket connections")
+        raise web.HTTPError(
+            405, "this raw_socket_proxy backend only supports websocket connections"
+        )
 
     async def proxy_open(self, host, port, proxied_path=""):
         """
         Open the backend connection. host and port are ignored (as they are in
         the parent for unix sockets) since they are always passed known values.
         """
-        transp, proto = await self._create_ws_connection(lambda: RawSocketProtocol(self))
+        transp, proto = await self._create_ws_connection(
+            lambda: RawSocketProtocol(self)
+        )
         self.ws_transp = transp
         self.ws_proto = proto
         self._record_activity()
@@ -66,8 +76,10 @@ def on_message(self, message):
         "Send websocket messages as stream writes, encoding if necessary."
         self._record_activity()
         if isinstance(message, str):
-            message = message.encode('utf-8')
-        self.ws_transp.write(message) # buffered non-blocking. should block (needs new enough tornado)
+            message = message.encode("utf-8")
+        self.ws_transp.write(
+            message
+        )  # buffered non-blocking. should block (needs new enough tornado)
 
     def on_ping(self, message):
         "No-op"
@@ -79,6 +91,7 @@ def on_close(self):
         if hasattr(self, "ws_transp"):
             self.ws_transp.close()
 
+
 class SuperviseAndRawSocketHandler(SuperviseAndProxyHandler, RawSocketHandler):
     async def _http_ready_func(self, p):
         # not really HTTP here, just try an empty connection

tests/resources/jupyter_server_config.py

@@ -42,10 +42,10 @@ def cats_only(response, path):
         response.code = 403
         response.body = b"dogs not allowed"
 
+
 def my_env():
-    return {
-            "MYVAR": "String with escaped {{var}}"
-        }
+    return {"MYVAR": "String with escaped {{var}}"}
+
 
 c.ServerProxy.servers = {
     "python-http": {
@@ -129,12 +129,12 @@ def my_env():
     "python-proxyto54321-no-command": {"port": 54321},
     "python-rawsocket-tcp": {
         "command": [sys.executable, "./tests/resources/rawsocket.py", "{port}"],
-        "raw_socket_proxy": True
+        "raw_socket_proxy": True,
     },
     "python-rawsocket-unix": {
         "command": [sys.executable, "./tests/resources/rawsocket.py", "{unix_socket}"],
         "unix_socket": True,
-        "raw_socket_proxy": True
+        "raw_socket_proxy": True,
     },
 }
 

tests/resources/rawsocket.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-import os
 import socket
 import sys
 
@@ -11,7 +10,7 @@
 try:
     port = int(where)
     family = socket.AF_INET
-    addr = ('localhost', port)
+    addr = ("localhost", port)
 except ValueError:
     family = socket.AF_UNIX
     addr = where

tests/test_proxies.py

@@ -471,18 +471,20 @@ def test_callable_environment_formatting(
     assert r.code == 200
 
 
-@pytest.mark.parametrize("rawsocket_type", [
-    "tcp",
-    pytest.param(
-        "unix",
-        marks=pytest.mark.skipif(
-            sys.platform == "win32", reason="Unix socket not supported on Windows"
+@pytest.mark.parametrize(
+    "rawsocket_type",
+    [
+        "tcp",
+        pytest.param(
+            "unix",
+            marks=pytest.mark.skipif(
+                sys.platform == "win32", reason="Unix socket not supported on Windows"
+            ),
         ),
-    ),
-])
+    ],
+)
 async def test_server_proxy_rawsocket(
-    rawsocket_type: str,
-    a_server_port_and_token: Tuple[int, str]
+    rawsocket_type: str, a_server_port_and_token: Tuple[int, str]
 ) -> None:
     PORT, TOKEN = a_server_port_and_token
     url = f"ws://{LOCALHOST}:{PORT}/python-rawsocket-{rawsocket_type}/?token={TOKEN}"