@kevisual/query 0.0.19 → 0.0.21

package/dist/query-adapter.d.ts

@@ -1,11 +1,12 @@
 declare const methods: readonly ["GET", "POST"];
 type Method = (typeof methods)[number];
 type AdapterOpts = {
-    url: string;
+    url?: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
     method?: Method;
+    isBlob?: boolean;
 };
 /**
  *

package/dist/query-adapter.js

@@ -8,6 +8,7 @@ const methods = ['GET', 'POST'];
 const adapter = async (opts, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
+    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -39,8 +40,12 @@ const adapter = async (opts, overloadOpts) => {
         .then((response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
+        if (isBlob) {
+            return response.blob(); // 直接返回 Blob 对象
+        }
+        const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
-        if (contentType && contentType.includes('application/json')) {
+        if (isJson) {
             return response.json(); // 解析为 JSON
         }
         else {

package/dist/query-browser.d.ts

@@ -3,11 +3,12 @@ import { StoreApi } from 'zustand/vanilla';
 declare const methods: readonly ["GET", "POST"];
 type Method = (typeof methods)[number];
 type AdapterOpts = {
-    url: string;
+    url?: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
     method?: Method;
+    isBlob?: boolean;
 };
 /**
  *
@@ -92,10 +93,12 @@ type Fn = (opts: {
 }) => Promise<Record<string, any> | false>;
 type QueryOpts$1 = {
     url?: string;
-    adapter?: typeof adapter;
     headers?: Record<string, string>;
+    body?: Record<string, any>;
     timeout?: number;
     method?: Method;
+    isBlob?: boolean;
+    adapter?: typeof adapter;
     [key: string]: any;
 };
 type Data = {
@@ -159,7 +162,9 @@ declare class Query {
      * 需要突然停止请求，比如401的时候
      */
     stop?: boolean;
+    qws: QueryWs;
     constructor(opts?: QueryOpts$1);
+    setQueryWs(qws: QueryWs): void;
     /**
      * 突然停止请求
      */
