[examples] use asyncio.run() to run main entry point

examples/doq_client.py

@@ -64,7 +64,7 @@ def save_session_ticket(ticket):
             pickle.dump(ticket, fp)
 
 
-async def run(
+async def main(
     configuration: QuicConfiguration,
     host: str,
     port: int,
@@ -155,9 +155,8 @@ async def run(
     else:
         logger.debug("No session ticket defined...")
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        run(
+    asyncio.run(
+        main(
             configuration=configuration,
             host=args.host,
             port=args.port,

examples/doq_server.py

@@ -43,6 +43,25 @@ def pop(self, label: bytes) -> Optional[SessionTicket]:
         return self.tickets.pop(label, None)
 
 
+async def main(
+    host: str,
+    port: int,
+    configuration: QuicConfiguration,
+    session_ticket_store: SessionTicketStore,
+    retry: bool,
+) -> None:
+    await serve(
+        args.host,
+        args.port,
+        configuration=configuration,
+        create_protocol=DnsServerProtocol,
+        session_ticket_fetcher=session_ticket_store.pop,
+        session_ticket_handler=session_ticket_store.add,
+        retry=args.retry,
+    )
+    await asyncio.Future()
+
+
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description="DNS over QUIC server")
@@ -99,6 +118,7 @@ def pop(self, label: bytes) -> Optional[SessionTicket]:
         level=logging.DEBUG if args.verbose else logging.INFO,
     )
 
+    # create QUIC logger
     if args.quic_log:
         quic_logger = QuicFileLogger(args.quic_log)
     else:
@@ -112,21 +132,15 @@ def pop(self, label: bytes) -> Optional[SessionTicket]:
 
     configuration.load_cert_chain(args.certificate, args.private_key)
 
-    ticket_store = SessionTicketStore()
-
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        serve(
-            args.host,
-            args.port,
-            configuration=configuration,
-            create_protocol=DnsServerProtocol,
-            session_ticket_fetcher=ticket_store.pop,
-            session_ticket_handler=ticket_store.add,
-            retry=args.retry,
-        )
-    )
     try:
-        loop.run_forever()
+        asyncio.run(
+            main(
+                host=args.host,
+                port=args.port,
+                configuration=configuration,
+                session_ticket_store=SessionTicketStore(),
+                retry=args.retry,
+            )
+        )
     except KeyboardInterrupt:
         pass

examples/http3_client.py

@@ -345,7 +345,7 @@ def save_session_ticket(ticket: SessionTicket) -> None:
             pickle.dump(ticket, fp)
 
 
-async def run(
+async def main(
     configuration: QuicConfiguration,
     urls: List[str],
     data: Optional[str],
@@ -544,9 +544,8 @@ async def run(
 
     if uvloop is not None:
         uvloop.install()
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        run(
+    asyncio.run(
+        main(
             configuration=configuration,
             urls=args.url,
             data=args.data,

examples/http3_server.py

@@ -476,6 +476,25 @@ def pop(self, label: bytes) -> Optional[SessionTicket]:
         return self.tickets.pop(label, None)
 
 
+async def main(
+    host: str,
+    port: int,
+    configuration: QuicConfiguration,
+    session_ticket_store: SessionTicketStore,
+    retry: bool,
+) -> None:
+    await serve(
+        args.host,
+        args.port,
+        configuration=configuration,
+        create_protocol=HttpServerProtocol,
+        session_ticket_fetcher=session_ticket_store.pop,
+        session_ticket_handler=session_ticket_store.add,
+        retry=args.retry,
+    )
+    await asyncio.Future()
+
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="QUIC server")
     parser.add_argument(
@@ -565,23 +584,18 @@ def pop(self, label: bytes) -> Optional[SessionTicket]:
     # load SSL certificate and key
     configuration.load_cert_chain(args.certificate, args.private_key)
 
-    ticket_store = SessionTicketStore()
-
     if uvloop is not None:
         uvloop.install()
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        serve(
-            args.host,
-            args.port,
-            configuration=configuration,
-            create_protocol=HttpServerProtocol,
-            session_ticket_fetcher=ticket_store.pop,
-            session_ticket_handler=ticket_store.add,
-            retry=args.retry,
-        )
-    )
+
     try:
-        loop.run_forever()
+        asyncio.run(
+            main(
+                host=args.host,
+                port=args.port,
+                configuration=configuration,
+                session_ticket_store=SessionTicketStore(),
+                retry=args.retry,
+            )
+        )
     except KeyboardInterrupt:
         pass

examples/httpx_client.py

@@ -150,7 +150,7 @@ def save_session_ticket(ticket):
             pickle.dump(ticket, fp)
 
 
-async def run(
+async def main(
     configuration: QuicConfiguration,
     url: str,
     data: str,
@@ -287,9 +287,8 @@ async def run(
         except FileNotFoundError:
             pass
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        run(
+    asyncio.run(
+        main(
             configuration=configuration,
             url=args.url,
             data=args.data,

examples/interop.py

@@ -349,6 +349,7 @@ async def test_nat_rebinding(server: Server, configuration: QuicConfiguration):
 
         # replace transport
         protocol._transport.close()
+        loop = asyncio.get_event_loop()
         await loop.create_datagram_endpoint(lambda: protocol, local_addr=("::", 0))
 
         # cause more traffic
@@ -379,6 +380,7 @@ async def test_address_mobility(server: Server, configuration: QuicConfiguration
 
         # replace transport
         protocol._transport.close()
+        loop = asyncio.get_event_loop()
         await loop.create_datagram_endpoint(lambda: protocol, local_addr=("::", 0))
 
         # change connection ID
@@ -480,7 +482,7 @@ def print_result(server: Server) -> None:
     print("%s%s%s" % (server.name, " " * (20 - len(server.name)), result))
 
 
-async def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:
+async def main(servers, tests, quic_log=False, secrets_log_file=None) -> None:
     for server in servers:
         if server.structured_logging:
             server.result |= Result.L
@@ -557,9 +559,8 @@ async def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:
     if args.test:
         tests = list(filter(lambda x: x[0] == args.test, tests))
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        run(
+    asyncio.run(
+        main(
             servers=servers,
             tests=tests,
             quic_log=args.quic_log,

examples/siduck_client.py

@@ -36,7 +36,7 @@ def quic_event_received(self, event: QuicEvent) -> None:
                 waiter.set_result(None)
 
 
-async def run(configuration: QuicConfiguration, host: str, port: int) -> None:
+async def main(configuration: QuicConfiguration, host: str, port: int) -> None:
     async with connect(
         host, port, configuration=configuration, create_protocol=SiduckClient
     ) as client:
@@ -91,7 +91,10 @@ async def run(configuration: QuicConfiguration, host: str, port: int) -> None:
     if args.secrets_log:
         configuration.secrets_log_file = open(args.secrets_log, "a")
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(
-        run(configuration=configuration, host=args.host, port=args.port)
+    asyncio.run(
+        main(
+            configuration=configuration,
+            host=args.host,
+            port=args.port,
+        )
     )