quick refactor

Author: RulaKhaled

packages/cloudflare/src/request.ts

@@ -51,6 +51,15 @@ export function wrapRequestHandler(
 
     const waitUntil = context?.waitUntil?.bind?.(context);
 
+    // Track whether flush has been scheduled to prevent duplicate calls
+    let flushScheduled = false;
+    const scheduleFlush = (timeout: number = 2000): void => {
+      if (!flushScheduled && waitUntil) {
+        flushScheduled = true;
+        waitUntil(flush(timeout));
+      }
+    };
+
     const client = init({ ...options, ctx: context });
     isolationScope.setClient(client);
 
@@ -89,7 +98,7 @@ export function wrapRequestHandler(
         }
         throw e;
       } finally {
-        waitUntil?.(flush(2000));
+        scheduleFlush();
       }
     }
 
@@ -112,7 +121,7 @@ export function wrapRequestHandler(
             if (captureErrors) {
               captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });
             }
-            waitUntil?.(flush(2000));
+            scheduleFlush();
             throw e;
           }
 
@@ -146,7 +155,10 @@ export function wrapRequestHandler(
             })();
 
             // Use waitUntil to keep context alive and flush after span ends
-            waitUntil?.(streamMonitor.then(() => flush(2000)));
+            if (waitUntil) {
+              flushScheduled = true;
+              waitUntil(streamMonitor.then(() => flush(2000)));
+            }
 
             // Return response with client stream
             return new Response(clientStream, {
@@ -158,7 +170,7 @@ export function wrapRequestHandler(
 
           // Non-streaming response - end span immediately and return original
           span.end();
-          waitUntil?.(flush(2000));
+          scheduleFlush();
           return classification.response;
         });
       },