@kevisual/query 0.0.11 → 0.0.13

package/dist/query-browser.d.ts

@@ -93,7 +93,11 @@ type Result<S = any> = {
 };
 type DataOpts = Partial<QueryOpts$1> & {
     beforeRequest?: Fn;
-    afterResponse?: <S, U = S>(result: Result<S>) => Promise<U>;
+    afterResponse?: <S, U = S>(result: Result<S>, ctx?: {
+        req?: any;
+        res?: any;
+        fetch?: any;
+    }) => Promise<U>;
 };
 /**
  * const query = new Query();
@@ -108,10 +112,18 @@ declare class Query {
     adapter: typeof adapter;
     url: string;
     beforeRequest?: Fn;
-    afterResponse?: (result: Result) => Promise<any>;
+    afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop?: boolean;
     constructor(opts?: QueryOpts$1);
+    /**
+     * 突然停止请求
+     */
+    setStop(stop: boolean): void;
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -139,7 +151,7 @@ declare class Query {
      * 请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
-    after(fn: (result: Result) => Promise<any>): void;
+    after(fn: (result: Result, req?: any) => Promise<any>): void;
 }
 
 type QueryOpts = {

package/dist/query-browser.js

@@ -221,6 +221,24 @@ class QueryWs {
     }
 }
 
+/**
+ * 设置基础响应, 设置 success 和 showError,
+ * success 是 code 是否等于 200
+ * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
+ * @param res 响应
+ */
+const setBaseResponse = (res) => {
+    res.success = res.code === 200;
+    /**
+     * 显示错误
+     * @param fn 错误处理函数
+     */
+    res.showError = (fn) => {
+        if (!res.success && !res.noMsg) {
+            fn?.();
+        }
+    };
+};
 /**
  * const query = new Query();
  * const res = await query.post({
@@ -237,6 +255,10 @@ class Query {
     afterResponse;
     headers;
     timeout;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -245,6 +267,12 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 突然停止请求
+     */
+    setStop(stop) {
+        this.stop = stop;
+    }
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -291,21 +319,32 @@ class Query {
                 showError: () => { },
             };
         }
+        if (this.stop) {
+            const that = this;
+            await new Promise((resolve) => {
+                let timer = 0;
+                const detect = setInterval(() => {
+                    if (!that.stop) {
+                        clearInterval(detect);
+                        resolve(true);
+                    }
+                    timer++;
+                    if (timer > 30) {
+                        console.error('request stop: timeout', req.url, timer);
+                    }
+                }, 1000);
+            });
+        }
         return adapter(req).then(async (res) => {
             try {
-                res.success = res.code === 200;
+                setBaseResponse(res);
                 if (afterResponse) {
-                    return await afterResponse(res);
+                    return await afterResponse(res, {
+                        req,
+                        res,
+                        fetch: adapter,
+                    });
                 }
-                /**
-                 * 显示错误
-                 * @param fn 错误处理函数
-                 */
-                res.showError = (fn) => {
-                    if (!res.success && !res.noResult) {
-                        fn?.();
-                    }
-                };
                 return res;
             }
             catch (e) {

package/dist/query.d.ts

@@ -55,8 +55,19 @@ type Result<S = any> = {
 };
 type DataOpts = Partial<QueryOpts> & {
     beforeRequest?: Fn;
-    afterResponse?: <S, U = S>(result: Result<S>) => Promise<U>;
+    afterResponse?: <S, U = S>(result: Result<S>, ctx?: {
+        req?: any;
+        res?: any;
+        fetch?: any;
+    }) => Promise<U>;
 };
+/**
+ * 设置基础响应, 设置 success 和 showError,
+ * success 是 code 是否等于 200
+ * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
+ * @param res 响应
+ */
+declare const setBaseResponse: (res: Result) => void;
 /**
  * const query = new Query();
  * const res = await query.post({
@@ -70,10 +81,18 @@ declare class Query {
     adapter: typeof adapter;
     url: string;
     beforeRequest?: Fn;
-    afterResponse?: (result: Result) => Promise<any>;
+    afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop?: boolean;
     constructor(opts?: QueryOpts);
+    /**
+     * 突然停止请求
+     */
+    setStop(stop: boolean): void;
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -101,8 +120,8 @@ declare class Query {
      * 请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
-    after(fn: (result: Result) => Promise<any>): void;
+    after(fn: (result: Result, req?: any) => Promise<any>): void;
 }
 
-export { Query, adapter };
-export type { Data, QueryOpts, Result };
+export { Query, adapter, setBaseResponse };
+export type { Data, DataOpts, Fn, QueryOpts, Result };

package/dist/query.js

@@ -46,6 +46,24 @@ const adapter = async (opts, overloadOpts) => {
     });
 };
 
+/**
+ * 设置基础响应, 设置 success 和 showError,
+ * success 是 code 是否等于 200
+ * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
+ * @param res 响应
+ */
+const setBaseResponse = (res) => {
+    res.success = res.code === 200;
+    /**
+     * 显示错误
+     * @param fn 错误处理函数
+     */
+    res.showError = (fn) => {
+        if (!res.success && !res.noMsg) {
+            fn?.();
+        }
+    };
+};
 /**
  * const query = new Query();
  * const res = await query.post({
@@ -62,6 +80,10 @@ class Query {
     afterResponse;
     headers;
     timeout;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -70,6 +92,12 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 突然停止请求
+     */
+    setStop(stop) {
+        this.stop = stop;
+    }
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -116,21 +144,32 @@ class Query {
                 showError: () => { },
             };
         }
+        if (this.stop) {
+            const that = this;
+            await new Promise((resolve) => {
+                let timer = 0;
+                const detect = setInterval(() => {
+                    if (!that.stop) {
+                        clearInterval(detect);
+                        resolve(true);
+                    }
+                    timer++;
+                    if (timer > 30) {
+                        console.error('request stop: timeout', req.url, timer);
+                    }
+                }, 1000);
+            });
+        }
         return adapter(req).then(async (res) => {
             try {
-                res.success = res.code === 200;
+                setBaseResponse(res);
                 if (afterResponse) {
-                    return await afterResponse(res);
+                    return await afterResponse(res, {
+                        req,
+                        res,
+                        fetch: adapter,
+                    });
                 }
-                /**
-                 * 显示错误
-                 * @param fn 错误处理函数
-                 */
-                res.showError = (fn) => {
-                    if (!res.success && !res.noResult) {
-                        fn?.();
-                    }
-                };
                 return res;
             }
             catch (e) {
@@ -160,4 +199,4 @@ class Query {
     }
 }
 
-export { Query, adapter };
+export { Query, adapter, setBaseResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",