From 5abc0115df58e6359d7ed798a984317227495a44 Mon Sep 17 00:00:00 2001 From: Izuco Date: Wed, 27 Oct 2021 22:46:08 +0200 Subject: [PATCH 1/5] Inital --- .eslintrc.js | 31 - .eslintrc.json | 33 + .gitignore | 2 +- @types/hls-download.d.ts | 28 + @types/items.d.ts | 237 + @types/m3u8-parsed.d.ts | 48 + @types/sei-helper.d.ts | 3 + funi.js => funi.ts | 135 +- modules/iso639.d.ts | 9 + ...{module.app-args.js => module.app-args.ts} | 21 +- modules/module.cfg-loader.js | 129 - modules/module.cfg-loader.ts | 148 + modules/module.getdata.js | 97 - modules/module.getdata.ts | 129 + modules/module.merger.js | 195 - modules/module.merger.ts | 182 + modules/module.parseSelect.js | 96 - modules/module.parseSelect.ts | 94 + modules/module.vttconvert.js | 166 - modules/module.vttconvert.ts | 174 + package-lock.json | 4058 ++++++++++++++++- package.json | 8 +- tsconfig.json | 69 + 23 files changed, 5288 insertions(+), 804 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 .eslintrc.json create mode 100644 @types/hls-download.d.ts create mode 100644 @types/items.d.ts create mode 100644 @types/m3u8-parsed.d.ts create mode 100644 @types/sei-helper.d.ts rename funi.js => funi.ts (88%) create mode 100644 modules/iso639.d.ts rename modules/{module.app-args.js => module.app-args.ts} (93%) delete mode 100644 modules/module.cfg-loader.js create mode 100644 modules/module.cfg-loader.ts delete mode 100644 modules/module.getdata.js create mode 100644 modules/module.getdata.ts delete mode 100644 modules/module.merger.js create mode 100644 modules/module.merger.ts delete mode 100644 modules/module.parseSelect.js create mode 100644 modules/module.parseSelect.ts delete mode 100644 modules/module.vttconvert.js create mode 100644 modules/module.vttconvert.ts create mode 100644 tsconfig.json diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index beb6893..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,31 +0,0 @@ -module.exports = { - 'env': { - 'commonjs': true, - 'es2021': true, - 'node': true - }, - 'extends': 'eslint:recommended', - 'parserOptions': { - 'ecmaVersion': 12 - }, - 'rules': { - 'no-empty': [ - 'error', - { allowEmptyCatch: true } - ], - 'indent': [ - 'error', - 4, - { 'SwitchCase': 1 } - ], - 'linebreak-style': 'off', - 'quotes': [ - 'error', - 'single' - ], - 'semi': [ - 'error', - 'always' - ] - } -}; diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..856a44e --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,33 @@ +{ + "env": { + "es2021": true, + "node": true + }, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended" + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": 12, + "sourceType": "module" + }, + "plugins": [ + "@typescript-eslint" + ], + "rules": { + "@typescript-eslint/no-explicit-any": "off", + "indent": [ + "error", + 2 + ], + "quotes": [ + "error", + "single" + ], + "semi": [ + "error", + "always" + ] + } +} diff --git a/.gitignore b/.gitignore index e2bc5fc..a9ecb05 100644 --- a/.gitignore +++ b/.gitignore @@ -3,13 +3,13 @@ /_builds/* /node_modules/ /videos/*.json +/videos/*.ts .DS_Store ffmpeg mkvmerge token.yml *.exe *.dll -*.ts *.mkv *.mp4 *.ass diff --git a/@types/hls-download.d.ts b/@types/hls-download.d.ts new file mode 100644 index 0000000..3ce039f --- /dev/null +++ b/@types/hls-download.d.ts @@ -0,0 +1,28 @@ +declare module 'hls-download' { + export default class hlsDownload { + constructor(options: { + m3u8json: { + segments: { + + }[], + mediaSequence?: number, + }, + output?: string, + threads?: number, + retries?: number, + offset?: number, + baseurl?: string, + proxy?: string, + skipInit?: boolean, + timeout?: number + }) + async download() : { + ok: boolean, + parts: { + first: number, + total: number, + compleated: number + } + } + } +} \ No newline at end of file diff --git a/@types/items.d.ts b/@types/items.d.ts new file mode 100644 index 0000000..7062bec --- /dev/null +++ b/@types/items.d.ts @@ -0,0 +1,237 @@ +export interface Item { + // Added later + id: string, + id_split: (number|string)[] + // Added from the start + mostRecentSvodJpnUs: MostRecentSvodJpnUs; + synopsis: string; + mediaCategory: ContentType; + mostRecentSvodUsEndTimestamp: number; + quality: QualityClass; + genres: Genre[]; + titleImages: TitleImages; + engAllTerritoryAvail: EngAllTerritoryAvail; + thumb: string; + mostRecentSvodJpnAllTerrStartTimestamp: number; + title: string; + starRating: number; + primaryAvail: PrimaryAvail; + access: Access[]; + version: Version[]; + mostRecentSvodJpnAllTerrEndTimestamp: number; + itemId: number; + versionAudio: VersionAudio; + contentType: ContentType; + mostRecentSvodUsStartTimestamp: number; + poster: string; + mostRecentSvodEngAllTerrEndTimestamp: number; + mostRecentSvodJpnUsStartTimestamp: number; + mostRecentSvodJpnUsEndTimestamp: number; + mostRecentSvodStartTimestamp: number; + mostRecentSvod: MostRecent; + altAvail: AltAvail; + ids: IDs; + mostRecentSvodUs: MostRecent; + item: Item; + mostRecentSvodEngAllTerrStartTimestamp: number; + audio: Audio[]; + mostRecentAvod: MostRecent; +} + +export enum Access { + AVODSimulcastEnglish = "A-VOD_Simulcast_English", + AVODUncutEnglish = "A-VOD_Uncut_English", + SVODSimulcastEnglish = "SVOD_Simulcast_English", + SVODUncutEnglish = "SVOD_Uncut_English", +} + +export enum AltAvail { + MostRecentSvodJpnUs = "most_recent_svod_jpn_us", +} + +export enum Audio { + English = "English", +} + +export enum ContentType { + Episode = "episode", + Ova = "ova", +} + +export enum EngAllTerritoryAvail { + MostRecentSvodEngAllTerr = "most_recent_svod_eng_all_terr", +} + +export enum Genre { + ActionAdventure = "Action/Adventure", + Comedy = "Comedy", + Drama = "Drama", + Fantasy = "Fantasy", +} + +export interface IDs { + externalShowId: ID; + externalSeasonId: ExternalSeasonID; + externalEpisodeId: string; + externalAsianId?: string +} + +export enum ExternalSeasonID { + TrsS11 = "TRS-S1-1", + TrsS22 = "TRS-S2-2", +} + +export enum ID { + Trs = "TRS", +} + +export interface Item { + seasonTitle: SeasonTitle; + seasonId: number; + episodeOrder: number; + episodeSlug: string; + created: Date; + titleSlug: TitleSlug; + episodeNum: string; + episodeId: number; + titleId: number; + seasonNum: string; + ratings: Array; + showImage: string; + titleName: TitleName; + runtime: string; + episodeName: string; + seasonOrder: number; + titleExternalId: ID; +} + +export enum SeasonTitle { + Season1 = "Season 1", + Season2 = "Season 2", +} + +export enum TitleName { + ThatTimeIGotReincarnatedAsASlime = "That Time I Got Reincarnated as a Slime", +} + +export enum TitleSlug { + ThatTimeIGotReincarnatedAsASlime = "that-time-i-got-reincarnated-as-a-slime", +} + +export interface MostRecent { + image?: string; + siblingStartTimestamp?: string; + devices?: Device[]; + availId?: number; + distributor?: Distributor; + quality?: MostRecentAvodQuality; + endTimestamp?: string; + mediaCategory?: ContentType; + isPromo?: boolean; + siblingType?: Purchase; + version?: Version; + territory?: Territory; + startDate?: Date; + endDate?: Date; + versionId?: number; + tier?: Device | null; + purchase?: Purchase; + startTimestamp?: string; + language?: Audio; + itemTitle?: string; + ids?: MostRecentAvodIDS; + experience?: number; + siblingEndTimestamp?: string; + item?: Item; + subscriptionRequired?: boolean; + purchased?: boolean; +} + +export enum Device { + All = "All", +} + +export enum Distributor { + FunimationVenue = "FunimationVenue", +} + +export interface MostRecentAvodIDS { + externalSeasonId: ExternalSeasonID; + externalAsianId: null; + externalShowId: ID; + externalEpisodeId: string; + externalEnglishId: string; + externalAlphaId: string; +} + +export enum Purchase { + AVOD = "A-VOD", + Dfov = "DFOV", + Est = "EST", + Svod = "SVOD", +} + +export enum MostRecentAvodQuality { + HD1080 = "HD 1080", +} + +export enum Territory { + Usa = "USA", +} + +export enum Version { + Simulcast = "Simulcast", + Uncut = "Uncut", +} + +export interface MostRecentSvodJpnUs { +} + +export enum PrimaryAvail { + MostRecentSvodUs = "most_recent_svod_us", +} + +export interface QualityClass { + quality: QualityQuality; + height: number; +} + +export enum QualityQuality { + HD = "HD", + SD = "SD", +} + +export interface TitleImages { + showThumbnail: string; + showBackgroundSite: string; + showDetailHeaderDesktop: string; + continueWatchingDesktop: string; + showDetailHeroSite: string; + appleHorizontalBannerShow: string; + backgroundImageXbox_360: string; + applePosterCover: string; + showDetailBoxArtTablet: string; + featuredShowBackgroundTablet: string; + backgroundImageAppletvfiretv: string; + newShowDetailHero: string; + showDetailHeroDesktop: string; + showKeyart: string; + continueWatchingMobile: string; + featuredSpotlightShowPhone: string; + appleHorizontalBannerMovie: string; + featuredSpotlightShowTablet: string; + showDetailBoxArtPhone: string; + featuredShowBackgroundPhone: string; + appleSquareCover: string; + backgroundVideo: string; + showMasterKeyArt: string; + newShowDetailHeroPhone: string; + showDetailBoxArtXbox_360: string; + showDetailHeaderMobile: string; + showLogo: string; +} + +export interface VersionAudio { + Uncut?: Audio[]; + Simulcast: Audio[]; +} \ No newline at end of file diff --git a/@types/m3u8-parsed.d.ts b/@types/m3u8-parsed.d.ts new file mode 100644 index 0000000..f16f908 --- /dev/null +++ b/@types/m3u8-parsed.d.ts @@ -0,0 +1,48 @@ +declare module 'm3u8-parsed' { + export default function (data: string): { + allowCache: boolean, + discontinuityStarts: [], + segments: { + duration: number, + byterange?: { + length: number, + offset: number + }, + uri: string, + key: { + method: string, + uri: string, + }, + timeline: number + }[], + version: number, + mediaGroups?: { + [type: string]: { + [index: string]: { + [language: string]: { + default: boolean, + autoselect: boolean, + language: string, + uri: string + } + } + } + }, + playlists?: { + uri: string, + timeline: number, + attributes: { + "CLOSED-CAPTIONS": string, + "AUDIO": string, + "FRAME-RATE": number, + "RESOLUTION": { + width: number, + height: number + }, + "CODECS": string, + "AVERAGE-BANDWIDTH": string, + "BANDWIDTH": number + } + }[], + } +} \ No newline at end of file diff --git a/@types/sei-helper.d.ts b/@types/sei-helper.d.ts new file mode 100644 index 0000000..224c060 --- /dev/null +++ b/@types/sei-helper.d.ts @@ -0,0 +1,3 @@ +declare module 'sei-helper' { + export async function question(qStr: string): string; +} \ No newline at end of file diff --git a/funi.js b/funi.ts similarity index 88% rename from funi.js rename to funi.ts index 6eeeaec..815b304 100644 --- a/funi.js +++ b/funi.ts @@ -1,45 +1,42 @@ #!/usr/bin/env node // modules build-in -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; // package json -const packageJson = require('./package.json'); +const packageJson = JSON.parse(fs.readFileSync('./package.json').toString()) // program name console.log(`\n=== Funimation Downloader NX ${packageJson.version} ===\n`); const api_host = 'https://prod-api-funimationnow.dadcdigital.com/api'; // modules extra -const shlp = require('sei-helper'); -const m3u8 = require('m3u8-parsed'); -const hlsDownload = require('hls-download'); +import * as shlp from 'sei-helper'; +import m3u8 from 'm3u8-parsed'; +import hlsDownload from 'hls-download'; // extra -const appYargs = require('./modules/module.app-args'); -const yamlCfg = require('./modules/module.cfg-loader'); -const vttConvert = require('./modules/module.vttconvert'); +import * as appYargs from './modules/module.app-args'; +import * as yamlCfg from './modules/module.cfg-loader'; +import vttConvert from './modules/module.vttconvert'; + +// types +import { Item } from "./@types/items"; // params const cfg = yamlCfg.loadCfg(); let token = yamlCfg.loadFuniToken(); - // cli const argv = appYargs.appArgv(cfg.cli); // Import modules after argv has been exported -const getData = require('./modules/module.getdata.js'); -const merger = require('./modules/module.merger'); -const parseSelect = require('./modules/module.parseSelect'); +import getData from './modules/module.getdata.js'; +import merger from './modules/module.merger'; +import parseSelect from './modules/module.parseSelect'; // check page -if(!isNaN(parseInt(argv.p, 10)) && parseInt(argv.p, 10) > 0){ - argv.p = parseInt(argv.p, 10); -} -else{ - argv.p = 1; -} +argv.p = 1; // fn variables let title = '', @@ -61,7 +58,7 @@ let title = '', else if(argv.search){ searchShow(); } - else if(argv.s && !isNaN(parseInt(argv.s, 10)) && parseInt(argv.s, 10) > 0){ + else if(argv.s && argv.s > 0){ getShow(); } else{ @@ -71,24 +68,26 @@ let title = '', // auth async function auth(){ - let authOpts = {}; - authOpts.user = await shlp.question('[Q] LOGIN/EMAIL'); - authOpts.pass = await shlp.question('[Q] PASSWORD '); + 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/', - useProxy: true, auth: authOpts, debug: argv.debug, }); - if(authData.ok){ - authData = JSON.parse(authData.res.body); - if(authData.token){ + 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', authData.token.slice(0,8),'*'.repeat(32)); - yamlCfg.saveFuniToken({'token': authData.token}); - } - else if(authData.error){ - console.log('[ERROR]%s\n', authData.error); + yamlCfg.saveFuniToken({'token': resJSON.token}); + } else { + console.log('[ERROR]%s\n', ' No token found'); + if (argv.debug) { + console.log(resJSON); + } process.exit(1); } } @@ -96,30 +95,29 @@ async function auth(){ // search show async function searchShow(){ - let qs = {unique: true, limit: 100, q: argv.search, offset: (argv.p-1)*1000 }; + 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, - useProxy: true, debug: argv.debug, }); - if(!searchData.ok){return;} - searchData = JSON.parse(searchData.res.body); - if(searchData.detail){ - console.log(`[ERROR] ${searchData.detail}`); + if(!searchData.ok || !searchData.res){return;} + const searchDataJSON = JSON.parse(searchData.res.body); + if(searchDataJSON.detail){ + console.log(`[ERROR] ${searchDataJSON.detail}`); return; } - if(searchData.items && searchData.items.hits){ - let shows = searchData.items.hits; + 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',searchData.count); + console.log('[INFO] Total shows found: %s\n',searchDataJSON.count); } // get show @@ -127,27 +125,32 @@ async function getShow(){ // show main data let showData = await getData({ baseUrl: api_host, - url: `/source/catalog/title/${parseInt(argv.s, 10)}`, + url: `/source/catalog/title/${argv.s}`, token: token, useToken: true, - useProxy: true, debug: argv.debug, }); // check errors - if(!showData.ok){return;} - showData = JSON.parse(showData.res.body); - if(showData.status){ - console.log('[ERROR] Error #%d: %s\n', showData.status, showData.data.errors[0].detail); + 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(!showData.items || showData.items.length<1){ + else if(!showDataJSON.items || showDataJSON.items.length<1){ console.log('[ERROR] Show not found\n'); process.exit(0); } - showData = showData.items[0]; - console.log('[#%s] %s (%s)',showData.id,showData.title,showData.releaseYear); + const showDataItem = showDataJSON.items[0]; + console.log('[#%s] %s (%s)',showDataItem.id,showDataItem.title,showDataItem.releaseYear); // show episodes - let qs = { limit: -1, sort: 'order', sort_direction: 'ASC', title_id: parseInt(argv.s, 10) }; + let 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, @@ -155,24 +158,26 @@ async function getShow(){ querystring: qs, token: token, useToken: true, - useProxy: true, debug: argv.debug, }); - if(!episodesData.ok){return;} + if(!episodesData.ok || !episodesData.res){return;} - - let epsDataArr = JSON.parse(episodesData.res.body).items; + 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; - const parseEpStr = (epStr) => { - epStr = epStr.match(epNumRegex); - if(epStr.length > 2){ - epStr = [...epStr].splice(1); - epStr[0] = epStr[0] ? epStr[0] : ''; - return epStr; + const parseEpStr = (epStr: string) => { + const match = epStr.match(epNumRegex); + if (!match) { + console.error('[ERROR] No match found') + return ['', ''] } - else return [ '', epStr[0] ]; + 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 => { @@ -192,23 +197,23 @@ async function getShow(){ return e; }); - epSelList = parseSelect(argv.e); + epSelList = parseSelect(argv.e as string); let fnSlug = [], is_selected = false; let eps = epsDataArr; epsDataArr.sort((a, b) => { - if (a.item.seasonOrder < b.item.seasonOrder && a.id < b.id) { + if (a.item.seasonOrder < b.item.seasonOrder && a.id.localeCompare(b.id) < 0) { return -1; } - if (a.item.seasonOrder > b.item.seasonOrder && a.id > b.id) { + 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().padStart(epIdLen, '0'); + 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; diff --git a/modules/iso639.d.ts b/modules/iso639.d.ts new file mode 100644 index 0000000..04b1bb9 --- /dev/null +++ b/modules/iso639.d.ts @@ -0,0 +1,9 @@ +declare module 'iso-639' { + export type iso639Type = { + [key: string]: { + '639-1'?: string, + '639-2'?: string + } + } + export const iso_639_2: iso639Type; +} \ No newline at end of file diff --git a/modules/module.app-args.js b/modules/module.app-args.ts similarity index 93% rename from modules/module.app-args.js rename to modules/module.app-args.ts index ac4918c..74f1380 100644 --- a/modules/module.app-args.js +++ b/modules/module.app-args.ts @@ -1,4 +1,4 @@ -const yargs = require('yargs'); +import yargs from 'yargs'; const availableFilenameVars = [ 'title', @@ -12,9 +12,11 @@ const availableFilenameVars = [ const subLang = ['enUS', 'esLA', 'ptBR']; const dubLang = ['enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP']; -const appArgv = (cfg) => { +const appArgv = (cfg: { + [key: string]: unknown +}) => { // init - const parseDefault = (key, _default) => { + const parseDefault = (key: string, _default: unknown) => { if (Object.prototype.hasOwnProperty.call(cfg, key)) { return cfg[key]; } else @@ -207,6 +209,13 @@ const appArgv = (cfg) => { 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', @@ -222,7 +231,7 @@ const appArgv = (cfg) => { ]) // -- - .argv; + .parseSync(); // Resolve unwanted arrays if (argv.allDubs) argv.dub = dubLang; @@ -230,7 +239,7 @@ const appArgv = (cfg) => { argv.subLang = subLang; for (let key in argv) { if (argv[key] instanceof Array && !(key === 'subLang' || key === 'dub')) { - argv[key] = argv[key].pop(); + argv[key] = (argv[key] as Array).pop(); } } return argv; @@ -238,7 +247,7 @@ const appArgv = (cfg) => { const showHelp = yargs.showHelp; -module.exports = { +export { appArgv, showHelp, availableFilenameVars, diff --git a/modules/module.cfg-loader.js b/modules/module.cfg-loader.js deleted file mode 100644 index cdf3120..0000000 --- a/modules/module.cfg-loader.js +++ /dev/null @@ -1,129 +0,0 @@ -const path = require('path'); -const yaml = require('yaml'); -const fs = require('fs-extra'); -const { lookpath } = require('lookpath'); - -// new-cfg -const workingDir = process.pkg ? path.dirname(process.execPath) : path.join(__dirname, '/..'); -const binCfgFile = path.join(workingDir, 'config', 'bin-path'); -const dirCfgFile = path.join(workingDir, 'config', 'dir-path'); -const cliCfgFile = path.join(workingDir, 'config', 'cli-defaults'); -const tokenFile = path.join(workingDir, 'config', 'token'); - -const loadYamlCfgFile = (file, isSess) => { - if(fs.existsSync(`${file}.user.yml`) && !isSess){ - file += '.user'; - } - file += '.yml'; - if(fs.existsSync(file)){ - try{ - return yaml.parse(fs.readFileSync(file, 'utf8')); - } - catch(e){ - console.log('[ERROR]', e); - return {}; - } - } - return {}; -}; - -const loadCfg = () => { - // load cfgs - const cfg = { - bin: '', - dir: loadYamlCfgFile(dirCfgFile), - cli: loadYamlCfgFile(cliCfgFile), - }; - // check each cfg object - for(const ctype of Object.keys(cfg)){ - if(typeof cfg[ctype] !== 'object' || cfg[ctype] === null || Array.isArray(cfg[ctype])){ - cfg[ctype] = {}; - } - } - // set defaults for dirs - const defaultDirs = { - fonts: '${wdir}/fonts/', - content: '${wdir}/videos/', - trash: '${wdir}/videos/_trash/', - }; - for(const dir of Object.keys(defaultDirs)){ - if(!Object.prototype.hasOwnProperty.call(cfg.dir, dir) || typeof cfg.dir[dir] != 'string'){ - cfg.dir[dir] = defaultDirs[dir]; - } - if (!path.isAbsolute(cfg.dir[dir])){ - if(cfg.dir[dir].match(/^\${wdir}/)){ - cfg.dir[dir] = cfg.dir[dir].replace(/^\${wdir}/, ''); - } - cfg.dir[dir] = path.join(workingDir, cfg.dir[dir]); - } - } - if(!fs.existsSync(cfg.dir.content)){ - try{ - fs.ensureDirSync(cfg.dir.content); - } - catch(e){ - console.log('[ERROR] Content directory not accessible!'); - return; - } - } - if(!fs.existsSync(cfg.dir.trash)){ - cfg.dir.trash = cfg.dir.content; - } - // output - return cfg; -}; - -const loadBinCfg = async () => { - let binCfg = loadYamlCfgFile(binCfgFile); - // binaries - const defaultBin = { - ffmpeg: '${wdir}/bin/ffmpeg/ffmpeg', - mkvmerge: '${wdir}/bin/mkvtoolnix/mkvmerge', - }; - for(const dir of Object.keys(defaultBin)){ - if(!Object.prototype.hasOwnProperty.call(binCfg, dir) || typeof binCfg[dir] != 'string'){ - binCfg[dir] = defaultBin[dir]; - } - if (!path.isAbsolute(binCfg[dir]) && binCfg[dir].match(/^\${wdir}/)){ - binCfg[dir] = binCfg[dir].replace(/^\${wdir}/, ''); - binCfg[dir] = path.join(workingDir, binCfg[dir]); - } - binCfg[dir] = await lookpath(binCfg[dir]); - binCfg[dir] = binCfg[dir] ? binCfg[dir] : false; - if(!binCfg[dir]){ - const binFile = await lookpath(path.basename(defaultBin[dir])); - binCfg[dir] = binFile ? binFile : binCfg[dir]; - } - } - return binCfg; -}; - -const loadFuniToken = () => { - let token = loadYamlCfgFile(tokenFile, true); - if (token === null) token = false; - else if (token.token === null) token = false; - else token = token.token; - // info if token not set - if(!token){ - console.log('[INFO] Token not set!\n'); - } - return token; -}; - -const saveFuniToken = (data) => { - const cfgFolder = path.dirname(tokenFile); - try{ - fs.ensureDirSync(cfgFolder); - fs.writeFileSync(`${tokenFile}.yml`, yaml.stringify(data)); - } - catch(e){ - console.log('[ERROR] Can\'t save token file to disk!'); - } -}; - -module.exports = { - loadCfg, - loadBinCfg, - loadFuniToken, - saveFuniToken, -}; diff --git a/modules/module.cfg-loader.ts b/modules/module.cfg-loader.ts new file mode 100644 index 0000000..6dca5c6 --- /dev/null +++ b/modules/module.cfg-loader.ts @@ -0,0 +1,148 @@ +import path from 'path'; +import yaml from 'yaml'; +import fs from 'fs-extra'; +import { lookpath } from 'lookpath'; + +// new-cfg +const workingDir = (process as NodeJS.Process & { + pkg?: unknown +}).pkg ? path.dirname(process.execPath) : path.join(__dirname, '/..'); +const binCfgFile = path.join(workingDir, 'config', 'bin-path'); +const dirCfgFile = path.join(workingDir, 'config', 'dir-path'); +const cliCfgFile = path.join(workingDir, 'config', 'cli-defaults'); +const tokenFile = path.join(workingDir, 'config', 'token'); + +const loadYamlCfgFile = >(file: string, isSess?: boolean): T => { + if(fs.existsSync(`${file}.user.yml`) && !isSess){ + file += '.user'; + } + file += '.yml'; + if(fs.existsSync(file)){ + try{ + return yaml.parse(fs.readFileSync(file, 'utf8')); + } + catch(e){ + console.log('[ERROR]', e); + return {} as T; + } + } + return {} as T; +}; + +export type ConfigObject = { + dir: { + content: string, + trash: string, + fonts: string; + }, + bin: { + ffmpeg?: string, + mkvmerge?: string + }, + cli: { + [key: string]: any + } +} + +const loadCfg = () : ConfigObject => { + // load cfgs + const defaultCfg: ConfigObject = { + bin: {}, + dir: loadYamlCfgFile<{ + content: string, + trash: string, + fonts: string + }>(dirCfgFile), + cli: loadYamlCfgFile<{ + [key: string]: any + }>(cliCfgFile), + }; + const defaultDirs = { + fonts: '${wdir}/fonts/', + content: '${wdir}/videos/', + trash: '${wdir}/videos/_trash/', + }; + if (typeof defaultCfg.dir !== 'object' || defaultCfg.dir === null || Array.isArray(defaultCfg.dir)) { + defaultCfg.dir = defaultDirs; + } + + const keys = Object.keys(defaultDirs) as (keyof typeof defaultDirs)[]; + for (const key of keys) { + if (!Object.prototype.hasOwnProperty.call(defaultCfg.dir, key) || typeof defaultCfg.dir[key] !== 'string') { + defaultCfg.dir[key] = defaultDirs[key]; + } + if (!path.isAbsolute(defaultCfg.dir[key])) { + defaultCfg.dir[key] = path.join(workingDir, defaultCfg.dir[key].replace(/^\${wdir}/, '')); + } + } + + if(!fs.existsSync(defaultCfg.dir.content)){ + try{ + fs.ensureDirSync(defaultCfg.dir.content); + } + catch(e){ + console.log('[ERROR] Content directory not accessible!'); + return defaultCfg; + } + } + if(!fs.existsSync(defaultCfg.dir.trash)){ + defaultCfg.dir.trash = defaultCfg.dir.content; + } + // output + return defaultCfg; +}; + +const loadBinCfg = async () => { + const binCfg = loadYamlCfgFile(binCfgFile); + // binaries + const defaultBin = { + ffmpeg: '${wdir}/bin/ffmpeg/ffmpeg', + mkvmerge: '${wdir}/bin/mkvtoolnix/mkvmerge', + }; + const keys = Object.keys(defaultBin) as (keyof typeof defaultBin)[]; + for(const dir of keys){ + if(!Object.prototype.hasOwnProperty.call(binCfg, dir) || typeof binCfg[dir] != 'string'){ + binCfg[dir] = defaultBin[dir]; + } + if (!path.isAbsolute(binCfg[dir] as string) && (binCfg[dir] as string).match(/^\${wdir}/)){ + binCfg[dir] = (binCfg[dir] as string).replace(/^\${wdir}/, ''); + binCfg[dir] = path.join(workingDir, binCfg[dir] as string); + } + binCfg[dir] = await lookpath(binCfg[dir] as string); + binCfg[dir] = binCfg[dir] ? binCfg[dir] : undefined; + if(!binCfg[dir]){ + const binFile = await lookpath(path.basename(defaultBin[dir])); + binCfg[dir] = binFile ? binFile : binCfg[dir]; + } + } + return binCfg; +}; + +const loadFuniToken = () => { + const loadedToken = loadYamlCfgFile<{ + token?: string + }>(tokenFile, true); + let token: false|string = false; + if (loadedToken && loadedToken.token) + token = loadedToken.token; + // info if token not set + if(!token){ + console.log('[INFO] Token not set!\n'); + } + return token; +}; + +const saveFuniToken = (data: { + token?: string +}) => { + const cfgFolder = path.dirname(tokenFile); + try{ + fs.ensureDirSync(cfgFolder); + fs.writeFileSync(`${tokenFile}.yml`, yaml.stringify(data)); + } + catch(e){ + console.log('[ERROR] Can\'t save token file to disk!'); + } +}; + +export { loadBinCfg, loadCfg, loadFuniToken, saveFuniToken }; \ No newline at end of file diff --git a/modules/module.getdata.js b/modules/module.getdata.js deleted file mode 100644 index a986d93..0000000 --- a/modules/module.getdata.js +++ /dev/null @@ -1,97 +0,0 @@ -const got = require('got'); - -// Used for future updates -// const argv = require('../funi').argv; -// -// const lang = { -// 'ptBR': { -// langCode: 'pt-BR', -// regionCode: 'BR' -// }, -// 'esLA': { -// langCode: 'es-LA', -// regionCode: 'MX' -// } -// }; - -// do req -const getData = async (options) => { - let regionHeaders = {}; - - - let gOptions = { - url: options.url, - headers: { - 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:70.0) Gecko/20100101 Firefox/70.0', - 'Accept-Encoding': 'gzip', - ...regionHeaders - } - }; - if(options.responseType) { - gOptions.responseType = options.responseType; - } - if(options.baseUrl){ - gOptions.prefixUrl = options.baseUrl; - gOptions.url = gOptions.url.replace(/^\//,''); - } - if(options.querystring){ - gOptions.url += `?${new URLSearchParams(options.querystring).toString()}`; - } - if(options.auth){ - gOptions.method = 'POST'; - gOptions.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'; - gOptions.headers['Origin'] = 'https://www.funimation.com'; - gOptions.headers['Accept'] = 'application/json, text/javascript, */*; q=0.01'; - gOptions.headers['Accept-Encoding'] = 'gzip, deflate, br'; - gOptions.headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:89.0) Gecko/20100101 Firefox/89.0'; - gOptions.body = `username=${encodeURIComponent(options.auth.user)}&password=${encodeURIComponent(options.auth.pass)}`; - } - if(options.useToken && options.token){ - gOptions.headers.Authorization = `Token ${options.token}`; - } - if(options.dinstid){ - gOptions.headers.devicetype = 'Android Phone'; - } - // debug - gOptions.hooks = { - beforeRequest: [ - (gotOpts) => { - if(options.debug){ - console.log('[DEBUG] GOT OPTIONS:'); - console.log(gotOpts); - } - } - ] - }; - try { - let res = await got(gOptions); - if(res.body && (options.responseType !== 'buffer' && res.body.match(/^, + auth?: { + user: string, + pass: string + }, + useToken?: boolean, + token?: string|boolean, + dinstid?: boolean, + debug?: boolean +} +const getData = async (options: Options) => { + const regionHeaders = {}; + + + const gOptions = { + url: options.url, + headers: { + 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:70.0) Gecko/20100101 Firefox/70.0', + 'Accept-Encoding': 'gzip', + ...regionHeaders + } + } as OptionsOfUnknownResponseBody; + if(options.responseType) { + gOptions.responseType = options.responseType; + } + if(options.baseUrl){ + gOptions.prefixUrl = options.baseUrl; + gOptions.url = gOptions.url?.toString().replace(/^\//,''); + } + if(options.querystring){ + gOptions.url += `?${new URLSearchParams(options.querystring).toString()}`; + } + if(options.auth){ + gOptions.method = 'POST'; + const newHeaders = { + ...gOptions.headers, + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + 'Origin': 'https://ww.funimation.com', + 'Accept': 'application/json, text/javascript, */*; q=0.01', + 'Accept-Encoding': 'gzip, deflate, br', + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:89.0) Gecko/20100101 Firefox/89.0' + }; + gOptions.headers = newHeaders; + gOptions.body = `username=${encodeURIComponent(options.auth.user)}&password=${encodeURIComponent(options.auth.pass)}`; + } + if(options.useToken && options.token){ + gOptions.headers = { + ...gOptions.headers, + Authorization: `Token ${options.token}` + }; + } + if(options.dinstid){ + gOptions.headers = { + ...gOptions.headers, + devicetype: 'Android Phone' + }; + } + // debug + gOptions.hooks = { + beforeRequest: [ + (gotOpts) => { + if(options.debug){ + console.log('[DEBUG] GOT OPTIONS:'); + console.log(gotOpts); + } + } + ] + }; + try { + const res = await got(gOptions); + if(res.body && (options.responseType !== 'buffer' && (res.body as string).match(/^ + }; + if(options.debug){ + console.log(error); + } + if(error.response && error.response.statusCode && error.response.statusMessage){ + console.log(`[ERROR] ${error.name} ${error.response.statusCode}: ${error.response.statusMessage}`); + } + else if(error.name && error.name == 'HTMLError' && error.res && error.res.body){ + console.log(`[ERROR] ${error.name}:`); + console.log(error.res.body); + } + else{ + console.log(`[ERROR] ${error.name}: ${error.code||error.message}`); + } + return { + ok: false, + error, + }; + } +}; + +export default getData; diff --git a/modules/module.merger.js b/modules/module.merger.js deleted file mode 100644 index 5e944cd..0000000 --- a/modules/module.merger.js +++ /dev/null @@ -1,195 +0,0 @@ -const iso639 = require('iso-639'); - -/** - * @param {Array} bin config paths - * @param {boolean} use mp4 format - * @returns {Array} - */ -// check mergers programs -const checkMerger = (bin, useMP4format) => { - const merger = { - MKVmerge: bin.mkvmerge, - FFmpeg: bin.ffmpeg, - }; - if( !useMP4format && !merger.MKVmerge ){ - 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; - } - return merger; -}; - -/** - * @param {Array} videoAndAudio - * @param {Array} onlyVid - * @param {Array} onlyAudio - * @param {Array} subtitles - * @param {string} output - * @returns {string} - */ -const buildCommandFFmpeg = (simul, videoAndAudio, onlyVid, onlyAudio, subtitles, output) => { - let args = []; - let metaData = []; - - let index = 0; - let audioIndex = 0; - let hasVideo = false; - for (let vid of videoAndAudio) { - args.push(`-i "${vid.path}"`); - if (!hasVideo) { - metaData.push(`-map ${index}`); - metaData.push(`-metadata:s:a:${audioIndex} language=${getLanguageCode(vid.lang, vid.lang)}`); - metaData.push(`-metadata:s:v:${index} title="[Funimation]"`); - hasVideo = true; - } else { - metaData.push(`-map ${index}:a`); - metaData.push(`-metadata:s:a:${audioIndex} language=${getLanguageCode(vid.lang, vid.lang)}`); - } - audioIndex++; - index++; - } - - for (let vid of onlyVid) { - if (!hasVideo) { - args.push(`-i "${vid.path}"`); - metaData.push(`-map ${index} -map -${index}:a`); - metaData.push(`-metadata:s:v:${index} title="[Funimation]"`); - hasVideo = true; - index++; - } - } - - for (let aud of onlyAudio) { - args.push(`-i "${aud.path}"`); - metaData.push(`-map ${index}`); - metaData.push(`-metadata:s:a:${audioIndex} language=${getLanguageCode(aud.lang, aud.lang)}`); - index++; - audioIndex++; - } - - for (let index in subtitles) { - let sub = subtitles[index]; - args.push(`-i "${sub.file}"`); - } - - args.push(...metaData); - args.push(...subtitles.map((_, subIndex) => `-map ${subIndex + index}`)); - args.push( - '-c:v copy', - '-c:a copy' - ); - args.push(output.split('.').pop().toLowerCase() === 'mp4' ? '-c:s mov_text' : '-c:s ass'); - args.push(...subtitles.map((sub, subindex) => `-metadata:s:${index + subindex} language=${getLanguageCode(sub.language)}`)); - args.push(`"${output}"`); - return args.join(' '); -}; - -/** - * @param {string} videoFile - * @param {object} audioFile - * @param {Array} subtitles - * @returns {string} - */ -const buildCommandMkvMerge = (simul, videoAndAudio, onlyVid, onlyAudio, subtitles, output) => { - let args = []; - - let hasVideo = false; - - args.push(`-o "${output}"`); - args.push( - '--no-date', - '--disable-track-statistics-tags', - '--engage no_variable_data', - ); - - for (let vid of onlyVid) { - if (!hasVideo) { - args.push( - '--video-tracks 0', - '--no-audio' - ); - let trackName = subDict[vid.lang] + (simul ? ' [Simulcast]' : ' [Uncut]'); - args.push('--track-name', `0:"${trackName}"`); - args.push(`--language 0:${getLanguageCode(vid.lang, vid.lang)}`); - hasVideo = true; - args.push(`"${vid.path}"`); - } - } - - for (let vid of videoAndAudio) { - if (!hasVideo) { - args.push( - '--video-tracks 0', - '--audio-tracks 1' - ); - let trackName = subDict[vid.lang] + (simul ? ' [Simulcast]' : ' [Uncut]'); - args.push('--track-name', `0:"${trackName}"`); - args.push('--track-name', `1:"${trackName}"`); - args.push(`--language 1:${getLanguageCode(vid.lang, vid.lang)}`); - hasVideo = true; - } else { - args.push( - '--no-video', - '--audio-tracks 1' - ); - let trackName = subDict[vid.lang] + (simul ? ' [Simulcast]' : ' [Uncut]'); - args.push('--track-name', `1:"${trackName}"`); - args.push(`--language 1:${getLanguageCode(vid.lang, vid.lang)}`); - } - args.push(`"${vid.path}"`); - } - - for (let aud of onlyAudio) { - let trackName = subDict[aud.lang] + (simul ? ' [Simulcast]' : ' [Uncut]'); - args.push('--track-name', `0:"${trackName}"`); - args.push(`--language 0:${getLanguageCode(aud.lang, aud.lang)}`); - args.push( - '--no-video', - '--audio-tracks 0' - ); - args.push(`"${aud.path}"`); - } - - if (subtitles.length > 0) { - for (let subObj of subtitles) { - let trackName = subDict[subObj.language] + (simul ? ' [Simulcast]' : ' [Uncut]'); - args.push('--track-name', `0:"${trackName}"`); - args.push('--language', `0:${getLanguageCode(subObj.language)}`); - args.push(`"${subObj.file}"`); - } - } else { - args.push( - '--no-subtitles', - '--no-attachments' - ); - } - - return args.join(' '); -}; -const subDict = { - 'en': 'English (United State)', - 'es': 'Español (Latinoamericano)', - 'pt': 'Português (Brasil)', - 'ja': '日本語', - 'cmn': '官話' -}; -const getLanguageCode = (from, _default = 'eng') => { - if (from === 'cmn') return 'chi'; - for (let lang in iso639.iso_639_2) { - let langObj = iso639.iso_639_2[lang]; - if (Object.prototype.hasOwnProperty.call(langObj, '639-1') && langObj['639-1'] === from) { - return langObj['639-2']; - } - } - return _default; -}; - -module.exports = { - checkMerger, - getLanguageCode, - buildCommandFFmpeg, - buildCommandMkvMerge -}; \ No newline at end of file diff --git a/modules/module.merger.ts b/modules/module.merger.ts new file mode 100644 index 0000000..e2b51e9 --- /dev/null +++ b/modules/module.merger.ts @@ -0,0 +1,182 @@ +import * as iso639 from 'iso-639'; + +export type MergerInput = { + path: string, + lang: string, +} + +export type SubtitleInput = { + language: string, + file: string, +} + +export type MergerOptions = { + videoAndAudio: MergerInput[], + onlyVid: MergerInput[], + onlyAudio: MergerInput[], + subtitels: SubtitleInput[], + output: string, + simul?: boolean +} + +class Merger { + private subDict = { + 'en': 'English (United State)', + 'es': 'Español (Latinoamericano)', + 'pt': 'Português (Brasil)', + 'ja': '日本語', + 'cmn': '官話' + } as { + [key: string]: string; + }; + + constructor(private options: MergerOptions) {} + + public FFmpeg() : string { + const args = []; + const metaData = []; + + let index = 0; + let audioIndex = 0; + let hasVideo = false; + for (const vid of this.options.videoAndAudio) { + args.push(`-i "${vid.path}"`); + if (!hasVideo) { + metaData.push(`-map ${index}`); + metaData.push(`-metadata:s:a:${audioIndex} language=${Merger.getLanguageCode(vid.lang, vid.lang)}`); + metaData.push(`-metadata:s:v:${index} title="[Funimation]"`); + hasVideo = true; + } else { + metaData.push(`-map ${index}:a`); + metaData.push(`-metadata:s:a:${audioIndex} language=${Merger.getLanguageCode(vid.lang, vid.lang)}`); + } + audioIndex++; + index++; + } + + for (const vid of this.options.onlyVid) { + if (!hasVideo) { + args.push(`-i "${vid.path}"`); + metaData.push(`-map ${index} -map -${index}:a`); + metaData.push(`-metadata:s:v:${index} title="[Funimation]"`); + hasVideo = true; + index++; + } + } + + for (const aud of this.options.onlyAudio) { + args.push(`-i "${aud.path}"`); + metaData.push(`-map ${index}`); + metaData.push(`-metadata:s:a:${audioIndex} language=${Merger.getLanguageCode(aud.lang, aud.lang)}`); + index++; + audioIndex++; + } + + for (const index in this.options.subtitels) { + const sub = this.options.subtitels[index]; + args.push(`-i "${sub.file}"`); + } + + args.push(...metaData); + args.push(...this.options.subtitels.map((_, subIndex) => `-map ${subIndex + index}`)); + args.push( + '-c:v copy', + '-c:a copy' + ); + args.push(this.options.output.split('.').pop()?.toLowerCase() === 'mp4' ? '-c:s mov_text' : '-c:s ass'); + args.push(...this.options.subtitels.map((sub, subindex) => `-metadata:s:${index + subindex} language=${Merger.getLanguageCode(sub.language)}`)); + args.push(`"${this.options.output}"`); + return args.join(' '); + } + + public static getLanguageCode = (from: string, _default = 'eng'): string => { + if (from === 'cmn') return 'chi'; + for (const lang in iso639.iso_639_2) { + const langObj = iso639.iso_639_2[lang]; + if (Object.prototype.hasOwnProperty.call(langObj, '639-1') && langObj['639-1'] === from) { + return langObj['639-2'] as string; + } + } + return _default; + }; + + public MkvMerge = () => { + const args = []; + + let hasVideo = false; + + args.push(`-o "${this.options.output}"`); + args.push( + '--no-date', + '--disable-track-statistics-tags', + '--engage no_variable_data', + ); + + for (const vid of this.options.onlyVid) { + if (!hasVideo) { + args.push( + '--video-tracks 0', + '--no-audio' + ); + const trackName = this.subDict[vid.lang] + (this.options.simul ? ' [Simulcast]' : ' [Uncut]'); + args.push('--track-name', `0:"${trackName}"`); + args.push(`--language 0:${Merger.getLanguageCode(vid.lang, vid.lang)}`); + hasVideo = true; + args.push(`"${vid.path}"`); + } + } + + for (const vid of this.options.videoAndAudio) { + if (!hasVideo) { + args.push( + '--video-tracks 0', + '--audio-tracks 1' + ); + const trackName = this.subDict[vid.lang] + (this.options.simul ? ' [Simulcast]' : ' [Uncut]'); + args.push('--track-name', `0:"${trackName}"`); + args.push('--track-name', `1:"${trackName}"`); + args.push(`--language 1:${Merger.getLanguageCode(vid.lang, vid.lang)}`); + hasVideo = true; + } else { + args.push( + '--no-video', + '--audio-tracks 1' + ); + const trackName = this.subDict[vid.lang] + (this.options.simul ? ' [Simulcast]' : ' [Uncut]'); + args.push('--track-name', `1:"${trackName}"`); + args.push(`--language 1:${Merger.getLanguageCode(vid.lang, vid.lang)}`); + } + args.push(`"${vid.path}"`); + } + + for (const aud of this.options.onlyAudio) { + const trackName = this.subDict[aud.lang] + (this.options.simul ? ' [Simulcast]' : ' [Uncut]'); + args.push('--track-name', `0:"${trackName}"`); + args.push(`--language 0:${Merger.getLanguageCode(aud.lang, aud.lang)}`); + args.push( + '--no-video', + '--audio-tracks 0' + ); + args.push(`"${aud.path}"`); + } + + if (this.options.subtitels.length > 0) { + for (const subObj of this.options.subtitels) { + const trackName = this.subDict[subObj.language] + (this.options.simul ? ' [Simulcast]' : ' [Uncut]'); + args.push('--track-name', `0:"${trackName}"`); + args.push('--language', `0:${Merger.getLanguageCode(subObj.language)}`); + args.push(`"${subObj.file}"`); + } + } else { + args.push( + '--no-subtitles', + '--no-attachments' + ); + } + + return args.join(' '); + }; + +} + +export default Merger; \ No newline at end of file diff --git a/modules/module.parseSelect.js b/modules/module.parseSelect.js deleted file mode 100644 index 3ae95d4..0000000 --- a/modules/module.parseSelect.js +++ /dev/null @@ -1,96 +0,0 @@ -/** - * @param {string} selectString - * @returns {{ - * isSelected: (val: string) => boolean, - * values: string[] - * }} - */ -module.exports = (selectString) => { - if (!selectString) - return { - values: [], - isSelected: () => false - }; - let parts = selectString.split(','); - let select = []; - - - parts.forEach(part => { - if (part.includes('-')) { - let splits = part.split('-'); - if (splits.length !== 2) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - - let firstPart = splits[0]; - let match = firstPart.match(/[A-Za-z]+/); - if (match && match.length > 0) { - if (match.index && match.index !== 0) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - let letters = firstPart.substring(0, match[0].length); - let number = parseInt(firstPart.substring(match[0].length)); - let b = parseInt(splits[1]); - if (isNaN(number) || isNaN(b)) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - for (let i = number; i <= b; i++) { - select.push(`${letters}${i}`); - } - - } else { - let a = parseInt(firstPart); - let b = parseInt(splits[1]); - if (isNaN(a) || isNaN(b)) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - for (let i = a; i <= b; i++) { - select.push(`${i}`); - } - } - - } else { - let match = part.match(/[A-Za-z]+/); - if (match && match.length > 0) { - if (match.index && match.index !== 0) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - let letters = part.substring(0, match[0].length); - let number = parseInt(part.substring(match[0].length)); - if (isNaN(number)) { - console.log(`[WARN] Unable to parse input "${part}"`); - return; - } - select.push(`${letters}${number}`); - } else { - select.push(`${parseInt(part)}`); - } - } - }); - - return { - values: select, - isSelected: (st) => { - let match = st.match(/[A-Za-z]+/); - if (match && match.length > 0) { - if (match.index && match.index !== 0) { - return false; - } - let letter = st.substring(0, match[0].length); - let number = parseInt(st.substring(match[0].length)); - if (isNaN(number)) { - return false; - } - - return select.includes(`${letter}${number}`); - } else { - return select.includes(`${parseInt(st)}`); - } - } - }; -}; \ No newline at end of file diff --git a/modules/module.parseSelect.ts b/modules/module.parseSelect.ts new file mode 100644 index 0000000..2bcf5a3 --- /dev/null +++ b/modules/module.parseSelect.ts @@ -0,0 +1,94 @@ +const parseSelect = (selectString: string) : { + isSelected: (val: string) => boolean, + values: string[] +} => { + if (!selectString) + return { + values: [], + isSelected: () => false + }; + const parts = selectString.split(','); + const select: string[] = []; + + + parts.forEach(part => { + if (part.includes('-')) { + const splits = part.split('-'); + if (splits.length !== 2) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + + const firstPart = splits[0]; + const match = firstPart.match(/[A-Za-z]+/); + if (match && match.length > 0) { + if (match.index && match.index !== 0) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + const letters = firstPart.substring(0, match[0].length); + const number = parseInt(firstPart.substring(match[0].length)); + const b = parseInt(splits[1]); + if (isNaN(number) || isNaN(b)) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + for (let i = number; i <= b; i++) { + select.push(`${letters}${i}`); + } + + } else { + const a = parseInt(firstPart); + const b = parseInt(splits[1]); + if (isNaN(a) || isNaN(b)) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + for (let i = a; i <= b; i++) { + select.push(`${i}`); + } + } + + } else { + const match = part.match(/[A-Za-z]+/); + if (match && match.length > 0) { + if (match.index && match.index !== 0) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + const letters = part.substring(0, match[0].length); + const number = parseInt(part.substring(match[0].length)); + if (isNaN(number)) { + console.log(`[WARN] Unable to parse input "${part}"`); + return; + } + select.push(`${letters}${number}`); + } else { + select.push(`${parseInt(part)}`); + } + } + }); + + return { + values: select, + isSelected: (st) => { + const match = st.match(/[A-Za-z]+/); + if (match && match.length > 0) { + if (match.index && match.index !== 0) { + return false; + } + const letter = st.substring(0, match[0].length); + const number = parseInt(st.substring(match[0].length)); + if (isNaN(number)) { + return false; + } + + return select.includes(`${letter}${number}`); + } else { + return select.includes(`${parseInt(st)}`); + } + } + }; +}; + +export default parseSelect; \ No newline at end of file diff --git a/modules/module.vttconvert.js b/modules/module.vttconvert.js deleted file mode 100644 index dcdfba9..0000000 --- a/modules/module.vttconvert.js +++ /dev/null @@ -1,166 +0,0 @@ -// vtt loader -function loadVtt(vttStr) { - const rx = /^([\d:.]*) --> ([\d:.]*)\s?(.*?)\s*$/; - const lines = vttStr.replace(/\r?\n/g, '\n').split('\n'); - let data = [], lineBuf = [], record = null; - // check lines - for (let l of lines) { - let m = l.match(rx); - if (m) { - if (lineBuf.length > 0) { - lineBuf.pop(); - } - if (record !== null) { - record.text = lineBuf.join('\n'); - data.push(record); - } - record = { - time_start: m[1], - time_end: m[2], - ext_param: m[3].split(' ').map(x => x.split(':')).reduce((p, c) => (p[c[0]] = c[1]) && p, {}), - }; - lineBuf = []; - continue; - } - lineBuf.push(l); - } - if (record !== null) { - if (lineBuf[lineBuf.length - 1] === '') { - lineBuf.pop(); - } - record.text = lineBuf.join('\n'); - data.push(record); - } - return data; -} - -// ass specific -function convertToAss(vttStr, lang, fontSize){ - let ass = [ - '\ufeff[Script Info]', - `Title: ${lang}`, - 'ScriptType: v4.00+', - 'PlayResX: 1280', - 'PlayResY: 720', - 'WrapStyle: 0', - 'ScaledBorderAndShadow: yes', - '', - '[V4+ Styles]', - 'Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, ' - + 'Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, ' - + 'BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding', - `Style: Main,Noto Sans,${fontSize},&H00FFFFFF,&H000000FF,&H00020713,&H00000000,0,0,0,0,100,100,0,0,1,3,0,2,10,10,10,1`, - `Style: MainTop,Noto Sans,${fontSize},&H00FFFFFF,&H000000FF,&H00020713,&H00000000,0,0,0,0,100,100,0,0,1,3,0,8,10,10,10`, - '', - '[Events]', - 'Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text', - ]; - - let vttData = loadVtt(vttStr); - for (let l of vttData) { - l = convertToAssLine(l, 'Main'); - ass = ass.concat(l); - } - - return ass.join('\r\n') + '\r\n'; -} - -function convertToAssLine(l, style) { - let start = convertTime(l.time_start); - let end = convertTime(l.time_end); - let text = convertToAssText(l.text); - - // debugger - if (l.ext_param.line === '7%') { - style = 'MainTop'; - } - - if (l.ext_param.line === '10%') { - style = 'MainTop'; - } - - return `Dialogue: 0,${start},${end},${style},,0,0,0,,${text}`; -} - -function convertToAssText(text) { - text = text - .replace(/\r/g, '') - .replace(/\n/g, '\\N') - .replace(/\\N +/g, '\\N') - .replace(/ +\\N/g, '\\N') - .replace(/(\\N)+/g, '\\N') - .replace(/]*>([^<]*)<\/b>/g, '{\\b1}$1{\\b0}') - .replace(/]*>([^<]*)<\/i>/g, '{\\i1}$1{\\i0}') - .replace(/]*>([^<]*)<\/u>/g, '{\\u1}$1{\\u0}') - .replace(/</g, '<') - .replace(/>/g, '>') - .replace(/&/g, '&') - .replace(/<[^>]>/g, '') - .replace(/\\N$/, '') - .replace(/ +$/, ''); - return text; -} - -// srt specific -function convertToSrt(vttStr){ - let srt = [], srtLineIdx = 0; - - let vttData = loadVtt(vttStr); - for (let l of vttData) { - srtLineIdx++; - l = convertToSrtLine(l, srtLineIdx); - srt = srt.concat(l); - } - - return srt.join('\r\n') + '\r\n'; -} - -function convertToSrtLine(l, idx) { - let bom = idx == 1 ? '\ufeff' : ''; - let start = convertTime(l.time_start, true); - let end = convertTime(l.time_end, true); - let text = l.text; - return `${bom}${idx}\r\n${start} --> ${end}\r\n${text}\r\n`; -} - -// time parser -function convertTime(time, srtFormat) { - let mTime = time.match(/([\d:]*)\.?(\d*)/); - if (!mTime){ - return srtFormat ? '00:00:00,000' : '0:00:00.00'; - } - return toSubsTime(mTime[0], srtFormat); -} - -function toSubsTime(str, srtFormat) { - - let n = [], x, sx; - x = str.split(/[:.]/).map(x => Number(x)); - - let msLen = srtFormat ? 3 : 2; - let hLen = srtFormat ? 2 : 1; - - x[3] = '0.' + ('' + x[3]).padStart(3, '0'); - sx = x[0]*60*60 + x[1]*60 + x[2] + Number(x[3]); - sx = sx.toFixed(msLen).split('.'); - - - n.unshift(padTimeNum((srtFormat ? ',' : '.'), sx[1], msLen)); - sx = Number(sx[0]); - - n.unshift(padTimeNum(':', sx%60, 2)); - n.unshift(padTimeNum(':', Math.floor(sx/60)%60, 2)); - n.unshift(padTimeNum('', Math.floor(sx/3600)%60, hLen)); - - return n.join(''); -} - -function padTimeNum(sep, input, pad){ - return sep + ('' + input).padStart(pad, '0'); -} - -// export module -module.exports = (vttStr, toSrt, lang = 'English', fontSize) => { - const convert = toSrt ? convertToSrt : convertToAss; - return convert(vttStr, lang, fontSize); -}; diff --git a/modules/module.vttconvert.ts b/modules/module.vttconvert.ts new file mode 100644 index 0000000..24293ba --- /dev/null +++ b/modules/module.vttconvert.ts @@ -0,0 +1,174 @@ +// vtt loader +export type Record = { + text?: string, + time_start?: string, + time_end?: string, + ext_param?: unknown +}; +export type NullRecord = Record | null; + +function loadVtt(vttStr: string) { + const rx = /^([\d:.]*) --> ([\d:.]*)\s?(.*?)\s*$/; + const lines = vttStr.replace(/\r?\n/g, '\n').split('\n'); + const data = []; let lineBuf = [], record: NullRecord = null; + // check lines + for (const l of lines) { + const m = l.match(rx); + if (m) { + if (lineBuf.length > 0) { + lineBuf.pop(); + } + if (record !== null) { + record.text = lineBuf.join('\n'); + data.push(record); + } + record = { + time_start: m[1], + time_end: m[2], + ext_param: m[3].split(' ').map(x => x.split(':')).reduce((p: any, c: any) => (p[c[0]] = c[1]) && p, {}), + }; + lineBuf = []; + continue; + } + lineBuf.push(l); + } + if (record !== null) { + if (lineBuf[lineBuf.length - 1] === '') { + lineBuf.pop(); + } + record.text = lineBuf.join('\n'); + data.push(record); + } + return data; +} + +// ass specific +function convertToAss(vttStr: string, lang: string, fontSize: number){ + let ass = [ + '\ufeff[Script Info]', + `Title: ${lang}`, + 'ScriptType: v4.00+', + 'PlayResX: 1280', + 'PlayResY: 720', + 'WrapStyle: 0', + 'ScaledBorderAndShadow: yes', + '', + '[V4+ Styles]', + 'Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, ' + + 'Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, ' + + 'BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding', + `Style: Main,Noto Sans,${fontSize},&H00FFFFFF,&H000000FF,&H00020713,&H00000000,0,0,0,0,100,100,0,0,1,3,0,2,10,10,10,1`, + `Style: MainTop,Noto Sans,${fontSize},&H00FFFFFF,&H000000FF,&H00020713,&H00000000,0,0,0,0,100,100,0,0,1,3,0,8,10,10,10`, + '', + '[Events]', + 'Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text', + ]; + + const vttData = loadVtt(vttStr); + for (const l of vttData) { + const line = convertToAssLine(l, 'Main'); + ass = ass.concat(line); + } + + return ass.join('\r\n') + '\r\n'; +} + +function convertToAssLine(l: Record, style: string) { + const start = convertTime(l.time_start as string); + const end = convertTime(l.time_end as string); + const text = convertToAssText(l.text as string); + + // debugger + if ((l.ext_param as any).line === '7%') { + style = 'MainTop'; + } + + if ((l.ext_param as any).line === '10%') { + style = 'MainTop'; + } + + return `Dialogue: 0,${start},${end},${style},,0,0,0,,${text}`; +} + +function convertToAssText(text: string) { + text = text + .replace(/\r/g, '') + .replace(/\n/g, '\\N') + .replace(/\\N +/g, '\\N') + .replace(/ +\\N/g, '\\N') + .replace(/(\\N)+/g, '\\N') + .replace(/]*>([^<]*)<\/b>/g, '{\\b1}$1{\\b0}') + .replace(/]*>([^<]*)<\/i>/g, '{\\i1}$1{\\i0}') + .replace(/]*>([^<]*)<\/u>/g, '{\\u1}$1{\\u0}') + .replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/<[^>]>/g, '') + .replace(/\\N$/, '') + .replace(/ +$/, ''); + return text; +} + +// srt specific +function convertToSrt(vttStr: string){ + let srt: string[] = [], srtLineIdx = 0; + + const vttData = loadVtt(vttStr); + for (const l of vttData) { + srtLineIdx++; + const line = convertToSrtLine(l, srtLineIdx); + srt = srt.concat(line); + } + + return srt.join('\r\n') + '\r\n'; +} + +function convertToSrtLine(l: Record, idx: number) : string { + const bom = idx == 1 ? '\ufeff' : ''; + const start = convertTime(l.time_start as string, true); + const end = convertTime(l.time_end as string, true); + const text = l.text; + return `${bom}${idx}\r\n${start} --> ${end}\r\n${text}\r\n`; +} + +// time parser +function convertTime(time: string, srtFormat = false) { + const mTime = time.match(/([\d:]*)\.?(\d*)/); + if (!mTime){ + return srtFormat ? '00:00:00,000' : '0:00:00.00'; + } + return toSubsTime(mTime[0], srtFormat); +} + +function toSubsTime(str: string, srtFormat: boolean) : string { + + const n = [], x: (string|number)[] = str.split(/[:.]/).map(x => Number(x)); let sx; + + const msLen = srtFormat ? 3 : 2; + const hLen = srtFormat ? 2 : 1; + + x[3] = '0.' + ('' + x[3]).padStart(3, '0'); + sx = (x[0] as number)*60*60 + (x[1] as number)*60 + (x[2] as number) + Number(x[3]); + sx = sx.toFixed(msLen).split('.'); + + + n.unshift(padTimeNum((srtFormat ? ',' : '.'), sx[1], msLen)); + sx = Number(sx[0]); + + n.unshift(padTimeNum(':', sx%60, 2)); + n.unshift(padTimeNum(':', Math.floor(sx/60)%60, 2)); + n.unshift(padTimeNum('', Math.floor(sx/3600)%60, hLen)); + + return n.join(''); +} + +function padTimeNum(sep: string, input: string|number , pad:number){ + return sep + ('' + input).padStart(pad, '0'); +} + +// export module +const _default = (vttStr: string, toSrt: boolean, lang = 'English', fontSize: number) => { + const convert = toSrt ? convertToSrt : convertToAss; + return convert(vttStr, lang, fontSize); +}; +export default _default; diff --git a/package-lock.json b/package-lock.json index 4f73764..08caaaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,3868 @@ { "name": "funimation-downloader-nx", "version": "4.12.5", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "funimation-downloader-nx", + "version": "4.12.5", + "license": "MIT", + "dependencies": { + "form-data": "^4.0.0", + "fs-extra": "^10.0.0", + "got": "^11.7.0", + "hls-download": "^2.6.3", + "iso-639": "^0.2.2", + "lookpath": "^1.1.0", + "m3u8-parsed": "^1.3.0", + "sei-helper": "^3.3.0", + "yaml": "^1.10.0", + "yargs": "^17.2.1" + }, + "devDependencies": { + "@types/fs-extra": "^9.0.13", + "@types/node": "^16.11.6", + "@types/yargs": "^17.0.4", + "@typescript-eslint/eslint-plugin": "^5.2.0", + "@typescript-eslint/parser": "^5.2.0", + "eslint": "^7.30.0", + "pkg": "^5.3.3", + "removeNPMAbsolutePaths": "^2.0.0", + "typescript": "^4.4.4" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.14.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.13.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz", + "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", + "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.13.12", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz", + "integrity": "sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@sindresorhus/is": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", + "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dependencies": { + "defer-to-connect": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/cacheable-request": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", + "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", + "dependencies": { + "@types/http-cache-semantics": "*", + "@types/keyv": "*", + "@types/node": "*", + "@types/responselike": "*" + } + }, + "node_modules/@types/fs-extra": { + "version": "9.0.13", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", + "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" + }, + "node_modules/@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", + "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==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "16.11.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz", + "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==" + }, + "node_modules/@types/responselike": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", + "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/yargs": { + "version": "17.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.4.tgz", + "integrity": "sha512-D/wihO9WFYqwsmJI0e0qS+U09wIQtYRSBJlXWjTFGjouEuOCy0BU4N/ZK5utb00S5lW/9LO7vOpvGDd8M06NvQ==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "20.2.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", + "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.2.0.tgz", + "integrity": "sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "5.2.0", + "@typescript-eslint/scope-manager": "5.2.0", + "debug": "^4.3.2", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "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", + "integrity": "sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.2.0", + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/typescript-estree": "5.2.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "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", + "integrity": "sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.2.0", + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/typescript-estree": "5.2.0", + "debug": "^4.3.2" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz", + "integrity": "sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/visitor-keys": "5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.2.0.tgz", + "integrity": "sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz", + "integrity": "sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/visitor-keys": "5.2.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz", + "integrity": "sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.2.0", + "eslint-visitor-keys": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "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==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, + "node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "node_modules/are-we-there-yet": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", + "dev": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ast-types": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/cacheable-lookup": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "engines": { + "node": ">=10.6.0" + } + }, + "node_modules/cacheable-request": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", + "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", + "dependencies": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dependencies": { + "mimic-response": "^1.0.0" + } + }, + "node_modules/code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-uri-to-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", + "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, + "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=" + }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/degenerator": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz", + "integrity": "sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ==", + "dependencies": { + "ast-types": "^0.13.2", + "escodegen": "^1.8.1", + "esprima": "^4.0.0", + "vm2": "^3.9.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/degenerator/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/degenerator/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/degenerator/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/degenerator/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/degenerator/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "dev": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/escodegen/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "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==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "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/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/espree/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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "node_modules/fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/file-uri-to-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz", + "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "dev": true + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "node_modules/fs-extra": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/ftp": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", + "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=", + "dependencies": { + "readable-stream": "1.1.x", + "xregexp": "2.0.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/ftp/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "node_modules/ftp/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/ftp/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "node_modules/gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "dependencies": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "node_modules/gauge/node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true, + "engines": { + "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", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-uri": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz", + "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==", + "dependencies": { + "@tootallnate/once": "1", + "data-uri-to-buffer": "3", + "debug": "4", + "file-uri-to-path": "2", + "fs-extra": "^8.1.0", + "ftp": "^0.3.10" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/get-uri/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/get-uri/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/get-uri/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", + "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==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/global": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "dependencies": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, + "node_modules/globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "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", + "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==", + "dependencies": { + "@sindresorhus/is": "^4.0.0", + "@szmarczak/http-timer": "^4.0.5", + "@types/cacheable-request": "^6.0.1", + "@types/responselike": "^1.0.0", + "cacheable-lookup": "^5.0.3", + "cacheable-request": "^7.0.1", + "decompress-response": "^6.0.0", + "http2-wrapper": "^1.0.0-beta.5.2", + "lowercase-keys": "^2.0.0", + "p-cancelable": "^2.0.0", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=10.19.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, + "node_modules/hls-download": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/hls-download/-/hls-download-2.6.3.tgz", + "integrity": "sha512-rmUIjwS7r1S0r2WdcWOHpzgyJlByKO06RihUlvWx2dZwlBjFIrBXvbtVjlk2UvktgTACZtPrVIrwAk74hmf8dw==", + "dependencies": { + "got": "^11.7.0", + "proxy-agent": "^5.0.0", + "sei-helper": "^3.3.0" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + }, + "node_modules/http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http2-wrapper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.0.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "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/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/into-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz", + "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==", + "dev": true, + "dependencies": { + "from2": "^2.3.0", + "p-is-promise": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ip": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "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==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "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/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/iso-639": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/iso-639/-/iso-639-0.2.2.tgz", + "integrity": "sha1-itOC5fd+iurZ+iaX0eJ55BevkVY=" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/keyv": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz", + "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", + "dev": true + }, + "node_modules/lookpath": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.2.2.tgz", + "integrity": "sha512-k2Gmn8iV6qdME3ztZC2spubmQISimFOPLuQKiPaLcVdRz0IpdxrNClVepMlyTJlhodm/zG/VfbkWERm3kUIh+Q==", + "bin": { + "lookpath": "bin/lookpath.js" + }, + "engines": { + "npm": ">=6.13.4" + } + }, + "node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "engines": { + "node": ">=8" + } + }, + "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/m3u8-parsed": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/m3u8-parsed/-/m3u8-parsed-1.3.0.tgz", + "integrity": "sha512-bGIFjhSFrLJq9u6O/ooaIMMOTKZr92Z2bUgDWerN/C6h44MriXQxrvAGtKsT7OlJCp7sC/7+Hv0KruNYce85uw==", + "dependencies": { + "m3u8-parser": "^4.4.0" + } + }, + "node_modules/m3u8-parser": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz", + "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "^3.0.0", + "global": "^4.4.0" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "dev": true, + "dependencies": { + "braces": "^3.0.1", + "picomatch": "^2.2.3" + }, + "engines": { + "node": ">=8.6" + } + }, + "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==", + "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==", + "dependencies": { + "mime-db": "1.49.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "dependencies": { + "dom-walk": "^0.1.0" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/multistream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", + "integrity": "sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "once": "^1.4.0", + "readable-stream": "^3.6.0" + } + }, + "node_modules/multistream/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "node_modules/netmask": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", + "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/node-abi": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", + "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", + "dev": true, + "dependencies": { + "semver": "^5.4.1" + } + }, + "node_modules/node-abi/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-fetch": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz", + "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/noop-logger": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", + "dev": true + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "dependencies": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "node_modules/number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-is-promise": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", + "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/pac-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz", + "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4", + "get-uri": "3", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "5", + "pac-resolver": "^5.0.0", + "raw-body": "^2.2.0", + "socks-proxy-agent": "5" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/pac-resolver": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz", + "integrity": "sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==", + "dependencies": { + "degenerator": "^3.0.1", + "ip": "^1.1.5", + "netmask": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.3.3.tgz", + "integrity": "sha512-48qPxwyPvKfUuXxeK+kS3mBvfWWTX2khAdceDThbWCc8OUz3RFyO1Ft8SVkq2gQfPU2DtiPtWaf2SKH0Dlx59g==", + "dev": true, + "dependencies": { + "@babel/parser": "7.13.13", + "@babel/types": "7.13.12", + "chalk": "^4.1.0", + "escodegen": "^2.0.0", + "fs-extra": "^9.1.0", + "globby": "^11.0.3", + "into-stream": "^6.0.0", + "minimist": "^1.2.5", + "multistream": "^4.1.0", + "pkg-fetch": "3.2.3", + "prebuild-install": "6.0.1", + "progress": "^2.0.3", + "resolve": "^1.20.0", + "stream-meter": "^1.0.4", + "tslib": "2.1.0" + }, + "bin": { + "pkg": "lib-es5/bin.js" + }, + "peerDependencies": { + "node-notifier": ">=9.0.1" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/pkg-fetch": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.3.tgz", + "integrity": "sha512-bv9vYANgAZ2Lvxn5Dsq7E0rLqzcqYkV4gnwe2f7oHV9N4SVMfDOIjjFCRuuTltop5EmsOcu7XkQpB5A/pIgC1g==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "fs-extra": "^9.1.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "progress": "^2.0.3", + "semver": "^7.3.5", + "yargs": "^16.2.0" + }, + "bin": { + "pkg-fetch": "lib-es5/bin.js" + } + }, + "node_modules/pkg-fetch/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pkg-fetch/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pkg/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prebuild-install": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz", + "integrity": "sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ==", + "dev": true, + "dependencies": { + "detect-libc": "^1.0.3", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^2.7.0", + "noop-logger": "^0.1.1", + "npmlog": "^4.0.1", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^3.0.3", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0", + "which-pm-runs": "^1.0.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz", + "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==", + "dependencies": { + "agent-base": "^6.0.0", + "debug": "4", + "http-proxy-agent": "^4.0.0", + "https-proxy-agent": "^5.0.0", + "lru-cache": "^5.1.1", + "pac-proxy-agent": "^5.0.0", + "proxy-from-env": "^1.0.0", + "socks-proxy-agent": "^5.0.0" + }, + "engines": { + "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", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/raw-body": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", + "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.3", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/removeNPMAbsolutePaths": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/removeNPMAbsolutePaths/-/removeNPMAbsolutePaths-2.0.0.tgz", + "integrity": "sha512-Hea7U6iJcD0NE/aqBqxBMPKeKaxjqMNyTTajmH2dH9hhafJ9Tem5r4UeJK8+BdE1MK9lqoOYqNM0Sq9rl1OIbQ==", + "dev": true, + "bin": { + "removeNPMAbsolutePaths": "bin/removeNPMAbsolutePaths" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "dependencies": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/responselike": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", + "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", + "dependencies": { + "lowercase-keys": "^2.0.0" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/sei-helper": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/sei-helper/-/sei-helper-3.3.0.tgz", + "integrity": "sha512-tHKNxiY5H5YayQ0QkxOvDZl35bH5OW2ptjk04j887hHA/pbj8ggsIKs7tb+wI7zViHOOY4JQorpQ8Jnj4LMitQ==" + }, + "node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", + "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==", + "dev": true + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "dev": true, + "dependencies": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/simple-get/node_modules/decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "dev": true, + "dependencies": { + "mimic-response": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/simple-get/node_modules/mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-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==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz", + "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==", + "dependencies": { + "ip": "^1.1.5", + "smart-buffer": "^4.1.0" + }, + "engines": { + "node": ">= 10.13.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz", + "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "4", + "socks": "^2.3.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/stream-meter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", + "integrity": "sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0=", + "dev": true, + "dependencies": { + "readable-stream": "^2.1.4" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "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/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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/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==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "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", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/table": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "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" + }, + "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==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/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/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "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==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dev": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar-stream/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true + }, + "node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url-toolkit": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz", + "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ==" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, + "node_modules/vm2": { + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.5.tgz", + "integrity": "sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng==", + "bin": { + "vm2": "bin/vm2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-pm-runs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", + "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=", + "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==", + "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" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/xregexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", + "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=", + "engines": { + "node": "*" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } + }, + "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/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "17.2.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", + "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + } + }, "dependencies": { "@babel/code-frame": { "version": "7.12.11", @@ -202,11 +4062,26 @@ "@types/responselike": "*" } }, + "@types/fs-extra": { + "version": "9.0.13", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", + "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/http-cache-semantics": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" }, + "@types/json-schema": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", + "dev": true + }, "@types/keyv": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz", @@ -216,9 +4091,9 @@ } }, "@types/node": { - "version": "16.7.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz", - "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==" + "version": "16.11.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz", + "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==" }, "@types/responselike": { "version": "1.0.0", @@ -228,6 +4103,131 @@ "@types/node": "*" } }, + "@types/yargs": { + "version": "17.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.4.tgz", + "integrity": "sha512-D/wihO9WFYqwsmJI0e0qS+U09wIQtYRSBJlXWjTFGjouEuOCy0BU4N/ZK5utb00S5lW/9LO7vOpvGDd8M06NvQ==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "20.2.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", + "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", + "dev": true + }, + "@typescript-eslint/eslint-plugin": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.2.0.tgz", + "integrity": "sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "5.2.0", + "@typescript-eslint/scope-manager": "5.2.0", + "debug": "^4.3.2", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", + "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": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz", + "integrity": "sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.2.0", + "@typescript-eslint/types": "5.2.0", + "@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": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.2.0.tgz", + "integrity": "sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.2.0", + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/typescript-estree": "5.2.0", + "debug": "^4.3.2" + } + }, + "@typescript-eslint/scope-manager": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz", + "integrity": "sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/visitor-keys": "5.2.0" + } + }, + "@typescript-eslint/types": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.2.0.tgz", + "integrity": "sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz", + "integrity": "sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.2.0", + "@typescript-eslint/visitor-keys": "5.2.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz", + "integrity": "sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==", + "dev": true, + "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", @@ -248,7 +4248,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "agent-base": { "version": "6.0.2", @@ -1455,9 +5456,9 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -2355,6 +6356,15 @@ "readable-stream": "^2.1.4" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -2380,15 +6390,6 @@ } } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -2538,6 +6539,23 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2562,6 +6580,12 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, + "typescript": { + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", + "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", + "dev": true + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", diff --git a/package.json b/package.json index 7ef91ea..7f224fd 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,15 @@ "yargs": "^17.2.1" }, "devDependencies": { + "@types/fs-extra": "^9.0.13", + "@types/node": "^16.11.6", + "@types/yargs": "^17.0.4", + "@typescript-eslint/eslint-plugin": "^5.2.0", + "@typescript-eslint/parser": "^5.2.0", "eslint": "^7.30.0", "pkg": "^5.3.3", - "removeNPMAbsolutePaths": "^2.0.0" + "removeNPMAbsolutePaths": "^2.0.0", + "typescript": "^4.4.4" }, "scripts": { "build-win64": "node modules/build win64", diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..c9f603c --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,69 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} From 7f325e28355f7e1217692400bf9420cf1b88b078 Mon Sep 17 00:00:00 2001 From: Izuco Date: Thu, 28 Oct 2021 16:57:25 +0200 Subject: [PATCH 2/5] Working typescript --- .gitignore | 1 + @types/downloadedFile.d.ts | 4 + @types/episode.d.ts | 392 +++++++++++++++++++++++++++++ @types/hls-download.d.ts | 8 +- @types/items.d.ts | 75 +----- @types/m3u8-parsed.d.ts | 4 +- @types/pkg.d.ts | 3 + @types/removeNPMAbsolutePaths.d.ts | 3 + @types/sei-helper.d.ts | 2 + @types/streamData.d.ts | 28 +++ @types/subtitleObject.d.ts | 7 + funi.ts | 201 ++++++++------- modules/{build.js => build.ts} | 11 +- modules/module.app-args.ts | 48 ++-- modules/module.getdata.ts | 2 +- modules/module.merger.ts | 23 ++ package-lock.json | 247 ++++++++++++++++++ package.json | 11 +- tsc.ts | 63 +++++ tsconfig.json | 9 +- 20 files changed, 946 insertions(+), 196 deletions(-) create mode 100644 @types/downloadedFile.d.ts create mode 100644 @types/episode.d.ts create mode 100644 @types/pkg.d.ts create mode 100644 @types/removeNPMAbsolutePaths.d.ts create mode 100644 @types/streamData.d.ts create mode 100644 @types/subtitleObject.d.ts rename modules/{build.js => build.ts} (89%) create mode 100644 tsc.ts diff --git a/.gitignore b/.gitignore index a9ecb05..0a3122a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ token.yml *.srt *.resume *.user.yml +lib diff --git a/@types/downloadedFile.d.ts b/@types/downloadedFile.d.ts new file mode 100644 index 0000000..9f66467 --- /dev/null +++ b/@types/downloadedFile.d.ts @@ -0,0 +1,4 @@ +export type DownloadedFile = { + path: string, + lang: string +} \ No newline at end of file diff --git a/@types/episode.d.ts b/@types/episode.d.ts new file mode 100644 index 0000000..6d79b67 --- /dev/null +++ b/@types/episode.d.ts @@ -0,0 +1,392 @@ +// Generated by https://quicktype.io + +export interface EpisodeData { + id: number; + title: string; + mediaDict: { [key: string]: string }; + episodeSlug: string; + starRating: number; + parent: EpisodeDataParent; + number: string; + description: string; + filename: string; + seriesBanner: string; + media: Media[]; + externalItemId: string; + contentId: string; + metaItems: MetaItems; + thumb: string; + type: Type; + default: { [key: string]: Default }; + published: boolean; + versions: VersionClass[]; + mediaCategory: string; + order: number; + seriesVersions: any[]; + source: Source; + ids: EpisodeDataIDS; + runtime: string; + siblings: PreviousSeasonEpisode[]; + seriesTitle: string; + seriesSlug: string; + next: Next; + previousSeasonEpisode: PreviousSeasonEpisode; + seasonTitle: string; + quality: Quality; + ratings: Array; + languages: TitleElement[]; + releaseDate: string; + historicalSelections: HistoricalSelections; + userRating: UserRating; +} + +export interface Default { + items: DefaultItem[]; +} + +export interface DefaultItem { + languages: string[]; + territories: string[]; + version: null; + value: Value[]; + devices: any[]; +} + +export interface Value { + name: MetaType; + value: string; + label: Label; +} + +export enum Label { + 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", +} + +export interface HistoricalSelections { + version: string; + language: string; +} + +export interface EpisodeDataIDS { + externalShowId: string; + externalSeasonId: string; + externalEpisodeId: string; +} + +export enum TitleElement { + Empty = "", + English = "English", +} + +export interface Media { + id: number; + title: string; + experienceType: string; + created: string; + createdBy: string; + itemFieldData: Next; + keyPath: string; + filename: string; + complianceStatus: null; + events: any[]; + clients: string[]; + qcStatus: null; + qcStatusDate: null; + image: string; + thumb: string; + ext: string; + avails: Avail[]; + version: string; + startTimecode: null; + endTimecode: null; + versionId: string; + mediaType: string; + status: string; + languages: LanguageClass[]; + territories: any[]; + devices: any[]; + keyType: string; + purpose: null; + externalItemId: null | string; + proxyId: null; + externalDbId: null; + mediaChildren: MediaChild[]; + isDefault: boolean; + parent: MediaChildParent; + filePath: null | string; + mediaInfo: Next; + type: string; + approved: boolean; + mediaKey: string; + itemFields: any[]; + source: Source; + fieldData: Next; + sourceId: null | string; + timecodeOverride: null; + seriesTitle: string; + episodeTitle: string; + genre: any[]; + txDate: string; + description: string; + synopsis: string; + resolution: null; + restrictedAccess: boolean; + createdById: string; + userIdsWithAccess: any[]; + runtime?: number; + language?: TitleElement; + purchased: boolean; +} + +export interface Avail { + id: number; + description: string; + endDate: string; + startDate: string; + ids: AvailIDS; + originalAirDate: null; + physicalReleaseDate: null; + preorderDate: null; + language: TitleElement; + territory: string; + territoryCode: string; + license: string; + parentAvail: null; + item: number; + version: string; + applyToLevel: null; + availLevel: string; + availDisplayCode: string; + availStatus: string; + bundleOnly: boolean; + contentOwnerOrganization: string; + currency: null; + price: null; + purchase: string; + priceValue: string; + resolutionFormat: null; + runtimeMilliseconds: null; + seasonOrEpisodeNumber: null; + tmsid: null; + deviceList: string; + tvodSku: null; +} + +export interface AvailIDS { + externalSeasonId: string; + externalAsianId: null; + externalShowId: string; + externalEpisodeId: string; + externalEnglishId: string; + externalAlphaId: string; +} + +export interface Next { +} + +export interface LanguageClass { + code: string; + id: number; + title: TitleElement; +} + +export interface MediaChild { + id: number; + title: string; + experienceType: string; + created: string; + createdBy: string; + itemFieldData: Next; + keyPath: null; + filename: string; + complianceStatus: null; + events: any[]; + clients: string[]; + qcStatus: null; + qcStatusDate: null; + image: string; + ext: string; + avails: any[]; + version: string; + startTimecode: null; + endTimecode: null; + versionId: string; + mediaType: string; + status: string; + languages: LanguageClass[]; + territories: any[]; + devices: any[]; + keyType: string; + purpose: null; + externalItemId: string; + proxyId: null; + externalDbId: null; + mediaChildren: any[]; + isDefault: boolean; + parent: MediaChildParent; + filePath: string; + mediaInfo: MediaInfo; + type: string; + approved: boolean; + mediaKey: null; + itemFields: any[]; + source: Source; + fieldData: Next; + sourceId: null; + timecodeOverride: null; + seriesTitle: string; + episodeTitle: string; + genre: any[]; + txDate: string; + description: string; + synopsis: string; + resolution: null | string; + restrictedAccess: boolean; + createdById: string; + userIdsWithAccess: any[]; + language: TitleElement; +} + +export interface MediaInfo { + imageAspectRatio: null | string; + format: string; + scanMode: null | string; + burnedInSubtitleLanguage: string; + screenAspectRatio: null | string; + subtitleFormat: null | string; + subtitleContent: null | string; + frameHeight: number | null; + frameWidth: number | null; + video: Video; +} + +export interface Video { + codecId: null | string; + container: null | string; + encodingRate: number | null; + frameRate: null | string; + height: number | null; + width: number | null; + duration: number | null; + bitRate: number | null; +} + +export interface MediaChildParent { + title: string; + type: string; + catalogParent: CatalogParent; + slug: string; + grandparentId: number; + id: number; +} + +export interface CatalogParent { + id: number; + title: string; +} + +export enum Source { + Dbb = "dbb", +} + +export interface MetaItems { + items: Items; + filters: Filters; +} + +export interface Filters { + territory: any[]; + language: any[]; +} + +export interface Items { + "release-date": AnimationProductionStudio; + rating: AnimationProductionStudio; + synopsis: AnimationProductionStudio; + "animation-production-studio": AnimationProductionStudio; +} + +export interface AnimationProductionStudio { + items: AnimationProductionStudioItem[]; + label: string; + id: number; + slug: string; +} + +export interface AnimationProductionStudioItem { + id: number; + metaType: MetaType; + metaTypeId: string; + client: null; + languages: TitleElement; + territories: string; + devices: string; + isDefault: boolean; + value: Value[]; + approved: boolean; + version: null; + source: Source; +} + +export interface EpisodeDataParent { + seasonId: number; + seasonNumber: string; + title: string; + titleSlug: string; + titleType: string; + titleId: number; +} + +export interface PreviousSeasonEpisode { + seasonTitle?: string; + mediaCategory: Type; + thumb: string; + title: string; + image: string; + number: string; + id: number; + version: string[]; + order: number; + slug: string; + season?: number; + languages?: TitleElement[]; +} + +export enum Type { + Episode = "episode", + Ova = "ova", +} + +export interface Quality { + quality: string; + height: number; +} + +export interface UserRating { + overall: number; + ja: number; + eng: number; +} + +export interface VersionClass { + compliance_approved: boolean; + title: string; + version_id: string; + is_default: boolean; + runtime: string; + external_id: string; + id: number; +} diff --git a/@types/hls-download.d.ts b/@types/hls-download.d.ts index 3ce039f..4ed0f6a 100644 --- a/@types/hls-download.d.ts +++ b/@types/hls-download.d.ts @@ -2,9 +2,7 @@ declare module 'hls-download' { export default class hlsDownload { constructor(options: { m3u8json: { - segments: { - - }[], + segments: {}[], mediaSequence?: number, }, output?: string, @@ -16,13 +14,13 @@ declare module 'hls-download' { skipInit?: boolean, timeout?: number }) - async download() : { + async download() : Promise<{ ok: boolean, parts: { first: number, total: number, compleated: number } - } + }> } } \ No newline at end of file diff --git a/@types/items.d.ts b/@types/items.d.ts index 7062bec..b7ac98d 100644 --- a/@types/items.d.ts +++ b/@types/items.d.ts @@ -38,37 +38,11 @@ export interface Item { mostRecentAvod: MostRecent; } -export enum Access { - AVODSimulcastEnglish = "A-VOD_Simulcast_English", - AVODUncutEnglish = "A-VOD_Uncut_English", - SVODSimulcastEnglish = "SVOD_Simulcast_English", - SVODUncutEnglish = "SVOD_Uncut_English", -} - -export enum AltAvail { - MostRecentSvodJpnUs = "most_recent_svod_jpn_us", -} - -export enum Audio { - English = "English", -} - export enum ContentType { Episode = "episode", Ova = "ova", } -export enum EngAllTerritoryAvail { - MostRecentSvodEngAllTerr = "most_recent_svod_eng_all_terr", -} - -export enum Genre { - ActionAdventure = "Action/Adventure", - Comedy = "Comedy", - Drama = "Drama", - Fantasy = "Fantasy", -} - export interface IDs { externalShowId: ID; externalSeasonId: ExternalSeasonID; @@ -76,47 +50,26 @@ export interface IDs { externalAsianId?: string } -export enum ExternalSeasonID { - TrsS11 = "TRS-S1-1", - TrsS22 = "TRS-S2-2", -} - -export enum ID { - Trs = "TRS", -} - export interface Item { - seasonTitle: SeasonTitle; + seasonTitle: string; seasonId: number; episodeOrder: number; episodeSlug: string; created: Date; - titleSlug: TitleSlug; + titleSlug: string; episodeNum: string; episodeId: number; titleId: number; seasonNum: string; ratings: Array; showImage: string; - titleName: TitleName; + titleName: string; runtime: string; episodeName: string; seasonOrder: number; - titleExternalId: ID; + titleExternalId: string; } -export enum SeasonTitle { - Season1 = "Season 1", - Season2 = "Season 2", -} - -export enum TitleName { - ThatTimeIGotReincarnatedAsASlime = "That Time I Got Reincarnated as a Slime", -} - -export enum TitleSlug { - ThatTimeIGotReincarnatedAsASlime = "that-time-i-got-reincarnated-as-a-slime", -} export interface MostRecent { image?: string; @@ -147,14 +100,6 @@ export interface MostRecent { purchased?: boolean; } -export enum Device { - All = "All", -} - -export enum Distributor { - FunimationVenue = "FunimationVenue", -} - export interface MostRecentAvodIDS { externalSeasonId: ExternalSeasonID; externalAsianId: null; @@ -171,14 +116,6 @@ export enum Purchase { Svod = "SVOD", } -export enum MostRecentAvodQuality { - HD1080 = "HD 1080", -} - -export enum Territory { - Usa = "USA", -} - export enum Version { Simulcast = "Simulcast", Uncut = "Uncut", @@ -187,10 +124,6 @@ export enum Version { export interface MostRecentSvodJpnUs { } -export enum PrimaryAvail { - MostRecentSvodUs = "most_recent_svod_us", -} - export interface QualityClass { quality: QualityQuality; height: number; diff --git a/@types/m3u8-parsed.d.ts b/@types/m3u8-parsed.d.ts index f16f908..437a2a3 100644 --- a/@types/m3u8-parsed.d.ts +++ b/@types/m3u8-parsed.d.ts @@ -16,7 +16,7 @@ declare module 'm3u8-parsed' { timeline: number }[], version: number, - mediaGroups?: { + mediaGroups: { [type: string]: { [index: string]: { [language: string]: { @@ -28,7 +28,7 @@ declare module 'm3u8-parsed' { } } }, - playlists?: { + playlists: { uri: string, timeline: number, attributes: { diff --git a/@types/pkg.d.ts b/@types/pkg.d.ts new file mode 100644 index 0000000..86ad545 --- /dev/null +++ b/@types/pkg.d.ts @@ -0,0 +1,3 @@ +declare module 'pkg' { + export async function exec(config: string[]); +} \ No newline at end of file diff --git a/@types/removeNPMAbsolutePaths.d.ts b/@types/removeNPMAbsolutePaths.d.ts new file mode 100644 index 0000000..eae351b --- /dev/null +++ b/@types/removeNPMAbsolutePaths.d.ts @@ -0,0 +1,3 @@ +declare module 'removeNPMAbsolutePaths' { + export default async function modulesCleanup(path: string); +} \ No newline at end of file diff --git a/@types/sei-helper.d.ts b/@types/sei-helper.d.ts index 224c060..2cd732e 100644 --- a/@types/sei-helper.d.ts +++ b/@types/sei-helper.d.ts @@ -1,3 +1,5 @@ declare module 'sei-helper' { export async function question(qStr: string): string; + export function cleanupFilename(str: string): string; + export function exec(str: string, str1: string, str2: string); } \ No newline at end of file diff --git a/@types/streamData.d.ts b/@types/streamData.d.ts new file mode 100644 index 0000000..5ddee55 --- /dev/null +++ b/@types/streamData.d.ts @@ -0,0 +1,28 @@ +// Generated by https://quicktype.io + +export interface StreamData { + items: Item[]; + watchHistorySaveInterval: number; + errors?: Error[] +} + +export interface Error { + detail: string, + code: number +} + +export interface Item { + src: string; + kind: string; + isPromo: boolean; + videoType: string; + aips: Aip[]; + experienceId: string; + showAds: boolean; + id: number; +} + +export interface Aip { + out: number; + in: number; +} diff --git a/@types/subtitleObject.d.ts b/@types/subtitleObject.d.ts new file mode 100644 index 0000000..266fe10 --- /dev/null +++ b/@types/subtitleObject.d.ts @@ -0,0 +1,7 @@ +export type Subtitle = { + path: string, + ext: string, + langName: string, + language: string, + file?: string +} \ No newline at end of file diff --git a/funi.ts b/funi.ts index 815b304..388194d 100644 --- a/funi.ts +++ b/funi.ts @@ -5,7 +5,7 @@ import fs from 'fs'; import path from 'path'; // package json -const packageJson = JSON.parse(fs.readFileSync('./package.json').toString()) +import packageJson from './package.json'; // program name console.log(`\n=== Funimation Downloader NX ${packageJson.version} ===\n`); @@ -32,8 +32,12 @@ const argv = appYargs.appArgv(cfg.cli); // Import modules after argv has been exported import getData from './modules/module.getdata.js'; -import merger from './modules/module.merger'; +import merger, { SubtitleInput } from './modules/module.merger'; import parseSelect from './modules/module.parseSelect'; +import { EpisodeData, MediaChild } from './@types/episode'; +import { Subtitle } from './@types/subtitleObject'; +import { StreamData } from './@types/streamData'; +import { DownloadedFile } from './@types/downloadedFile'; // check page argv.p = 1; @@ -41,11 +45,14 @@ argv.p = 1; // fn variables let title = '', showTitle = '', - fnEpNum = 0, - fnOutput = [], + fnEpNum: string|number = 0, + fnOutput: string[] = [], season = 0, - tsDlPath = [], - stDlPath = []; + tsDlPath: { + path: string, + lang: string, + }[] = [], + stDlPath: Subtitle[] = []; // main (async () => { @@ -81,7 +88,7 @@ async function auth(){ 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', authData.token.slice(0,8),'*'.repeat(32)); + 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'); @@ -199,7 +206,10 @@ async function getShow(){ epSelList = parseSelect(argv.e as string); - let fnSlug = [], is_selected = false; + let fnSlug: { + title: string, + episode: string + }[] = [], is_selected = false; let eps = epsDataArr; epsDataArr.sort((a, b) => { @@ -226,21 +236,21 @@ async function getShow(){ is_selected = false; } // console vars - let tx_snum = eps[e].item.seasonNum==1?'':` S${eps[e].item.seasonNum}`; + 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 !== '' ? - `#${(eps[e].item.episodeNum < 10 ? '0' : '')+eps[e].item.episodeNum}` : '#'+eps[e].item.episodeId; + `#${(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].padStart(typeIdLen, ' '); + 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 == e ? '\n' : ''; + conOut += eps.length-1 == parseInt(e) ? '\n' : ''; console.log(conOut); } if(fnSlug.length < 1){ @@ -256,17 +266,19 @@ async function getShow(){ } -async function getEpisode(fnSlug){ +async function getEpisode(fnSlug: { + title: string, + episode: string +}) { let episodeData = await getData({ baseUrl: api_host, url: `/source/catalog/episode/${fnSlug.title}/${fnSlug.episode}/`, token: token, useToken: true, - useProxy: true, debug: argv.debug, }); - if(!episodeData.ok){return;} - let ep = JSON.parse(episodeData.res.body).items[0], streamIds = []; + if(!episodeData.ok || !episodeData.res){return;} + let ep = JSON.parse(episodeData.res.body).items[0] as EpisodeData, streamIds = []; // build fn showTitle = ep.parent.title; title = ep.title; @@ -296,7 +308,7 @@ async function getEpisode(fnSlug){ // map medias let media = ep.media.map(function(m){ if(m.mediaType == 'experience'){ - if(m.version.match(/uncut/i)){ + if(m.version.match(/uncut/i) && m.language){ uncut[m.language] = true; } return { @@ -326,16 +338,24 @@ async function getEpisode(fnSlug){ let selected = false; if(m.id > 0 && m.type == 'Non-Encrypted'){ let dub_type = m.language; - let localSubs = []; - let selUncut = !argv.simul && uncut[dub_type] && m.version.match(/uncut/i) + 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) { + : (!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; @@ -347,7 +367,7 @@ async function getEpisode(fnSlug){ } } - let already = []; + let already: string[] = []; stDlPath = stDlPath.filter(a => { if (already.includes(a.language)) { return false; @@ -369,20 +389,19 @@ async function getEpisode(fnSlug){ token: token, dinstid: 'uuid', useToken: true, - useProxy: true, debug: argv.debug, }); - if(!streamData.ok){return;} - streamData = JSON.parse(streamData.res.body); - if(streamData.errors){ - console.log('[ERROR] Error #%s: %s\n',streamData.errors[0].code,streamData.errors[0].detail); + 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 streamData.items){ - if(streamData.items[u].videoType == 'm3u8'){ + for(let u in streamDataRes.items){ + if(streamDataRes.items[u].videoType == 'm3u8'){ tsDlPath.push({ - path: streamData.items[u].src, + path: streamDataRes.items[u].src, lang: streamId.lang }); break; @@ -400,12 +419,12 @@ async function getEpisode(fnSlug){ } } -function getSubsUrl(m){ +function getSubsUrl(m: MediaChild[]) : Subtitle[] { if(argv.nosubs && !argv.sub){ return []; } - let subLangs = argv.subLang; + let subLangs = argv.subLang as appYargs.possibleSubs; const subType = { 'enUS': 'English', @@ -419,7 +438,7 @@ function getSubsUrl(m){ subLangs = [ 'enUS' ]; } - let found = []; + let found: Subtitle[] = []; for(let i in m){ let fpp = m[i].filePath.split('.'); @@ -443,16 +462,15 @@ async function downloadStreams(){ // req playlist - let purvideo = []; - let puraudio = []; - let audioAndVideo = []; + let purvideo: DownloadedFile[] = []; + let puraudio: DownloadedFile[] = []; + let audioAndVideo: DownloadedFile[] = []; for (let streamPath of tsDlPath) { let plQualityReq = await getData({ url: streamPath.path, - useProxy: (argv.ssp ? false : true), debug: argv.debug, }); - if(!plQualityReq.ok){return;} + if(!plQualityReq.ok || !plQualityReq.res){return;} let plQualityLinkList = m3u8(plQualityReq.res.body); @@ -463,27 +481,43 @@ async function downloadStreams(){ 'funiprod.akamaized.net', ]; - let plServerList = [], - plStreams = {}, + let plServerList: string[] = [], + plStreams: Record = {}, plLayersStr = [], - plLayersRes = {}, + plLayersRes: Record = {}, plMaxLayer = 1, plNewIds = 1, - plAud = { uri: '' }; + 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]){ - let audioData = plQualityLinkList.mediaGroups.AUDIO[audioKey], - audioEl = Object.keys(audioData); - audioData = audioData[audioEl[0]]; + 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) => { - let av = parseInt(a.uri.match(vplReg)[3]); - let bv = parseInt(b.uri.match(vplReg)[3]); + 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; } @@ -497,9 +531,10 @@ async function downloadStreams(){ for(let s of plQualityLinkList.playlists){ if(s.uri.match(/_Layer(\d+)\.m3u8/) || s.uri.match(vplReg)){ // set layer and max layer - let plLayerId = 0; - if(s.uri.match(/_Layer(\d+)\.m3u8/)){ - plLayerId = parseInt(s.uri.match(/_Layer(\d+)\.m3u8/)[1]); + let plLayerId: number|string = 0; + const match = s.uri.match(/_Layer(\d+)\.m3u8/); + if(match){ + plLayerId = parseInt(match[1]); } else{ plLayerId = plNewIds, plNewIds++; @@ -546,10 +581,7 @@ async function downloadStreams(){ break; } } - - if(typeof argv.q == 'object' && argv.q.length > 1){ - argv.q = argv.q[argv.q.length-1]; - } + argv.q = argv.q < 1 || argv.q > plMaxLayer ? plMaxLayer : argv.q; @@ -567,7 +599,7 @@ async function downloadStreams(){ 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', fnOutput); + 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){ @@ -593,10 +625,9 @@ async function downloadStreams(){ // download video let reqVideo = await getData({ url: videoUrl, - useProxy: (argv.ssp ? false : true), debug: argv.debug, }); - if (!reqVideo.ok) { break video; } + if (!reqVideo.ok || !reqVideo.res) { break video; } let chunkList = m3u8(reqVideo.res.body); @@ -625,10 +656,9 @@ async function downloadStreams(){ break audio; let reqAudio = await getData({ url: plAud.uri, - useProxy: (argv.ssp ? false : true), debug: argv.debug, }); - if (!reqAudio.ok) { return; } + if (!reqAudio.ok || !reqAudio.res) { return; } let chunkListA = m3u8(reqAudio.res.body); @@ -654,10 +684,9 @@ async function downloadStreams(){ for (let subObject of stDlPath) { let subsSrc = await getData({ url: subObject.path, - useProxy: true, debug: argv.debug, }); - if(subsSrc.ok){ + 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); @@ -683,7 +712,7 @@ async function downloadStreams(){ } // check exec - const mergerBin = await merger.checkMerger(cfg.bin, argv.mp4); + const mergerBin = merger.checkMerger(cfg.bin, argv.mp4); if ( argv.novids ){ console.log('[INFO] Video not downloaded. Skip muxing video.'); @@ -697,16 +726,22 @@ async function downloadStreams(){ 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){ - let ffext = !argv.mp4 ? 'mkv' : 'mp4'; - let command = merger.buildCommandMkvMerge(argv.simul, audioAndVideo, purvideo, puraudio, stDlPath, `${path.join(cfg.dir.content, - ...fnOutput)}.${ffext}`); + let command = mergeInstance.MkvMerge(); shlp.exec('mkvmerge', `"${mergerBin.MKVmerge}"`, command); } else if(mergerBin.FFmpeg){ - let ffext = !argv.mp4 ? 'mkv' : 'mp4'; - let command = merger.buildCommandFFmpeg(argv.simul, audioAndVideo, purvideo, puraudio, stDlPath, `${path.join(cfg.dir.content, - ...fnOutput)}.${ffext}`); + let command = mergeInstance.FFmpeg(); shlp.exec('ffmpeg',`"${mergerBin.FFmpeg}"`,command); } else{ @@ -717,34 +752,28 @@ async function downloadStreams(){ return; audioAndVideo.concat(puraudio).concat(purvideo).forEach(a => fs.unlinkSync(a.path)); - stDlPath.forEach(subObject => fs.unlinkSync(subObject.file)); + stDlPath.forEach(subObject => subObject.file && fs.unlinkSync(subObject.file)); console.log('\n[INFO] Done!\n'); } -async function downloadFile(filename, chunkList) { +async function downloadFile(filename: string, chunkList: { + segments: {}[], +}) { const downloadStatus = await new hlsDownload({ m3u8json: chunkList, output: `${filename + '.ts'}`, timeout: argv.timeout, - pcount: argv.partsize + threads: argv.partsize }).download(); return downloadStatus.ok; } -/** - * @param {string} input - * @param {string} title - * @param {number|string} episode - * @param {string} showTitle - * @param {number} season - * @param {number} width - * @param {number} height - * @returns {Array} - */ -function parseFileName(input, title, episode, showTitle, season, width, height) { +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()) { @@ -754,7 +783,7 @@ function parseFileName(input, title, episode, showTitle, season, width, height) 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); + input = input.replace(vars[i], len < argv.numbers ? '0'.repeat(argv.numbers - len) + episode : episode.toString()); } else { input = input.replace(vars[i], episode); } @@ -765,14 +794,14 @@ function parseFileName(input, title, episode, showTitle, season, width, height) 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); + 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); + input = input.replace(vars[i], width.toString()); break; case 'height': - input = input.replace(vars[i], height); + input = input.replace(vars[i], height.toString()); break; default: break; diff --git a/modules/build.js b/modules/build.ts similarity index 89% rename from modules/build.js rename to modules/build.ts index 5670c2e..84199ab 100644 --- a/modules/build.js +++ b/modules/build.ts @@ -1,10 +1,10 @@ #!/usr/bin/env node // build requirements -const pkg = require('../package.json'); -const fs = require('fs-extra'); -const modulesCleanup = require('removeNPMAbsolutePaths'); -const { exec } = require('pkg'); +import fs from 'fs-extra'; +import pkg from '../package.json'; +import modulesCleanup from 'removeNPMAbsolutePaths'; +import { exec } from 'pkg'; const buildsDir = './_builds'; const nodeVer = 'node14-'; @@ -50,6 +50,7 @@ const nodeVer = 'node14-'; 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`)){ @@ -58,7 +59,7 @@ const nodeVer = 'node14-'; require('child_process').execSync(`7z a -t7z "${buildsDir}/${buildFull}.7z" "${buildDir}"`,{stdio:[0,1,2]}); }()); -function getTarget(bt){ +function getTarget(bt: string) : string { switch(bt){ case 'win64': return 'windows-x64'; diff --git a/modules/module.app-args.ts b/modules/module.app-args.ts index 74f1380..fa2e255 100644 --- a/modules/module.app-args.ts +++ b/modules/module.app-args.ts @@ -9,20 +9,26 @@ const availableFilenameVars = [ 'height' ]; -const subLang = ['enUS', 'esLA', 'ptBR']; -const dubLang = ['enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP']; +export type possibleDubs = ( + 'enUS' | 'esLA' | 'ptBR' | 'zhMN' | 'jaJP' +)[]; +export type possibleSubs = ( + 'enUS' | 'esLA' | 'ptBR' +)[]; +const subLang: possibleSubs = ['enUS', 'esLA', 'ptBR']; +const dubLang: possibleDubs = ['enUS', 'esLA', 'ptBR', 'zhMN', 'jaJP']; + const appArgv = (cfg: { [key: string]: unknown }) => { // init - const parseDefault = (key: string, _default: unknown) => { + const parseDefault = (key: string, _default: T) : T=> { if (Object.prototype.hasOwnProperty.call(cfg, key)) { - return cfg[key]; + return cfg[key] as T; } else return _default; }; - const argv = yargs.parserConfiguration({ 'duplicate-arguments-array': true, 'camel-case-expansion': false @@ -59,27 +65,27 @@ const appArgv = (cfg: { group: 'Downloading:', describe: 'Used to download all episodes from the show', type: 'boolean', - default: parseDefault('all', false) + 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) + 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), + default: parseDefault('videoLayer', 7), type: 'number', }) // alt listing .option('alt', { group: 'Downloading:', describe: 'Alternative episode listing (if available)', - default: parseDefault('altList', false), + default: parseDefault('altList', false), type: 'boolean', }) // switch to subs @@ -87,20 +93,20 @@ const appArgv = (cfg: { group: 'Downloading:', describe: 'Download non-Japanese Dub (English Dub mode by default)', choices: dubLang, - default: parseDefault('dub', 'enUS'), + default: parseDefault('dub', ['enUS']), type: 'array', }) .option('subLang', { group: 'Downloading:', describe: 'Set the subtitle language (English is default and fallback)', - default: parseDefault('subLang', 'enUS'), + 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), + default: parseDefault('fontSize', 55), type: 'number' }) .option('allSubs', { @@ -119,7 +125,7 @@ const appArgv = (cfg: { .option('simul', { group: 'Downloading:', describe: 'Force downloading simulcast ver. instead of uncut ver. (if uncut ver. available)', - default: parseDefault('forceSimul', false), + default: parseDefault('forceSimul', false), type: 'boolean', }) // server number @@ -128,7 +134,7 @@ const appArgv = (cfg: { group: 'Downloading:', describe: 'Select server', choices: [1, 2, 3, 4], - default: parseDefault('nServer', 1), + default: parseDefault('nServer', 1), type: 'number', }) // skip @@ -153,19 +159,19 @@ const appArgv = (cfg: { .option('proxy', { group: 'Proxy:', describe: 'Set http(s)/socks proxy WHATWG url', - default: parseDefault('proxy', false), + default: parseDefault('proxy', false), hidden: true, }) .option('proxy-auth', { group: 'Proxy:', describe: 'Colon-separated username and password for proxy', - default: parseDefault('proxy_auth', false), + 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), + default: parseDefault('proxy_ssp', false), hidden: true, type: 'boolean', }) @@ -178,7 +184,7 @@ const appArgv = (cfg: { .option('mp4', { group: 'Muxing:', describe: 'Mux into mp4', - default: parseDefault('mp4mux', false), + default: parseDefault('mp4mux', false), type: 'boolean' }) // filenaming @@ -187,20 +193,20 @@ const appArgv = (cfg: { 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]') + 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) + default: parseDefault('numbers', 2) }) // util .option('nocleanup', { group: 'Utilities:', describe: 'Dont\'t delete the input files after muxing', - default: parseDefault('noCleanUp', false), + default: parseDefault('noCleanUp', false), type: 'boolean' }) .option('timeout', { diff --git a/modules/module.getdata.ts b/modules/module.getdata.ts index 4e851f3..e40a2e3 100644 --- a/modules/module.getdata.ts +++ b/modules/module.getdata.ts @@ -26,7 +26,7 @@ export type Options = { }, useToken?: boolean, token?: string|boolean, - dinstid?: boolean, + dinstid?: boolean|string, debug?: boolean } const getData = async (options: Options) => { diff --git a/modules/module.merger.ts b/modules/module.merger.ts index e2b51e9..672e510 100644 --- a/modules/module.merger.ts +++ b/modules/module.merger.ts @@ -177,6 +177,29 @@ class Merger { return args.join(' '); }; + public static checkMerger(bin: { + mkvmerge?: string, + ffmpeg?: string + }, useMP4format: boolean) { + const merger: { + MKVmerge: undefined|string|false, + FFmpeg: undefined|string|false + } = { + MKVmerge: bin.mkvmerge, + FFmpeg: bin.ffmpeg, + }; + if( !useMP4format && !merger.MKVmerge ){ + 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; + } + return merger; + + } + } export default Merger; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 08caaaa..a2dd9ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "eslint": "^7.30.0", "pkg": "^5.3.3", "removeNPMAbsolutePaths": "^2.0.0", + "ts-node": "^10.4.0", "typescript": "^4.4.4" } }, @@ -169,6 +170,27 @@ "to-fast-properties": "^2.0.0" } }, + "node_modules/@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-consumer": "0.8.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -274,6 +296,30 @@ "node": ">= 6" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "node_modules/@types/cacheable-request": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", @@ -569,6 +615,15 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -643,6 +698,12 @@ "readable-stream": "^2.0.6" } }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -927,6 +988,12 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1128,6 +1195,15 @@ "node": ">=0.10" } }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -2334,6 +2410,12 @@ "global": "^4.4.0" } }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3561,6 +3643,59 @@ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", "dev": true }, + "node_modules/ts-node": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz", + "integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/acorn": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -3861,6 +3996,15 @@ "engines": { "node": ">=10" } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } } }, "dependencies": { @@ -3973,6 +4117,21 @@ "to-fast-properties": "^2.0.0" } }, + "@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true + }, + "@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", + "dev": true, + "requires": { + "@cspotcode/source-map-consumer": "0.8.0" + } + }, "@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -4051,6 +4210,30 @@ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" }, + "@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "@types/cacheable-request": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", @@ -4251,6 +4434,12 @@ "dev": true, "requires": {} }, + "acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true + }, "agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -4306,6 +4495,12 @@ "readable-stream": "^2.0.6" } }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -4519,6 +4714,12 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4656,6 +4857,12 @@ "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -5608,6 +5815,12 @@ "global": "^4.4.0" } }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -6534,6 +6747,34 @@ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", "dev": true }, + "ts-node": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz", + "integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "yn": "3.1.1" + }, + "dependencies": { + "acorn": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "dev": true + } + } + }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -6759,6 +7000,12 @@ "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true } } } diff --git a/package.json b/package.json index 7f224fd..42c0632 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,17 @@ "eslint": "^7.30.0", "pkg": "^5.3.3", "removeNPMAbsolutePaths": "^2.0.0", + "ts-node": "^10.4.0", "typescript": "^4.4.4" }, "scripts": { - "build-win64": "node modules/build win64", - "build-linux64": "node modules/build linux64", - "build-macos64": "node modules/build macos64", + "tsc": "ts-node tsc.ts", + "prebuild-win64": "npm run tsc", + "prebuild-linux64": "npm run tsc", + "prebuild-maxos64": "npm run tsc", + "build-win64": "cd lib && node modules/build win64", + "build-linux64": "cd lib && node modules/build linux64", + "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" diff --git a/tsc.ts b/tsc.ts new file mode 100644 index 0000000..6d28af0 --- /dev/null +++ b/tsc.ts @@ -0,0 +1,63 @@ +import { exec } from "child_process"; +import fs from "fs"; +import path from "path"; +import { removeSync, copyFileSync } from "fs-extra"; + +const ignore = [ + '.git', + 'lib', + 'node_modules', + '@types' +].map(a => path.join(__dirname, a)); + +(async () => { + removeSync('lib'); + const tsc = exec('npx tsc'); + tsc.stdout?.on("data", console.log); + tsc.stderr?.on("data", console.log); + + 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 + } + }) + filtered.forEach(item => { + const itemPath = path.join(__dirname, 'lib', item.path.replace(__dirname, '')); + if (item.stats.isDirectory()) { + if (!fs.existsSync(itemPath)) + fs.mkdirSync(itemPath) + } else { + copyFileSync(item.path, itemPath) + } + }) + }) +})() + +const readDir = (dir: string) : { + path: string, + stats: fs.Stats +}[] => { + const items: { + path: string, + stats: fs.Stats + }[] = []; + const content = fs.readdirSync(dir); + for (const item of content) { + const itemPath = path.join(dir, item); + if (ignore.some(a => itemPath.startsWith(a))) + continue; + const stats = fs.statSync(itemPath); + items.push({ + path: itemPath, + stats + }); + if (stats.isDirectory()) { + items.push(...readDir(itemPath)) + } + } + return items; +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index c9f603c..d25803f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ + "outDir": "./lib", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ @@ -63,7 +63,12 @@ // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ /* Advanced Options */ + "resolveJsonModule": true, "skipLibCheck": true, /* Skip type checking of declaration files. */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ - } + }, + "exclude": [ + "./videos", + "./tsc.ts" + ] } From 255574df1befe7b9b08c2935eb8f23598c1cfbc5 Mon Sep 17 00:00:00 2001 From: Izuco Date: Thu, 28 Oct 2021 18:49:25 +0200 Subject: [PATCH 3/5] Update workflows --- .github/workflows/eslint.yml | 1 - .github/workflows/release-matrix.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 26d4425..fdf1044 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -8,7 +8,6 @@ on: jobs: build: - runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/release-matrix.yml b/.github/workflows/release-matrix.yml index 860011c..5813fcb 100644 --- a/.github/workflows/release-matrix.yml +++ b/.github/workflows/release-matrix.yml @@ -40,7 +40,7 @@ jobs: with: upload_url: ${{ github.event.release.upload_url }} asset_name: ${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ env.BUILD_TYPE }}.7z - asset_path: ./_builds/${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ env.BUILD_TYPE }}.7z + asset_path: ./lib/_builds/${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ env.BUILD_TYPE }}.7z asset_content_type: application/x-7z-compressed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2c07f51f54a4919ae2808846896dcb33d9433ec4 Mon Sep 17 00:00:00 2001 From: Izuco Date: Thu, 28 Oct 2021 19:32:34 +0200 Subject: [PATCH 4/5] Test + Style --- .eslintignore | 2 + .github/workflows/eslint.yml | 23 - .github/workflows/test.yml | 33 + @types/episode.d.ts | 39 +- @types/hls-download.d.ts | 2 +- @types/items.d.ts | 23 +- @types/m3u8-parsed.d.ts | 16 +- funi.ts | 1334 +++++++++++++++++----------------- modules/build.ts | 113 +-- modules/module.app-args.ts | 466 ++++++------ modules/module.merger.ts | 12 +- package-lock.json | 953 ++++++++++++------------ package.json | 6 +- tsc.ts | 32 +- 14 files changed, 1560 insertions(+), 1494 deletions(-) create mode 100644 .eslintignore delete mode 100644 .github/workflows/eslint.yml create mode 100644 .github/workflows/test.yml 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 From 1978556c0641510a182de833e63c7f5168b52a44 Mon Sep 17 00:00:00 2001 From: Izuco Date: Thu, 28 Oct 2021 19:34:49 +0200 Subject: [PATCH 5/5] Rename job --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 965d0dc..a15886d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: eslint +name: Style and build test on: push: