wip

khuezy · khuezy · commit 8220e758b456 · 2023-09-14T19:46:42.000-07:00
diff --git a/packages/open-next/src/adapters/http/responseStreaming.ts b/packages/open-next/src/adapters/http/responseStreaming.ts
@@ -120,9 +120,14 @@ export class StreamingServerResponse extends http.ServerResponse {
       this[HEADERS] = {
         ...this[HEADERS],
         ...this._initialHeaders,
-        "content-encoding": "br",
       };
 
+      console.log("~~thisheaders: ", this[HEADERS]);
+      if (this[HEADERS]["accept-encoding"]?.includes("br")) {
+        console.log("~~setting encoding to br");
+        this[HEADERS]["content-encoding"] = "br";
+      }
+
       debug("writeHead", this[HEADERS]);
 
       this._wroteHeader = true;
@@ -150,11 +155,15 @@ export class StreamingServerResponse extends http.ServerResponse {
 
       setImmediate(() => {
         this.responseStream.write(new Uint8Array(8));
-        const br = zlib.createBrotliCompress({
-          flush: zlib.constants.BROTLI_OPERATION_FLUSH,
-        });
-        br.pipe(this.responseStream);
-        this.responseStream = br as unknown as ResponseStream;
+        console.log("~~accept-encoding:", this[HEADERS]["accept-encoding"]);
+
+        if (this[HEADERS]["accept-encoding"]?.includes("br")) {
+          const br = zlib.createBrotliCompress({
+            flush: zlib.constants.BROTLI_OPERATION_FLUSH,
+          });
+          br.pipe(this.responseStream);
+          this.responseStream = br as unknown as ResponseStream;
+        }
       });
 
       debug("writeHead", this[HEADERS]);
diff --git a/packages/open-next/src/adapters/plugins/routing/default.replacement.ts b/packages/open-next/src/adapters/plugins/routing/default.replacement.ts
@@ -39,7 +39,7 @@ export const processInternalEvent: ProcessInternalEvent = async (
   createResponse,
 ) => {
   const nextHeaders = addNextConfigHeaders(event, configHeaders) ?? {};
-  debug("nextHeaders", nextHeaders);
+  console.log("~~nextHeaders", nextHeaders);
 
   let internalEvent = fixDataPage(event, buildId);
 
diff --git a/packages/open-next/src/adapters/plugins/streaming.replacement.ts b/packages/open-next/src/adapters/plugins/streaming.replacement.ts
@@ -32,6 +32,7 @@ export const lambdaHandler = awslambda.streamifyResponse(async function (
   responseStream: ResponseStream,
 ) {
   debug("event", event);
+  console.log("~~url: ", event);
 
   // Handler warmer
   if ("type" in event) {
@@ -76,6 +77,9 @@ export const lambdaHandler = awslambda.streamifyResponse(async function (
   );
   if ("type" in preprocessResult) {
     const headers = preprocessResult.headers;
+    headers["cookie"] = internalEvent.headers["cookie"];
+    headers["accept-encoding"] = internalEvent.headers["accept-encoding"];
+
     const res = createServerResponse("GET", headers);
 
     setImmediate(() => {
