fix(mitm): error reading destroyed from scoket

ulixee · Feb 8, 2021 · f09e67f · f09e67f
1 parent 1d5906f
commit f09e67f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mitm/handlers/HttpRequestHandler.ts b/mitm/handlers/HttpRequestHandler.ts
@@ -207,10 +207,9 @@ export default class HttpRequestHandler extends BaseHttpHandler {
 
     context.setState(ResourceState.WriteProxyToClientResponseBody);
 
-    const http2Stream = (proxyToClientResponse as Http2ServerResponse).stream;
     for await (const chunk of serverToProxyResponse) {
       const data = context.cacheHandler.onResponseData(chunk as Buffer);
-      if (data && http2Stream?.destroyed !== true) {
+      if (data && !this.isClientConnectionDestroyed()) {
         proxyToClientResponse.write(data, error => {
           if (error && !this.isClientConnectionDestroyed())
             this.onError('ServerToProxy.WriteResponseError', error);
@@ -219,7 +218,7 @@ export default class HttpRequestHandler extends BaseHttpHandler {
     }
 
     if (context.cacheHandler.shouldServeCachedData) {
-      if (proxyToClientResponse.socket.destroyed)
+      if (!this.isClientConnectionDestroyed())
         proxyToClientResponse.write(context.cacheHandler.cacheData, error => {
           if (error && !this.isClientConnectionDestroyed())
             this.onError('ServerToProxy.WriteCachedResponseError', error);
@@ -242,7 +241,8 @@ export default class HttpRequestHandler extends BaseHttpHandler {
     const proxyToClientResponse = this.context.proxyToClientResponse;
     return (
       (proxyToClientResponse as Http2ServerResponse).stream?.destroyed ||
-      proxyToClientResponse.socket?.destroyed
+      proxyToClientResponse.socket?.destroyed ||
+      proxyToClientResponse.connection?.destroyed
     );
   }