fix: fix write after close error

fixes #695
fent · Nov 14, 2020 · 64d643c · 64d643c
1 parent fc84ca8
commit 64d643c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 36 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -43,15 +43,15 @@ const createStream = options => {
   const stream = new PassThrough({
     highWaterMark: (options && options.highWaterMark) || 1024 * 512,
   });
-  stream.destroy = () => { stream._isDestroyed = true; };
+  stream._destroy = () => { stream.destroyed = true; };
   return stream;
 };
 
 
 const pipeAndSetEvents = (req, stream, end) => {
   // Forward events from the request to the stream.
   [
-    'abort', 'request', 'response', 'error', 'redirect', 'retry', 'reconnect',
+    'abort', 'request', 'response', 'error', 'close', 'redirect', 'retry', 'reconnect',
   ].forEach(event => {
     req.prependListener(event, stream.emit.bind(stream, event));
   });
@@ -88,7 +88,7 @@ const downloadFromInfoCallback = (stream, info, options) => {
     return;
   }
   stream.emit('info', info, format);
-  if (stream._isDestroyed) { return; }
+  if (stream.destroyed) { return; }
 
   let contentLength, downloaded = 0;
   const ondata = chunk => {
@@ -146,7 +146,7 @@ const downloadFromInfoCallback = (stream, info, options) => {
         req = miniget(format.url, requestOptions);
         req.on('data', ondata);
         req.on('end', () => {
-          if (stream._isDestroyed) { return; }
+          if (stream.destroyed) { return; }
           if (end && end !== rangeEnd) {
             start = end + 1;
             end += dlChunkSize;
@@ -168,20 +168,18 @@ const downloadFromInfoCallback = (stream, info, options) => {
       }
       req = miniget(format.url, requestOptions);
       req.on('response', res => {
-        if (stream._isDestroyed) { return; }
+        if (stream.destroyed) { return; }
         contentLength = contentLength || parseInt(res.headers['content-length']);
       });
       req.on('data', ondata);
       pipeAndSetEvents(req, stream, shouldEnd);
     }
   }
 
-  stream.destroy = () => {
-    stream._isDestroyed = true;
-    if (req.abort) req.abort();
+  stream._destroy = () => {
+    stream.destroyed = true;
+    req.destroy();
     req.end();
-    req.removeListener('data', ondata);
-    req.unpipe();
   };
 };
 

diff --git a/lib/info.js b/lib/info.js
@@ -31,7 +31,7 @@ exports.watchPageCache = new Cache();
  * @returns {Promise<Object>}
 */
 exports.getBasicInfo = async(id, options) => {
-  const retryOptions = Object.assign({}, miniget.Defaults, options.requestOptions);
+  const retryOptions = Object.assign({}, miniget.defaultOptions, options.requestOptions);
   let info = await retryFn(getJSONWatchPage, [id, options], retryOptions);
   let player_response =
     (info.player && info.player.args && info.player.args.player_response) ||

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "html-entities": "^1.3.1",
-    "m3u8stream": "^0.8.0",
-    "miniget": "^2.1.0",
+    "m3u8stream": "^0.8.1",
+    "miniget": "^3.0.0",
     "sax": "^1.1.3"
   },
   "devDependencies": {
@@ -47,7 +47,7 @@
     "eslint": "^6.8.0",
     "mocha": "^7.0.0",
     "muk-require": "^1.2.0",
-    "nock": "^12.0.0",
+    "nock": "^13.0.4",
     "nyc": "^15.0.0",
     "sinon": "^9.0.0",
     "stream-equal": "~1.1.0",

diff --git a/test/download-test.js b/test/download-test.js
@@ -91,7 +91,7 @@ describe('Download video', () => {
         const abort = sinon.spy();
         stream.on('abort', abort);
         stream.on('error', err => {
-          assert.ok(abort.called);
+          assert.ok(!abort.called);
           assert.strictEqual(err.message, 'socket hang up');
           scope.done();
           done();
@@ -119,9 +119,8 @@ describe('Download video', () => {
 
         const abort = sinon.spy();
         stream.on('abort', abort);
-        stream.on('error', err => {
-          assert.ok(abort.called);
-          assert.strictEqual(err.message, 'socket hang up');
+        stream.on('close', () => {
+          assert.ok(!abort.called);
           scope.done();
           done();
         });
@@ -173,7 +172,7 @@ describe('Download video', () => {
         const abort = sinon.spy();
         stream.on('abort', abort);
         stream.on('error', err => {
-          assert.ok(abort.called);
+          assert.ok(!abort.called);
           assert.strictEqual(err.message, 'socket hang up');
           scope.done();
           done();
@@ -201,9 +200,8 @@ describe('Download video', () => {
 
         const abort = sinon.spy();
         stream.on('abort', abort);
-        stream.on('error', err => {
-          assert.ok(abort.called);
-          assert.strictEqual(err.message, 'socket hang up');
+        stream.on('close', () => {
+          assert.ok(!abort.called);
           scope.done();
           done();
         });

diff --git a/test/info-test.js b/test/info-test.js
@@ -8,9 +8,9 @@ const miniget = require('miniget');
 describe('ytdl.getInfo()', () => {
   let expectedInfo;
   before(() => expectedInfo = require('./files/videos/regular/expected-info.json'));
-  let minigetDefaults = miniget.Defaults;
-  before(() => miniget.Defaults = Object.assign({}, minigetDefaults, { maxRetries: 0 }));
-  after(() => miniget.Defaults = minigetDefaults);
+  let minigetDefaults = miniget.defaultOptions;
+  before(() => miniget.defaultOptions = Object.assign({}, minigetDefaults, { maxRetries: 0 }));
+  after(() => miniget.defaultOptions = minigetDefaults);
 
   describe('From a regular video', () => {
     it('Retrieves correct metainfo', async() => {