From 337f27fdda72994256eda4e949209d6f95f14fbc Mon Sep 17 00:00:00 2001
From: shiyiya <shiyiya.11@gmail.com>
Date: Sat, 13 Apr 2024 14:00:02 +0800
Subject: [PATCH] see changelog

---
 packages/docs/public/oplayer.html | 53 +++++++++++++++++--------------
 packages/mpegts/package.json      |  2 +-
 packages/mpegts/src/index.ts      | 13 +++++---
 packages/plugins/CHANGELOG.md     |  2 ++
 packages/plugins/package.json     |  2 +-
 packages/plugins/src/playlist.css |  2 +-
 packages/plugins/src/playlist.ts  |  2 +-
 7 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/packages/docs/public/oplayer.html b/packages/docs/public/oplayer.html
index 6dcc1b34..2d75eee7 100644
--- a/packages/docs/public/oplayer.html
+++ b/packages/docs/public/oplayer.html
@@ -211,25 +211,29 @@
 
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/hls@1.2.25-beta.0/dist/index.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@oplayer/dash@1.2.25-beta.1/dist/index.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@oplayer/mpegts@1.2.23/dist/index.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@oplayer/mpegts@1.2.24/dist/index.min.js"></script>
 
-    <script src="https://cdn.jsdelivr.net/npm/@oplayer/plugins@1.0.12-beta.3/dist/airplay.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@oplayer/plugins@1.0.12-beta.5/dist/chromecast.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@oplayer/plugins@1.0.12-beta.6/dist/airplay.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@oplayer/plugins@1.0.12-beta.6/dist/chromecast.min.js"></script>
 
     <script>
-      var playlistScriptCdn = 'https://cdn.jsdelivr.net/npm/@oplayer/plugins@latest/dist/playlist.min.js'
+      var playlistScriptCdn =
+        'https://cdn.jsdelivr.net/npm/@oplayer/plugins@1.0.12-beta.6/dist/playlist.min.js'
       var danmakuScriptCdn = 'https://cdn.jsdelivr.net/npm/@oplayer/danmaku@latest/dist/index.min.js'
 
       var query = document.location.search.substring(1)
       var src, poster, subtitle, danmaku, title, watermark
       var playlist = [],
         deps = [],
