@lzwme/m3u8-dl 1.3.0 → 1.3.1

package/cjs/cli.js

@@ -89,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/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");
@@ -50,9 +51,10 @@ class DLServer {
     /** 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: '',
@@ -102,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');
@@ -195,6 +197,7 @@ class DLServer {
                 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);
@@ -248,16 +251,16 @@ class DLServer {
     startDownload(url, options) {
         const dlOptions = (0, format_options_js_1.formatOptions)(url, { ...this.cfg.dlOptions, ...options, cacheDir: this.options.cacheDir })[1];
         const cacheItem = this.dlCache.get(url) || { options, dlOptions, status: 'pending', url };
-        utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem?.status);
+        utils_js_1.logger.debug('startDownload', url, dlOptions, cacheItem.status);
         if (cacheItem.status === 'resume')
             return cacheItem.options;
-        if (this.downloading >= this.cfg.webOptions.maxDownloads) {
-            cacheItem.status = 'pending';
-            this.dlCache.set(url, cacheItem);
-            return cacheItem.options;
-        }
-        cacheItem.status = 'resume';
+        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,
@@ -291,12 +294,10 @@ 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]);
             }
         };
         try {
@@ -323,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 => {
@@ -484,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;
@@ -495,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/client/index.html

@@ -6,7 +6,7 @@
   <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">
   <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=="
@@ -406,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>
 
@@ -513,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));
@@ -602,6 +613,8 @@ services:
         serverInfo: {
           version: '{{version}}',
           ariang: false,
+          newVersion: '',
+          appUpdateMessage: '',
         },
         config: {
           /** 并发下载线程数。取决于服务器限制，过多可能会容易下载失败。一般建议不超过 8 个。默认为 cpu数 * 2，但不超过 8 */
@@ -661,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 = {
@@ -682,6 +695,38 @@ 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) {
@@ -705,7 +750,7 @@ services:
 
             switch (type) {
               case 'serverInfo':
-                this.serverInfo = data;
+                Object.assign(this.serverInfo, data);
                 break;
               case 'tasks':
                 this.tasks = data;
@@ -1058,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.3.0",
+  "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": "^24.0.1",
+    "@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": {