@lzwme/m3u8-dl 1.1.2 → 1.1.3

package/cjs/server/download-server.js

@@ -405,9 +405,9 @@ class DLServer {
             const urlsToPause = all ? [...this.dlCache.keys()] : urls;
             const list = [];
             for (const url of urlsToPause) {
-                const item = this.dlCache.get(url);
+                const { workPoll, ...item } = this.dlCache.get(url);
                 if (item?.status === 'resume') {
-                    (0, m3u8_download_js_1.m3u8DLStop)(url, item.workPoll);
+                    (0, m3u8_download_js_1.m3u8DLStop)(url, workPoll);
                     item.status = item.tsSuccess === item.tsCount ? 'done' : 'pause';
                     list.push(item);
                 }
@@ -422,7 +422,7 @@ class DLServer {
             const urlsToResume = all ? [...this.dlCache.keys()] : urls;
             const list = [];
             for (const url of urlsToResume) {
-                const item = this.dlCache.get(url);
+                const { workPoll, ...item } = this.dlCache.get(url);
                 if (['pause', 'error'].includes(item?.status)) {
                     this.startDownload(url, item.options);
                     list.push(item);
@@ -445,6 +445,7 @@ class DLServer {
                 if (item) {
                     (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))
@@ -457,12 +458,11 @@ class DLServer {
                                 (0, node_fs_1.unlinkSync)(filepath);
                         });
                     }
-                    list.push(item);
                 }
             }
             const count = list.length;
             if (count)
-                this.wsSend('progress', list);
+                this.wsSend('delete', list);
             res.json({ message: `已删除 ${count} 个下载任务`, code: 0, count });
         });
         app.get(/^\/localplay\/(.*)$/, (req, res) => {

package/client/index.html

@@ -719,6 +719,9 @@ services:
                   // this.forceUpdate();
                 });
                 break;
+              case 'delete':
+                if (Array.isArray(data)) data.forEach(url => delete this.tasks[url]);
+                break;
               case 'queueStatus':
                 this.queueStatus = data;
                 break;
@@ -928,7 +931,7 @@ services:
         },
         /** 边下边播 */
         localPlay: function (task) {
-          const url = location.origin + '/localplay/' + encodeURIComponent(task.localVideo || task.localM3u8);
+          const url = location.origin + '/localplay/' + (task.localVideo || task.localM3u8);
           console.log(task);
           // return window.open(`./play.html?url=${encodeURIComponent(url)}`);
           Swal.fire({

package/package.json

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