Spaces:

userIdc2024
/

ProductShowcaseStudio

Running

App Files Files Community

sushilideaclan01 commited on Apr 29

Commit

f41b748

1 Parent(s): 53706f2

added favicon

Browse files

Files changed (3) hide show

frontend/index.html +1 -0
frontend/public/favicon.svg +19 -0
frontend/src/api.ts +120 -45

frontend/index.html CHANGED Viewed

@@ -3,6 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Product Showcase Studio</title>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>Product Showcase Studio</title>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

frontend/public/favicon.svg ADDED Viewed

frontend/src/api.ts CHANGED Viewed

@@ -419,32 +419,57 @@ export function waitForSeedanceVideo(taskId: string, timeoutMs = 600000): Promis
   return new Promise((resolve, reject) => {
     let settled = false;
     const es = createSeedanceEventSource(taskId);
-    const pollEveryMs = 4000;
-    const poller = window.setInterval(async () => {
       if (settled) return;
-      try {
-        const data = await seedanceStatus(taskId);
-        if (data.state === 'success' && data.url) {
-          settled = true;
-          window.clearInterval(poller);
-          clearTimeout(t);
-          es.close();
-          resolve(data.url);
-        } else if (data.state === 'fail') {
-          settled = true;
-          window.clearInterval(poller);
-          clearTimeout(t);
-          es.close();
-          reject(new Error(data.failMsg || 'Seedance generation failed'));
-        }
-      } catch {
-        /* ignore transient poll errors; SSE can still resolve */
       }
-    }, pollEveryMs);
     const t = setTimeout(() => {
       if (settled) return;
       settled = true;
-      window.clearInterval(poller);
       es.close();
       reject(new Error('Seedance generation timed out'));
     }, timeoutMs);
@@ -456,25 +481,14 @@ export function waitForSeedanceVideo(taskId: string, timeoutMs = 600000): Promis
           url?: string | null;
           failMsg?: string | null;
         };
-        if (data.state === 'success' && data.url) {
-          settled = true;
-          window.clearInterval(poller);
-          clearTimeout(t);
-          es.close();
-          resolve(data.url);
-        } else if (data.state === 'fail') {
-          settled = true;
-          window.clearInterval(poller);
-          clearTimeout(t);
-          es.close();
-          reject(new Error(data.failMsg || 'Seedance generation failed'));
-        }
       } catch {
         /* ignore malformed SSE payloads */
       }
     };
     es.onerror = () => {
-      /* EventSource retries automatically; timeout handles terminal failure */
     };
   });
 }
@@ -503,31 +517,92 @@ export function createKlingEventSource(taskId: string): EventSource {
   return new EventSource(`${API_BASE}/api/veo/events/${taskId}`);
 }
 export function waitForKlingVideo(taskId: string, timeoutMs = 420000): Promise<string> {
   return new Promise((resolve, reject) => {
     const es = createKlingEventSource(taskId);
     const t = setTimeout(() => {
       es.close();
       reject(new Error('Video generation timed out'));
     }, timeoutMs);
     es.onmessage = (ev) => {
       try {
         const data = JSON.parse(ev.data);
-        if (data.status === 'succeeded' && data.url) {
-          clearTimeout(t);
-          es.close();
-          resolve(data.url as string);
-        } else if (data.status === 'failed' || data.status === 'cancelled') {
-          clearTimeout(t);
-          es.close();
-          reject(new Error(data.error || data.message || 'Generation failed'));
-        }
       } catch {
         /* ignore */
       }
     };
     es.onerror = () => {
-      /* EventSource retries; rely on timeout */
     };
   });
 }

   return new Promise((resolve, reject) => {
     let settled = false;
     const es = createSeedanceEventSource(taskId);
+    let poller: number | null = null;
+    const pollEveryMs = 10000;
+    const settleSuccess = (url: string) => {
       if (settled) return;
+      settled = true;
+      if (poller !== null) window.clearInterval(poller);
+      clearTimeout(t);
+      es.close();
+      resolve(url);
+    };
+    const settleFail = (msg?: string | null) => {
+      if (settled) return;
+      settled = true;
+      if (poller !== null) window.clearInterval(poller);
+      clearTimeout(t);
+      es.close();
+      reject(new Error(msg || 'Seedance generation failed'));
+    };
+    const inspect = (data: { state?: string; url?: string | null; failMsg?: string | null }) => {
+      if (data.state === 'success' && data.url) {
+        settleSuccess(data.url);
+      } else if (data.state === 'fail') {
+        settleFail(data.failMsg);
       }
+    };
+    const startFallbackPolling = () => {
+      if (poller !== null || settled) return;
+      poller = window.setInterval(async () => {
+        if (settled) return;
+        try {
+          const data = await seedanceStatus(taskId);
+          inspect(data);
+        } catch {
+          /* ignore transient poll errors; timeout handles terminal failure */
+        }
+      }, pollEveryMs);
+    };
+    // Fast path: handle already-finished tasks without waiting for callback/SSE.
+    void seedanceStatus(taskId).then(inspect).catch(() => {
+      /* ignore transient status errors; SSE path remains active */
+    });
     const t = setTimeout(() => {
       if (settled) return;
       settled = true;
+      if (poller !== null) window.clearInterval(poller);
       es.close();
       reject(new Error('Seedance generation timed out'));
     }, timeoutMs);
           url?: string | null;
           failMsg?: string | null;
         };
+        inspect(data);
       } catch {
         /* ignore malformed SSE payloads */
       }
     };
     es.onerror = () => {
+      // EventSource retries automatically; poll only as a degraded-path fallback.
+      startFallbackPolling();
     };
   });
 }
   return new EventSource(`${API_BASE}/api/veo/events/${taskId}`);
 }
