Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

squash

Browse Source
This commit is contained in:
Adam Hopkins
2020-07-14 10:25:56 +03:00
parent eddb5bad91
commit 16d36fc17f
4 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sanic/asgi.py
View File

@@ -1,5 +1,6 @@
import asyncio
import warnings
from inspect import isawaitable
from typing import (
Any,
@@ -15,6 +16,7 @@ from typing import (
from urllib.parse import quote
import sanic.app # noqa
from sanic.compat import Header
from sanic.exceptions import InvalidUsage, ServerError
from sanic.log import logger
@@ -23,6 +25,7 @@ from sanic.response import HTTPResponse, StreamingHTTPResponse
from sanic.server import ConnInfo, StreamBuffer
from sanic.websocket import WebSocketConnection
ASGIScope = MutableMapping[str, Any]
ASGIMessage = MutableMapping[str, Any]
ASGISend = Callable[[ASGIMessage], Awaitable[None]]
@@ -65,7 +68,9 @@ class MockProtocol:
class MockTransport:
_protocol: Optional[MockProtocol]
def __init__(self, scope: ASGIScope, receive: ASGIReceive, send: ASGISend) -> None:
def __init__(
self, scope: ASGIScope, receive: ASGIReceive, send: ASGISend
) -> None:
self.scope = scope
self._receive = receive
self._send = send
@@ -141,7 +146,9 @@ class Lifespan:
) + self.asgi_app.sanic_app.listeners.get("after_server_start", [])
for handler in listeners:
response = handler(self.asgi_app.sanic_app, self.asgi_app.sanic_app.loop)
response = handler(
self.asgi_app.sanic_app, self.asgi_app.sanic_app.loop
)
if isawaitable(response):
await response
@@ -159,7 +166,9 @@ class Lifespan:
) + self.asgi_app.sanic_app.listeners.get("after_server_stop", [])
for handler in listeners:
response = handler(self.asgi_app.sanic_app, self.asgi_app.sanic_app.loop)
response = handler(
self.asgi_app.sanic_app, self.asgi_app.sanic_app.loop
)
if isawaitable(response):
await response
@@ -204,13 +213,19 @@ class ASGIApp:
for key, value in scope.get("headers", [])
]
)
instance.do_stream = True if headers.get("expect") == "100-continue" else False
instance.do_stream = (
True if headers.get("expect") == "100-continue" else False
)
instance.lifespan = Lifespan(instance)
if scope["type"] == "lifespan":
await instance.lifespan(scope, receive, send)
else:
path = scope["path"][1:] if scope["path"].startswith("/") else scope["path"]
path = (
scope["path"][1:]
if scope["path"].startswith("/")
else scope["path"]
)
url = "/".join([scope.get("root_path", ""), quote(path)])
url_bytes = url.encode("latin-1")
url_bytes += b"?" + scope["query_string"]
@@ -233,12 +248,19 @@ class ASGIApp:
request_class = sanic_app.request_class or Request
instance.request = request_class(
url_bytes, headers, version, method, instance.transport, sanic_app,
url_bytes,
headers,
version,
method,
instance.transport,
sanic_app,
)
instance.request.conn_info = ConnInfo(instance.transport)
if sanic_app.is_request_stream:
is_stream_handler = sanic_app.router.is_stream_handler(instance.request)
is_stream_handler = sanic_app.router.is_stream_handler(
instance.request
)
if is_stream_handler:
instance.request.stream = StreamBuffer(
sanic_app.config.REQUEST_BUFFER_QUEUE_SIZE
@@ -317,7 +339,9 @@ class ASGIApp:
type(response),
)
exception = ServerError("Invalid response type")
response = self.sanic_app.error_handler.response(self.request, exception)
response = self.sanic_app.error_handler.response(
self.request, exception
)
headers = [
(str(name).encode("latin-1"), str(value).encode("latin-1"))
for name, value in response.headers.items()
@@ -327,10 +351,14 @@ class ASGIApp:
if "content-length" not in response.headers and not isinstance(
response, StreamingHTTPResponse
):
headers += [(b"content-length", str(len(response.body)).encode("latin-1"))]
headers += [
(b"content-length", str(len(response.body)).encode("latin-1"))
]
if "content-type" not in response.headers:
headers += [(b"content-type", str(response.content_type).encode("latin-1"))]
headers += [
(b"content-type", str(response.content_type).encode("latin-1"))
]
if response.cookies:
cookies.update(
@@ -342,7 +370,8 @@ class ASGIApp:
)
headers += [
(b"set-cookie", cookie.encode("utf-8")) for k, cookie in cookies.items()
(b"set-cookie", cookie.encode("utf-8"))
for k, cookie in cookies.items()
]
await self.transport.send(

12
sanic/testing.py
View File

@@ -95,7 +95,9 @@ class SanicTestClient:
@self.app.exception(MethodNotSupported)
async def error_handler(request, exception):
if request.method in ["HEAD", "PATCH", "PUT", "DELETE"]:
return text("", exception.status_code, headers=exception.headers)
return text(
"", exception.status_code, headers=exception.headers
)
else:
return self.app.error_handler.default(request, exception)
@@ -111,7 +113,9 @@ class SanicTestClient:
host, port = sock.getsockname()
self.port = port
if uri.startswith(("http:", "https:", "ftp:", "ftps://", "//", "ws:", "wss:")):
if uri.startswith(
("http:", "https:", "ftp:", "ftps://", "//", "ws:", "wss:")
):
url = uri
else:
uri = uri if uri.startswith("/") else f"/{uri}"
@@ -243,7 +247,9 @@ class SanicASGITestClient(httpx.AsyncClient):
headers.setdefault("sec-websocket-key", "testserver==")
headers.setdefault("sec-websocket-version", "13")
if subprotocols is not None:
headers.setdefault("sec-websocket-protocol", ", ".join(subprotocols))
headers.setdefault(
"sec-websocket-protocol", ", ".join(subprotocols)
)
scope = {
"type": "websocket",