Fix aiohttp connection reset errors

homeassistant/components/camera/__init__.py

@@ -321,12 +321,9 @@ async def write_to_mjpeg_stream(img_bytes):
 
         except asyncio.CancelledError:
             _LOGGER.debug("Stream closed by frontend.")
-            response = None
-            raise
+            pass
 
-        finally:
-            if response is not None:
-                await response.write_eof()
+        return response
 
     async def handle_async_mjpeg_stream(self, request):
         """Serve an HTTP MJPEG stream from the camera.
@@ -409,10 +406,9 @@ async def get(self, request, entity_id):
                          request.query.get('token') in camera.access_tokens)
 
         if not authenticated:
-            return web.Response(status=401)
+            raise web.HTTPUnauthorized()
 
-        response = await self.handle(request, camera)
-        return response
+        return await self.handle(request, camera)
 
     async def handle(self, request, camera):
         """Handle the camera request."""
@@ -435,7 +431,7 @@ async def handle(self, request, camera):
                 return web.Response(body=image,
                                     content_type=camera.content_type)
 
-        return web.Response(status=500)
+        raise web.HTTPInternalServerError()
 
 
 class CameraMjpegStream(CameraView):
@@ -448,19 +444,17 @@ async def handle(self, request, camera):
         """Serve camera stream, possibly with interval."""
         interval = request.query.get('interval')
         if interval is None:
-            await camera.handle_async_mjpeg_stream(request)
-            return
+            return await camera.handle_async_mjpeg_stream(request)
 
         try:
             # Compose camera stream from stills
             interval = float(request.query.get('interval'))
             if interval < MIN_STREAM_INTERVAL:
                 raise ValueError("Stream interval must be be > {}"
                                  .format(MIN_STREAM_INTERVAL))
-            await camera.handle_async_still_stream(request, interval)
-            return
+            return await camera.handle_async_still_stream(request, interval)
         except ValueError:
-            return web.Response(status=400)
+            raise web.HTTPBadRequest()
 
 
 @callback

homeassistant/components/camera/ffmpeg.py

@@ -69,10 +69,12 @@ def handle_async_mjpeg_stream(self, request):
         yield from stream.open_camera(
             self._input, extra_cmd=self._extra_arguments)
 
-        yield from async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        yield from stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()
 
     @property
     def name(self):

homeassistant/components/camera/mjpeg.py

@@ -135,7 +135,7 @@ def handle_async_mjpeg_stream(self, request):
         websession = async_get_clientsession(self.hass)
         stream_coro = websession.get(self._mjpeg_url, auth=self._auth)
 
-        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)
+        return await async_aiohttp_proxy_web(self.hass, request, stream_coro)
 
     @property
     def name(self):

homeassistant/components/camera/proxy.py

@@ -192,7 +192,7 @@ async def handle_async_mjpeg_stream(self, request):
 
         if not self._stream_opts:
             await async_aiohttp_proxy_web(self.hass, request, stream_coro)
-            return
+            return aiohttp.web.HTTPBadRequest()
 
         response = aiohttp.web.StreamResponse()
         response.content_type = ('multipart/x-mixed-replace; '
@@ -232,12 +232,8 @@ async def write(img_bytes):
         except asyncio.CancelledError:
             _LOGGER.debug("Stream closed by frontend.")
             req.close()
-            response = None
-            raise
 
-        finally:
-            if response is not None:
-                await response.write_eof()
+        return response
 
     @property
     def name(self):

homeassistant/helpers/aiohttp_client.py

@@ -73,7 +73,7 @@ def async_aiohttp_proxy_web(hass, request, web_coro, buffer_size=102400,
     """Stream websession request to aiohttp web response."""
     try:
         with async_timeout.timeout(timeout, loop=hass.loop):
-            req = yield from web_coro
+            req = await web_coro
 
     except asyncio.CancelledError:
         # The user cancelled the request
@@ -88,7 +88,7 @@ def async_aiohttp_proxy_web(hass, request, web_coro, buffer_size=102400,
         raise HTTPBadGateway() from err
 
     try:
-        yield from async_aiohttp_proxy_stream(
+        return await async_aiohttp_proxy_stream(
             hass,
             request,
             req.content,
@@ -112,19 +112,14 @@ async def async_aiohttp_proxy_stream(hass, request, stream, content_type,
                 data = await stream.read(buffer_size)
 
             if not data:
-                await response.write_eof()
                 break
-
             await response.write(data)
 
-    except (asyncio.TimeoutError, aiohttp.ClientError):
-        # Something went wrong fetching data, close connection gracefully
-        await response.write_eof()
-
-    except asyncio.CancelledError:
-        # The user closed the connection
+    except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError):
+        # Something went wrong fetching data, closed connection
         pass
 
+    return response
 
 @callback
 def _async_register_clientsession_shutdown(hass, clientsession):