@kevisual/cli 0.1.5 → 0.1.6

package/dist/assistant.js

@@ -35026,23 +35026,17 @@ var getEnvToken = () => {
   return envTokne;
 };
 
-// ../node_modules/.pnpm/@kevisual+query@0.0.44/node_modules/@kevisual/query/dist/query-browser.js
+// ../node_modules/.pnpm/@kevisual+query@0.0.49/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();
@@ -35101,21 +35095,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") {
@@ -35135,16 +35139,14 @@ 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;
 };
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -35152,11 +35154,20 @@ 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;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -35165,7 +35176,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,
@@ -35187,7 +35198,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;
@@ -35201,13 +35211,20 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
         if (res === false) {
           return wrapperError({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -35216,13 +35233,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) {
@@ -35230,11 +35247,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 {
@@ -35247,10 +35273,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
         });
       }
@@ -35288,7 +35314,7 @@ class Query {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+router@0.0.74/node_modules/@kevisual/router/dist/router-browser.js
+// ../node_modules/.pnpm/@kevisual+router@0.0.80/node_modules/@kevisual/router/dist/router-browser.js
 var __create3 = Object.create;
 var __getProtoOf3 = Object.getPrototypeOf;
 var __defProp3 = Object.defineProperty;
@@ -49295,7 +49321,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.51_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.52_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -49332,7 +49358,7 @@ var initApi = async (opts) => {
         metadata
       }).define(async (ctx) => {
         const msg = { ...ctx.query };
-        if (msg.token === undefined && token !== undefined) {
+        if (msg.token === undefined && token !== undefined && !_isBrowser) {
           msg.token = token;
         }
         const res2 = await query.post({ path: r.path, key: r.key, ...msg });
@@ -63438,23 +63464,17 @@ class AssistantApp extends Manager2 {
     }
   }
 }
-// ../node_modules/.pnpm/@kevisual+query@0.0.44/node_modules/@kevisual/query/dist/query.js
+// ../node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query.js
 var isTextForContentType2 = (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 adapter2 = 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();
@@ -63513,21 +63533,31 @@ var adapter2 = 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 json3 = await response.json();
+      if (json3?.code) {
+        return json3;
+      }
+      return {
+        code: isSuccess ? 200 : response.status,
+        status: response.status,
+        data: json3
+      };
     } else if (isTextForContentType2(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") {
@@ -63547,16 +63577,14 @@ var adapter2 = async (opts = {}, overloadOpts) => {
 var wrapperError2 = ({ code, message }) => {
   const result = {
     code: code || 500,
-    success: false,
-    message: message || "api request error",
-    showError: (fn) => {},
-    noMsg: true
+    message: message || "请求错误"
   };
   return result;
 };
 
 class Query2 {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -63564,11 +63592,20 @@ class Query2 {
   timeout;
   stop;
   qws;
-  isClient = false;
+  tokenName;
+  storage;
+  token;
   constructor(opts) {
     this.adapter = opts?.adapter || adapter2;
+    this.tokenName = opts?.tokenName || "token";
+    this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -63577,7 +63614,7 @@ class Query2 {
       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,
@@ -63599,7 +63636,6 @@ class Query2 {
   }
   async post(body, options) {
     const url3 = options?.url || this.url;
-    console.log("query post", url3, body, options);
     const { headers, adapter: adapter22, beforeRequest, afterResponse, timeout, ...rest } = options || {};
     const _headers = { ...this.headers, ...headers };
     const _adapter = adapter22 || this.adapter;
@@ -63613,13 +63649,20 @@ class Query2 {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
         if (res === false) {
           return wrapperError2({
             code: 500,
-            message: "request is cancel",
+            message: "请求取消",
             req
           });
         }
@@ -63628,13 +63671,13 @@ class Query2 {
       console.error("request beforeFn error", e, req);
       return wrapperError2({
         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) {
@@ -63642,11 +63685,20 @@ class Query2 {
             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 wrapperError2({
+          code: 500,
+          message: "请求取消，可能是因为用户未登录或者token过期",
+          req
+        });
+      }
     }
     return _adapter(req).then(async (res) => {
       try {
@@ -63659,10 +63711,10 @@ class Query2 {
         }
         return res;
       } catch (e) {
-        console.error("request afterFn error", e, req);
+        console.error("请求在响应后处理时发生错误", e, req);
         return wrapperError2({
           code: 500,
-          message: "api request afterFn error",
+          message: "请求在响应后处理时发生错误",
           req
         });
       }