Revert "feat: switch to client-side fetch for Fish Audio API to bypass server network restrictions"
This reverts commit dedb37e22b.
This commit is contained in:
@@ -857,48 +857,14 @@
|
||||
}
|
||||
|
||||
async function _generateSingleTTS(text, reference_id) {
|
||||
try {
|
||||
// Client-side fetch to use local browser's proxy
|
||||
const fishRes = await fetch('https://api.fish.audio/v1/tts', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Authorization': 'Bearer 233f3a9bcc204b20a1979d59d33cc649',
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
text: text,
|
||||
reference_id: reference_id,
|
||||
model: TTS_MODEL,
|
||||
format: "wav"
|
||||
})
|
||||
});
|
||||
|
||||
if (!fishRes.ok) {
|
||||
let msg = 'Fish Audio API Error';
|
||||
try { msg = await fishRes.text(); } catch(e){}
|
||||
throw new Error(`[${fishRes.status}] ${msg}`);
|
||||
}
|
||||
|
||||
const audioBlob = await fishRes.blob();
|
||||
|
||||
// Upload the blob to the server as a temporary file
|
||||
const formData = new FormData();
|
||||
formData.append('audio', audioBlob, 'temp.wav');
|
||||
|
||||
const uploadRes = await fetch('/api/tts/upload_temp', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
});
|
||||
|
||||
const data = await uploadRes.json();
|
||||
if (!data.success) throw new Error(data.message);
|
||||
return data;
|
||||
} catch (err) {
|
||||
if (err.name === 'TypeError' && err.message === 'Failed to fetch') {
|
||||
throw new Error('网络跨域拦截(CORS)或连接失败。请确保你的浏览器已开启 CORS Unblock 插件,并且本地代理工作正常!');
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
const res = await fetch('/api/tts/generate', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ text, reference_id, model: TTS_MODEL })
|
||||
});
|
||||
const data = await res.json();
|
||||
if (!data.success) throw new Error(data.message);
|
||||
return data;
|
||||
}
|
||||
|
||||
async function _importSingleAudio(code, zhTemp, jaTemp) {
|
||||
@@ -1030,13 +996,13 @@
|
||||
try {
|
||||
// 1. Generate ZH
|
||||
const zhData = await _generateSingleTTS(task.zh, ZH_REFERENCE_ID);
|
||||
// 2. Generate JA
|
||||
const jaData = await _generateSingleTTS(task.en, JA_REFERENCE_ID);
|
||||
|
||||
task.zhTempName = zhData.tempName;
|
||||
task.jaTempName = jaData.tempName;
|
||||
task.zhUrl = zhData.url;
|
||||
task.jaUrl = jaData.url;
|
||||
// 2. Generate JA
|
||||
const jaData = await _generateSingleTTS(task.en, JA_REFERENCE_ID);
|
||||
|
||||
task.zhTempName = zhData.tempName;
|
||||
task.jaTempName = jaData.jaTempName || jaData.enTempName || jaData.tempName;
|
||||
task.zhUrl = zhData.url;
|
||||
task.jaUrl = jaData.jaUrl || jaData.enUrl || jaData.url;
|
||||
|
||||
success = true;
|
||||
} catch (e) {
|
||||
@@ -1175,20 +1141,46 @@
|
||||
status.textContent = "Generating Chinese audio...";
|
||||
|
||||
try {
|
||||
// Generate Chinese via Client-Side Fetch
|
||||
const dataZh = await _generateSingleTTS(zhText, ZH_REFERENCE_ID);
|
||||
// Generate Chinese via Server-Side Proxy
|
||||
const resZh = await fetch('/api/tts/generate', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
text: zhText,
|
||||
reference_id: ZH_REFERENCE_ID,
|
||||
model: TTS_MODEL
|
||||
})
|
||||
});
|
||||
|
||||
const dataZh = await resZh.json();
|
||||
if (!dataZh.success) throw new Error("ZH TTS failed: " + dataZh.message);
|
||||
|
||||
status.textContent = "Generating Japanese audio...";
|
||||
|
||||
// Generate Japanese via Client-Side Fetch
|
||||
const dataJa = await _generateSingleTTS(jaText, JA_REFERENCE_ID);
|
||||
// Generate Japanese via Server-Side Proxy
|
||||
const resJa = await fetch('/api/tts/generate', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
text: jaText,
|
||||
reference_id: JA_REFERENCE_ID,
|
||||
model: TTS_MODEL
|
||||
})
|
||||
});
|
||||
|
||||
const dataJa = await resJa.json();
|
||||
if (!dataJa.success) throw new Error("JA TTS failed: " + dataJa.message);
|
||||
|
||||
// Success
|
||||
zhTempFile = dataZh.tempName;
|
||||
jaTempFile = dataJa.tempName;
|
||||
jaTempFile = dataJa.jaTempName || dataJa.enTempName || dataJa.tempName;
|
||||
|
||||
document.getElementById('zh-audio').src = dataZh.url;
|
||||
document.getElementById('en-audio').src = dataJa.url;
|
||||
document.getElementById('en-audio').src = dataJa.jaUrl || dataJa.enUrl || dataJa.url;
|
||||
|
||||
document.getElementById('preview-section').style.display = 'block';
|
||||
status.textContent = "Generation complete!";
|
||||
|
||||
Reference in New Issue
Block a user