Add HTTP client to reuse the aiohttp session where needed.

Remove unnecessary aiohttp exceptions.

gns3server/endpoints/controller/links.py

@@ -19,8 +19,8 @@
 API endpoints for links.
 """
 
-import aiohttp
 import multidict
+import aiohttp
 
 from fastapi import APIRouter, Depends, Request, status
 from fastapi.responses import StreamingResponse
@@ -31,9 +31,13 @@ from uuid import UUID
 from gns3server.controller import Controller
 from gns3server.controller.controller_error import ControllerError
 from gns3server.controller.link import Link
+from gns3server.utils.http_client import HTTPClient
 from gns3server.endpoints.schemas.common import ErrorMessage
 from gns3server.endpoints import schemas
 
+import logging
+log = logging.getLogger(__name__)
+
 router = APIRouter()
 
 responses = {
@@ -201,12 +205,13 @@ async def pcap(request: Request, link: Link = Depends(dep_link)):
 
     async def compute_pcap_stream():
 
-        connector = aiohttp.TCPConnector(limit=None, force_close=True)
-        async with aiohttp.ClientSession(connector=connector, headers=headers) as session:
-            async with session.request(request.method, pcap_streaming_url, timeout=None, data=body) as compute_response:
-                async for data in compute_response.content.iter_any():
+        try:
+            async with HTTPClient.request(request.method, pcap_streaming_url, timeout=None, data=body) as response:
+                async for data in response.content.iter_any():
                     if not data:
                         break
                     yield data
+        except aiohttp.ClientError as e:
+            raise ControllerError(f"Client error received when receiving pcap stream from compute: {e}")
 
     return StreamingResponse(compute_pcap_stream(), media_type="application/vnd.tcpdump.pcap")

gns3server/endpoints/controller/nodes.py

@@ -32,6 +32,7 @@ from gns3server.controller import Controller
 from gns3server.controller.node import Node
 from gns3server.controller.project import Project
 from gns3server.utils import force_unix_path
+from gns3server.utils.http_client import HTTPClient
 from gns3server.controller.controller_error import ControllerForbiddenError
 from gns3server.endpoints.schemas.common import ErrorMessage
 from gns3server.endpoints import schemas
@@ -400,18 +401,17 @@ async def ws_console(websocket: WebSocket, node: Node = Depends(dep_node)):
 
     try:
         # receive WebSocket data from compute console WebSocket and forward to client.
-        async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) as session:
-            async with session.ws_connect(ws_console_compute_url) as ws_console_compute:
-                asyncio.ensure_future(ws_receive(ws_console_compute))
-                async for msg in ws_console_compute:
-                    if msg.type == aiohttp.WSMsgType.TEXT:
-                        await websocket.send_text(msg.data)
-                    elif msg.type == aiohttp.WSMsgType.BINARY:
-                        await websocket.send_bytes(msg.data)
-                    elif msg.type == aiohttp.WSMsgType.ERROR:
-                        break
-    except aiohttp.client_exceptions.ClientResponseError as e:
-        log.error(f"Client response error received when forwarding to compute console WebSocket: {e}")
+        async with HTTPClient.get_client().ws_connect(ws_console_compute_url) as ws_console_compute:
+            asyncio.ensure_future(ws_receive(ws_console_compute))
+            async for msg in ws_console_compute:
+                if msg.type == aiohttp.WSMsgType.TEXT:
+                    await websocket.send_text(msg.data)
+                elif msg.type == aiohttp.WSMsgType.BINARY:
+                    await websocket.send_bytes(msg.data)
+                elif msg.type == aiohttp.WSMsgType.ERROR:
+                    break
+    except aiohttp.ClientError as e:
+        log.error(f"Client error received when forwarding to compute console WebSocket: {e}")
 
 
 @router.post("/console/reset",

gns3server/endpoints/controller/projects.py

@@ -29,7 +29,7 @@ import time
 import logging
 log = logging.getLogger()
 
-from fastapi import APIRouter, Depends, Request, Body, Query, HTTPException, status, WebSocket, WebSocketDisconnect
+from fastapi import APIRouter, Depends, Request, Body, HTTPException, status, WebSocket, WebSocketDisconnect
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse, FileResponse
 from websockets.exceptions import ConnectionClosed, WebSocketException