@@ -192,6 +197,7 @@ declare class Query {
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
+    fetchText(url: string, options?: RequestInit): Promise<Result<any>>;
 }
 
 declare class BaseQuery<T extends Query = Query, R extends {
@@ -204,14 +210,17 @@ declare class BaseQuery<T extends Query = Query, R extends {
     query: T;
     queryDefine: R;
     constructor(opts?: {
-        query: T;
+        query?: T;
         queryDefine?: R;
         clientQuery?: T;
     });
-    get chain(): any;
+    get chain(): R['queryChain'];
     post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
+declare class ClientQuery extends Query {
+    constructor(opts?: QueryOpts$1);
+}
 
 type QueryOpts = {
     url?: string;
@@ -220,13 +229,12 @@ type QueryOpts = {
     timeout?: number;
 };
 /**
- * 前端调用后端QueryRouter
+ * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
  */
 declare class QueryClient extends Query {
     tokenName: string;
     storage: Storage;
     token: string;
-    qws: QueryWs;
     constructor(opts?: QueryOpts & {
         tokenName?: string;
         storage?: Storage;
@@ -238,5 +246,5 @@ declare class QueryClient extends Query {
     removeToken(): void;
 }
 
-export { BaseQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
+export { BaseQuery, ClientQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
 export type { Data, DataOpts, QueryOpts, QueryWsOpts, Result };

package/dist/query-browser.js

@@ -7,6 +7,7 @@
 const adapter = async (opts, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
+    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -38,8 +39,12 @@ const adapter = async (opts, overloadOpts) => {
         .then((response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
+        if (isBlob) {
+            return response.blob(); // 直接返回 Blob 对象
+        }
+        const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
-        if (contentType && contentType.includes('application/json')) {
+        if (isJson) {
             return response.json(); // 解析为 JSON
         }
         else {
@@ -293,6 +298,7 @@ const setBaseResponse = (res) => {
             fn?.();
         }
     };
+    return res;
 };
 const wrapperError = ({ code, message }) => {
     const result = {
@@ -326,6 +332,8 @@ class Query {
      * 需要突然停止请求，比如401的时候
      */
     stop;
+    // 默认不使用ws
+    qws;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -334,6 +342,9 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    setQueryWs(qws) {
+        this.qws = qws;
+    }
     /**
      * 突然停止请求
      */
@@ -443,6 +454,62 @@ class Query {
     after(fn) {
         this.afterResponse = fn;
     }
+    async fetchText(url, options) {
+        const res = await fetch(url, {
+            method: 'GET',
+            ...options,
+            headers: {
+                ...this.headers,
+                ...(options?.headers || {}),
+            },
+        });
+        if (!res.ok) {
+            return wrapperError({
+                code: res.status,
+                message: `fetch error: ${res.statusText}`,
+            });
+        }
+        const contentType = res.headers.get('Content-Type');
+        if (contentType && contentType.includes('application/json')) {
+            const data = await res.json();
+            const result = { code: res.status, data, success: res.ok };
+            return setBaseResponse(result);
+        }
+        if (contentType && contentType.includes('text/html')) {
+            const text = await res.text();
+            const result = {
+                code: res.status,
+                data: text,
+                success: res.ok,
+            };
+            return setBaseResponse(result);
+        }
+        if (contentType && contentType.includes('text/plain')) {
+            let text = await res.text();
+            // 处理特殊情况，比如返回的是纯文本
+            if (text.startsWith('{')) {
+                try {
+                    text = JSON.parse(text);
+                }
+                catch (e) {
+                    // 如果解析失败，保持原样
+                }
+            }
+            const result = {
+                code: res.status,
+                data: text,
+                success: res.ok,
+            };
+            return setBaseResponse(result);
+        }
+        const blob = await res.blob();
+        const result = {
+            code: res.status,
+            data: blob,
+            success: res.ok,
+        };
+        return setBaseResponse(result);
+    }
 }
 class BaseQuery {
     query;
@@ -469,16 +536,19 @@ class BaseQuery {
         return this.query.get(data, options);
     }
 }
+class ClientQuery extends Query {
+    constructor(opts) {
+        super({ ...opts, url: opts?.url || '/client/router' });
+    }
+}
 
 /**
- * 前端调用后端QueryRouter
+ * 前端调用后端QueryRouter, 封装 beforeRequest 和 wss
  */
 class QueryClient extends Query {
     tokenName;
     storage;
     token;
-    // 默认不使用ws
-    qws;
     constructor(opts) {
         super(opts);
         this.tokenName = opts?.tokenName || 'token';
@@ -513,4 +583,4 @@ class QueryClient extends Query {
 // 移除默认生成的实例
 // export const client = new QueryClient();
 
-export { BaseQuery, Query, QueryClient, QueryWs, adapter, wrapperError };
+export { BaseQuery, ClientQuery, Query, QueryClient, QueryWs, adapter, wrapperError };

package/dist/query.d.ts

@@ -1,11 +1,14 @@
+import { StoreApi } from 'zustand/vanilla';
+
 declare const methods: readonly ["GET", "POST"];
 type Method = (typeof methods)[number];
 type AdapterOpts = {
-    url: string;
+    url?: string;
     headers?: Record<string, string>;
     body?: Record<string, any>;
     timeout?: number;
     method?: Method;
+    isBlob?: boolean;
 };
 /**
  *
@@ -15,6 +18,67 @@ type AdapterOpts = {
  */
 declare const adapter: (opts: AdapterOpts, overloadOpts?: RequestInit) => Promise<any>;
 
+type QueryWsStore = {
+    connected: boolean;
+    status: 'connecting' | 'connected' | 'disconnected';
+    setConnected: (connected: boolean) => void;
+    setStatus: (status: QuerySelectState) => void;
+};
+type QuerySelectState = 'connecting' | 'connected' | 'disconnected';
+type QueryWsOpts = {
+    url?: string;
+    store?: StoreApi<QueryWsStore>;
+    ws?: WebSocket;
+};
+declare class QueryWs {
+    url: string;
+    store: StoreApi<QueryWsStore>;
+    ws: WebSocket;
+    constructor(opts?: QueryWsOpts);
+    /**
+     * 连接 WebSocket
+     */
+    connect(opts?: {
+        timeout?: number;
+    }): Promise<unknown>;
+    /**
+     * ws.onopen 必须用这个去获取，否者会丢失链接信息
+     * @param callback
+     * @returns
+     */
+    listenConnect(callback: () => void): () => void;
+    listenClose(callback: () => void): () => void;
+    onMessage<T = any, U = any>(fn: (data: U, event: MessageEvent) => void, opts?: {
+        /**
+         * 是否将数据转换为 JSON
+         */
+        isJson?: boolean;
+        /**
+         * 选择器
+         */
+        selector?: (data: T) => U;
+    }): () => void;
+    close(): void;
+    /**
+     * 发送消息
+     *
+     * @param data
+     * @param opts
+     * @returns
+     */
+    send<T = any, U = any>(data: T, opts?: {
+        /**
+         * 是否将数据转换为 JSON
+         */
+        isJson?: boolean;
+        /**
+         * 包装数据
+         */
+        wrapper?: (data: T) => U;
+    }): void;
+    getOpen(): boolean;
+}
+
 /**
  * 请求前处理函数
  * @param opts 请求配置
@@ -29,10 +93,12 @@ type Fn = (opts: {
 }) => Promise<Record<string, any> | false>;
 type QueryOpts = {
     url?: string;
-    adapter?: typeof adapter;
     headers?: Record<string, string>;
+    body?: Record<string, any>;
     timeout?: number;
     method?: Method;
+    isBlob?: boolean;
+    adapter?: typeof adapter;
     [key: string]: any;
 };
 type Data = {
@@ -72,7 +138,7 @@ type DataOpts = Partial<QueryOpts> & {
  * showError 是 如果 success 为 false 且 noMsg 为 false, 则调用 showError
  * @param res 响应
  */
-declare const setBaseResponse: (res: Result) => void;
+declare const setBaseResponse: (res: Partial<Result>) => Result;
 declare const wrapperError: ({ code, message }: {
     code?: number;
     message?: string;
@@ -103,7 +169,9 @@ declare class Query {
      * 需要突然停止请求，比如401的时候
      */
     stop?: boolean;
+    qws: QueryWs;
     constructor(opts?: QueryOpts);
+    setQueryWs(qws: QueryWs): void;
     /**
      * 突然停止请求
      */
@@ -136,6 +204,7 @@ declare class Query {
      * @param fn 处理函数
      */
     after(fn: DataOpts['afterResponse']): void;
+    fetchText(url: string, options?: RequestInit): Promise<Result<any>>;
 }
 
 declare class BaseQuery<T extends Query = Query, R extends {
@@ -148,11 +217,11 @@ declare class BaseQuery<T extends Query = Query, R extends {
     query: T;
     queryDefine: R;
     constructor(opts?: {
-        query: T;
+        query?: T;
         queryDefine?: R;
         clientQuery?: T;
     });
-    get chain(): any;
+    get chain(): R['queryChain'];
     post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }

package/dist/query.js

@@ -7,6 +7,7 @@
 const adapter = async (opts, overloadOpts) => {
     const controller = new AbortController();
     const signal = controller.signal;
+    const isBlob = opts.isBlob || false; // 是否返回 Blob 对象
     const timeout = opts.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     const timer = setTimeout(() => {
         controller.abort();
@@ -38,8 +39,12 @@ const adapter = async (opts, overloadOpts) => {
         .then((response) => {
         // 获取 Content-Type 头部信息
         const contentType = response.headers.get('Content-Type');
+        if (isBlob) {
+            return response.blob(); // 直接返回 Blob 对象
+        }
+        const isJson = contentType && contentType.includes('application/json');
         // 判断返回的数据类型
-        if (contentType && contentType.includes('application/json')) {
+        if (isJson) {
             return response.json(); // 解析为 JSON
         }
         else {
@@ -77,6 +82,7 @@ const setBaseResponse = (res) => {
             fn?.();
         }
     };
+    return res;
 };
 const wrapperError = ({ code, message }) => {
     const result = {
@@ -110,6 +116,8 @@ class Query {
      * 需要突然停止请求，比如401的时候
      */
     stop;
+    // 默认不使用ws
+    qws;
     constructor(opts) {
         this.adapter = opts?.adapter || adapter;
         this.url = opts?.url || '/api/router';
@@ -118,6 +126,9 @@ class Query {
         };
         this.timeout = opts?.timeout || 60000 * 3; // 默认超时时间为 60s * 3
     }
+    setQueryWs(qws) {
+        this.qws = qws;
+    }
     /**
      * 突然停止请求
      */
@@ -227,6 +238,62 @@ class Query {
     after(fn) {
         this.afterResponse = fn;
     }
+    async fetchText(url, options) {
+        const res = await fetch(url, {
+            method: 'GET',
+            ...options,
+            headers: {
+                ...this.headers,
+                ...(options?.headers || {}),
+            },
+        });
+        if (!res.ok) {
+            return wrapperError({
+                code: res.status,
+                message: `fetch error: ${res.statusText}`,
+            });
+        }
+        const contentType = res.headers.get('Content-Type');
+        if (contentType && contentType.includes('application/json')) {
+            const data = await res.json();
+            const result = { code: res.status, data, success: res.ok };
+            return setBaseResponse(result);
+        }
+        if (contentType && contentType.includes('text/html')) {
+            const text = await res.text();
+            const result = {
+                code: res.status,
+                data: text,
+                success: res.ok,
+            };
+            return setBaseResponse(result);
+        }
+        if (contentType && contentType.includes('text/plain')) {
+            let text = await res.text();
+            // 处理特殊情况，比如返回的是纯文本
+            if (text.startsWith('{')) {
+                try {
+                    text = JSON.parse(text);
+                }
+                catch (e) {
+                    // 如果解析失败，保持原样
+                }
+            }
+            const result = {
+                code: res.status,
+                data: text,
+                success: res.ok,
+            };
+            return setBaseResponse(result);
+        }
+        const blob = await res.blob();
+        const result = {
+            code: res.status,
+            data: blob,
+            success: res.ok,
+        };
+        return setBaseResponse(result);
+    }
 }
 class BaseQuery {
     query;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "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.40.2",
+    "rollup": "^4.41.1",
     "rollup-plugin-dts": "^6.2.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3",
-    "zustand": "^5.0.4"
+    "zustand": "^5.0.5"
   },
   "packageManager": "yarn@1.22.22",
   "publishConfig": {
@@ -59,6 +59,6 @@
     }
   },
   "dependencies": {
-    "openai": "^4.98.0"
+    "openai": "^5.0.1"
   }
 }