diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..06f80bc --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +lib +/videos/*.ts \ No newline at end of file diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml deleted file mode 100644 index fdf1044..0000000 --- a/.github/workflows/eslint.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: eslint - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [14.x] - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - - run: npm i - - run: npx eslint . diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..965d0dc --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,33 @@ +name: eslint + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + eslint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 14 + uses: actions/setup-node@v2 + with: + node-version: 14 + cache: 'npm' + - run: npm i + - run: npx eslint . + test: + needs: eslint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 14 + uses: actions/setup-node@v2 + with: + node-version: 14 + cache: 'npm' + - run: npm i + - run: npm run test + diff --git a/@types/episode.d.ts b/@types/episode.d.ts index 6d79b67..e5e9b2e 100644 --- a/@types/episode.d.ts +++ b/@types/episode.d.ts @@ -59,20 +59,20 @@ export interface Value { } export enum Label { - Rating = "Rating", - RatingSystem = "Rating System", - ReleaseDate = "Release Date", - Synopsis = "Synopsis", - SynopsisType = "Synopsis Type", + Rating = 'Rating', + RatingSystem = 'Rating System', + ReleaseDate = 'Release Date', + Synopsis = 'Synopsis', + SynopsisType = 'Synopsis Type', } export enum MetaType { - Rating = "rating", - RatingSystemType = "RatingSystemType", - ReleaseDate = "release-date", - Synopsis = "synopsis", - Synopsistype = "synopsistype", - VideoRatingType = "VideoRatingType", + Rating = 'rating', + RatingSystemType = 'RatingSystemType', + ReleaseDate = 'release-date', + Synopsis = 'synopsis', + Synopsistype = 'synopsistype', + VideoRatingType = 'VideoRatingType', } export interface HistoricalSelections { @@ -87,8 +87,8 @@ export interface EpisodeDataIDS { } export enum TitleElement { - Empty = "", - English = "English", + Empty = '', + English = 'English', } export interface Media { @@ -194,8 +194,7 @@ export interface AvailIDS { externalAlphaId: string; } -export interface Next { -} +export type Next = Record export interface LanguageClass { code: string; @@ -299,7 +298,7 @@ export interface CatalogParent { } export enum Source { - Dbb = "dbb", + Dbb = 'dbb', } export interface MetaItems { @@ -313,10 +312,10 @@ export interface Filters { } export interface Items { - "release-date": AnimationProductionStudio; + 'release-date': AnimationProductionStudio; rating: AnimationProductionStudio; synopsis: AnimationProductionStudio; - "animation-production-studio": AnimationProductionStudio; + 'animation-production-studio': AnimationProductionStudio; } export interface AnimationProductionStudio { @@ -366,8 +365,8 @@ export interface PreviousSeasonEpisode { } export enum Type { - Episode = "episode", - Ova = "ova", + Episode = 'episode', + Ova = 'ova', } export interface Quality { diff --git a/@types/hls-download.d.ts b/@types/hls-download.d.ts index 4ed0f6a..a919fdb 100644 --- a/@types/hls-download.d.ts +++ b/@types/hls-download.d.ts @@ -2,7 +2,7 @@ declare module 'hls-download' { export default class hlsDownload { constructor(options: { m3u8json: { - segments: {}[], + segments: Record[], mediaSequence?: number, }, output?: string, diff --git a/@types/items.d.ts b/@types/items.d.ts index b7ac98d..1d2a12c 100644 --- a/@types/items.d.ts +++ b/@types/items.d.ts @@ -39,8 +39,8 @@ export interface Item { } export enum ContentType { - Episode = "episode", - Ova = "ova", + Episode = 'episode', + Ova = 'ova', } export interface IDs { @@ -110,19 +110,18 @@ export interface MostRecentAvodIDS { } export enum Purchase { - AVOD = "A-VOD", - Dfov = "DFOV", - Est = "EST", - Svod = "SVOD", + AVOD = 'A-VOD', + Dfov = 'DFOV', + Est = 'EST', + Svod = 'SVOD', } export enum Version { - Simulcast = "Simulcast", - Uncut = "Uncut", + Simulcast = 'Simulcast', + Uncut = 'Uncut', } -export interface MostRecentSvodJpnUs { -} +export type MostRecentSvodJpnUs = Record export interface QualityClass { quality: QualityQuality; @@ -130,8 +129,8 @@ export interface QualityClass { } export enum QualityQuality { - HD = "HD", - SD = "SD", + HD = 'HD', + SD = 'SD', } export interface TitleImages { diff --git a/@types/m3u8-parsed.d.ts b/@types/m3u8-parsed.d.ts index 437a2a3..073dcfb 100644 --- a/@types/m3u8-parsed.d.ts +++ b/@types/m3u8-parsed.d.ts @@ -32,17 +32,17 @@ declare module 'm3u8-parsed' { uri: string, timeline: number, attributes: { - "CLOSED-CAPTIONS": string, - "AUDIO": string, - "FRAME-RATE": number, - "RESOLUTION": { + 'CLOSED-CAPTIONS': string, + 'AUDIO': string, + 'FRAME-RATE': number, + 'RESOLUTION': { width: number, height: number }, - "CODECS": string, - "AVERAGE-BANDWIDTH": string, - "BANDWIDTH": number + 'CODECS': string, + 'AVERAGE-BANDWIDTH': string, + 'BANDWIDTH': number } }[], - } + }; } \ No newline at end of file diff --git a/funi.ts b/funi.ts index 388194d..622df0c 100644 --- a/funi.ts +++ b/funi.ts @@ -22,11 +22,11 @@ import * as yamlCfg from './modules/module.cfg-loader'; import vttConvert from './modules/module.vttconvert'; // types -import { Item } from "./@types/items"; +import { Item } from './@types/items'; // params const cfg = yamlCfg.loadCfg(); -let token = yamlCfg.loadFuniToken(); +const token = yamlCfg.loadFuniToken(); // cli const argv = appYargs.appArgv(cfg.cli); @@ -44,225 +44,225 @@ argv.p = 1; // fn variables let title = '', - showTitle = '', - fnEpNum: string|number = 0, - fnOutput: string[] = [], - season = 0, - tsDlPath: { + showTitle = '', + fnEpNum: string|number = 0, + fnOutput: string[] = [], + season = 0, + tsDlPath: { path: string, lang: string, }[] = [], - stDlPath: Subtitle[] = []; + stDlPath: Subtitle[] = []; // main (async () => { - // load binaries - cfg.bin = await yamlCfg.loadBinCfg(); - // select mode - if(argv.auth){ - auth(); - } - else if(argv.search){ - searchShow(); - } - else if(argv.s && argv.s > 0){ - getShow(); - } - else{ - appYargs.showHelp(); - } + // load binaries + cfg.bin = await yamlCfg.loadBinCfg(); + // select mode + if(argv.auth){ + auth(); + } + else if(argv.search){ + searchShow(); + } + else if(argv.s && argv.s > 0){ + getShow(); + } + else{ + appYargs.showHelp(); + } })(); // auth async function auth(){ - let authOpts = { - user: await shlp.question('[Q] LOGIN/EMAIL'), - pass: await shlp.question('[Q] PASSWORD ') - }; - let authData = await getData({ - baseUrl: api_host, - url: '/auth/login/', - auth: authOpts, - debug: argv.debug, - }); - if(authData.ok && authData.res){ - const resJSON = JSON.parse(authData.res.body); - if(resJSON.token){ - console.log('[INFO] Authentication success, your token: %s%s\n', resJSON.token.slice(0,8),'*'.repeat(32)); - yamlCfg.saveFuniToken({'token': resJSON.token}); - } else { - console.log('[ERROR]%s\n', ' No token found'); - if (argv.debug) { - console.log(resJSON); - } - process.exit(1); - } + const authOpts = { + user: await shlp.question('[Q] LOGIN/EMAIL'), + pass: await shlp.question('[Q] PASSWORD ') + }; + const authData = await getData({ + baseUrl: api_host, + url: '/auth/login/', + auth: authOpts, + debug: argv.debug, + }); + if(authData.ok && authData.res){ + const resJSON = JSON.parse(authData.res.body); + if(resJSON.token){ + console.log('[INFO] Authentication success, your token: %s%s\n', resJSON.token.slice(0,8),'*'.repeat(32)); + yamlCfg.saveFuniToken({'token': resJSON.token}); + } else { + console.log('[ERROR]%s\n', ' No token found'); + if (argv.debug) { + console.log(resJSON); + } + process.exit(1); } + } } // search show async function searchShow(){ - let qs = {unique: true, limit: 100, q: argv.search, offset: 0 }; - let searchData = await getData({ - baseUrl: api_host, - url: '/source/funimation/search/auto/', - querystring: qs, - token: token, - useToken: true, - debug: argv.debug, - }); - if(!searchData.ok || !searchData.res){return;} - const searchDataJSON = JSON.parse(searchData.res.body); - if(searchDataJSON.detail){ - console.log(`[ERROR] ${searchDataJSON.detail}`); - return; + const qs = {unique: true, limit: 100, q: argv.search, offset: 0 }; + const searchData = await getData({ + baseUrl: api_host, + url: '/source/funimation/search/auto/', + querystring: qs, + token: token, + useToken: true, + debug: argv.debug, + }); + if(!searchData.ok || !searchData.res){return;} + const searchDataJSON = JSON.parse(searchData.res.body); + if(searchDataJSON.detail){ + console.log(`[ERROR] ${searchDataJSON.detail}`); + return; + } + if(searchDataJSON.items && searchDataJSON.items.hits){ + const shows = searchDataJSON.items.hits; + console.log('[INFO] Search Results:'); + for(const ssn in shows){ + console.log(`[#${shows[ssn].id}] ${shows[ssn].title}` + (shows[ssn].tx_date?` (${shows[ssn].tx_date})`:'')); } - if(searchDataJSON.items && searchDataJSON.items.hits){ - let shows = searchDataJSON.items.hits; - console.log('[INFO] Search Results:'); - for(let ssn in shows){ - console.log(`[#${shows[ssn].id}] ${shows[ssn].title}` + (shows[ssn].tx_date?` (${shows[ssn].tx_date})`:'')); - } - } - console.log('[INFO] Total shows found: %s\n',searchDataJSON.count); + } + console.log('[INFO] Total shows found: %s\n',searchDataJSON.count); } // get show async function getShow(){ - // show main data - let showData = await getData({ - baseUrl: api_host, - url: `/source/catalog/title/${argv.s}`, - token: token, - useToken: true, - debug: argv.debug, - }); + // show main data + const showData = await getData({ + baseUrl: api_host, + url: `/source/catalog/title/${argv.s}`, + token: token, + useToken: true, + debug: argv.debug, + }); // check errors - if(!showData.ok || !showData.res){return;} - const showDataJSON = JSON.parse(showData.res.body); - if(showDataJSON.status){ - console.log('[ERROR] Error #%d: %s\n', showDataJSON.status, showDataJSON.data.errors[0].detail); - process.exit(1); - } - else if(!showDataJSON.items || showDataJSON.items.length<1){ - console.log('[ERROR] Show not found\n'); - process.exit(0); - } - const showDataItem = showDataJSON.items[0]; - console.log('[#%s] %s (%s)',showDataItem.id,showDataItem.title,showDataItem.releaseYear); - // show episodes - let qs: { + if(!showData.ok || !showData.res){return;} + const showDataJSON = JSON.parse(showData.res.body); + if(showDataJSON.status){ + console.log('[ERROR] Error #%d: %s\n', showDataJSON.status, showDataJSON.data.errors[0].detail); + process.exit(1); + } + else if(!showDataJSON.items || showDataJSON.items.length<1){ + console.log('[ERROR] Show not found\n'); + process.exit(0); + } + const showDataItem = showDataJSON.items[0]; + console.log('[#%s] %s (%s)',showDataItem.id,showDataItem.title,showDataItem.releaseYear); + // show episodes + const qs: { limit: number, sort: string, sort_direction: string, title_id: number, language?: string } = { limit: -1, sort: 'order', sort_direction: 'ASC', title_id: argv.s as number }; - if(argv.alt){ qs.language = 'English'; } - let episodesData = await getData({ - baseUrl: api_host, - url: '/funimation/episodes/', - querystring: qs, - token: token, - useToken: true, - debug: argv.debug, - }); - if(!episodesData.ok || !episodesData.res){return;} + if(argv.alt){ qs.language = 'English'; } + const episodesData = await getData({ + baseUrl: api_host, + url: '/funimation/episodes/', + querystring: qs, + token: token, + useToken: true, + debug: argv.debug, + }); + if(!episodesData.ok || !episodesData.res){return;} - let epsDataArr: Item[] = JSON.parse(episodesData.res.body).items; - let epNumRegex = /^([A-Z0-9]*[A-Z])?(\d+)$/i; - let epSelEpsTxt = [], epSelList, typeIdLen = 0, epIdLen = 4; + let epsDataArr: Item[] = JSON.parse(episodesData.res.body).items; + const epNumRegex = /^([A-Z0-9]*[A-Z])?(\d+)$/i; + const epSelEpsTxt = []; let typeIdLen = 0, epIdLen = 4; - const parseEpStr = (epStr: string) => { - const match = epStr.match(epNumRegex); - if (!match) { - console.error('[ERROR] No match found') - return ['', ''] - } - if(match.length > 2){ - const spliced = [...match].splice(1); - spliced[0] = spliced[0] ? spliced[0] : ''; - return spliced; - } - else return [ '', match[0] ]; - }; - - epsDataArr = epsDataArr.map(e => { - const baseId = e.ids.externalAsianId ? e.ids.externalAsianId : e.ids.externalEpisodeId; - e.id = baseId.replace(new RegExp('^' + e.ids.externalShowId), ''); - if(e.id.match(epNumRegex)){ - const epMatch = parseEpStr(e.id); - epIdLen = epMatch[1].length > epIdLen ? epMatch[1].length : epIdLen; - typeIdLen = epMatch[0].length > typeIdLen ? epMatch[0].length : typeIdLen; - e.id_split = epMatch; - } - else{ - typeIdLen = 3 > typeIdLen? 3 : typeIdLen; - console.log('[ERROR] FAILED TO PARSE: ', e.id); - e.id_split = [ 'ZZZ', 9999 ]; - } - return e; - }); - - epSelList = parseSelect(argv.e as string); - - let fnSlug: { - title: string, - episode: string - }[] = [], is_selected = false; - - let eps = epsDataArr; - epsDataArr.sort((a, b) => { - if (a.item.seasonOrder < b.item.seasonOrder && a.id.localeCompare(b.id) < 0) { - return -1; - } - if (a.item.seasonOrder > b.item.seasonOrder && a.id.localeCompare(b.id) > 0) { - return 1; - } - return 0; - }); - - for(let e in eps){ - eps[e].id_split[1] = parseInt(eps[e].id_split[1].toString()).toString().padStart(epIdLen, '0'); - let epStrId = eps[e].id_split.join(''); - // select - is_selected = false; - if (argv.all || epSelList.isSelected(epStrId)) { - fnSlug.push({title:eps[e].item.titleSlug,episode:eps[e].item.episodeSlug}); - epSelEpsTxt.push(epStrId); - is_selected = true; - } - else{ - is_selected = false; - } - // console vars - let tx_snum = eps[e].item.seasonNum=='1'?'':` S${eps[e].item.seasonNum}`; - let tx_type = eps[e].mediaCategory != 'episode' ? eps[e].mediaCategory : ''; - let tx_enum = eps[e].item.episodeNum && eps[e].item.episodeNum !== '' ? - `#${(parseInt(eps[e].item.episodeNum) < 10 ? '0' : '')+eps[e].item.episodeNum}` : '#'+eps[e].item.episodeId; - let qua_str = eps[e].quality.height ? eps[e].quality.quality + eps[e].quality.height : 'UNK'; - let aud_str = eps[e].audio.length > 0 ? `, ${eps[e].audio.join(', ')}` : ''; - let rtm_str = eps[e].item.runtime !== '' ? eps[e].item.runtime : '??:??'; - // console string - eps[e].id_split[0] = eps[e].id_split[0].toString().padStart(typeIdLen, ' '); - epStrId = eps[e].id_split.join(''); - let conOut = `[${epStrId}] `; - conOut += `${eps[e].item.titleName+tx_snum} - ${tx_type+tx_enum} ${eps[e].item.episodeName} `; - conOut += `(${rtm_str}) [${qua_str+aud_str}]`; - conOut += is_selected ? ' (selected)' : ''; - conOut += eps.length-1 == parseInt(e) ? '\n' : ''; - console.log(conOut); + const parseEpStr = (epStr: string) => { + const match = epStr.match(epNumRegex); + if (!match) { + console.error('[ERROR] No match found'); + return ['', '']; } - if(fnSlug.length < 1){ - console.log('[INFO] Episodes not selected!\n'); - process.exit(); + if(match.length > 2){ + const spliced = [...match].splice(1); + spliced[0] = spliced[0] ? spliced[0] : ''; + return spliced; + } + else return [ '', match[0] ]; + }; + + epsDataArr = epsDataArr.map(e => { + const baseId = e.ids.externalAsianId ? e.ids.externalAsianId : e.ids.externalEpisodeId; + e.id = baseId.replace(new RegExp('^' + e.ids.externalShowId), ''); + if(e.id.match(epNumRegex)){ + const epMatch = parseEpStr(e.id); + epIdLen = epMatch[1].length > epIdLen ? epMatch[1].length : epIdLen; + typeIdLen = epMatch[0].length > typeIdLen ? epMatch[0].length : typeIdLen; + e.id_split = epMatch; } else{ - console.log('[INFO] Selected Episodes: %s\n',epSelEpsTxt.join(', ')); - for(let fnEp=0;fnEp typeIdLen? 3 : typeIdLen; + console.log('[ERROR] FAILED TO PARSE: ', e.id); + e.id_split = [ 'ZZZ', 9999 ]; } + return e; + }); + + const epSelList = parseSelect(argv.e as string); + + const fnSlug: { + title: string, + episode: string + }[] = []; let is_selected = false; + + const eps = epsDataArr; + epsDataArr.sort((a, b) => { + if (a.item.seasonOrder < b.item.seasonOrder && a.id.localeCompare(b.id) < 0) { + return -1; + } + if (a.item.seasonOrder > b.item.seasonOrder && a.id.localeCompare(b.id) > 0) { + return 1; + } + return 0; + }); + + for(const e in eps){ + eps[e].id_split[1] = parseInt(eps[e].id_split[1].toString()).toString().padStart(epIdLen, '0'); + let epStrId = eps[e].id_split.join(''); + // select + is_selected = false; + if (argv.all || epSelList.isSelected(epStrId)) { + fnSlug.push({title:eps[e].item.titleSlug,episode:eps[e].item.episodeSlug}); + epSelEpsTxt.push(epStrId); + is_selected = true; + } + else{ + is_selected = false; + } + // console vars + const tx_snum = eps[e].item.seasonNum=='1'?'':` S${eps[e].item.seasonNum}`; + const tx_type = eps[e].mediaCategory != 'episode' ? eps[e].mediaCategory : ''; + const tx_enum = eps[e].item.episodeNum && eps[e].item.episodeNum !== '' ? + `#${(parseInt(eps[e].item.episodeNum) < 10 ? '0' : '')+eps[e].item.episodeNum}` : '#'+eps[e].item.episodeId; + const qua_str = eps[e].quality.height ? eps[e].quality.quality + eps[e].quality.height : 'UNK'; + const aud_str = eps[e].audio.length > 0 ? `, ${eps[e].audio.join(', ')}` : ''; + const rtm_str = eps[e].item.runtime !== '' ? eps[e].item.runtime : '??:??'; + // console string + eps[e].id_split[0] = eps[e].id_split[0].toString().padStart(typeIdLen, ' '); + epStrId = eps[e].id_split.join(''); + let conOut = `[${epStrId}] `; + conOut += `${eps[e].item.titleName+tx_snum} - ${tx_type+tx_enum} ${eps[e].item.episodeName} `; + conOut += `(${rtm_str}) [${qua_str+aud_str}]`; + conOut += is_selected ? ' (selected)' : ''; + conOut += eps.length-1 == parseInt(e) ? '\n' : ''; + console.log(conOut); + } + if(fnSlug.length < 1){ + console.log('[INFO] Episodes not selected!\n'); + process.exit(); + } + else{ + console.log('[INFO] Selected Episodes: %s\n',epSelEpsTxt.join(', ')); + for(let fnEp=0;fnEp 0 && m.type == 'Non-Encrypted'){ - let dub_type = m.language; - if (!dub_type) - continue; - let localSubs: Subtitle[] = []; - let selUncut = !argv.simul && uncut[dub_type] && m.version?.match(/uncut/i) - ? true - : (!uncut[dub_type] || argv.simul && m.version?.match(/simulcast/i) ? true : false); - for (let curDub of (argv.dub as appYargs.possibleDubs)) { - if(dub_type == dubType[curDub] && selUncut){ - streamIds.push({ - id: m.id, - lang: merger.getLanguageCode(curDub, curDub.slice(0, -2)) - }); - if (!m.subtitles) { - console.log('[ERROR] Unable to find subs for episode ', m.id) - if (argv.debug) - console.log(m) - continue; - } - stDlPath.push(...m.subtitles); - localSubs = m.subtitles; - selected = true; - } - } - console.log(`[#${m.id}] ${dub_type} [${m.version}]${(selected?' (selected)':'')}${ - localSubs && localSubs.length > 0 && selected ? ` (using ${localSubs.map(a => `'${a.langName}'`).join(', ')} for subtitles)` : '' - }`); - } - } - - let already: string[] = []; - stDlPath = stDlPath.filter(a => { - if (already.includes(a.language)) { - return false; - } else { - already.push(a.language); - return true; - } - }); - if(streamIds.length <1){ - console.log('[ERROR] Track not selected\n'); - return; + // map medias + const media = ep.media.map(function(m){ + if(m.mediaType == 'experience'){ + if(m.version.match(/uncut/i) && m.language){ + uncut[m.language] = true; + } + return { + id: m.id, + language: m.language, + version: m.version, + type: m.experienceType, + subtitles: getSubsUrl(m.mediaChildren), + }; } else{ - tsDlPath = []; - for (let streamId of streamIds) { - let streamData = await getData({ - baseUrl: api_host, - url: `/source/catalog/video/${streamId.id}/signed`, - token: token, - dinstid: 'uuid', - useToken: true, - debug: argv.debug, - }); - if(!streamData.ok || !streamData.res){return;} - const streamDataRes = JSON.parse(streamData.res.body) as StreamData; - if(streamDataRes.errors){ - console.log('[ERROR] Error #%s: %s\n',streamDataRes.errors[0].code,streamDataRes.errors[0].detail); - return; - } - else{ - for(let u in streamDataRes.items){ - if(streamDataRes.items[u].videoType == 'm3u8'){ - tsDlPath.push({ - path: streamDataRes.items[u].src, - lang: streamId.lang - }); - break; - } - } - } - } - if(tsDlPath.length < 1){ - console.log('[ERROR] Unknown error\n'); - return; - } - else{ - await downloadStreams(); - } + return { id: 0, type: '' }; } + }); + + const dubType = { + 'enUS': 'English', + 'esLA': 'Spanish (Latin Am)', + 'ptBR': 'Portuguese (Brazil)', + 'zhMN': 'Chinese (Mandarin, PRC)', + 'jaJP': 'Japanese' + }; + + // select + stDlPath = []; + for(const m of media){ + let selected = false; + if(m.id > 0 && m.type == 'Non-Encrypted'){ + const dub_type = m.language; + if (!dub_type) + continue; + let localSubs: Subtitle[] = []; + const selUncut = !argv.simul && uncut[dub_type] && m.version?.match(/uncut/i) + ? true + : (!uncut[dub_type] || argv.simul && m.version?.match(/simulcast/i) ? true : false); + for (const curDub of (argv.dub as appYargs.possibleDubs)) { + if(dub_type == dubType[curDub] && selUncut){ + streamIds.push({ + id: m.id, + lang: merger.getLanguageCode(curDub, curDub.slice(0, -2)) + }); + stDlPath.push(...m.subtitles); + localSubs = m.subtitles; + selected = true; + } + } + console.log(`[#${m.id}] ${dub_type} [${m.version}]${(selected?' (selected)':'')}${ + localSubs && localSubs.length > 0 && selected ? ` (using ${localSubs.map(a => `'${a.langName}'`).join(', ')} for subtitles)` : '' + }`); + } + } + + const already: string[] = []; + stDlPath = stDlPath.filter(a => { + if (already.includes(a.language)) { + return false; + } else { + already.push(a.language); + return true; + } + }); + if(streamIds.length <1){ + console.log('[ERROR] Track not selected\n'); + return; + } + else{ + tsDlPath = []; + for (const streamId of streamIds) { + const streamData = await getData({ + baseUrl: api_host, + url: `/source/catalog/video/${streamId.id}/signed`, + token: token, + dinstid: 'uuid', + useToken: true, + debug: argv.debug, + }); + if(!streamData.ok || !streamData.res){return;} + const streamDataRes = JSON.parse(streamData.res.body) as StreamData; + if(streamDataRes.errors){ + console.log('[ERROR] Error #%s: %s\n',streamDataRes.errors[0].code,streamDataRes.errors[0].detail); + return; + } + else{ + for(const u in streamDataRes.items){ + if(streamDataRes.items[u].videoType == 'm3u8'){ + tsDlPath.push({ + path: streamDataRes.items[u].src, + lang: streamId.lang + }); + break; + } + } + } + } + if(tsDlPath.length < 1){ + console.log('[ERROR] Unknown error\n'); + return; + } + else{ + await downloadStreams(); + } + } } function getSubsUrl(m: MediaChild[]) : Subtitle[] { - if(argv.nosubs && !argv.sub){ - return []; - } + if(argv.nosubs && !argv.sub){ + return []; + } - let subLangs = argv.subLang as appYargs.possibleSubs; + let subLangs = argv.subLang as appYargs.possibleSubs; - const subType = { - 'enUS': 'English', - 'esLA': 'Spanish (Latin Am)', - 'ptBR': 'Portuguese (Brazil)' - }; + const subType = { + 'enUS': 'English', + 'esLA': 'Spanish (Latin Am)', + 'ptBR': 'Portuguese (Brazil)' + }; - let subLangAvailable = m.some(a => subLangs.some(subLang => a.ext == 'vtt' && a.language === subType[subLang])); + const subLangAvailable = m.some(a => subLangs.some(subLang => a.ext == 'vtt' && a.language === subType[subLang])); - if (!subLangAvailable) { - subLangs = [ 'enUS' ]; - } + if (!subLangAvailable) { + subLangs = [ 'enUS' ]; + } - let found: Subtitle[] = []; + const found: Subtitle[] = []; - for(let i in m){ - let fpp = m[i].filePath.split('.'); - let fpe = fpp[fpp.length-1]; - for (let lang of subLangs) { - if(fpe == 'vtt' && m[i].language === subType[lang]) { - found.push({ - path: m[i].filePath, - ext: `.${lang}`, - langName: subType[lang], - language: m[i].languages[0].code || lang.slice(0, 2) - }); - } - } + for(const i in m){ + const fpp = m[i].filePath.split('.'); + const fpe = fpp[fpp.length-1]; + for (const lang of subLangs) { + if(fpe == 'vtt' && m[i].language === subType[lang]) { + found.push({ + path: m[i].filePath, + ext: `.${lang}`, + langName: subType[lang], + language: m[i].languages[0].code || lang.slice(0, 2) + }); + } } + } - return found; + return found; } async function downloadStreams(){ - // req playlist + // req playlist - let purvideo: DownloadedFile[] = []; - let puraudio: DownloadedFile[] = []; - let audioAndVideo: DownloadedFile[] = []; - for (let streamPath of tsDlPath) { - let plQualityReq = await getData({ - url: streamPath.path, - debug: argv.debug, - }); - if(!plQualityReq.ok || !plQualityReq.res){return;} + const purvideo: DownloadedFile[] = []; + const puraudio: DownloadedFile[] = []; + const audioAndVideo: DownloadedFile[] = []; + for (const streamPath of tsDlPath) { + const plQualityReq = await getData({ + url: streamPath.path, + debug: argv.debug, + }); + if(!plQualityReq.ok || !plQualityReq.res){return;} - let plQualityLinkList = m3u8(plQualityReq.res.body); + const plQualityLinkList = m3u8(plQualityReq.res.body); - let mainServersList = [ - 'vmfst-api.prd.funimationsvc.com', - 'd33et77evd9bgg.cloudfront.net', - 'd132fumi6di1wa.cloudfront.net', - 'funiprod.akamaized.net', - ]; + const mainServersList = [ + 'vmfst-api.prd.funimationsvc.com', + 'd33et77evd9bgg.cloudfront.net', + 'd132fumi6di1wa.cloudfront.net', + 'funiprod.akamaized.net', + ]; - let plServerList: string[] = [], - plStreams: Record = {}, - plLayersStr = [], - plLayersRes: Record = {}, - plMaxLayer = 1, - plNewIds = 1, - plAud: { - uri: string, - langStr: string, - language: string - } = { uri: '', langStr: '', language: '' }; + const plServerList: string[] = [], + plStreams: Record = {}, + plLayersStr = [], + plLayersRes: Record = {}; + let plMaxLayer = 1, + plNewIds = 1, + plAud: { + uri: string, + langStr: string, + language: string + } = { uri: '', langStr: '', language: '' }; - // new uris - let vplReg = /streaming_video_(\d+)_(\d+)_(\d+)_index\.m3u8/; - if(plQualityLinkList.playlists[0].uri.match(vplReg)){ - let audioKey = Object.keys(plQualityLinkList.mediaGroups.AUDIO).pop(); - if (!audioKey) - return console.log('[ERROR] No audio key found') - if(plQualityLinkList.mediaGroups.AUDIO[audioKey]){ - const audioDataParts = plQualityLinkList.mediaGroups.AUDIO[audioKey], - audioEl = Object.keys(audioDataParts); - const audioData = audioDataParts[audioEl[0]]; - plAud = { ...audioData, ...{ langStr: audioEl[0] } }; - } - plQualityLinkList.playlists.sort((a, b) => { - const aMatch = a.uri.match(vplReg), bMatch = b.uri.match(vplReg); - if (!aMatch || !bMatch) { - console.log('[ERROR] Unable to match') - return 0; - } - let av = parseInt(aMatch[3]); - let bv = parseInt(bMatch[3]); - if(av > bv){ - return 1; - } - if (av < bv) { - return -1; - } - return 0; - }); + // new uris + const vplReg = /streaming_video_(\d+)_(\d+)_(\d+)_index\.m3u8/; + if(plQualityLinkList.playlists[0].uri.match(vplReg)){ + const audioKey = Object.keys(plQualityLinkList.mediaGroups.AUDIO).pop(); + if (!audioKey) + return console.log('[ERROR] No audio key found'); + if(plQualityLinkList.mediaGroups.AUDIO[audioKey]){ + const audioDataParts = plQualityLinkList.mediaGroups.AUDIO[audioKey], + audioEl = Object.keys(audioDataParts); + const audioData = audioDataParts[audioEl[0]]; + plAud = { ...audioData, ...{ langStr: audioEl[0] } }; + } + plQualityLinkList.playlists.sort((a, b) => { + const aMatch = a.uri.match(vplReg), bMatch = b.uri.match(vplReg); + if (!aMatch || !bMatch) { + console.log('[ERROR] Unable to match'); + return 0; } - - for(let s of plQualityLinkList.playlists){ - if(s.uri.match(/_Layer(\d+)\.m3u8/) || s.uri.match(vplReg)){ - // set layer and max layer - let plLayerId: number|string = 0; - const match = s.uri.match(/_Layer(\d+)\.m3u8/); - if(match){ - plLayerId = parseInt(match[1]); - } - else{ - plLayerId = plNewIds, plNewIds++; - } - plMaxLayer = plMaxLayer < plLayerId ? plLayerId : plMaxLayer; - // set urls and servers - let plUrlDl = s.uri; - let plServer = new URL(plUrlDl).host; - if(!plServerList.includes(plServer)){ - plServerList.push(plServer); - } - if(!Object.keys(plStreams).includes(plServer)){ - plStreams[plServer] = {}; - } - if(plStreams[plServer][plLayerId] && plStreams[plServer][plLayerId] != plUrlDl){ - console.log(`[WARN] Non duplicate url for ${plServer} detected, please report to developer!`); - } - else{ - plStreams[plServer][plLayerId] = plUrlDl; - } - // set plLayersStr - let plResolution = s.attributes.RESOLUTION; - plLayersRes[plLayerId] = plResolution; - let plBandwidth = Math.round(s.attributes.BANDWIDTH/1024); - if(plLayerId<10){ - plLayerId = plLayerId.toString().padStart(2,' '); - } - let qualityStrAdd = `${plLayerId}: ${plResolution.width}x${plResolution.height} (${plBandwidth}KiB/s)`; - let qualityStrRegx = new RegExp(qualityStrAdd.replace(/(:|\(|\)|\/)/g,'\\$1'),'m'); - let qualityStrMatch = !plLayersStr.join('\r\n').match(qualityStrRegx); - if(qualityStrMatch){ - plLayersStr.push(qualityStrAdd); - } - } - else { - console.log(s.uri); - } + const av = parseInt(aMatch[3]); + const bv = parseInt(bMatch[3]); + if(av > bv){ + return 1; } - - for(let s of mainServersList){ - if(plServerList.includes(s)){ - plServerList.splice(plServerList.indexOf(s), 1); - plServerList.unshift(s); - break; - } + if (av < bv) { + return -1; } - + return 0; + }); + } - argv.q = argv.q < 1 || argv.q > plMaxLayer ? plMaxLayer : argv.q; - - let plSelectedServer = plServerList[argv.x-1]; - let plSelectedList = plStreams[plSelectedServer]; - let videoUrl = argv.x < plServerList.length+1 && plSelectedList[argv.q] ? plSelectedList[argv.q] : ''; - - plLayersStr.sort(); - console.log(`[INFO] Servers available:\n\t${plServerList.join('\n\t')}`); - console.log(`[INFO] Available qualities:\n\t${plLayersStr.join('\n\t')}`); - - if(videoUrl != ''){ - console.log(`[INFO] Selected layer: ${argv.q} (${plLayersRes[argv.q].width}x${plLayersRes[argv.q].height}) @ ${plSelectedServer}`); - console.log('[INFO] Stream URL:',videoUrl); - - fnOutput = parseFileName(argv.fileName, title, fnEpNum, showTitle, season, plLayersRes[argv.q].width, plLayersRes[argv.q].height); - if (fnOutput.length < 1) - throw new Error(`Invalid path generated for input ${argv.fileName}`); - console.log(`[INFO] Output filename: ${fnOutput.join(path.sep)}.ts`); - } - else if(argv.x > plServerList.length){ - console.log('[ERROR] Server not selected!\n'); - return; + for(const s of plQualityLinkList.playlists){ + if(s.uri.match(/_Layer(\d+)\.m3u8/) || s.uri.match(vplReg)){ + // set layer and max layer + let plLayerId: number|string = 0; + const match = s.uri.match(/_Layer(\d+)\.m3u8/); + if(match){ + plLayerId = parseInt(match[1]); } else{ - console.log('[ERROR] Layer not selected!\n'); - return; + plLayerId = plNewIds, plNewIds++; } - - let dlFailed = false; - let dlFailedA = false; - - await fs.promises.mkdir(path.join(cfg.dir.content, ...fnOutput.slice(0, -1)), { recursive: true }); - - video: if (!argv.novids) { - if (plAud.uri && (purvideo.length > 0 || audioAndVideo.length > 0)) { - break video; - } else if (!plAud.uri && (audioAndVideo.some(a => a.lang === streamPath.lang) || puraudio.some(a => a.lang === streamPath.lang))) { - break video; - } - // download video - let reqVideo = await getData({ - url: videoUrl, - debug: argv.debug, - }); - if (!reqVideo.ok || !reqVideo.res) { break video; } - - let chunkList = m3u8(reqVideo.res.body); - - let tsFile = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.video${(plAud.uri ? '' : '.' + streamPath.lang )}`); - dlFailed = !await downloadFile(tsFile, chunkList); - if (!dlFailed) { - if (plAud.uri) { - purvideo.push({ - path: `${tsFile}.ts`, - lang: plAud.language - }); - } else { - audioAndVideo.push({ - path: `${tsFile}.ts`, - lang: streamPath.lang - }); - } - } + plMaxLayer = plMaxLayer < plLayerId ? plLayerId : plMaxLayer; + // set urls and servers + const plUrlDl = s.uri; + const plServer = new URL(plUrlDl).host; + if(!plServerList.includes(plServer)){ + plServerList.push(plServer); + } + if(!Object.keys(plStreams).includes(plServer)){ + plStreams[plServer] = {}; + } + if(plStreams[plServer][plLayerId] && plStreams[plServer][plLayerId] != plUrlDl){ + console.log(`[WARN] Non duplicate url for ${plServer} detected, please report to developer!`); } else{ - console.log('[INFO] Skip video downloading...\n'); + plStreams[plServer][plLayerId] = plUrlDl; } - audio: if (!argv.noaudio && plAud.uri) { - // download audio - if (audioAndVideo.some(a => a.lang === plAud.language) || puraudio.some(a => a.lang === plAud.language)) - break audio; - let reqAudio = await getData({ - url: plAud.uri, - debug: argv.debug, - }); - if (!reqAudio.ok || !reqAudio.res) { return; } - - let chunkListA = m3u8(reqAudio.res.body); - - let tsFileA = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.audio.${plAud.language}`); - - dlFailedA = !await downloadFile(tsFileA, chunkListA); - if (!dlFailedA) - puraudio.push({ - path: `${tsFileA}.ts`, - lang: plAud.language - }); - + // set plLayersStr + const plResolution = s.attributes.RESOLUTION; + plLayersRes[plLayerId] = plResolution; + const plBandwidth = Math.round(s.attributes.BANDWIDTH/1024); + if(plLayerId<10){ + plLayerId = plLayerId.toString().padStart(2,' '); } - } - - // add subs - let subsExt = !argv.mp4 || argv.mp4 && argv.ass ? '.ass' : '.srt'; - let addSubs = true; - - // download subtitles - if(stDlPath.length > 0){ - console.log('[INFO] Downloading subtitles...'); - for (let subObject of stDlPath) { - let subsSrc = await getData({ - url: subObject.path, - debug: argv.debug, - }); - if(subsSrc.ok && subsSrc.res){ - let assData = vttConvert(subsSrc.res.body, (subsExt == '.srt' ? true : false), subObject.langName, argv.fontSize); - subObject.file = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.subtitle${subObject.ext}${subsExt}`); - fs.writeFileSync(subObject.file, assData); - } - else{ - console.log('[ERROR] Failed to download subtitles!'); - addSubs = false; - break; - } + const qualityStrAdd = `${plLayerId}: ${plResolution.width}x${plResolution.height} (${plBandwidth}KiB/s)`; + const qualityStrRegx = new RegExp(qualityStrAdd.replace(/(:|\(|\)|\/)/g,'\\$1'),'m'); + const qualityStrMatch = !plLayersStr.join('\r\n').match(qualityStrRegx); + if(qualityStrMatch){ + plLayersStr.push(qualityStrAdd); } - if (addSubs) - console.log('[INFO] Subtitles downloaded!'); - } - - if((puraudio.length < 1 && audioAndVideo.length < 1) || (purvideo.length < 1 && audioAndVideo.length < 1)){ - console.log('\n[INFO] Unable to locate a video AND audio file\n'); - return; - } - - if(argv.skipmux){ - console.log('[INFO] Skipping muxing...'); - return; - } - - // check exec - const mergerBin = merger.checkMerger(cfg.bin, argv.mp4); - - if ( argv.novids ){ - console.log('[INFO] Video not downloaded. Skip muxing video.'); - } - - // mergers - if(!argv.mp4 && !mergerBin.MKVmerge){ - console.log('[WARN] MKVMerge not found...'); - } - if(!mergerBin.MKVmerge && !mergerBin.FFmpeg || argv.mp4 && !mergerBin.MKVmerge){ - console.log('[WARN] FFmpeg not found...'); + } + else { + console.log(s.uri); + } } - const ffext = !argv.mp4 ? 'mkv' : 'mp4'; - const mergeInstance = new merger({ - onlyAudio: puraudio, - onlyVid: purvideo, - output: `${path.join(cfg.dir.content, ...fnOutput)}.${ffext}`, - subtitels: stDlPath as SubtitleInput[], - videoAndAudio: audioAndVideo, - simul: argv.simul - }) - - if(!argv.mp4 && mergerBin.MKVmerge){ - let command = mergeInstance.MkvMerge(); - shlp.exec('mkvmerge', `"${mergerBin.MKVmerge}"`, command); + for(const s of mainServersList){ + if(plServerList.includes(s)){ + plServerList.splice(plServerList.indexOf(s), 1); + plServerList.unshift(s); + break; + } } - else if(mergerBin.FFmpeg){ - let command = mergeInstance.FFmpeg(); - shlp.exec('ffmpeg',`"${mergerBin.FFmpeg}"`,command); + + + argv.q = argv.q < 1 || argv.q > plMaxLayer ? plMaxLayer : argv.q; + + const plSelectedServer = plServerList[argv.x-1]; + const plSelectedList = plStreams[plSelectedServer]; + const videoUrl = argv.x < plServerList.length+1 && plSelectedList[argv.q] ? plSelectedList[argv.q] : ''; + + plLayersStr.sort(); + console.log(`[INFO] Servers available:\n\t${plServerList.join('\n\t')}`); + console.log(`[INFO] Available qualities:\n\t${plLayersStr.join('\n\t')}`); + + if(videoUrl != ''){ + console.log(`[INFO] Selected layer: ${argv.q} (${plLayersRes[argv.q].width}x${plLayersRes[argv.q].height}) @ ${plSelectedServer}`); + console.log('[INFO] Stream URL:',videoUrl); + + fnOutput = parseFileName(argv.fileName, title, fnEpNum, showTitle, season, plLayersRes[argv.q].width, plLayersRes[argv.q].height); + if (fnOutput.length < 1) + throw new Error(`Invalid path generated for input ${argv.fileName}`); + console.log(`[INFO] Output filename: ${fnOutput.join(path.sep)}.ts`); + } + else if(argv.x > plServerList.length){ + console.log('[ERROR] Server not selected!\n'); + return; } else{ - console.log('\n[INFO] Done!\n'); - return; + console.log('[ERROR] Layer not selected!\n'); + return; } - if (argv.nocleanup) - return; + + let dlFailed = false; + let dlFailedA = false; + + await fs.promises.mkdir(path.join(cfg.dir.content, ...fnOutput.slice(0, -1)), { recursive: true }); + + video: if (!argv.novids) { + if (plAud.uri && (purvideo.length > 0 || audioAndVideo.length > 0)) { + break video; + } else if (!plAud.uri && (audioAndVideo.some(a => a.lang === streamPath.lang) || puraudio.some(a => a.lang === streamPath.lang))) { + break video; + } + // download video + const reqVideo = await getData({ + url: videoUrl, + debug: argv.debug, + }); + if (!reqVideo.ok || !reqVideo.res) { break video; } + + const chunkList = m3u8(reqVideo.res.body); + + const tsFile = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.video${(plAud.uri ? '' : '.' + streamPath.lang )}`); + dlFailed = !await downloadFile(tsFile, chunkList); + if (!dlFailed) { + if (plAud.uri) { + purvideo.push({ + path: `${tsFile}.ts`, + lang: plAud.language + }); + } else { + audioAndVideo.push({ + path: `${tsFile}.ts`, + lang: streamPath.lang + }); + } + } + } + else{ + console.log('[INFO] Skip video downloading...\n'); + } + audio: if (!argv.noaudio && plAud.uri) { + // download audio + if (audioAndVideo.some(a => a.lang === plAud.language) || puraudio.some(a => a.lang === plAud.language)) + break audio; + const reqAudio = await getData({ + url: plAud.uri, + debug: argv.debug, + }); + if (!reqAudio.ok || !reqAudio.res) { return; } + + const chunkListA = m3u8(reqAudio.res.body); - audioAndVideo.concat(puraudio).concat(purvideo).forEach(a => fs.unlinkSync(a.path)); - stDlPath.forEach(subObject => subObject.file && fs.unlinkSync(subObject.file)); + const tsFileA = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.audio.${plAud.language}`); + + dlFailedA = !await downloadFile(tsFileA, chunkListA); + if (!dlFailedA) + puraudio.push({ + path: `${tsFileA}.ts`, + lang: plAud.language + }); + + } + } + + // add subs + const subsExt = !argv.mp4 || argv.mp4 && argv.ass ? '.ass' : '.srt'; + let addSubs = true; + + // download subtitles + if(stDlPath.length > 0){ + console.log('[INFO] Downloading subtitles...'); + for (const subObject of stDlPath) { + const subsSrc = await getData({ + url: subObject.path, + debug: argv.debug, + }); + if(subsSrc.ok && subsSrc.res){ + const assData = vttConvert(subsSrc.res.body, (subsExt == '.srt' ? true : false), subObject.langName, argv.fontSize); + subObject.file = path.join(cfg.dir.content, ...fnOutput.slice(0, -1), `${fnOutput.slice(-1)}.subtitle${subObject.ext}${subsExt}`); + fs.writeFileSync(subObject.file, assData); + } + else{ + console.log('[ERROR] Failed to download subtitles!'); + addSubs = false; + break; + } + } + if (addSubs) + console.log('[INFO] Subtitles downloaded!'); + } + + if((puraudio.length < 1 && audioAndVideo.length < 1) || (purvideo.length < 1 && audioAndVideo.length < 1)){ + console.log('\n[INFO] Unable to locate a video AND audio file\n'); + return; + } + + if(argv.skipmux){ + console.log('[INFO] Skipping muxing...'); + return; + } + + // check exec + const mergerBin = merger.checkMerger(cfg.bin, argv.mp4); + + if ( argv.novids ){ + console.log('[INFO] Video not downloaded. Skip muxing video.'); + } + + // mergers + if(!argv.mp4 && !mergerBin.MKVmerge){ + console.log('[WARN] MKVMerge not found...'); + } + if(!mergerBin.MKVmerge && !mergerBin.FFmpeg || argv.mp4 && !mergerBin.MKVmerge){ + console.log('[WARN] FFmpeg not found...'); + } + + const ffext = !argv.mp4 ? 'mkv' : 'mp4'; + const mergeInstance = new merger({ + onlyAudio: puraudio, + onlyVid: purvideo, + output: `${path.join(cfg.dir.content, ...fnOutput)}.${ffext}`, + subtitels: stDlPath as SubtitleInput[], + videoAndAudio: audioAndVideo, + simul: argv.simul + }); + + if(!argv.mp4 && mergerBin.MKVmerge){ + const command = mergeInstance.MkvMerge(); + shlp.exec('mkvmerge', `"${mergerBin.MKVmerge}"`, command); + } + else if(mergerBin.FFmpeg){ + const command = mergeInstance.FFmpeg(); + shlp.exec('ffmpeg',`"${mergerBin.FFmpeg}"`,command); + } + else{ console.log('\n[INFO] Done!\n'); + return; + } + if (argv.nocleanup) + return; + + audioAndVideo.concat(puraudio).concat(purvideo).forEach(a => fs.unlinkSync(a.path)); + stDlPath.forEach(subObject => subObject.file && fs.unlinkSync(subObject.file)); + console.log('\n[INFO] Done!\n'); } async function downloadFile(filename: string, chunkList: { - segments: {}[], + segments: Record[], }) { - const downloadStatus = await new hlsDownload({ - m3u8json: chunkList, - output: `${filename + '.ts'}`, - timeout: argv.timeout, - threads: argv.partsize - }).download(); + const downloadStatus = await new hlsDownload({ + m3u8json: chunkList, + output: `${filename + '.ts'}`, + timeout: argv.timeout, + threads: argv.partsize + }).download(); - return downloadStatus.ok; + return downloadStatus.ok; } function parseFileName(input: string, title: string, episode:number|string, showTitle: string, season: number, width: number, height: number): string[] { - const varRegex = /\${[A-Za-z1-9]+}/g; - const vars = input.match(varRegex); - if (!vars) - return [input]; - for (let i = 0; i < vars.length; i++) { - const type = vars[i]; - switch (type.slice(2, -1).toLowerCase()) { - case 'title': - input = input.replace(vars[i], title); - break; - case 'episode': { - if (typeof episode === 'number') { - let len = episode.toFixed(0).toString().length; - input = input.replace(vars[i], len < argv.numbers ? '0'.repeat(argv.numbers - len) + episode : episode.toString()); - } else { - input = input.replace(vars[i], episode); - } - break; - } - case 'showtitle': - input = input.replace(vars[i], showTitle); - break; - case 'season': { - let len = season.toFixed(0).toString().length; - input = input.replace(vars[i], len < argv.numbers ? '0'.repeat(argv.numbers - len) + season : season.toString()); - break; - } - case 'width': - input = input.replace(vars[i], width.toString()); - break; - case 'height': - input = input.replace(vars[i], height.toString()); - break; - default: - break; - } + const varRegex = /\${[A-Za-z1-9]+}/g; + const vars = input.match(varRegex); + if (!vars) + return [input]; + for (let i = 0; i < vars.length; i++) { + const type = vars[i]; + switch (type.slice(2, -1).toLowerCase()) { + case 'title': + input = input.replace(vars[i], title); + break; + case 'episode': { + if (typeof episode === 'number') { + const len = episode.toFixed(0).toString().length; + input = input.replace(vars[i], len < argv.numbers ? '0'.repeat(argv.numbers - len) + episode : episode.toString()); + } else { + input = input.replace(vars[i], episode); + } + break; } - return input.split(path.sep).map(a => shlp.cleanupFilename(a)); + case 'showtitle': + input = input.replace(vars[i], showTitle); + break; + case 'season': { + const len = season.toFixed(0).toString().length; + input = input.replace(vars[i], len < argv.numbers ? '0'.repeat(argv.numbers - len) + season : season.toString()); + break; + } + case 'width': + input = input.replace(vars[i], width.toString()); + break; + case 'height': + input = input.replace(vars[i], height.toString()); + break; + default: + break; + } + } + return input.split(path.sep).map(a => shlp.cleanupFilename(a)); } diff --git a/modules/build.ts b/modules/build.ts index 84199ab..a2bea81 100644 --- a/modules/build.ts +++ b/modules/build.ts @@ -5,69 +5,70 @@ import fs from 'fs-extra'; import pkg from '../package.json'; import modulesCleanup from 'removeNPMAbsolutePaths'; import { exec } from 'pkg'; +import { execSync } from 'child_process'; const buildsDir = './_builds'; const nodeVer = 'node14-'; // main (async function(){ - const buildStr = `${pkg.name}-${pkg.version}`; - const acceptableBuilds = ['win64','linux64','macos64']; - const buildType = process.argv[2]; - if(!acceptableBuilds.includes(buildType)){ - console.error('[ERROR] unknown build type!'); - process.exit(1); - } - await modulesCleanup('.'); - if(!fs.existsSync(buildsDir)){ - fs.mkdirSync(buildsDir); - } - const buildFull = `${buildStr}-${buildType}`; - const buildDir = `${buildsDir}/${buildFull}`; - if(fs.existsSync(buildDir)){ - fs.removeSync(buildDir); - } - fs.mkdirSync(buildDir); - const buildConfig = [ - pkg.main, - '--target', nodeVer + getTarget(buildType), - '--output', `${buildDir}/${pkg.short_name}`, - ]; - console.log(`[Build] Build configuration: ${buildFull}`); - try { - await exec(buildConfig); - } - catch(e){ - console.log(e); - process.exit(1); - } - fs.mkdirSync(`${buildDir}/bin`); - fs.mkdirSync(`${buildDir}/config`); - fs.mkdirSync(`${buildDir}/videos`); - fs.copySync('./bin/', `${buildDir}/bin/`); - fs.copySync('./config/bin-path.yml', `${buildDir}/config/bin-path.yml`); - fs.copySync('./config/cli-defaults.yml', `${buildDir}/config/cli-defaults.yml`); - fs.copySync('./config/dir-path.yml', `${buildDir}/config/dir-path.yml`); - fs.copySync('./modules/cmd-here.bat', `${buildDir}/cmd-here.bat`); - fs.copySync('./modules/NotoSans-Regular.ttf', `${buildDir}/NotoSans-Regular.ttf`); - fs.copySync('./package.json', `${buildDir}/package.json`) - fs.copySync('./docs/', `${buildDir}/docs/`); - fs.copySync('./LICENSE.md', `${buildDir}/docs/LICENSE.md`); - if(fs.existsSync(`${buildsDir}/${buildFull}.7z`)){ - fs.removeSync(`${buildsDir}/${buildFull}.7z`); - } - require('child_process').execSync(`7z a -t7z "${buildsDir}/${buildFull}.7z" "${buildDir}"`,{stdio:[0,1,2]}); + const buildStr = `${pkg.name}-${pkg.version}`; + const acceptableBuilds = ['win64','linux64','macos64']; + const buildType = process.argv[2]; + if(!acceptableBuilds.includes(buildType)){ + console.error('[ERROR] unknown build type!'); + process.exit(1); + } + await modulesCleanup('.'); + if(!fs.existsSync(buildsDir)){ + fs.mkdirSync(buildsDir); + } + const buildFull = `${buildStr}-${buildType}`; + const buildDir = `${buildsDir}/${buildFull}`; + if(fs.existsSync(buildDir)){ + fs.removeSync(buildDir); + } + fs.mkdirSync(buildDir); + const buildConfig = [ + pkg.main, + '--target', nodeVer + getTarget(buildType), + '--output', `${buildDir}/${pkg.short_name}`, + ]; + console.log(`[Build] Build configuration: ${buildFull}`); + try { + await exec(buildConfig); + } + catch(e){ + console.log(e); + process.exit(1); + } + fs.mkdirSync(`${buildDir}/bin`); + fs.mkdirSync(`${buildDir}/config`); + fs.mkdirSync(`${buildDir}/videos`); + fs.copySync('./bin/', `${buildDir}/bin/`); + fs.copySync('./config/bin-path.yml', `${buildDir}/config/bin-path.yml`); + fs.copySync('./config/cli-defaults.yml', `${buildDir}/config/cli-defaults.yml`); + fs.copySync('./config/dir-path.yml', `${buildDir}/config/dir-path.yml`); + fs.copySync('./modules/cmd-here.bat', `${buildDir}/cmd-here.bat`); + fs.copySync('./modules/NotoSans-Regular.ttf', `${buildDir}/NotoSans-Regular.ttf`); + fs.copySync('./package.json', `${buildDir}/package.json`); + fs.copySync('./docs/', `${buildDir}/docs/`); + fs.copySync('./LICENSE.md', `${buildDir}/docs/LICENSE.md`); + if(fs.existsSync(`${buildsDir}/${buildFull}.7z`)){ + fs.removeSync(`${buildsDir}/${buildFull}.7z`); + } + execSync(`7z a -t7z "${buildsDir}/${buildFull}.7z" "${buildDir}"`,{stdio:[0,1,2]}); }()); function getTarget(bt: string) : string { - switch(bt){ - case 'win64': - return 'windows-x64'; - case 'linux64': - return 'linux-x64'; - case 'macos64': - return 'macos-x64'; - default: - return 'windows-x64'; - } + switch(bt){ + case 'win64': + return 'windows-x64'; + case 'linux64': + return 'linux-x64'; + case 'macos64': + return 'macos-x64'; + default: + return 'windows-x64'; + } } diff --git a/modules/module.app-args.ts b/modules/module.app-args.ts index fa2e255..8445906 100644 --- a/modules/module.app-args.ts +++ b/modules/module.app-args.ts @@ -1,12 +1,12 @@ import yargs from 'yargs'; const availableFilenameVars = [ - 'title', - 'episode', - 'showTitle', - 'season', - 'width', - 'height' + 'title', + 'episode', + 'showTitle', + 'season', + 'width', + 'height' ]; export type possibleDubs = ( @@ -22,241 +22,241 @@ const dubLang: possibleDubs = ['enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP']; const appArgv = (cfg: { [key: string]: unknown }) => { - // init - const parseDefault = (key: string, _default: T) : T=> { - if (Object.prototype.hasOwnProperty.call(cfg, key)) { - return cfg[key] as T; - } else - return _default; - }; - const argv = yargs.parserConfiguration({ - 'duplicate-arguments-array': true, - 'camel-case-expansion': false + // init + const parseDefault = (key: string, _default: T) : T=> { + if (Object.prototype.hasOwnProperty.call(cfg, key)) { + return cfg[key] as T; + } else + return _default; + }; + const argv = yargs.parserConfiguration({ + 'duplicate-arguments-array': true, + 'camel-case-expansion': false + }) + // main + .wrap(Math.min(120)) // yargs.terminalWidth() + .help(false).version(false) + .usage('Usage: $0 [options]') + // auth + .option('auth', { + group: 'Authentication:', + describe: 'Enter authentication mode', + type: 'boolean', }) - // main - .wrap(Math.min(120)) // yargs.terminalWidth() - .help(false).version(false) - .usage('Usage: $0 [options]') - // auth - .option('auth', { - group: 'Authentication:', - describe: 'Enter authentication mode', - type: 'boolean', - }) - // search - .option('search', { - alias: 'f', - group: 'Search:', - describe: 'Search show ids', - type: 'string', - }) - // select show and eps - .option('s', { - group: 'Downloading:', - describe: 'Sets the show id', - type: 'number', - }) - .option('e', { - group: 'Downloading:', - describe: 'Select episode ids (comma-separated, hyphen-sequence)', - type: 'string', - }) - .option('all', { - group: 'Downloading:', - describe: 'Used to download all episodes from the show', - type: 'boolean', - default: parseDefault('all', false) - }) - .option('partsize', { - group: 'Downloading:', - describe: 'The amount of parts that should be downloaded in paralell', - type: 'number', - default: parseDefault('partsize', 10) - }) - // quality - .option('q', { - group: 'Downloading:', - describe: 'Select video layer (0 is max)', - choices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], - default: parseDefault('videoLayer', 7), - type: 'number', - }) - // alt listing - .option('alt', { - group: 'Downloading:', - describe: 'Alternative episode listing (if available)', - default: parseDefault('altList', false), - type: 'boolean', - }) - // switch to subs - .option('dub', { - group: 'Downloading:', - describe: 'Download non-Japanese Dub (English Dub mode by default)', - choices: dubLang, - default: parseDefault('dub', ['enUS']), - type: 'array', - }) - .option('subLang', { - group: 'Downloading:', - describe: 'Set the subtitle language (English is default and fallback)', - default: parseDefault('subLang', ['enUS']), - choices: subLang, - type: 'array' - }) - .option('fontSize', { - group: 'Downloading:', - describe: 'Used to set the fontsize of the subtitles', - default: parseDefault('fontSize', 55), - type: 'number' - }) - .option('allSubs', { - group: 'Downloading:', - describe: 'If set to true, all available subs will get downloaded', - default: false, - type: 'boolean' - }) - .option('allDubs', { - group: 'Downloading:', - describe: 'If set to true, all available dubs will get downloaded', - default: false, - type: 'boolean' - }) - // simulcast - .option('simul', { - group: 'Downloading:', - describe: 'Force downloading simulcast ver. instead of uncut ver. (if uncut ver. available)', - default: parseDefault('forceSimul', false), - type: 'boolean', - }) - // server number - .option('x', { - alias: 'server', - group: 'Downloading:', - describe: 'Select server', - choices: [1, 2, 3, 4], - default: parseDefault('nServer', 1), - type: 'number', - }) - // skip - .option('noaudio', { - group: 'Downloading:', - describe: 'Skip downloading audio', - type: 'boolean' - }) - .option('novids', { - group: 'Downloading:', - alias: 'skipdl', - describe: 'Skip downloading video', - type: 'boolean', - }) - .option('nosubs', { - group: 'Downloading:', - describe: 'Skip downloading subtitles for English Dub (if available)', - type: 'boolean', - default: false - }) - // proxy - .option('proxy', { - group: 'Proxy:', - describe: 'Set http(s)/socks proxy WHATWG url', - default: parseDefault('proxy', false), - hidden: true, - }) - .option('proxy-auth', { - group: 'Proxy:', - describe: 'Colon-separated username and password for proxy', - default: parseDefault('proxy_auth', false), - hidden: true, - }) - .option('ssp', { - group: 'Proxy:', - describe: 'Don\'t use proxy for stream and subtitles downloading', - default: parseDefault('proxy_ssp', false), - hidden: true, - type: 'boolean', - }) - // muxing - .option('skipmux', { - group: 'Muxing:', - describe: 'Skip muxing video and subtitles', - type: 'boolean', - }) - .option('mp4', { - group: 'Muxing:', - describe: 'Mux into mp4', - default: parseDefault('mp4mux', false), - type: 'boolean' - }) - // filenaming - .option('fileName', { - group: 'Filename Template:', - describe: `Set the filename template. Use \${variable_name} to insert variables.\nYou may use ${availableFilenameVars - .map(a => `'${a}'`).join(', ')} as variables.`, - type: 'string', - default: parseDefault('fileName', '[Funimation] ${showTitle} - ${episode} [${height}p]') - }) - .option('numbers', { - group: 'Filename Template:', - describe: `Set how long a number in the title should be at least.\n${[[3, 5, '005'], [2, 1, '01'], [1, 20, '20']] - .map(val => `Set in config: ${val[0]}; Episode number: ${val[1]}; Output: ${val[2]}`).join('\n')}`, - type: 'number', - default: parseDefault('numbers', 2) - }) - // util - .option('nocleanup', { - group: 'Utilities:', - describe: 'Dont\'t delete the input files after muxing', - default: parseDefault('noCleanUp', false), - type: 'boolean' - }) - .option('timeout', { - group: 'Downloading:', - describe: 'Set the timeout of all download reqests. Set in millisecods', - type: 'number', - default: parseDefault('timeout', 60 * 1000) - }) - .option('debug', { - group: 'Utilities:', - describe: 'Used to enter debug mode. Please use this flag when opening an issue to get more information' + // search + .option('search', { + alias: 'f', + group: 'Search:', + describe: 'Search show ids', + type: 'string', + }) + // select show and eps + .option('s', { + group: 'Downloading:', + describe: 'Sets the show id', + type: 'number', + }) + .option('e', { + group: 'Downloading:', + describe: 'Select episode ids (comma-separated, hyphen-sequence)', + type: 'string', + }) + .option('all', { + group: 'Downloading:', + describe: 'Used to download all episodes from the show', + type: 'boolean', + default: parseDefault('all', false) + }) + .option('partsize', { + group: 'Downloading:', + describe: 'The amount of parts that should be downloaded in paralell', + type: 'number', + default: parseDefault('partsize', 10) + }) + // quality + .option('q', { + group: 'Downloading:', + describe: 'Select video layer (0 is max)', + choices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + default: parseDefault('videoLayer', 7), + type: 'number', + }) + // alt listing + .option('alt', { + group: 'Downloading:', + describe: 'Alternative episode listing (if available)', + default: parseDefault('altList', false), + type: 'boolean', + }) + // switch to subs + .option('dub', { + group: 'Downloading:', + describe: 'Download non-Japanese Dub (English Dub mode by default)', + choices: dubLang, + default: parseDefault('dub', ['enUS']), + type: 'array', + }) + .option('subLang', { + group: 'Downloading:', + describe: 'Set the subtitle language (English is default and fallback)', + default: parseDefault('subLang', ['enUS']), + choices: subLang, + type: 'array' + }) + .option('fontSize', { + group: 'Downloading:', + describe: 'Used to set the fontsize of the subtitles', + default: parseDefault('fontSize', 55), + type: 'number' + }) + .option('allSubs', { + group: 'Downloading:', + describe: 'If set to true, all available subs will get downloaded', + default: false, + type: 'boolean' + }) + .option('allDubs', { + group: 'Downloading:', + describe: 'If set to true, all available dubs will get downloaded', + default: false, + type: 'boolean' + }) + // simulcast + .option('simul', { + group: 'Downloading:', + describe: 'Force downloading simulcast ver. instead of uncut ver. (if uncut ver. available)', + default: parseDefault('forceSimul', false), + type: 'boolean', + }) + // server number + .option('x', { + alias: 'server', + group: 'Downloading:', + describe: 'Select server', + choices: [1, 2, 3, 4], + default: parseDefault('nServer', 1), + type: 'number', + }) + // skip + .option('noaudio', { + group: 'Downloading:', + describe: 'Skip downloading audio', + type: 'boolean' + }) + .option('novids', { + group: 'Downloading:', + alias: 'skipdl', + describe: 'Skip downloading video', + type: 'boolean', + }) + .option('nosubs', { + group: 'Downloading:', + describe: 'Skip downloading subtitles for English Dub (if available)', + type: 'boolean', + default: false + }) + // proxy + .option('proxy', { + group: 'Proxy:', + describe: 'Set http(s)/socks proxy WHATWG url', + default: parseDefault('proxy', false), + hidden: true, + }) + .option('proxy-auth', { + group: 'Proxy:', + describe: 'Colon-separated username and password for proxy', + default: parseDefault('proxy_auth', false), + hidden: true, + }) + .option('ssp', { + group: 'Proxy:', + describe: 'Don\'t use proxy for stream and subtitles downloading', + default: parseDefault('proxy_ssp', false), + hidden: true, + type: 'boolean', + }) + // muxing + .option('skipmux', { + group: 'Muxing:', + describe: 'Skip muxing video and subtitles', + type: 'boolean', + }) + .option('mp4', { + group: 'Muxing:', + describe: 'Mux into mp4', + default: parseDefault('mp4mux', false), + type: 'boolean' + }) + // filenaming + .option('fileName', { + group: 'Filename Template:', + describe: `Set the filename template. Use \${variable_name} to insert variables.\nYou may use ${availableFilenameVars + .map(a => `'${a}'`).join(', ')} as variables.`, + type: 'string', + default: parseDefault('fileName', '[Funimation] ${showTitle} - ${episode} [${height}p]') + }) + .option('numbers', { + group: 'Filename Template:', + describe: `Set how long a number in the title should be at least.\n${[[3, 5, '005'], [2, 1, '01'], [1, 20, '20']] + .map(val => `Set in config: ${val[0]}; Episode number: ${val[1]}; Output: ${val[2]}`).join('\n')}`, + type: 'number', + default: parseDefault('numbers', 2) + }) + // util + .option('nocleanup', { + group: 'Utilities:', + describe: 'Dont\'t delete the input files after muxing', + default: parseDefault('noCleanUp', false), + type: 'boolean' + }) + .option('timeout', { + group: 'Downloading:', + describe: 'Set the timeout of all download reqests. Set in millisecods', + type: 'number', + default: parseDefault('timeout', 60 * 1000) + }) + .option('debug', { + group: 'Utilities:', + describe: 'Used to enter debug mode. Please use this flag when opening an issue to get more information' + '\n!Be careful! - Your token might be exposed so make sure to delete it!', - type: 'boolean', - default: false - }) - // help - .option('help', { - alias: 'h', - group: 'Help:', - describe: 'Show this help', - type: 'boolean' - }) - // usage - .example([ - ['$0 --search "My Hero"', 'search "My Hero" in title'], - ['$0 -s 124389 -e 1,2,3', 'download episodes 1-3 from show with id 124389'], - ['$0 -s 124389 -e 1-3,2-7,s1-2', 'download episodes 1-7 and "S"-episodes 1-2 from show with id 124389'], - ]) + type: 'boolean', + default: false + }) + // help + .option('help', { + alias: 'h', + group: 'Help:', + describe: 'Show this help', + type: 'boolean' + }) + // usage + .example([ + ['$0 --search "My Hero"', 'search "My Hero" in title'], + ['$0 -s 124389 -e 1,2,3', 'download episodes 1-3 from show with id 124389'], + ['$0 -s 124389 -e 1-3,2-7,s1-2', 'download episodes 1-7 and "S"-episodes 1-2 from show with id 124389'], + ]) - // -- - .parseSync(); + // -- + .parseSync(); // Resolve unwanted arrays - if (argv.allDubs) - argv.dub = dubLang; - if (argv.allSubs) - argv.subLang = subLang; - for (let key in argv) { - if (argv[key] instanceof Array && !(key === 'subLang' || key === 'dub')) { - argv[key] = (argv[key] as Array).pop(); - } + if (argv.allDubs) + argv.dub = dubLang; + if (argv.allSubs) + argv.subLang = subLang; + for (const key in argv) { + if (argv[key] instanceof Array && !(key === 'subLang' || key === 'dub')) { + argv[key] = (argv[key] as Array).pop(); } - return argv; + } + return argv; }; const showHelp = yargs.showHelp; export { - appArgv, - showHelp, - availableFilenameVars, - dubLang, - subLang + appArgv, + showHelp, + availableFilenameVars, + dubLang, + subLang }; diff --git a/modules/module.merger.ts b/modules/module.merger.ts index 672e510..6150580 100644 --- a/modules/module.merger.ts +++ b/modules/module.merger.ts @@ -185,16 +185,16 @@ class Merger { MKVmerge: undefined|string|false, FFmpeg: undefined|string|false } = { - MKVmerge: bin.mkvmerge, - FFmpeg: bin.ffmpeg, + MKVmerge: bin.mkvmerge, + FFmpeg: bin.ffmpeg, }; if( !useMP4format && !merger.MKVmerge ){ - console.log('[WARN] MKVMerge not found, skip using this...'); - merger.MKVmerge = false; + console.log('[WARN] MKVMerge not found, skip using this...'); + merger.MKVmerge = false; } if( !merger.MKVmerge && !merger.FFmpeg || useMP4format && !merger.FFmpeg ){ - console.log('[WARN] FFmpeg not found, skip using this...'); - merger.FFmpeg = false; + console.log('[WARN] FFmpeg not found, skip using this...'); + merger.FFmpeg = false; } return merger; diff --git a/package-lock.json b/package-lock.json index a2dd9ab..e870af7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "funimation-downloader-nx", - "version": "4.12.5", + "version": "5.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "funimation-downloader-nx", - "version": "4.12.5", + "version": "5.0.0", "license": "MIT", "dependencies": { "form-data": "^4.0.0", @@ -43,9 +43,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -149,9 +149,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", - "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -211,6 +211,15 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", @@ -267,9 +276,9 @@ } }, "node_modules/@sindresorhus/is": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", - "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz", + "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==", "engines": { "node": ">=10" }, @@ -352,9 +361,9 @@ "dev": true }, "node_modules/@types/keyv": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz", - "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", + "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", "dependencies": { "@types/node": "*" } @@ -419,15 +428,6 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/@typescript-eslint/experimental-utils": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz", @@ -452,24 +452,6 @@ "eslint": "*" } }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, "node_modules/@typescript-eslint/parser": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.2.0.tgz", @@ -571,19 +553,10 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", - "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/@videojs/vhs-utils": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.3.tgz", - "integrity": "sha512-bU7daxDHhzcTDbmty1cXjzsTYvx2cBGbA8hG5H2Gvpuk4sdfuvkZtMCwtCqL59p6dsleMPspyaNS+7tWXx2Y0A==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz", + "integrity": "sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==", "dependencies": { "@babel/runtime": "^7.12.5", "global": "^4.4.0", @@ -661,9 +634,9 @@ } }, "node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "engines": { "node": ">=8" } @@ -927,6 +900,27 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -1067,9 +1061,9 @@ } }, "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, "node_modules/defer-to-connect": { "version": "2.0.1", @@ -1301,9 +1295,9 @@ } }, "node_modules/escodegen/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -1431,6 +1425,42 @@ } }, "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", + "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/eslint-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", @@ -1445,7 +1475,7 @@ "url": "https://github.com/sponsors/mysticatea" } }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", @@ -1454,7 +1484,7 @@ "node": ">=4" } }, - "node_modules/eslint-visitor-keys": { + "node_modules/eslint/node_modules/eslint-visitor-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", @@ -1463,6 +1493,15 @@ "node": ">=10" } }, + "node_modules/eslint/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/espree": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", @@ -1511,9 +1550,9 @@ } }, "node_modules/esquery/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -1532,9 +1571,9 @@ } }, "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -1776,32 +1815,6 @@ "node": ">=0.10.0" } }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/gauge/node_modules/strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -1888,9 +1901,9 @@ "dev": true }, "node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -1929,9 +1942,9 @@ } }, "node_modules/globals": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", - "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1963,15 +1976,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globby/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/got": { "version": "11.8.2", "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", @@ -2127,9 +2131,9 @@ ] }, "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true, "engines": { "node": ">= 4" @@ -2203,9 +2207,9 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, "node_modules/is-core-module": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", - "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -2224,11 +2228,15 @@ } }, "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "dependencies": { + "number-is-nan": "^1.0.0" + }, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, "node_modules/is-glob": { @@ -2381,15 +2389,11 @@ } }, "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" + "yallist": "^3.0.2" } }, "node_modules/m3u8-parsed": { @@ -2439,19 +2443,19 @@ } }, "node_modules/mime-db": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", - "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz", - "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", "dependencies": { - "mime-db": "1.49.0" + "mime-db": "1.50.0" }, "engines": { "node": ">= 0.6" @@ -2769,9 +2773,9 @@ } }, "node_modules/pkg": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.3.3.tgz", - "integrity": "sha512-48qPxwyPvKfUuXxeK+kS3mBvfWWTX2khAdceDThbWCc8OUz3RFyO1Ft8SVkq2gQfPU2DtiPtWaf2SKH0Dlx59g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.4.0.tgz", + "integrity": "sha512-OPLjbZ0NUwv7qlutITd9/2VI/4rtCdY5YeLsecj3qDz5hdL/pW55pnUWRCVcI04ZIXSC8YMVGN5+KJP+yKDwjQ==", "dev": true, "dependencies": { "@babel/parser": "7.13.13", @@ -2835,6 +2839,29 @@ "node": ">=10" } }, + "node_modules/pkg-fetch/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-fetch/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/pkg-fetch/node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", @@ -2947,19 +2974,6 @@ "node": ">= 8" } }, - "node_modules/proxy-agent/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/proxy-agent/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -3227,6 +3241,24 @@ "node": ">=10" } }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -3432,27 +3464,41 @@ } }, "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" }, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, "node_modules/string-width/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, "node_modules/string-width/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", @@ -3463,17 +3509,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -3499,26 +3534,26 @@ } }, "node_modules/table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", + "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==", "dev": true, "dependencies": { "ajv": "^8.0.1", "lodash.clonedeep": "^4.5.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" }, "engines": { "node": ">=10.0.0" } }, "node_modules/table/node_modules/ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -3547,14 +3582,14 @@ "dev": true }, "node_modules/table/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" }, "engines": { "node": ">=8" @@ -3862,55 +3897,12 @@ "dev": true }, "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "node_modules/word-wrap": { @@ -3937,6 +3929,27 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -3959,10 +3972,9 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "node_modules/yaml": { "version": "1.10.2", @@ -3997,6 +4009,27 @@ "node": ">=10" } }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", @@ -4018,9 +4051,9 @@ } }, "@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", "dev": true }, "@babel/highlight": { @@ -4099,9 +4132,9 @@ "dev": true }, "@babel/runtime": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", - "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -4147,6 +4180,14 @@ "js-yaml": "^3.13.1", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + } } }, "@humanwhocodes/config-array": { @@ -4193,9 +4234,9 @@ } }, "@sindresorhus/is": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", - "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz", + "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==" }, "@szmarczak/http-timer": { "version": "4.0.6", @@ -4266,9 +4307,9 @@ "dev": true }, "@types/keyv": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz", - "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", + "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", "requires": { "@types/node": "*" } @@ -4315,14 +4356,6 @@ "regexpp": "^3.2.0", "semver": "^7.3.5", "tsutils": "^3.21.0" - }, - "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } } }, "@typescript-eslint/experimental-utils": { @@ -4337,17 +4370,6 @@ "@typescript-eslint/typescript-estree": "5.2.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" - }, - "dependencies": { - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - } - } } }, "@typescript-eslint/parser": { @@ -4401,20 +4423,12 @@ "requires": { "@typescript-eslint/types": "5.2.0", "eslint-visitor-keys": "^3.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", - "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", - "dev": true - } } }, "@videojs/vhs-utils": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.3.tgz", - "integrity": "sha512-bU7daxDHhzcTDbmty1cXjzsTYvx2cBGbA8hG5H2Gvpuk4sdfuvkZtMCwtCqL59p6dsleMPspyaNS+7tWXx2Y0A==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz", + "integrity": "sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==", "requires": { "@babel/runtime": "^7.12.5", "global": "^4.4.0", @@ -4467,9 +4481,9 @@ "dev": true }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", @@ -4660,6 +4674,23 @@ "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "clone-response": { @@ -4766,9 +4797,9 @@ "dev": true }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, "defer-to-connect": { "version": "2.0.1", @@ -4933,9 +4964,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "levn": { @@ -5025,6 +5056,37 @@ "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + } } }, "eslint-scope": { @@ -5038,26 +5100,26 @@ } }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" }, "dependencies": { "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true } } }, "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", + "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", "dev": true }, "espree": { @@ -5094,9 +5156,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -5111,9 +5173,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -5320,26 +5382,6 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -5409,9 +5451,9 @@ "dev": true }, "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -5441,9 +5483,9 @@ } }, "globals": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", - "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -5461,14 +5503,6 @@ "ignore": "^5.1.4", "merge2": "^1.3.0", "slash": "^3.0.0" - }, - "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } } }, "got": { @@ -5585,9 +5619,9 @@ "dev": true }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, "import-fresh": { @@ -5643,9 +5677,9 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, "is-core-module": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", - "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "dev": true, "requires": { "has": "^1.0.3" @@ -5658,9 +5692,13 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } }, "is-glob": { "version": "4.0.3", @@ -5789,12 +5827,11 @@ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" }, "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "requires": { - "yallist": "^4.0.0" + "yallist": "^3.0.2" } }, "m3u8-parsed": { @@ -5838,16 +5875,16 @@ } }, "mime-db": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", - "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==" }, "mime-types": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz", - "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", "requires": { - "mime-db": "1.49.0" + "mime-db": "1.50.0" } }, "mimic-response": { @@ -6089,9 +6126,9 @@ "dev": true }, "pkg": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.3.3.tgz", - "integrity": "sha512-48qPxwyPvKfUuXxeK+kS3mBvfWWTX2khAdceDThbWCc8OUz3RFyO1Ft8SVkq2gQfPU2DtiPtWaf2SKH0Dlx59g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.4.0.tgz", + "integrity": "sha512-OPLjbZ0NUwv7qlutITd9/2VI/4rtCdY5YeLsecj3qDz5hdL/pW55pnUWRCVcI04ZIXSC8YMVGN5+KJP+yKDwjQ==", "dev": true, "requires": { "@babel/parser": "7.13.13", @@ -6152,6 +6189,23 @@ "universalify": "^2.0.0" } }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", @@ -6228,21 +6282,6 @@ "pac-proxy-agent": "^5.0.0", "proxy-from-env": "^1.0.0", "socks-proxy-agent": "^5.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - } } }, "proxy-from-env": { @@ -6426,6 +6465,23 @@ "dev": true, "requires": { "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } } }, "set-blocking": { @@ -6579,36 +6635,39 @@ } }, "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" }, "dependencies": { "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true }, "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, "requires": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^2.0.0" } } } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "strip-json-comments": { @@ -6627,23 +6686,23 @@ } }, "table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", + "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==", "dev": true, "requires": { "ajv": "^8.0.1", "lodash.clonedeep": "^4.5.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" }, "dependencies": { "ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -6665,14 +6724,14 @@ "dev": true }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } } } @@ -6900,45 +6959,12 @@ "dev": true }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "word-wrap": { @@ -6954,6 +6980,23 @@ "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "wrappy": { @@ -6972,10 +7015,9 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "yaml": { "version": "1.10.2", @@ -6994,6 +7036,23 @@ "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "yargs-parser": { diff --git a/package.json b/package.json index 42c0632..9753fdb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "funimation-downloader-nx", "short_name": "funi", - "version": "4.12.5", + "version": "5.0.0", "description": "Download videos from Funimation via cli.", "keywords": [ "download", @@ -57,6 +57,8 @@ "build-macos64": "cd lib && node modules/build macos64", "eslint": "eslint *.js modules", "eslint-fix": "eslint *.js modules --fix", - "test": "echo \"Error: no test specified\" && exit 1" + "pretest": "npm run tsc", + "test": "cd lib && node modules/build win64 && node modules/build linux64 && node modules/build macos64" + } } diff --git a/tsc.ts b/tsc.ts index 6d28af0..613a591 100644 --- a/tsc.ts +++ b/tsc.ts @@ -1,7 +1,7 @@ -import { exec } from "child_process"; -import fs from "fs"; -import path from "path"; -import { removeSync, copyFileSync } from "fs-extra"; +import { exec } from 'child_process'; +import fs from 'fs'; +import path from 'path'; +import { removeSync, copyFileSync } from 'fs-extra'; const ignore = [ '.git', @@ -13,29 +13,29 @@ const ignore = [ (async () => { removeSync('lib'); const tsc = exec('npx tsc'); - tsc.stdout?.on("data", console.log); - tsc.stderr?.on("data", console.log); + tsc.stdout?.on('data', console.log); + tsc.stderr?.on('data', console.log); - tsc.on("close", () => { + tsc.on('close', () => { const files = readDir(__dirname); const filtered = files.filter(a => { if (a.stats.isFile()) { return a.path.split('.').pop() !== 'ts'; } else { - return true + return true; } - }) + }); filtered.forEach(item => { const itemPath = path.join(__dirname, 'lib', item.path.replace(__dirname, '')); if (item.stats.isDirectory()) { if (!fs.existsSync(itemPath)) - fs.mkdirSync(itemPath) + fs.mkdirSync(itemPath); } else { - copyFileSync(item.path, itemPath) + copyFileSync(item.path, itemPath); } - }) - }) -})() + }); + }); +})(); const readDir = (dir: string) : { path: string, @@ -56,8 +56,8 @@ const readDir = (dir: string) : { stats }); if (stats.isDirectory()) { - items.push(...readDir(itemPath)) + items.push(...readDir(itemPath)); } } return items; -} \ No newline at end of file +}; \ No newline at end of file