Fix routing for custom bottles

PR #203 added the ability for users to pass a custom Bottle instance to
Eel, which was intended to help them add middleware. Unfortunately, the
custom app instance has no routing set up and so fundamentally fails to
support Eel's functionality.

This patch applies the functions that handle routing to any custom
bottles before handing off off to bottle to run the server.

Fix #211

Author: samuelhwilliams

eel/__init__.py

@@ -138,12 +138,18 @@ def run_lambda():
             HOST = '0.0.0.0'
         else:
             HOST = _start_args['host']
+
+        app = _start_args.get('app', btl.default_app)  # type: btl.Bottle
+        for route_path, route_params in BOTTLE_ROUTES.items():
+            route_func, route_kwargs = route_params
+            app.route(path=route_path, callback=route_func, **route_kwargs)
+
         return btl.run(
             host=HOST,
             port=_start_args['port'],
             server=wbs.GeventWebSocketServer,
             quiet=True,
-            app=_start_args.get('app'))
+            app=app)
 
     # Start the webserver
     if _start_args['block']:
@@ -165,7 +171,6 @@ def spawn(function, *args, **kwargs):
 
 # Bottle Routes
 
-@btl.route('/eel.js')
 def _eel():
     start_geometry = {'default': {'size': _start_args['size'],
                                   'position': _start_args['position']},
@@ -179,8 +184,6 @@ def _eel():
     _set_response_headers(btl.response)
     return page
 
-
-@btl.route('/<path:path>')
 def _static(path):
     response = None
     if 'jinja_env' in _start_args and 'jinja_templates' in _start_args:
@@ -196,8 +199,6 @@ def _static(path):
     _set_response_headers(response)
     return response
 
-
-@btl.get('/eel', apply=[wbs.websocket])
 def _websocket(ws):
     global _websockets
 
@@ -223,6 +224,13 @@ def _websocket(ws):
 
     _websocket_close(page)
 
+
+BOTTLE_ROUTES = {
+    "/eel.js": (_eel, dict()),
+    "/<path:path>": (_static, dict()),
+    "/eel": (_websocket, dict(apply=[wbs.websocket]))
+}
+
 # Private functions
 
 def _safe_json(obj):