@lzwme/m3u8-dl 1.2.2 → 1.3.1

package/cjs/cli.js

@@ -67,6 +67,7 @@ commander_1.program
     .option('--no-convert', '下载成功后，是否不合并转换为 mp4 文件。默认为 true。')
     .option('-H, --headers <headers>', '自定义请求头。格式为 key1=value1\nkey2=value2')
     .option('-T, --type <type>', '指定下载类型。默认根据URL自动识别，如果是批量下载多个不同 URL 类型，请不要设置。可选值：m3u8, file, parser')
+    .option('-I, --ignore-segments <time-segments>', '忽略的视频片段，用-分割起始时间点，多个用逗号分隔。如：0-10,20-30')
     .action(async (urls) => {
     const options = getOptions();
     utils_js_1.logger.debug(urls, options);
@@ -88,7 +89,9 @@ commander_1.program
     const opts = getOptions();
     if (opts.debug)
         options.debug = true;
-    console.log(opts, options);
+    if (opts.cacheDir)
+        options.cacheDir = opts.cacheDir;
+    utils_js_1.logger.debug('[cli][server]', opts, options);
     Promise.resolve().then(() => __importStar(require('./server/download-server.js'))).then(m => {
         new m.DLServer(options);
     });

package/cjs/lib/m3u8-download.js

@@ -105,8 +105,35 @@ async function m3u8InfoParse(url, options = {}) {
         utils_js_1.logger.error('[parseM3U8][failed]', e.message);
         console.log(e);
     });
-    if (m3u8Info && m3u8Info?.tsCount > 0)
+    if (m3u8Info && m3u8Info?.tsCount > 0) {
         result.m3u8Info = m3u8Info;
+        if (options.ignoreSegments) {
+            const timeSegments = options.ignoreSegments
+                .split(',')
+                .map(d => d.split(/[- ]+/).map(d => +d.trim()))
+                .filter(d => d[0] && d[1] && d[0] !== d[1]);
+            if (timeSegments.length) {
+                const total = m3u8Info.data.length;
+                m3u8Info.data = m3u8Info.data.filter(item => {
+                    for (let [start, end] of timeSegments) {
+                        if (start > end)
+                            [start, end] = [end, start];
+                        if (item.timeline + item.duration / 2 >= start && item.timeline + item.duration / 2 <= end) {
+                            m3u8Info.duration -= item.duration;
+                            return false;
+                        }
+                    }
+                    return true;
+                });
+                const ignoredCount = total - m3u8Info.data.length;
+                if (ignoredCount) {
+                    m3u8Info.tsCount = m3u8Info.data.length;
+                    utils_js_1.logger.info(`[parseM3U8][ignoreSegments] ignored ${(0, console_log_colors_1.cyanBright)(ignoredCount)} segments`);
+                    m3u8Info.duration = +Number(m3u8Info.duration).toFixed(2);
+                }
+            }
+        }
+    }
     return result;
 }
 /**

package/cjs/lib/parseM3u8.js

@@ -83,7 +83,7 @@ async function parseM3U8(content, cacheDir = './cache', headers) {
         result.data.push({
             index: i,
             duration: item.duration,
-            timeline: item.timeline,
+            timeline: item.timeline || result.duration,
             uri: item.uri,
             tsOut: (0, node_path_1.resolve)(cacheDir, `${(0, fe_utils_1.md5)(item.uri)}.ts`),
             keyUri: item.key?.uri || '',

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

@@ -8,6 +8,8 @@ interface DLServerOptions {
     debug?: boolean;
     /** 登录 token，默认取环境变量 DS_SECRET */
     token?: string;
