Skip to content

Handle task completion notifications to skip polling delay #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Christian-Sidak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle task completion notifications to skip polling delay #1192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions client/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,11 @@ const App = () => {
} = useDraggableSidebar(320);

const selectedTaskRef = useRef<Task | null>(null);
// Signal used to wake up the task polling loop when a task status notification arrives
const taskNotificationResolverRef = useRef<{
taskId: string;
resolve: () => void;
} | null>(null);
useEffect(() => {
selectedTaskRef.current = selectedTask;
}, [selectedTask]);
Expand Down Expand Up @@ -418,6 +423,15 @@ const App = () => {
if (selectedTaskRef.current?.taskId === task.taskId) {
setSelectedTask(task);
}
// Wake up the polling loop if this task reached a terminal status
const terminalStatuses = ["completed", "failed", "cancelled"];
if (
terminalStatuses.includes(task.status) &&
taskNotificationResolverRef.current?.taskId === task.taskId
) {
taskNotificationResolverRef.current.resolve();
taskNotificationResolverRef.current = null;
}
}
},
onPendingRequest: (request, resolve, reject) => {
Expand Down Expand Up @@ -1097,8 +1111,17 @@ const App = () => {
let taskCompleted = false;
while (!taskCompleted) {
try {
// Wait for 1 second before polling
await new Promise((resolve) => setTimeout(resolve, pollInterval));
// Wait for poll interval OR a task status notification, whichever comes first
await Promise.race([
new Promise((resolve) => setTimeout(resolve, pollInterval)),
new Promise<void>((resolve) => {
taskNotificationResolverRef.current = { taskId, resolve };
}),
]);
// Clear the resolver ref if it was not consumed by a notification
if (taskNotificationResolverRef.current?.taskId === taskId) {
taskNotificationResolverRef.current = null;
}

const taskStatus = await sendMCPRequest(
{
Expand Down