kbfetch 0.0.21 → 0.0.26

package/dist/index.js

@@ -8,13 +8,6 @@ var help = {
     const fullQueryStr = [originalQueryStr, queryStr].filter(Boolean).join("&");
     return [pre, fullQueryStr].filter(Boolean).join("?");
   },
-  createTimeoutAbortController: (timeout) => {
-    const abortController = new AbortController;
-    timeout > 0 && setTimeout(() => {
-      abortController.abort();
-    }, timeout);
-    return abortController;
-  },
   parseResBody: (res) => {
     const contentType = res.headers.get("content-type") || "";
     if (contentType.includes("application/json"))
@@ -41,13 +34,21 @@ var defaultKbFetch = {
     let { before = _t.before, ..._init } = init || {};
     _init = before(_init);
     let { parser = _t.parser, after = _t.after, baseUrl = _t.baseUrl, timeout = _t.timeout, canAbort, headers, ...requestInit } = _init;
-    let abortController = null;
-    (timeout !== -1 || canAbort) && (abortController = help_default.createTimeoutAbortController(timeout));
+    let abortController;
+    let timeoutIns;
+    if (timeout > 0 || canAbort) {
+      abortController = new AbortController;
+      abortController.signal.onabort = () => clearTimeout(timeoutIns);
+      timeoutIns = setTimeout(() => {
+        abortController.abort();
+      }, timeout);
+      return abortController;
+    }
     abortController && Object.assign(requestInit, { signal: abortController.signal });
     headers && Object.assign(requestInit, { headers: help_default.obj2header(headers) });
     if (!url.startsWith("http://") && !url.startsWith("https://"))
       url = baseUrl + url;
-    const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) }));
+    const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) })).finally(() => clearTimeout(timeoutIns));
     return Object.assign(after(response), {
       abort: () => abortController?.abort()
     });

package/dist/typings/help.d.ts

@@ -30,7 +30,6 @@ export interface DefaultKbFetch {
 }
 declare const help: {
     synthesizeUrlWithParams: (url: string, params?: Record<string, any>) => string;
-    createTimeoutAbortController: (timeout: number) => AbortController;
     parseResBody: (res: Response) => Promise<any>;
     obj2header: (obj: Record<string, string>) => Headers;
 };

package/package.json

@@ -2,12 +2,13 @@
     "name": "kbfetch",
     "main": "./dist/index.js",
     "module": "./dist/index.js",
+    "description": "一个轻量基于fetch封装的API请求工具库",
     "keywords": [
         "fetch",
         "ajax"
     ],
     "type": "module",
-    "version": "0.0.21",
+    "version": "0.0.26",
     "license": "MIT",
     "types": "./dist/typings/index.d.ts",
     "files": [
@@ -16,9 +17,9 @@
     "scripts": {
         "pub": "bun bld && bun tsc && bun patch && npm publish --registry https://registry.npmjs.org/ ; bun updatetaobao ",
         "patch": "git stash && npm version patch && git stash pop",
+        "updatetaobao": "cnpm sync kbfetch",
         "tsc": "tsc index.ts -d --emitDeclarationOnly --declarationDir ./dist/typings",
-        "bld": "bun build ./index.ts --outdir ./dist",
-        "updatetaobao": "cnpm sync kbfetch"
+        "bld": "bun build ./index.ts --outdir ./dist"
     },
     "devDependencies": {
         "bun-types": "latest",