More unified TTS error messages

This commit is contained in:
Cohee
2023-06-05 17:01:59 +03:00
parent fdaf58061f
commit b3ec66faa7
4 changed files with 20 additions and 18 deletions

View File

@ -84,7 +84,7 @@ class EdgeTtsProvider {
url.pathname = `/api/edge-tts/list` url.pathname = `/api/edge-tts/list`
const response = await doExtrasFetch(url) const response = await doExtrasFetch(url)
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
let responseJson = await response.json() let responseJson = await response.json()
responseJson = responseJson responseJson = responseJson
@ -101,7 +101,7 @@ class EdgeTtsProvider {
const text = getPreviewString(voice.lang); const text = getPreviewString(voice.lang);
const response = await this.fetchTtsGeneration(text, id) const response = await this.fetchTtsGeneration(text, id)
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const audio = await response.blob(); const audio = await response.blob();
@ -127,8 +127,8 @@ class EdgeTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
toastr.error(response.statusText); toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }

View File

@ -149,7 +149,7 @@ class ElevenLabsTtsProvider {
headers: headers headers: headers
}) })
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const responseJson = await response.json() const responseJson = await response.json()
return responseJson.voices return responseJson.voices
@ -166,7 +166,7 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
return response.json() return response.json()
} }
@ -193,7 +193,8 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }
@ -209,7 +210,7 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
return response return response
} }
@ -222,7 +223,7 @@ class ElevenLabsTtsProvider {
headers: headers headers: headers
}) })
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const responseJson = await response.json() const responseJson = await response.json()
return responseJson.history return responseJson.history

View File

@ -123,7 +123,7 @@ class NovelTtsProvider {
) )
if (!response.ok) { if (!response.ok) {
toastr.error(response.statusText, 'TTS Generation Failed'); toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}`); throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }

View File

@ -118,7 +118,8 @@ class SileroTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }