fix page static props and streaming not always starting

conico974 · khuezy · commit f16b50f23a4d · 2023-09-08T08:42:28.000-07:00
diff --git a/packages/open-next/src/adapters/http/responseStreaming.ts b/packages/open-next/src/adapters/http/responseStreaming.ts
@@ -42,13 +42,27 @@ export class StreamingServerResponse extends http.ServerResponse {
     try {
       this.fixHeaders(this[HEADERS]);
       this._wroteHeader = true;
-      this.responseStream = awslambda.HttpResponseStream.from(
-        this.responseStream,
-        {
-          statusCode: statusCode as number,
-          headers: this[HEADERS],
-        },
+      // FIXME: This is extracted from the docker lambda node 18 runtime
+      // https://gist.github.com/conico974/13afd708af20711b97df439b910ceb53#file-index-mjs-L921-L932
+      // We replace their write with ours which are inside a process.nextTick
+      // This way it seems to work all the time
+      // I think we can't ship this code as it is, it could break at anytime if they decide to change the runtime and they already did it in the past
+      this.responseStream.setContentType(
+        "application/vnd.awslambda.http-integration-response",
       );
+      const prelude = JSON.stringify({
+        statusCode: statusCode as number,
+        headers: this[HEADERS],
+      });
+      this.internalWrite(prelude);
+      this.internalWrite(new Uint8Array(8));
+      // this.responseStream = awslambda.HttpResponseStream.from(
+      //   this.responseStream,
+      //   {
+      //     statusCode: statusCode as number,
+      //     headers: this[HEADERS],
+      //   },
+      // );
 
       debug("writeHead", this[HEADERS]);
     } catch (e) {
@@ -76,22 +90,23 @@ export class StreamingServerResponse extends http.ServerResponse {
       this.internalWrite(chunk);
     }
 
-    if (!this._hasWritten) {
-      // We need to send data here, otherwise the stream will not end at all
+    if (!this._hasWritten && !chunk) {
+      // We need to send data here if there is none, otherwise the stream will not end at all
       this.internalWrite(new Uint8Array(8));
     }
 
-    setImmediate(() => {
+    process.nextTick(() => {
       this.responseStream.end(() => {
+        // The callback seems necessary here
         debug("stream end", chunk);
       });
     });
-    debug("stream end", chunk);
+    // debug("stream end", chunk);
     return this;
   }
 
   private internalWrite(chunk: any) {
-    setImmediate(() => {
+    process.nextTick(() => {
       this.responseStream.write(chunk);
       this._hasWritten = true;
     });
