@lzwme/m3u8-dl 1.6.0 → 1.8.0

package/README.MD

@@ -12,7 +12,7 @@
 [![GitHub forks][forks-badge]][forks-url]
 [![GitHub stars][stars-badge]][stars-url]
 
-> **Language**: [English](README.md) | [中文简体](README.zh-CN.MD)
+> **Language**: [English](README.md) | [中文简体](README.zh-CN.md)
 
 A free, open-source, and powerful m3u8 video batch downloader with multi-threaded downloading, play-while-downloading, WebUI management, video parsing, and more. Supports multiple usage methods including CLI command line, browser, PC client, Docker deployment, and Node.js API calls.
 
@@ -59,12 +59,12 @@ A free, open-source, and powerful m3u8 video batch downloader with multi-threade
 - **Auto Capture**: Automatically intercepts and captures m3u8 and mp4 video links in web pages
 - **Real-time Monitoring**: Monitors network requests (XMLHttpRequest, fetch, Performance API), automatically discovers video links
 - **Smart Recognition**: Automatically recognizes video types (M3U8/MP4) and extracts video names
-- **One-click Jump**: Supports one-click jump to m3u8-dl WebUI for downloading
+- **One-click Jump**: Supports one-click jump to M3U8-DL WebUI for downloading
 - **Flexible Configuration**: Supports configuring exclusion URL rules to avoid capturing on specific pages
 - **Draggable Panel**: Supports dragging to move panel position, automatically saves position
 - **Link Management**: Supports copying links, clearing list, and other operations
 
-> This is a Tampermonkey/Greasemonkey userscript that can automatically capture video links in browsers, working with m3u8-dl WebUI to provide a seamless download experience.
+> This is a Violentmonkey/Tampermonkey/Greasemonkey userscript that can automatically capture video links in browsers, working with M3U8-DL WebUI to provide a seamless download experience.
 
 ### 📺 Video Search Features
 
