fix(ui): SSE in React chat

This commit is contained in:
Richard Palethorpe
2025-03-28 14:10:10 +00:00
parent d672842a81
commit 29beee6057
3 changed files with 32 additions and 22 deletions

View File

@@ -343,9 +343,9 @@ func (a *App) ChatAPI(pool *state.AgentPool) func(c *fiber.Ctx) error {
// Send user message event via SSE
userMessageData, err := json.Marshal(map[string]interface{}{
"id": messageID + "-user",
"sender": "user",
"content": message,
"id": messageID + "-user",
"sender": "user",
"content": message,
"timestamp": time.Now().Format(time.RFC3339),
})
if err != nil {
@@ -357,14 +357,14 @@ func (a *App) ChatAPI(pool *state.AgentPool) func(c *fiber.Ctx) error {
// Send processing status
statusData, err := json.Marshal(map[string]interface{}{
"status": "processing",
"status": "processing",
"timestamp": time.Now().Format(time.RFC3339),
})
if err != nil {
xlog.Error("Error marshaling status message", "error", err)
} else {
manager.Send(
sse.NewMessage(string(statusData)).WithEvent("status"))
sse.NewMessage(string(statusData)).WithEvent("json_status"))
}
// Process the message asynchronously
@@ -376,7 +376,7 @@ func (a *App) ChatAPI(pool *state.AgentPool) func(c *fiber.Ctx) error {
// Send error message
xlog.Error("Error asking agent", "agent", agentName, "error", response.Error)
errorData, err := json.Marshal(map[string]interface{}{
"error": response.Error.Error(),
"error": response.Error.Error(),
"timestamp": time.Now().Format(time.RFC3339),
})
if err != nil {
@@ -389,9 +389,9 @@ func (a *App) ChatAPI(pool *state.AgentPool) func(c *fiber.Ctx) error {
// Send agent response
xlog.Info("Response from agent", "agent", agentName, "response", response.Response)
responseData, err := json.Marshal(map[string]interface{}{
"id": messageID + "-agent",
"sender": "agent",
"content": response.Response,
"id": messageID + "-agent",
"sender": "agent",
"content": response.Response,
"timestamp": time.Now().Format(time.RFC3339),
})
if err != nil {
@@ -404,20 +404,20 @@ func (a *App) ChatAPI(pool *state.AgentPool) func(c *fiber.Ctx) error {
// Send completed status
completedData, err := json.Marshal(map[string]interface{}{
"status": "completed",
"status": "completed",
"timestamp": time.Now().Format(time.RFC3339),
})
if err != nil {
xlog.Error("Error marshaling completed status", "error", err)
} else {
manager.Send(
sse.NewMessage(string(completedData)).WithEvent("status"))
sse.NewMessage(string(completedData)).WithEvent("json_status"))
}
}()
// Return immediate success response
return c.Status(fiber.StatusAccepted).JSON(map[string]interface{}{
"status": "message_received",
"status": "message_received",
"message_id": messageID,
})
}

View File

@@ -12,6 +12,7 @@ export function useChat(agentName) {
const [sending, setSending] = useState(false);
const [error, setError] = useState(null);
const processedMessageIds = useRef(new Set());
const localMessageContents = useRef(new Set()); // Track locally added message contents
// Use SSE hook to receive real-time messages
const { messages: sseMessages, statusUpdates, errorMessages, isConnected } = useSSE(agentName);
@@ -42,6 +43,11 @@ export function useChat(agentName) {
// Add to processed set to avoid duplicates
processedMessageIds.current.add(messageData.id);
// Skip user messages that we've already added locally
if (messageData.sender === 'user' && localMessageContents.current.has(messageData.content)) {
return;
}
// Add the message to our state
setMessages(prev => [...prev, {
id: messageData.id,
@@ -115,6 +121,9 @@ export function useChat(agentName) {
setMessages(prev => [...prev, userMessage]);
// Track this message content to avoid duplication from SSE
localMessageContents.current.add(content);
try {
// Use the JSON-based API endpoint
await chatApi.sendMessage(agentName, content);
@@ -131,6 +140,7 @@ export function useChat(agentName) {
const clearChat = useCallback(() => {
setMessages([]);
processedMessageIds.current.clear();
localMessageContents.current.clear(); // Clear tracked local messages
}, []);
return {

View File

@@ -23,7 +23,7 @@ export function useSSE(agentName) {
}
// Create a new EventSource connection
const sseUrl = `${API_CONFIG.baseUrl}${API_CONFIG.endpoints.sse(agentName)}`;
const sseUrl = new URL(`${API_CONFIG.endpoints.sse(agentName)}`, window.location.origin).href;
const eventSource = new EventSource(sseUrl);
eventSourceRef.current = eventSource;