fix: the server need use headersSent without use flushHeader (#4660)

* fix: the server need use headersSent without use flushHeader * fix: add new vars
web-infra-dev · Sep 20, 2023 · 411cea2 · 411cea2
1 parent 14f95cf
commit 411cea2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/.changeset/moody-parents-breathe.md b/.changeset/moody-parents-breathe.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/prod-server': patch
+---
+
+fix(prod-server): the server need use headersSent without use flushHeader
+fix(prod-server): 没有 flushHeader 时 server 应该使用 headersSent
diff --git a/packages/server/prod-server/src/libs/preload/flushServerHeader.ts b/packages/server/prod-server/src/libs/preload/flushServerHeader.ts
@@ -37,4 +37,5 @@ export async function flushServerHeader({
   }
 
   res.flushHeaders();
+  res.modernFlushedHeaders = true;
 }
diff --git a/packages/server/prod-server/src/server/modernServer.ts b/packages/server/prod-server/src/server/modernServer.ts
@@ -635,7 +635,11 @@ export class ModernServer implements ModernServerInterface {
 
   private isSend(res: ServerResponse) {
     /// Is true after response.end() has been called.
-    if (res.writableEnded) {
+    if (res.modernFlushedHeaders) {
+      if (res.writableFinished) {
+        return true;
+      }
+    } else if (res.headersSent) {
       return true;
     }
 

diff --git a/packages/server/prod-server/src/type.ts b/packages/server/prod-server/src/type.ts
@@ -21,6 +21,7 @@ declare module 'http' {
 
   interface OutgoingMessage {
     set: (key: string, value: any) => this;
+    modernFlushedHeaders?: boolean;
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,5 @@ export async function flushServerHeader({ @@
       }
       res.flushHeaders();
+      res.modernFlushedHeaders = true;
     }