@kevisual/query 0.0.12 → 0.0.14

package/dist/query-adapter.d.ts

@@ -1,8 +1,11 @@
+declare const methods: readonly ["GET", "POST"];
+type Method = (typeof methods)[number];
 type AdapterOpts = {
     url: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
+    method?: Method;
 };
 /**
  *
@@ -16,4 +19,5 @@ declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promis
  */
 declare const queryFetch: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
-export { adapter, queryFetch };
+export { adapter, methods, queryFetch };
+export type { AdapterOpts, Method };

package/dist/query-adapter.js

@@ -1,3 +1,4 @@
+const methods = ['GET', 'POST'];
 /**
  *
  * @param opts
@@ -11,15 +12,21 @@ const adapter = async (opts, overloadOpts) => {
     const timer = setTimeout(() => {
         controller.abort();
     }, timeout);
-    return fetch(opts.url, {
-        method: 'POST',
+    let method = overloadOpts?.method || opts.method || 'POST';
+    let url = new URL(opts.url, window.location.origin);
+    const isGet = method === 'GET';
+    if (isGet) {
+        url.search = new URLSearchParams(opts.body).toString();
+    }
+    return fetch(url, {
+        method: method,
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,
         },
-        body: JSON.stringify(opts.body),
         signal,
         ...overloadOpts,
+        body: isGet ? undefined : JSON.stringify(opts.body),
     })
         .then((response) => {
         // 获取 Content-Type 头部信息
@@ -50,4 +57,4 @@ const adapter = async (opts, overloadOpts) => {
  */
 const queryFetch = adapter;
 
-export { adapter, queryFetch };
+export { adapter, methods, queryFetch };

package/dist/query-browser.d.ts

@@ -1,10 +1,13 @@
 import { StoreApi } from 'zustand/vanilla';
 
