l-min-components 1.7.1321 → 1.7.1323

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.7.1321",
+  "version": "1.7.1323",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/useAudioPlayer/index.jsx

@@ -9,7 +9,8 @@ const useAudioPlayer = ({ src, streamSrc }) => {
   const [error, setError] = useState(null);
   const [progress, setProgress] = useState({});
 
-  const audio = useMemo(() => new Audio(), []);
+  const url = useMemo(() => src || streamSrc, [src, streamSrc]);
+  const audio = useMemo(() => new Audio(), [url]);
 
   const { accessToken, generalData } = useContext(OutletContext);
 
@@ -34,15 +35,58 @@ const useAudioPlayer = ({ src, streamSrc }) => {
     }
   }, [isReady, audio]);
 
-  const url = useMemo(() => src || streamSrc, [src, streamSrc]);
-
   useEffect(() => {
     let hls;
 
+    const handleEnded = () => setIsPlaying(false);
+    const handlePause = () => setIsPlaying(false);
+    const handlePlay = () => setIsPlaying(true);
+
+    const handleProgress = () => {
+      if (audio) {
+        const currentTime = audio.currentTime;
+        const duration = audio.duration;
+        setProgress({ currentTime, duration });
+      }
+    };
+
+    const attachAudioEvents = () => {
+      audio.addEventListener("ended", handleEnded);
+      audio.addEventListener("pause", handlePause);
+      audio.addEventListener("playing", handlePlay);
+      audio.addEventListener("timeupdate", handleProgress);
+      audio.addEventListener("loadedmetadata", handleProgress);
+      audio.addEventListener("waiting", () => setIsBuffering(true));
+      audio.addEventListener("canplay", () => setIsBuffering(false));
+    };
+
+    const cleanupAudioEvents = () => {
+      audio.removeEventListener("ended", handleEnded);
+      audio.removeEventListener("pause", handlePause);
+      audio.removeEventListener("playing", handlePlay);
+      audio.removeEventListener("timeupdate", handleProgress);
+      audio.removeEventListener("loadedmetadata", handleProgress);
+      audio.removeEventListener("waiting", () => setIsBuffering(true));
+      audio.removeEventListener("canplay", () => setIsBuffering(false));
+    };
+
     if (audio && accountId) {
-      if (Hls?.isSupported() && streamSrc && !src) {
+      if (src) {
+        // Load src directly — faster, non-stream
+        audio.src = src;
+        const handleMetadata = () => {
+          setIsReady(true);
+          handleProgress();
+          audio.removeEventListener("loadedmetadata", handleMetadata);
+        };
+
+        audio.addEventListener("loadedmetadata", handleMetadata);
+        attachAudioEvents();
+        audio.load();
+      } else if (Hls.isSupported() && streamSrc) {
+        // HLS streaming setup
         hls = new Hls({
-          xhrSetup: function (xhr, url) {
+          xhrSetup: (xhr, url) => {
             const modifiedURL = `${url}?_account=${accountId}`;
             xhr.open("GET", modifiedURL, true);
             xhr.setRequestHeader("Authorization", `Bearer ${accessToken}`);
@@ -50,21 +94,25 @@ const useAudioPlayer = ({ src, streamSrc }) => {
           lowLatencyMode: true,
         });
 
-        hls.loadSource(url);
-        hls?.attachMedia(audio);
+        hls.attachMedia(audio);
 
-        hls.on(Hls?.Events?.MANIFEST_PARSED, () => {
+        hls.on(Hls.Events.MEDIA_ATTACHED, () => {
+          hls.loadSource(url);
+        });
+
+        hls.on(Hls.Events.LEVEL_LOADED, () => {
           setIsReady(true);
           setError(null);
         });
-        hls.on(Hls?.Events?.BUFFER_STALLED, () => {
-          setIsBuffering(true);
-        });
 
-        hls.on(Hls?.Events?.BUFFER_APPENDED, () => {
-          setIsBuffering(false);
+        hls.on(Hls.Events.MANIFEST_PARSED, () => {
+          setIsReady(true);
+          setError(null);
         });
 
+        hls.on(Hls.Events.BUFFER_STALLED, () => setIsBuffering(true));
+        hls.on(Hls.Events.BUFFER_APPENDED, () => setIsBuffering(false));
+
         hls.on(Hls.Events.ERROR, (event, data) => {
           console.warn("HLS error", data);
           if (data.fatal) {
@@ -79,47 +127,29 @@ const useAudioPlayer = ({ src, streamSrc }) => {
             }
           }
         });
-      } else if (!src && audio.canPlayType("application/vnd.apple.mpegurl")) {
+
+        attachAudioEvents();
+      } else if (
+        streamSrc &&
+        audio.canPlayType("application/vnd.apple.mpegurl")
+      ) {
+        // Safari native HLS
         audio.src = url;
         audio.addEventListener("loadedmetadata", () => {
           setIsReady(true);
         });
-      } else {
-        if (audio && src) {
-          audio.src = src;
-          audio.load();
-          setIsReady(true);
-        }
+        attachAudioEvents();
       }
-      const handleEnded = () => setIsPlaying(false);
-      const handlePause = () => setIsPlaying(false);
-      const handlePlay = () => setIsPlaying(true);
-
-      const handleProgress = () => {
-        if (audio) {
-          const currentTime = audio.currentTime;
-          const duration = audio.duration;
-
-          setProgress({ currentTime, duration });
-        }
-      };
-
-      audio.addEventListener("ended", handleEnded);
-      audio.addEventListener("pause", handlePause);
-      audio.addEventListener("playing", handlePlay);
-      audio.addEventListener("timeupdate", handleProgress);
-      audio.addEventListener("loadedmetadata", handleProgress);
-      audio.addEventListener("waiting", () => setIsBuffering(true));
-      audio.addEventListener("canplay", () => setIsBuffering(false));
     }
+
     return () => {
       if (hls) {
         hls.destroy();
       }
-
+      cleanupAudioEvents();
       setIsReady(false);
     };
-  }, [url, accessToken, accountId, audio]);
+  }, [url, accessToken, accountId, audio, src, streamSrc]);
 
   return {
     stop,