@kevisual/query 0.0.7-alpha.3 → 0.0.8

package/dist/query-adapter.d.ts

@@ -0,0 +1,19 @@
+type AdapterOpts = {
+    url: string;
+    headers?: Record<string, string>;
+    body?: Record<string, any>;
+    timeout?: number;
+};
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
+/**
+ * adapter
+ */
+declare const queryFetch: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
+
+export { adapter, queryFetch };

package/dist/query-adapter.js

@@ -0,0 +1,53 @@
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+const adapter = async (opts, overloadOpts) => {
+    const controller = new AbortController();
+    const signal = controller.signal;
+    const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
+    const timer = setTimeout(() => {
+        controller.abort();
+    }, timeout);
+    return fetch(opts.url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            ...opts.headers,
+        },
+        body: JSON.stringify(opts.body),
+        signal,
+        ...overloadOpts,
+    })
+        .then((response) => {
+        // 获取 Content-Type 头部信息
+        const contentType = response.headers.get('Content-Type');
+        // 判断返回的数据类型
+        if (contentType && contentType.includes('application/json')) {
+            return response.json(); // 解析为 JSON
+        }
+        else {
+            return response.text(); // 解析为文本
+        }
+    })
+        .catch((err) => {
+        if (err.name === 'AbortError') {
+            console.log('Request timed out and was aborted');
+        }
+        console.error(err);
+        return {
+            code: 500,
+        };
+    })
+        .finally(() => {
+        clearTimeout(timer);
+    });
+};
+/**
+ * adapter
+ */
+const queryFetch = adapter;
+
+export { adapter, queryFetch };

package/dist/query-browser.d.ts

@@ -6,7 +6,13 @@ type AdapterOpts = {
     body?: Record<string, any>;
     timeout?: number;
 };
