Update index.html

index.html

@@ -656,13 +656,14 @@
                     body: formData
                 });
                 const data = await response.json();
+                // ** LOGIC FIX: Return full object structure expected by Gradio **
                 if (data && data.length > 0) {
                     return {
                         "path": data[0],
                         "url": `${ACE_SPACE_URL}gradio_api/file=${data[0]}`,
                         "orig_name": file.name,
                         "size": file.size,
-                        "mime_type": file.type,
+                        "mime_type": "audio/wav",
                         "meta": {"_type": "gradio.FileData"}
                     };
                 }
@@ -682,19 +683,7 @@
             loader.style.display = 'block';
             
             try {
-                const audioInput = document.getElementById('audio_reference');
-                let uploadedAudioObj = null;
-                
-                if (audioInput.files.length > 0) {
-                    let fileToUpload = audioInput.files[0];
-                    if (fileToUpload.type !== 'audio/wav' && !fileToUpload.name.toLowerCase().endsWith('.wav')) {
-                        loaderText.innerText = "در حال تبدیل فرمت فایل صوتی به WAV...";
-                        fileToUpload = await convertAudioToWav(fileToUpload);
-                    }
-                    loaderText.innerText = "در حال آپلود فایل نمونه...";
-                    uploadedAudioObj = await uploadAudioFile(fileToUpload);
-                }
-
+                // 1. Text Generation First
                 loaderText.innerText = "آلفا در حال نوشتن شعر و ملودی...";
                 const isInstrumental = getChk('instrumental_chk');
                 
@@ -710,43 +699,68 @@
                 });
 
                 if (response.status === 429) {
-                    loader.style.display = 'none';
-                    step1.style.display = 'block';
-                    historySection.style.display = 'block';
-                    processBtn.disabled = false;
-                    
-                    upgradeModalTitle.innerText = "محدودیت ساخت روزانه";
-                    upgradeModalText.innerText = "شما به سقف ۵ آهنگ رایگان در روز رسیده‌اید.";
-                    upgradeModal.classList.add('open');
-                    return;
+                    throw new Error("LIMIT_REACHED");
                 }
 
                 const data = await response.json();
                 if (data.error) throw new Error(data.error);
 
                 const { lyrics, musicPrompt } = data;
-                loaderText.innerText = "در حال ضبط آهنگ در استودیو آلفا...";
                 
+                // 2. Audio Upload (Only if file selected)
+                const audioInput = document.getElementById('audio_reference');
+                let uploadedAudioObj = null;
+                
+                if (audioInput.files.length > 0) {
+                    let fileToUpload = audioInput.files[0];
+                    loaderText.innerText = "در حال پردازش فایل صوتی...";
+                    
+                    if (fileToUpload.type !== 'audio/wav' && !fileToUpload.name.toLowerCase().endsWith('.wav')) {
+                        fileToUpload = await convertAudioToWav(fileToUpload);
+                    }
+                    
+                    loaderText.innerText = "در حال آپلود فایل نمونه...";
+                    uploadedAudioObj = await uploadAudioFile(fileToUpload);
+                    
+                    if (!uploadedAudioObj) throw new Error("آپلود فایل با خطا مواجه شد.");
+                }
+
+                // 3. Generate Music
+                loaderText.innerText = "در حال ضبط آهنگ در استودیو آلفا...";
                 const finalLyrics = isInstrumental ? "" : lyrics;
 
