@kevisual/query 0.0.46 → 0.0.48

package/dist/query-browser.d.ts

@@ -13,14 +13,6 @@ type AdapterOpts = {
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
-    /**
-     * @deprecated use responseType
-     */
-    isBlob?: boolean;
-    /**
-     * @deprecated use responseType
-     */
-    isText?: boolean;
     /**
      * 响应类型,
      * */
@@ -118,6 +110,8 @@ type QueryOptions = {
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
+    tokenName?: string;
+    storage?: Storage;
     beforeRequest?: Fn;
 };
 type Data = {
@@ -148,10 +142,7 @@ declare const wrapperError: ({ code, message }: {
     message?: string;
 }) => {
     code: number;
-    success: boolean;
     message: string;
-    showError: (fn?: () => void) => void;
-    noMsg: boolean;
 };
 /**
  * const query = new Query();
@@ -180,10 +171,9 @@ declare class Query {
      */
     stop?: boolean;
     qws: QueryWs;
-    /**
-     * 默认是 /client/router或者 默认是 /api/router
-     */
-    isClient: boolean;
+    tokenName: string;
+    storage: Storage;
+    token: string;
     constructor(opts?: QueryOptions);
     setQueryWs(qws: QueryWs): void;
     /**
@@ -251,18 +241,10 @@ type QueryOpts = {
  * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
  */
 declare class QueryClient extends Query {
-    tokenName: string;
-    storage: Storage;
-    token: string;
     constructor(opts?: QueryOptions & {
-        tokenName?: string;
-        storage?: Storage;
         io?: boolean;
     });
     createWs(opts?: QueryWsOpts): void;
-    getToken(): string;
-    saveToken(token: string): void;
-    removeToken(): void;
 }
 
 export { BaseQuery, Query, QueryClient, QueryWs, adapter, wrapperError };

package/dist/query-browser.js

@@ -2,19 +2,13 @@
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
-  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md"];
+  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md", "json"];
   return textTypes.some((type) => contentType.includes(type));
 };
 var adapter = async (opts = {}, overloadOpts) => {
   const controller = new AbortController;
   const signal = controller.signal;
   const isPostFile = opts.isPostFile || false;
-  let responseType = opts.responseType || "json";
-  if (opts.isBlob) {
-    responseType = "blob";
-  } else if (opts.isText) {
-    responseType = "text";
-  }
   const timeout = opts.timeout || 60000 * 3;
   const timer = setTimeout(() => {
     controller.abort();
@@ -73,21 +67,31 @@ var adapter = async (opts = {}, overloadOpts) => {
     headers
   }).then(async (response) => {
     const contentType = response.headers.get("Content-Type");
-    if (responseType === "blob") {
-      return await response.blob();
-    }
-    const isText = responseType === "text";
     const isJson = contentType && contentType.includes("application/json");
-    if (isJson && !isText) {
-      return await response.json();
+    const isSuccess = response.ok;
+    if (isJson) {
+      const json = await response.json();
+      if (json?.code) {
+        return json;
+      }
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: json
+      };
     } else if (isTextForContentType(contentType)) {
       return {
-        code: response.status,
+        code: isSuccess ? 200 : response.status,
         status: response.status,
         data: await response.text()
       };
     } else {
-      return response;
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: "非文本非JSON响应, 请手动处理response。",
+        response
+      };
     }
   }).catch((err) => {
     if (err.name === "AbortError") {
@@ -306,10 +310,7 @@ class QueryWs {
 var wrapperError = ({ code, message }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || "api request error",
-    showError: (fn) => {},
-    noMsg: true
+    message: message || "请求错误"
   };
   return result;
 };
@@ -323,9 +324,13 @@ class Query {
   timeout;
   stop;
   qws;
-  isClient = false;
+  tokenName;
+  storage;
+  token;
   constructor(opts) {
     this.adapter = opts?.adapter || adapter;
+    this.tokenName = opts?.tokenName || "token";
+    this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
     this.headers = opts?.headers || {
@@ -336,7 +341,7 @@ class Query {
       this.beforeRequest = opts.beforeRequest;
     } else {
       this.beforeRequest = async (opts2) => {
-        const token = globalThis?.localStorage?.getItem("token");
+        const token = this.token || this.storage?.getItem?.(this.tokenName);
         if (token) {
           opts2.headers = {
             ...opts2.headers,
@@ -358,7 +363,6 @@ class Query {
   }
   async post(body, options) {
     const url = options?.url || this.url;
-    console.log("query post", url, body, options);
     const { headers, adapter: adapter2, beforeRequest, afterResponse, timeout, ...rest } = options || {};
     const _headers = { ...this.headers, ...headers };
     const _adapter = adapter2 || this.adapter;
@@ -378,7 +382,7 @@ class Query {
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -387,13 +391,13 @@ class Query {
       console.error("request beforeFn error", e, req);
       return wrapperError({
         code: 500,
-        message: "api request beforeFn error",
+        message: "请求在请求前处理时发生错误",
         req
       });
     }
     if (this.stop && !options?.noStop) {
       const that = this;
-      await new Promise((resolve) => {
+      const res = await new Promise((resolve) => {
         let timer = 0;
         const detect = setInterval(() => {
           if (!that.stop) {
@@ -401,11 +405,20 @@ class Query {
             resolve(true);
           }
           timer++;
-          if (timer > 30) {
-            console.error("request stop: timeout", req.url, timer);
+          if (timer > 5) {
+            console.error("等待请求失败：", req.url, timer);
+            clearInterval(detect);
+            resolve(false);
           }
         }, 1000);
       });
+      if (!res) {
+        return wrapperError({
+          code: 500,
+          message: "请求取消，可能是因为用户未登录或者token过期",
+          req
+        });
+      }
     }
     return _adapter(req).then(async (res) => {
       try {
@@ -418,10 +431,10 @@ class Query {
         }
         return res;
       } catch (e) {
-        console.error("request afterFn error", e, req);
+        console.error("请求在响应后处理时发生错误", e, req);
         return wrapperError({
           code: 500,
-          message: "api request afterFn error",
+          message: "请求在响应后处理时发生错误",
           req
         });
       }
@@ -485,23 +498,8 @@ class BaseQuery {
 
 // src/query-browser.ts
 class QueryClient extends Query {
-  tokenName;
-  storage;
-  token;
   constructor(opts) {
     super(opts);
-    this.tokenName = opts?.tokenName || "token";
-    this.storage = opts?.storage || globalThis.localStorage;
-    this.beforeRequest = async (opts2) => {
-      const token = this.token || this.getToken();
-      if (token) {
-        opts2.headers = {
-          ...opts2.headers,
-          Authorization: `Bearer ${token}`
-        };
-      }
-      return opts2;
-    };
     if (opts?.io) {
       this.createWs();
     }
@@ -509,15 +507,6 @@ class QueryClient extends Query {
   createWs(opts) {
     this.qws = new QueryWs({ url: this.url, ...opts });
   }
-  getToken() {
-    return this.storage.getItem(this.tokenName);
-  }
-  saveToken(token) {
-    this.storage.setItem(this.tokenName, token);
-  }
-  removeToken() {
-    this.storage.removeItem(this.tokenName);
-  }
 }
 export {
   wrapperError,

package/dist/query.d.ts

@@ -13,14 +13,6 @@ type AdapterOpts = {
     body?: Record<string, any> | FormData;
     timeout?: number;
     method?: Method;
-    /**
-     * @deprecated use responseType
-     */
-    isBlob?: boolean;
-    /**
-     * @deprecated use responseType
-     */
-    isText?: boolean;
     /**
      * 响应类型,
      * */
@@ -118,6 +110,8 @@ type QueryOptions = {
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
+    tokenName?: string;
+    storage?: Storage;
     beforeRequest?: Fn;
 };
 type Data = {
@@ -143,26 +137,12 @@ type DataOpts = Partial<QueryOpts> & {
      */
     noStop?: boolean;
 };
-/**
- * 设置基础响应, 设置 success 和 showError,
- * success 是 code 是否等于 200
- * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
- * @param res 响应
- */
-declare const setBaseResponse: (res: Partial<Result & {
-    success?: boolean;
-    showError?: (fn?: () => void) => void;
-    noMsg?: boolean;
-}>) => Result;
 declare const wrapperError: ({ code, message }: {
     code?: number;
     message?: string;
 }) => {
     code: number;
-    success: boolean;
     message: string;
-    showError: (fn?: () => void) => void;
-    noMsg: boolean;
 };
 /**
  * const query = new Query();
@@ -191,10 +171,9 @@ declare class Query {
      */
     stop?: boolean;
     qws: QueryWs;
-    /**
-     * 默认是 /client/router或者 默认是 /api/router
-     */
-    isClient: boolean;
+    tokenName: string;
+    storage: Storage;
+    token: string;
     constructor(opts?: QueryOptions);
     setQueryWs(qws: QueryWs): void;
     /**
@@ -251,5 +230,5 @@ declare class BaseQuery<T extends Query = Query, R extends {
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
 
-export { BaseQuery, Query, adapter, setBaseResponse, wrapperError };
+export { BaseQuery, Query, adapter, wrapperError };
 export type { Data, DataOpts, Fn, QueryOptions, QueryOpts, Result };

package/dist/query.js

@@ -2,19 +2,13 @@
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
-  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md"];
+  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md", "json"];
   return textTypes.some((type) => contentType.includes(type));
 };
 var adapter = async (opts = {}, overloadOpts) => {
   const controller = new AbortController;
   const signal = controller.signal;
   const isPostFile = opts.isPostFile || false;
-  let responseType = opts.responseType || "json";
-  if (opts.isBlob) {
-    responseType = "blob";
-  } else if (opts.isText) {
-    responseType = "text";
-  }
   const timeout = opts.timeout || 60000 * 3;
   const timer = setTimeout(() => {
     controller.abort();
@@ -73,21 +67,31 @@ var adapter = async (opts = {}, overloadOpts) => {
     headers
   }).then(async (response) => {
     const contentType = response.headers.get("Content-Type");
-    if (responseType === "blob") {
-      return await response.blob();
-    }
-    const isText = responseType === "text";
     const isJson = contentType && contentType.includes("application/json");
-    if (isJson && !isText) {
-      return await response.json();
+    const isSuccess = response.ok;
+    if (isJson) {
+      const json = await response.json();
+      if (json?.code) {
+        return json;
+      }
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: json
+      };
     } else if (isTextForContentType(contentType)) {
       return {
-        code: response.status,
+        code: isSuccess ? 200 : response.status,
         status: response.status,
         data: await response.text()
       };
     } else {
-      return response;
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: "非文本非JSON响应, 请手动处理response。",
+        response
+      };
     }
   }).catch((err) => {
     if (err.name === "AbortError") {
@@ -106,22 +110,10 @@ var adapter = async (opts = {}, overloadOpts) => {
 };
 
 // src/query.ts
-var setBaseResponse = (res) => {
-  res.success = res.code === 200;
-  res.showError = (fn) => {
-    if (!res.success && !res.noMsg) {
-      fn?.();
-    }
-  };
-  return res;
-};
 var wrapperError = ({ code, message }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || "api request error",
-    showError: (fn) => {},
-    noMsg: true
+    message: message || "请求错误"
   };
   return result;
 };
@@ -135,9 +127,13 @@ class Query {
   timeout;
   stop;
   qws;
-  isClient = false;
+  tokenName;
+  storage;
+  token;
   constructor(opts) {
     this.adapter = opts?.adapter || adapter;
+    this.tokenName = opts?.tokenName || "token";
+    this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
     this.headers = opts?.headers || {
@@ -148,7 +144,7 @@ class Query {
       this.beforeRequest = opts.beforeRequest;
     } else {
       this.beforeRequest = async (opts2) => {
-        const token = globalThis?.localStorage?.getItem("token");
+        const token = this.token || this.storage?.getItem?.(this.tokenName);
         if (token) {
           opts2.headers = {
             ...opts2.headers,
@@ -170,7 +166,6 @@ class Query {
   }
   async post(body, options) {
     const url = options?.url || this.url;
-    console.log("query post", url, body, options);
     const { headers, adapter: adapter2, beforeRequest, afterResponse, timeout, ...rest } = options || {};
     const _headers = { ...this.headers, ...headers };
     const _adapter = adapter2 || this.adapter;
@@ -190,7 +185,7 @@ class Query {
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -199,13 +194,13 @@ class Query {
       console.error("request beforeFn error", e, req);
       return wrapperError({
         code: 500,
-        message: "api request beforeFn error",
+        message: "请求在请求前处理时发生错误",
         req
       });
     }
     if (this.stop && !options?.noStop) {
       const that = this;
-      await new Promise((resolve) => {
+      const res = await new Promise((resolve) => {
         let timer = 0;
         const detect = setInterval(() => {
           if (!that.stop) {
@@ -213,11 +208,20 @@ class Query {
             resolve(true);
           }
           timer++;
-          if (timer > 30) {
-            console.error("request stop: timeout", req.url, timer);
+          if (timer > 5) {
+            console.error("等待请求失败：", req.url, timer);
+            clearInterval(detect);
+            resolve(false);
           }
         }, 1000);
       });
+      if (!res) {
+        return wrapperError({
+          code: 500,
+          message: "请求取消，可能是因为用户未登录或者token过期",
+          req
+        });
+      }
     }
     return _adapter(req).then(async (res) => {
       try {
@@ -230,10 +234,10 @@ class Query {
         }
         return res;
       } catch (e) {
-        console.error("request afterFn error", e, req);
+        console.error("请求在响应后处理时发生错误", e, req);
         return wrapperError({
           code: 500,
-          message: "api request afterFn error",
+          message: "请求在响应后处理时发生错误",
           req
         });
       }
@@ -296,7 +300,6 @@ class BaseQuery {
 }
 export {
   wrapperError,
-  setBaseResponse,
   adapter,
   Query,
   BaseQuery

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "type": "module",
   "scripts": {
     "build": "npm run clean && bun run bun.config.ts",
@@ -19,7 +19,7 @@
   "description": "",
   "devDependencies": {
     "@kevisual/code-builder": "^0.0.6",
-    "@kevisual/router": "^0.0.74",
+    "@kevisual/router": "^0.0.80",
     "@types/node": "^25.2.3",
     "typescript": "^5.9.3",
     "es-toolkit": "^1.44.0",

package/src/adapter.ts

@@ -13,14 +13,6 @@ export type AdapterOpts = {
   body?: Record<string, any> | FormData; // body 可以是对象、字符串或 FormData
   timeout?: number;
   method?: Method;
-  /**
-   * @deprecated use responseType
-   */
-  isBlob?: boolean; // 是否返回 Blob 对象, 第一优先
-  /**
-   * @deprecated use responseType
-   */
-  isText?: boolean; // 是否返回文本内容， 第二优先
   /**
    * 响应类型,
    * */
@@ -29,7 +21,7 @@ export type AdapterOpts = {
 };
 export const isTextForContentType = (contentType: string | null) => {
   if (!contentType) return false;
-  const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded', 'md'];
+  const textTypes = ['text/', 'xml', 'html', 'javascript', 'css', 'csv', 'plain', 'x-www-form-urlencoded', 'md', 'json'];
   return textTypes.some((type) => contentType.includes(type));
 };
 /**
@@ -42,13 +34,6 @@ export const adapter = async (opts: AdapterOpts = {}, overloadOpts?: RequestInit
   const controller = new AbortController();
   const signal = controller.signal;
   const isPostFile = opts.isPostFile || false; // 是否为文件上传
-  let responseType = opts.responseType || 'json'; // 响应类型
-  if (opts.isBlob) {
-    responseType = 'blob';
-  } else if (opts.isText) {
-    responseType = 'text';
-  }
-
   const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
   const timer = setTimeout(() => {
     controller.abort();
@@ -110,22 +95,32 @@ export const adapter = async (opts: AdapterOpts = {}, overloadOpts?: RequestInit
     .then(async (response) => {
       // 获取 Content-Type 头部信息
       const contentType = response.headers.get('Content-Type');
-      if (responseType === 'blob') {
-        return await response.blob(); // 直接返回 Blob 对象
-      }
-      const isText = responseType === 'text';
       const isJson = contentType && contentType.includes('application/json');
+      const isSuccess = response.ok;
       // 判断返回的数据类型
-      if (isJson && !isText) {
-        return await response.json(); // 解析为 JSON
+      if (isJson) {
+        const json = await response.json();
+        if (json?.code) {
+          return json;
+        }
+        return {
+          code: isSuccess ? 200 : response.status,
+          status: response.status,
+          data: json,
+        }
       } else if (isTextForContentType(contentType)) {
         return {
-          code: response.status,
+          code: isSuccess ? 200 : response.status,
           status: response.status,
           data: await response.text(), // 直接返回文本内容
         };
       } else {
-        return response;
+        return {
+          code: isSuccess ? 200 : response.status,
+          status: response.status,
+          data: '非文本非JSON响应, 请手动处理response。',
+          response
+        };
       }
     })
     .catch((err) => {
@@ -143,8 +138,4 @@ export const adapter = async (opts: AdapterOpts = {}, overloadOpts?: RequestInit
     .finally(() => {
       clearTimeout(timer);
     });
-};
-/**
- * adapter
- */
-export const queryFetch = adapter;
+};

package/src/create-query/index.ts

@@ -1,4 +1,5 @@
 
+import { toJSONSchema, fromJSONSchema } from '@kevisual/router/browser'
 type RouteInfo = {
   path: string;
   key: string;
@@ -44,6 +45,14 @@ export const createQueryByRoutes = (list: RouteInfo[]) => {
     if (!obj[route.path]) {
       obj[route.path] = {};
     }
+    if (route.metadata?.args) {
+      const args = route.metadata.args;
+      if (args?.$schema) {
+        // 将 args 转换为 JSON Schema
+        const jsonSchema = fromJSONSchema(args);
+        route.metadata.args = toJSONSchema(jsonSchema);
+      }
+    }
     obj[route.path][route.key] = route;
   }
   const code = `