fix: fix age restricted videos

closes #803
fent · Dec 2, 2020 · 84d5118 · 84d5118
1 parent 3ced5ac
commit 84d5118
Show file tree

Hide file tree

Showing 10 changed files with 17,399 additions and 1,724 deletions.
diff --git a/README.md b/README.md
@@ -146,7 +146,6 @@ ytdl cannot download videos that fall into the following
 * Regionally restricted (requires a [proxy](example/proxy.js))
 * Private (if you have access, requires [cookies](example/cookies.js))
 * Rentals (if you have access, requires [cookies](example/cookies.js))
-* Age restricted, requires [cookies](example/cookies.js))
 
 Generated download links are valid for 6 hours, and may only be downloadable from the same IP address.
 

diff --git a/lib/info.js b/lib/info.js
@@ -42,8 +42,7 @@ const AGE_RESTRICTED_URLS = [
 exports.getBasicInfo = async(id, options) => {
   const retryOptions = Object.assign({}, miniget.defaultOptions, options.requestOptions);
   const isValid = info =>
-    info.player_response && (utils.playError(info.player_response, ['LOGIN_REQUIRED']) ||
-      info.player_response.streamingData || isRental(info.player_response));
+    info.player_response && (info.player_response.streamingData || isRental(info.player_response));
   let info = await pipeline([id, options], retryOptions, isValid, [
     getJSONWatchPage,
     getEmbedPage,

diff --git a/test/download-test.js b/test/download-test.js
@@ -661,25 +661,6 @@ describe('Download video', () => {
     });
   });
 
-  describe('From an age restricted video', () => {
-    it('Stream emits an error', done => {
-      const id = 'LuZu9N53Vd0';
-      const scope = nock(id, 'age-restricted');
-      let stream = ytdl(id);
-      stream.on('error', err => {
-        scope.done();
-        assert.strictEqual(err.message, 'Sign in to confirm your age');
-        done();
-      });
-      stream.on('data', () => {
-        done(Error('should not emit `data`'));
-      });
-      stream.on('end', () => {
-        done(Error('should not emit `end`'));
-      });
-    });
-  });
-
   describe('With no formats', () => {
     it('Stream emits an error', done => {
       const id = '_HSylqgVYQI';

diff --git a/test/files/videos/age-restricted/embed.html b/test/files/videos/age-restricted/embed.html
diff --git a/test/files/videos/age-restricted/expected-info.json b/test/files/videos/age-restricted/expected-info.json
diff --git a/test/files/videos/age-restricted/get_video_info b/test/files/videos/age-restricted/get_video_info
diff --git a/test/files/videos/age-restricted/player_ias.vflset.js b/test/files/videos/age-restricted/player_ias.vflset.js
diff --git a/test/files/videos/age-restricted/watch.json b/test/files/videos/age-restricted/watch.json
diff --git a/test/info-test.js b/test/info-test.js
@@ -112,14 +112,15 @@ describe('ytdl.getInfo()', () => {
   });
 
   describe('From an age restricted video', () => {
-    it('Returns correct video metainfo', async() => {
+    it('Returns correct video metainfo with formats', async() => {
       const expected = require('./files/videos/age-restricted/expected-info.json');
       const id = 'LuZu9N53Vd0';
       const scope = nock(id, 'age-restricted');
       let info = await ytdl.getInfo(id);
       scope.done();
       assert.strictEqual(info.formats.length, expected.formats.length);
       assert.ok(info.videoDetails.age_restricted);
+      assert.ok(info.formats.length);
     });
   });
 

diff --git a/test/irl-test.js b/test/irl-test.js
@@ -5,6 +5,8 @@ const ytdl = require('..');
 
 const videos = {
   'Regular video': 'mgOS64BF2eU',
+  'Age restricted': 'LuZu9N53Vd0',
+  'Embed domain restricted': 'B3eAMGXFw1o',
   'No embed allowed': 'GFg8BP01F5Q',
   Offensive: 'hCKDsjLt_qU',
   'Live broadcast': '5qap5aO4i9A',