npm - @lzwme/m3u8-dl - Versions diffs - 1.5.0 → 1.6.0-0 - Mend

@lzwme/m3u8-dl 1.5.0 → 1.6.0-0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/README.MD +361 -68
package/cjs/cli.js +37 -24
package/cjs/i18n/locales/en.d.ts +108 -0
package/cjs/i18n/locales/en.js +109 -0
package/cjs/i18n/locales/zh.d.ts +108 -0
package/cjs/i18n/locales/zh.js +109 -0
package/cjs/index.d.ts +1 -1
package/cjs/index.js +1 -1
package/cjs/lib/file-download.js +8 -5
package/cjs/lib/getM3u8Urls.d.ts +6 -0
package/cjs/lib/getM3u8Urls.js +45 -27
package/cjs/lib/i18n.d.ts +27 -0
package/cjs/lib/i18n.js +89 -0
package/cjs/lib/m3u8-convert.js +2 -7
package/cjs/lib/m3u8-download.js +36 -15
package/cjs/lib/utils.js +4 -4
package/cjs/server/download-server.d.ts +1 -0
package/cjs/server/download-server.js +111 -39
package/cjs/types/index.d.ts +1 -1
package/cjs/types/index.js +1 -1
package/cjs/types/m3u8.d.ts +4 -2
package/client/assets/main-DYJAIw1q.css +1 -0
package/client/assets/main-XL0wiaDU.js +25 -0
package/client/index.html +4 -1144
package/client/play.html +221 -14
package/package.json +20 -17
package/client/style.css +0 -137

package/client/play.html CHANGED Viewed

@@ -2,14 +2,21 @@
 <html lang="zh">
 <head>
-  <title>M3U8 在线播放</title>
+  <title>M3U8 Player</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 rel="shortcut icon" href="logo.png">
   <style>
     body {
       margin: 0;
+      padding: 0;
+    }
+    #dplayer {
+      width: 100vw;
+      height: 100vh;
     }
   </style>
 </head>
