l-min-components 1.7.1485 → 1.7.1486

package/package.json

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

package/src/components/useAudioPlayer/index.jsx

@@ -26,11 +26,10 @@ const useAudioPlayer = ({ src, streamSrc }) => {
   const [error, setError] = useState(null);
   const [progress, setProgress] = useState({});
 
-  const url = useMemo(() => src || streamSrc, [src, streamSrc]);
+  const url = useMemo(() => streamSrc || src, [src, streamSrc]);
   const audio = useMemo(() => new Audio(), [url]);
 
   const { accessToken, generalData } = useContext(OutletContext);
-
   const accountId = generalData?.selectedAccount?.id;
 
   const play = useCallback(() => {
@@ -61,12 +60,13 @@ const useAudioPlayer = ({ src, streamSrc }) => {
     const handlePlay = () => setIsPlaying(true);
     const handleProgress = () => {
       if (audio) {
-        const currentTime = audio.currentTime;
-        const duration = audio.duration;
-
-        setProgress({ currentTime, duration });
+        setProgress({
+          currentTime: audio.currentTime,
+          duration: audio.duration,
+        });
       }
     };
+
     const attachAudioEvents = () => {
       audio.addEventListener("ended", handleEnded);
       audio.addEventListener("pause", handlePause);
@@ -76,15 +76,10 @@ const useAudioPlayer = ({ src, streamSrc }) => {
       audio.addEventListener("waiting", () => setIsBuffering(true));
       audio.addEventListener("canplay", () => setIsBuffering(false));
     };
-    if (audio && src) {
-      audio.src = src;
-      audio.addEventListener("loadedmetadata", () => {
-        setIsReady(true);
-      });
-      attachAudioEvents();
-      audio.load();
-    } else if (audio && accountId) {
-      if (Hls?.isSupported() && streamSrc && !src) {
+
+    if (audio && streamSrc && accountId && !src) {
+      // HLS stream preferred
+      if (Hls.isSupported()) {
         hls = new Hls({
           xhrSetup: function (xhr, url) {
             const modifiedURL = `${url}?_account=${accountId}`;
@@ -94,10 +89,10 @@ const useAudioPlayer = ({ src, streamSrc }) => {
           lowLatencyMode: true,
         });
 
-        hls?.attachMedia(audio);
+        hls.attachMedia(audio);
 
         hls.on(Hls.Events.MEDIA_ATTACHED, () => {
-          hls.loadSource(url);
+          hls.loadSource(streamSrc);
         });
 
         hls.on(Hls.Events.LEVEL_LOADED, () => {
@@ -105,25 +100,6 @@ const useAudioPlayer = ({ src, streamSrc }) => {
           setError(null);
         });
 
-        hls.on(Hls.Events.LEVEL_SWITCHED, (val) => {
-          if (val === "hlsLevelSwitched") {
-            setIsReady(true);
-            setError(null);
-          }
-        });
-        hls.on(Hls.Events.LEVEL_LOADING, (val) => {
-          if (val === "hlsLevelLoading") {
-            setIsReady(false);
-          }
-        });
-        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) {
@@ -138,14 +114,22 @@ const useAudioPlayer = ({ src, streamSrc }) => {
             }
           }
         });
-      } else if (!src && audio.canPlayType("application/vnd.apple.mpegurl")) {
-        audio.src = url;
+      } else if (audio.canPlayType("application/vnd.apple.mpegurl")) {
+        audio.src = streamSrc;
         audio.addEventListener("loadedmetadata", () => {
           setIsReady(true);
         });
       }
       attachAudioEvents();
+    } else if (audio && src) {
+      // Fallback to normal src
+      audio.src = src;
+      audio.addEventListener("loadedmetadata", () => {
+        setIsReady(true);
+      });
+      attachAudioEvents();
     }
+
     return () => {
       if (hls) {
         hls.destroy();