@lazycatcloud/lzc-video-player 0.0.35 → 0.0.36

package/dist/lzc-video-player.js

@@ -51463,6 +51463,12 @@ const getFrame = (t) => t ? client$2.getFileDownloadLink(t) : EmptySvg, addFrame
     getters: {
       getHistoryInfo(r) {
         return (a) => r.infos.find((n) => n.sourceUrl === a);
+      },
+      getHistoryInfoByPath(r) {
+        return (a) => r.infos.find((n) => {
+          if (n.path && n.path === a)
+            return n;
+        });
       }
     },
     actions: {
@@ -53307,7 +53313,7 @@ const QItem = createComponent({
     }, s = (u, l) => {
       var c, d, f;
       return (c = a.value) != null && c.auto ? u.id == "auto" : (d = a.value) != null && d.origin ? u.id === "origin" : Math.min(u.height, u.width) === ((f = a.value) == null ? void 0 : f.res) && l > 0;
-    }, o = (u) => u.id === "origin" ? "\u539F\u59CB\u753B\u8D28" : u.id === "auto" ? "\u81EA\u52A8" : `${u.id} P`;
+    }, o = (u) => u.id === "origin" ? "\u539F\u59CB\u753B\u8D28" : u.id === "auto" ? "\u81EA\u52A8" : `${u.height} P`;
     return (u, l) => (openBlock(), createBlock(SimpleList, {
       items: unref(r),
       isActive: s,
@@ -87183,16 +87189,6 @@ const previewConfig = {
   tile: 4,
   len: 16
 };
-function isNetdiskSource(t, e = !1) {
-  return e ? !0 : !(t.startsWith("http") || t.startsWith("blob"));
-}
-function filenameByUrl(t, e) {
-  e = e.split("?")[0];
-  let r = new RegExp(`${t}/hls/(.*?)/master.m3u8$`, "i"), a = e.match(r);
-  if (a && a.length >= 2 || (a = e.match(/_lzc\/files\/home\/(.*?)$/i), a && a.length >= 2))
-    return a[1];
-  throw "invalid netdisk file url";
-}
 function clearUrl(t) {
   return t.startsWith("/") ? t.substring(1) : t.startsWith("%2F") ? t.substring(3) : t;
 }
@@ -87203,11 +87199,11 @@ function useVideoPreview(t, e) {
       e.currentTime() / (previewConfig.len * previewConfig.interval)
     );
   }
-  function s(c = 0) {
-    const d = c * previewConfig.len * previewConfig.interval, f = e.src();
+  function s(c, d = 0) {
+    const f = d * previewConfig.len * previewConfig.interval, p = c.path;
     return `${t}/screenshot/${clearUrl(
-      f
-    )}?start=${d}`;
+      p
+    )}?start=${f}`;
   }
   function o(c) {
     if (a)
@@ -87217,13 +87213,16 @@ function useVideoPreview(t, e) {
     );
     if (c > d)
       return;
-    const f = s(c);
-    if (r.has(f))
+    const f = e.currentVideoInfo();
+    if (!f.fromNetdisk && !f.path)
+      return;
+    const p = s(f, c);
+    if (r.has(p))
       return o(c + 1);
-    console.log("load video preview: ", c, f);
-    const p = new Image();
-    p.src = f, a = !0, p.onload = () => {
-      r.set(f, p), a = !1;
+    console.log("load video preview: ", c, p);
+    const g = new Image();
+    g.src = p, a = !0, g.onload = () => {
+      r.set(p, g), a = !1;
     };
   }
   function u() {
@@ -87231,8 +87230,11 @@ function useVideoPreview(t, e) {
     return o(c);
   }
   function l() {
-    const c = n(), d = s(c);
-    return r.get(d);
+    const c = n(), d = e.currentVideoInfo();
+    if (!d.fromNetdisk && !d.path)
+      return;
+    const f = s(d, c);
+    return r.get(f);
   }
   return { loadPreview: u, getPreview: l, currentPage: n };
 }
@@ -87251,7 +87253,7 @@ function useSource(t) {
   async function u(g) {
     getFileLinkWithDefault(g._id).then((m) => {
       t.poster(m);
-    }), t.src(g.sourceUrl), g.name && (e = g.name), isNetdiskSource(g.sourceUrl, g.fromNetdisk) && !LzcApp.isTvOsWebShell() && t.on(
+    }), t.src(g.sourceUrl), g.name && (e = g.name), g.fromNetdisk && !LzcApp.isTvOsWebShell() && t.on(
       "timeupdate",
       lodash_throttle(() => {
         (t.networkState() == 1 || t.networkState() == 2) && n.loadPreview();
@@ -87275,20 +87277,19 @@ function useSource(t) {
       image: g
     };
   }
-  t.currentSrc.bind(t), t.currentSrc = function() {
-    const g = decodeURI(f());
-    return isNetdiskSource(g) ? "/" + clearUrl(decodeURIComponent(filenameByUrl(a, g))) : g;
-  };
   const f = t.src.bind(t);
   function p(g) {
     if (!g)
       return f();
-    const m = (y, E = "") => isNetdiskSource(y) ? {
-      src: `${a}/hls/${clearUrl(y)}/master.m3u8`,
-      type: "application/x-mpegURL"
-    } : {
-      src: y,
-      type: E
+    const m = (y, E = "") => {
+      const I = t.currentVideoInfo();
+      return I.fromNetdisk && I.path || y.startsWith("/") && !y.startsWith(a) ? {
+        src: `${a}/hls/${clearUrl(I.path || y)}/master.m3u8`,
+        type: "application/x-mpegURL"
+      } : {
+        src: y,
+        type: E
+      };
     };
     let v = [];
     Array.isArray(g) ? v = g.map((y) => m(y.src, y.type)) : typeof g == "string" ? v.push(m(g, "")) : v.push(m(g.src, g.type)), f(v);
@@ -87322,7 +87323,12 @@ function useSource(t) {
     }
   }, t.on("openVideo", async (g) => {
     const m = g.info;
-    e = m.name, t.isCastMode() || (console.debug("openVideo: ", m), await u(m), t.isNetdiskSource = () => isNetdiskSource(t.src(), m.fromNetdisk), m.duration - m.currentTime > 3 && t.one("canplay", function() {
+    e = m.name, t.currentVideoInfo = () => ({
+      ...m,
+      duration: t.duration(),
+      currentTime: t.currentTime(),
+      name: t.currentVideoName()
+    }), t.isCastMode() || (console.debug("openVideo: ", m), await u(m), t.isNetdiskSource = () => !!m.fromNetdisk, m.duration - m.currentTime > 3 && t.one("canplay", function() {
       t.currentTime(m.currentTime);
     }));
   }), t.currentVideoName = c, t.currentPreview = d, t.isCastMode = function() {
@@ -87332,7 +87338,7 @@ function useSource(t) {
     t.one("loadedmetadata", function() {
       g != null && o(g), t.currentTime(m);
     }), t.src(t.currentSource()), t.play();
-  }, t.init = u;
+  };
 }
 function unrefElement(t) {
   var e;
@@ -87463,33 +87469,26 @@ const _hoisted_1 = ["onClick"], _sfc_main = /* @__PURE__ */ defineComponent({
       c.name = "referrer", c.content = "no-referrer", document.head.append(c), n = videojs(s.value, u()), useSource(n), n.dimensions(window.innerWidth, window.innerHeight), n.poster(r.poster);
       const d = new LzcModal(n);
       n.addChild(d), n.lzcModal = () => d, n.enableTouchActivity();
-      const f = () => ({
-        _id: "",
-        sourceUrl: n.src(),
-        duration: n.duration(),
-        currentTime: n.currentTime(),
-        name: n.currentVideoName(),
-        invalid: !1
-      }), p = async (m) => {
+      const f = async (g) => {
         if (n.isDisposed()) {
           console.debug("skip update because player already disposed.");
           return;
         }
-        let v = null;
-        m && (v = () => makeVideoFrame(n)), l.updateOrCreateHistory(f(), v);
-      }, g = lodash_debounce(() => p(!1), 5e3, {
+        let m = null;
+        g && (m = () => makeVideoFrame(n)), l.updateOrCreateHistory(n.currentVideoInfo(), m);
+      }, p = lodash_debounce(() => f(!1), 5e3, {
         maxWait: 15e3
       });
       r.options && r.options.preload == "auto" && n.load(), n.on("back", () => {
         n.dispose(), e("back");
-      }), n.on("seeked", g), n.on("pause", () => p(!0)), n.on("timeupdate", g), n.on("userinactive", () => {
+      }), n.on("seeked", p), n.on("pause", () => f(!0)), n.on("timeupdate", p), n.on("userinactive", () => {
         document.body.style.cursor = "none";
       }), n.on("useractive", () => {
         document.body.style.cursor = "default";
       }), n.one("canplay", () => {
-        var m;
-        (m = r.options) != null && m.autoplay && n.play(), p(!0);
-      }), console.log("player", n), r.onInit && r.onInit(n), window.videojs = videojs, videojs.log.level("debug"), window.player = n;
+        var g;
+        (g = r.options) != null && g.autoplay && n.play(), f(!0);
+      }), console.log("player", n), r.onInit && r.onInit(n), window.videojs = videojs, window.player = n;
     }), onUnmounted(() => {
       n.isDisposed() || n.dispose();
     }), (l, c) => (openBlock(), createElementBlock("div", {

package/dist/model.d.ts

@@ -32,4 +32,5 @@ export interface VideoInfo extends Doc {
     invalid: boolean;
     updateTime?: number;
     fromNetdisk?: boolean;
+    path?: string;
 }

package/dist/stores/playlist.d.ts

@@ -30,6 +30,7 @@ export declare const useHistoryInfo: () => import("pinia").Store<"historyInfo",
             invalid: boolean;
             updateTime?: number | undefined;
             fromNetdisk?: boolean | undefined;
+            path?: string | undefined;
             _id: string;
         }[];
     } & import("pinia").PiniaCustomStateProperties<{
@@ -43,6 +44,50 @@ export declare const useHistoryInfo: () => import("pinia").Store<"historyInfo",
         invalid: boolean;
         updateTime?: number | undefined;
         fromNetdisk?: boolean | undefined;
+        path?: string | undefined;
+        _id: string;
+    } | undefined;
+    getHistoryInfoByPath(state: {
+        collection: {
+            find: (selector: Record<string, any>, options?: import("@lazycatcloud/minidb/dist/remoteDB").CollectionFindOptions | undefined) => {
+                fetch: () => Promise<VideoInfo[]>;
+            };
+            findOne: (selector: Record<string, any>, options?: import("@lazycatcloud/minidb/dist/remoteDB").CollectionFindOptions | undefined) => Promise<VideoInfo | null>;
+            upsertOrUpdate: (selector: Record<string, any>, doc: VideoInfo, options?: import("@lazycatcloud/minidb/dist/remoteDB").CollectionFindOptions | undefined) => Promise<VideoInfo | null>;
+            upsert: {
+                (doc: VideoInfo): Promise<VideoInfo | null>;
+                (doc: VideoInfo, base: VideoInfo | null | undefined): Promise<VideoInfo | null>;
+                (docs: VideoInfo[]): Promise<(VideoInfo | null)[]>;
+                (docs: VideoInfo[], bases: (VideoInfo | null | undefined)[]): Promise<(VideoInfo | null)[]>;
+            };
+            remove: {
+                (id: any): Promise<void>;
+                (ids: any[]): Promise<void>;
+            };
+        };
+        infos: {
+            sourceUrl: string;
+            name: string;
+            duration: number;
+            currentTime: number;
+            invalid: boolean;
+            updateTime?: number | undefined;
+            fromNetdisk?: boolean | undefined;
+            path?: string | undefined;
+            _id: string;
+        }[];
+    } & import("pinia").PiniaCustomStateProperties<{
+        collection: RemoteDB<VideoInfo>;
+        infos: VideoInfo[];
+    }>): (path: string) => {
+        sourceUrl: string;
+        name: string;
+        duration: number;
+        currentTime: number;
+        invalid: boolean;
+        updateTime?: number | undefined;
+        fromNetdisk?: boolean | undefined;
+        path?: string | undefined;
         _id: string;
     } | undefined;
 }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-video-player",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "",
   "type": "module",
   "main": "dist/lzc-video-player.js",