Merge f2e94f1 into 9fc4352

tsedio · Dec 27, 2021 · eac4818 · eac4818
2 parents 9fc4352 + f2e94f1
commit eac4818
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/packages/platform/common/src/domain/AnyToPromiseWithCtx.ts b/packages/platform/common/src/domain/AnyToPromiseWithCtx.ts
@@ -1,4 +1,4 @@
-import {AnyPromiseResult, AnyToPromise, AnyToPromiseStatus} from "@tsed/core";
+import {AnyPromiseResult, AnyToPromise} from "@tsed/core";
 import {PlatformContext} from "./PlatformContext";
 
 /**
@@ -22,17 +22,7 @@ export class AnyToPromiseWithCtx extends AnyToPromise {
   isDone(): boolean {
     const {$ctx} = this;
 
-    if (!$ctx?.isDone()) {
-      if ($ctx?.request.isAborted() || $ctx?.response.isDone()) {
-        this.destroy();
-
-        if (this.status === AnyToPromiseStatus.PENDING) {
-          this.status = AnyToPromiseStatus.RESOLVED;
-        }
-      }
-    }
-
-    return super.isDone();
+    return $ctx?.isDone() || super.isDone();
   }
 
   async call(cb: Function): Promise<AnyPromiseResult<any>> {

diff --git a/packages/platform/common/src/domain/PlatformContext.ts b/packages/platform/common/src/domain/PlatformContext.ts
@@ -103,7 +103,15 @@ export class PlatformContext extends DIContext implements ContextMethods {
   }
 
   isDone() {
-    return !this.request || !this.response;
+    if (!this.request || !this.response) {
+      return true;
+    }
+
+    if (this.request?.isAborted()) {
+      return true;
+    }
+
+    return this.response?.isDone();
   }
 
   /**

diff --git a/packages/platform/common/src/services/PlatformHandler.ts b/packages/platform/common/src/services/PlatformHandler.ts
@@ -125,7 +125,7 @@ export class PlatformHandler {
   protected async onRequest(requestOptions: OnRequestOptions): Promise<any> {
     const {$ctx, metadata, err, handler} = requestOptions;
     // istanbul ignore next
-    if (!$ctx) {
+    if (!$ctx || $ctx.isDone()) {
       $log.error({
         name: "HEADERS_SENT",
         message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${metadata.toString()}`
@@ -170,7 +170,7 @@ export class PlatformHandler {
     }
 
     // istanbul ignore next
-    if (!$ctx?.response?.isHeadersSent || $ctx.response.isHeadersSent()) {
+    if (!$ctx || $ctx?.isDone()) {
       $log.warn({
         name: "HEADERS_SENT",
         message: `An error was caught after the headers were sent to the client. The error comes from the handler: ${metadata.toString()}`,
@@ -194,9 +194,8 @@ export class PlatformHandler {
   protected async onSuccess(data: any, requestOptions: OnRequestOptions) {
     const {metadata, $ctx, next} = requestOptions;
 
-    // TODO see this control is necessary
     // istanbul ignore next
-    if ($ctx.request.isAborted() || $ctx.response.isDone()) {
+    if ($ctx?.isDone()) {
       return;
     }
 

diff --git a/packages/platform/platform-express/cancel-request.js b/packages/platform/platform-express/cancel-request.js
@@ -0,0 +1,19 @@
+const axios = require("axios");
+
+const source = axios.CancelToken.source();
+
+const options = {
+  method: "GET",
+  url: "http://localhost:8081/rest/hello/something",
+  cancelToken: source.token
+};
+
+setTimeout(() => {
+  console.log("==START CANCEL");
+  source.cancel();
+}, 5000);
+
+axios
+  .request(options)
+  .then((response) => console.log(response.data))
+  .catch((error) => console.error(error));
diff --git a/packages/platform/platform-express/test/app/index.ts b/packages/platform/platform-express/test/app/index.ts
@@ -1,5 +1,6 @@
 import {$log, BodyParams, Controller, Get, PlatformResponse, Post, QueryParams, Res} from "@tsed/common";
 import {Returns} from "@tsed/schema";
+import {promisify} from "util";
 import {agent, SuperAgentStatic} from "superagent";
 import {PlatformExpress} from "../../src";
 import {Server} from "./Server";
@@ -12,6 +13,12 @@ if (process.env.NODE_ENV !== "test") {
       return {test: "Hello world"};
     }
 
+    @Get('/something')
+    @Returns(204)
+    public async getSomething(): Promise<void> {
+      await promisify(setTimeout)(10000);
+    }
+
     @Get("/image")
     @Returns(200).Header("X-Content-Type-Options", "nosniff")
     async getGoogle(@Res() res: PlatformResponse) {