fix bugs

lib/connection/requester.py

@@ -278,14 +278,13 @@ def __init__(self):
         super().__init__()
 
         transport = httpx.AsyncHTTPTransport(
-            # FIXME: max_connections != thread_count
+            verify=False,
+            cert=self._cert,
             limits=httpx.Limits(max_connections=options["thread_count"]),
             socket_options=self._socket_options,
         )
 
         self.session = httpx.AsyncClient(
-            verify=False,
-            cert=self._cert,
             mounts={"http://": transport, "https://": transport},
             timeout=httpx.Timeout(options["timeout"]),
         )

lib/controller/controller.py

@@ -305,20 +305,20 @@ def start(self):
 
     async def _start_coroutines(self):
         task = self.loop.create_task(self.fuzzer.start())
-        done, _ = await asyncio.wait(
-            [self.done_future, task],
-            timeout=options["max_time"] if options["max_time"] > 0 else None,
-            return_when=asyncio.FIRST_COMPLETED,
-        )
+        max_time = options["max_time"] if options["max_time"] > 0 else None
+        try:
+            async with asyncio.timeout(max_time):
+                await asyncio.wait(
+                    [self.done_future, task],
+                    return_when=asyncio.FIRST_COMPLETED,
+                )
+        except asyncio.TimeoutError:
+            raise SkipTargetInterrupt("Runtime exceeded the maximum set by the user")
 
         if self.done_future.done():
             task.cancel()
             await self.done_future  # propagate the exception, if raised
 
-        # TODO: find a better way to catch TimeoutError
-        if len(done) == 0:
-            raise SkipTargetInterrupt("Runtime exceeded the maximum set by the user")
-
     def set_target(self, url):
         # If no scheme specified, unset it first
         if "://" not in url: