address PR feedback

Author: svozza

packages/event-handler/src/rest/utils.ts

@@ -1,4 +1,4 @@
-import { Duplex, Readable, Writable } from 'node:stream';
+import { Duplex, Readable } from 'node:stream';
 import {
   isRecord,
   isRegExp,
@@ -18,9 +18,9 @@ import type {
   HandlerResponse,
   HttpMethod,
   HttpStatusCode,
-  ResponseStream as IResponseStream,
   Middleware,
   Path,
+  ResponseStream,
   ValidationResult,
 } from '../types/rest.js';
 import {
@@ -306,35 +306,35 @@ export const resolvePrefixedPath = (path: Path, prefix?: Path): Path => {
   return `${prefix}${path}`.replace(/\/$/, '') as Path;
 };
 
-export class ResponseStream extends Writable implements IResponseStream {
-  // biome-ignore lint/correctness/noUnusedPrivateClassMembers: This is how the Lambda RIC implements it
-  #contentType: string | undefined;
-  readonly #chunks: Buffer[] = [];
-  public _onBeforeFirstWrite?: (
-    write: (data: Uint8Array | string) => void
-  ) => void;
-  #firstWrite = true;
-
-  setContentType(contentType: string) {
-    this.#contentType = contentType;
-  }
-
-  _write(chunk: Buffer, _encoding: string, callback: () => void): void {
-    /* v8 ignore else -- @preserve */
-    if (this.#firstWrite && this._onBeforeFirstWrite) {
-      this._onBeforeFirstWrite((data: Uint8Array | string) => {
-        this.#chunks.push(Buffer.from(data));
-      });
-      this.#firstWrite = false;
-    }
-    this.#chunks.push(chunk);
-    callback();
-  }
-
-  public getBuffer(): Buffer {
-    return Buffer.concat(this.#chunks);
-  }
-}
+// export class ResponseStream extends Writable implements IResponseStream {
+//   // biome-ignore lint/correctness/noUnusedPrivateClassMembers: This is how the Lambda RIC implements it
+//   #contentType: string | undefined;
+//   readonly #chunks: Buffer[] = [];
+//   public _onBeforeFirstWrite?: (
+//     write: (data: Uint8Array | string) => void
+//   ) => void;
+//   #firstWrite = true;
+//
+//   setContentType(contentType: string) {
+//     this.#contentType = contentType;
+//   }
+//
+//   _write(chunk: Buffer, _encoding: string, callback: () => void): void {
+//     /* v8 ignore else -- @preserve */
+//     if (this.#firstWrite && this._onBeforeFirstWrite) {
+//       this._onBeforeFirstWrite((data: Uint8Array | string) => {
+//         this.#chunks.push(Buffer.from(data));
+//       });
+//       this.#firstWrite = false;
+//     }
+//     this.#chunks.push(chunk);
+//     callback();
+//   }
+//
+//   public getBuffer(): Buffer {
+//     return Buffer.concat(this.#chunks);
+//   }
+// }
 
 export const HttpResponseStream =
   globalThis.awslambda?.HttpResponseStream ??
@@ -428,7 +428,7 @@ const streamifyResponse =
 
       /* v8 ignore next -- @preserve */
       const output: Buffer =
-        (responseStream as IResponseStream).getBuffer?.() ?? Buffer.from([]);
+        (responseStream as ResponseStream).getBuffer?.() ?? Buffer.from([]);
       const nullBytes = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
       const separatorIndex = output.indexOf(nullBytes);
 

packages/event-handler/tests/unit/rest/Router/decorators.test.ts

@@ -9,7 +9,6 @@ import {
   streamify,
   UnauthorizedError,
 } from '../../../../src/rest/index.js';
-import { ResponseStream } from '../../../../src/rest/utils.js';
 import type { RequestContext } from '../../../../src/types/rest.js';
 import {
   createHandler,
@@ -18,6 +17,7 @@ import {
   createTestEventV2,
   createTestLambdaClass,
   createTrackingMiddleware,
+  ResponseStream,
 } from '../helpers.js';
 
 describe.each([

packages/event-handler/tests/unit/rest/Router/streaming.test.ts

@@ -6,8 +6,11 @@ import {
   streamify,
   UnauthorizedError,
 } from '../../../../src/rest/index.js';
-import { ResponseStream } from '../../../../src/rest/utils.js';
-import { createTestEvent, createTestEventV2 } from '../helpers.js';
+import {
+  createTestEvent,
+  createTestEventV2,
+  ResponseStream,
+} from '../helpers.js';
 
 describe.each([
   { version: 'V1', createEvent: createTestEvent },

packages/event-handler/tests/unit/rest/helpers.ts

@@ -1,3 +1,4 @@
+import { Writable } from 'node:stream';
 import type {
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
@@ -6,7 +7,11 @@ import type {
   Context,
 } from 'aws-lambda';
 import type { Router } from '../../../src/rest/Router.js';
-import type { HandlerResponse, Middleware } from '../../../src/types/rest.js';
+import type {
+  HandlerResponse,
+  ResponseStream as IResponseStream,
+  Middleware,
+} from '../../../src/types/rest.js';
 
 export const createTestEvent = (
   path: string,
@@ -128,6 +133,36 @@ export const createHeaderCheckMiddleware = (headers: {
   };
 };
 
+export class ResponseStream extends Writable implements IResponseStream {
+  // biome-ignore lint/correctness/noUnusedPrivateClassMembers: This is how the Lambda RIC implements it
+  #contentType: string | undefined;
+  readonly #chunks: Buffer[] = [];
+  public _onBeforeFirstWrite?: (
+    write: (data: Uint8Array | string) => void
+  ) => void;
+  #firstWrite = true;
+
+  setContentType(contentType: string) {
+    this.#contentType = contentType;
+  }
+
+  _write(chunk: Buffer, _encoding: string, callback: () => void): void {
+    /* v8 ignore else -- @preserve */
+    if (this.#firstWrite && this._onBeforeFirstWrite) {
+      this._onBeforeFirstWrite((data: Uint8Array | string) => {
+        this.#chunks.push(Buffer.from(data));
+      });
+      this.#firstWrite = false;
+    }
+    this.#chunks.push(chunk);
+    callback();
+  }
+
+  public getBuffer(): Buffer {
+    return Buffer.concat(this.#chunks);
+  }
+}
+
 // Create a handler function from the Router instance
 export const createHandler = (app: Router) => {
   function handler(