Revert "Add a jupyter server extension to render desktop/"

Removes the server extension, so the HTML for the interface
*is* served by websockify itself. This is a fix for
yuvipanda#10
This reverts commit 18d7fb7.

MANIFEST.in

@@ -1,3 +1 @@
-graft jupyter_desktop_server/share
-graft jupyter_desktop_server/etc
-graft jupyter_desktop_server/templates
+graft jupyter_desktop/share

jupyter_desktop_server/__init__.py → jupyter_desktop/__init__.py

@@ -1,20 +1,17 @@
 import os
 import shlex
 import tempfile
-from notebook.utils import url_path_join as ujoin
-from tornado.web import StaticFileHandler
-from .handlers import DesktopHandler
 
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 
-def setup_vnc():
+def setup_desktop():
     # make a secure temporary directory for sockets
     # This is only readable, writeable & searchable by our uid
     sockets_dir = tempfile.mkdtemp()
     sockets_path = os.path.join(sockets_dir, 'vnc-socket')
 
-    vnc_command = [
+    vnc_command = ' '.join((shlex.quote(p) for p in [
         os.path.join(HERE, 'share/tigervnc/bin/vncserver'),
         '-verbose',
         '-xstartup', os.path.join(HERE, 'share/xstartup'),
@@ -23,7 +20,7 @@ def setup_vnc():
         '-rfbunixpath', sockets_path,
         '-fg',
         ':1',
-    ]
+    ]))
     return {
         'command': [
             'websockify', '-v',
@@ -32,18 +29,10 @@ def setup_vnc():
             '5901',
             '--unix-target', sockets_path,
             '--',
-        ] + vnc_command,
+            '/bin/sh', '-c',
+            f'cd {os.getcwd()} && {vnc_command}'
+        ],
         'port': 5901,
         'timeout': 30,
+        'mappath': {'/': '/vnc_lite.html'},
     }
-
-
-def load_jupyter_server_extension(nbapp):
-    # Set up handlers picked up via config
-    base_url = nbapp.web_app.settings['base_url']
-
-    web_path = os.path.join(HERE, 'share/web')
-    nbapp.web_app.add_handlers('.*', [
-        (ujoin(base_url, 'desktop-server/static/(.*)'), StaticFileHandler, {'path': web_path}),
-        (ujoin(base_url, 'desktop'), DesktopHandler)
-    ])

jupyter_desktop_server/templates/desktop.html → jupyter_desktop/share/web/noVNC-1.1.0/vnc_lite.html

@@ -60,7 +60,7 @@
     </style>
 
     <!-- Promise polyfill for IE11 -->
-    <script src="{{novnc_base_url}}vendor/promise.js"></script>
+    <script src="vendor/promise.js"></script>
 
     <!-- ES2015/ES6 modules polyfill -->
     <script type="module">
@@ -70,7 +70,7 @@
         window.addEventListener("load", function() {
             if (window._noVNC_has_module_support) return;
             const loader = document.createElement("script");
-            loader.src = "{{novnc_base_url}}vendor/browser-es-module-loader/dist/" +
+            loader.src = "vendor/browser-es-module-loader/dist/" +
                 "browser-es-module-loader.js";
             document.head.appendChild(loader);
         });
@@ -79,7 +79,7 @@
     <!-- actual script modules -->
     <script type="module" crossorigin="use-credentials">
         // RFB holds the API to connect and communicate with a VNC server
-        import RFB from '../desktop-server/static/noVNC-1.1.0/core/rfb.js';
+        import RFB from './core/rfb.js';
 
         let rfb;
         let desktopName;
@@ -155,7 +155,7 @@
         let port = readQueryVariable('port', window.location.port);
         const password = readQueryVariable('password', '');
         // MODIFICATION FROM vnc_lite.html
-        const path = readQueryVariable('path', "{{base_url}}vnc/");
+        const path = readQueryVariable('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify');
 
         // | | |         | | |
         // | | | Connect | | |
@@ -174,8 +174,7 @@
         if(port) {
             url += ':' + port;
         }
-        // MODIFICATION FROM vnc_lite
-        url += path;
+        url += '/' + path;
 
         // Creating a new RFB object will start a new connection
         rfb = new RFB(document.getElementById('screen'), url,

setup.py

@@ -7,12 +7,9 @@
     version='0.1.2',
     entry_points={
         'jupyter_serverproxy_servers': [
-            'vnc = jupyter_desktop_server:setup_vnc',
+            'desktop = jupyter_desktop:setup_desktop',
         ]
     },
-    data_files=[
-        ('etc/jupyter/jupyter_notebook_config.d', ['jupyter_desktop_server/etc/jupyter-desktop-server-serverextension.json']),
-    ],
     install_requires=['jupyter-server-proxy>=1.2.0'],
     include_package_data=True,
     zip_safe=False