-        isM3u = false
-
-      if (query.endsWith('==')) {
-        src = atob(query.substring(0, query.length - 2))
-      } else if (query.startsWith('http')) {
-        src = safeDecodeURIComponent(query.substring(0, query.length - 1))
+        m3u = false,
+        p = 0
+
+      var _query = decodeURIComponent(query || '')
+      if (_query.startsWith('http')) {
+        // ?https://xx.com= 有时候会自动带上 “=”
+        src = _query.endsWith('=') ? _query.substring(0, _query.length - 1) : query
+      } else if (_query.endsWith('=')) {
+        src = atob(_query)
       } else {
         var search = new URLSearchParams(document.location.search)
         src = safeDecodeURIComponent(search.get('src'))
@@ -237,7 +241,8 @@
         poster = safeDecodeURIComponent(search.get('poster'))
         title = safeDecodeURIComponent(search.get('title')) || '❤OPlayer'
         danmaku = safeDecodeURIComponent(search.get('danmaku'))
-        isM3u = Boolean(search.get('m3u'))
+        m3u = safeDecodeURIComponent(search.get('m3u'))
+        p = search.get('p') || 0
 
         subtitle = search.get('subtitle')
           ? {
@@ -267,9 +272,9 @@
           : undefined
       }
 
-      if (/m3u(#|\?|$)/i.test(src) || isM3u) {
-        playlist = [{ title: '-', src, poster }]
-        isM3u = true
+      if (/m3u(#|\?|$)/i.test(src) || m3u) {
+        playlist = [{ title: '-', src: typeof m3u == 'string' ? m3u : src, poster }]
+        m3u = true
         src = undefined
         deps.push(['https://cdn.jsdelivr.net/npm/m3u8-parser@7.1.0/dist/m3u8-parser.min.js'])
       }
@@ -328,7 +333,7 @@
             library: 'https://cdn.jsdelivr.net/npm/hls.js@0.14.17/dist/hls.min.js'
           }),
           ODash({ library: 'https://cdn.dashjs.org/latest/dash.all.min.js' }),
-          OMpegts(),
+          OMpegts({ library: 'https://cdn.jsdelivr.net/npm/mpegts.js/dist/mpegts.min.js' }),
           new OAirplay(),
           new OChromecast()
         ])
@@ -342,22 +347,24 @@
             OPlaylist.m3u8Parser = m3u8Parser
             player.applyPlugin(
               new OPlaylist({
-                initialIndex: 0,
+                initialIndex: p,
+                autoHide: false,
                 sources: playlist,
-                m3uList: isM3u
+                m3uList: m3u
                   ? {
                       sourceFormat(info) {
                         try {
-                          const chunk = info.title.substring(3).split(' ')
-                          const titleWith = chunk.find((it) => it.includes('title')).split('=')[1]
-                          const posterWith = chunk.find((it) => it.includes('logo'))?.split('=')[1]
+                          const chunk = info.title.substring(3).split('" ')
+                          const titleWith = /group-title="(.+",.+)/.exec(info.title)
+                          const posterWith = /tvg-logo="(.+)"/.exec(info.title)
                           return {
                             src: info.uri,
-                            title: titleWith.substring(1, titleWith.length),
-                            poster: posterWith?.substring(1, posterWith.length)
+                            format: 'm3u8',
+                            title: titleWith ? titleWith[1] : /group-title="(.+)"/.exec(info.title)[1],
+                            poster: posterWith && posterWith[1]
                           }
                         } catch (error) {
-                          return { src: info.uri, title: info.title }
+                          return { src: info.uri, title: info.title, format: 'm3u8' }
                         }
                       }
                     }
diff --git a/packages/mpegts/package.json b/packages/mpegts/package.json
index df94dec1..f605b4f2 100644
--- a/packages/mpegts/package.json
+++ b/packages/mpegts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oplayer/mpegts",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "description": "mpegts.js plugin for oplayer",
   "type": "module",
   "main": "./dist/index.es.js",
diff --git a/packages/mpegts/src/index.ts b/packages/mpegts/src/index.ts
index f9755e8a..8be36d81 100644
--- a/packages/mpegts/src/index.ts
+++ b/packages/mpegts/src/index.ts
@@ -1,4 +1,4 @@
-import type { Player, PlayerPlugin, Source, PartialRequired } from '@oplayer/core'
+import { type Player, type PlayerPlugin, type Source, type PartialRequired, loadSDK } from '@oplayer/core'
 import type Mpegts from 'mpegts.js'
 
 const PLUGIN_NAME = 'oplayer-plugin-mpegts'
@@ -14,6 +14,7 @@ export type Active = (
 export type MpegtsPluginOptions = {
   config?: Partial<Mpegts.Config>
   matcher?: Matcher
+  library?: string
 }
 
 const REG = /flv|ts|m2ts(#|\?|$)/i
@@ -52,12 +53,16 @@ class MpegtsPlugin implements PlayerPlugin {
   }
 
   async load({ $video, options }: Player, source: Source) {
-    const { matcher } = this.options
+    const { matcher, library } = this.options
 
     if (!matcher($video, source)) return false
 
-    //@ts-ignore
-    MpegtsPlugin.library ??= (await import('mpegts.js/dist/mpegts.js')).default
+    if (!MpegtsPlugin.library) {
+      MpegtsPlugin.library =
+        (globalThis as any).mpegts ||
+        //@ts-expect-error
+        (library ? await loadSDK(library, 'mpegts') : (await import('mpegts.js/dist/mpegts.js')).default)
+    }
 
     if (!MpegtsPlugin.library.isSupported()) return false
 
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index 28e32edb..fec7e8b6 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## UnRelease
 
+- playlist: fix error scroll position
+
 ## 1.0.12-beta.3
 
 - vtt thumbnails: `prefix` options
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 38524853..7afc98d6 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oplayer/plugins",
-  "version": "1.0.12-beta.5",
+  "version": "1.0.12-beta.6",
   "author": "shiyiya",
   "description": "oplayer's plugin",
   "homepage": "https://github.com/shiyiya/oplayer",
diff --git a/packages/plugins/src/playlist.css b/packages/plugins/src/playlist.css
index abe943f2..1f375cb7 100644
--- a/packages/plugins/src/playlist.css
+++ b/packages/plugins/src/playlist.css
@@ -79,7 +79,7 @@
 }
 
 .playlist-list::-webkit-scrollbar {
-  width: 3px;
+  width: 0.3em;
 }
 
 .playlist-list::-webkit-scrollbar-thumb {
diff --git a/packages/plugins/src/playlist.ts b/packages/plugins/src/playlist.ts
index 8cf08401..d76c8efa 100644
--- a/packages/plugins/src/playlist.ts
+++ b/packages/plugins/src/playlist.ts
@@ -245,7 +245,7 @@ export default class PlaylistPlugin implements PlayerPlugin {
         const list = this.$root.querySelector('.playlist-list')!
         const active = this.$root.querySelector<HTMLDivElement>('.playlist-source__active')
         if (active && list.scrollHeight > 0 && this.currentIndex) {
-          list.scrollTo(0, active.offsetHeight * this.currentIndex)
+          list.scrollTo(0, active.offsetTop - active.offsetHeight)
         }
       }
     })