fix example, fix server (#2)

example/__main__.py

@@ -0,0 +1,14 @@
+import sys
+
+from example import client, server
+
+if __name__ == "__main__":
+    if len(sys.argv) == 2:
+        if sys.argv[1] == "client":
+            client.run()
+            exit(0)
+        elif sys.argv[1] == "server":
+            server.run()
+            exit(0)
+    print("Usage: python -m example [client|server]")
+    exit(-1)

example/client.py

@@ -1,4 +1,5 @@
 import asyncio
+from concurrent.futures import ThreadPoolExecutor
 
 from example.events import Message
 from socketapp import Client
@@ -7,7 +8,9 @@
 async def send(client: Client) -> None:
     await client.wait_until_ready()
     while True:
-        await client.send(Message(data="hi"), client.clients)
+        with ThreadPoolExecutor(1, "AsyncInput") as executor:
+            inp = await asyncio.get_event_loop().run_in_executor(executor, input)
+        await client.send(Message(data=inp), client.clients)
         await asyncio.sleep(1)
 
 
@@ -16,8 +19,9 @@ async def main(client: Client) -> None:
     await client.run()
 
 
-try:
-    client = Client()
-    asyncio.run(main(client))
-finally:
-    client.stop()
+def run() -> None:
+    try:
+        client = Client()
+        asyncio.run(main(client))
+    finally:
+        client.stop()

example/server.py

@@ -3,4 +3,6 @@
 from example import events  # noqa
 from socketapp import Server
 
-asyncio.run(Server().run())
+
+def run() -> None:
+    asyncio.run(Server().run())

socketapp/server.py

@@ -24,20 +24,21 @@ def __init__(
 
         self.clients: dict[int, WebSocketServerProtocol] = {}
 
-        self.future: asyncio.Future[None] = asyncio.Future()
+        self.future: asyncio.Future[None] | None = None
 
     async def run(self) -> None:
         asyncio.get_event_loop().add_signal_handler(signal.SIGINT, self.stop)
 
-        if self.future.done():
+        if not self.future or self.future.done():
             self.future = asyncio.Future()
 
         asyncio.create_task(self._broadcast_clients())
         async with serve(self._serve, self.host, self.port):
             await self.future
 
     def stop(self) -> None:
-        self.future.set_result(None)
+        if self.future and not self.future.done():
+            self.future.set_result(None)
 
     async def _handshake(self, ws: WebSocketServerProtocol) -> int | None:
         init = await ws.recv()