fix: logic

webpack · Jul 17, 2024 · c568f03 · c568f03
1 parent d9f1c54
commit c568f03
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/src/index.js b/src/index.js
@@ -408,21 +408,24 @@ function koaWrapper(compiler, options) {
             resolve();
           };
           /**
-           * @param {string | Buffer} content content
+           * @param {string | Buffer} data data
            */
-          res.send = (content) => {
+          res.send = (data) => {
             // eslint-disable-next-line no-param-reassign
-            ctx.body = content;
+            ctx.body = data;
             resolve();
           };
 
-          res.finish = () => {
+          /**
+           * @param {string | Buffer} [data] data
+           */
+          res.finish = (data) => {
             if (status === 404) {
               // eslint-disable-next-line no-param-reassign
               ctx.status = 200;
             }
 
-            res.end();
+            res.end(data);
             resolve();
           };
 
@@ -565,15 +568,18 @@ function honoWrapper(compiler, options) {
           };
 
           /**
-           * @param {string | Buffer} bufferOrString readable stream
+           * @param {string | Buffer} data data
            */
-          res.send = (bufferOrString) => {
-            body = c.body(bufferOrString);
+          res.send = (data) => {
+            body = c.body(data);
             resolve();
           };
 
-          res.finish = () => {
-            body = c.body(null);
+          /**
+           * @param {string | Buffer} [data] data
+           */
+          res.finish = (data) => {
+            body = data ? c.body(data) : c.body(null);
             resolve();
           };
 

diff --git a/src/middleware.js b/src/middleware.js
@@ -220,7 +220,7 @@ function wrapper(context) {
 
       setResponseHeader(res, "Content-Length", byteLength);
 
-      send(res, document);
+      finish(res, document);
     }
 
     function isConditionalGET() {
@@ -632,6 +632,7 @@ function wrapper(context) {
           removeResponseHeader(res, "Content-Length");
           removeResponseHeader(res, "Content-Range");
           removeResponseHeader(res, "Content-Type");
+
           finish(res);
 
           return;

diff --git a/src/utils/compatibleAPI.js b/src/utils/compatibleAPI.js
@@ -16,7 +16,7 @@
  * @property {(name: string, value: number | string | Readonly<string[]>) => ExpectedServerResponse} [setHeader]
  * @property {(name: string) => void} [removeHeader]
  * @property {(data: string | Buffer) => void} [send]
- * @property {() => void} [finish]
+ * @property {(data?: string | Buffer) => void} [finish]
  * @property {() => string[]} [getResponseHeaders]
  * @property {(data: any) => void} [stream]
  * @property {() => any} [getOutgoing]
@@ -180,16 +180,17 @@ function send(res, bufferOrString) {
 /**
  * @template {ServerResponse & ExpectedServerResponse} Response
  * @param {Response} res
+ * @param {string | Buffer} [data]
  */
-function finish(res) {
+function finish(res, data) {
   // Pseudo API and Express API and Koa API
   if (typeof res.finish === "function") {
-    res.finish();
+    res.finish(data);
     return;
   }
 
   // Pseudo API and Express API and Koa API
-  res.end();
+  res.end(data);
 }
 
 /**

diff --git a/test/middleware.test.js b/test/middleware.test.js
@@ -2814,7 +2814,7 @@ describe.each([
         });
       });
 
-      describe.skip("should handle custom fs errors and response 500 code", () => {
+      describe("should handle custom fs errors and response 500 code", () => {
         let compiler;
 
         const outputPath = path.resolve(
@@ -2886,7 +2886,7 @@ describe.each([
         });
       });
 
-      describe.skip("should handle known fs errors and response 404 code", () => {
+      describe("should handle known fs errors and response 404 code", () => {
         let compiler;
 
         const outputPath = path.resolve(

diff --git a/types/utils/compatibleAPI.d.ts b/types/utils/compatibleAPI.d.ts
@@ -19,7 +19,7 @@ export type ExpectedServerResponse = {
     | undefined;
   removeHeader?: ((name: string) => void) | undefined;
   send?: ((data: string | Buffer) => void) | undefined;
-  finish?: (() => void) | undefined;
+  finish?: ((data?: string | Buffer) => void) | undefined;
   getResponseHeaders?: (() => string[]) | undefined;
   stream?: ((data: any) => void) | undefined;
   getOutgoing?: (() => any) | undefined;
@@ -57,7 +57,7 @@ export function getStatusCode<
  * @property {(name: string, value: number | string | Readonly<string[]>) => ExpectedServerResponse} [setHeader]
  * @property {(name: string) => void} [removeHeader]
  * @property {(data: string | Buffer) => void} [send]
- * @property {() => void} [finish]
+ * @property {(data?: string | Buffer) => void} [finish]
  * @property {() => string[]} [getResponseHeaders]
  * @property {(data: any) => void} [stream]
  * @property {() => any} [getOutgoing]
@@ -148,10 +148,11 @@ export function send<Response extends ServerResponse & ExpectedServerResponse>(
 /**
  * @template {ServerResponse & ExpectedServerResponse} Response
  * @param {Response} res
+ * @param {string | Buffer} [data]
  */
 export function finish<
   Response extends ServerResponse & ExpectedServerResponse,
->(res: Response): void;
+>(res: Response, data?: string | Buffer | undefined): void;
 /**
  * @param {string} filename
  * @param {import("../index").OutputFileSystem} outputFileSystem