fix: fixes interrupt behavior (#9)

Author: TENSIILE

src/packages/frameworks/express/express.constants.ts

@@ -1,4 +1 @@
-export const ENDPOINT_NAME = '/api/@cancel';
-export const REQUEST_ID = 'requestId';
-export const REQUEST_NOT_FOUND_MESSAGE = 'Request not found';
 export const ENDPOINT_WAS_INTERRUPTED_MESSAGE = 'The endpoint was interrupted';

src/packages/frameworks/express/express.service.ts

@@ -95,86 +95,21 @@ class ExpressRequestInterruptionService {
 
     next();
   };
-
-  public existsRequest = (requestId: string): boolean => {
-    return this.abortRegistries.has(requestId);
-  };
-
-  public removeRequest = (requestId: string): void => {
-    this.abortRegistries.delete(requestId);
-  };
 }
 
 /**
  * Initializes request interruption support for an Express application.
  *
  * This function:
  * - Adds a middleware that attaches an `AbortSignal` to every request.
- * - Adds a POST endpoint (default `/api/@cancel`) that can be called to abort a
- *   specific request by sending its request ID in the request body.
  *
  * @param app - Express application instance.
- * @param options - Configuration options.
- * @param options.endpointName - The path where the abort endpoint will be mounted.
- *                               Defaults to `/api/@cancel`.
+
  * @returns An `ExpressRequestInterruptionService` instance, which can be used
  *          to manually abort requests if needed.
  */
-export const initRequestInterrupts = (
-  app: Express,
-  { endpointName = Constants.ENDPOINT_NAME }: { endpointName?: string } = {}
-) => {
+export const initRequestInterrupts = (app: Express): void => {
   const requestInterruptionService = new ExpressRequestInterruptionService();
 
   app.use(requestInterruptionService.expressMiddleware);
-
-  app.post(endpointName, async (req, res) => {
-    const requestId = await new Promise<string>((resolve) => {
-      let rawBody = '';
-
-      req.on('data', (chunk) => {
-        rawBody += chunk;
-      });
-      req.on('end', () => {
-        resolve(rawBody);
-      });
-    });
-
-    if (!requestInterruptionService.existsRequest(requestId)) {
-      return res.status(202).send();
-    }
-
-    if (requestId && requestInterruptionService.abort(requestId)) {
-      res.status(200).json({ aborted: true });
-    } else {
-      res.status(404).json({ error: Constants.REQUEST_NOT_FOUND_MESSAGE });
-    }
-
-    requestInterruptionService.removeRequest(requestId);
-  });
 };
-
-/**
- * Retrieves the `signal` property from an Express Request object.
- *
- * @param {import('express').Request} req - The Express request object.
- * @returns {AbortSignal | undefined} The abort signal attached to the request,
- *          or `undefined` if the property does not exist.
- *
- * @example
- * // In a route handler
- * app.get('/data', (req, res) => {
- *   const signal = getAbortSignal(req);
- *   fetch('https://api.example.com/data', { signal })
- *     .then(response => response.json())
- *     .then(data => res.json(data))
- *     .catch(err => {
- *       if (err.name === 'AbortError') {
- *         res.status(499).end();
- *       } else {
- *         res.status(500).end();
- *       }
- *     });
- * });
- */
-export const getAbortSignal = (req: Request): AbortSignal | undefined => (req as any).signal;

src/packages/frameworks/express/express.utils.ts

@@ -21,3 +21,28 @@ import { Request } from 'express';
 export const setSignalInExpressRequest = (req: Request, controller: AbortController): void => {
   (req as any).signal = controller.signal;
 };
+
+/**
+ * Retrieves the `signal` property from an Express Request object.
+ *
+ * @param {import('express').Request} req - The Express request object.
+ * @returns {AbortSignal | undefined} The abort signal attached to the request,
+ *          or `undefined` if the property does not exist.
+ *
+ * @example
+ * // In a route handler
+ * app.get('/data', (req, res) => {
+ *   const signal = getAbortSignal(req);
+ *   fetch('https://api.example.com/data', { signal })
+ *     .then(response => response.json())
+ *     .then(data => res.json(data))
+ *     .catch(err => {
+ *       if (err.name === 'AbortError') {
+ *         res.status(499).end();
+ *       } else {
+ *         res.status(500).end();
+ *       }
+ *     });
+ * });
+ */
+export const getAbortSignal = (req: Request): AbortSignal | undefined => (req as any).signal;

src/packages/frameworks/express/index.ts

@@ -1 +1,2 @@
 export * from './express.service';
+export { getAbortSignal } from './express.utils';