-                const taskType = uploadedAudioObj ? "prompt" : "text2music";
+                // ** CRITICAL FIX: Structure payload exactly as logs show **
+                // If audio exists, index 1 is "custom" and index 2 is object
+                // If no audio, index 1 is "custom" and index 2 is null (or check logs for no-audio case)
                 
                 const payload = [
-                    getVal('model_select'), 
-                    "custom", 
-                    uploadedAudioObj, 
-                    getVal('duration_select'), 
-                    musicPrompt, 
-                    finalLyrics, 
-                    0, "", "", "unknown", 
-                    getNum('steps_input'), getNum('cfg_input'), true, getNum('seed_input'), null, -1, 
-                    getNum('batch_size'), null, null, 0, -1, "Fill the audio semantic mask based on the given conditions:", 
-                    1, taskType, false, 0, 1, 3, "ode", "", "mp3", 0.85, 
-                    getChk('think_checkbox'), 2, 0, 0.9, "NO USER INPUT", true, true, true, null, false, true, false, false, 0.5, 8, null, [], false, null, null, null, null
+                    getVal('model_select'),       // 0: Model
+                    "custom",                     // 1: Mode (Always "custom" based on logs)
+                    uploadedAudioObj,             // 2: Audio Object or null
+                    getVal('duration_select'),    // 3: Duration
+                    musicPrompt,                  // 4: Prompt
+                    finalLyrics,                  // 5: Lyrics
+                    0, "", "", "unknown",         // 6-9
+                    getNum('steps_input'),        // 10: Steps
+                    getNum('cfg_input'),          // 11: CFG
+                    true,                         // 12
+                    getNum('seed_input'),         // 13: Seed
+                    null, -1, getNum('batch_size'), null, null, 0, -1, 
+                    "Fill the audio semantic mask based on the given conditions:", // 22
+                    1,                            // 23
+                    "text2music",                 // 24: Task (Logs say text2music even with audio)
+                    false, 0, 1, 3, "ode", "", "mp3", 0.85, 
+                    getChk('think_checkbox'), 2, 0, 0.9, "NO USER INPUT", 
+                    true, true, true, null, false, true, false, false, 0.5, 8, null, [], false, null, null, null, null
                 ];
 
                 const session_hash = Math.random().toString(36).substring(2);
-                const joinResp = await fetch(`${ACE_SPACE_URL}gradio_api/queue/join`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ data: payload, fn_index: 77, session_hash }) });
+                const joinResp = await fetch(`${ACE_SPACE_URL}gradio_api/queue/join`, { 
+                    method: 'POST', 
+                    headers: { 'Content-Type': 'application/json' }, 
+                    body: JSON.stringify({ data: payload, fn_index: 77, session_hash }) 
+                });
+                
                 if (!joinResp.ok) throw new Error('خطا در اتصال به سرور موزیک');
 
                 const eventSource = new EventSource(`${ACE_SPACE_URL}gradio_api/queue/data?session_hash=${session_hash}`);
@@ -762,11 +776,21 @@
                 eventSource.onerror = () => { throw new Error('ارتباط با سرور قطع شد.'); };
 
             } catch (e) {
-                alert("خطا: " + e.message);
-                loader.style.display = 'none';
-                step1.style.display = 'block';
-                historySection.style.display = 'block';
-                processBtn.disabled = false;
+                if(e.message === "LIMIT_REACHED"){
+                    loader.style.display = 'none';
+                    step1.style.display = 'block';
+                    historySection.style.display = 'block';
+                    processBtn.disabled = false;
+                    upgradeModalTitle.innerText = "محدودیت ساخت روزانه";
+                    upgradeModalText.innerText = "شما به سقف ۵ آهنگ رایگان در روز رسیده‌اید.";
+                    upgradeModal.classList.add('open');
+                } else {
+                    alert("خطا: " + e.message);
+                    loader.style.display = 'none';
+                    step1.style.display = 'block';
+                    historySection.style.display = 'block';
+                    processBtn.disabled = false;
+                }
             }
         });
 
@@ -790,11 +814,12 @@
             }
 
             function traverse(obj) {
+                if (!obj) return;
                 if (typeof obj === 'string') {
                     if (obj.includes('/file=') && (obj.endsWith('.mp3') || obj.endsWith('.wav'))) {
                         addAudio(obj);
                     }
-                } else if (obj && typeof obj === 'object') {
+                } else if (typeof obj === 'object') {
                     if (obj.url && (obj.url.endsWith('.mp3') || obj.url.endsWith('.wav'))) {
                         addAudio(obj.url);
                     }
@@ -819,10 +844,11 @@
                 finalLyricsBox.innerHTML = formatLyrics(lyrics);
                 window.scrollTo({ top: 0, behavior: 'smooth' });
             } else {
-                console.log("Server Response:", data); 
-                alert("فایل صوتی در پاسخ سرور یافت نشد. لطفاً دوباره تلاش کنید.");
+                console.log("Full Server Response for Debug:", data);
+                alert("خروجی معتبری دریافت نشد. لطفاً تنظیمات را بررسی کنید.");
                 step1.style.display = 'block';
                 historySection.style.display = 'block';
+                processBtn.disabled = false;
             }
         }