@@ -19,25 +26,225 @@
   <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) {
+    const playUrl = location.href.split('url=')[1];
+    if (!playUrl) {
       document.getElementById('dplayer').innerText = '请传入播放地址参数 url=';
     } else {
-      const dp = new DPlayer({
-        container: document.getElementById('dplayer'),
-        autoplay: true,
-        video: {
-          url: decodeURIComponent(url),
-          type: 'auto',
+      const CDN_CONFIG = {
+        // m3u8Demo: 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
+        dplayer: 'https://s4.zstatic.net/ajax/libs/dplayer/1.26.0/DPlayer.min.js',
+        artplayer: [
+          'https://s4.zstatic.net/ajax/libs/artplayer/5.3.0/artplayer.min.js',
+          // 'https://fastly.jsdelivr.net/npm/artplayer-plugin-hls-control/dist/artplayer-plugin-hls-control.min.js',
+        ],
+      }
+      const T = {
+        data: {
+          playType: playUrl.includes('dplayer') ? 'dplayer' : 'artplayer',
+          videoUrl: decodeURIComponent(playUrl),
+          dpInstance: null,
+          artInstance: null,
+        },
+        play(videoUrl, playType) {
+          if (videoUrl && videoUrl !== T.data.videoUrl) T.data.videoUrl = videoUrl;
+          if (playType && playType !== T.data.playType) T.data.playType = playType;
+          if (!['dplayer', 'artplayer'].includes(T.data.playType)) T.data.playType = 'artplayer';
+          if (T.data.playType === 'dplayer') {
+            return T.dplayer(T.data.videoUrl);
+          } else {
+            return T.artplayer(T.data.videoUrl);
+          }
         },
-        pluginOptions: {
-          hls: {},
+        async loadJS(url) {
+          if (Array.isArray(url)) {
+            for (const u of url) {
+              await T.loadJS(u);
+            }
+            return;
+          }
+          if (document.querySelector(`script[src="${url}"]`)) {
+            return;
+          }
+          return new Promise((resolve, reject) => {
+            const script = document.createElement('script');
+            script.src = url;
+            script.onload = resolve;
+            script.onerror = reject;
+            document.body.appendChild(script);
+          });
+        },
+        sleep(ms) {
+          return new Promise(resolve => setTimeout(resolve, ms));
+        },
+        async dplayer(videoUrl) {
+          if (T.data.dpInstance) {
+            T.data.dpInstance.destroy();
+            T.data.dpInstance = null;
+            await T.sleep(100);
+          } else {
+            await T.loadJS(CDN_CONFIG.dplayer);
+          }
+          const dp = new DPlayer({
+            container: document.getElementById('dplayer'),
+            autoplay: true,
+            airplay: true,
+            theme: '#FADFA3',
+            loop: true,
+            screenshot: true,
+            hotkey: true,
+            chromecast: true,
+            preload: 'auto',
+            playbackSpeed: [0.5, 0.75, 1, 1.25, 1.5, 2, 3, 4, 8],
+            video: {
+              url: videoUrl,
+              type: 'auto',
+            },
+            pluginOptions: {
+              hls: {},
+            },
+            contextmenu: [
+              { text: '在线播放器', link: 'https://m3u8-player.lzw.me' },
+              { text: '在线下载器', link: 'https://m3u8-downloader.lzw.me' },
+            ],
+          });
+          dp.on('ended', () => {
+            console.log('[dplayer]播放完毕', videoUrl);
+            T.next_video();
+          });
+          T.data.dpInstance = dp;
+          return dp;
         },
-      });
+        /** 使用 artplayer 播放 */
+        async artplayer(videoUrl) {
+          if (T.data.artInstance) {
+            T.data.artInstance.destroy();
+            T.data.artInstance = null;
+            await T.sleep(100);
+          } else {
+            await T.loadJS(CDN_CONFIG.artplayer);
+          }
+          const art = new Artplayer({
+            container: document.getElementById('dplayer'),
+            url: videoUrl, // 'https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8',
+            // airplay: true,
+            aspectRatio: true, // 是否显示视频长宽比功能
+            autoplay: true,
+            autoOrientation: true,
+            // autoMini: true, // 当播放器滚动到浏览器视口以外时，自动进入 迷你播放 模式
+            autoPlayback: true,
+            // autoSize: true, // 自动调整播放器尺寸
+            fastForward: true,
+            flip: true, // 是否显示视频翻转功能
+            fullscreen: true, // 是否在底部控制栏里显示播放器 窗口全屏 按钮
+            fullscreenWeb: true, // 是否在底部控制栏里显示播放器 网页全屏 按钮
+            lock: true,
+            miniProgressBar: true,
+            pip: true, // 是否在底部控制栏里显示 画中画 的开关按钮
+            playbackRate: true, // 是否显示视频播放速度功能
+            screenshot: true,
+            setting: true,
+            theme: '#39f',
+            type: videoUrl.includes('mp4') ? 'mp4' : 'm3u8',
+            customType: {
+              m3u8: function playM3u8(video, url, art) {
+                if (Hls.isSupported()) {
+                  if (art.hls) art.hls.destroy();
+                  const hls = new Hls();
+                  hls.loadSource(url);
+                  hls.attachMedia(video);
+                  art.hls = hls;
+                  art.on('destroy', () => hls.destroy());
+                } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
+                  video.src = url;
+                } else {
+                  art.notice.show = 'Unsupported playback format: m3u8';
+                }
+              },
+              flv: function playFlv(video, url, art) {
+                if (flvjs.isSupported()) {
+                  if (art.flv) art.flv.destroy();
+                  const flv = flvjs.createPlayer({ type: 'flv', url });
+                  flv.attachMediaElement(video);
+                  flv.load();
+                  art.flv = flv;
+                  art.on('destroy', () => flv.destroy());
+                } else {
+                  art.notice.show = 'Unsupported playback format: flv';
+                }
+              },
+            },
+            controls: [{
+              name: "previous-button",
+              index: 10,
+              position: "left",
+              html: '<svg fill="none" stroke-width="2" xmlns="http://www.w3.org/2000/svg" height="22" width="22" class="icon icon-tabler icon-tabler-player-track-prev-filled" width="1em" height="1em" viewBox="0 0 24 24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" style="overflow: visible; color: currentcolor;"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M20.341 4.247l-8 7a1 1 0 0 0 0 1.506l8 7c.647 .565 1.659 .106 1.659 -.753v-14c0 -.86 -1.012 -1.318 -1.659 -.753z" stroke-width="0" fill="currentColor"></path><path d="M9.341 4.247l-8 7a1 1 0 0 0 0 1.506l8 7c.647 .565 1.659 .106 1.659 -.753v-14c0 -.86 -1.012 -1.318 -1.659 -.753z" stroke-width="0" fill="currentColor"></path></svg>',
+              tooltip: "Previous",
+              click: function () {
+                T.previous_video()
+              },
+            },
+            {
+              name: "next-button",
+              index: 11,
+              position: "left",
+              html: '<svg fill="none" stroke-width="2" xmlns="http://www.w3.org/2000/svg" height="22" width="22" class="icon icon-tabler icon-tabler-player-track-next-filled" width="1em" height="1em" viewBox="0 0 24 24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" style="overflow: visible; color: currentcolor;"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M2 5v14c0 .86 1.012 1.318 1.659 .753l8 -7a1 1 0 0 0 0 -1.506l-8 -7c-.647 -.565 -1.659 -.106 -1.659 .753z" stroke-width="0" fill="currentColor"></path><path d="M13 5v14c0 .86 1.012 1.318 1.659 .753l8 -7a1 1 0 0 0 0 -1.506l-8 -7c-.647 -.565 -1.659 -.106 -1.659 .753z" stroke-width="0" fill="currentColor"></path></svg>',
+              tooltip: "Next",
+              click: function () {
+                T.next_video()
+              },
+            }],
+            contextmenu: [
+              { html: '在线播放器', click: () => window.open('https://m3u8-player.lzw.me', '_blank') },
+              { html: '在线下载器', click: () => window.open('https://m3u8-downloader.lzw.me', '_blank') },
+            ],
+          });
+          art.on('video:ended', () => {
+            console.log('[artplayer]播放完毕', videoUrl);
+            T.next_video();
+          });
+          // console.log('[artplayer]播放器初始化完成', art);
+          T.data.artInstance = art;
+          return art;
+        },
+        previous_video() {
+          T.postMessage({ action: 'previous', url: T.data.videoUrl, playType: T.data.playType });
+        },
+        next_video() {
+          T.postMessage({ action: 'next', url: T.data.videoUrl, playType: T.data.playType });
+        },
+        postMessage(message) {
+          if (window.sef === window.parent) {
+            return;
+          } else {
+            window.parent.postMessage(message, '*');
+          }
+        },
+        init() {
+          if (window.sef !== window.parent) {
+            // 监听来自父窗口的消息
+            window.addEventListener('message', (event) => {
+              const data = event.data;
+              if (!data) return;
+              if (typeof data === 'object' && data.url) {
+                T.data.videoUrl = data.url;
+                if (data.playType) T.data.playType = data.playType;
+                T.play();
+              }
+            });
+          }
+          return T.play();
+        }
+      };
+      T.init();
+      window.T = T;
     }
   </script>
 </body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lzwme/m3u8-dl",
-  "version": "1.5.0",
+  "version": "1.6.0-0",
   "description": "Batch download of m3u8 files and convert to mp4",
   "main": "cjs/index.js",
   "types": "cjs/index.d.ts",
@@ -16,14 +16,18 @@
     "dev": "npm run watch",
     "watch": "npm run build -- -- -w",
     "lint:flh": "flh --eslint --tscheck --prettier",
-    "lint": "biome lint src",
-    "build": "npm run clean && npm run build:cjs",
+    "lint": "biome lint",
+    "format": "biome format --write",
+    "fix": "biome check --fix",
+    "build": "npm run clean && npm run build:cjs && npm run build:frontend",
     "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:frontend": "pnpm -F @lzwme/m3u8-dl-frontend build",
+    "download-cdn": "node scripts/download-cdn-resources.js",
     "doc": "typedoc src/ --exclude **/*.spec.ts --out docs --tsconfig tsconfig.module.json",
     "version": "standard-version",
     "dist": "npm run build",
     "release": "npm run dist && npm run version",
-    "clean": "flh rm -f ./cjs ./esm ./docs",
+    "clean": "flh rm -f ./cjs ./esm ./docs ./client/assets",
     "test": "npm run lint"
   },
   "bin": {
@@ -44,32 +48,31 @@
     "registry": "https://registry.npmjs.com"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.2.2",
-    "@eslint/js": "^9.34.0",
+    "@biomejs/biome": "^2.3.4",
+    "@eslint/js": "^9.39.1",
     "@lzwme/fed-lint-helper": "^2.6.6",
-    "@types/express": "^5.0.3",
-    "@types/m3u8-parser": "^7.2.3",
-    "@types/node": "^24.3.0",
+    "@types/express": "^5.0.5",
+    "@types/m3u8-parser": "^7.2.5",
+    "@types/node": "^24.10.0",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.41.0",
-    "@typescript-eslint/parser": "^8.41.0",
-    "eslint": "^9.34.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.3",
+    "@typescript-eslint/parser": "^8.46.3",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "express": "^5.1.0",
     "husky": "^9.1.7",
     "prettier": "^3.6.2",
     "standard-version": "^9.5.0",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.41.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.3",
     "ws": "^8.18.3"
   },
   "dependencies": {
-    "@lzwme/fe-utils": "^1.9.0",
-    "commander": "^14.0.0",
+    "@lzwme/fe-utils": "^1.9.2",
+    "commander": "^14.0.2",
     "console-log-colors": "^0.5.0",
     "enquirer": "^2.4.1",
-    "ffmpeg-static": "^5.2.0",
     "m3u8-parser": "^7.2.0"
   },
   "files": [

package/client/style.css DELETED Viewed

@@ -1,137 +0,0 @@
-::placeholder {
-  font-size: 14px;
-}
-.swal2-html-container textarea, input {
-  font-size: 16px !important;
-}
-#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;
-}