@lzwme/m3u8-dl 1.1.0 → 1.1.2

package/cjs/lib/m3u8-convert.js

@@ -17,10 +17,10 @@ async function m3u8Convert(options, data) {
     (0, fe_utils_1.mkdirp)((0, node_path_1.dirname)(filepath));
     if (ffmpegSupport) {
         const ffconcatFile = (0, node_path_1.resolve)((0, node_path_1.dirname)(data[0].tsOut), 'ffconcat.txt');
-        let filesAllArr = data.map(d => (0, node_path_1.resolve)(d.tsOut)).filter(d => (0, node_fs_1.existsSync)(d));
+        let filesAllArr = data.filter(d => (0, node_fs_1.existsSync)(d.tsOut)).map(d => `file '${d.tsOut}'\nduration ${d.duration}`);
         if (process.platform === 'win32')
             filesAllArr = filesAllArr.map(d => d.replaceAll('\\', '/'));
-        (0, node_fs_1.writeFileSync)(ffconcatFile, 'ffconcat version 1.0\nfile ' + filesAllArr.join('\nfile '));
+        (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)) {
@@ -28,13 +28,15 @@ async function m3u8Convert(options, data) {
             }
         }
         // ffmpeg -i nz.ts -c copy -map 0:v -map 0:a -bsf:a aac_adtstoasc nz.mp4
-        const cmd = `ffmpeg -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
+        // const cmd = `ffmpeg -async 1 -y -f concat -safe 0 -i "${ffconcatFile}" -acodec copy -vcodec copy -bsf:a aac_adtstoasc ${headersString} "${filepath}"`;
+        const cmd = `ffmpeg -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}"`;
         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;
         if (r.error)
             utils_1.logger.error('Conversion to mp4 failed. Please confirm that `ffmpeg` is installed!', r.stderr);
