@anderspitman/fetch-handler 0.2.0 → 0.4.0

package/examples/canceled/main.js

@@ -0,0 +1,43 @@
+import { serve } from '../../fetch_handler.js';
+
+const handler = async (req) => {
+
+  const abortedPromise = new Promise((resolve, reject) => {
+    req.signal.addEventListener('abort', (evt) => {
+      reject("canceled");
+    });
+  });
+
+  const { resPromise, cancelJob } = longrunningJob();
+
+  try {
+    const res = await Promise.race([ resPromise, abortedPromise ]);
+    return res;
+  }
+  catch (e) {
+    cancelJob();
+    console.warn(e);
+  }
+}
+
+function longrunningJob() {
+
+  let timeoutId;
+
+  const resPromise = new Promise((resolve, reject) => {
+    timeoutId = setTimeout(() => {
+      resolve(new Response("Hi there"));
+    }, 3000);
+  });
+
+  function cancelJob() {
+    clearTimeout(timeoutId);
+  }
+
+  return {
+    resPromise,
+    cancelJob,
+  };
+}
+
+serve({ handler, port: 3000 });

package/fetch_handler.js

@@ -19,12 +19,26 @@ async function serve(opt) {
 
         const hasBody = req.method !== "GET" && req.method !== "HEAD";
 
-        return new Request(url, {
+        // TODO: might need to make sure this gets cleaned up after normal
+        // responses.
+        const abortController = new AbortController();
+
+        req.on('close', () => {
+          abortController.abort();
+        });
+
+        const webReq = new Request(url, {
           method: req.method,
           headers: req.headers,
           body: hasBody ? Readable.toWeb(req) : undefined,
           duplex: hasBody ? "half" : undefined,
+          signal: abortController.signal,
         });
+
+        return {
+          req: webReq,
+          abortSignal: abortController.signal,
+        };
       }
 
       function sendResponse(nodeRes, res) {
@@ -49,11 +63,13 @@ async function serve(opt) {
 
       http.createServer(async (nodeReq, nodeRes) => {
 
-        const req = incomingToRequest(nodeReq);
+        const { req, abortSignal } = incomingToRequest(nodeReq);
 
-        const res = await opt.handler(req);
+        const res = await opt.handler(req, nodeReq, nodeRes);
 
-        sendResponse(nodeRes, res);
+        if (res && !abortSignal.aborted) {
+          sendResponse(nodeRes, res);
+        }
 
       }).listen(opt.port);
 

package/package.json

@@ -6,7 +6,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.0",
+  "version": "0.4.0",
   "main": "fetch_handler.js",
   "devDependencies": {},
   "scripts": {