+export async function klingStatus(taskId: string): Promise<{
+  status?: string;
+  url?: string | null;
+  error?: string | null;
+  message?: string | null;
+}> {
+  const res = await fetch(`${API_BASE}/api/veo/status/${encodeURIComponent(taskId)}`);
+  if (!res.ok) throw new Error(await parseError(res, 'Video status check failed'));
+  return res.json();
+}
 export function waitForKlingVideo(taskId: string, timeoutMs = 420000): Promise<string> {
   return new Promise((resolve, reject) => {
+    let settled = false;
     const es = createKlingEventSource(taskId);
+    let poller: number | null = null;
+    const pollEveryMs = 10000;
+    const settleSuccess = (url: string) => {
+      if (settled) return;
+      settled = true;
+      if (poller !== null) window.clearInterval(poller);
+      clearTimeout(t);
+      es.close();
+      resolve(url);
+    };
+    const settleFail = (msg?: string | null) => {
+      if (settled) return;
+      settled = true;
+      if (poller !== null) window.clearInterval(poller);
+      clearTimeout(t);
+      es.close();
+      reject(new Error(msg || 'Generation failed'));
+    };
+    const inspect = (data: {
+      status?: string;
+      url?: string | null;
+      error?: string | null;
+      message?: string | null;
+    }) => {
+      if (data.status === 'succeeded' && data.url) {
+        settleSuccess(data.url);
+      } else if (data.status === 'failed' || data.status === 'cancelled') {
+        settleFail(data.error || data.message);
+      }
+    };
+    const startFallbackPolling = () => {
+      if (poller !== null || settled) return;
+      poller = window.setInterval(async () => {
+        if (settled) return;
+        try {
+          const data = await klingStatus(taskId);
+          inspect(data);
+        } catch {
+          /* ignore transient poll errors; timeout handles terminal failure */
+        }
+      }, pollEveryMs);
+    };
+    // Fast path for already-finished tasks.
+    void klingStatus(taskId).then(inspect).catch(() => {
+      /* ignore transient status errors; SSE path remains active */
+    });
     const t = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      if (poller !== null) window.clearInterval(poller);
       es.close();
       reject(new Error('Video generation timed out'));
     }, timeoutMs);
     es.onmessage = (ev) => {
+      if (settled) return;
       try {
         const data = JSON.parse(ev.data);
+        inspect(data);
       } catch {
         /* ignore */
       }
     };
     es.onerror = () => {
+      // EventSource retries automatically; poll only as a degraded-path fallback.
+      startFallbackPolling();
     };
   });
 }