-        (0, node_fs_1.unlinkSync)(ffconcatFile);
+        else
+            (0, node_fs_1.unlinkSync)(ffconcatFile);
     }
     if (!ffmpegSupport) {
         filepath = filepath.replace(/\.mp4$/, '.ts');

package/cjs/lib/m3u8-download.js

@@ -185,6 +185,7 @@ async function m3u8Download(url, options = {}) {
             remainingTime: 0,
             localM3u8: (0, local_play_js_1.toLocalM3u8)(m3u8Info.data).replace(options.cacheDir, '').replaceAll(node_path_1.sep, '/').slice(1),
             filename: options.filename,
+            threadNum: options.threadNum,
         };
         const runTask = (data) => {
             for (const info of data) {
@@ -234,6 +235,7 @@ async function m3u8Download(url, options = {}) {
                         if (stats.speed > stats.avgSpeed)
                             stats.remainingTime = stats.remainingTime * (stats.avgSpeed / stats.speed);
                         stats.remainingTime = Math.ceil(stats.remainingTime);
+                        stats.size = stats.downloadedSize * (stats.duration / stats.durationDownloaded);
                     }
                     if (options.showProgress) {
                         const processBar = '='.repeat(Math.floor(stats.progress * 0.2)).padEnd(20, '-');

package/cjs/server/download-server.js

@@ -110,11 +110,10 @@ class DLServer {
                     item.status = 'pause';
                 }
                 else {
-                    const isError = item.status === 'done' && item.options?.convert && (!item.localVideo || !(0, node_fs_1.existsSync)(item.localVideo));
+                    const isError = item.status === 'done' && item.options?.convert !== false && (!item.localVideo || !(0, node_fs_1.existsSync)(item.localVideo));
                     if (isError) {
                         item.status = 'error';
                         item.errmsg = '本地视频文件不存在';
-                        item.localVideo = '';
                     }
                 }
                 this.dlCache.set(url, item);

package/cjs/types/m3u8.d.ts

@@ -83,6 +83,8 @@ export interface M3u8DLProgressStats {
     localVideo?: string;
     /** 本地保存的文件名 */
     filename?: string;
+    /** 并发下载线程数 */
+    threadNum?: number;
     /** 最新的错误信息 */
     errmsg?: string;
 }

package/client/index.html

@@ -155,13 +155,11 @@
                   class="text-blue-500 hover:text-blue-600">https://github.com/lzwme/m3u8-dl.git</a>
               </p>
               <p class="text-gray-600"><strong>问题反馈：</strong>
-                <a href="https://github.com/lzwme/m3u8-dl/issues" target="_blank" rel="noopener"
-                  class="text-blue-500 hover:text-blue-600">
+                <a href="https://github.com/lzwme/m3u8-dl/issues" target="_blank" rel="noopener" class="text-blue-500 hover:text-blue-600">
                   https://github.com/lzwme/m3u8-dl/issues</a>
               </p>
               <p class="text-gray-600"><strong>当前版本：</strong>
-                <a href="https://github.com/lzwme/m3u8-dl/release" target="_blank" rel="noopener"
-                  class="text-blue-500 hover:text-blue-600">
+                <a href="https://github.com/lzwme/m3u8-dl/release" target="_blank" rel="noopener" class="text-blue-500 hover:text-blue-600">
                   {{serverInfo.version}}</a>
               </p>
             </div>
@@ -192,8 +190,7 @@
             <h3 class="text-lg font-medium text-gray-900 mb-2">安装使用</h3>
             <div class="bg-gray-50 p-4 rounded-lg">
               <p class="text-gray-600 mb-2">全局安装：</p>
-              <pre
-                class="bg-gray-800 text-gray-100 p-3 rounded-lg overflow-x-auto">npm i -g @lzwme/m3u8-dl<br>m3u8dl -h</pre>
+              <pre class="bg-gray-800 text-gray-100 p-3 rounded-lg overflow-x-auto">npm i -g @lzwme/m3u8-dl<br>m3u8dl -h</pre>
               <p class="text-gray-600 mt-4 mb-2">使用 npx：</p>
               <pre class="bg-gray-800 text-gray-100 p-3 rounded-lg overflow-x-auto">npx @lzwme/m3u8-dl -h</pre>
             </div>
@@ -259,8 +256,7 @@ services:
               <label class="block text-sm font-bold text-gray-700 mb-1">下载完成后删除ts分片缓存</label>
               <div class="flex items-center mt-2">
                 <label class="inline-flex items-center">
-                  <input type="checkbox" v-model="config.delCache"
-                    class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500">
+                  <input type="checkbox" v-model="config.delCache" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500">
                   <span class="ml-2 text-gray-700">删除分片文件</span>
                 </label>
               </div>
@@ -272,8 +268,7 @@ services:
               <label class="block text-sm font-bold text-gray-700 mb-1">下载完成后转换格式</label>
               <div class="flex items-center mt-2">
                 <label class="inline-flex items-center">
-                  <input type="checkbox" v-model="config.convert"
-                    class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500">
+                  <input type="checkbox" v-model="config.convert" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500">
                   <span class="ml-2 text-gray-700">合并转换为 MP4/TS 文件</span>
                 </label>
               </div>
@@ -324,8 +319,8 @@ services:
             <div>
               <label class="block text-sm font-bold text-gray-700 mb-1">访问密码</label>
               <div class="flex">
-                <input v-model="token" type="password" maxlength="256"
-                  class="w-full p-2 border rounded-lg focus:ring-blue-500" placeholder="请输入访问密码" />
+                <input v-model="token" type="password" maxlength="256" class="w-full p-2 border rounded-lg focus:ring-blue-500"
+                  placeholder="请输入访问密码" />
               </div>
               <p class="mt-1 text-sm text-gray-500">若服务端设置了访问密码(token)，请在此输入</p>
             </div>
@@ -349,8 +344,7 @@ services:
             <div class="flex justify-between items-center">
               <h2 class="text-xl font-semibold">下载任务</h2>
               <div class="flex space-x-2">
-                <button @click="showNewDownloadDialog"
-                  class="px-3 py-1 text-sm bg-blue-500 hover:bg-blue-600 text-white rounded">
+                <button @click="showNewDownloadDialog" class="px-3 py-1 text-sm bg-blue-500 hover:bg-blue-600 text-white rounded">
                   <i class="fas fa-plus mr-1"></i>新建
                 </button>
                 <button v-if="selectedTasks.length > 0" @click="pauseDownload(selectedTasks)"
@@ -383,23 +377,22 @@ services:
               <div class="flex-1">
                 <div class="relative">
                   <input type="text" v-model="searchQuery"
-                    class="w-full pl-10 pr-4 py-2 border rounded-lg focus:ring-blue-500 focus:border-blue-500"
-                    placeholder="搜索任务名称或URL" aria-label="搜索任务">
+                    class="w-full pl-10 pr-4 py-2 border rounded-lg focus:ring-blue-500 focus:border-blue-500" placeholder="搜索任务名称或URL"
+                    aria-label="搜索任务">
                   <i class="fas fa-search absolute left-3 top-3 text-gray-400"></i>
                 </div>
               </div>
               <div class="flex items-center space-x-2">
-                <select v-model="statusFilter"
-                  class="px-3 py-2 border rounded-lg focus:ring-blue-500 focus:border-blue-500" title="按状态筛选"
+                <select v-model="statusFilter" class="px-3 py-2 border rounded-lg focus:ring-blue-500 focus:border-blue-500" title="按状态筛选"
                   aria-label="按状态筛选">
                   <option value="">全部状态</option>
                   <option value="resume">下载中</option>
                   <option value="pending">等待中</option>
                   <option value="pause">已暂停</option>
+                  <option value="error">异常</option>
                   <option value="done">已完成</option>
                 </select>
-                <button @click="clearFilters" class="px-3 py-2 text-gray-600 hover:text-gray-800" title="清除筛选条件"
-                  aria-label="清除筛选条件">
+                <button @click="clearFilters" class="px-3 py-2 text-gray-600 hover:text-gray-800" title="清除筛选条件" aria-label="清除筛选条件">
                   <i class="fas fa-times"></i>
                 </button>
               </div>
@@ -431,32 +424,25 @@ services:
               <div class="flex items-center justify-between mb-2">
                 <div class="flex-1">
                   <div class="flex items-center">
-                    <input type="checkbox" :checked="selectedTasks.includes(task.url)"
-                      @change="toggleTaskSelection(task.url)"
+                    <input type="checkbox" :checked="selectedTasks.includes(task.url)" @change="toggleTaskSelection(task.url)"
                       class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500 mr-2"
                       :aria-label="'选择任务：' + (task.localVideo || task.filename || task.url)">
                     <h3 class="font-bold text-green-600 truncate" :title="task.url">
                       {{ task.localVideo || task.filename || task.url }}
                     </h3>
-                    <span v-if="task.status === 'pending'"
-                      class="ml-2 px-2 py-0.5 text-xs bg-yellow-100 text-yellow-800 rounded">等待中</span>
+                    <span v-if="task.status === 'pending'" class="ml-2 px-2 py-0.5 text-xs bg-yellow-100 text-yellow-800 rounded">等待中</span>
                     <span v-else-if="task.status === 'resume'"
                       class="ml-2 px-2 py-0.5 text-xs bg-green-100 text-green-800 rounded">下载中</span>
-                    <span v-else-if="task.status === 'pause'"
-                      class="ml-2 px-2 py-0.5 text-xs bg-gray-100 text-gray-800 rounded">已暂停</span>
-                    <span v-else-if="task.status === 'done'"
-                      class="ml-2 px-2 py-0.5 text-xs bg-blue-100 text-blue-800 rounded">已完成</span>
-                    <span v-else-if="task.status === 'error'"
-                      class="ml-2 px-2 py-0.5 text-xs bg-red-100 text-red-600 rounded" :title="task.errmsg">异常<i
-                        class="fas fa-info-circle ml-1"></i></span>
+                    <span v-else-if="task.status === 'pause'" class="ml-2 px-2 py-0.5 text-xs bg-gray-100 text-gray-800 rounded">已暂停</span>
+                    <span v-else-if="task.status === 'done'" class="ml-2 px-2 py-0.5 text-xs bg-blue-100 text-blue-800 rounded">已完成</span>
+                    <span v-else-if="task.status === 'error'" class="ml-2 px-2 py-0.5 text-xs bg-red-100 text-red-600 rounded"
+                      :title="task.errmsg">异常<i class="fas fa-info-circle ml-1"></i></span>
                   </div>
                   <div class="flex items-center text-sm text-gray-500 mt-1 flex-wrap gap-2">
-                    <span v-if="config.showPreview" class="text-blue-500 hover:text-blue-600 cursor-pointer"
-                      @click="preview(task.url)">
+                    <span v-if="config.showPreview" class="text-blue-500 hover:text-blue-600 cursor-pointer" @click="preview(task.url)">
                       <i class="fas fa-eye mr-1"></i>预览
                     </span>
-                    <span v-if="config.showLocalPlay" class="text-green-500 hover:text-green-600 cursor-pointer"
-                      @click="localPlay(task)">
+                    <span v-if="config.showLocalPlay" class="text-green-500 hover:text-green-600 cursor-pointer" @click="localPlay(task)">
                       <i class="fas fa-play-circle mr-1"></i>{{ task.localVideo ? '播放' : '边下边播' }}
                     </span>
                     <span v-if="task.duration" class="flex items-center">
@@ -491,17 +477,15 @@ services:
                   </div>
                 </div>
                 <div class="flex space-x-2">
-                  <button v-if="task.status === 'resume' || task.status === 'pending'"
-                    @click="pauseDownload([task.url])" class="p-2 text-yellow-500 hover:bg-yellow-50 rounded"
-                    title="暂停">
+                  <button v-if="task.status === 'resume' || task.status === 'pending'" @click="pauseDownload([task.url])"
+                    class="p-2 text-yellow-500 hover:bg-yellow-50 rounded" title="暂停">
                     <i class="fas fa-pause"></i>
                   </button>
                   <button v-if="task.status === 'pause' || task.status === 'error'" @click="resumeDownload([task.url])"
                     class="p-2 text-green-500 hover:bg-green-50 rounded" title="继续">
                     <i class="fas fa-play"></i>
                   </button>
-                  <button @click="deleteDownload([task.url])" class="p-2 text-red-500 hover:bg-red-50 rounded"
-                    title="删除">
+                  <button @click="deleteDownload([task.url])" class="p-2 text-red-500 hover:bg-red-50 rounded" title="删除">
                     <i class="fas fa-trash"></i>
                   </button>
                 </div>
@@ -524,8 +508,7 @@ services:
             <div v-if="filteredTasks.length === 0" class="p-8 text-center text-gray-500">
               <i class="fas fa-download text-4xl mb-4"></i>
               <p>暂无下载任务</p>
-              <button @click="showNewDownloadDialog"
-                class="mt-4 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600">
+              <button @click="showNewDownloadDialog" class="mt-4 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600">
                 <i class="fas fa-plus mr-1"></i>添加下载任务
               </button>
             </div>
@@ -720,7 +703,7 @@ services:
           const ws = new WebSocket(`ws://${location.host}/ws?token=${this.token}`);
           this.ws = ws;
           ws.onmessage = (e) => {
-            const { type, data } = T.safeJSONParse(e.data);
+            let { type, data } = T.safeJSONParse(e.data);
 
             switch (type) {
               case 'serverInfo':
@@ -877,7 +860,7 @@ services:
           if (typeof urls === 'string') urls = [urls];
           const r = await T.post(`/pause`, { urls, all: urls[0] === 'all' });
           if (!r.code) T.toast(r.message || '已暂停下载');
-          this.tasks[url].status = 'pause';
+          if (urls === this.selectedTasks) this.selectedTasks = [];
         },
         /** 恢复下载 */
         resumeDownload: async function (urls) {
@@ -885,6 +868,60 @@ services:
           if (typeof urls === 'string') urls = [urls];
           const r = await T.post(`/resume`, { urls, all: urls[0] === 'all' });
           if (!r.code) T.toast(r.message || '已恢复下载');
+          if (urls === this.selectedTasks) this.selectedTasks = [];
+        },
+        /** 删除选中的任务 */
+        async deleteDownload(urls = this.selectedTasks) {
+          if (!urls.length) return;
+          try {
+            const result = await Swal.fire({
+              title: '确认删除',
+              html: `
+                <div class="text-left">
+                  <div class="mb-4">
+                    <label class="inline-flex items-center">
+                      <input type="checkbox" id="deleteCache" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500" checked>
+                      <span class="ml-2 text-gray-700">同时删除已下载的缓存</span>
+                    </label>
+                  </div>
+                  <div>
+                    <label class="inline-flex items-center">
+                      <input type="checkbox" id="deleteVideo" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500" checked>
+                      <span class="ml-2 text-red-700">同时删除已下载的视频</span>
+                    </label>
+                  </div>
+                </div>
+              `,
+              showCancelButton: true,
+              confirmButtonText: '确认删除',
+              cancelButtonText: '取消',
+              confirmButtonColor: '#ef4444',
+              focusConfirm: false,
+              preConfirm: () => {
+                return {
+                  deleteCache: document.getElementById('deleteCache').checked,
+                  deleteVideo: document.getElementById('deleteVideo').checked
+                };
+              }
+            });
+
+            if (result.isConfirmed) {
+              const r = await T.post(`/delete`, {
+                urls,
+                deleteCache: result.value.deleteCache,
+                deleteVideo: result.value.deleteVideo
+              });
+              if (!r.code) {
+                T.toast(r.message || '已删除选中的下载');
+                urls.forEach(url => (delete this.tasks[url]));
+                if (urls === this.selectedTasks) this.selectedTasks = [];
+                this.forceUpdate();
+              }
+            }
+          } catch (error) {
+            console.error('删除下载失败:', error);
+            T.alert('删除下载失败: ' + error.message);
+          }
         },
         getTasks: async function () {
           this.tasks = await T.get('/tasks');
@@ -893,17 +930,17 @@ services:
         localPlay: function (task) {
           const url = location.origin + '/localplay/' + encodeURIComponent(task.localVideo || task.localM3u8);
           console.log(task);
-          if (task.localVideo) {
-            Swal.fire({
-              title: task?.options.filename || task.url,
-              width: '1000px',
-              showCloseButton: true,
-              showConfirmButton: false,
-              html: `<video autoplay width="100%" style="max-width: 1000px; min-height: 300px; max-height: 90vh" src="${url}" controls></video> `,
-            });
-          } else {
-            window.open(`http://lzw.me/x/m3u8-player/?url=${encodeURIComponent(url)}`);
-          }
+          // return window.open(`./play.html?url=${encodeURIComponent(url)}`);
+          Swal.fire({
+            title: task?.options.filename || task.url,
+            width: '1000px',
+            padding: 0,
+            allowOutsideClick: false,
+            showCloseButton: true,
+            showConfirmButton: false,
+            html: `<iframe src="./play.html?url=${encodeURIComponent(url)}" style="width: 100%; height: 550px; max-width: 1000px; max-height: 90vh" frameborder="0" allowfullscreen></iframe>`,
+            // html: `<video autoplay width="100%" style="max-width: 1000px; min-height: 300px; max-height: 90vh" src="${url}" controls></video> `,
+          });
         },
         // 预览
         preview: function (url) {
@@ -969,59 +1006,6 @@ services:
             this.selectedTasks.splice(index, 1);
           }
         },
-        /** 删除选中的任务 */
-        async deleteDownload(urls = this.selectedTasks) {
-          if (!urls.length) return;
-          try {
-            const result = await Swal.fire({
-              title: '确认删除',
-              html: `
-                <div class="text-left">
-                  <div class="mb-4">
-                    <label class="inline-flex items-center">
-                      <input type="checkbox" id="deleteCache" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500" checked>
-                      <span class="ml-2 text-gray-700">同时删除已下载的缓存</span>
-                    </label>
-                  </div>
-                  <div>
-                    <label class="inline-flex items-center">
-                      <input type="checkbox" id="deleteVideo" class="form-checkbox h-5 w-5 text-blue-500 rounded focus:ring-blue-500" checked>
-                      <span class="ml-2 text-red-700">同时删除已下载的视频</span>
-                    </label>
-                  </div>
-                </div>
-              `,
-              showCancelButton: true,
-              confirmButtonText: '确认删除',
-              cancelButtonText: '取消',
-              confirmButtonColor: '#ef4444',
-              focusConfirm: false,
-              preConfirm: () => {
-                return {
-                  deleteCache: document.getElementById('deleteCache').checked,
-                  deleteVideo: document.getElementById('deleteVideo').checked
-                };
-              }
-            });
-
-            if (result.isConfirmed) {
-              const r = await T.post(`/delete`, {
-                urls,
-                deleteCache: result.value.deleteCache,
-                deleteVideo: result.value.deleteVideo
-              });
-              if (!r.code) {
-                T.toast(r.message || '已删除选中的下载');
-                urls.forEach(url => (delete this.tasks[url]));
-                this.selectedTasks = [];
-                this.forceUpdate();
-              }
-            }
-          } catch (error) {
-            console.error('删除下载失败:', error);
-            T.alert('删除下载失败: ' + error.message);
-          }
-        },
       },
       mounted() {
         T.reqHeaders.authorization = this.token ? `${this.token}` : '';

package/client/play.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<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>
+</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>
+
+    <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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",