Fix crash while scrubbing some audio files (#902)

<!-- Please read
https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before
submitting your pull request -->

### Description

I don't think we technically do "scrubbing" but idk any other word for
it.

<!-- Please include a summary of the change. Please also include
relevant motivation and context. List any dependencies that are required
for this change. -->

Fixes the crash while scrubbing audio files by pretty much just spamming
infinity checks everywhere and adding a helper to calculate duration
properly (previously the voice message content never specified duration
so it would only appear after the file fully loaded in).

#### Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] This change requires a documentation update

### Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings

### AI disclosure:

- [ ] Partially AI assisted (clarify which code was AI assisted and
briefly explain what it does).
- [ ] Fully AI generated (explain what all the generated code does in
moderate detail).
<!-- Write any explanation required here, but do not generate the
explanation using AI!! You must prove you understand what the code in
this PR does. -->
This commit is contained in:
7w1 authored and GitHub committed 2026-05-25 15:47:08 -05:00
commit 254cd5e907
5 files changed
+61 -13

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
---
default: patch
---
Fix crash during scrubbing before duration duration appears.
@@ -511,6 +511,28 @@ export function MVideo({ content, renderAsFile, renderVideoContent, outlined }:
);
}
const getAudioDurationMs = (content: IAudioContent, info?: IAudioInfo): number | undefined => {
const fromInfo = info?.duration;
if (typeof fromInfo === 'number' && Number.isFinite(fromInfo) && fromInfo > 0) {
return fromInfo;
}
const voiceV2 = (content as Record<string, unknown>)['org.matrix.msc3245.voice.v2'];
if (voiceV2 && typeof voiceV2 === 'object') {
const seconds = (voiceV2 as { duration?: number }).duration;
if (typeof seconds === 'number' && Number.isFinite(seconds) && seconds > 0) {
return seconds * 1000;
}
}
const msc1767Audio = (content as Record<string, unknown>)['org.matrix.msc1767.audio'];
if (msc1767Audio && typeof msc1767Audio === 'object') {
const ms = (msc1767Audio as { duration?: number }).duration;
if (typeof ms === 'number' && Number.isFinite(ms) && ms > 0) {
return ms;
}
}
return undefined;
};
type RenderAudioContentProps = {
info: IAudioInfo;
mimeType: string;
@@ -536,6 +558,9 @@ export function MAudio({ content, renderAsFile, renderAudioContent, outlined }:
}
const filename = content.filename ?? content.body ?? 'Audio';
const durationMs = getAudioDurationMs(content, audioInfo);
const resolvedInfo =
durationMs !== undefined ? { ...audioInfo, duration: durationMs } : audioInfo;
return (
<Attachment outlined={outlined}>
<AttachmentHeader>
@@ -555,7 +580,7 @@ export function MAudio({ content, renderAsFile, renderAudioContent, outlined }:
<AttachmentBox>
<AttachmentContent>
{renderAudioContent({
info: audioInfo,
info: resolvedInfo,
mimeType: safeMimeType,
url: mxcUrl,
encInfo: content.file,
@@ -72,8 +72,10 @@ export function AudioContent({
const [currentTime, setCurrentTime] = useState(0);
// duration in seconds. (NOTE: info.duration is in milliseconds)
const infoDuration = info.duration ?? 0;
const [duration, setDuration] = useState((infoDuration >= 0 ? infoDuration : 0) / 1000);
const infoDurationMs = info.duration ?? 0;
const initialDurationSec =
Number.isFinite(infoDurationMs) && infoDurationMs > 0 ? infoDurationMs / 1000 : 0;
const [duration, setDuration] = useState(initialDurationSec);
const getAudioRef = useCallback(() => audioRef.current, []);
const { loading } = useMediaLoading(getAudioRef);
@@ -81,9 +83,15 @@ export function AudioContent({
const { seek } = useMediaSeek(getAudioRef);
const { volume, mute, setMute, setVolume } = useMediaVolume(getAudioRef);
const handlePlayTimeCallback: PlayTimeCallback = useCallback((d, ct) => {
setDuration(d);
setCurrentTime(ct);
if (Number.isFinite(d) && d > 0) setDuration(d);
if (Number.isFinite(ct) && ct >= 0) setCurrentTime(ct);
}, []);
const trackMax = duration > 0 ? duration : 1;
const trackTime =
duration > 0 ? Math.min(Number.isFinite(currentTime) ? currentTime : 0, duration) : 0;
const displayDuration = duration > 0 ? duration : 0;
const displayCurrentTime = Number.isFinite(currentTime) && currentTime >= 0 ? currentTime : 0;
useMediaPlayTimeCallback(
getAudioRef,
useThrottle(handlePlayTimeCallback, PLAY_TIME_THROTTLE_OPS)
@@ -102,9 +110,14 @@ export function AudioContent({
<Range
step={1}
min={0}
max={duration || 1}
values={[currentTime]}
onChange={(values) => seek(values[0] ?? 0)}
max={trackMax}
values={[trackTime]}
onChange={(values) => {
if (!(duration > 0)) return;
const next = values[0] ?? 0;
if (!Number.isFinite(next)) return;
seek(Math.max(0, Math.min(next, duration)));
}}
renderTrack={(params) => {
const { key, ...restProps } = params.props as unknown as {
key?: string;
@@ -118,8 +131,8 @@ export function AudioContent({
variant="Secondary"
size="300"
min={0}
max={duration}
value={currentTime}
max={trackMax}
value={trackTime}
radii="300"
/>
</div>
@@ -168,8 +181,8 @@ export function AudioContent({
</Chip>
<Text size="T200">{`${secondsToMinutesAndSeconds(
currentTime
)} / ${secondsToMinutesAndSeconds(duration)}`}</Text>
displayCurrentTime
)} / ${secondsToMinutesAndSeconds(displayDuration)}`}</Text>
</>
),
rightControl: (
@@ -82,6 +82,7 @@ function PreviewVideo({ fileItem }: Readonly<PreviewVideoProps>) {
const BAR_COUNT = 44;
function formatAudioTime(s: number): string {
if (!Number.isFinite(s) || s < 0) return '0:00';
const m = Math.floor(s / 60);
const sec = Math.floor(s % 60);
return `${m}:${sec.toString().padStart(2, '0')}`;
@@ -10,7 +10,11 @@ export const useMediaPlayTimeCallback = (
const targetEl = getTargetElement();
const handleChange = () => {
if (!targetEl) return;
onPlayTimeCallback(targetEl.duration, targetEl.currentTime);
const { duration, currentTime } = targetEl;
onPlayTimeCallback(
duration,
Number.isFinite(currentTime) && currentTime >= 0 ? currentTime : 0
);
};
targetEl?.addEventListener('timeupdate', handleChange);
targetEl?.addEventListener('loadedmetadata', handleChange);