Cancel req send on abort signal

Signed-off-by: Marcos Candeia <[email protected]>
deco-cx · Jun 1, 2024 · f7525bf · f7525bf
1 parent 371927b
commit f7525bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@deco/warp",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "exports": "./mod.ts",
   "tasks": {
     "check": "deno fmt && deno lint && deno check mod.ts"

diff --git a/handlers.client.ts b/handlers.client.ts
@@ -36,6 +36,7 @@ const error: ServerMessageHandler<ErrorMessage> = (state) => {
   state.live = false;
 };
 
+
 /**
  * Handler for the 'request-start' server message.
  * @param {ClientState} state - The client state.

diff --git a/handlers.server.ts b/handlers.server.ts
@@ -67,11 +67,6 @@ const onResponseStart: ClientMessageHandler<ResponseStartMessage> = (
 const data: ClientMessageHandler<DataMessage> = async (state, message) => {
   const request = state.ongoingRequests[message.id];
   if (!request) {
-    console.error(
-      new Date(),
-      "Didn't find response object, unable to send data",
-      message.id,
-    );
     return;
   }
   try {
@@ -89,10 +84,6 @@ const data: ClientMessageHandler<DataMessage> = async (state, message) => {
 const onDataEnd: ClientMessageHandler<DataEndMessage> = (state, message) => {
   const request = state.ongoingRequests[message.id];
   if (!request) {
-    console.error(
-      new Date(),
-      "Didn't find response object, unable to send data",
-    );
     return;
   }
   if (message.error) {
@@ -240,7 +231,6 @@ export const handleClientMessage: ClientMessageHandler = async (
   state,
   message,
 ) => {
-  console.info(new Date(), message.type, "id" in message ? message.id : "");
   await handlersByType?.[message.type]?.(state, message)?.catch?.((err) => {
     console.error(
       "unexpected error happening when handling message",

diff --git a/server.ts b/server.ts
@@ -154,19 +154,19 @@ export const serveHandler = (
         responseBodyChan: makeChan(),
       };
       try {
-        const signal = ch.out.signal;
         await ch.out.send(requestForward);
         const dataChan = req.body ? makeChanStream(req.body) : undefined;
+        const linked = link(ch.out.signal, req.signal);
         (async () => {
           try {
-            for await (const chunk of dataChan?.recv(signal) ?? []) {
+            for await (const chunk of dataChan?.recv(linked) ?? []) {
               await ch.out.send({
                 type: "request-data",
                 id: messageId,
                 chunk,
               });
             }
-            if (signal.aborted) {
+            if (linked.aborted) {
               return;
             }
             await ch.out.send({
@@ -179,7 +179,7 @@ export const serveHandler = (
                 status: 503,
               }),
             );
-            if (signal.aborted) {
+            if (linked.aborted) {
               return;
             }
             console.log(