@exode-team/react-recorder 1.1.10 → 1.1.11

package/dist/hooks/useAudioBlobLoader.d.ts

@@ -11,12 +11,16 @@ interface UseAudioBlobLoaderOptions {
     preloadedBlob?: Blob | null;
     playbackCallbacks: PlaybackCallbacks;
 }
+interface EnsureAudioLoadedOptions {
+    /** Retry a src that already failed — only on explicit user intent, not on auto-prefetch */
+    retryFailed?: boolean;
+}
 interface UseAudioBlobLoaderResult {
     audioRef: React.MutableRefObject<HTMLAudioElement | null>;
     isLoading: boolean;
     isLoaded: boolean;
     waveformLevels: number[];
-    ensureAudioLoaded: () => Promise<void>;
+    ensureAudioLoaded: (options?: EnsureAudioLoadedOptions) => Promise<void>;
 }
 declare const useAudioBlobLoader: (options: UseAudioBlobLoaderOptions) => UseAudioBlobLoaderResult;
 export { useAudioBlobLoader };

package/dist/hooks/useAudioBlobLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAudioBlobLoader.d.ts","sourceRoot":"","sources":["../../src/hooks/useAudioBlobLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYrD,UAAU,yBAAyB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC5B,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,UAAU,wBAAwB;IAC9B,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IAC1D,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,QAAA,MAAM,kBAAkB,GAAI,SAAS,yBAAyB,KAAG,wBA2IhE,CAAC;AAGF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"useAudioBlobLoader.d.ts","sourceRoot":"","sources":["../../src/hooks/useAudioBlobLoader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYrD,UAAU,yBAAyB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC5B,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,UAAU,wBAAwB;IAC9B,2FAA2F;IAC3F,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,wBAAwB;IAC9B,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IAC1D,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5E;AAED,QAAA,MAAM,kBAAkB,GAAI,SAAS,yBAAyB,KAAG,wBA4KhE,CAAC;AAGF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/index.cjs

@@ -191,6 +191,64 @@ const TIMELINE_BAR_GAP = 2;
 const TIMELINE_BAR_MIN_HEIGHT = 3;
 const TIMELINE_BAR_MAX_HEIGHT = 24;
 
+/**
+ * MPEG frame scanner
+ *
+ * @author: exode <hello@exode.ru>
+ */
+const MPEG_LAYER_III = 1;
+const MPEG_SAMPLE_RATES = [44100, 48000, 32000];
+const MPEG_BITRATES_V1 = [0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0];
+const MPEG_BITRATES_V2 = [0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0];
+/** Length of the Layer III frame at the given offset, or 0 when it is not one */
+const readFrameLength = (bytes, offset) => {
+    if (offset + 3 >= bytes.length || bytes[offset] !== 0xff || (bytes[offset + 1] & 0xe0) !== 0xe0) {
+        return 0;
+    }
+    /** Version ids: 0 = MPEG 2.5, 1 = reserved, 2 = MPEG 2, 3 = MPEG 1 */
+    const version = (bytes[offset + 1] >> 3) & 0x03;
+    const layer = (bytes[offset + 1] >> 1) & 0x03;
+    const bitrateIndex = (bytes[offset + 2] >> 4) & 0x0f;
+    const sampleRateIndex = (bytes[offset + 2] >> 2) & 0x03;
+    const isReserved = version === 1
+        || layer !== MPEG_LAYER_III
+        || sampleRateIndex === 3
+        || bitrateIndex === 0
+        || bitrateIndex === 0x0f;
+    if (isReserved) {
+        return 0;
+    }
+    const isVersion1 = version === 3;
+    const padding = (bytes[offset + 2] >> 1) & 0x01;
+    const bitrate = (isVersion1 ? MPEG_BITRATES_V1 : MPEG_BITRATES_V2)[bitrateIndex] * 1000;
+    const sampleRate = MPEG_SAMPLE_RATES[sampleRateIndex] / (isVersion1 ? 1 : version === 2 ? 2 : 4);
+    return Math.floor((isVersion1 ? 144 : 72) * bitrate / sampleRate) + padding;
+};
+/**
+ * Some mp3 (e.g. converted from wma) keep junk between the ID3 tag and the
+ * first MPEG frame: media elements skip it, the WebAudio decoder does not.
+ * Returns the offset of the first real frame, or 0 when there is none.
+ */
+const findFirstFrameOffset = (bytes) => {
+    let start = 0;
+    /** ID3v2 header: "ID3" + version + flags + 4 syncsafe size bytes */
+    if (bytes.length >= 10 && bytes[0] === 0x49 && bytes[1] === 0x44 && bytes[2] === 0x33) {
+        start = 10 + ((bytes[6] << 21) | (bytes[7] << 14) | (bytes[8] << 7) | bytes[9]);
+        /** ID3v2.4 may append a 10 byte footer copy of the header */
+        if (bytes[5] & 0x10) {
+            start += 10;
+        }
+    }
+    for (let i = start; i < bytes.length - 3; i += 1) {
+        const length = readFrameLength(bytes, i);
+        /** Junk can open with a valid looking header, so require the next frame to follow */
+        if (length && readFrameLength(bytes, i + length)) {
+            return i;
+        }
+    }
+    return 0;
+};
+
 /**
  * Audio analyzer platform adapter
  *
@@ -217,11 +275,24 @@ const readFrequencyLevels = (analyser, barCount = AUDIO_LEVEL_BARS) => {
     }
     return levels;
 };
+/** decodeAudioData detaches the buffer, so the retry re-reads the blob */
+const decodeSkippingJunk = async (context, blob) => {
+    try {
+        return await context.decodeAudioData(await blob.arrayBuffer());
+    }
+    catch (error) {
+        const bytes = new Uint8Array(await blob.arrayBuffer());
+        const offset = findFirstFrameOffset(bytes);
+        if (!offset) {
+            throw error;
+        }
+        return context.decodeAudioData(bytes.buffer.slice(offset));
+    }
+};
 const decodeAudioLevels = async (blob, barCount = AUDIO_LEVEL_BARS) => {
     const context = new AudioContext();
     try {
-        const arrayBuffer = await blob.arrayBuffer();
-        const audioBuffer = await context.decodeAudioData(arrayBuffer);
+        const audioBuffer = await decodeSkippingJunk(context, blob);
         const channelData = audioBuffer.getChannelData(0);
         if (!channelData.length) {
             return Array.from({ length: barCount }, () => 0);
@@ -258,6 +329,9 @@ const fetchAudioBlob = async (url, signal) => {
         mode: 'cors',
         credentials: 'omit',
     });
+    if (!response.ok) {
+        throw new Error(`Failed to fetch audio: ${response.status}`);
+    }
     return response.blob();
 };
 
@@ -890,7 +964,10 @@ const useAudioBlobLoader = (options) => {
     const objectUrlRef = React.useRef(null);
     const abortControllerRef = React.useRef(null);
     const failedSrcRef = React.useRef(null);
+    const waveformTokenRef = React.useRef(0);
+    const waveformDataRef = React.useRef(waveformData);
     const callbacksRef = React.useRef(playbackCallbacks);
+    waveformDataRef.current = waveformData;
     callbacksRef.current = playbackCallbacks;
     const createAudioFromBlob = React.useCallback((blob) => {
         if (objectUrlRef.current) {
@@ -913,15 +990,33 @@ const useAudioBlobLoader = (options) => {
         audioRef.current = audio;
         setIsLoaded(true);
     }, []);
+    /**
+     * Waveform is cosmetic: some files (e.g. mp3 with junk before the first
+     * frame) fail to decode in Safari while playing fine, so a decode error
+     * must never block playback. Token keeps only the latest decode.
+     */
+    const applyWaveformLevels = React.useCallback(async (blob) => {
+        if (waveformData) {
+            return;
+        }
+        waveformTokenRef.current += 1;
+        const token = waveformTokenRef.current;
+        try {
+            const levels = await decodeAudioLevels(blob);
+            if (token === waveformTokenRef.current) {
+                setWaveformLevels(levels);
+            }
+        }
+        catch (error) {
+            console.warn('[voice-player] Failed to decode waveform', error);
+        }
+    }, [waveformData]);
     const mountFromBlob = React.useCallback(async (blob) => {
         if (audioRef.current) {
             return;
         }
         setIsLoading(true);
         try {
-            if (!waveformData) {
-                setWaveformLevels(await decodeAudioLevels(blob));
-            }
             createAudioFromBlob(blob);
         }
         catch (error) {
@@ -930,12 +1025,19 @@ const useAudioBlobLoader = (options) => {
         finally {
             setIsLoading(false);
         }
-    }, [waveformData, createAudioFromBlob]);
-    const ensureAudioLoaded = React.useCallback(async () => {
+        void applyWaveformLevels(blob);
+    }, [applyWaveformLevels, createAudioFromBlob]);
+    const ensureAudioLoaded = React.useCallback(async (options) => {
         var _a;
-        if (audioRef.current || failedSrcRef.current === src) {
+        if (audioRef.current) {
             return;
         }
+        if (failedSrcRef.current === src) {
+            if (!(options === null || options === void 0 ? void 0 : options.retryFailed)) {
+                return;
+            }
+            failedSrcRef.current = null;
+        }
         if (preloadedBlob) {
             return mountFromBlob(preloadedBlob);
         }
@@ -951,14 +1053,8 @@ const useAudioBlobLoader = (options) => {
             if (controller.signal.aborted) {
                 return;
             }
-            if (!waveformData) {
-                const levels = await decodeAudioLevels(blob);
-                if (controller.signal.aborted) {
-                    return;
-                }
-                setWaveformLevels(levels);
-            }
             createAudioFromBlob(blob);
+            void applyWaveformLevels(blob);
         }
         catch (error) {
             if (error instanceof DOMException && error.name === 'AbortError') {
@@ -972,13 +1068,16 @@ const useAudioBlobLoader = (options) => {
                 setIsLoading(false);
             }
         }
-    }, [src, waveformData, preloadedBlob, mountFromBlob, createAudioFromBlob]);
+    }, [src, preloadedBlob, mountFromBlob, applyWaveformLevels, createAudioFromBlob]);
     /** Cleanup on src change or unmount */
     React.useEffect(() => {
         failedSrcRef.current = null;
+        /** Drop the previous waveform so a failed decode cannot leave a foreign one */
+        setWaveformLevels(waveformDataRef.current || createInitialLevels());
         return () => {
             var _a;
             (_a = abortControllerRef.current) === null || _a === void 0 ? void 0 : _a.abort();
+            waveformTokenRef.current += 1;
             if (audioRef.current) {
                 cleanupAudio(audioRef.current);
                 audioRef.current = null;
@@ -997,6 +1096,7 @@ const useAudioBlobLoader = (options) => {
     }, [preloadedBlob, mountFromBlob]);
     React.useEffect(() => {
         if (waveformData) {
+            waveformTokenRef.current += 1;
             setWaveformLevels(waveformData);
         }
     }, [waveformData]);
@@ -1102,7 +1202,7 @@ const useVoiceMessagePlayer = (options) => {
             return;
         }
         audioPlaybackManager.stopOthers(stopThis);
-        void ensureAudioLoaded().then(() => {
+        void ensureAudioLoaded({ retryFailed: true }).then(() => {
             const audio = audioRef.current;
             if (audio) {
                 audio.play()
@@ -1162,7 +1262,7 @@ const useVoiceMessagePlayer = (options) => {
                 .catch(() => setIsPlaying(false));
         }
         else {
-            void ensureAudioLoaded().then(() => {
+            void ensureAudioLoaded({ retryFailed: true }).then(() => {
                 const loadedAudio = audioRef.current;
                 if (loadedAudio) {
                     audioPlaybackManager.stopOthers(stopThis);