kopia lustrzana https://github.com/cirospaciari/socketify.py
added ASGI lifespan support
Ciro
rodzic
a8c44eac7f
commit
2a41f6f995
|
|
@ -5,6 +5,7 @@ from .socketify import (
|
|||
OpCode,
|
||||
SendStatus,
|
||||
CompressOptions,
|
||||
Loop
|
||||
)
|
||||
from .asgi import (
|
||||
ASGI
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from socketify import App, OpCode
|
||||
from socketify import App, OpCode, Loop
|
||||
from queue import SimpleQueue
|
||||
from .native import lib, ffi
|
||||
from .tasks import create_task, create_task_with_factory
|
||||
|
|
@ -7,6 +7,7 @@ import platform
|
|||
import sys
|
||||
import logging
|
||||
import uuid
|
||||
import asyncio
|
||||
is_pypy = platform.python_implementation() == "PyPy"
|
||||
async def task_wrapper(task):
|
||||
try:
|
||||
|
|
@ -613,8 +614,86 @@ class _ASGI:
|
|||
return self
|
||||
|
||||
def run(self):
|
||||
# scope = {"type": "lifespan", "asgi": {"version": "3.0", "spec_version": "2.3"}}
|
||||
self.server.run() # run app on the main process too :)
|
||||
scope = {"type": "lifespan", "asgi": {"version": "3.0", "spec_version": "2.3"}}
|
||||
|
||||
lifespan_loop = Loop(lambda loop, error, response: logging.error("Uncaught Exception: %s" % str(error)))
|
||||
is_starting = True
|
||||
is_stopped = False
|
||||
status = 0 # 0 starting, 1 ok, 2 error, 3 stoping, 4 stopped, 5 stopped with error, 6 no lifespan
|
||||
status_message = ""
|
||||
stop_future = lifespan_loop.create_future()
|
||||
async def send(options):
|
||||
nonlocal status, status_message, is_stopped
|
||||
type = options["type"]
|
||||
status_message = options.get("message", "")
|
||||
if type == "lifespan.startup.complete":
|
||||
status = 1
|
||||
elif type == "lifespan.startup.failed":
|
||||
is_stopped = True
|
||||
status = 2
|
||||
elif type == "lifespan.shutdown.complete":
|
||||
is_stopped = True
|
||||
status = 4
|
||||
elif type == "lifespan.shutdown.failed":
|
||||
is_stopped = True
|
||||
status = 5
|
||||
|
||||
async def receive():
|
||||
nonlocal is_starting, is_stopped
|
||||
while not is_stopped:
|
||||
if is_starting:
|
||||
is_starting = False
|
||||
return {
|
||||
"type": "lifespan.startup",
|
||||
"asgi": {"version": "3.0", "spec_version": "2.3"},
|
||||
}
|
||||
return await stop_future
|
||||
|
||||
async def task_wrapper(task):
|
||||
nonlocal status
|
||||
try:
|
||||
return await task
|
||||
except Exception as error:
|
||||
try:
|
||||
# just log in console the error to call attention
|
||||
logging.error("Uncaught Exception: %s" % str(error))
|
||||
status = 6 # no more lifespan
|
||||
finally:
|
||||
return None
|
||||
|
||||
# start lifespan
|
||||
lifespan_loop.ensure_future(task_wrapper(self.app(scope, receive, send)))
|
||||
|
||||
# run until start or fail
|
||||
while status == 0:
|
||||
lifespan_loop.run_once()
|
||||
|
||||
# failed to start
|
||||
if status == 2:
|
||||
logging.error("Startup failed: %s" % str(status_message))
|
||||
return self
|
||||
|
||||
# run app
|
||||
self.server.run()
|
||||
|
||||
# no more lifespan events
|
||||
if status == 6:
|
||||
return self
|
||||
|
||||
# signal stop
|
||||
status = 3
|
||||
stop_future.set_result({
|
||||
"type": "lifespan.shutdown",
|
||||
"asgi": {"version": "3.0", "spec_version": "2.3"},
|
||||
})
|
||||
|
||||
# run until end or fail
|
||||
while status == 3:
|
||||
lifespan_loop.run_once()
|
||||
|
||||
# failed to stop
|
||||
if status == 5:
|
||||
logging.error("Shutdown failed: %s" % str(status_message))
|
||||
return self
|
||||
|
||||
def __del__(self):
|
||||
|
|
@ -666,7 +745,7 @@ class ASGI:
|
|||
run_task()
|
||||
|
||||
# fork limiting the cpu count - 1
|
||||
for i in range(1, workers):
|
||||
for _ in range(1, workers):
|
||||
create_fork()
|
||||
|
||||
run_task() # run app on the main process too :)
|
||||
|
|
|
|||
|
|
@ -79,6 +79,18 @@ class Loop:
|
|||
def ensure_future(self, task):
|
||||
return asyncio.ensure_future(task, loop=self.loop)
|
||||
|
||||
def run_until_complete(self, task=None):
|
||||
self.started = True
|
||||
if task is not None:
|
||||
future = self.ensure_future(task)
|
||||
else:
|
||||
future = None
|
||||
self.loop.call_soon(self._keep_alive)
|
||||
self.loop.run_until_complete()
|
||||
# clean up uvloop
|
||||
self.uv_loop.stop()
|
||||
return future
|
||||
|
||||
def run(self, task=None):
|
||||
self.started = True
|
||||
if task is not None:
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@ def uws_generic_listen_handler(listen_socket, config, user_data):
|
|||
else AppListenOptions(
|
||||
port=int(config.port),
|
||||
host=None
|
||||
if config.host == ffi.NULL
|
||||
if config.host == ffi.NULL or listen_socket == ffi.NULL
|
||||
else ffi.string(config.host).decode("utf8"),
|
||||
options=int(config.options),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ class RequestTask:
|
|||
|
||||
def __del__(self):
|
||||
|
||||
if self._state == _PENDING and self._log_destroy_pending:
|
||||
if self._state == _PENDING and self._log_destroy_pending and self._loop:
|
||||
context = {
|
||||
"task": self,
|
||||
"message": "Task was destroyed but it is pending!",
|
||||
|
|
|
|||
122
src/tests.py
122
src/tests.py
|
|
@ -1,55 +1,89 @@
|
|||
# https://github.com/Tinche/aiofiles
|
||||
# https://github.com/uNetworking/uWebSockets/issues/1426
|
||||
from socketify.template import *
|
||||
|
||||
# import os.path
|
||||
# https://github.com/chtd/psycopg2cffi/
|
||||
# https://github.com/tlocke/pg8000
|
||||
# https://www.psycopg.org/docs/advanced.html#asynchronous-support (works in cffi version too)
|
||||
# https://github.com/sass/libsass-python
|
||||
|
||||
# DLL_EXPORT typedef void (*uws_listen_domain_handler)(struct us_listen_socket_t *listen_socket, const char* domain, size_t domain_length, int options, void *user_data);
|
||||
# DLL_EXPORT typedef void (*uws_filter_handler)(uws_res_t *response, int, void *user_data);
|
||||
# @memo() # generate an static string after first execution aka skipping re-rendering when props are unchanged
|
||||
# def title(message):
|
||||
# return h1(message, classes="title-light")
|
||||
|
||||
# DLL_EXPORT void uws_app_listen_domain(int ssl, uws_app_t *app, const char *domain,size_t server_name_length,_listen_domain_handler handler, void *user_data);
|
||||
# DLL_EXPORT void uws_app_listen_domain_with_options(int ssl, uws_app_t *app, const char *domain,size_t servere_length, int options, uws_listen_domain_handler handler, void *user_data);
|
||||
# DLL_EXPORT void uws_app_domain(int ssl, uws_app_t *app, const char* server_name, size_t server_name_length);
|
||||
# DLL_EXPORT void uws_filter(int ssl, uws_app_t *app, uws_filter_handler handler, void *user_data);
|
||||
# @memo(maxsize=128)
|
||||
def htemplate(message, left_message, right_message):
|
||||
|
||||
return (
|
||||
h1(message),
|
||||
span(
|
||||
children=(
|
||||
span(left_message, classes=("text-light", "align-left")),
|
||||
span(right_message, classes=("text-light", "align-right")),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
from socketify import App, AppOptions, OpCode, CompressOptions
|
||||
import asyncio
|
||||
# <!DOCTYPE html>
|
||||
# <html lang="en">
|
||||
# <head>
|
||||
# <meta charset="UTF-8">
|
||||
# <meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
# <meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
# <title>Document</title>
|
||||
# </head>
|
||||
# <body>
|
||||
# </body>
|
||||
# </html>
|
||||
def html5():
|
||||
return (
|
||||
doctype(),
|
||||
html(lang="en", children=(
|
||||
head(children=(
|
||||
# meta(charset="UTF-8")
|
||||
# meta(http_equiv="X-UA-Compatible",content="IE=edge")
|
||||
# meta(name="vieport",content="width=device-width, initial-scale=1.0")
|
||||
title("Document")
|
||||
)),
|
||||
body()
|
||||
))
|
||||
)
|
||||
|
||||
# print(render_tostring(html5()))
|
||||
# from mako.template import Template
|
||||
|
||||
def ws_open(ws):
|
||||
print("A WebSocket got connected!")
|
||||
ws.send("Hello World!", OpCode.TEXT)
|
||||
# template = Template(
|
||||
# "<h1>${message}</h1><span><span classes=\"text-light align-left\">${left_message}</span><span classes=\"text-light align-right\">${right_message}</span></span>"
|
||||
# )
|
||||
|
||||
# from jinja2 import Environment, BaseLoader
|
||||
# rtemplate = Environment(loader=BaseLoader()).from_string("<h1>{{ message }}</h1><span><span classes=\"text-light align-left\">{{ left_message }}</span><span classes=\"text-light align-right\">{{ right_message }}</span></span>")
|
||||
|
||||
def ws_message(ws, message, opcode):
|
||||
print(message, opcode)
|
||||
# Ok is false if backpressure was built up, wait for drain
|
||||
ok = ws.send(message, opcode)
|
||||
# print(
|
||||
# render_tostring(htemplate(
|
||||
# message="Hello, World!",
|
||||
# left_message="Text in Left",
|
||||
# right_message="Text in Right",
|
||||
# ))
|
||||
# )
|
||||
# print(
|
||||
# render_tostring(htemplate(
|
||||
# message="Hello, World!",
|
||||
# left_message="Text in Left",
|
||||
# right_message="Text in Right",
|
||||
# ))
|
||||
# )
|
||||
|
||||
# for i in range(1_000_000):
|
||||
# render_tostring(htemplate(message="Hello, World!", left_message="Text in Left", right_message="Text in Right"))
|
||||
# template.render(message="Hello, World!", left_message="Text in Left", right_message="Text in Right")
|
||||
# rtemplate.render(message="Hello, World!", left_message="Text in Left", right_message="Text in Right")
|
||||
|
||||
async def ws_upgrade(res, req, socket_context):
|
||||
key = req.get_header("sec-websocket-key")
|
||||
protocol = req.get_header("sec-websocket-protocol")
|
||||
extensions = req.get_header("sec-websocket-extensions")
|
||||
await asyncio.sleep(2)
|
||||
res.upgrade(key, protocol, extensions, socket_context)
|
||||
|
||||
|
||||
app = App()
|
||||
app.ws(
|
||||
"/*",
|
||||
{
|
||||
"compression": CompressOptions.SHARED_COMPRESSOR,
|
||||
"max_payload_length": 16 * 1024 * 1024,
|
||||
"idle_timeout": 12,
|
||||
"open": ws_open,
|
||||
"message": ws_message,
|
||||
"upgrade": ws_upgrade,
|
||||
},
|
||||
)
|
||||
app.any("/", lambda res, req: res.end("Nothing to see here!"))
|
||||
app.listen(
|
||||
3000,
|
||||
lambda config: print("Listening on port http://localhost:%d now\n" % (config.port)),
|
||||
)
|
||||
app.run()
|
||||
# print(
|
||||
# render(
|
||||
# html(
|
||||
# message="Hello, World!",
|
||||
# left_message="Text in Left",
|
||||
# right_message="Text in Right",
|
||||
# )
|
||||
# )
|
||||
# )
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue