@lzwme/m3u8-dl 1.6.0-0 → 1.7.0

package/cjs/server/download-server.js

@@ -60,7 +60,7 @@ class DLServer {
     };
     serverInfo = {
         version: '',
-        ariang: (0, node_fs_1.existsSync)((0, node_path_1.resolve)(rootDir, 'client/ariang/index.html')),
+        ariang: false,
     };
     cfg = {
         /** 支持 web 设置修改的参数 */
@@ -91,28 +91,29 @@ class DLServer {
         opts.cacheDir = (0, node_path_1.resolve)(opts.cacheDir);
         if (!opts.configPath)
             opts.configPath = (0, node_path_1.resolve)(opts.cacheDir, 'config.json');
-        const pkgFile = (0, node_path_1.resolve)(rootDir, 'package.json');
-        if ((0, node_fs_1.existsSync)(pkgFile)) {
-            const pkg = JSON.parse((0, node_fs_1.readFileSync)(pkgFile, 'utf8'));
-            this.serverInfo.version = pkg.version;
-        }
         if (opts.token)
             opts.token = (0, fe_utils_1.md5)(opts.token.trim()).slice(0, 8);
         this.init();
     }
     async init() {
-        this.readConfig();
+        const pkgFile = (0, node_path_1.resolve)(rootDir, 'package.json');
+        if (await (0, utils_js_1.checkFileExists)(pkgFile)) {
+            const pkg = JSON.parse(await node_fs_1.promises.readFile(pkgFile, 'utf8'));
+            this.serverInfo.version = pkg.version;
+        }
+        this.serverInfo.ariang = await (0, utils_js_1.checkFileExists)((0, node_path_1.resolve)(rootDir, 'client/ariang/index.html'));
+        await this.loadConfig();
         if (this.cfg.dlOptions.debug)
             utils_js_1.logger.updateOptions({ levelType: 'debug' });
-        this.loadCache();
+        await this.loadCache();
         await this.createApp();
         this.initRouters();
         utils_js_1.logger.debug('Server initialized', 'cacheSize:', this.dlCache.size, this.options, this.cfg.dlOptions);
     }
-    loadCache() {
+    async loadCache() {
         const cacheFile = (0, node_path_1.resolve)(this.options.cacheDir, 'cache.json');
-        if ((0, node_fs_1.existsSync)(cacheFile)) {
-            JSON.parse((0, node_fs_1.readFileSync)(cacheFile, 'utf8')).forEach(([url, item]) => {
+        if (await (0, utils_js_1.checkFileExists)(cacheFile)) {
+            JSON.parse(await node_fs_1.promises.readFile(cacheFile, 'utf8')).forEach(([url, item]) => {
                 if (item.status === 'resume')
                     item.status = 'pause';
                 this.dlCache.set(url, item);
@@ -122,20 +123,39 @@ class DLServer {
     }
     checkDLFileLaest = 0;
     checkDLFileTimer = null;
-    checkDLFileIsExists() {
+    async checkDLFileIsExists() {
         const now = Date.now();
         const interval = 1000 * 60;
         clearTimeout(this.checkDLFileTimer);
-        if (now - this.checkDLFileLaest < interval) {
-            this.checkDLFileTimer = setTimeout(() => this.checkDLFileIsExists(), interval - (now - this.checkDLFileLaest));
+        const delay = this.checkDLFileLaest + interval - now;
+        if (delay > 0) {
+            this.checkDLFileTimer = setTimeout(() => {
+                this.checkDLFileIsExists();
+            }, delay + 100);
             return;
         }
-        this.dlCache.forEach(item => {
-            if (item.status === 'done' && (!item.localVideo || !(0, node_fs_1.existsSync)(item.localVideo))) {
+        const tasks = [...this.dlCache.values()].map(item => () => this.checkItemStatus(item));
+        await (0, fe_utils_1.concurrency)(tasks, 3);
+        this.checkDLFileLaest = now;
+    }
+    async checkItemStatus(item) {
+        if (item.status === 'done') {
+            if (item.current) {
+                if (!item.cacheDir && item.current.tsOut)
+                    item.cacheDir = (0, node_path_1.dirname)(item.current.tsOut);
+                delete item.current;
+            }
+            if (!(await (0, utils_js_1.checkFileExists)(item.localVideo)) && !(0, node_fs_1.existsSync)(item.localVideo)) {
                 item.status = 'error';
                 item.errmsg = '已删除';
             }
-        });
+        }
+        else if (item.status === 'error' && item.progress === 100) {
+            if (await (0, utils_js_1.checkFileExists)(item.localVideo)) {
+                item.status = 'done';
+                delete item.errmsg;
+            }
+        }
     }
     dlCacheClone() {
         const info = [];
@@ -154,34 +174,32 @@ class DLServer {
         clearTimeout(this.cacheSaveTimer);
         this.cacheSaveTimer = setTimeout(() => {
             const cacheFile = (0, node_path_1.resolve)(this.options.cacheDir, 'cache.json');
-            const info = this.dlCacheClone();
             (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(cacheFile));
-            (0, node_fs_1.writeFileSync)(cacheFile, JSON.stringify(info));
+            node_fs_1.promises.writeFile(cacheFile, JSON.stringify(this.dlCacheClone()));
         }, 1000);
     }
-    readConfig(configPath) {
+    async loadConfig(configPath) {
         try {
             if (!configPath)
                 configPath = this.options.configPath;
-            if ((0, node_fs_1.existsSync)(configPath))
-                (0, fe_utils_1.assign)(this.cfg, JSON.parse((0, node_fs_1.readFileSync)(configPath, 'utf8')));
+            if (await (0, utils_js_1.checkFileExists)(configPath))
+                (0, fe_utils_1.assign)(this.cfg, JSON.parse(await node_fs_1.promises.readFile(configPath, 'utf8')));
         }
         catch (error) {
-            utils_js_1.logger.error('读取配置失败:', error);
+            utils_js_1.logger.error('Load config failed:', error);
         }
-        return this.cfg.dlOptions;
     }
-    saveConfig(config, configPath) {
+    async saveConfig(config, configPath) {
         if (!configPath)
             configPath = this.options.configPath;
         // 验证 ffmpegPath 是否存在
         if (config.ffmpegPath?.trim()) {
             const ffmpegPath = config.ffmpegPath.trim();
-            if (!(0, node_fs_1.existsSync)(ffmpegPath)) {
+            if (!(await (0, utils_js_1.checkFileExists)(ffmpegPath))) {
                 throw new Error(`ffmpeg 路径不存在: ${ffmpegPath}`);
             }
             // 检查是否为文件（不是目录）
-            const stats = (0, node_fs_1.statSync)(ffmpegPath);
+            const stats = await node_fs_1.promises.stat(ffmpegPath);
             if (!stats.isFile()) {
                 throw new Error(`ffmpeg 路径不是文件: ${ffmpegPath}`);
             }
@@ -195,7 +213,7 @@ class DLServer {
                 this.cfg.dlOptions[key] = value;
         }
         (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(configPath));
-        (0, node_fs_1.writeFileSync)(configPath, JSON.stringify(this.cfg, null, 2));
+        return node_fs_1.promises.writeFile(configPath, JSON.stringify(this.cfg, null, 2));
     }
     async createApp() {
         const { default: express } = await Promise.resolve().then(() => __importStar(require('express')));
@@ -203,16 +221,17 @@ class DLServer {
         const app = express();
         const server = app.listen(this.options.port, () => utils_js_1.logger.info(`Server running on port ${(0, console_log_colors_1.green)(this.options.port)}`));
         const wss = new WebSocketServer({ server });
+        const hasLocalCdnDir = await (0, utils_js_1.checkFileExists)((0, node_path_1.resolve)(rootDir, 'client/local/cdn'));
         this.app = app;
         this.wss = wss;
-        app.use((req, res, next) => {
+        app.use(async (req, res, next) => {
             // 处理 SPA 路由：根路径和 /page/* 路径都返回 index.html
             const isIndexPage = ['/', '/index.html'].includes(req.path) || req.path.startsWith('/page/');
             const isPlayPage = req.path.startsWith('/play.html');
-            if (isIndexPage || isPlayPage) {
-                const version = this.serverInfo.version;
-                let htmlContent = (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(rootDir, `client/${isPlayPage ? 'play' : 'index'}.html`), 'utf-8').replaceAll('{{version}}', version);
-                if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(rootDir, 'client/local/cdn'))) {
+            const isApi = req.path.startsWith('/api/');
+            if (!isApi && (isIndexPage || isPlayPage)) {
+                let htmlContent = await node_fs_1.promises.readFile((0, node_path_1.resolve)(rootDir, `client/${isPlayPage ? 'play' : 'index'}.html`), 'utf-8');
+                if (hasLocalCdnDir) {
                     // 提取所有 zstatic.net 的 js 和 css 资源地址，若子路径存在于 local/cdn 目录下则替换为本地路径
                     const zstaticRegex = /https:\/\/s4\.zstatic\.net\/ajax\/libs\/[^\s"'`<>]+\.(js|css)/g;
                     const zstaticMatches = htmlContent.match(zstaticRegex);
@@ -220,8 +239,8 @@ class DLServer {
                         for (const match of zstaticMatches) {
                             const relativePath = match.split('libs/')[1];
                             const localPath = (0, node_path_1.resolve)(rootDir, `client/local/cdn/${relativePath}`);
-                            if ((0, node_fs_1.existsSync)(localPath)) {
-                                htmlContent = htmlContent.replaceAll(match, `local/cdn/${relativePath}`);
+                            if (await (0, utils_js_1.checkFileExists)(localPath)) {
+                                htmlContent = htmlContent.replaceAll(match, `/local/cdn/${relativePath}`);
                             }
                         }
                         htmlContent = htmlContent.replaceAll(/integrity="[^"]+"\n?/g, '');
@@ -288,14 +307,23 @@ class DLServer {
                 options.filename = item[1];
         }
         const { options: dlOptions } = (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 };
         utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem.status);
         if (cacheItem.status === 'resume')
             return;
-        if (cacheItem.localVideo && !(0, node_fs_1.existsSync)(cacheItem.localVideo))
-            delete cacheItem.localVideo;
-        if (cacheItem.endTime)
-            delete cacheItem.endTime;
+        if (cacheItem.localVideo) {
+            if (await (0, utils_js_1.checkFileExists)(cacheItem.localVideo)) {
+                if (cacheItem.status === 'done')
+                    return;
+            }
+            else {
+                delete cacheItem.localVideo;
+                if (cacheItem.endTime)
+                    delete cacheItem.endTime;
+            }
+        }
         cacheItem.status = this.downloading >= this.cfg.webOptions.maxDownloads ? 'pending' : 'resume';
         // pending 优先级靠后
         if (cacheItem.status === 'pending' && this.dlCache.has(url))
@@ -316,18 +344,20 @@ class DLServer {
                 if (!item)
                     return false; // 已删除
                 const status = item.status || 'resume';
-                Object.assign(item, { ...stats, current, options: dlOptions, status, workPoll, url });
+                if (!item.cacheDir && current?.tsOut)
+                    item.cacheDir = (0, node_path_1.dirname)(current.tsOut);
+                Object.assign(item, { ...stats, dlOptions, status, workPoll, url });
                 this.dlCache.set(url, item);
                 this.saveCache();
                 this.wsSend('progress', url);
                 return status !== 'pause';
             },
         };
-        const afterDownload = (r, url) => {
+        const afterDownload = async (r, url) => {
             const item = this.dlCache.get(url) || cacheItem;
-            if (r.filepath && (0, node_fs_1.existsSync)(r.filepath)) {
+            if (r.filepath && (await (0, utils_js_1.checkFileExists)(r.filepath))) {
                 item.localVideo = r.filepath;
-                item.downloadedSize = (0, node_fs_1.statSync)(r.filepath).size;
+                item.downloadedSize = (await node_fs_1.promises.stat(r.filepath)).size;
             }
             else if (!r.errmsg && opts.convert !== false)
                 r.errmsg = '下载失败';
@@ -371,6 +401,11 @@ class DLServer {
         if (queryLang && i18n_js_1.LANG_CODES.has(queryLang)) {
             return queryLang;
         }
+        // Try to get lang from body
+        const bodyLang = req.body?.lang;
+        if (bodyLang && i18n_js_1.LANG_CODES.has(bodyLang)) {
+            return bodyLang;
+        }
         // Try to get lang from Accept-Language header
         const acceptLanguage = req.headers['accept-language'];
         if (acceptLanguage) {
@@ -379,11 +414,6 @@ class DLServer {
                 return langCode;
             }
         }
-        // Try to get lang from body
-        const bodyLang = req.body?.lang;
-        if (bodyLang && i18n_js_1.LANG_CODES.has(bodyLang)) {
-            return bodyLang;
-        }
         // Fallback to default
         return (0, i18n_js_1.getLang)();
     }
@@ -470,19 +500,32 @@ class DLServer {
         // });
         // API to start m3u8 download
         app.post('/api/download', (req, res) => {
-            const { url, options = {}, list = [] } = req.body;
+            const { list = [] } = req.body;
             const lang = this.getLangFromRequest(req);
             try {
-                if (list.length) {
-                    for (const item of list) {
-                        const { url, ...options } = item;
-                        if (url)
-                            this.startDownload(url, options);
+                let duplicateCount = 0;
+                let startedCount = 0;
+                // 检查并统计重复的 URL，但仍允许下载
+                for (const item of list) {
+                    const { url, ...options } = item;
+                    if (url) {
+                        if (this.dlCache.has(url)) {
+                            duplicateCount++;
+                        }
+                        else {
+                            startedCount++;
+                        }
+                        this.startDownload(url, options);
                     }
                 }
-                else if (url)
-                    this.startDownload(url, options);
-                res.json({ message: (0, i18n_js_1.t)('api.success.downloadStarted', lang, { count: list.length || 1 }), code: 0 });
+                let message = '';
+                if (duplicateCount > 0) {
+                    message = `${(0, i18n_js_1.t)('api.success.downloadStarted', lang, { count: list.length })}，${(0, i18n_js_1.t)('api.error.duplicateDownload', lang, { count: duplicateCount })}`;
+                }
+                else {
+                    message = (0, i18n_js_1.t)('api.success.downloadStarted', lang, { count: list.length });
+                }
+                res.json({ message, code: 0, duplicateCount, startedCount });
                 this.wsSend('tasks');
             }
             catch (error) {
@@ -535,7 +578,7 @@ class DLServer {
             });
         });
         // API to delete download
-        app.post('/api/delete', (req, res) => {
+        app.post('/api/delete', async (req, res) => {
             const { urls, deleteCache = false, deleteVideo = false } = req.body;
             const urlsToDelete = urls;
             const list = [];
@@ -545,21 +588,21 @@ class DLServer {
                     (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
                     this.dlCache.delete(url);
                     list.push(item.url);
-                    if (deleteCache && item.current?.tsOut) {
-                        const cacheDir = (0, node_path_1.dirname)(item.current.tsOut);
-                        if ((0, node_fs_1.existsSync)(cacheDir)) {
-                            (0, node_fs_1.rmSync)(cacheDir, { recursive: true });
+                    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);
                         }
                     }
                     if (deleteVideo) {
-                        ['.ts', '.mp4'].forEach(ext => {
+                        for (const ext of ['.ts', '.mp4']) {
                             const filepath = (0, node_path_1.resolve)(item.options.saveDir, item.options.filename + ext);
-                            if ((0, node_fs_1.existsSync)(filepath)) {
-                                (0, node_fs_1.unlinkSync)(filepath);
+                            if (await (0, utils_js_1.checkFileExists)(filepath)) {
+                                await node_fs_1.promises.unlink(filepath);
                                 utils_js_1.logger.debug('删除文件：', filepath);
                             }
-                        });
+                        }
                     }
                 }
             }
@@ -571,20 +614,73 @@ class DLServer {
             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 });
         });
-        app.get(/^\/localplay\/(.*)$/, (req, res) => {
+        // API to rename download file
+        app.post('/api/rename', async (req, res) => {
+            const { url, newFilename } = req.body;
+            const lang = this.getLangFromRequest(req);
+            if (!url || !newFilename) {
+                res.json({ code: 1001, message: (0, i18n_js_1.t)('api.error.invalidParams', lang) });
+                return;
+            }
+            // 检查新文件名是否包含非法字符
+            const invalidChars = /[<>:"/\\|?*]/;
+            if (invalidChars.test(newFilename)) {
+                res.json({ code: 1004, message: (0, i18n_js_1.t)('api.error.invalidFilename', lang) });
+                return;
+            }
+            const item = this.dlCache.get(url);
+            if (!item) {
+                res.json({ code: 1002, message: (0, i18n_js_1.t)('api.error.taskNotFound', lang) });
+                return;
+            }
+            await this.checkItemStatus(item);
+            // 只允许重命名已完成且状态正常的任务
+            if (item.status !== 'done' || item.errmsg) {
+                utils_js_1.logger.error('rename failed:', item.status, (0, console_log_colors_1.red)(item.errmsg), (0, console_log_colors_1.gray)(url));
+                res.json({ code: 1003, message: (0, i18n_js_1.t)('api.error.onlyRenameCompleted', lang) });
+                return;
+            }
+            try {
+                const oldPath = item.localVideo;
+                const oldDir = (0, node_path_1.dirname)(oldPath);
+                const oldExt = oldPath.split('.').pop() || '';
+                const newFilenameBase = newFilename.replace(/\.[^.]+$/, '');
+                const newPath = (0, node_path_1.resolve)(oldDir, `${newFilenameBase}${oldExt ? `.${oldExt}` : ''}`);
+                // 检查新文件名是否已存在
+                if (await (0, utils_js_1.checkFileExists)(newPath)) {
+                    res.json({ code: 1007, message: (0, i18n_js_1.t)('api.error.fileExists', lang) });
+                    return;
+                }
+                // 重命名文件
+                await node_fs_1.promises.rename(oldPath, newPath);
+                utils_js_1.logger.debug('重命名文件：', (0, console_log_colors_1.gray)(oldPath), '->', (0, console_log_colors_1.cyan)(newPath));
+                // 更新任务信息
+                item.localVideo = newPath;
+                item.options.filename = item.filename = (0, node_path_1.basename)(newPath);
+                this.dlCache.set(url, item);
+                this.saveCache();
+                this.wsSend('progress', url);
+                res.json({ message: (0, i18n_js_1.t)('api.success.renamed', lang), code: 0 });
+            }
+            catch (error) {
+                utils_js_1.logger.error('重命名失败:', error);
+                res.json({ code: 1006, message: (0, i18n_js_1.t)('api.error.renameFailed', lang, { error: error.message }) });
+            }
+        });
+        app.get(/^\/localplay\/(.*)$/, async (req, res) => {
             let filepath = decodeURIComponent(req.params[0]);
             if (filepath) {
                 let ext = filepath.split('.').pop();
                 if (!ext) {
                     ext = 'm3u8';
-                    if (!(0, node_fs_1.existsSync)(filepath))
+                    if (!(await (0, utils_js_1.checkFileExists)(filepath)))
                         filepath += '.m3u8';
                 }
                 const allowedDirs = [this.options.cacheDir, this.cfg.dlOptions.saveDir];
-                if (!(0, node_fs_1.existsSync)(filepath)) {
+                if (!(await (0, utils_js_1.checkFileExists)(filepath))) {
                     for (const dir of allowedDirs) {
                         const tpath = (0, node_path_1.resolve)(dir, filepath);
-                        if ((0, node_fs_1.existsSync)(tpath)) {
+                        if (await (0, utils_js_1.checkFileExists)(tpath)) {
                             filepath = tpath;
                             break;
                         }
@@ -600,8 +696,8 @@ class DLServer {
                         return;
                     }
                 }
-                if ((0, node_fs_1.existsSync)(filepath)) {
-                    const stats = (0, node_fs_1.statSync)(filepath);
+                if (await (0, utils_js_1.checkFileExists)(filepath)) {
+                    const stats = await node_fs_1.promises.stat(filepath);
                     const headers = new Headers({
                         'Last-Modified': stats.mtime.toUTCString(),
                         'Access-Control-Allow-Headers': '*',
@@ -613,7 +709,8 @@ class DLServer {
                     });
                     res.setHeaders(headers);
                     if (ext === 'm3u8' || ('ts' === ext && stats.size < 1024 * 1024 * 3)) {
-                        res.send((0, node_fs_1.readFileSync)(filepath));
+                        const data = await node_fs_1.promises.readFile(filepath);
+                        res.send(data);
                         utils_js_1.logger.debug('[Localplay]file sent:', (0, console_log_colors_1.gray)(filepath), 'Size:', stats.size, 'bytes');
                     }
                     else {

package/cjs/types/m3u8.d.ts

@@ -142,8 +142,8 @@ export interface M3u8DLOptions {
     type?: 'm3u8' | 'file' | 'parser';
     /** ffmpeg 可执行文件路径。如果未指定，则尝试使用系统 PATH 中的 'ffmpeg' */
     ffmpegPath?: string;
-    /** 语言。可选值：zh, en */
-    lang?: 'zh' | 'en';
+    /** 语言。可选值：zh-CN, en */
+    lang?: 'zh-CN' | 'en';
 }
 export interface M3u8DLResult extends Partial<DownloadResult> {
     /** 下载进度统计 */