Merge 5d60ab1139 into 7955d8e408

src/app/api/search/route.ts

@@ -146,10 +146,7 @@ export const POST = async (req: Request) => {
               }
             } catch (error) {
               reject(
-                Response.json(
+                Response.json({ message: 'Error parsing data' }, { status: 500 }),
-                  { message: 'Error parsing data' },
-                  { status: 500 },
-                ),
               );
             }
           });
@@ -160,10 +157,7 @@ export const POST = async (req: Request) => {
 
           emitter.on('error', (error: any) => {
             reject(
-              Response.json(
+              Response.json({ message: 'Search error', error }, { status: 500 }),
-                { message: 'Search error', error },
-                { status: 500 },
-              ),
             );
           });
         },
@@ -171,56 +165,52 @@ export const POST = async (req: Request) => {
     }
 
     const encoder = new TextEncoder();
-
+    
+    // Create an AbortController to handle cancellation
     const abortController = new AbortController();
     const { signal } = abortController;
-
+    
     const stream = new ReadableStream({
       start(controller) {
         let sources: any[] = [];
 
-        controller.enqueue(
+        // Send an initial message to keep the connection alive
-          encoder.encode(
+        controller.enqueue(encoder.encode(JSON.stringify({
-            JSON.stringify({
+          type: 'init',
-              type: 'init',
+          data: 'Stream connected'
-              data: 'Stream connected',
+        }) + '\n'));
-            }) + '\n',
-          ),
-        );
 
+        // Set up cleanup function for when client disconnects
         signal.addEventListener('abort', () => {
+          // Remove all listeners from emitter to prevent memory leaks
           emitter.removeAllListeners();
-
+          
+          // Close the controller if it's still active
           try {
             controller.close();
-          } catch (error) {}
+          } catch (error) {
+            // Controller might already be closed
+          }
         });
 
         emitter.on('data', (data: string) => {
+          // Check if request has been cancelled before processing
           if (signal.aborted) return;
-
+          
           try {
             const parsedData = JSON.parse(data);
-
+            
             if (parsedData.type === 'response') {
-              controller.enqueue(
+              controller.enqueue(encoder.encode(JSON.stringify({
-                encoder.encode(
+                type: 'response',
-                  JSON.stringify({
+                data: parsedData.data
-                    type: 'response',
+              }) + '\n'));
-                    data: parsedData.data,
-                  }) + '\n',
-                ),
-              );
             } else if (parsedData.type === 'sources') {
               sources = parsedData.data;
-              controller.enqueue(
+              controller.enqueue(encoder.encode(JSON.stringify({
-                encoder.encode(
+                type: 'sources',
-                  JSON.stringify({
+                data: sources
-                    type: 'sources',
+              }) + '\n'));
-                    data: sources,
-                  }) + '\n',
-                ),
-              );
             }
           } catch (error) {
             controller.error(error);
@@ -228,34 +218,32 @@ export const POST = async (req: Request) => {
         });
 
         emitter.on('end', () => {
+          // Check if request has been cancelled before processing
           if (signal.aborted) return;
-
+          
-          controller.enqueue(
+          controller.enqueue(encoder.encode(JSON.stringify({
-            encoder.encode(
+            type: 'done'
-              JSON.stringify({
+          }) + '\n'));
-                type: 'done',
-              }) + '\n',
-            ),
-          );
           controller.close();
         });
 
         emitter.on('error', (error: any) => {
+          // Check if request has been cancelled before processing
           if (signal.aborted) return;
-
+          
           controller.error(error);
         });
       },
       cancel() {
         abortController.abort();
-      },
+      }
     });
 
     return new Response(stream, {
       headers: {
-        'Content-Type': 'text/event-stream',
+        'Content-Type': 'application/json',
         'Cache-Control': 'no-cache, no-transform',
-        Connection: 'keep-alive',
+        'Connection': 'keep-alive',
       },
     });
   } catch (err: any) {