Fixed episode selection + using hls-downloader

funi.js

@@ -15,8 +15,7 @@ const api_host = 'https://prod-api-funimationnow.dadcdigital.com/api';
 const shlp = require('sei-helper');
 const { lookpath } = require('lookpath');
 const m3u8 = require('m3u8-parsed');
-const crypto = require('crypto');
-const got = require('got');
+const hlsDownload = require("hls-download")
 
 // extra
 const appYargs    = require('./modules/module.app-args');
@@ -44,6 +43,9 @@ module.exports = {
 // Import modules after argv has been exported
 const getData = require('./modules/module.getdata.js');
 const merger = require('./modules/merger');
+const parseSelect = require('./modules/module.parseSelect')
+
+parseSelect(argv.e)
 
 // check page
 if(!isNaN(parseInt(argv.p, 10)) && parseInt(argv.p, 10) > 0){
@@ -172,7 +174,7 @@ async function getShow(){
     let selEps = typeof argv.e == 'string' ? argv.e.split(',') : [];
     let epsDataArr = JSON.parse(episodesData.res.body).items;
     let epNumRegex = /^([A-Z0-9]*[A-Z])?(\d+)$/i;
-    let epSelEpsTxt = [], epSelList = [], typeIdLen = 0, epIdLen = 4;
+    let epSelEpsTxt = [], epSelList, typeIdLen = 0, epIdLen = 4;
     
     const parseEpStr = (epStr) => {
         epStr = epStr.match(epNumRegex);
@@ -201,36 +203,8 @@ async function getShow(){
         return e;
     });
     
-    let maxEp = Math.pow(10, epIdLen) - 1;
-    
-    selEps.map( (e) => {
-        if(e.match('-')) {
-            e = e.split('-');
-            if( e[0].match(epNumRegex) && e[1].match(/^\d+$/) ){
-                e[0] = parseEpStr(e[0]);
-                const letter = e[0][0];
-                e[0] = parseInt(e[0][1]);
-                e[0] = maxEp > e[0] ? e[0] : maxEp;
-                e[1] = parseInt(e[1]);
-                if(e[0] < e[1]){
-                    const rangeLength = e[1] - e[0] + 1;
-                    for(const i in Array(rangeLength).fill(0)){
-                        epSelList.push((letter + (i.toString()).padStart(epIdLen, '0')).toUpperCase());
-                    }
-                }
-                else{
-                    epSelList.push((letter + (e[0].toString()).padStart(epIdLen, '0')).toUpperCase());
-                }
-            }
-        }
-        else if(e.match(epNumRegex)){
-            e = parseEpStr(e);
-            e[1] = parseInt(e[1]);
-            e[1] = maxEp > e[1] ? e[1] : maxEp;
-            epSelList.push((e[0] + (e[1].toString()).padStart(epIdLen, '0')).toUpperCase());
-        }
-    });
-    
+    epSelList = parseSelect(argv.e);
+
     let fnSlug = [], is_selected = false;
     
     let eps = epsDataArr;
@@ -249,7 +223,7 @@ async function getShow(){
         let epStrId = eps[e].id_split.join('');
         // select
         is_selected = false;
-        if (argv.all || epSelList.includes(epStrId)) {
+        if (argv.all || epSelList.isSelected(epStrId)) {
             fnSlug.push({title:eps[e].item.titleSlug,episode:eps[e].item.episodeSlug});
             epSelEpsTxt.push(epStrId);
             is_selected = true;
@@ -760,115 +734,13 @@ async function downloadStreams(){
 }
 
 async function downloadFile(filename, chunkList) {
-    let offset = 0;
-    fileCheck: if (fs.existsSync(filename + '.ts')) {
-        if (fs.existsSync(filename + '.ts.resume')) {
-            const resume = JSON.parse(fs.readFileSync(`${filename}.ts.resume`));
-            if (resume.total === chunkList.segments.length) {
-                offset = resume.downloaded;
-                break fileCheck;
-            }
-        }
-        let rwts = await shlp.question(`[Q] File «${filename + '.ts'}» already exists! Rewrite or continue? (y/N/c)`);
-        rwts = rwts || 'N';
-        if (['N', 'n'].includes(rwts[0])) {
-            return false;
-        } else if (['C', 'c'].includes(rwts[0])) {
-            return true;
-        } else {
-            fs.unlinkSync(filename + '.ts');
-        }
-    }
-
-    let start = Date.now();
-
-    console.log(`[INFO] Started ${filename}.ts`);
-    for (let i = offset; i < chunkList.segments.length; i+=argv.partsize) {
-        let cur = [];
-        for (let a = 0; a < Math.min(argv.partsize, chunkList.segments.length - i); a++) {
-            cur.push(downloadPart(chunkList.segments[i + a], i + a, chunkList.segments.length)
-                .catch(e => e));
-        }
-
-        let p = await Promise.all(cur);
-        if (p.some(el => el instanceof Error)) {
-            console.log(`[ERROR] An error occured while downloading ${filename}.ts`);
-            return false;
-        }
-
-        fs.writeFileSync(`${filename}.ts.resume`, JSON.stringify({ total: chunkList.segments.length, downloaded: i + argv.partsize }, null, 4));
-
-        for (let a = 0; a < p.length; a++) {
-            fs.writeFileSync(filename + '.ts', p[a].content, { flag: 'a' });
-        }
-
-        logDownloadInfo(start, i + Math.min(argv.partsize, chunkList.segments.length - i),
-            chunkList.segments.length, i + Math.min(argv.partsize, chunkList.segments.length - i),
-            chunkList.segments.length);
-    }
+    const downloadStatus = await new hlsDownload({
+        m3u8json: chunkList,
+        output: `${filename + '.ts'}`,
+        timeout: argv.timeout
+    }).download()
     
-    if (fs.existsSync(`${filename}.ts.resume`))
-        fs.unlinkSync(`${filename}.ts.resume`);
-
-    console.log(`[INFO] Finished ${filename}.ts`);
-    return true;
-}
-
-async function downloadPart(chunk, index) {
-
-    let key = await generateCrypto(chunk, index);
-    
-    let headers = {
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:70.0) Gecko/20100101 Firefox/70.0'
-    };
-
-    if (chunk.byterange)
-        headers.Range = `bytes=${chunk.byterange.offset}-${chunk.byterange.offset+chunk.byterange.length-1}`;
-
-    let res = (await got({
-        url: chunk.uri,
-        headers,
-        responseType: 'buffer'
-    }).catch(error => console.log(`[ERROR] ${error.name}: ${error.code||error.message}`)));
-
-    if (!res.body) { return new Error('Invalid State'); }
-    try {
-        let dec = key.update(res.body);
-        dec = Buffer.concat([dec, key.final()]);
-        return { content: dec, index: index};
-    } catch (e) { return e; }
-}
-
-let keys = {};
-async function generateCrypto(chunk, index) {
-    let key = keys[chunk.key.uri];
-    if (!key) {
-        let reqKey = await getData({
-            url: chunk.key.uri,
-            responseType: 'buffer'
-        });
-    
-        if (!reqKey.ok) { console.log('[ERROR] Can\'t get key'); return; }
-        key = reqKey.res.body;
-        keys[chunk.key.uri] = key;
-    }
-    let iv = Buffer.alloc(16);
-    let ivs = chunk.key.iv ? chunk.key.iv : [0, 0, 0, index];
-    for (let i in ivs) {
-        iv.writeUInt32BE(ivs[i], i * 4);
-    }
-    key = crypto.createDecipheriv('aes-128-cbc', key, iv);
-    return key;
-}
-
-/* Snacked from hls-download */
-function logDownloadInfo (dateStart, partsDL, partsTotal, partsDLRes, partsTotalRes) {
-    const dateElapsed = Date.now() - dateStart;
-    const percentFxd = (partsDL / partsTotal * 100).toFixed();
-    const percent = percentFxd < 100 ? percentFxd : (partsTotal == partsDL ? 100 : 99);
-    const revParts = parseInt(dateElapsed * (partsTotal / partsDL - 1));
-    const time = shlp.formatTime((revParts / 1000).toFixed());
-    console.log(`[INFO] ${partsDLRes} of ${partsTotalRes} parts downloaded [${percent}%] (${time})`);
+    return downloadStatus.ok;
 }
 
 /**

modules/module.app-args.js

@@ -201,6 +201,12 @@ const appArgv = (cfg) => {
             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)
+        })
         // help
         .option('help', {
             alias: 'h',

modules/module.parseSelect.js

@@ -0,0 +1,75 @@
+/**
+ * @param {string} selectString
+ * @returns {{
+ *  isSelected: (val: string) => boolean,
+ *  values: string[]
+ * }} 
+ */
+module.exports = (selectString) => {
+  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 {
+      select.push(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)}`)
+      }
+    }
+  };
+}

package-lock.json

@@ -186,6 +186,11 @@
                 "defer-to-connect": "^2.0.0"
             }
         },
+        "@tootallnate/once": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+        },
         "@types/cacheable-request": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
@@ -249,7 +254,6 @@
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
             "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
             "requires": {
                 "debug": "4"
             }
@@ -316,6 +320,14 @@
             "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
             "dev": true
         },
+        "ast-types": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+            "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+            "requires": {
+                "tslib": "^2.0.1"
+            }
+        },
         "astral-regex": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -398,6 +410,11 @@
                 "ieee754": "^1.1.13"
             }
         },
+        "bytes": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+            "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        },
         "cacheable-lookup": {
             "version": "5.0.4",
             "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -516,8 +533,7 @@
         "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==",
-            "dev": true
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "cross-spawn": {
             "version": "7.0.3",
@@ -530,11 +546,15 @@
                 "which": "^2.0.1"
             }
         },
+        "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=="
+        },
         "debug": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
             "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
             "requires": {
                 "ms": "2.1.2"
             }
@@ -563,14 +583,73 @@
         "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=",
-            "dev": true
+            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
         },
         "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=="
         },
+        "degenerator": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz",
+            "integrity": "sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ==",
+            "requires": {
+                "ast-types": "^0.13.2",
+                "escodegen": "^1.8.1",
+                "esprima": "^4.0.0",
+                "vm2": "^3.9.3"
+            },
+            "dependencies": {
+                "escodegen": {
+                    "version": "1.14.3",
+                    "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+                    "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+                    "requires": {
+                        "esprima": "^4.0.1",
+                        "estraverse": "^4.2.0",
+                        "esutils": "^2.0.2",
+                        "optionator": "^0.8.1",
+                        "source-map": "~0.6.1"
+                    }
+                },
+                "levn": {
+                    "version": "0.3.0",
+                    "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+                    "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+                    "requires": {
+                        "prelude-ls": "~1.1.2",
+                        "type-check": "~0.3.2"
+                    }
+                },
+                "optionator": {
+                    "version": "0.8.3",
+                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+                    "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+                    "requires": {
+                        "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"
+                    }
+                },
+                "prelude-ls": {
+                    "version": "1.1.2",
+                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+                    "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+                },
+                "type-check": {
+                    "version": "0.3.2",
+                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+                    "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+                    "requires": {
+                        "prelude-ls": "~1.1.2"
+                    }
+                }
+            }
+        },
         "delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -582,6 +661,11 @@
             "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
             "dev": true
         },
+        "depd": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+            "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+        },
         "detect-libc": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -807,8 +891,7 @@
         "esprima": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
         },
         "esquery": {
             "version": "1.4.0",
@@ -847,14 +930,12 @@
         "estraverse": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         },
         "esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
         },
         "expand-template": {
             "version": "2.0.3",
@@ -890,8 +971,7 @@
         "fast-levenshtein": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
+            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
         },
         "fastq": {
             "version": "1.13.0",
@@ -911,6 +991,11 @@
                 "flat-cache": "^3.0.4"
             }
         },
+        "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=="
+        },
         "fill-range": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -978,6 +1063,38 @@
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
             "dev": true
         },
+        "ftp": {
+            "version": "0.3.10",
+            "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+            "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+            "requires": {
+                "readable-stream": "1.1.x",
+                "xregexp": "2.0.0"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "0.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+                },
+                "readable-stream": {
+                    "version": "1.1.14",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.1",
+                        "isarray": "0.0.1",
+                        "string_decoder": "~0.10.x"
+                    }
+                },
+                "string_decoder": {
+                    "version": "0.10.31",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+                }
+            }
+        },
         "function-bind": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -1056,6 +1173,44 @@
                 "pump": "^3.0.0"
             }
         },
+        "get-uri": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+            "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
+            "requires": {
+                "@tootallnate/once": "1",
+                "data-uri-to-buffer": "3",
+                "debug": "4",
+                "file-uri-to-path": "2",
+                "fs-extra": "^8.1.0",
+                "ftp": "^0.3.10"
+            },
+            "dependencies": {
+                "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==",
+                    "requires": {
+                        "graceful-fs": "^4.2.0",
+                        "jsonfile": "^4.0.0",
+                        "universalify": "^0.1.0"
+                    }
+                },
+                "jsonfile": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+                    "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+                    "requires": {
+                        "graceful-fs": "^4.1.6"
+                    }
+                },
+                "universalify": {
+                    "version": "0.1.2",
+                    "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+                    "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+                }
+            }
+        },
         "github-from-package": {
             "version": "0.0.0",
             "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -1169,11 +1324,43 @@
             "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
             "dev": true
         },
+        "hls-download": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/hls-download/-/hls-download-2.6.2.tgz",
+            "integrity": "sha512-5D+nSLar6xl8SSXqciCH8iaWcdGgOb5W8dp33ti23Bh/n6BFGTHb41NyIXA0JqmlKyAs/1+E/2Wg6+BTrdkU7A==",
+            "requires": {
+                "got": "^11.7.0",
+                "proxy-agent": "^5.0.0",
+                "sei-helper": "^3.3.0"
+            }
+        },
         "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=="
         },
+        "http-errors": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+            "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+            "requires": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.1.1",
+                "statuses": ">= 1.5.0 < 2",
+                "toidentifier": "1.0.0"
+            }
+        },
+        "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==",
+            "requires": {
+                "@tootallnate/once": "1",
+                "agent-base": "6",
+                "debug": "4"
+            }
+        },
         "http2-wrapper": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
@@ -1187,12 +1374,19 @@
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
             "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
             "requires": {
                 "agent-base": "6",
                 "debug": "4"
             }
         },
+        "iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            }
+        },
         "ieee754": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -1234,8 +1428,7 @@
         "inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
         "ini": {
             "version": "1.3.8",
@@ -1253,6 +1446,11 @@
                 "p-is-promise": "^3.0.0"
             }
         },
+        "ip": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+            "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+        },
         "is-core-module": {
             "version": "2.6.0",
             "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
@@ -1493,8 +1691,7 @@
         "ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "multistream": {
             "version": "4.1.0",
@@ -1531,6 +1728,11 @@
             "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
             "dev": true
         },
+        "netmask": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+            "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
+        },
         "node-abi": {
             "version": "2.30.1",
             "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
@@ -1622,6 +1824,32 @@
             "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==",
             "dev": true
         },
+        "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==",
+            "requires": {
+                "@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"
+            }
+        },
+        "pac-resolver": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz",
+            "integrity": "sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==",
+            "requires": {
+                "degenerator": "^3.0.1",
+                "ip": "^1.1.5",
+                "netmask": "^2.0.1"
+            }
+        },
         "parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -1788,6 +2016,41 @@
             "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
             "dev": true
         },
+        "proxy-agent": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+            "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
+            "requires": {
+                "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"
+            },
+            "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": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+        },
         "pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -1814,6 +2077,17 @@
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
             "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
         },
+        "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==",
+            "requires": {
+                "bytes": "3.1.0",
+                "http-errors": "1.7.3",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            }
+        },
         "rc": {
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -1936,6 +2210,11 @@
             "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
             "dev": true
         },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+        },
         "sei-helper": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/sei-helper/-/sei-helper-3.3.0.tgz",
@@ -1956,6 +2235,11 @@
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
             "dev": true
         },
+        "setprototypeof": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+            "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+        },
         "shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2036,11 +2320,34 @@
                 }
             }
         },
+        "smart-buffer": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
+        },
+        "socks": {
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
+            "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
+            "requires": {
+                "ip": "^1.1.5",
+                "smart-buffer": "^4.1.0"
+            }
+        },
+        "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==",
+            "requires": {
+                "agent-base": "^6.0.2",
+                "debug": "4",
+                "socks": "^2.3.3"
+            }
+        },
         "source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
             "optional": true
         },
         "sprintf-js": {
@@ -2049,6 +2356,11 @@
             "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
             "dev": true
         },
+        "statuses": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+            "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+        },
         "stream-meter": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz",
@@ -2211,11 +2523,15 @@
                 "is-number": "^7.0.0"
             }
         },
+        "toidentifier": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+            "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+        },
         "tslib": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-            "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-            "dev": true
+            "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
         },
         "tunnel-agent": {
             "version": "0.6.0",
@@ -2246,6 +2562,11 @@
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
             "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
         },
+        "unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+        },
         "uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -2272,6 +2593,11 @@
             "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
             "dev": true
         },
+        "vm2": {
+            "version": "3.9.3",
+            "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.3.tgz",
+            "integrity": "sha512-smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q=="
+        },
         "which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2332,8 +2658,7 @@
         "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==",
-            "dev": true
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
         },
         "wrap-ansi": {
             "version": "7.0.0",
@@ -2367,6 +2692,11 @@
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
+        "xregexp": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+            "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM="
+        },
         "y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -25,14 +25,15 @@
     "main": "funi.js",
     "dependencies": {
         "form-data": "^4.0.0",
+        "fs-extra": "^10.0.0",
         "got": "^11.7.0",
+        "hls-download": "^2.6.2",
         "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.1.1",
-        "fs-extra": "^10.0.0"
+        "yargs": "^17.1.1"
     },
     "devDependencies": {
         "eslint": "^7.30.0",