@lzwme/m3u8-dl 1.2.0 → 1.2.2

package/README.MD

@@ -152,6 +152,7 @@ services:
       DS_PORT: '6600'
       DS_SAVE_DIR: '/app/downloads'
       DS_CACHE_DIR: '/app/cache'
+      DS_SECRET: '' # 设置访问密码
       DS_DEBUG: ''
     # command: >
     #   sh -c "node cjs/server/index.js"

package/cjs/cli.js

@@ -34,12 +34,12 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
 const commander_1 = require("commander");
 const console_log_colors_1 = require("console-log-colors");
-const fe_utils_1 = require("@lzwme/fe-utils");
 const utils_js_1 = require("./lib/utils.js");
-const m3u8_batch_download_1 = require("./m3u8-batch-download");
 const video_search_js_1 = require("./lib/video-search.js");
+const m3u8_batch_download_1 = require("./m3u8-batch-download");
 const pkg = (0, fe_utils_1.readJsonFileSync)((0, node_path_1.resolve)(__dirname, '../package.json'));
 process.on('unhandledRejection', r => {
     console.error(r);
@@ -54,19 +54,19 @@ commander_1.program
     .version(pkg.version, '-v, --version')
     .description((0, console_log_colors_1.cyanBright)(pkg.description))
     .argument('<m3u8Urls...>', 'm3u8 url。也可以是本地 txt 文件，指定一组 m3u8，适用于批量下载的场景')
-    .option('--silent', `开启静默模式。`)
-    .option('--debug', `开启调试模式。`)
-    .option('-f, --filename <name>', `指定下载文件的保存名称。默认取 url md5 值。若指定了多个 url 地址，则会在末尾增加序号`)
-    .option('-n, --thread-num <number>', `并发下载线程数。默认为 cpu * 2。可设置不同数值观察下载效果`)
-    .option('-F, --force', `启用强制执行模式。文件已存在时，是否仍继续下载和生成`)
-    .option('--no-progress', `是否不打印进度信息`)
-    .option('-p, --play', `是否边下边看`)
-    .option('-C, --cache-dir <dirpath>', `临时文件保存目录。默认为 cache`)
-    .option('-S, --save-dir <dirpath>', `下载文件保存的路径。默认为当前目录`)
-    .option('--no-del-cache', `下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存`)
+    .option('--silent', '开启静默模式。')
+    .option('--debug', '开启调试模式。')
+    .option('-f, --filename <name>', '指定下载文件的保存名称。默认取 url md5 值。若指定了多个 url 地址，则会在末尾增加序号')
+    .option('-n, --thread-num <number>', '并发下载线程数。默认为 cpu * 2。可设置不同数值观察下载效果')
+    .option('-F, --force', '启用强制执行模式。文件已存在时，是否仍继续下载和生成')
+    .option('--no-progress', '是否不打印进度信息')
+    .option('-p, --play', '是否边下边看')
+    .option('-C, --cache-dir <dirpath>', '临时文件保存目录。默认为 cache')
+    .option('-S, --save-dir <dirpath>', '下载文件保存的路径。默认为当前目录')
+    .option('--no-del-cache', '下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存')
     .option('--no-convert', '下载成功后，是否不合并转换为 mp4 文件。默认为 true。')
-    .option('-H, --headers <headers>', `自定义请求头。格式为 key1=value1\nkey2=value2`)
-    .option('-T, --type <type>', `指定下载类型。默认根据URL自动识别，如果是批量下载多个不同 URL 类型，请不要设置。可选值：m3u8, file, parser`)
+    .option('-H, --headers <headers>', '自定义请求头。格式为 key1=value1\nkey2=value2')
+    .option('-T, --type <type>', '指定下载类型。默认根据URL自动识别，如果是批量下载多个不同 URL 类型，请不要设置。可选值：m3u8, file, parser')
     .action(async (urls) => {
     const options = getOptions();
     utils_js_1.logger.debug(urls, options);
@@ -83,11 +83,12 @@ commander_1.program
     .command('server')
     .description('启动下载中心web服务')
     .option('-P, --port <port>', '指定web服务端口。默认为6600')
-    .option('--token <token>', '指定web服务密码（请求头authorization）。默认为空')
+    .option('-t, --token <token>', '指定web服务密码（请求头authorization）。默认为空')
     .action((options) => {
     const opts = getOptions();
     if (opts.debug)
         options.debug = true;
+    console.log(opts, options);
     Promise.resolve().then(() => __importStar(require('./server/download-server.js'))).then(m => {
         new m.DLServer(options);
     });

package/cjs/lib/file-download.d.ts

@@ -1,2 +1,2 @@
 import type { M3u8DLOptions, M3u8DLResult } from '../types';
-export declare function fileDownload(url: string, options: M3u8DLOptions): Promise<M3u8DLResult>;
+export declare function fileDownload(u: string, opts: M3u8DLOptions): Promise<M3u8DLResult>;

package/cjs/lib/file-download.js

@@ -4,11 +4,11 @@ exports.fileDownload = fileDownload;
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
 const console_log_colors_1 = require("console-log-colors");
-const utils_js_1 = require("./utils.js");
 const format_options_js_1 = require("./format-options.js");
-async function fileDownload(url, options) {
-    utils_js_1.logger.debug('fileDownload', url, options);
-    [url, options] = (0, format_options_js_1.formatOptions)(url, options);
+const utils_js_1 = require("./utils.js");
+async function fileDownload(u, opts) {
+    utils_js_1.logger.debug('fileDownload', u, opts);
+    const [url, options] = (0, format_options_js_1.formatOptions)(u, opts);
     const startTime = Date.now();
     const stats = {
         url,
@@ -49,13 +49,15 @@ async function fileDownload(url, options) {
                 stats.size = info.size;
                 stats.downloadedSize = info.downloaded;
                 stats.speed = info.speed;
-                stats.speedDesc = (0, fe_utils_1.formatByteSize)(stats.speed) + '/s';
+                stats.speedDesc = `${(0, fe_utils_1.formatByteSize)(stats.speed)}/s`;
                 stats.remainingTime = Math.round((info.size - info.downloaded) / stats.speed);
                 if (options.showProgress) {
                     const processBar = info.percent === -1 ? '' : '='.repeat(Math.floor(stats.progress * 0.2)).padEnd(20, '-');
-                    utils_js_1.logger.logInline(`${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] ` +
-                        `${(0, console_log_colors_1.blueBright)((0, fe_utils_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} ` +
-                        (stats.progress === 100 ? '\n' : stats.remainingTime ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}` : ''));
+                    utils_js_1.logger.logInline([
+                        `${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] `,
+                        `${(0, console_log_colors_1.blueBright)((0, fe_utils_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} `,
+                        stats.progress === 100 ? '\n' : stats.remainingTime ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}` : '',
+                    ].join(''));
                 }
                 if (options.onProgress) {
                     return options.onProgress(info.downloaded, info.size, null, stats);
@@ -74,7 +76,7 @@ async function fileDownload(url, options) {
         stats.errmsg = error.message;
         return {
             isExist: false,
-            errmsg: '下载失败: ' + error.message,
+            errmsg: `下载失败: ${error.message}`,
             stats,
         };
     }

package/cjs/lib/format-options.d.ts

@@ -1,2 +1,2 @@
-import { M3u8DLOptions } from '../types';
+import type { M3u8DLOptions } from '../types';
 export declare function formatOptions(url: string, opts: M3u8DLOptions): readonly [string, M3u8DLOptions, string];

package/cjs/lib/format-options.js

@@ -4,8 +4,8 @@ exports.formatOptions = formatOptions;
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
-const utils_1 = require("./utils");
 const video_parser_1 = require("../video-parser");
+const utils_1 = require("./utils");
 const fileSupportExtList = [
     '.mp4',
     '.mkv',
@@ -48,7 +48,7 @@ function formatOptions(url, opts) {
         }
     }
     let [u, n] = url.split(/[|$]+/);
-    if (n && n.startsWith('http'))
+    if (n?.startsWith('http'))
         [u, n] = [n, u];
     url = u;
     if (n) {
@@ -67,7 +67,7 @@ function formatOptions(url, opts) {
     if (!(0, node_path_1.extname)(options.filename) && options.type !== 'file')
         options.filename += ext || '.mp4';
     if (!options.cacheDir)
-        options.cacheDir = `cache`;
+        options.cacheDir = 'cache';
     if (options.headers)
         options.headers = (0, utils_1.formatHeaders)(options.headers);
     if (!options.threadNum || +options.threadNum <= 0)

package/cjs/lib/local-play.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localPlay = localPlay;
 exports.toLocalM3u8 = toLocalM3u8;
-const fe_utils_1 = require("@lzwme/fe-utils");
-const console_log_colors_1 = require("console-log-colors");
 const node_fs_1 = require("node:fs");
 const node_http_1 = require("node:http");
 const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
+const console_log_colors_1 = require("console-log-colors");
 const utils_js_1 = require("./utils.js");
 /**
  * 边下边看
@@ -32,24 +32,24 @@ function toLocalM3u8(m3u8Info, m3u8FilePath = '', host = '') {
     if ((0, node_fs_1.existsSync)(m3u8FilePath))
         return m3u8FilePath;
     const m3u8ContentList = [
-        `#EXTM3U`,
-        `#EXT-X-VERSION:3`,
-        `#EXT-X-ALLOW-CACHE:YES`,
+        '#EXTM3U',
+        '#EXT-X-VERSION:3',
+        '#EXT-X-ALLOW-CACHE:YES',
         `#EXT-X-TARGETDURATION:${Math.max(...m3u8Info.map(d => d.duration))}`,
-        `#EXT-X-MEDIA-SEQUENCE:0`,
+        '#EXT-X-MEDIA-SEQUENCE:0',
         // `#EXT-X-KEY:METHOD=AES-128,URI="/api/aes/enc.key"`,
     ];
     if (host && !host.endsWith('/'))
         host += '/';
-    m3u8Info.forEach(d => {
+    for (const d of m3u8Info) {
         if (d.tsOut)
             m3u8ContentList.push(`#EXTINF:${Number(d.duration).toFixed(6)},`, `${host}${(0, node_path_1.basename)(d.tsOut)}`);
-    });
-    m3u8ContentList.push(`#EXT-X-ENDLIST`);
+    }
+    m3u8ContentList.push('#EXT-X-ENDLIST');
     const m3u8Content = m3u8ContentList.join('\n');
     const ext = (0, node_path_1.extname)(m3u8FilePath);
     if (ext !== '.m3u8')
-        m3u8FilePath = m3u8FilePath.replace(ext, '') + '.m3u8';
+        m3u8FilePath = `${m3u8FilePath.replace(ext, '')}.m3u8`;
     m3u8FilePath = (0, node_path_1.resolve)(cacheDir, m3u8FilePath);
     (0, fe_utils_1.mkdirp)(cacheDir);
     (0, node_fs_1.writeFileSync)(m3u8FilePath, m3u8Content, 'utf8');
@@ -79,7 +79,7 @@ async function createLocalServer(baseDir) {
                 (0, node_fs_1.createReadStream)(filename).pipe(res);
                 return;
             }
-            else if (stats.isDirectory()) {
+            if (stats.isDirectory()) {
                 const html = (0, node_fs_1.readdirSync)(filename).map(fname => {
                     const rpath = (0, node_path_1.resolve)(filename, fname).replace(baseDir, '');
                     return `<li><a href="${rpath}">${rpath}</a></li>`;

package/cjs/lib/m3u8-convert.js

@@ -20,7 +20,7 @@ async function m3u8Convert(options, data) {
         let filesAllArr = data.filter(d => (0, node_fs_1.existsSync)(d.tsOut)).map(d => `file '${d.tsOut}'\nduration ${d.duration}`);
         if (process.platform === 'win32')
             filesAllArr = filesAllArr.map(d => d.replaceAll('\\', '/'));
-        (0, node_fs_1.writeFileSync)(ffconcatFile, 'ffconcat version 1.0\n' + filesAllArr.join('\n'));
+        (0, node_fs_1.writeFileSync)(ffconcatFile, `ffconcat version 1.0\n${filesAllArr.join('\n')}`);
         let headersString = '';
         if (options.headers) {
             for (const [key, value] of Object.entries(options.headers)) {

package/cjs/lib/m3u8-download.js

@@ -4,17 +4,17 @@ exports.workPollPublic = exports.downloadQueue = exports.DownloadQueue = void 0;
 exports.preDownLoad = preDownLoad;
 exports.m3u8Download = m3u8Download;
 exports.m3u8DLStop = m3u8DLStop;
-const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
 const helper_1 = require("@lzwme/fe-utils/cjs/common/helper");
 const console_log_colors_1 = require("console-log-colors");
-const utils_js_1 = require("./utils.js");
 const format_options_js_1 = require("./format-options.js");
-const worker_pool_js_1 = require("./worker_pool.js");
-const parseM3u8_js_1 = require("./parseM3u8.js");
-const m3u8_convert_js_1 = require("./m3u8-convert.js");
 const local_play_js_1 = require("./local-play.js");
+const m3u8_convert_js_1 = require("./m3u8-convert.js");
+const parseM3u8_js_1 = require("./parseM3u8.js");
+const utils_js_1 = require("./utils.js");
+const worker_pool_js_1 = require("./worker_pool.js");
 /** 下载队列管理 */
 class DownloadQueue {
     queue = [];
@@ -101,7 +101,10 @@ async function m3u8InfoParse(url, options = {}) {
     }
     if (!options.force && (0, node_fs_1.existsSync)(filepath))
         return result;
-    const m3u8Info = await (0, parseM3u8_js_1.parseM3U8)(url, (0, node_path_1.resolve)(options.cacheDir, urlMd5), options.headers).catch(e => utils_js_1.logger.error('[parseM3U8][failed]', e));
+    const m3u8Info = await (0, parseM3u8_js_1.parseM3U8)(url, (0, node_path_1.resolve)(options.cacheDir, urlMd5), options.headers).catch(e => {
+        utils_js_1.logger.error('[parseM3U8][failed]', e.message);
+        console.log(e);
+    });
     if (m3u8Info && m3u8Info?.tsCount > 0)
         result.m3u8Info = m3u8Info;
     return result;
@@ -132,7 +135,7 @@ async function preDownLoad(url, options, wp = exports.workPollPublic) {
             return;
         if (!cache.downloading.has(info.uri)) {
             cache.downloading.add(info.uri);
-            wp.runTask({ url, info, options: JSON.parse(JSON.stringify(result.options)), crypto: result.m3u8Info.crypto }, () => {
+            wp.runTask({ url, info, options: JSON.parse(JSON.stringify(result.options)), crypto: result.m3u8Info.crypto[info.keyUri] }, () => {
                 cache.downloading.delete(info.uri);
             });
         }
@@ -196,7 +199,7 @@ async function m3u8Download(url, options = {}) {
         const runTask = (data) => {
             for (const info of data) {
                 const o = JSON.parse(JSON.stringify(options));
-                workPoll.runTask({ url, info, options: o, crypto: m3u8Info.crypto }, (err, res, taskStartTime) => {
+                workPoll.runTask({ url, info, options: o, crypto: m3u8Info.crypto[info.keyUri] }, (err, res, taskStartTime) => {
                     stats.errmsg = err ? err.cause || err.message || err.toString() : '';
                     if (!res || err) {
                         if (err) {
@@ -230,28 +233,26 @@ async function m3u8Download(url, options = {}) {
                     const downloadedDuration = m3u8Info.data.reduce((a, b) => a + (b.tsSize ? b.duration : 0), 0);
                     stats.downloadedSize = m3u8Info.data.reduce((a, b) => a + (b.tsSize || 0), 0);
                     stats.avgSpeed = (stats.downloadedSize / timeCost) * 1000;
-                    stats.avgSpeedDesc = (0, helper_1.formatByteSize)(stats.avgSpeed) + '/s';
+                    stats.avgSpeedDesc = `${(0, helper_1.formatByteSize)(stats.avgSpeed)}/s`;
                     // 如果当前速度小于平均速度，则更新为平均速度
                     if (stats.speed < stats.avgSpeed)
                         stats.speed = stats.avgSpeed;
-                    stats.speedDesc = (0, helper_1.formatByteSize)(stats.speed) + '/s';
+                    stats.speedDesc = `${(0, helper_1.formatByteSize)(stats.speed)}/s`;
                     stats.progress = Math.floor((finished / m3u8Info.tsCount) * 100);
                     if (downloadedDuration) {
                         stats.remainingTime = (timeCost / downloadedDuration) * (m3u8Info.duration - stats.durationDownloaded);
                         if (stats.speed > stats.avgSpeed)
                             stats.remainingTime = stats.remainingTime * (stats.avgSpeed / stats.speed);
                         stats.remainingTime = Math.ceil(stats.remainingTime);
-                        stats.size = stats.downloadedSize * (stats.duration / stats.durationDownloaded);
+                        stats.size = Math.round(stats.downloadedSize * (stats.duration / stats.durationDownloaded));
                     }
                     if (options.showProgress) {
                         const processBar = '='.repeat(Math.floor(stats.progress * 0.2)).padEnd(20, '-');
-                        utils_js_1.logger.logInline(`${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] ${(0, console_log_colors_1.cyan)(finished)} ${(0, console_log_colors_1.green)(stats.durationDownloaded.toFixed(2) + 'sec')} ` +
-                            `${(0, console_log_colors_1.blueBright)((0, helper_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} ` +
-                            (finished === m3u8Info.tsCount
-                                ? '\n'
-                                : stats.remainingTime
-                                    ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}`
-                                    : ''));
+                        utils_js_1.logger.logInline(`${stats.progress}% [${(0, console_log_colors_1.greenBright)(processBar)}] ${(0, console_log_colors_1.cyan)(finished)} ${(0, console_log_colors_1.green)(`${stats.durationDownloaded.toFixed(2)}sec`)} ${(0, console_log_colors_1.blueBright)((0, helper_1.formatByteSize)(stats.downloadedSize))} ${(0, console_log_colors_1.yellowBright)((0, fe_utils_1.formatTimeCost)(startTime))} ${(0, console_log_colors_1.magentaBright)(stats.speedDesc)} ${finished === m3u8Info.tsCount
+                            ? '\n'
+                            : stats.remainingTime
+                                ? `${(0, console_log_colors_1.cyan)((0, fe_utils_1.formatTimeCost)(Date.now() - stats.remainingTime))}`
+                                : ''}`);
                     }
                     if (options.onProgress)
                         options.onProgress(finished, m3u8Info.tsCount, info, stats);
@@ -265,23 +266,25 @@ async function m3u8Download(url, options = {}) {
             }
         };
         if (options.showProgress) {
-            console.info(`\nTotal segments: ${(0, console_log_colors_1.cyan)(m3u8Info.tsCount)}, duration: ${(0, console_log_colors_1.green)(m3u8Info.duration + 'sec')}.`, `Parallel jobs: ${(0, console_log_colors_1.magenta)(options.threadNum)}`);
+            console.info(`\nTotal segments: ${(0, console_log_colors_1.cyan)(m3u8Info.tsCount)}, duration: ${(0, console_log_colors_1.green)(`${m3u8Info.duration}sec`)}.`, `Parallel jobs: ${(0, console_log_colors_1.magenta)(options.threadNum)}`);
         }
         result.stats = stats;
-        (0, local_play_js_1.toLocalM3u8)(m3u8Info.data, options.filename);
+        (0, local_play_js_1.toLocalM3u8)(m3u8Info.data);
         if (options.onInited)
             options.onInited(stats, m3u8Info, workPoll);
         runTask(m3u8Info.data);
         await barrier.wait();
-        if (stats.tsFailed === 0) {
-            if (options.convert !== false) {
-                result.filepath = await (0, m3u8_convert_js_1.m3u8Convert)(options, m3u8Info.data);
-                if (options.delCache && result.filepath && (0, node_fs_1.existsSync)(result.filepath))
+        if (stats.tsFailed > 0) {
+            utils_js_1.logger.warn('Download Failed! Please retry!', stats.tsFailed);
+        }
+        else if (options.convert !== false) {
+            result.filepath = await (0, m3u8_convert_js_1.m3u8Convert)(options, m3u8Info.data);
+            if (result.filepath && (0, node_fs_1.existsSync)(result.filepath)) {
+                stats.size = (0, node_fs_1.statSync)(result.filepath).size;
+                if (options.delCache)
                     (0, fe_utils_1.rmrfAsync)((0, node_path_1.dirname)(m3u8Info.data[0].tsOut));
             }
         }
-        else
-            utils_js_1.logger.warn('Download Failed! Please retry!', stats.tsFailed);
     }
     utils_js_1.logger.debug('Done!', url, result.m3u8Info);
     return result;

package/cjs/lib/parseM3u8.d.ts

@@ -1,5 +1,5 @@
+import type { IncomingHttpHeaders } from 'node:http';
 import type { M3u8Info } from '../types/m3u8';
-import { IncomingHttpHeaders } from 'node:http';
 /**
  * 解析 m3u8 文件
  * @param content m3u8 文件的内容，可为 http 远程地址、本地文件路径

package/cjs/lib/parseM3u8.js

@@ -30,7 +30,14 @@ async function parseM3U8(content, cacheDir = './cache', headers) {
     parser.end();
     utils_1.logger.debug('parser.manifest', parser.manifest);
     if (parser.manifest.playlists?.length > 0) {
-        url = new URL(parser.manifest.playlists[0].uri, url).toString();
+        let maxBandwidthItem = parser.manifest.playlists[0];
+        for (const item of parser.manifest.playlists) {
+            if (!maxBandwidthItem || (item.attributes?.BANDWIDTH || 0) > (maxBandwidthItem.attributes?.BANDWIDTH || 0)) {
+                maxBandwidthItem = item;
+            }
+        }
+        url = new URL(maxBandwidthItem.uri, url).toString();
+        utils_1.logger.debug('maxBandwidthItem', maxBandwidthItem, url);
         content = (await (0, utils_1.getRetry)(url, headers)).data;
         parser = new m3u8_parser_1.Parser();
         parser.push(content);
@@ -45,42 +52,44 @@ async function parseM3U8(content, cacheDir = './cache', headers) {
         duration: 0,
         data: [],
         /** 加密相关信息 */
-        crypto: {
-            method: 'AES-128',
-            iv: new Uint8Array(16),
-            key: '',
-            uri: '',
-        },
+        crypto: {},
     };
     if (!result.tsCount) {
         utils_1.logger.error('m3u8 file error!\n', url, content);
         return result;
     }
-    const tsKeyInfo = tsList[0].key;
-    if (tsKeyInfo?.uri) {
-        if (tsKeyInfo.method)
-            result.crypto.method = tsKeyInfo.method.toUpperCase();
-        if (tsKeyInfo.iv) {
-            result.crypto.iv = typeof tsKeyInfo.iv === 'string' ? new Uint8Array(Buffer.from(tsKeyInfo.iv)) : tsKeyInfo.iv;
+    for (const [i, item] of tsList.entries()) {
+        if (!item.uri.includes('://'))
+            item.uri = new URL(item.uri, url).toString();
+        if (item.key) {
+            const tsKeyInfo = item.key;
+            if (!tsKeyInfo.uri.includes('://'))
+                tsKeyInfo.uri = new URL(tsKeyInfo.uri, url).toString();
+            if (tsKeyInfo?.uri && !result.crypto[tsKeyInfo.uri]) {
+                const r = await (0, utils_1.getRetry)(tsKeyInfo.uri);
+                if (r.response.statusCode !== 200) {
+                    utils_1.logger.error('获取加密 key 失败:', tsKeyInfo.uri, r.response.statusCode, r.data);
+                }
+                else {
+                    result.crypto[tsKeyInfo.uri] = {
+                        uri: tsKeyInfo.uri,
+                        method: tsKeyInfo.method.toUpperCase() || 'AES-128',
+                        iv: typeof tsKeyInfo.iv === 'string' ? new Uint8Array(Buffer.from(tsKeyInfo.iv)) : tsKeyInfo.iv,
+                        key: r.buffer,
+                    };
+                }
+            }
         }
-        result.crypto.uri = tsKeyInfo.uri.includes('://') ? tsKeyInfo.uri : new URL(tsKeyInfo.uri, url).toString();
-    }
-    if (result.crypto.uri !== '') {
-        const r = await (0, utils_1.getRetry)(result.crypto.uri);
-        result.crypto.key = r.buffer;
-    }
-    for (let i = 0; i < result.tsCount; i++) {
-        if (!tsList[i].uri.startsWith('http'))
-            tsList[i].uri = new URL(tsList[i].uri, url).toString();
         result.data.push({
-            m3u8: url,
             index: i,
-            duration: tsList[i].duration,
-            timeline: tsList[i].timeline,
-            uri: tsList[i].uri,
-            tsOut: (0, node_path_1.resolve)(cacheDir, `${(0, fe_utils_1.md5)(tsList[i].uri)}.ts`),
+            duration: item.duration,
+            timeline: item.timeline,
+            uri: item.uri,
+            tsOut: (0, node_path_1.resolve)(cacheDir, `${(0, fe_utils_1.md5)(item.uri)}.ts`),
+            keyUri: item.key?.uri || '',
+            m3u8: url,
         });
-        result.duration += tsList[i].duration;
+        result.duration += item.duration;
     }
     result.duration = +Number(result.duration).toFixed(2);
     return result;

package/cjs/lib/search-api/CommSearchApi.d.ts

@@ -1,5 +1,5 @@
 import type { SearchApi, VideoDetailsResult, VideoSearchResult } from '../../types';
-import { type M3u8StorConfig } from '../storage.js';
+import type { M3u8StorConfig } from '../storage.js';
 export interface VSOptions {
     /** 采集站地址 */
     api?: string;

package/cjs/lib/search-api/CommSearchApi.js

@@ -41,7 +41,7 @@ class CommSearchApi {
     }
     async search(wd, api = this.options.api) {
         let { data } = await req.get(api, { wd }, null, { rejectUnauthorized: false });
-        if (typeof data == 'string')
+        if (typeof data === 'string')
             data = JSON.parse(data);
         return data;
     }
@@ -54,7 +54,7 @@ class CommSearchApi {
             ac: 'videolist',
             ids: Array.isArray(ids) ? ids.join(',') : ids,
         }, null, { rejectUnauthorized: false });
-        if (typeof data == 'string')
+        if (typeof data === 'string')
             data = JSON.parse(data);
         return data;
     }

package/cjs/lib/storage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stor = void 0;
-const fe_utils_1 = require("@lzwme/fe-utils");
-const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const fe_utils_1 = require("@lzwme/fe-utils");
 exports.stor = fe_utils_1.LiteStorage.getInstance({ uuid: 'm3u8dl', filepath: (0, node_path_1.resolve)((0, node_os_1.homedir)(), '.liteStorage/m3u8dl.json') });

package/cjs/lib/ts-download.d.ts

@@ -1,3 +1,3 @@
-import type { M3u8Crypto, TsItemInfo } from '../types/m3u8';
 import type { IncomingHttpHeaders } from 'node:http';
+import type { M3u8Crypto, TsItemInfo } from '../types/m3u8';
 export declare function tsDownload(info: TsItemInfo, cryptoInfo: M3u8Crypto, headers?: IncomingHttpHeaders): Promise<boolean>;

package/cjs/lib/ts-download.js

@@ -14,7 +14,7 @@ async function tsDownload(info, cryptoInfo, headers) {
         const r = await (0, utils_js_1.getRetry)(info.uri, headers);
         if (r.response.statusCode === 200) {
             utils_js_1.logger.debug('\n', info);
-            const data = cryptoInfo.key ? aesDecrypt(r.buffer, cryptoInfo) : r.buffer;
+            const data = cryptoInfo?.key ? aesDecrypt(r.buffer, cryptoInfo) : r.buffer;
             (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(info.tsOut));
             await node_fs_1.promises.writeFile(info.tsOut, data);
             info.tsSize = r.buffer.byteLength;
@@ -29,7 +29,8 @@ async function tsDownload(info, cryptoInfo, headers) {
 }
 function aesDecrypt(data, cryptoInfo) {
     try {
-        const decipher = (0, node_crypto_1.createDecipheriv)((cryptoInfo.method + '-cbc').toLocaleLowerCase(), cryptoInfo.key, cryptoInfo.iv);
+        const iv = cryptoInfo.iv || new Uint8Array(16);
+        const decipher = (0, node_crypto_1.createDecipheriv)(`${cryptoInfo.method}-cbc`.toLocaleLowerCase(), cryptoInfo.key, iv);
         return Buffer.concat([decipher.update(Buffer.isBuffer(data) ? data : Buffer.from(data)), decipher.final()]);
     }
     catch (err) {

package/cjs/lib/utils.d.ts

@@ -1,5 +1,5 @@
+import { type Stats } from 'node:fs';
 import type { IncomingHttpHeaders } from 'node:http';
-import { Stats } from 'node:fs';
 import { NLogger, Request } from '@lzwme/fe-utils';
 export declare const request: Request;
 export declare const getRetry: <T = string>(url: string, headers?: IncomingHttpHeaders, retries?: number) => Promise<{

package/cjs/lib/utils.js

@@ -38,9 +38,9 @@ function findFiles(apidir, validate) {
                 files.push((0, node_path_1.resolve)(apidir));
             }
             else if (stat.isDirectory()) {
-                (0, node_fs_1.readdirSync)(apidir).forEach(filename => {
-                    findFiles((0, node_path_1.resolve)(apidir, filename)).forEach(f => files.push(f));
-                });
+                for (const filename of (0, node_fs_1.readdirSync)(apidir)) {
+                    files.push(...findFiles((0, node_path_1.resolve)(apidir, filename)));
+                }
             }
         }
     }
@@ -49,7 +49,7 @@ function findFiles(apidir, validate) {
 /** 获取重定向后的 URL */
 async function getLocation(url, method = 'HEAD') {
     const { res } = await exports.request.req(url, null, { method, headers: { 'content-type': 'text/html' } }, false);
-    const rurl = res.headers['location'] || res.headers['x-redirect'] || res.headers['x-location'];
+    const rurl = res.headers.location || res.headers['x-redirect'] || res.headers['x-location'];
     if (typeof rurl === 'string' && rurl !== url)
         return getLocation(rurl, method);
     return url;