-declare const adapter: (opts: AdapterOpts) => Promise<any>;
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
 type QueryWsStore = {
     connected: boolean;
@@ -120,6 +126,5 @@ declare class QueryClient<U = any, V = any> extends Query<U, V> {
     saveToken(token: string): void;
     removeToken(): void;
 }
-declare const client: QueryClient<any, any>;
 
-export { Query, QueryClient, type QueryOpts, QueryWs, type QueryWsOpts, adapter, client };
+export { Query, QueryClient, type QueryOpts, QueryWs, type QueryWsOpts, adapter };

package/dist/query-browser.js

@@ -1,4 +1,10 @@
-const adapter = async (opts) => {
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+const adapter = async (opts, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
@@ -13,6 +19,7 @@ const adapter = async (opts) => {
         },
         body: JSON.stringify(opts.body),
         signal,
+        ...overloadOpts,
     })
         .then((response) => {
         // 获取 Content-Type 头部信息
@@ -56,15 +63,7 @@ const createStoreImpl = (createState) => {
     listeners.add(listener);
     return () => listeners.delete(listener);
   };
-  const destroy = () => {
-    if ((import.meta.env ? import.meta.env.MODE : void 0) !== "production") {
-      console.warn(
-        "[DEPRECATED] The `destroy` method will be unsupported in a future version. Instead use unsubscribe function returned by subscribe. Everything will be garbage-collected if store is garbage-collected."
-      );
-    }
-    listeners.clear();
-  };
-  const api = { setState, getState, getInitialState, subscribe, destroy };
+  const api = { setState, getState, getInitialState, subscribe };
   const initialState = state = createState(setState, getState, api);
   return api;
 };
@@ -262,15 +261,35 @@ class Query {
             body,
             timeout,
         };
-        if (beforeRequest) {
-            await beforeRequest(req);
+        try {
+            if (beforeRequest) {
+                await beforeRequest(req);
+            }
+        }
+        catch (e) {
+            console.error(e);
+            return {
+                code: 500,
+                success: false,
+                message: 'api request beforeFn error',
+            };
         }
         return adapter(req).then(async (res) => {
-            res.success = res.code === 200;
-            if (afterResponse) {
-                return await afterResponse(res);
+            try {
+                res.success = res.code === 200;
+                if (afterResponse) {
+                    return await afterResponse(res);
+                }
+                return res;
+            }
+            catch (e) {
+                console.error(e);
+                return {
+                    code: 500,
+                    success: false,
+                    message: 'api request afterFn error',
+                };
             }
-            return res;
         });
     }
     before(fn) {
@@ -288,6 +307,7 @@ class QueryClient extends Query {
     tokenName;
     storage;
     token;
+    // 默认不使用ws
     qws;
     constructor(opts) {
         super(opts);
@@ -320,6 +340,7 @@ class QueryClient extends Query {
         this.storage.removeItem(this.tokenName);
     }
 }
-const client = new QueryClient();
+// 移除默认生成的实例
+// export const client = new QueryClient();
 
-export { Query, QueryClient, QueryWs, adapter, client };
+export { Query, QueryClient, QueryWs, adapter };

package/dist/query-ws.js

@@ -15,15 +15,7 @@ const createStoreImpl = (createState) => {
     listeners.add(listener);
     return () => listeners.delete(listener);
   };
-  const destroy = () => {
-    if ((import.meta.env ? import.meta.env.MODE : void 0) !== "production") {
-      console.warn(
-        "[DEPRECATED] The `destroy` method will be unsupported in a future version. Instead use unsubscribe function returned by subscribe. Everything will be garbage-collected if store is garbage-collected."
-      );
-    }
-    listeners.clear();
-  };
-  const api = { setState, getState, getInitialState, subscribe, destroy };
+  const api = { setState, getState, getInitialState, subscribe };
   const initialState = state = createState(setState, getState, api);
   return api;
 };

package/dist/query.d.ts

@@ -4,7 +4,13 @@ type AdapterOpts = {
     body?: Record<string, any>;
     timeout?: number;
 };
-declare const adapter: (opts: AdapterOpts) => Promise<any>;
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
 type Fn = (opts: {
     url?: string;

package/dist/query.js

@@ -1,4 +1,10 @@
-const adapter = async (opts) => {
+/**
+ *
+ * @param opts
+ * @param overloadOpts 覆盖fetch的默认配置
+ * @returns
+ */
+const adapter = async (opts, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
@@ -13,6 +19,7 @@ const adapter = async (opts) => {
         },
         body: JSON.stringify(opts.body),
         signal,
+        ...overloadOpts,
     })
         .then((response) => {
         // 获取 Content-Type 头部信息
@@ -79,15 +86,35 @@ class Query {
             body,
             timeout,
         };
-        if (beforeRequest) {
-            await beforeRequest(req);
+        try {
+            if (beforeRequest) {
+                await beforeRequest(req);
+            }
+        }
+        catch (e) {
+            console.error(e);
+            return {
+                code: 500,
+                success: false,
+                message: 'api request beforeFn error',
+            };
         }
         return adapter(req).then(async (res) => {
-            res.success = res.code === 200;
-            if (afterResponse) {
-                return await afterResponse(res);
+            try {
+                res.success = res.code === 200;
+                if (afterResponse) {
+                    return await afterResponse(res);
+                }
+                return res;
+            }
+            catch (e) {
+                console.error(e);
+                return {
+                    code: 500,
+                    success: false,
+                    message: 'api request afterFn error',
+                };
             }
-            return res;
         });
     }
     before(fn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.7-alpha.3",
+  "version": "0.0.8",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,16 +22,16 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "rollup": "^4.21.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-typescript": "^12.1.2",
+    "rollup": "^4.34.9",
     "ts-node": "^10.9.2",
-    "tslib": "^2.7.0",
-    "typescript": "^5.5.4",
-    "zustand": "^4.5.5",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.2",
+    "zustand": "^5.0.3",
     "rollup-plugin-dts": "^6.1.1"
   },
-  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447",
+  "packageManager": "yarn@1.22.22",
   "publishConfig": {
     "access": "public"
   },