+declare const methods: readonly ["GET", "POST"];
+type Method = (typeof methods)[number];
 type AdapterOpts = {
     url: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
+    method?: Method;
 };
 /**
  *
@@ -67,6 +70,8 @@ type QueryOpts$1 = {
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
+    method?: Method;
+    [key: string]: any;
 };
 type Data = {
     path?: string;
@@ -93,11 +98,11 @@ type Result<S = any> = {
 };
 type DataOpts = Partial<QueryOpts$1> & {
     beforeRequest?: Fn;
-    afterResponse?: <S, U = S>(result: Result<S>, ctx?: {
+    afterResponse?: <S = any>(result: Result<S>, ctx?: {
         req?: any;
         res?: any;
         fetch?: any;
-    }) => Promise<U>;
+    }) => Promise<S>;
 };
 /**
  * const query = new Query();
@@ -111,11 +116,19 @@ type DataOpts = Partial<QueryOpts$1> & {
 declare class Query {
     adapter: typeof adapter;
     url: string;
-    beforeRequest?: Fn;
+    beforeRequest?: DataOpts['beforeRequest'];
     afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop?: boolean;
     constructor(opts?: QueryOpts$1);
+    /**
+     * 突然停止请求
+     */
+    setStop(stop: boolean): void;
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -138,12 +151,12 @@ declare class Query {
      * 请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
-    before(fn: Fn): void;
+    before(fn: DataOpts['beforeRequest']): void;
     /**
      * 请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
-    after(fn: (result: Result, req?: any) => Promise<any>): void;
+    after(fn: DataOpts['afterResponse']): void;
 }
 
 type QueryOpts = {

package/dist/query-browser.js

@@ -11,15 +11,21 @@ const adapter = async (opts, overloadOpts) => {
     const timer = setTimeout(() => {
         controller.abort();
     }, timeout);
-    return fetch(opts.url, {
-        method: 'POST',
+    let method = overloadOpts?.method || opts.method || 'POST';
+    let url = new URL(opts.url, window.location.origin);
+    const isGet = method === 'GET';
+    if (isGet) {
+        url.search = new URLSearchParams(opts.body).toString();
+    }
+    return fetch(url, {
+        method: method,
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,
         },
-        body: JSON.stringify(opts.body),
         signal,
         ...overloadOpts,
+        body: isGet ? undefined : JSON.stringify(opts.body),
     })
         .then((response) => {
         // 获取 Content-Type 头部信息
@@ -255,6 +261,10 @@ class Query {
     afterResponse;
     headers;
     timeout;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -263,6 +273,12 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 突然停止请求
+     */
+    setStop(stop) {
+        this.stop = stop;
+    }
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -284,20 +300,22 @@ class Query {
      */
     async post(body, options) {
         const url = options?.url || this.url;
-        const headers = { ...this.headers, ...options?.headers };
-        const adapter = options?.adapter || this.adapter;
-        const beforeRequest = options?.beforeRequest || this.beforeRequest;
-        const afterResponse = options?.afterResponse || this.afterResponse;
-        const timeout = options?.timeout || this.timeout;
+        const { headers, adapter, beforeRequest, afterResponse, timeout, ...rest } = options || {};
+        const _headers = { ...this.headers, ...headers };
+        const _adapter = adapter || this.adapter;
+        const _beforeRequest = beforeRequest || this.beforeRequest;
+        const _afterResponse = afterResponse || this.afterResponse;
+        const _timeout = timeout || this.timeout;
         const req = {
             url: url,
-            headers: headers,
+            headers: _headers,
             body,
-            timeout,
+            timeout: _timeout,
+            ...rest,
         };
         try {
-            if (beforeRequest) {
-                await beforeRequest(req);
+            if (_beforeRequest) {
+                await _beforeRequest(req);
             }
         }
         catch (e) {
@@ -309,11 +327,27 @@ class Query {
                 showError: () => { },
             };
         }
-        return adapter(req).then(async (res) => {
+        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 {
                 setBaseResponse(res);
-                if (afterResponse) {
-                    return await afterResponse(res, {
+                if (_afterResponse) {
+                    return await _afterResponse(res, {
                         req,
                         res,
                         fetch: adapter,

package/dist/query.d.ts

@@ -1,8 +1,11 @@
+declare const methods: readonly ["GET", "POST"];
+type Method = (typeof methods)[number];
 type AdapterOpts = {
     url: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
+    method?: Method;
 };
 /**
  *
@@ -29,6 +32,8 @@ type QueryOpts = {
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
+    method?: Method;
+    [key: string]: any;
 };
 type Data = {
     path?: string;
@@ -55,11 +60,11 @@ type Result<S = any> = {
 };
 type DataOpts = Partial<QueryOpts> & {
     beforeRequest?: Fn;
-    afterResponse?: <S, U = S>(result: Result<S>, ctx?: {
+    afterResponse?: <S = any>(result: Result<S>, ctx?: {
         req?: any;
         res?: any;
         fetch?: any;
-    }) => Promise<U>;
+    }) => Promise<S>;
 };
 /**
  * 设置基础响应, 设置 success 和 showError,
@@ -80,11 +85,19 @@ declare const setBaseResponse: (res: Result) => void;
 declare class Query {
     adapter: typeof adapter;
     url: string;
-    beforeRequest?: Fn;
+    beforeRequest?: DataOpts['beforeRequest'];
     afterResponse?: DataOpts['afterResponse'];
     headers?: Record<string, string>;
     timeout?: number;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop?: boolean;
     constructor(opts?: QueryOpts);
+    /**
+     * 突然停止请求
+     */
+    setStop(stop: boolean): void;
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -107,12 +120,12 @@ declare class Query {
      * 请求前处理，设置请求前处理函数
      * @param fn 处理函数
      */
-    before(fn: Fn): void;
+    before(fn: DataOpts['beforeRequest']): void;
     /**
      * 请求后处理，设置请求后处理函数
      * @param fn 处理函数
      */
-    after(fn: (result: Result, req?: any) => Promise<any>): void;
+    after(fn: DataOpts['afterResponse']): void;
 }
 
 export { Query, adapter, setBaseResponse };

package/dist/query.js

@@ -11,15 +11,21 @@ const adapter = async (opts, overloadOpts) => {
     const timer = setTimeout(() => {
         controller.abort();
     }, timeout);
-    return fetch(opts.url, {
-        method: 'POST',
+    let method = overloadOpts?.method || opts.method || 'POST';
+    let url = new URL(opts.url, window.location.origin);
+    const isGet = method === 'GET';
+    if (isGet) {
+        url.search = new URLSearchParams(opts.body).toString();
+    }
+    return fetch(url, {
+        method: method,
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,
         },
-        body: JSON.stringify(opts.body),
         signal,
         ...overloadOpts,
+        body: isGet ? undefined : JSON.stringify(opts.body),
     })
         .then((response) => {
         // 获取 Content-Type 头部信息
@@ -80,6 +86,10 @@ class Query {
     afterResponse;
     headers;
     timeout;
+    /**
+     * 需要突然停止请求，比如401的时候
+     */
+    stop;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -88,6 +98,12 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    /**
+     * 突然停止请求
+     */
+    setStop(stop) {
+        this.stop = stop;
+    }
     /**
      * 发送 get 请求，转到 post 请求
      *  T是请求类型自定义
@@ -109,20 +125,22 @@ class Query {
      */
     async post(body, options) {
         const url = options?.url || this.url;
-        const headers = { ...this.headers, ...options?.headers };
-        const adapter = options?.adapter || this.adapter;
-        const beforeRequest = options?.beforeRequest || this.beforeRequest;
-        const afterResponse = options?.afterResponse || this.afterResponse;
-        const timeout = options?.timeout || this.timeout;
+        const { headers, adapter, beforeRequest, afterResponse, timeout, ...rest } = options || {};
+        const _headers = { ...this.headers, ...headers };
+        const _adapter = adapter || this.adapter;
+        const _beforeRequest = beforeRequest || this.beforeRequest;
+        const _afterResponse = afterResponse || this.afterResponse;
+        const _timeout = timeout || this.timeout;
         const req = {
             url: url,
-            headers: headers,
+            headers: _headers,
             body,
-            timeout,
+            timeout: _timeout,
+            ...rest,
         };
         try {
-            if (beforeRequest) {
-                await beforeRequest(req);
+            if (_beforeRequest) {
+                await _beforeRequest(req);
             }
         }
         catch (e) {
@@ -134,11 +152,27 @@ class Query {
                 showError: () => { },
             };
         }
-        return adapter(req).then(async (res) => {
+        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 {
                 setBaseResponse(res);
-                if (afterResponse) {
-                    return await afterResponse(res, {
+                if (_afterResponse) {
+                    return await _afterResponse(res, {
                         req,
                         res,
                         fetch: adapter,

package/package.json

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