@fatcherjs/middleware-aborter 3.0.0-alpha-9 → 3.0.0-alpha-11

package/README.md

@@ -69,7 +69,7 @@ import { aborter, timeout } from '@fatcherjs/middleware-aborter';
 fatcher('https://foo.bar', {
   onAbort: () => console.log('aborted'),
   timeout: 1000 * 10, // 10s
-  middlewares: [aborter(), timeout() /* must call after aborter */],
+  middlewares: [aborter, timeout /* must call after aborter */],
 });
 ```
 
@@ -84,7 +84,7 @@ const abortController = new AbortController();
 fatcher('https://foo.bar', {
   onAbort: () => console.log('aborted'),
   abortController,
-  middlewares: [aborter()],
+  middlewares: [aborter],
 }).catch(error => {
   // abort error
 });
@@ -103,7 +103,7 @@ const abortController = new AbortController();
 fatcher('https://foo.bar', {
   onAbort: () => console.log('aborted'),
   abortController,
-  middlewares: [aborter()],
+  middlewares: [aborter],
 }).catch(error => {
   if (isAbortError(error)) {
     // do something..

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { FatcherMiddleware } from 'fatcher';
 
-declare const aborter: () => FatcherMiddleware;
+declare const aborter: FatcherMiddleware;
 
 /**
  * Confirm an error whether is DOMException
@@ -9,16 +9,16 @@ declare const aborter: () => FatcherMiddleware;
  */
 declare function isAbortError(error: unknown): error is DOMException;
 
-declare const timeout: () => FatcherMiddleware;
+declare const timeout: FatcherMiddleware;
 
 declare module 'fatcher' {
-    interface FatcherRequest {
-        abort: (reason?: string) => void;
-    }
     interface FatcherOptions {
-        timeout?: number;
         onAbort?: (reason?: string) => void;
         abortController?: AbortController;
+        timeout?: number;
+    }
+    interface FatcherContext {
+        abort: (reason?: string) => void;
     }
 }
 

package/dist/index.esm.js

@@ -1,6 +1,9 @@
-const aborter = () => {
-  return async (req, next) => {
-    const { onAbort, abortController = new AbortController() } = req.options;
+import 'fatcher';
+
+const aborter = {
+  name: "fatcher-middleware-aborter",
+  use: async (request, next) => {
+    const { onAbort, abortController = new AbortController() } = request;
     const handler = () => {
       onAbort?.(abortController.signal.reason);
       abortController.signal.removeEventListener("abort", handler);
@@ -16,19 +19,17 @@ const aborter = () => {
       abortController.signal.removeEventListener("abort", handler);
     }
     return response;
-  };
+  }
 };
 
 function isAbortError(error) {
   return error instanceof DOMException && error.name === "AbortError";
 }
 
-const timeout = () => {
-  return async (req, next) => {
-    const {
-      abort,
-      options: { timeout: _timeout }
-    } = req;
+const timeout = {
+  name: "fatcher-middleware-timeout",
+  use: async (context, next) => {
+    const { abort, timeout: _timeout } = context;
     let timer = null;
     if (_timeout) {
       timer = setTimeout(() => {
@@ -45,7 +46,7 @@ const timeout = () => {
       throw error;
     }
     return response;
-  };
+  }
 };
 
 export { aborter, isAbortError, timeout };

package/dist/index.js

@@ -2,9 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const aborter = () => {
-  return async (req, next) => {
-    const { onAbort, abortController = new AbortController() } = req.options;
+require('fatcher');
+
+const aborter = {
+  name: "fatcher-middleware-aborter",
+  use: async (request, next) => {
+    const { onAbort, abortController = new AbortController() } = request;
     const handler = () => {
       onAbort?.(abortController.signal.reason);
       abortController.signal.removeEventListener("abort", handler);
@@ -20,19 +23,17 @@ const aborter = () => {
       abortController.signal.removeEventListener("abort", handler);
     }
     return response;
-  };
+  }
 };
 
 function isAbortError(error) {
   return error instanceof DOMException && error.name === "AbortError";
 }
 
-const timeout = () => {
-  return async (req, next) => {
-    const {
-      abort,
-      options: { timeout: _timeout }
-    } = req;
+const timeout = {
+  name: "fatcher-middleware-timeout",
+  use: async (context, next) => {
+    const { abort, timeout: _timeout } = context;
     let timer = null;
     if (_timeout) {
       timer = setTimeout(() => {
@@ -49,7 +50,7 @@ const timeout = () => {
       throw error;
     }
     return response;
-  };
+  }
 };
 
 exports.aborter = aborter;

package/dist/index.min.js

@@ -1 +1 @@
-(function(t,i){typeof exports=="object"&&typeof module!="undefined"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(t=typeof globalThis!="undefined"?globalThis:t||self,i(t.FatcherMiddlewareAborter={}))})(this,function(t){"use strict";const i=()=>async(o,a)=>{const{onAbort:r,abortController:e=new AbortController}=o.options,n=()=>{r==null||r(e.signal.reason),e.signal.removeEventListener("abort",n)};r&&e.signal.addEventListener("abort",n);const s=await a({abort:e.abort.bind(e),signal:e.signal});return r&&e.signal.removeEventListener("abort",n),s};function u(o){return o instanceof DOMException&&o.name==="AbortError"}const l=()=>async(o,a)=>{const{abort:r,options:{timeout:e}}=o;let n=null;e&&(n=setTimeout(()=>{r()},e));let s;try{s=await a()}catch(c){throw n&&clearTimeout(n),c}return s};t.aborter=i,t.isAbortError=u,t.timeout=l,Object.defineProperty(t,"__esModule",{value:!0})});
+(function(t,i){typeof exports=="object"&&typeof module!="undefined"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(t=typeof globalThis!="undefined"?globalThis:t||self,i(t.FatcherMiddlewareAborter={}))})(this,function(t){"use strict";const i={name:"fatcher-middleware-aborter",use:async(o,s)=>{const{onAbort:r,abortController:e=new AbortController}=o,n=()=>{r==null||r(e.signal.reason),e.signal.removeEventListener("abort",n)};r&&e.signal.addEventListener("abort",n);const a=await s({abort:e.abort.bind(e),signal:e.signal});return r&&e.signal.removeEventListener("abort",n),a}};function u(o){return o instanceof DOMException&&o.name==="AbortError"}const l={name:"fatcher-middleware-timeout",use:async(o,s)=>{const{abort:r,timeout:e}=o;let n=null;e&&(n=setTimeout(()=>{r()},e));let a;try{a=await s()}catch(c){throw n&&clearTimeout(n),c}return a}};t.aborter=i,t.isAbortError=u,t.timeout=l,Object.defineProperty(t,"__esModule",{value:!0})});

package/package.json

@@ -13,12 +13,12 @@
     "dist"
   ],
   "peerDependencies": {
-    "fatcher": "3.0.0-alpha-9"
+    "fatcher": "3.0.0-alpha-11"
   },
   "devDependencies": {
-    "fatcher": "3.0.0-alpha-9"
+    "fatcher": "3.0.0-alpha-11"
   },
-  "version": "3.0.0-alpha-9",
+  "version": "3.0.0-alpha-11",
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && rollup -c rollup.config.ts",