@lzwme/m3u8-dl 1.7.0 → 1.8.0

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/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;

package/cjs/lib/utils.js

@@ -63,8 +63,29 @@ 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);
 }
 /** 异步检查文件是否存在 */
@@ -75,7 +96,8 @@ async function checkFileExists(filepath) {
         await (0, promises_1.access)(filepath, promises_1.constants.F_OK);
         return true;
     }
-    catch {
+    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.js

@@ -43,6 +43,7 @@ const file_download_js_1 = require("../lib/file-download.js");
 const format_options_js_1 = require("../lib/format-options.js");
 const getM3u8Urls_js_1 = require("../lib/getM3u8Urls.js");
 const i18n_js_1 = require("../lib/i18n.js");
+const init_proxy_js_1 = require("../lib/init-proxy.js");
 const m3u8_download_js_1 = require("../lib/m3u8-download.js");
 const utils_js_1 = require("../lib/utils.js");
 const index_js_1 = require("../video-parser/index.js");
@@ -78,6 +79,10 @@ class DLServer {
             saveDir: process.env.DS_SAVE_DIR || './downloads',
             threadNum: 4,
             ffmpegPath: process.env.DS_FFMPEG_PATH || undefined,
+            // 代理配置改为字符串模式：'custom', 'system', 'disabled'
+            proxyMode: process.env.DS_PROXY_MODE || 'system',
+            proxyUrl: process.env.DS_PROXY_URL || undefined,
+            noProxy: process.env.DS_NO_PROXY || undefined,
         },
     };
     /** 下载任务缓存 */
@@ -109,6 +114,8 @@ class DLServer {
         await this.createApp();
         this.initRouters();
         utils_js_1.logger.debug('Server initialized', 'cacheSize:', this.dlCache.size, this.options, this.cfg.dlOptions);
+        // 初始化 global-agent 代理
+        (0, init_proxy_js_1.initProxy)(this.cfg.dlOptions);
     }
     async loadCache() {
         const cacheFile = (0, node_path_1.resolve)(this.options.cacheDir, 'cache.json');
@@ -213,7 +220,10 @@ class DLServer {
                 this.cfg.dlOptions[key] = value;
         }
         (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(configPath));
-        return node_fs_1.promises.writeFile(configPath, JSON.stringify(this.cfg, null, 2));
+        const result = await node_fs_1.promises.writeFile(configPath, JSON.stringify(this.cfg, null, 2));
+        // 重新初始化代理
+        await (0, init_proxy_js_1.initProxy)(this.cfg.dlOptions);
+        return result;
     }
     async createApp() {
         const { default: express } = await Promise.resolve().then(() => __importStar(require('express')));
@@ -306,7 +316,7 @@ class DLServer {
             if (!options.filename)
                 options.filename = item[1];
         }
-        const { options: dlOptions } = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir });
+        const { options: dlOptions } = await (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir });
         if (!dlOptions.saveDir)
             dlOptions.saveDir = this.cfg.dlOptions.saveDir;
         const cacheItem = this.dlCache.get(url) || { options, dlOptions, status: 'pending', url };
@@ -324,6 +334,16 @@ class DLServer {
                     delete cacheItem.endTime;
             }
         }
+        else if (!this.dlCache.has(url)) {
+            // 如果本地视频已存在，则重命名 filename
+            const localVideo = (0, node_path_1.resolve)(dlOptions.saveDir, dlOptions.filename);
+            const hasSameNameVideo = [...this.dlCache.values()].some(d => d.dlOptions.saveDir === dlOptions.saveDir && d.dlOptions.filename === dlOptions.filename);
+            if (hasSameNameVideo || (await (0, utils_js_1.checkFileExists)(localVideo))) {
+                const ext = (0, node_path_1.extname)(localVideo) || '';
+                dlOptions.filename = `${(0, node_path_1.basename)(localVideo, ext)}.${Date.now()}${ext}`;
+                utils_js_1.logger.info('存在重名视频，重命名filename：', (0, console_log_colors_1.gray)(localVideo), '->', (0, console_log_colors_1.cyan)(dlOptions.filename));
+            }
+        }
         cacheItem.status = this.downloading >= this.cfg.webOptions.maxDownloads ? 'pending' : 'resume';
         // pending 优先级靠后
         if (cacheItem.status === 'pending' && this.dlCache.has(url))
@@ -363,7 +383,7 @@ class DLServer {
                 r.errmsg = '下载失败';
             item.endTime = Date.now();
             item.errmsg = r.errmsg;
-            item.status = r.errmsg ? 'error' : 'done';
+            item.status = r.isExist ? 'done' : r.errmsg ? 'error' : 'done';
             utils_js_1.logger.info('Download complete:', item.status, (0, console_log_colors_1.red)(r.errmsg), (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(r.filepath));
             this.dlCache.set(url, item);
             this.wsSend('progress', url);
@@ -372,8 +392,8 @@ class DLServer {
         };
         try {
             if (dlOptions.type === 'parser') {
-                const vp = new index_js_1.VideoParser();
-                vp.download(url, opts).then(r => afterDownload(r, url));
+                console.log('\n\nDownloading with VideoParser\n\n', dlOptions, url);
+                index_js_1.VideoParser.download(url, opts).then(r => afterDownload(r, url));
             }
             else if (dlOptions.type === 'file') {
                 (0, file_download_js_1.fileDownload)(url, opts).then(r => afterDownload(r, url));
@@ -582,27 +602,80 @@ class DLServer {
             const { urls, deleteCache = false, deleteVideo = false } = req.body;
             const urlsToDelete = urls;
             const list = [];
+            const errors = [];
             for (const url of urlsToDelete) {
                 const item = this.dlCache.get(url);
                 if (item) {
+                    utils_js_1.logger.info('delete download task:', (0, console_log_colors_1.gray)(url), (0, console_log_colors_1.cyan)(item.status), (0, console_log_colors_1.cyan)(item.localVideo), deleteCache, deleteVideo);
                     (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
                     this.dlCache.delete(url);
                     list.push(item.url);
                     if (deleteCache) {
-                        const cacheDir = item.cacheDir;
-                        if (await (0, utils_js_1.checkFileExists)(cacheDir)) {
-                            await node_fs_1.promises.rm(cacheDir, { recursive: true });
-                            utils_js_1.logger.debug('删除缓存目录：', cacheDir);
+                        try {
+                            const cacheDir = item.cacheDir;
+                            if (cacheDir && (await (0, utils_js_1.checkFileExists)(cacheDir))) {
+                                await node_fs_1.promises.rm(cacheDir, { recursive: true, force: true });
+                                utils_js_1.logger.info('删除缓存目录：', (0, console_log_colors_1.gray)(cacheDir));
+                            }
+                        }
+                        catch (error) {
+                            const errorMsg = `删除缓存目录失败: ${error.message}`;
+                            utils_js_1.logger.error(errorMsg, (0, console_log_colors_1.gray)(item.cacheDir));
+                            errors.push(errorMsg);
                         }
                     }
                     if (deleteVideo) {
-                        for (const ext of ['.ts', '.mp4']) {
-                            const filepath = (0, node_path_1.resolve)(item.options.saveDir, item.options.filename + ext);
-                            if (await (0, utils_js_1.checkFileExists)(filepath)) {
-                                await node_fs_1.promises.unlink(filepath);
-                                utils_js_1.logger.debug('删除文件：', filepath);
+                        try {
+                            // 优先使用 item.localVideo（实际文件路径）
+                            if (item.localVideo) {
+                                const filepath = item.localVideo;
+                                if (await (0, utils_js_1.checkFileExists)(filepath)) {
+                                    try {
+                                        await node_fs_1.promises.rm(filepath, { recursive: true, force: true });
+                                        utils_js_1.logger.info('删除文件：', (0, console_log_colors_1.gray)(filepath));
+                                    }
+                                    catch (error) {
+                                        const errorMsg = `删除文件失败: ${filepath}, 错误: ${error.message}`;
+                                        utils_js_1.logger.error(errorMsg);
+                                        errors.push(errorMsg);
+                                        // 如果直接删除失败，可能是文件被占用
+                                    }
+                                }
+                            }
+                            else {
+                                // 如果 localVideo 不存在，尝试使用 dlOptions 构建路径（格式化后的参数更准确）
+                                const saveDir = item.dlOptions?.saveDir || item.options?.saveDir;
+                                const filename = item.dlOptions?.filename || item.options?.filename;
+                                if (saveDir && filename) {
+                                    // 尝试多种可能的扩展名
+                                    for (const ext of ['', '.ts', '.mp4']) {
+                                        const filepath = (0, node_path_1.resolve)(saveDir, filename + ext);
+                                        if (await (0, utils_js_1.checkFileExists)(filepath)) {
+                                            try {
+                                                await node_fs_1.promises.rm(filepath, { recursive: true, force: true });
+                                                utils_js_1.logger.info('删除文件：', (0, console_log_colors_1.gray)(filepath));
+                                                break; // 找到并删除后退出循环
+                                            }
+                                            catch (error) {
+                                                const errorMsg = `删除文件失败: ${filepath}, 错误: ${error.message}`;
+                                                utils_js_1.logger.error(errorMsg);
+                                                errors.push(errorMsg);
+                                            }
+                                        }
+                                    }
+                                }
+                                else {
+                                    const errorMsg = `无法确定文件路径: saveDir=${saveDir}, filename=${filename}`;
+                                    utils_js_1.logger.warn(errorMsg, (0, console_log_colors_1.gray)(url));
+                                    errors.push(errorMsg);
+                                }
                             }
                         }
+                        catch (error) {
+                            const errorMsg = `删除视频文件时发生错误: ${error.message}`;
+                            utils_js_1.logger.error(errorMsg, (0, console_log_colors_1.gray)(url));
+                            errors.push(errorMsg);
+                        }
                     }
                 }
             }
@@ -612,7 +685,10 @@ class DLServer {
                 this.startNextPending();
             }
             const lang = this.getLangFromRequest(req);
-            res.json({ message: (0, i18n_js_1.t)('api.success.deleted', lang, { count: list.length }), code: 0, count: list.length });
+            const message = errors.length
+                ? `${(0, i18n_js_1.t)('api.success.deleted', lang, { count: list.length })}，但有 ${errors.length} 个错误: ${errors.join('; ')}`
+                : (0, i18n_js_1.t)('api.success.deleted', lang, { count: list.length });
+            res.json({ message, code: errors.length > 0 ? 1 : 0, count: list.length, errors: errors.length > 0 ? errors : undefined });
         });
         // API to rename download file
         app.post('/api/rename', async (req, res) => {

package/cjs/types/m3u8.d.ts

@@ -144,6 +144,12 @@ export interface M3u8DLOptions {
     ffmpegPath?: string;
     /** 语言。可选值：zh-CN, en */
     lang?: 'zh-CN' | 'en';
+    /** 代理模式。可选值：custom, system, disabled */
+    proxyMode?: 'custom' | 'system' | 'disabled';
+    /** 代理地址。如果 proxyMode 为 'custom'，则必须指定 */
+    proxyUrl?: string;
+    /** 不使用代理的域名。多个域名用逗号分隔 */
+    noProxy?: string;
 }
 export interface M3u8DLResult extends Partial<DownloadResult> {
     /** 下载进度统计 */

package/cjs/video-parser/index.d.ts

@@ -4,8 +4,8 @@ export declare class VideoParser {
     /**
      * 解析视频 URL
      */
-    parse(url: string, headers?: Record<string, string>): Promise<ApiResponse<VideoInfo>>;
-    download(url: string, options: M3u8DLOptions): Promise<M3u8DLResult>;
+    static parse(url: string, headers?: Record<string, string>): Promise<ApiResponse<VideoInfo>>;
+    static download(url: string, options: M3u8DLOptions): Promise<M3u8DLResult>;
     /**
      * 根据 URL 获取平台标识
      */
@@ -16,5 +16,5 @@ export declare class VideoParser {
     /**
      * 获取所有支持的平台列表
      */
-    getSupportedPlatforms(): string[];
+    static getSupportedPlatforms(): string[];
 }

package/cjs/video-parser/index.js

@@ -31,15 +31,15 @@ class VideoParser {
     /**
      * 解析视频 URL
      */
-    async parse(url, headers = {}) {
+    static async parse(url, headers = {}) {
         const info = VideoParser.getPlatform(url);
         if (!info)
             return { code: 201, message: '不支持的视频平台' };
         const parserClass = VideoParser.platforms[info.platform].class;
         return await parserClass.parse(info.url, headers);
     }
-    async download(url, options) {
-        const info = await this.parse(url);
+    static async download(url, options) {
+        const info = await VideoParser.parse(url);
         utils_1.logger.debug('解析视频信息', info);
         if (info.code || !info.data?.url)
             return { errmsg: info.message || '解析视频信息失败', options };
@@ -54,7 +54,7 @@ class VideoParser {
             referer: info.data.referer || info.data.url,
             ...(0, utils_1.formatHeaders)(options.headers),
         };
-        return (0, file_download_1.fileDownload)(url, options);
+        return (0, file_download_1.fileDownload)(info.data.url, options);
     }
     /**
      * 根据 URL 获取平台标识
@@ -79,7 +79,7 @@ class VideoParser {
     /**
      * 获取所有支持的平台列表
      */
-    getSupportedPlatforms() {
+    static getSupportedPlatforms() {
         return Object.keys(VideoParser.platforms);
     }
 }