Salih/post streaming cleanup (#513)
This commit is contained in:
@@ -14,6 +14,7 @@ import { getClient } from "@/api/AxiosClient";
|
|||||||
import { useCredentialGetter } from "@/hooks/useCredentialGetter";
|
import { useCredentialGetter } from "@/hooks/useCredentialGetter";
|
||||||
import { Skeleton } from "@/components/ui/skeleton";
|
import { Skeleton } from "@/components/ui/skeleton";
|
||||||
import { toast } from "@/components/ui/use-toast";
|
import { toast } from "@/components/ui/use-toast";
|
||||||
|
import { envCredential } from "@/util/env";
|
||||||
|
|
||||||
type StreamMessage = {
|
type StreamMessage = {
|
||||||
task_id: string;
|
task_id: string;
|
||||||
@@ -70,12 +71,18 @@ function TaskActions() {
|
|||||||
|
|
||||||
async function run() {
|
async function run() {
|
||||||
// Create WebSocket connection.
|
// Create WebSocket connection.
|
||||||
const credential = await credentialGetter!();
|
let credential = null;
|
||||||
|
if (credentialGetter) {
|
||||||
|
const token = await credentialGetter();
|
||||||
|
credential = `?token=Bearer ${token}`;
|
||||||
|
} else {
|
||||||
|
credential = `?apikey=${envCredential}`;
|
||||||
|
}
|
||||||
if (socket) {
|
if (socket) {
|
||||||
socket.close();
|
socket.close();
|
||||||
}
|
}
|
||||||
socket = new WebSocket(
|
socket = new WebSocket(
|
||||||
`${wssBaseUrl}/stream/tasks/${taskId}?token=Bearer ${credential}`,
|
`${wssBaseUrl}/stream/tasks/${taskId}${credential}`,
|
||||||
);
|
);
|
||||||
// Listen for messages
|
// Listen for messages
|
||||||
socket.addEventListener("message", (event) => {
|
socket.addEventListener("message", (event) => {
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
import { Status } from "@/api/types";
|
|
||||||
import { useCredentialGetter } from "@/hooks/useCredentialGetter";
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useParams } from "react-router-dom";
|
|
||||||
|
|
||||||
type StreamMessage = {
|
|
||||||
task_id: string;
|
|
||||||
status: string;
|
|
||||||
screenshot?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
let socket: WebSocket | null = null;
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
status: Status;
|
|
||||||
};
|
|
||||||
|
|
||||||
const wssBaseUrl = import.meta.env.VITE_WSS_BASE_URL;
|
|
||||||
|
|
||||||
function TaskStream({ status }: Props) {
|
|
||||||
const { taskId } = useParams();
|
|
||||||
const credentialGetter = useCredentialGetter();
|
|
||||||
const [imgSrc, setImgSrc] = useState<string>("");
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!taskId || !credentialGetter) {
|
|
||||||
console.error("TaskStream: Task ID is required");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function run() {
|
|
||||||
// Create WebSocket connection.
|
|
||||||
const credential = await credentialGetter!();
|
|
||||||
if (socket) {
|
|
||||||
socket.close();
|
|
||||||
}
|
|
||||||
socket = new WebSocket(
|
|
||||||
`${wssBaseUrl}/stream/tasks/${taskId}?token=Bearer ${credential}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
socket.addEventListener("open", (event) => {
|
|
||||||
console.log("open event", event);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Listen for messages
|
|
||||||
socket.addEventListener("message", (event) => {
|
|
||||||
try {
|
|
||||||
const message: StreamMessage = JSON.parse(event.data);
|
|
||||||
if (message.screenshot) {
|
|
||||||
setImgSrc(message.screenshot);
|
|
||||||
}
|
|
||||||
if (message.status === "completed") {
|
|
||||||
socket?.close();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error("Failed to parse message", e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
socket.addEventListener("close", (event) => {
|
|
||||||
console.log("close event", event);
|
|
||||||
socket = null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
run();
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
if (socket) {
|
|
||||||
socket.close();
|
|
||||||
socket = null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [credentialGetter, taskId]);
|
|
||||||
|
|
||||||
if (status === Status.Queued) {
|
|
||||||
return (
|
|
||||||
<div className="w-full h-full flex flex-col gap-4 items-center justify-center text-lg bg-slate-900">
|
|
||||||
<span>Your task is queued. Typical queue time is 1-2 minutes.</span>
|
|
||||||
<span>Stream will start when the task is running.</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status === Status.Running && imgSrc.length === 0) {
|
|
||||||
return (
|
|
||||||
<div className="w-full h-full flex items-center justify-center text-lg bg-slate-900">
|
|
||||||
Starting the stream...
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status === Status.Running && imgSrc.length > 0) {
|
|
||||||
return (
|
|
||||||
<div className="w-full h-full">
|
|
||||||
<img src={`data:image/png;base64,${imgSrc}`} />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export { TaskStream };
|
|
||||||
Reference in New Issue
Block a user