this is better

Author: RulaKhaled

packages/cloudflare/src/request.ts

@@ -51,13 +51,14 @@ export function wrapRequestHandler(
 
     const waitUntil = context?.waitUntil?.bind?.(context);
 
-    // Track flush promise to ensure it's only scheduled once
-    let flushPromise: Promise<boolean> | null = null;
+    // Track whether flush has been scheduled globally for this request
+    let flushScheduled = false;
     const scheduleFlush = (timeout: number = 2000): void => {
-      if (!flushPromise && waitUntil) {
-        flushPromise = flush(timeout);
-        waitUntil(flushPromise);
+      if (flushScheduled || !waitUntil) {
+        return;
       }
+      flushScheduled = true;
+      waitUntil(flush(timeout));
     };
 
     const client = init({ ...options, ctx: context });
@@ -151,15 +152,12 @@ export function wrapRequestHandler(
                 clearTimeout(timeout);
                 reader.releaseLock();
                 span.end();
+                // Always schedule flush exactly once
+                scheduleFlush();
               }
             })();
 
-            // Use waitUntil to keep context alive and flush after span ends
-            if (waitUntil && !flushPromise) {
-              flushPromise = streamMonitor.then(() => flush(2000));
-              waitUntil(flushPromise);
-            } else if (waitUntil && flushPromise) {
-              // Just wait for the stream to complete
+            if (waitUntil) {
               waitUntil(streamMonitor);
             }