Update services/api.ts

services/api.ts

@@ -1,32 +1,67 @@
-
 import { JobData, StatusResponse, Model } from '../types';
 import * as legacyApi from './legacy_api';
 
-const VC_BASE_URL = 'https://sada8888-sada.hf.space';
 const TTS_BASE_URL = 'https://hamed744-ttsp3.hf.space';
 const ENHANCE_BASE_URL = 'https://ezmarynoori-taqviat-sada.hf.space';
 
+const safeBase64Encode = (str: string): string => {
+  return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, (match, p1) => {
+    return String.fromCharCode(parseInt('0x' + p1));
+  }));
+};
+
+const uploadAudioToOrchestrator = async (file: Blob | File, runId: string, suffix: string): Promise<string> => {
+  const formData = new FormData();
+  const ext = (file as File).name?.split('.').pop()?.toLowerCase() || 'wav';
+  formData.append('run_id', `${runId}_${suffix}`);
+  formData.append('ext', ext);
+  formData.append('file', file);
+
+  const response = await fetch('/api/webhook/upload', {
+    method: 'POST',
+    body: formData
+  });
+  if (!response.ok) throw new Error("خطا در آپلود فایل صوتی به سرور پشتیبان.");
+  return ext;
+};
+
 export const uploadJob = async (
     sourceFile: File | Blob, 
     refFile: File | Blob, 
     metadata: { type?: 'custom' | 'model', modelName?: string, modelImage?: string }
 ): Promise<JobData> => {
-  const formData = new FormData();
-  formData.append('source_audio', sourceFile, 'source.wav');
-  formData.append('ref_audio', refFile, 'ref.wav');
+  const currentRunId = "vev" + Math.random().toString(36).substring(2, 14);
+
+  // ۱. آپلود صوتی‌های مبدا و مرجع به ارکستریتور
+  const sourceExt = await uploadAudioToOrchestrator(sourceFile, currentRunId, 'vevo_source');
+  const refExt = await uploadAudioToOrchestrator(refFile, currentRunId, 'vevo_ref');
+
+  // ۲. رمزگذاری آدرس فضای پردازش و ساخت کلید تنظیمات Vevo
+  const b64SpaceUrl = safeBase64Encode("https://opera8-sada.hf.space");
+  const vevoPayload = `VEVOCONFIG_userRunId_${currentRunId}_sourceExt_${sourceExt}_refExt_${refExt}_spaceUrl_${b64SpaceUrl}`;
 
-  const response = await fetch(`${VC_BASE_URL}/upload`, {
+  // ۳. ارسال دستور کار به سیستم دیسپچ گیت‌هاب اکشنز
+  const response = await fetch('/api/generate', {
     method: 'POST',
-    body: formData,
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      prompt: vevoPayload,
+      action_name: 'vevo-voice'
+    }),
   });
 
   if (!response.ok) {
-    throw new Error(`Upload failed: ${response.status}`);
+    const errData = await response.json().catch(() => ({}));
+    throw new Error(errData.message || `خطا در تخصیص صف گیت‌هاب: ${response.status}`);
   }
 
   const data = await response.json();
+  const finalRunId = data.run_id || currentRunId;
+
   return {
-    ...data,
+    job_id: finalRunId,
+    total_chunks: 1,
+    chunks: [],
     date: new Date().toLocaleString('fa-IR'),
     timestamp: Date.now(),
     progress: 0,
@@ -34,7 +69,7 @@ export const uploadJob = async (
     type: metadata.type,
     modelName: metadata.modelName,
     modelImage: metadata.modelImage,
-    backend: 'standard' // Explicitly mark as standard backend
+    backend: 'standard'
   };
 };
 
@@ -115,15 +150,29 @@ export const checkJobStatus = async (job: JobData): Promise<StatusResponse> => {
   // Priority 1: Use the explicit backend flag if available
   if (job.backend === 'legacy') return await legacyApi.checkLegacyStatus(job.job_id);
   if (job.backend === 'standard') {
-    const response = await fetch(`${VC_BASE_URL}/check_status`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ job_id: job.job_id, total_chunks: job.total_chunks || 1, chunks: job.chunks || [] }),
-    });
-    return await response.json();
+    try {
+      const response = await fetch(`/api/status/${job.job_id}`);
+      if (!response.ok) throw new Error(`بررسی وضعیت با خطا مواجه شد: ${response.status}`);
+      const data = await response.json();
+      
+      let status: 'processing' | 'completed' | 'failed' | 'error' = 'processing';
+      if (data.status === 'ready') status = 'completed';
+      else if (data.status === 'failed') status = 'failed';
+      else if (data.status === 'not_found' || data.status === 'error') status = 'error';
+
+      return {
+          status,
+          progress: data.status === 'ready' ? 100 : (data.status === 'processing' ? 50 : 10),
+          filename: data.url ? data.url.split('/').pop() : undefined,
+          detail: data.message || (data.status === 'ready' ? 'تکمیل شد' : 'در حال پردازش در سرور ابری...'),
+          downloadUrl: data.url ? data.url : undefined
+      };
+    } catch (e) {
+      return { status: 'processing', progress: 10, detail: 'درحال تلاش برای برقراری ارتباط با سرور...' };
+    }
   }
 
-  // Priority 2: Fallback for jobs created before the backend flag was added
+  // Fallback for legacy models tracking
   const legacyNames = [
     'shadmehr', 'moein', 'billie', 'chavoshi', 'ghomayshi', 'yas', 'ferdosipour', 'khiabani', 'jalilvand', 'tahmasb', 'pourang', 'sponge', 'jenab', 'yousef', 'jomeong', 'musk',
     'شادمهر عقیلی', 'معین', 'بیلی آیلیش', 'محسن چاوشی', 'سیاوش قمیشی', 'یاس',
@@ -136,12 +185,26 @@ export const checkJobStatus = async (job: JobData): Promise<StatusResponse> => {
 
   if (isLegacy) return await legacyApi.checkLegacyStatus(job.job_id);
 
-  const response = await fetch(`${VC_BASE_URL}/check_status`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ job_id: job.job_id, total_chunks: job.total_chunks || 1, chunks: job.chunks || [] }),
-  });
-  return await response.json();
+  try {
+    const response = await fetch(`/api/status/${job.job_id}`);
+    if (!response.ok) throw new Error(`بررسی وضعیت با خطا مواجه شد: ${response.status}`);
+    const data = await response.json();
+    
+    let status: 'processing' | 'completed' | 'failed' | 'error' = 'processing';
+    if (data.status === 'ready') status = 'completed';
+    else if (data.status === 'failed') status = 'failed';
+    else if (data.status === 'not_found' || data.status === 'error') status = 'error';
+
+    return {
+        status,
+        progress: data.status === 'ready' ? 100 : (data.status === 'processing' ? 50 : 10),
+        filename: data.url ? data.url.split('/').pop() : undefined,
+        detail: data.message || (data.status === 'ready' ? 'تکمیل شد' : 'در حال پردازش در سرور ابری...'),
+        downloadUrl: data.url ? data.url : undefined
+    };
+  } catch (e) {
+    return { status: 'processing', progress: 10, detail: 'درحال تلاش برای برقراری ارتباط با سرور...' };
+  }
 };
 
 export const processUnifiedJob = async (
@@ -175,4 +238,4 @@ export const processUnifiedJob = async (
     onProgress("ارسال به سرور تغییر صدا...", 20);
     return await uploadJob(actualSource, refFile, metadata);
   }
-};
+};