kbfetch 1.0.6 → 1.0.8

package/README.md

@@ -37,7 +37,6 @@ kbfetch.g('https://baidu.com', { method: 'PATCH' })
 ```
 
 取消请求示例：
-`timeout!=-1时,canAbort可以不设置`
 
 ```js
 const ft = kbfetch.post('https://api.example.com/data', { id: 1 }, { canAbort: true })
@@ -45,7 +44,7 @@ ft.abort()
 ```
 
 `or`
-
+`timeout>=0`
 ```js
 const ft = kbfetch.g('https://api.example.com/data', { params: { id: 1 }, timeout: 0 })
 ft.abort()

package/dist/index.js

@@ -54,10 +54,12 @@ var defaultKbFetch = {
     if (timeout > 0 || canAbort) {
       abortController = new AbortController;
       Object.assign(requestInit, { signal: abortController.signal });
-      abortController.signal.onabort = () => clearTimeout(timeoutIns);
-      timeoutIns = setTimeout(() => {
-        abortController.abort();
-      }, timeout);
+      if (timeout >= 0) {
+        abortController.signal.onabort = () => clearTimeout(timeoutIns);
+        timeoutIns = setTimeout(() => {
+          abortController.abort();
+        }, timeout);
+      }
     }
     if (requestInit.params)
       url = help_default.synthesizeUrlWithParams(url, requestInit.params);
@@ -70,7 +72,7 @@ var defaultKbFetch = {
     requestInit.headers && (requestInit.headers = help_default.obj2header(requestInit.headers));
     url = help_default.urlWithProtocol(url) ? url : help_default.addProtocol(baseUrl) + url;
     const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) })).finally(() => clearTimeout(timeoutIns));
-    return Object.assign(after(response), {
+    return Object.assign(after(response, { url, init }), {
       abort: () => abortController?.abort()
     });
   },

package/dist/typings/help.d.ts

@@ -18,7 +18,10 @@ export interface DefaultKbFetch {
     before: <T extends any>(init: T) => T | void;
     after: (res: Promise<Response & {
         data: any;
-    }>) => any;
+    }>, req: {
+        url: string;
+        init: KbFetchInit | undefined;
+    }) => any;
     parser: (res: Response) => any;
     timeout: number;
     do: <T>(url: string, init?: KbFetchInit) => Res<T>;

package/dist/typings/index.d.ts

@@ -2,7 +2,10 @@ import { DefaultKbFetch } from './help';
 export declare const createKbFetch: (config: Partial<Pick<DefaultKbFetch, "baseUrl" | "baseParams" | "baseBody" | "timeout" | "before" | "parser" | "after">>) => {
     after: (res: Promise<Response & {
         data: any;
-    }>) => any;
+    }>, req: {
+        url: string;
+        init: import("./help").KbFetchInit | undefined;
+    }) => any;
     before: <T extends any>(init: T) => T | void;
     timeout: number;
     baseUrl?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kbfetch",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "devDependencies": {