donatehelper/donat-widget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add fix

Browse Source
This commit is contained in:
harold 2025-05-14 20:59:43 +05:00
parent 666f3dc830
commit 8a6d6fa089
1 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
internal/model/widget-templates.go
View File

@ -106,9 +106,8 @@ function playAudio(url, volume) {
const audio = new Audio(url);
audio.volume = volume;
audio.play().then(() => {
audio.addEventListener('ended', resolve);
audio.addEventListener('ended', () => resolve(audio));
}).catch(error => {
console.error('Error playing audio:', error);
reject(error);
});
});
@ -116,7 +115,7 @@ function playAudio(url, volume) {
function playSpeech(text, voiceSettings) {
return new Promise((resolve, reject) => {
if (!voiceSettings.voice_enabled) return resolve();
if (!voiceSettings.voice_enabled) return resolve(null);
const requestBody = {
text: text,
@ -140,31 +139,59 @@ function playSpeech(text, voiceSettings) {
const url = URL.createObjectURL(blob);
const audio = new Audio(url);
audio.volume = (voiceSettings.voice_sound_percent || 100) / 100;
audio.play().catch(reject);
audio.addEventListener('ended', () => {
URL.revokeObjectURL(url);
resolve();
});
audio.play().then(() => {
audio.addEventListener('ended', () => {
URL.revokeObjectURL(url);
resolve(audio);
});
}).catch(reject);
})
.catch(reject);
});
}
async function playMedia(donat, voiceSettings) {
let audioElement = null;
let ttsAudio = null;
const controller = new AbortController();
try {
let mediaPromise = Promise.resolve();
const volume = (voiceSettings.voice_sound_percent || 100) / 100;
const timeoutPromise = new Promise(resolve =>
setTimeout(() => {
controller.abort();
resolve('timeout');
}, donat.duration * 1000)
);
if (donat.play_content && donat.audio_link) {
mediaPromise = playAudio(donat.audio_link, volume)
.then(() => playSpeech(donat.text, voiceSettings));
} else if (donat.text && donat.voice_enabled) {
mediaPromise = playSpeech(donat.text, voiceSettings);
const mediaPromise = (async () => {
try {
if (donat.play_content && donat.audio_link) {
audioElement = await playAudio(
donat.audio_link,
(voiceSettings.voice_sound_percent || 100) / 100
);
if (donat.text && !controller.signal.aborted) {
ttsAudio = await playSpeech(donat.text, voiceSettings);
}
} else if (donat.text && donat.voice_enabled) {
ttsAudio = await playSpeech(donat.text, voiceSettings);
}
} catch (e) {
if (!controller.signal.aborted) throw e;
}
})();
await Promise.race([mediaPromise, timeoutPromise]);
} finally {
if (audioElement && !audioElement.ended) {
audioElement.pause();
audioElement.currentTime = 0;
}
if (ttsAudio && !ttsAudio.ended) {
ttsAudio.pause();
ttsAudio.currentTime = 0;
}
await mediaPromise;
} catch (error) {
console.error('Media play error:', error);
}
}
@ -243,7 +270,10 @@ async function widgetView() {
}
const elapsed = Date.now() - iterationStart;
const remaining = 5000 - elapsed;
const remaining = donat?.duration ?
Math.max(donat.duration * 1000 - elapsed, 0) :
5000 - elapsed;
if (remaining > 0) {
await new Promise(r => setTimeout(r, remaining));
}