Merge pull request #1 from ldruschk/fix-asyncsocket

fix AsyncSocket
enowars · Jun 30, 2021 · 9e736a3 · 9e736a3
2 parents 216330d + 5b13a75
commit 9e736a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -71,8 +71,8 @@ Start the checker using
 uvicorn --reload example:checker.app
 ```
 
-And browse to [http://localhost:8000/docs] to explore the web interface, which allows you to send requests to the checker.
+And browse to (http://localhost:8000/docs) to explore the web interface, which allows you to send requests to the checker.
 
 ## Documentation
 
-You can check out the full tutorial at [https://enowars.github.io/docs]
+You can check out the full tutorial at (https://enowars.github.io/docs)
diff --git a/enochecker3/enochecker.py b/enochecker3/enochecker.py
@@ -64,7 +64,7 @@
 TIMEOUT_BUFFER = 2
 
 
-AsyncSocket = Tuple[asyncio.StreamReader, asyncio.StreamWriter]
+AsyncSocket = AsyncIterator[Tuple[asyncio.StreamReader, asyncio.StreamWriter]]
 
 
 class EnocheckerException(Exception):
@@ -325,9 +325,7 @@ def _get_logger_adapter(
         )
 
     @contextlib.asynccontextmanager
-    async def _get_async_socket(
-        self, task: BaseCheckerTaskMessage
-    ) -> AsyncIterator[AsyncSocket]:
+    async def _get_async_socket(self, task: BaseCheckerTaskMessage) -> AsyncSocket:
         try:
             conn = await asyncio.streams.open_connection(
                 task.address, self.service_port

diff --git a/example.py b/example.py
@@ -55,4 +55,4 @@ async def exploit_test(searcher: FlagSearcher, client: AsyncClient) -> Optional[
         return flag
 
 if __name__ == "__main__":
-    checker.run()
+    checker.run()
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="enochecker3",
-    version="0.1.0",
+    version="0.1.1",
     author="ldruschk",
     author_email="[email protected]",
     description="FastAPI based library for building async python checkers for the EnoEngine A/D CTF Framework",