Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: Close protocol response streams when aborted (#26141)

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Milan Burda 4 years ago
parent
5e636f4b98
commit
dd631c67eb
3 changed files with 51 additions and 0 deletions
Split View Show Diff Stats
  1. 6 0
      shell/browser/net/node_stream_loader.cc
  2. 24 0
      spec-main/api-protocol-spec.ts
  3. 21 0
      spec-main/fixtures/pages/jquery.html

+ 6 - 0
shell/browser/net/node_stream_loader.cc
View File 

@@ -42,6 +42,12 @@ NodeStreamLoader::~NodeStreamLoader() {
 
     node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
 
                        node::arraysize(args), args, {0, 0});
 
   }
 
+
 
+  // Destroy the stream if not already ended
 
+  if (!ended_) {
 
+    node::MakeCallback(isolate_, emitter_.Get(isolate_), "destroy", 0, nullptr,
 
+                       {0, 0});
 
+  }
 
 }
 
 
 void NodeStreamLoader::Start(network::ResourceResponseHead head) {

+ 24 - 0
spec-main/api-protocol-spec.ts
View File 

@@ -442,6 +442,30 @@ describe('protocol module', () => {
 
       ajax(protocolName + '://fake-host')
 
       await hasEndedPromise
 
     })
 
+
 
+    it('destroys response streams when aborted before completion', async () => {
 
+      const events = new EventEmitter()
 
+      registerStreamProtocol(protocolName, (request, callback) => {
 
+        const responseStream = new stream.PassThrough()
 
+        responseStream.push('data\r\n')
 
+        responseStream.on('close', () => {
 
+          events.emit('close')
 
+        })
 
+        callback({
 
+          statusCode: 200,
 
+          headers: { 'Content-Type': 'text/plain' },
 
+          data: responseStream
 
+        })
 
+        events.emit('respond')
 
+      })
 
+
 
+      const hasRespondedPromise = emittedOnce(events, 'respond')
 
+      const hasClosedPromise = emittedOnce(events, 'close')
 
+      ajax(protocolName + '://fake-host')
 
+      await hasRespondedPromise
 
+      await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html'))
 
+      await hasClosedPromise
 
+    })
 
   })
 
 
   describe('protocol.isProtocolHandled', () => {

+ 21 - 0
spec-main/fixtures/pages/jquery.html
View File 

@@ -0,0 +1,21 @@
 
+<html>
 
+<head>
 
+  <script src="../../../spec/static/jquery-2.0.3.min.js"></script>
 
+</head>
 
+<body>
 
+<script>
 
+  window.ajax = (url, options) => {
 
+    return new Promise((resolve, reject) => {
 
+      options.url = url
 
+      options.success = (data, status, request) => {
 
+        resolve({data, status: request.status, headers: request.getAllResponseHeaders()})
 
+      }
 
+      options.error = (xhr, errorType, error) => {
 
+        reject(error ? error : new Error(`${xhr.status}`))
 
+      }
 
+      $.ajax(options)
 
+    })
 
+  }
 
+</script>
 
+</body>
 
+</html>