+    /** 是否限制文件访问(localplay视频资源等仅可读取下载和缓存目录) */
+    limitFileAccess?: boolean;
 }
 interface CacheItem extends Partial<M3u8DLProgressStats> {
     url: string;

package/cjs/server/download-server.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLServer = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const node_os_1 = require("node:os");
 const fe_utils_1 = require("@lzwme/fe-utils");
 const console_log_colors_1 = require("console-log-colors");
 const file_download_js_1 = require("../lib/file-download.js");
@@ -43,19 +44,21 @@ const format_options_js_1 = require("../lib/format-options.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");
+const rootDir = (0, node_path_1.resolve)(__dirname, '../..');
 class DLServer {
     app = null;
     wss = null;
     /** DS 参数 */
     options = {
         port: Number(process.env.DS_PORT) || 6600,
-        cacheDir: (0, node_path_1.resolve)(process.cwd(), './cache'),
+        cacheDir: process.env.DS_CACHE_DIR || (0, node_path_1.resolve)((0, node_os_1.homedir)(), '.m3u8-dl/cache'),
         token: process.env.DS_SECRET || process.env.DS_TOKEN || '',
         debug: process.env.DS_DEBUG === '1',
+        limitFileAccess: !['0', 'false'].includes(process.env.DS_LIMTE_FILE_ACCESS),
     };
     serverInfo = {
         version: '',
-        ariang: (0, node_fs_1.existsSync)((0, node_path_1.resolve)(__dirname, '../../client/ariang/index.html')),
+        ariang: (0, node_fs_1.existsSync)((0, node_path_1.resolve)(rootDir, 'client/ariang/index.html')),
     };
     cfg = {
         /** 支持 web 设置修改的参数 */
@@ -85,7 +88,7 @@ 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)(__dirname, '../../package.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;
@@ -101,7 +104,7 @@ class DLServer {
         this.loadCache();
         await this.createApp();
         this.initRouters();
-        utils_js_1.logger.debug('Server initialized', this.options, this.cfg.dlOptions);
+        utils_js_1.logger.debug('Server initialized', 'cacheSize:', this.dlCache.size, this.options, this.cfg.dlOptions);
     }
     loadCache() {
         const cacheFile = (0, node_path_1.resolve)(this.options.cacheDir, 'cache.json');
@@ -187,8 +190,24 @@ class DLServer {
         const wss = new WebSocketServer({ server });
         this.app = app;
         this.wss = wss;
+        app.use((req, res, next) => {
+            if (['/', '/index.html'].includes(req.path)) {
+                const version = this.serverInfo.version;
+                let indexHtml = (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(rootDir, 'client/index.html'), 'utf-8').replaceAll('{{version}}', version);
+                if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(rootDir, 'client/local/cdn'))) {
+                    indexHtml = indexHtml
+                        .replaceAll('https://s4.zstatic.net/ajax/libs', 'local/cdn')
+                        .replaceAll(/integrity=.+\n/g, '')
+                        .replace('https://cdn.tailwindcss.com/3.4.16', 'local/cdn/tailwindcss/3.4.16/tailwindcss.min.js');
+                }
+                res.setHeader('content-type', 'text/html').send(indexHtml);
+            }
+            else {
+                next();
+            }
+        });
         app.use(express.json());
-        app.use(express.static((0, node_path_1.resolve)(__dirname, '../../client')));
+        app.use(express.static((0, node_path_1.resolve)(rootDir, 'client')));
         app.use((req, res, next) => {
             res.setHeader('Access-Control-Allow-Origin', '*');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE');
@@ -230,20 +249,19 @@ class DLServer {
         return { app, wss };
     }
     startDownload(url, options) {
-        const cacheItem = this.dlCache.get(url);
         const dlOptions = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir })[1];
-        utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem?.status);
-        if (cacheItem?.status === 'resume')
+        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 cacheItem.options;
-        if (this.downloading >= this.cfg.webOptions.maxDownloads) {
-            if (cacheItem)
-                cacheItem.status = 'pending';
-            else
-                this.dlCache.set(url, { options, dlOptions, status: 'pending', url });
-            return cacheItem?.options || dlOptions;
-        }
-        let workPoll = cacheItem?.workPoll;
-        const defaultItem = { options, dlOptions, status: 'resume', url };
+        if (cacheItem.localVideo && !(0, node_fs_1.existsSync)(cacheItem.localVideo))
+            delete cacheItem.localVideo;
+        cacheItem.status = this.downloading >= this.cfg.webOptions.maxDownloads ? 'pending' : 'resume';
+        this.dlCache.set(url, cacheItem);
+        this.wsSend('progress', url);
+        if (cacheItem.status === 'pending')
+            return cacheItem.options;
+        let workPoll = cacheItem.workPoll;
         const opts = {
             ...dlOptions,
             showProgress: dlOptions.debug || this.options.debug,
@@ -251,8 +269,8 @@ class DLServer {
                 workPoll = wp;
             },
             onProgress: (_finished, _total, current, stats) => {
-                const item = this.dlCache.get(url) || defaultItem;
-                const status = item?.status || 'resume';
+                const item = this.dlCache.get(url) || cacheItem;
+                const status = item.status || 'resume';
                 Object.assign(item, { ...stats, current, options: dlOptions, status, workPoll, url });
                 this.dlCache.set(url, item);
                 this.saveCache();
@@ -261,7 +279,7 @@ class DLServer {
             },
         };
         const afterDownload = (r, url) => {
-            const item = this.dlCache.get(url) || defaultItem;
+            const item = this.dlCache.get(url) || cacheItem;
             if (r.filepath && (0, node_fs_1.existsSync)(r.filepath)) {
                 item.localVideo = r.filepath;
                 item.downloadedSize = (0, node_fs_1.statSync)(r.filepath).size;
@@ -276,18 +294,12 @@ class DLServer {
             this.wsSend('progress', url);
             this.saveCache();
             // 找到一个 pending 的任务，开始下载
-            for (const [url, item] of this.dlCache.entries()) {
-                if (item.status === 'pending') {
-                    this.startDownload(url, item.options);
-                    this.wsSend('progress', url);
-                    break;
-                }
+            const nextItem = this.dlCache.entries().find(([_url, d]) => d.status === 'pending');
+            if (nextItem) {
+                this.startDownload(nextItem[0], nextItem[1].options);
+                this.wsSend('progress', nextItem[0]);
             }
         };
-        if (cacheItem)
-            cacheItem.status = 'resume';
-        else
-            this.dlCache.set(url, defaultItem);
         try {
             if (dlOptions.type === 'parser') {
                 const vp = new index_js_1.VideoParser();
@@ -312,12 +324,10 @@ class DLServer {
         }
         else if (type === 'progress' && typeof data === 'string') {
             const item = this.dlCache.get(data);
-            if (item) {
-                const { workPoll, ...stats } = item;
-                data = [{ ...stats, url: data }];
-            }
-            else
+            if (!item)
                 return;
+            const { workPoll, ...stats } = item;
+            data = [{ ...stats, url: data }];
         }
         // 广播进度信息给所有客户端
         this.wss.clients.forEach(client => {
@@ -404,11 +414,12 @@ class DLServer {
             const urlsToPause = all ? [...this.dlCache.keys()] : urls;
             const list = [];
             for (const url of urlsToPause) {
-                const { workPoll, ...item } = this.dlCache.get(url);
+                const item = this.dlCache.get(url);
                 if (['resume', 'pending'].includes(item?.status)) {
-                    (0, m3u8_download_js_1.m3u8DLStop)(url, workPoll);
+                    (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
                     item.status = item.tsSuccess === item.tsCount ? 'done' : 'pause';
-                    list.push(item);
+                    const { workPoll, ...tItem } = item;
+                    list.push(tItem);
                 }
             }
             if (list.length)
@@ -472,8 +483,9 @@ class DLServer {
                     if (!(0, node_fs_1.existsSync)(filepath))
                         filepath += '.m3u8';
                 }
+                const allowedDirs = [this.options.cacheDir, this.cfg.dlOptions.saveDir];
                 if (!(0, node_fs_1.existsSync)(filepath)) {
-                    for (const dir of [this.options.cacheDir, this.cfg.dlOptions.saveDir]) {
+                    for (const dir of allowedDirs) {
                         const tpath = (0, node_path_1.resolve)(dir, filepath);
                         if ((0, node_fs_1.existsSync)(tpath)) {
                             filepath = tpath;
@@ -483,7 +495,9 @@ class DLServer {
                 }
                 else {
                     filepath = (0, node_path_1.resolve)(filepath);
-                    if ([this.options.cacheDir, this.cfg.dlOptions.saveDir].some(d => filepath.startsWith((0, node_path_1.resolve)(d)))) {
+                    const isAllow = !this.options.limitFileAccess || allowedDirs.some(d => filepath.startsWith((0, node_path_1.resolve)(d)));
+                    if (!isAllow) {
+                        utils_js_1.logger.error('[Localplay] Access denied:', filepath);
                         res.send({ message: 'Access denied', code: 403 });
                         return;
                     }

package/cjs/types/m3u8.d.ts

@@ -6,7 +6,9 @@ export interface TsItemInfo {
     m3u8: string;
     /** ts 文件次序 */
     index: number;
+    /** 视频片段时长 */
     duration: number;
+    /** 时间线(起点) */
     timeline: number;
     /** ts 文件下载 url 地址 */
     uri: string;
@@ -119,6 +121,8 @@ export interface M3u8DLOptions {
     saveDir?: string;
     /** 临时文件保存目录。默认为 cache/<md5(url)> */
     cacheDir?: string;
+    /** 忽略的时间片段，单位为秒，多段以逗号分割。示例: 0-10,100-110 */
+    ignoreSegments?: string;
     /** 下载成功后是否删除临时文件。默认为 true。保存临时文件可以在重复下载时识别缓存 */
     delCache?: boolean;
     /** 文件已存在时是否仍强制下载和生成。默认为 false，文件已存在则跳过 */

package/client/index.html

@@ -6,156 +6,26 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
-  <title>M3U8 下载管理</title>
+  <title>M3U8 下载器</title>
   <link rel="icon" type="image/svg+xml" href="logo.svg">
-  <script src="https://cdn.tailwindcss.com"></script>
+  <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/font-awesome/6.7.2/css/all.min.css"
+    integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/sweetalert2/11.16.1/sweetalert2.min.css"
+    integrity="sha512-WnmDqbbAeHb7Put2nIAp7KNlnMup0FXVviOctducz1omuXB/hHK3s2vd3QLffK/CvvFUKrpioxdo+/Jo3k/xIw=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="style.css?v={{version}}">
+
+  <script src="https://cdn.tailwindcss.com/3.4.16"></script>
   <script src="https://s4.zstatic.net/ajax/libs/vue/2.7.16/vue.min.js"
     integrity="sha512-Wx8niGbPNCD87mSuF0sBRytwW2+2ZFr7HwVDF8krCb3egstCc4oQfig+/cfg2OHd82KcUlOYxlSDAqdHqK5TCw=="
     crossorigin="anonymous" referrerpolicy="no-referrer"></script>
   <script src="https://s4.zstatic.net/ajax/libs/sweetalert2/11.16.1/sweetalert2.min.js"
     integrity="sha512-LGHBR+kJ5jZSIzhhdfytPoEHzgaYuTRifq9g5l6ja6/k9NAOsAi5dQh4zQF6JIRB8cAYxTRedERUF+97/KuivQ=="
     crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://s4.zstatic.net/ajax/libs/blueimp-md5/2.19.0/js/md5.min.js"
-    integrity="sha512-8pbzenDolL1l5OPSsoURCx9TEdMFTaeFipASVrMYKhuYtly+k3tcsQYliOEKTmuB1t7yuzAiVo+yd7SJz+ijFQ=="
-    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/sweetalert2/11.16.1/sweetalert2.min.css"
-    integrity="sha512-WnmDqbbAeHb7Put2nIAp7KNlnMup0FXVviOctducz1omuXB/hHK3s2vd3QLffK/CvvFUKrpioxdo+/Jo3k/xIw=="
-    crossorigin="anonymous" referrerpolicy="no-referrer" />
-  <link rel="stylesheet" href="https://s4.zstatic.net/ajax/libs/font-awesome/6.7.2/css/all.min.css"
-    integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
-    crossorigin="anonymous" referrerpolicy="no-referrer" />
-
-  <style>
-    #app {
-      max-width: 1400px;
-      margin: auto;
-      min-height: 100vh;
-      background-color: #f5f5f5;
-      position: relative;
-    }
+  <script src="https://s4.zstatic.net/ajax/libs/blueimp-md5/2.19.0/js/md5.min.js" crossorigin="anonymous"
+    referrerpolicy="no-referrer"></script>
 
-    .sidebar {
-      background-color: #fff;
-      box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
-      transition: all 0.3s ease;
-      position: absolute;
-      left: 0;
-      top: 0;
-      bottom: 0;
-      width: 16rem;
-      z-index: 1;
-    }
-
-    .download-item {
-      transition: all 0.3s ease;
-    }
-
-    .download-item:hover {
-      background-color: #f8f9fa;
-    }
-
-    .progress-bar {
-      height: 4px;
-      transition: width 0.3s ease;
-    }
-
-    .nav-item {
-      transition: all 0.3s ease;
-    }
-
-    .nav-item:hover {
-      background-color: #f0f0f0;
-      transform: translateX(4px);
-    }
-
-    .nav-item.active {
-      background-color: #e6f3ff;
-      color: #1890ff;
-    }
-
-    /* 移动端适配 */
-    @media (max-width: 768px) {
-      .sidebar {
-        transform: translateX(-100%);
-      }
-
-      .sidebar.show {
-        transform: translateX(0);
-      }
-
-      .menu-toggle {
-        display: block !important;
-      }
-
-      .main-content {
-        margin-left: 0 !important;
-      }
-    }
-
-    .menu-toggle {
-      display: none;
-      position: fixed;
-      top: 1rem;
-      left: 1rem;
-      z-index: 51;
-      padding: 0.5rem;
-      background: white;
-      border-radius: 0.5rem;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-      box-shadow: 0 2px 4px #9bdff5;
-      width: 42px;
-      height: 42px;
-    }
-
-    .main-content {
-      transition: margin-left 0.3s ease;
-      margin-left: 16rem;
-      width: calc(100% - 16rem);
-    }
-
-    /* 自定义toast样式 */
-    .custom-toast {
-      position: fixed;
-      top: 20px;
-      right: 20px;
-      min-width: 250px;
-      max-width: 400px;
-      padding: 15px;
-      border-radius: 4px;
-      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-      background: #fff;
-      color: #333;
-      z-index: 99999;
-      display: flex;
-      align-items: center;
-      transform: translateX(150%);
-      transition: transform 0.3s ease;
-    }
-
-    .custom-toast.show {
-      transform: translateX(0);
-    }
-
-    .custom-toast.hide {
-      transform: translateX(150%);
-    }
-
-    .custom-toast-success {
-      border-left: 4px solid #28a745;
-    }
-
-    .custom-toast-error {
-      border-left: 4px solid #dc3545;
-    }
-
-    .custom-toast-warning {
-      border-left: 4px solid #ffc107;
-    }
-
-    .custom-toast-info {
-      border-left: 4px solid #17a2b8;
-    }
-  </style>
 </head>
 
 <body>
@@ -343,16 +213,6 @@
                       <i class="fas fa-hourglass-half mr-1"></i>
                       <span>剩余: {{ T.formatTimeCost(task.remainingTime || 0) }}</span>
                     </span>
-                    <!-- <span class="flex items-center">
-                      <i class="fas fa-sort-amount-up mr-1"></i>
-                      <select v-model="task.priority" @change="updatePriority(url, task.priority)"
-                        class="text-sm border rounded px-1 py-0.5 focus:ring-blue-500 focus:border-blue-500"
-                        aria-label="设置下载优先级">
-                        <option value="0">普通优先级</option>
-                        <option value="1">高优先级</option>
-                        <option value="2">最高优先级</option>
-                      </select>
-                    </span> -->
                   </div>
                 </div>
                 <div class="flex space-x-2">
@@ -546,6 +406,14 @@
                   class="text-blue-500 hover:text-blue-600">
                   {{serverInfo.version}}</a>
               </p>
+              <p class="text-gray-600"><strong>检测版本：</strong>
+                <button @click="checkNewVersion" v-if="!serverInfo.appUpdateMessage"
+                  class="px-2 py-1 text-sm bg-green-600 hover:bg-green-700 text-white rounded">
+                  <i class="fas fa-check mr-1"></i>检测新版本
+                </button>
+                <span v-if="serverInfo.newVersion" class="text-blue-600">发现新版本！[{{serverInfo.newVersion}}]</span>
+                <span v-if="serverInfo.appUpdateMessage" class="text-green-600">{{serverInfo.appUpdateMessage}}</span>
+              </p>
             </div>
           </div>
 
@@ -622,6 +490,13 @@ services:
         'content-type': 'application/json',
         authorization: localStorage.getItem('token') || '',
       },
+      initTJ() {
+        if (!window._hmt) window._hmt = [];
+        const hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?0b21eda331ac9677a4c546dea88616d0";
+        const s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+      },
       request(method, url, data, headers = {}) {
         return fetch(url, {
           method,
@@ -646,7 +521,10 @@ services:
       alert(msg, p) {
         p = typeof msg === 'object' ? msg : Object.assign({ text: msg }, p);
         if (!p.toast) p.allowOutsideClick = false;
-        Swal.fire(Object.assign({ icon: 'info', showConfirmButton: false, showCloseButton: true }, p));
+        return Swal.fire(Object.assign({ icon: 'info', showConfirmButton: false, showCloseButton: true }, p));
+      },
+      confirm(msg, p) {
+        return this.alert(msg, { showConfirmButton: true, showCancelButton: true, showCloseButton: true, confirmButtonText: '确认', cancelButtonText: '取消' });
       },
       toast(msg, p) {
         p = (typeof msg === 'object' ? msg : Object.assign({ text: msg }, p));
@@ -727,13 +605,16 @@ services:
     };
 
     Vue.prototype.T = T;
+    T.initTJ();
     window.APP = new Vue({
       el: '#app',
       data: {
         ws: null,
         serverInfo: {
-          version: '',
+          version: '{{version}}',
           ariang: false,
+          newVersion: '',
+          appUpdateMessage: '',
         },
         config: {
           /** 并发下载线程数。取决于服务器限制，过多可能会容易下载失败。一般建议不超过 8 个。默认为 cpu数 * 2，但不超过 8 */
@@ -793,7 +674,7 @@ services:
 
           // 排序：resume > pending > pause > error > done
           const statusOrder = { resume: 0, pending: 1, pause: 2, error: 3, done: 4 };
-          tasks.sort((a, b) => (statusOrder[a.status] - statusOrder[b.status]) || a.status === 'done' ? (b.filename - a.filename) : (b.endTime - a.endTime));
+          tasks.sort((a, b) => (statusOrder[a.status] - statusOrder[b.status]) || (a.status === 'done' ? (b.filename - a.filename) : (b.endTime - a.endTime)));
 
           // 更新 queueStatus
           const queueStatus = {
@@ -814,10 +695,43 @@ services:
         }
       },
       methods: {
+        initEventsForApp() {
+          if (!window.electron) return;
+          const ipc = window.electron.ipc;
+          ipc.on('message', (ev) => {
+            if (typeof ev.data === 'string') T.toast(ev.data, { icon: 'info' });
+            else console.log(ev.data);
+          });
+
+          ipc.on('downloadProgress', (data) => {
+            console.log('downloadProgress', data);
+            this.serverInfo.appUpdateMessage = `下载中：${Number(data.percent).toFixed(2)}% [${T.formatSpeed(data.bytesPerSecond)}] [${T.formatSize(data.transferred)}/${T.formatSize(data.total)}]`;
+          });
+        },
+        async checkNewVersion() {
+          try {
+            const r = await fetch(`https://registry.npmmirror.com/@lzwme/m3u8-dl/latest`).then(r => r.json());
+            if (r.version) {
+              if (r.version === this.serverInfo.version) T.toast(`已是最新版本，无需更新[${r.version}]`);
+              else {
+                this.serverInfo.newVersion = r.version;
+                if (window.electron) {
+                  window.electron.ipc.send('checkForUpdate');
+                } else {
+                  T.alert(`发现新版本[${r.version}]，请前往 https://github.com/lzwme/m3u8-dl/releases 下载最新版本`, { icon: 'success' });
+                }
+              }
+            }
+          } catch (error) {
+            console.error('检查新版本失败:', error);
+            T.alert(`版本检查失败：${error.message}`, { icon: 'error' });
+          }
+        },
         forceUpdate: function () {
           const now = Date.now();
           if (now - this.forceUpdateTime > 500) {
             this.forceUpdateTime = now;
+            this.tasks = { ...this.tasks };
             this.$forceUpdate();
           } else {
             if (this.forceUpdateTimeout) clearTimeout(this.forceUpdateTimeout);
@@ -836,7 +750,7 @@ services:
 
             switch (type) {
               case 'serverInfo':
-                this.serverInfo = data;
+                Object.assign(this.serverInfo, data);
                 break;
               case 'tasks':
                 this.tasks = data;
@@ -930,6 +844,11 @@ services:
                   <input id="saveDir" class="w-full p-2 border rounded-lg focus:ring-blue-500" placeholder="请输入保存路径" value="${this.config.saveDir || ''}">
                 </div>
 
+                <div class="mt-4">
+                  <label class="block text-sm font-bold text-gray-700 mb-1">删除时间片段（适用于移除广告片段的情况）</label>
+                  <input id="ignoreSegments" class="w-full p-2 border rounded-lg focus:ring-blue-500" placeholder="以-分割起止时间，多个以逗号分隔。示例：0-10,20-100">
+                </div>
+
                 <div class="mt-4">
                   <label class="block text-sm font-bold text-gray-700 mb-1">自定义请求头</label>
                   <textarea id="headers" class="w-full p-2 border rounded-lg focus:ring-blue-500" rows="4" placeholder="每行一个请求头（微博视频必须设置 Cookie），格式：Key: Value&#10;例如：&#10;Referer: https://example.com&#10;Cookie: token=123"></textarea>
@@ -947,6 +866,7 @@ services:
               const filename = document.getElementById('filename').value.trim();
               const saveDir = document.getElementById('saveDir').value.trim();
               const headersText = document.getElementById('headers').value.trim();
+              const ignoreSegments = document.getElementById('ignoreSegments').value.trim();
 
               if (!urlsText) {
                 Swal.showValidationMessage('请输入至少一个 M3U8 链接');
@@ -971,6 +891,7 @@ services:
                 filename: item.name || (filename ? `${filename}第${idx + 1}集` : ''),
                 saveDir,
                 headers,
+                ignoreSegments,
               }));
             }
           }).then((result) => {
@@ -981,6 +902,7 @@ services:
         startBatchDownload: async function (list) {
           try {
             list.forEach(async (item, idx) => {
+              Object.entries(item).forEach(([key, value]) => !value && delete item[key]);
               this.tasks[item.url] = { status: 'resume', progress: 0, speed: 0, remainingTime: 0, size: 0 };
             });
             const r = await T.post('/download', { list });
@@ -1048,6 +970,7 @@ services:
                 deleteCache: result.value.deleteCache,
                 deleteVideo: result.value.deleteVideo
               });
+
               if (!r.code) {
                 T.toast(r.message || '已删除选中的下载');
                 urls.forEach(url => (delete this.tasks[url]));
@@ -1180,6 +1103,7 @@ services:
         T.reqHeaders.authorization = this.token ? `${this.token}` : '';
         this.fetchConfig().then(d => d && this.wsConnect());
         window.addEventListener('resize', this.handleResize);
+        this.initEventsForApp();
       },
       beforeDestroy() {
         window.removeEventListener('resize', this.handleResize);

package/client/play.html

@@ -2,43 +2,44 @@
 <html lang="zh">
 
 <head>
-    <title>m3u8 在线播放</title>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0,viewport-fit=cover" name="viewport" />
-    <link crossorigin="anonymous" rel="stylesheet" href="https://lib.baomitu.com/dplayer/latest/DPlayer.min.css">
-    <style>
-        body {
-            margin: 0;
-        }
-    </style>
+  <title>M3U8 在线播放</title>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0,viewport-fit=cover"
+    name="viewport" />
+  <style>
+    body {
+      margin: 0;
+    }
+  </style>
 </head>
 
 <body>
-    <div id="dplayer"></div>
-    <script crossorigin="anonymous"
-        integrity="sha512-yi//c0pOEPlBEqUMgK7Ia1VXQT9TwuMHJIRU+T2lyV7YxsMhbF35N/DGYkCFWfC9ebjdupP4xadFyFVTz/sgEg=="
-        src="https://lib.baomitu.com/hls.js/1.3.0/hls.min.js"></script>
-    <script crossorigin="anonymous" src="https://lib.baomitu.com/dplayer/latest/DPlayer.min.js"></script>
+  <div id="dplayer"></div>
+  <script src="https://s4.zstatic.net/ajax/libs/hls.js/1.5.18/hls.min.js"
+    integrity="sha512-hARxLWym80kd0Bzl5/93OuW1ujaKfvmJ90yTKak/RB67JuNIjtErU2H7H3bteyfzMuqiSK0tXarT7eK6lEWBBA=="
+    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://s4.zstatic.net/ajax/libs/dplayer/1.26.0/DPlayer.min.js" crossorigin="anonymous"
+    referrerpolicy="no-referrer"></script>
 
-    <script>
-        const url = location.href.split('url=')[1];
-        if (!url) {
-            document.getElementById('dplayer').innerText = '请传入播放地址参数 url=';
-        } else {
-            const dp = new DPlayer({
-                container: document.getElementById('dplayer'),
-                autoplay: true,
-                video: {
-                    url: decodeURIComponent(url),
-                    type: 'auto',
-                },
-                pluginOptions: {
-                    hls: {},
-                },
-            });
-        }
-    </script>
+  <script>
+    const url = location.href.split('url=')[1];
+    if (!url) {
+      document.getElementById('dplayer').innerText = '请传入播放地址参数 url=';
+    } else {
+      const dp = new DPlayer({
+        container: document.getElementById('dplayer'),
+        autoplay: true,
+        video: {
+          url: decodeURIComponent(url),
+          type: 'auto',
+        },
+        pluginOptions: {
+          hls: {},
+        },
+      });
+    }
+  </script>
 </body>
 
 </html>

package/client/style.css

@@ -0,0 +1,129 @@
+#app {
+  max-width: 1400px;
+  margin: auto;
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  position: relative;
+}
+
+.sidebar {
+  background-color: #fff;
+  box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 16rem;
+  z-index: 1;
+}
+
+.download-item {
+  transition: all 0.3s ease;
+}
+
+.download-item:hover {
+  background-color: #f8f9fa;
+}
+
+.progress-bar {
+  height: 4px;
+  transition: width 0.3s ease;
+}
+
+.nav-item {
+  transition: all 0.3s ease;
+}
+
+.nav-item:hover {
+  background-color: #f0f0f0;
+  transform: translateX(4px);
+}
+
+.nav-item.active {
+  background-color: #e6f3ff;
+  color: #1890ff;
+}
+
+/* 移动端适配 */
+@media (max-width: 768px) {
+  .sidebar {
+    transform: translateX(-100%);
+  }
+
+  .sidebar.show {
+    transform: translateX(0);
+  }
+
+  .menu-toggle {
+    display: block !important;
+  }
+
+  .main-content {
+    margin-left: 0 !important;
+  }
+}
+
+.menu-toggle {
+  display: none;
+  position: fixed;
+  top: 1rem;
+  left: 1rem;
+  z-index: 51;
+  padding: 0.5rem;
+  background: white;
+  border-radius: 0.5rem;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 4px #9bdff5;
+  width: 42px;
+  height: 42px;
+}
+
+.main-content {
+  transition: margin-left 0.3s ease;
+  margin-left: 16rem;
+  width: calc(100% - 16rem);
+}
+
+/* 自定义toast样式 */
+.custom-toast {
+  position: fixed;
+  top: 20px;
+  right: 20px;
+  min-width: 250px;
+  max-width: 400px;
+  padding: 15px 25px 15px 15px;
+  border-radius: 4px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  background: #fff;
+  color: #333;
+  z-index: 99999;
+  display: flex;
+  align-items: center;
+  transform: translateX(150%);
+  transition: transform 0.3s ease;
+}
+
+.custom-toast.show {
+  transform: translateX(0);
+}
+
+.custom-toast.hide {
+  transform: translateX(150%);
+}
+
+.custom-toast-success {
+  border-left: 4px solid #28a745;
+}
+
+.custom-toast-error {
+  border-left: 4px solid #dc3545;
+}
+
+.custom-toast-warning {
+  border-left: 4px solid #ffc107;
+}
+
+.custom-toast-info {
+  border-left: 4px solid #17a2b8;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -44,24 +44,24 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@eslint/js": "^9.28.0",
+    "@biomejs/biome": "^2.0.0",
+    "@eslint/js": "^9.29.0",
     "@lzwme/fed-lint-helper": "^2.6.6",
     "@types/express": "^5.0.3",
     "@types/m3u8-parser": "^7.2.2",
-    "@types/node": "^22.15.30",
+    "@types/node": "^24.0.3",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.34.0",
-    "@typescript-eslint/parser": "^8.34.0",
-    "eslint": "^9.28.0",
+    "@typescript-eslint/eslint-plugin": "^8.34.1",
+    "@typescript-eslint/parser": "^8.34.1",
+    "eslint": "^9.29.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.1",
+    "eslint-plugin-prettier": "^5.5.0",
     "express": "^5.1.0",
     "husky": "^9.1.7",
     "prettier": "^3.5.3",
     "standard-version": "^9.5.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.0",
+    "typescript-eslint": "^8.34.1",
     "ws": "^8.18.2"
   },
   "dependencies": {
@@ -73,7 +73,9 @@
   },
   "files": [
     "cjs",
-    "client",
+    "client/",
+    "!client/ariang",
+    "!client/local",
     "!cjs/type.js",
     "!cjs/cli.d.ts",
     "bin"