Apply suggestions from #1229

2025-08-02 11:10:18 +03:00 · 2019-08-01 19:14:15 +02:00 · 2019-08-01 19:14:15 +02:00 · 1be54035e8
commit 1be54035e8
parent c61a5c8fc6
1 changed files with 93 additions and 54 deletions
--- a/telethon_examples/quart_login.py
+++ b/telethon_examples/quart_login.py
@ -1,38 +1,11 @@
 import base64
 import os

-from quart import Quart, render_template_string, request, session
+import hypercorn.asyncio
+from quart import Quart, render_template_string, request

 from telethon import TelegramClient, utils

-BASE_TEMPLATE = """
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title>Telethon + Quart</title>
-    </head>
-    <body>{{ content | safe }}</body>
-</html>
-"""
-
-PHONE_FORM = """
-<form action="/" method="post">
-    Phone (international format): <input name="phone" type="text" placeholder="+34600000000">
-    <input type="submit">
-</form>
-"""
-
-CODE_FORM = """
-<form action="/" method="post">
-    Telegram code: <input name="code" type="text" placeholder="70707">
-    <input type="submit">
-</form>
-"""
-
-app = Quart(__name__)
-app.secret_key = "CHANGE THIS TO SOMETHING SECRET"
-

 def get_env(name, message):
    if name in os.environ:
@ -40,11 +13,45 @@ def get_env(name, message):
    return input(message)


+BASE_TEMPLATE = '''
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset='UTF-8'>
+        <title>Telethon + Quart</title>
+    </head>
+    <body>{{ content | safe }}</body>
+</html>
+'''
+
+PHONE_FORM = '''
+<form action='/' method='post'>
+    Phone (international format): <input name='phone' type='text' placeholder='+34600000000'>
+    <input type='submit'>
+</form>
+'''
+
+CODE_FORM = '''
+<form action='/' method='post'>
+    Telegram code: <input name='code' type='text' placeholder='70707'>
+    <input type='submit'>
+</form>
+'''
+
 # Session name, API ID and hash to use; loaded from environmental variables
 SESSION = os.environ.get('TG_SESSION', 'quart')
 API_ID = int(get_env('TG_API_ID', 'Enter your API ID: '))
 API_HASH = get_env('TG_API_HASH', 'Enter your API hash: ')

+# Telethon client
+client = TelegramClient(SESSION, API_ID, API_HASH)
+client.parse_mode = 'html'  # <- Render things nicely
+phone = None
+
+# Quart app
+app = Quart(__name__)
+app.secret_key = 'CHANGE THIS TO SOMETHING SECRET'
+

 # Helper method to format messages nicely
 async def format_message(message):
@ -64,36 +71,68 @@ async def format_message(message):
    )


-@app.route('/', methods=['GET', 'POST'])
-async def root():
-    client = TelegramClient(SESSION, API_ID, API_HASH)
+# Connect the client before we start serving with Quart
+@app.before_serving
+async def startup():
    await client.connect()

-    if request.method == "POST":
-        form = await request.form
-        if 'phone' in form:
-            session["phone"] = form["phone"]
-            await client.send_code_request(form["phone"])

-        if 'code' in form:
-            session["code"] = form["code"]
+# After we're done serving (near shutdown), clean up the client
+@app.after_serving
+async def cleanup():
+    await client.disconnect()

-    if "phone" not in session:
+
+@app.route('/', methods=['GET', 'POST'])
+async def root():
+    # We want to update the global phone variable to remember it
+    global phone
+
+    # Check form parameters (phone/code)
+    form = await request.form
+    if 'phone' in form:
+        phone = form['phone']
+        await client.send_code_request(phone)
+
+    if 'code' in form:
+        await client.sign_in(code=form['code'])
+
+    # If we're logged in, show them some messages from their first dialog
+    if await client.is_user_authorized():
+        # They are logged in, show them some messages from their first dialog
+        dialog = (await client.get_dialogs())[0]
+        result = '<h1>{}</h1>'.format(dialog.title)
+        async for m in client.iter_messages(dialog, 10):
+            result += await(format_message(m))
+
+        return await render_template_string(BASE_TEMPLATE, content=result)
+
+    # Ask for the phone if we don't know it yet
+    if phone is None:
        return await render_template_string(BASE_TEMPLATE, content=PHONE_FORM)

-    if "code" not in session:
-        return await render_template_string(BASE_TEMPLATE, content=CODE_FORM)
-
-    await client.sign_in(code=session["code"])
-    # They are logged in, show them some messages from their first dialog
-    dialog = (await client.get_dialogs())[0]
-    result = '<h1>{}</h1>'.format(dialog.title)
-    async for m in client.iter_messages(dialog, 10):
-        result += await(format_message(m))
-
-    await client.disconnect()
-    return await render_template_string(BASE_TEMPLATE, content=result)
+    # We have the phone, but we're not logged in, so ask for the code
+    return await render_template_string(BASE_TEMPLATE, content=CODE_FORM)


-if __name__ == "__main__":
-    app.run()
+async def main():
+    await hypercorn.asyncio.serve(app, hypercorn.Config())
+
+
+# By default, `Quart.run` uses `asyncio.run()`, which creates a new asyncio
+# event loop. If we create the `TelegramClient` before, `telethon` will
+# use `asyncio.get_event_loop()`, which is the implicit loop in the main
+# thread. These two loops are different, and it won't work.
+#
+# So, we have to manually pass the same `loop` to both applications to
+# make 100% sure it works and to avoid headaches.
+#
+# To run Quart inside `async def`, we must use `hypercorn.asyncio.serve()`
+# directly.
+#
+# This example creates a global client outside of Quart handlers.
+# If you create the client inside the handlers (common case), you
+# won't have to worry about any of this, but it's still good to be
+# explicit about the event loop.
+if __name__ == '__main__':
+    client.loop.run_until_complete(main())