optimization to static file serving

miguelgrinberg · Jun 3, 2019 · 5b87010 · 5b87010
1 parent 7709b8c
commit 5b87010
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/engineio/async_drivers/asgi.py b/engineio/async_drivers/asgi.py
@@ -46,7 +46,7 @@ async def __call__(self, scope, receive, send):
             await self.engineio_server.handle_request(scope, receive, send)
         else:
             static_file = get_static_file(scope['path'], self.static_files) \
-                if scope['type'] == 'http' else None
+                if scope['type'] == 'http' and self.static_files else None
             if static_file:
                 await self.serve_static_file(static_file, receive, send)
             elif self.other_asgi_app is not None:

diff --git a/engineio/middleware.py b/engineio/middleware.py
@@ -59,7 +59,8 @@ def get_socket(self):
                 path.startswith('/{0}/'.format(self.engineio_path)):
             return self.engineio_app.handle_request(environ, start_response)
         else:
-            static_file = get_static_file(path, self.static_files)
+            static_file = get_static_file(path, self.static_files) \
+                if self.static_files else None
             if static_file:
                 if os.path.exists(static_file['filename']):
                     start_response(

diff --git a/tests/asyncio/test_async_asgi.py b/tests/asyncio/test_async_asgi.py
@@ -85,6 +85,8 @@ def check_path(path, status_code, content_type, body):
         check_path('/static/foo.bar', 404, 'text/plain', 'Not Found')
         check_path('/static/test/index.html', 200, 'text/html',
                    '<html></html>\n')
+        check_path('/bar/foo', 404, 'text/plain', 'Not Found')
+        check_path('', 404, 'text/plain', 'Not Found')
 
         app.static_files[''] = 'index.html'
         check_path('/static/test/', 200, 'text/html',
@@ -102,6 +104,9 @@ def check_path(path, status_code, content_type, body):
         app.static_files[''] = {'filename': 'test.gif'}
         check_path('/static/test/', 404, 'text/plain', 'Not Found')
 
+        app.static_files = {}
+        check_path('/static/test/index.html', 404, 'text/plain', 'Not Found')
+
     def test_lifespan_startup(self):
         app = async_asgi.ASGIApp('eio')
         scope = {'type': 'lifespan'}

diff --git a/tests/common/test_middleware.py b/tests/common/test_middleware.py
@@ -57,8 +57,9 @@ def check_path(path, status_code, content_type, body):
                    'Not Found')
         check_path('/static/test/index.html', '200 OK', 'text/html',
                    '<html></html>\n')
-        check_path('/static/test/', '200 OK', 'text/html',
-                   '<html></html>\n')
+        check_path('/static/test/', '200 OK', 'text/html', '<html></html>\n')
+        check_path('/bar/foo', '404 Not Found', 'text/plain', 'Not Found')
+        check_path('', '404 Not Found', 'text/plain', 'Not Found')
 
         m.static_files[''] = 'index.html'
         check_path('/static/test/', '200 OK', 'text/html',
@@ -77,6 +78,10 @@ def check_path(path, status_code, content_type, body):
         check_path('/static/test/', '404 Not Found', 'text/plain',
                    'Not Found')
 
+        m.static_files = {}
+        check_path('/static/test/index.html', '404 Not Found', 'text/plain',
+                   'Not Found')
+
     def test_404(self):
         mock_wsgi_app = None
         mock_eio_app = mock.Mock()