@kevisual/api 0.0.50 → 0.0.52

package/dist/query-login.js

@@ -1,20 +1,14 @@
-// node_modules/.pnpm/@kevisual+query@0.0.40/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
 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();
@@ -26,7 +20,7 @@ var adapter = async (opts = {}, overloadOpts) => {
   if (opts?.url?.startsWith("http")) {
     url = new URL(opts.url);
   } else {
-    origin = window?.location?.origin || "http://localhost:51515";
+    origin = globalThis?.location?.origin || "http://localhost:51515";
     url = new URL(opts?.url || "", origin);
   }
   const isGet = method === "GET";
@@ -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") {
@@ -107,10 +111,7 @@ var adapter = async (opts = {}, overloadOpts) => {
 var wrapperError = ({ code, message }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || "api request error",
-    showError: (fn) => {},
-    noMsg: true
+    message: message || "请求错误"
   };
   return result;
 };
@@ -124,9 +125,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 || {
@@ -137,7 +142,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,
@@ -178,7 +183,7 @@ class Query {
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -187,12 +192,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) {
@@ -200,11 +206,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 {
@@ -217,10 +232,11 @@ 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
         });
       }
     });
@@ -282,17 +298,6 @@ class BaseQuery {
   }
 }
 
-// node_modules/.pnpm/@kevisual+query@0.0.40/node_modules/@kevisual/query/dist/query.js
-var setBaseResponse = (res) => {
-  res.success = res.code === 200;
-  res.showError = (fn) => {
-    if (!res.success && !res.noMsg) {
-      fn?.();
-    }
-  };
-  return res;
-};
-
 // query/query-login/login-cache.ts
 class LoginCacheStore {
   cache;
@@ -956,7 +961,6 @@ class QueryLogin extends BaseQuery {
     }
     return this.post({ key: "refreshToken", data }, {
       afterResponse: async (response, ctx) => {
-        setBaseResponse(response);
         return response;
       }
     });
@@ -981,7 +985,6 @@ class QueryLogin extends BaseQuery {
               body,
               headers: { ...headers, Authorization: `Bearer ${accessToken}` }
             });
-            setBaseResponse(res2);
             return res2;
           }
         } else {

package/dist/query-mark.js

@@ -1,20 +1,14 @@
-// node_modules/.pnpm/@kevisual+query@0.0.40/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
 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();
@@ -26,7 +20,7 @@ var adapter = async (opts = {}, overloadOpts) => {
   if (opts?.url?.startsWith("http")) {
     url = new URL(opts.url);
   } else {
-    origin = window?.location?.origin || "http://localhost:51515";
+    origin = globalThis?.location?.origin || "http://localhost:51515";
     url = new URL(opts?.url || "", origin);
   }
   const isGet = method === "GET";
@@ -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") {
@@ -107,10 +111,7 @@ var adapter = async (opts = {}, overloadOpts) => {
 var wrapperError = ({ code, message }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || "api request error",
-    showError: (fn) => {},
-    noMsg: true
+    message: message || "请求错误"
   };
   return result;
 };
@@ -124,9 +125,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 || {
@@ -137,7 +142,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,
@@ -178,7 +183,7 @@ class Query {
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -187,12 +192,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) {
@@ -200,11 +206,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 {
@@ -217,10 +232,11 @@ 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
         });
       }
     });