@@ -418,11 +418,11 @@ Download the built application:
 
 1. Install browser extension (choose one):
    - [Violentmonkey](https://violentmonkey.github.io/) (【Recommended】Open-source alternative)
-   - [Tampermonkey](https://www.tampermonkey.net/) (【Official】Supports Chrome, Firefox, Edge, Safari, etc.)
+   - [Tampermonkey](https://www.tampermonkey.net/) (Supports Chrome, Firefox, Edge, Safari, etc.)
    - [Greasemonkey](https://www.greasespot.net/) (Firefox only)
 
 2. Install script:
-   - Open Tampermonkey management panel
+   - Open userscript manager (Violentmonkey/Tampermonkey) management panel
    - Click "Add new script"
    - Copy content from `client/m3u8-capture.user.js` file
    - Paste into editor and save
@@ -431,14 +431,14 @@ Download the built application:
 3. Configure WebUI address:
    - Visit any web page, click the 🎬 icon in the top right corner to open the capture panel
    - Click the settings button ⚙️
-   - Enter your m3u8-dl WebUI address (e.g., `http://localhost:6600`)
+   - Enter your M3U8-DL WebUI address (e.g., `http://localhost:6600`)
    - Save settings
 
 **Feature Description:**
 
 - **Auto Capture**: The script automatically monitors network requests in web pages, when m3u8 or mp4 video links are detected, automatically adds them to the list
 - **Video Name Extraction**: Prioritizes extracting video names from page `h1`, `h2`, or `document.title`
-- **Jump to Download**: Click the "Jump to Download" button to automatically jump to m3u8-dl WebUI and fill in video link and name (format: `url|name`)
+- **Jump to Download**: Click the "Jump to Download" button to automatically jump to M3U8-DL WebUI and fill in video link and name (format: `url|name`)
 - **Exclusion Rules**: In settings, you can configure exclusion URL rule list, matching URLs will not show panel and will not capture video links
   - Supports plain string matching (contains match)
   - Supports regular expressions (starts and ends with `/`, e.g., `/example\.com/`)
@@ -448,7 +448,7 @@ Download the built application:
 1. Visit video playback page
 2. Script automatically captures video links, displayed in the panel in the bottom right corner
 3. Click "Jump to Download" button
-4. Automatically jumps to m3u8-dl WebUI, video link and name are automatically filled
+4. Automatically jumps to M3U8-DL WebUI, video link and name are automatically filled
 5. Click "Start Download" in WebUI
 
 **Exclusion Rule Configuration Example:**

package/README.zh-CN.md

@@ -12,7 +12,7 @@
 [![GitHub forks][forks-badge]][forks-url]
 [![GitHub stars][stars-badge]][stars-url]
 
-> **语言**: [English](README.md) | [中文简体](README.zh-CN.MD)
+> **语言**: [English](README.md) | [中文简体](README.zh-CN.md)
 
 一个免费开源功能强大的 m3u8 视频批量下载工具，支持多线程下载、边下边播、WebUI 管理、视频解析等多种功能。支持 CLI命令行、浏览器、PC客户端、Docker 部署以及 Node.js API 调用等多种使用方式。
 
@@ -59,12 +59,12 @@
 - **自动抓取**：自动拦截和抓取网页中的 m3u8 和 mp4 视频链接
 - **实时监控**：监控网络请求（XMLHttpRequest、fetch、Performance API），自动发现视频链接
 - **智能识别**：自动识别视频类型（M3U8/MP4），并提取视频名称
-- **一键跳转**：支持一键跳转到 m3u8-dl WebUI 进行下载
+- **一键跳转**：支持一键跳转到 M3U8-DL WebUI 进行下载
 - **灵活配置**：支持配置排除网址规则，避免在特定页面抓取
 - **拖拽面板**：支持拖拽移动面板位置，自动保存位置
 - **链接管理**：支持复制链接、清空列表等操作
 
-> 这是一个 Tampermonkey/Greasemonkey 用户脚本，可在浏览器中自动抓取视频链接，配合 m3u8-dl WebUI 使用，实现无缝下载体验。
+> 这是一个 Violentmonkey/Tampermonkey/Greasemonkey 用户脚本，可在浏览器中自动抓取视频链接，配合 M3U8-DL WebUI 使用，实现无缝下载体验。
 
 ### 📺 视频搜索功能
 
@@ -418,11 +418,11 @@ docker-compose up -d
 
 1. 安装浏览器扩展（任选其一）：
    - [Violentmonkey](https://violentmonkey.github.io/)（【推荐】开源替代方案）
-   - [Tampermonkey](https://www.tampermonkey.net/)（【官方】支持 Chrome、Firefox、Edge、Safari 等）
+   - [Tampermonkey](https://www.tampermonkey.net/)（支持 Chrome、Firefox、Edge、Safari 等）
    - [Greasemonkey](https://www.greasespot.net/)（仅支持 Firefox）
 
 2. 安装脚本：
-   - 打开 Tampermonkey 管理面板
+   - 打开用户脚本管理器（Violentmonkey/Tampermonkey）管理面板
    - 点击"添加新脚本"
    - 复制 `client/m3u8-capture.user.js` 文件内容
    - 粘贴到编辑器中并保存
@@ -431,14 +431,14 @@ docker-compose up -d
 3. 配置 WebUI 地址：
    - 访问任意网页，点击页面右上角的 🎬 图标打开抓取面板
    - 点击设置按钮 ⚙️
-   - 输入您的 m3u8-dl WebUI 地址（如 `http://localhost:6600`）
+   - 输入您的 M3U8-DL WebUI 地址（如 `http://localhost:6600`）
    - 保存设置
 
 **功能说明：**
 
 - **自动抓取**：脚本会自动监控网页中的网络请求，当检测到 m3u8 或 mp4 视频链接时，自动添加到列表中
 - **视频名称提取**：优先从页面的 `h1`、`h2` 或 `document.title` 提取视频名称
-- **跳转下载**：点击"跳转下载"按钮，会自动跳转到 m3u8-dl WebUI 并填充视频链接和名称（格式：`url|name`）
+- **跳转下载**：点击"跳转下载"按钮，会自动跳转到 M3U8-DL WebUI 并填充视频链接和名称（格式：`url|name`）
 - **排除规则**：在设置中可以配置排除网址规则列表，匹配的网址将不展示面板且不抓取视频链接
   - 支持普通字符串匹配（包含匹配）
   - 支持正则表达式（以 `/` 开头和结尾，如 `/example\.com/`）
@@ -448,7 +448,7 @@ docker-compose up -d
 1. 访问视频播放页面
 2. 脚本自动抓取视频链接，显示在右下角的面板中
 3. 点击"跳转下载"按钮
-4. 自动跳转到 m3u8-dl 的 WebUI，视频链接和名称已自动填充
+4. 自动跳转到 M3U8-DL 的 WebUI，视频链接和名称已自动填充
 5. 在 WebUI 中点击"开始下载"即可
 
 **排除规则配置示例：**

package/cjs/i18n/locales/en.d.ts

@@ -43,6 +43,14 @@ declare const _default: {
             accessDenied: string;
             invalidUrl: string;
             notFound: string;
+            invalidParams: string;
+            taskNotFound: string;
+            onlyRenameCompleted: string;
+            invalidFilename: string;
+            fileNotFound: string;
+            fileExists: string;
+            renameFailed: string;
+            duplicateDownload: string;
         };
         success: {
             configUpdated: string;
@@ -52,6 +60,7 @@ declare const _default: {
             resumed: string;
             noResumableTasks: string;
             deleted: string;
+            renamed: string;
         };
     };
     download: {

package/cjs/i18n/locales/en.js

@@ -45,6 +45,14 @@ exports.default = {
             accessDenied: 'Access denied',
             invalidUrl: 'Invalid url parameter',
             notFound: 'Not Found',
+            invalidParams: 'Invalid parameters',
+            taskNotFound: 'Task not found',
+            onlyRenameCompleted: 'Only completed tasks with normal status can be renamed',
+            invalidFilename: 'Filename contains invalid characters',
+            fileNotFound: 'File not found',
+            fileExists: 'File already exists',
+            renameFailed: 'Rename failed: {error}',
+            duplicateDownload: '{count} URL(s) already exist, duplicate download',
         },
         success: {
             configUpdated: 'Config updated successfully',
@@ -54,6 +62,7 @@ exports.default = {
             resumed: 'Resumed {count} download task(s)',
             noResumableTasks: 'No resumable download tasks found',
             deleted: 'Deleted {count} download task(s)',
+            renamed: 'Renamed successfully',
         },
     },
     download: {

package/cjs/i18n/locales/zh-CN.d.ts

@@ -43,6 +43,14 @@ declare const _default: {
             accessDenied: string;
             invalidUrl: string;
             notFound: string;
+            invalidParams: string;
+            taskNotFound: string;
+            onlyRenameCompleted: string;
+            invalidFilename: string;
+            fileNotFound: string;
+            fileExists: string;
+            renameFailed: string;
+            duplicateDownload: string;
         };
         success: {
             configUpdated: string;
@@ -52,6 +60,7 @@ declare const _default: {
             resumed: string;
             noResumableTasks: string;
             deleted: string;
+            renamed: string;
         };
     };
     download: {

package/cjs/i18n/locales/zh-CN.js

@@ -45,6 +45,14 @@ exports.default = {
             accessDenied: '访问被拒绝',
             invalidUrl: '无效的 url 参数',
             notFound: '未找到',
+            invalidParams: '参数无效',
+            taskNotFound: '任务不存在',
+            onlyRenameCompleted: '只能重命名已完成且状态正常的任务',
+            invalidFilename: '文件名包含非法字符',
+            fileNotFound: '文件未找到',
+            fileExists: '文件已存在',
+            renameFailed: '重命名失败: {error}',
+            duplicateDownload: '有 {count} 个 URL 已存在，重复下载',
         },
         success: {
             configUpdated: '配置更新成功',
@@ -54,6 +62,7 @@ exports.default = {
             resumed: '已恢复 {count} 个下载任务',
             noResumableTasks: '没有找到可恢复的下载任务',
             deleted: '已删除 {count} 个下载任务',
+            renamed: '重命名成功',
         },
     },
     download: {

package/cjs/index.d.ts

@@ -1,5 +1,6 @@
 export * from './lib/file-download';
 export * from './lib/getM3u8Urls';
+export * from './lib/init-proxy';
 export * from './lib/m3u8-download';
 export * from './lib/parseM3u8';
 export * from './video-parser';

package/cjs/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/file-download"), exports);
 __exportStar(require("./lib/getM3u8Urls"), exports);
+__exportStar(require("./lib/init-proxy"), exports);
 __exportStar(require("./lib/m3u8-download"), exports);
 __exportStar(require("./lib/parseM3u8"), exports);
 __exportStar(require("./video-parser"), exports);

package/cjs/lib/file-download.js

@@ -9,7 +9,7 @@ const i18n_js_1 = require("./i18n.js");
 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 { url, options } = await (0, format_options_js_1.formatOptions)(u, opts);
     const lang = (0, i18n_js_1.getLang)(options.lang);
     const startTime = Date.now();
     const stats = {
@@ -68,7 +68,7 @@ async function fileDownload(u, opts) {
         });
         stats.endTime = Date.now();
         return {
-            errmsg: r.filepath ? (0, i18n_js_1.t)('download.status.completed', lang) : (0, i18n_js_1.t)('download.status.failed', lang),
+            errmsg: r.filepath ? '' : (0, i18n_js_1.t)('download.status.failed', lang), // t('download.status.completed', lang)
             ...r,
             stats,
         };

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

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

package/cjs/lib/format-options.js

@@ -47,7 +47,7 @@ const fileSupportExtList = [
     '.deb',
     '.rpm',
 ];
-function formatOptions(url, opts) {
+async function formatOptions(url, opts) {
     const options = {
         delCache: !opts.debug,
         saveDir: process.cwd(),
@@ -58,6 +58,18 @@ function formatOptions(url, opts) {
     if (!options.type) {
         if (video_parser_1.VideoParser.getPlatform(url).platform !== 'unknown') {
             options.type = 'parser';
+            if (!opts.filename) {
+                const info = await video_parser_1.VideoParser.parse(url);
+                if (info.code === 0 && info.data?.title) {
+                    options.filename = info.data.title
+                        .split('\n')[0]
+                        // 替换全部的非中英文、数字、下划线为下划线
+                        .replace(/[^\u4e00-\u9fa5a-zA-Z0-9]+/g, '_')
+                        .trim()
+                        .replace(/_+/g, '_')
+                        .slice(0, 100);
+                }
+            }
         }
         else {
             options.type = 'm3u8';

package/cjs/lib/init-proxy.d.ts

@@ -0,0 +1,5 @@
+import type { M3u8DLOptions } from '../types';
+/**
+ * 初始化代理
+ */
+export declare function initProxy(options: M3u8DLOptions): Promise<void>;

package/cjs/lib/init-proxy.js

@@ -0,0 +1,93 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initProxy = initProxy;
+const utils_1 = require("./utils");
+/** 初始化失败 N 次后续忽略代理配置 */
+let initializFailedTimes = 3;
+/**
+ * 初始化代理
+ */
+async function initProxy(options) {
+    if (!initializFailedTimes && !options.force)
+        return;
+    // 根据代理模式来初始化
+    try {
+        const g = global;
+        let globalAgent = g.GLOBAL_AGENT;
+        if (!globalAgent) {
+            // 代理未初始化且为禁用状态，则直接返回
+            if (options.proxyMode === 'disabled')
+                return;
+            // 为系统代理模式，但未设置环境变量，则直接返回
+            if (options.proxyMode === 'system' && !process.env.HTTP_PROXY && !process.env.HTTPS_PROXY)
+                return;
+            const globalAgentModule = await Promise.resolve().then(() => __importStar(require('global-agent')));
+            const ok = globalAgentModule.bootstrap();
+            if (ok)
+                globalAgent = g.GLOBAL_AGENT;
+        }
+        if (options.proxyMode !== 'disabled' && options.noProxy) {
+            options.noProxy = options.noProxy.replaceAll('\n', ',').trim();
+        }
+        if (options.proxyMode === 'custom' && options.proxyUrl) {
+            // 自定义代理模式
+            globalAgent.HTTP_PROXY = options.proxyUrl;
+            globalAgent.HTTPS_PROXY = options.proxyUrl;
+            globalAgent.NO_PROXY = options.noProxy;
+            utils_1.logger.info('Custom proxy enabled:', options.proxyUrl);
+        }
+        else if (options.proxyMode === 'disabled') {
+            globalAgent.HTTP_PROXY = undefined;
+            globalAgent.HTTPS_PROXY = undefined;
+            globalAgent.NO_PROXY = undefined;
+            // 关闭代理
+            utils_1.logger.info('Proxy disabled');
+        }
+        else {
+            // } else if (options.proxyMode === 'system') {
+            // 默认为使用系统代理，但支持自定义代理过滤
+            globalAgent.HTTP_PROXY = process.env.HTTP_PROXY;
+            globalAgent.HTTPS_PROXY = process.env.HTTPS_PROXY;
+            globalAgent.NO_PROXY = options.noProxy || process.env.NO_PROXY;
+            utils_1.logger.info('System proxy enabled');
+        }
+    }
+    catch (error) {
+        utils_1.logger.error('Failed to initialize proxy:', error);
+        utils_1.logger.warn('Please install global-agent to enable proxy support: npm install global-agent');
+        initializFailedTimes--;
+    }
+}

package/cjs/lib/local-play.d.ts

@@ -5,6 +5,6 @@ import type { TsItemInfo } from '../types/m3u8.js';
 export declare function localPlay(m3u8Info: TsItemInfo[]): Promise<{
     port: number;
     origin: string;
-    server: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+    server: import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>;
 }>;
 export declare function toLocalM3u8(m3u8Info: TsItemInfo[], m3u8FilePath?: string, host?: string): string;

package/cjs/lib/local-play.js

@@ -19,7 +19,7 @@ async function localPlay(m3u8Info) {
     const cacheFilepath = toLocalM3u8(m3u8Info);
     const filename = (0, node_path_1.basename)(cacheFilepath);
     const info = await createLocalServer((0, node_path_1.dirname)(cacheDir));
-    const playUrl = `https://lzw.me/x/m3u8-player?url=${encodeURIComponent(`${info.origin}/${cacheDirname}/${filename}`)}`;
+    const playUrl = `https://m3u8-player.lzw.me?from=sdk&url=${encodeURIComponent(`${info.origin}/${cacheDirname}/${filename}`)}`;
     const cmd = `${process.platform === 'win32' ? 'start' : 'open'} ${playUrl}`;
     (0, fe_utils_1.execSync)(cmd);
     return info;

package/cjs/lib/m3u8-convert.js

@@ -22,15 +22,9 @@ async function m3u8Convert(options, data) {
         if (process.platform === 'win32')
             filesAllArr = filesAllArr.map(d => d.replaceAll('\\', '/'));
         (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)) {
-                headersString += `-headers "${key}: ${String(value)}" `;
-            }
-        }
         // ffmpeg -i nz.ts -c copy -map 0:v -map 0:a -bsf:a aac_adtstoasc nz.mp4
-        // const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
-        const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -c:v copy -c:a copy -movflags +faststart -fflags +genpts -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
+        // const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc "${filepath}"`;
+        const cmd = `"${ffmpegBin}" -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -c:v copy -c:a copy -movflags +faststart -fflags +genpts -bsf:a aac_adtstoasc "${filepath}"`;
         utils_1.logger.debug('[convert to mp4]cmd:', (0, console_log_colors_1.cyan)(cmd));
         const r = (0, fe_utils_1.execSync)(cmd);
         ffmpegSupport = !r.error;

package/cjs/lib/m3u8-download.js

@@ -90,7 +90,7 @@ exports.workPollPublic = new worker_pool_js_1.WorkerPool(tsDlFile);
 async function m3u8InfoParse(u, o = {}) {
     const ffmpegBin = o.ffmpegPath || 'ffmpeg';
     const ext = (0, utils_js_1.isSupportFfmpeg)(ffmpegBin) ? '.mp4' : '.ts';
-    const { url, options, urlMd5 } = (0, format_options_js_1.formatOptions)(u, o);
+    const { url, options, urlMd5 } = await (0, format_options_js_1.formatOptions)(u, o);
     /** 最终合并转换后的文件路径 */
     let filepath = (0, node_path_1.resolve)(options.saveDir, options.filename);
     if (!filepath.endsWith(ext))
@@ -104,8 +104,9 @@ async function m3u8InfoParse(u, o = {}) {
         return result;
     const lang = (0, i18n_js_1.getLang)(o.lang);
     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((0, i18n_js_1.t)('download.status.parseFailed', lang), e.message);
-        console.log(e);
+        utils_js_1.logger.error((0, i18n_js_1.t)('download.status.parseFailed', lang), e?.message);
+        if (e)
+            console.log(e);
     });
     if (m3u8Info && m3u8Info?.tsCount > 0) {
         result.m3u8Info = m3u8Info;

package/cjs/lib/parseM3u8.js

@@ -66,7 +66,7 @@ async function parseM3U8(content, cacheDir = './cache', headers) {
             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);
+                const r = await (0, utils_1.getRetry)(tsKeyInfo.uri, headers);
                 if (r.response.statusCode !== 200) {
                     utils_1.logger.error('获取加密 key 失败:', tsKeyInfo.uri, r.response.statusCode, r.data);
                 }

package/cjs/lib/utils.d.ts

@@ -5,8 +5,8 @@ export declare const request: Request;
 export declare const getRetry: <T = string>(url: string, headers?: OutgoingHttpHeaders | string, retries?: number) => Promise<{
     data: T;
     buffer: Buffer;
-    headers: import("http").IncomingHttpHeaders;
-    response: import("http").IncomingMessage;
+    headers: import("node:http").IncomingHttpHeaders;
+    response: import("node:http").IncomingMessage;
 }>;
 export declare const logger: NLogger;
 export declare function isSupportFfmpeg(ffmpegBin: string): boolean;
@@ -18,3 +18,5 @@ export declare function getLocation(url: string, method?: string): Promise<strin
  * 如果 headers 是字符串，会先将其解析为对象；如果 headers 为空，则返回空对象。
  */
 export declare function formatHeaders(headers: string | OutgoingHttpHeaders): Record<string, string>;
+/** 异步检查文件是否存在 */
+export declare function checkFileExists(filepath: string): Promise<boolean>;

package/cjs/lib/utils.js

@@ -5,7 +5,9 @@ exports.isSupportFfmpeg = isSupportFfmpeg;
 exports.findFiles = findFiles;
 exports.getLocation = getLocation;
 exports.formatHeaders = formatHeaders;
+exports.checkFileExists = checkFileExists;
 const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const fe_utils_1 = require("@lzwme/fe-utils");
 exports.request = new fe_utils_1.Request({
@@ -61,7 +63,41 @@ async function getLocation(url, method = 'HEAD') {
 function formatHeaders(headers) {
     if (!headers)
         return {};
-    if (typeof headers === 'string')
-        headers = Object.fromEntries(headers.split('\n').map(line => line.split(':').map(d => d.trim())));
+    if (typeof headers === 'string') {
+        headers = headers.trim();
+        if (headers.startsWith('{') && headers.endsWith('}')) {
+            try {
+                headers = JSON.parse(headers);
+            }
+            catch (e) {
+                console.error('解析 headers 失败:', e);
+            }
+        }
+        if (typeof headers === 'string') {
+            const parsed = {};
+            headers
+                .replace(/,\s*([a-zA-Z0-9_-]+:)/g, '\n$1') // 支持如 "Key1: Val1, Key2: Val2" 的格式
+                .split('\n')
+                .forEach(line => {
+                const idx = line.indexOf(':');
+                if (idx > 0)
+                    parsed[line.slice(0, idx).trim()] = line.slice(idx + 1).trim();
+            });
+            headers = parsed;
+        }
+    }
     return (0, fe_utils_1.toLowcaseKeyObject)(headers);
 }
+/** 异步检查文件是否存在 */
+async function checkFileExists(filepath) {
+    try {
+        if (!filepath)
+            return false;
+        await (0, promises_1.access)(filepath, promises_1.constants.F_OK);
+        return true;
+    }
+    catch (error) {
+        exports.logger.debug('checkFileExists failed:', filepath, error.message);
+        return false;
+    }
+}

package/cjs/lib/worker_pool.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-type WorkerPoolCallback<R> = (err: Error | null, result: R, startTime: number) => void;
+type WorkerPoolCallback<R> = (err: Error, result: R, startTime: number) => void;
 export declare class WorkerPool<T = unknown, R = unknown> extends EventEmitter {
     private processorFile;
     numThreads: number;

package/cjs/m3u8-batch-download.js

@@ -38,7 +38,7 @@ async function formatUrls(urls, options) {
                 continue;
             }
         }
-        const r = (0, format_options_1.formatOptions)(url, options);
+        const r = await (0, format_options_1.formatOptions)(url, options);
         taskset.set(r.url, r.options);
     }
     return taskset;
@@ -88,8 +88,7 @@ async function m3u8BatchDownload(urls, options) {
                     }
                 };
                 if (o.type === 'parser') {
-                    const vp = new video_parser_1.VideoParser();
-                    vp.download(url, o).then(r => afterDownload(r, url));
+                    video_parser_1.VideoParser.download(url, o).then(r => afterDownload(r, url));
                 }
                 else if (o.type === 'file') {
                     (0, file_download_1.fileDownload)(url, o).then(r => afterDownload(r, url));

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

@@ -1,5 +1,5 @@
 import type { Express } from 'express';
-import type { Server } from 'ws';
+import type { WebSocketServer } from 'ws';
 import type { M3u8DLOptions, M3u8DLProgressStats, M3u8WorkerPool, TsItemInfo } from '../types/m3u8.js';
 interface DLServerOptions {
     port?: number;
@@ -18,12 +18,18 @@ interface CacheItem extends Partial<M3u8DLProgressStats> {
     /** 格式化后实际下载使用的参数 */
     dlOptions?: M3u8DLOptions;
     status: 'pause' | 'resume' | 'done' | 'pending' | 'error';
+    /**
+     * 当前任务的 ts 信息
+     * @deprecated 下一版本将移除
+     */
     current?: TsItemInfo;
+    /** 当前任务的 ts 缓存目录 */
+    cacheDir?: string;
     workPoll?: M3u8WorkerPool;
 }
 export declare class DLServer {
     app: Express;
-    wss: Server;
+    wss: WebSocketServer | null;
     /** DS 参数 */
     options: DLServerOptions;
     private serverInfo;
@@ -38,11 +44,12 @@ export declare class DLServer {
     private checkDLFileLaest;
     private checkDLFileTimer;
     private checkDLFileIsExists;
+    private checkItemStatus;
     dlCacheClone(): [string, CacheItem][];
     private cacheSaveTimer;
     saveCache(): void;
-    private readConfig;
-    saveConfig(config: M3u8DLOptions, configPath?: string): void;
+    private loadConfig;
+    saveConfig(config: M3u8DLOptions, configPath?: string): Promise<void>;
     private createApp;
     private startDownload;
     startNextPending(): void;