@kevisual/query 0.0.16 → 0.0.18

package/dist/query-browser.d.ts

@@ -89,7 +89,7 @@ type Fn = (opts: {
     body?: Record<string, any>;
     [key: string]: any;
     timeout?: number;
-}) => Promise<Record<string, any>>;
+}) => Promise<Record<string, any> | false>;
 type QueryOpts$1 = {
     url?: string;
     adapter?: typeof adapter;
@@ -129,6 +129,16 @@ type DataOpts = Partial<QueryOpts$1> & {
         fetch?: any;
     }) => Promise<Result<S>>;
 };
+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();
  * const res = await query.post({
@@ -184,7 +194,7 @@ declare class Query {
     after(fn: DataOpts['afterResponse']): void;
 }
 
-declare class BaseQuery<T extends Query> {
+declare class BaseQuery<T extends Query = Query> {
     query: T;
     constructor({ query }: {
         query: T;
@@ -193,10 +203,6 @@ declare class BaseQuery<T extends Query> {
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
 
-
-
-
-
 type QueryOpts = {
     url?: string;
     adapter?: typeof adapter;
@@ -222,5 +228,5 @@ declare class QueryClient extends Query {
     removeToken(): void;
 }
 
-export { BaseQuery, Query, QueryClient, QueryWs, adapter };
+export { BaseQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
 export type { Data, DataOpts, QueryOpts, QueryWsOpts, Result };

package/dist/query-browser.js

@@ -18,7 +18,7 @@ const adapter = async (opts, overloadOpts) => {
         url = new URL(opts.url);
     }
     else {
-        origin = window?.location?.origin || 'http://localhost:11015';
+        origin = window?.location?.origin || 'http://localhost:51015';
         url = new URL(opts.url, origin);
     }
     const isGet = method === 'GET';
@@ -148,7 +148,7 @@ class QueryWs {
                     return;
                 }
                 console.error('WebSocket 连接超时');
-                reject('timeout');
+                resolve(false);
             }, timeout);
             ws.onopen = (ev) => {
                 store.getState().setConnected(true);
@@ -294,6 +294,18 @@ const setBaseResponse = (res) => {
         }
     };
 };
+const wrapperError = ({ code, message }) => {
+    const result = {
+        code: code || 500,
+        success: false,
+        message: message || 'api request error',
+        showError: (fn) => {
+            //
+        },
+        noMsg: true,
+    };
+    return result;
+};
 /**
  * const query = new Query();
  * const res = await query.post({
@@ -364,17 +376,22 @@ class Query {
         };
         try {
             if (_beforeRequest) {
-                await _beforeRequest(req);
+                const res = await _beforeRequest(req);
+                if (res === false) {
+                    return wrapperError({
+                        code: 500,
+                        message: 'request is cancel',
+                        // @ts-ignore
+                        req: req,
+                    });
+                }
             }
         }
         catch (e) {
             console.error('request beforeFn error', e, req);
-            return {
+            return wrapperError({
                 code: 500,
-                success: false,
-                message: 'api request beforeFn error',
-                showError: () => { },
-            };
+                message: 'api request beforeFn error'});
         }
         if (this.stop) {
             const that = this;
@@ -405,13 +422,10 @@ class Query {
                 return res;
             }
             catch (e) {
-                console.error('request error', e, req);
-                return {
+                console.error('request afterFn error', e, req);
+                return wrapperError({
                     code: 500,
-                    success: false,
-                    message: 'api request afterFn error',
-                    showError: () => { },
-                };
+                    message: 'api request afterFn error'});
             }
         });
     }
@@ -486,4 +500,4 @@ class QueryClient extends Query {
 // 移除默认生成的实例
 // export const client = new QueryClient();
 
-export { BaseQuery, Query, QueryClient, QueryWs, adapter };
+export { BaseQuery, Query, QueryClient, QueryWs, adapter, wrapperError };

package/dist/query-ws.js

@@ -86,7 +86,7 @@ class QueryWs {
                     return;
                 }
                 console.error('WebSocket 连接超时');
-                reject('timeout');
+                resolve(false);
             }, timeout);
             ws.onopen = (ev) => {
                 store.getState().setConnected(true);

package/dist/query.d.ts

@@ -26,7 +26,7 @@ type Fn = (opts: {
     body?: Record<string, any>;
     [key: string]: any;
     timeout?: number;
-}) => Promise<Record<string, any>>;
+}) => Promise<Record<string, any> | false>;
 type QueryOpts = {
     url?: string;
     adapter?: typeof adapter;
@@ -73,6 +73,16 @@ type DataOpts = Partial<QueryOpts> & {
  * @param res 响应
  */
 declare const setBaseResponse: (res: Result) => void;
+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();
  * const res = await query.post({
@@ -128,7 +138,7 @@ declare class Query {
     after(fn: DataOpts['afterResponse']): void;
 }
 
-declare class BaseQuery<T extends Query> {
+declare class BaseQuery<T extends Query = Query> {
     query: T;
     constructor({ query }: {
         query: T;
@@ -137,5 +147,5 @@ declare class BaseQuery<T extends Query> {
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
 
-export { BaseQuery, Query, adapter, setBaseResponse };
+export { BaseQuery, Query, adapter, setBaseResponse, wrapperError };
 export type { Data, DataOpts, Fn, QueryOpts, Result };

package/dist/query.js

@@ -18,7 +18,7 @@ const adapter = async (opts, overloadOpts) => {
         url = new URL(opts.url);
     }
     else {
-        origin = window?.location?.origin || 'http://localhost:11015';
+        origin = window?.location?.origin || 'http://localhost:51015';
         url = new URL(opts.url, origin);
     }
     const isGet = method === 'GET';
@@ -78,6 +78,18 @@ const setBaseResponse = (res) => {
         }
     };
 };
+const wrapperError = ({ code, message }) => {
+    const result = {
+        code: code || 500,
+        success: false,
+        message: message || 'api request error',
+        showError: (fn) => {
+            //
+        },
+        noMsg: true,
+    };
+    return result;
+};
 /**
  * const query = new Query();
  * const res = await query.post({
@@ -148,17 +160,22 @@ class Query {
         };
         try {
             if (_beforeRequest) {
-                await _beforeRequest(req);
+                const res = await _beforeRequest(req);
+                if (res === false) {
+                    return wrapperError({
+                        code: 500,
+                        message: 'request is cancel',
+                        // @ts-ignore
+                        req: req,
+                    });
+                }
             }
         }
         catch (e) {
             console.error('request beforeFn error', e, req);
-            return {
+            return wrapperError({
                 code: 500,
-                success: false,
-                message: 'api request beforeFn error',
-                showError: () => { },
-            };
+                message: 'api request beforeFn error'});
         }
         if (this.stop) {
             const that = this;
@@ -189,13 +206,10 @@ class Query {
                 return res;
             }
             catch (e) {
-                console.error('request error', e, req);
-                return {
+                console.error('request afterFn error', e, req);
+                return wrapperError({
                     code: 500,
-                    success: false,
-                    message: 'api request afterFn error',
-                    showError: () => { },
-                };
+                    message: 'api request afterFn error'});
             }
         });
     }
@@ -227,4 +241,4 @@ class BaseQuery {
     }
 }
 
-export { BaseQuery, Query, adapter, setBaseResponse };
+export { BaseQuery, Query, adapter, setBaseResponse, wrapperError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,12 +25,12 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.2",
-    "rollup": "^4.36.0",
-    "rollup-plugin-dts": "^6.2.0",
+    "rollup": "^4.40.2",
+    "rollup-plugin-dts": "^6.2.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "typescript": "^5.8.2",
-    "zustand": "^5.0.3"
+    "typescript": "^5.8.3",
+    "zustand": "^5.0.4"
   },
   "packageManager": "yarn@1.22.22",
   "publishConfig": {
@@ -59,6 +59,6 @@
     }
   },
   "dependencies": {
-    "openai": "^4.88.0"
+    "openai": "^4.98.0"
   }
 }