playdl-music-extractor
Advanced tools
Comparing version 3.0.3 to 3.0.4
{ | ||
"name": "playdl-music-extractor", | ||
"version": "3.0.3", | ||
"version": "3.0.4", | ||
"description": "PlayDL Music Extractor is a Extractor/Scrapper and Helps Players to fetch data from play-dl or Custom Extractors , as Per reduces extra work and credentials", | ||
@@ -37,3 +37,3 @@ "main": "./src/index.js", | ||
"eslint-plugin-import": "^2.26.0", | ||
"jsdoc": "^3.6.10", | ||
"jsdoc": "^3.6.11", | ||
"jsdoc-babel": "^0.5.0", | ||
@@ -40,0 +40,0 @@ "jsdoc-skyceil": "^2.0.0", |
@@ -189,3 +189,3 @@ <div align="center"> | ||
declare type extractorData = { | ||
album: boolean; | ||
album: Album | boolean; | ||
tracks: Array<Track>; | ||
@@ -192,0 +192,0 @@ }; |
@@ -5,5 +5,5 @@ const playdlEngine = require('./__playdlEngine'); | ||
static __dezerRegex = [ | ||
/^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(track|album|album)\/(\d+)$/, | ||
/^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(track|album|playlist)\/(\d+)$/, | ||
/^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(track)\/(\d+)$/, | ||
/^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(album|album)\/(\d+)$/, | ||
/^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(album|playlist)\/(\d+)$/, | ||
]; | ||
@@ -13,3 +13,3 @@ | ||
static __dezeralbumRegex = /^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(album|album)\/(\d+)$/; | ||
static __dezeralbumRegex = /^https?:\/\/(?:www\.)?deezer\.com\/([^#/\&\?]+)\/(album|playlist)\/(\d+)$/; | ||
@@ -16,0 +16,0 @@ static __test(rawUrl, returnRegexValue = false) { |
@@ -100,3 +100,2 @@ const { | ||
} | ||
return ( | ||
@@ -146,4 +145,5 @@ await Promise.all( | ||
} | ||
let __rawResults; let rawTracks; let | ||
rawAlbumId; | ||
let __rawResults; | ||
let rawTracks; | ||
let rawAlbumId; | ||
let __videoDetails; | ||
@@ -150,0 +150,0 @@ const __validateResults = []; |
@@ -16,3 +16,5 @@ const uriCheck = require('is-url'); | ||
try { | ||
if (!(rawUrl && typeof rawUrl === 'string' && rawUrl !== '')) { return false; } | ||
if (!(rawUrl && typeof rawUrl === 'string' && rawUrl !== '')) { | ||
return false; | ||
} | ||
if ( | ||
@@ -22,3 +24,3 @@ returnRegexValue | ||
) { | ||
return ( | ||
return ( | ||
rawUrl?.match( | ||
@@ -30,8 +32,7 @@ youtube.__youtubeRegex.find( | ||
); | ||
} | ||
} | ||
return ( | ||
Boolean( | ||
youtube.__youtubeRegex.find((regExp) => regExp.test(rawUrl)), | ||
) ?? !uriCheck(rawUrl) | ||
); | ||
Boolean(youtube.__youtubeRegex.find((regExp) => regExp.test(rawUrl))) | ||
|| !uriCheck(rawUrl) | ||
); | ||
} catch { | ||
@@ -44,2 +45,8 @@ return false; | ||
try { | ||
if (!uriCheck(rawQuery)) { | ||
__scrapperOptions = { | ||
...__scrapperOptions, | ||
fetchOptions: { ...__scrapperOptions?.fetchOptions, fetchLimit: 1 }, | ||
}; | ||
} | ||
const playdlEngine = require('./__playdlEngine'); | ||
@@ -61,3 +68,5 @@ const rawTracks = (await playdlEngine?.__rawExtractor( | ||
} catch (rawError) { | ||
if (__scrapperOptions?.ignoreInternalError) { return void __cacheMain.__errorHandling(rawError); } | ||
if (__scrapperOptions?.ignoreInternalError) { | ||
return void __cacheMain.__errorHandling(rawError); | ||
} | ||
throw rawError; | ||
@@ -64,0 +73,0 @@ } |
@@ -134,4 +134,4 @@ declare type secretTokens = { | ||
| "arbitary", | ||
album: Album, | ||
track: Track, | ||
playlistId: String | Number | undefined, | ||
metadata: any | ||
@@ -138,0 +138,0 @@ ]; |
72811
1773