@kevisual/query 0.0.34 → 0.0.36

package/dist/query-adapter.js

@@ -34,16 +34,28 @@ const adapter = async (opts = {}, overloadOpts) => {
         url = new URL(opts.url);
     }
     else {
-        origin = window?.location?.origin || 'http://localhost:51015';
+        origin = window?.location?.origin || 'http://localhost:51515';
         url = new URL(opts.url, origin);
     }
     const isGet = method === 'GET';
     if (isGet) {
-        url.search = new URLSearchParams(opts.body).toString();
+        let searchParams = new URLSearchParams(opts.body);
+        url.search = searchParams.toString();
     }
     else {
         const params = opts.params || {};
-        url.search = new URLSearchParams(params).toString();
+        const searchParams = new URLSearchParams(params);
+        if (typeof opts.body === 'object' && opts.body !== null) {
+            // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
+            let body = opts.body || {};
+            if (!params.path && body?.path) {
+                params.path = body.path;
+                if (body?.key) {
+                    params.key = body.key;
+                }
+            }
+        }
+        url.search = searchParams.toString();
     }
     let body = undefined;
     if (isGet) {

package/dist/query-browser.d.ts

@@ -118,6 +118,7 @@ type QueryOptions = {
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
+    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;

package/dist/query-browser.js

@@ -33,16 +33,28 @@ const adapter = async (opts = {}, overloadOpts) => {
         url = new URL(opts.url);
     }
     else {
-        origin = window?.location?.origin || 'http://localhost:51015';
+        origin = window?.location?.origin || 'http://localhost:51515';
         url = new URL(opts.url, origin);
     }
     const isGet = method === 'GET';
     if (isGet) {
-        url.search = new URLSearchParams(opts.body).toString();
+        let searchParams = new URLSearchParams(opts.body);
+        url.search = searchParams.toString();
     }
     else {
         const params = opts.params || {};
-        url.search = new URLSearchParams(params).toString();
+        const searchParams = new URLSearchParams(params);
+        if (typeof opts.body === 'object' && opts.body !== null) {
+            // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
+            let body = opts.body || {};
+            if (!params.path && body?.path) {
+                params.path = body.path;
+                if (body?.key) {
+                    params.key = body.key;
+                }
+            }
+        }
+        url.search = searchParams.toString();
     }
     let body = undefined;
     if (isGet) {
@@ -367,6 +379,21 @@ class Query {
             'Content-Type': 'application/json',
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
+        if (opts.beforeRequest) {
+            this.beforeRequest = opts.beforeRequest;
+        }
+        else {
+            this.beforeRequest = async (opts) => {
+                const token = globalThis?.localStorage?.getItem('token');
+                if (token) {
+                    opts.headers = {
+                        ...opts.headers,
+                        Authorization: `Bearer ${token}`,
+                    };
+                }
+                return opts;
+            };
+        }
     }
     setQueryWs(qws) {
         this.qws = qws;
@@ -549,7 +576,7 @@ class QueryClient extends Query {
     constructor(opts) {
         super(opts);
         this.tokenName = opts?.tokenName || 'token';
-        this.storage = opts?.storage || localStorage;
+        this.storage = opts?.storage || globalThis.localStorage;
         this.beforeRequest = async (opts) => {
             const token = this.token || this.getToken();
             if (token) {

package/dist/query.d.ts

@@ -118,6 +118,7 @@ type QueryOptions = {
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
+    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;

package/dist/query.js

@@ -33,16 +33,28 @@ const adapter = async (opts = {}, overloadOpts) => {
         url = new URL(opts.url);
     }
     else {
-        origin = window?.location?.origin || 'http://localhost:51015';
+        origin = window?.location?.origin || 'http://localhost:51515';
         url = new URL(opts.url, origin);
     }
     const isGet = method === 'GET';
     if (isGet) {
-        url.search = new URLSearchParams(opts.body).toString();
+        let searchParams = new URLSearchParams(opts.body);
+        url.search = searchParams.toString();
     }
     else {
         const params = opts.params || {};
-        url.search = new URLSearchParams(params).toString();
+        const searchParams = new URLSearchParams(params);
+        if (typeof opts.body === 'object' && opts.body !== null) {
+            // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
+            let body = opts.body || {};
+            if (!params.path && body?.path) {
+                params.path = body.path;
+                if (body?.key) {
+                    params.key = body.key;
+                }
+            }
+        }
+        url.search = searchParams.toString();
     }
     let body = undefined;
     if (isGet) {
@@ -170,6 +182,21 @@ class Query {
             'Content-Type': 'application/json',
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
+        if (opts.beforeRequest) {
+            this.beforeRequest = opts.beforeRequest;
+        }
+        else {
+            this.beforeRequest = async (opts) => {
+                const token = globalThis?.localStorage?.getItem('token');
+                if (token) {
+                    opts.headers = {
+                        ...opts.headers,
+                        Authorization: `Bearer ${token}`,
+                    };
+                }
+                return opts;
+            };
+        }
     }
     setQueryWs(qws) {
         this.qws = qws;

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "main": "dist/query-browser.js",
   "private": false,
   "type": "module",
   "scripts": {
     "build": "npm run clean && rollup -c",
-    "build:app": "npm run build && rsync dist/* ../deploy/dist",
     "dev:lib": "rollup -c -w",
     "clean": "rm -rf dist"
   },
@@ -24,10 +23,10 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "rollup": "^4.54.0",
+    "rollup": "^4.55.3",
     "rollup-plugin-dts": "^6.3.0",
     "typescript": "^5.9.3",
-    "zustand": "^5.0.9"
+    "zustand": "^5.0.10"
   },
   "publishConfig": {
     "access": "public"

package/src/adapter.ts

@@ -60,15 +60,27 @@ export const adapter = async (opts: AdapterOpts = {}, overloadOpts?: RequestInit
   if (opts?.url?.startsWith('http')) {
     url = new URL(opts.url);
   } else {
-    origin = window?.location?.origin || 'http://localhost:51015';
+    origin = window?.location?.origin || 'http://localhost:51515';
     url = new URL(opts.url, origin);
   }
   const isGet = method === 'GET';
   if (isGet) {
-    url.search = new URLSearchParams(opts.body as SimpleObject).toString();
+    let searchParams = new URLSearchParams(opts.body as SimpleObject);
+    url.search = searchParams.toString();
   } else {
     const params = opts.params || {};
-    url.search = new URLSearchParams(params as SimpleObject).toString();
+    const searchParams = new URLSearchParams(params as SimpleObject);
+    if (typeof opts.body === 'object' && opts.body !== null) {
+      // 浏览器环境下，自动将 body 中的 path 和 key 提取到查询参数中, 更容易排查问题
+      let body = opts.body as Record<string, any> || {};
+      if (!params.path && body?.path) {
+        params.path = body.path;
+        if (body?.key) {
+          params.key = body.key;
+        }
+      }
+    }
+    url.search = searchParams.toString();
   }
   let body: string | FormData | undefined = undefined;
   if (isGet) {

package/src/query-browser.ts

@@ -25,7 +25,7 @@ export class QueryClient extends Query {
   constructor(opts?: QueryOptions & { tokenName?: string; storage?: Storage; io?: boolean }) {
     super(opts);
     this.tokenName = opts?.tokenName || 'token';
-    this.storage = opts?.storage || localStorage;
+    this.storage = opts?.storage || globalThis.localStorage;
     this.beforeRequest = async (opts) => {
       const token = this.token || this.getToken();
       if (token) {

package/src/query.ts

@@ -24,6 +24,7 @@ export type QueryOptions = {
   headers?: Record<string, string>;
   timeout?: number;
   isClient?: boolean;
+  beforeRequest?: Fn;
 }
 export type Data = {
   path?: string;
@@ -113,6 +114,20 @@ export class Query {
       'Content-Type': 'application/json',
     };
     this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
+    if (opts.beforeRequest) {
+      this.beforeRequest = opts.beforeRequest;
+    } else {
+      this.beforeRequest = async (opts) => {
+        const token = globalThis?.localStorage?.getItem('token');
+        if (token) {
+          opts.headers = {
+            ...opts.headers,
+            Authorization: `Bearer ${token}`,
+          };
+        }
+        return opts;
+      };
+    }
   }
   setQueryWs(qws: QueryWs) {
     this.qws = qws;