@kevisual/query 0.0.40 → 0.0.42

package/dist/query-ws.js

@@ -1,6 +1,7 @@
-const createStoreImpl = (createState) => {
+// node_modules/.pnpm/zustand@5.0.11/node_modules/zustand/esm/vanilla.mjs
+var createStoreImpl = (createState) => {
   let state;
-  const listeners = /* @__PURE__ */ new Set();
+  const listeners = /* @__PURE__ */ new Set;
   const setState = (partial, replace) => {
     const nextState = typeof partial === "function" ? partial(state) : partial;
     if (!Object.is(nextState, state)) {
@@ -19,199 +20,180 @@ const createStoreImpl = (createState) => {
   const initialState = state = createState(setState, getState, api);
   return api;
 };
-const createStore = ((createState) => createState ? createStoreImpl(createState) : createStoreImpl);
+var createStore = (createState) => createState ? createStoreImpl(createState) : createStoreImpl;
 
-const parseWsUrl = (url) => {
-    try {
-        new URL(url);
-        return url;
+// src/utils.ts
+var parseWsUrl = (url) => {
+  try {
+    new URL(url);
+    return url;
+  } catch (e) {
+    const _url = new URL(url, location.origin);
+    if (_url.protocol === "http:") {
+      _url.protocol = "ws:";
     }
-    catch (e) {
-        const _url = new URL(url, location.origin);
-        if (_url.protocol === 'http:') {
-            _url.protocol = 'ws:';
-        }
-        if (_url.protocol === 'https:') {
-            _url.protocol = 'wss:';
-        }
-        return _url.href;
+    if (_url.protocol === "https:") {
+      _url.protocol = "wss:";
     }
+    return _url.href;
+  }
 };
 
+// src/ws.ts
 class QueryWs {
-    url;
-    store;
-    ws;
-    constructor(opts) {
-        const url = opts?.url || '/api/router';
-        if (opts?.store) {
-            this.store = opts.store;
-        }
-        else {
-            const store = createStore((set) => ({
-                connected: false,
-                status: 'connecting',
-                setConnected: (connected) => set({ connected }),
-                setStatus: (status) => set({ status }),
-            }));
-            this.store = store;
-        }
-        const wsUrl = parseWsUrl(url);
-        if (opts?.ws && opts.ws instanceof WebSocket) {
-            this.ws = opts.ws;
-        }
-        else {
-            this.ws = new WebSocket(wsUrl);
-        }
-        this.connect();
+  url;
+  store;
+  ws;
+  constructor(opts) {
+    const url = opts?.url || "/api/router";
+    if (opts?.store) {
+      this.store = opts.store;
+    } else {
+      const store = createStore((set) => ({
+        connected: false,
+        status: "connecting",
+        setConnected: (connected) => set({ connected }),
+        setStatus: (status) => set({ status })
+      }));
+      this.store = store;
     }
-    /**
-     * 连接 WebSocket
-     */
-    async connect(opts) {
-        const store = this.store;
-        const that = this;
-        const connected = store.getState().connected;
-        if (connected) {
-            return Promise.resolve(true);
-        }
-        return new Promise((resolve, reject) => {
-            const ws = that.ws || new WebSocket(that.url);
-            const timeout = opts?.timeout || 5 * 60 * 1000; // 默认 5 分钟
-            let timer = setTimeout(() => {
-                const isOpen = ws.readyState === WebSocket.OPEN;
-                if (isOpen) {
-                    console.log('WebSocket 连接成功 in timer');
-                    resolve(true);
-                    return;
-                }
-                console.error('WebSocket 连接超时', that.url);
-                resolve(false);
-            }, timeout);
-            ws.onopen = (ev) => {
-                store.getState().setConnected(true);
-                store.getState().setStatus('connected');
-                resolve(true);
-                clearTimeout(timer);
-            };
-            ws.onclose = (ev) => {
-                store.getState().setConnected(false);
-                store.getState().setStatus('disconnected');
-                this.ws = null;
-            };
-        });
+    const wsUrl = parseWsUrl(url);
+    if (opts?.ws && opts.ws instanceof WebSocket) {
+      this.ws = opts.ws;
+    } else {
+      this.ws = new WebSocket(wsUrl);
     }
-    /**
-     * ws.onopen 必须用这个去获取，否者会丢失链接信息
-     * @param callback
-     * @returns
-     */
-    listenConnect(callback) {
-        const store = this.store;
-        const { connected } = store.getState();
-        if (connected) {
-            callback();
-            return;
-        }
-        const subscriptionOne = (selector, listener) => {
-            const unsubscribe = store.subscribe((newState, oldState) => {
-                if (selector(newState) !== selector(oldState)) {
-                    listener(newState, oldState);
-                    unsubscribe();
-                }
-            });
-            return unsubscribe;
-        };
-        const cancel = subscriptionOne((state) => state.connected, () => {
-            callback();
-        });
-        return cancel;
+    this.connect();
+  }
+  async connect(opts) {
+    const store = this.store;
+    const that = this;
+    const connected = store.getState().connected;
+    if (connected) {
+      return Promise.resolve(true);
     }
-    listenClose(callback) {
-        const store = this.store;
-        const { status } = store.getState();
-        if (status === 'disconnected') {
-            callback();
+    return new Promise((resolve, reject) => {
+      const ws = that.ws || new WebSocket(that.url);
+      const timeout = opts?.timeout || 5 * 60 * 1000;
+      let timer = setTimeout(() => {
+        const isOpen = ws.readyState === WebSocket.OPEN;
+        if (isOpen) {
+          console.log("WebSocket 连接成功 in timer");
+          resolve(true);
+          return;
         }
-        const subscriptionOne = (selector, listener) => {
-            const unsubscribe = store.subscribe((newState, oldState) => {
-                if (selector(newState) !== selector(oldState)) {
-                    listener(newState, oldState);
-                    unsubscribe();
-                }
-            });
-            return unsubscribe;
-        };
-        const cancel = subscriptionOne((state) => state.status, (newState, oldState) => {
-            if (newState.status === 'disconnected') {
-                callback();
-            }
-        });
-        return cancel;
-    }
-    onMessage(fn, opts) {
-        const ws = this.ws;
-        const isJson = opts?.isJson ?? true;
-        const selector = opts?.selector;
-        const parseIfJson = (data) => {
-            try {
-                return JSON.parse(data);
-            }
-            catch (e) {
-                return data;
-            }
-        };
-        const listener = (event) => {
-            const received = parseIfJson(event.data);
-            if (typeof received === 'string' && !isJson) {
-                fn(received, event);
-            }
-            else if (typeof received === 'object' && isJson) {
-                fn(selector ? selector(received) : received, event);
-            }
-            else ;
-        };
-        ws.addEventListener('message', listener);
-        return () => {
-            ws.removeEventListener('message', listener);
-        };
-    }
-    close() {
-        const ws = this.ws;
-        const store = this.store;
-        ws?.close?.();
-        this.ws = null;
+        console.error("WebSocket 连接超时", that.url);
+        resolve(false);
+      }, timeout);
+      ws.onopen = (ev) => {
+        store.getState().setConnected(true);
+        store.getState().setStatus("connected");
+        resolve(true);
+        clearTimeout(timer);
+      };
+      ws.onclose = (ev) => {
         store.getState().setConnected(false);
-        store.getState().setStatus('disconnected');
+        store.getState().setStatus("disconnected");
+        this.ws = null;
+      };
+    });
+  }
+  listenConnect(callback) {
+    const store = this.store;
+    const { connected } = store.getState();
+    if (connected) {
+      callback();
+      return;
     }
-    /**
-     * 发送消息
-     *
-     * @param data
-     * @param opts
-     * @returns
-     */
-    send(data, opts) {
-        const ws = this.ws;
-        const isJson = opts?.isJson ?? true;
-        const wrapper = opts?.wrapper;
-        if (!ws || ws.readyState !== WebSocket.OPEN) {
-            console.error('WebSocket is not open');
-            return;
-        }
-        if (isJson) {
-            ws.send(JSON.stringify(wrapper ? wrapper(data) : data));
-        }
-        else {
-            ws.send(data);
+    const subscriptionOne = (selector, listener) => {
+      const unsubscribe = store.subscribe((newState, oldState) => {
+        if (selector(newState) !== selector(oldState)) {
+          listener(newState, oldState);
+          unsubscribe();
         }
+      });
+      return unsubscribe;
+    };
+    const cancel = subscriptionOne((state) => state.connected, () => {
+      callback();
+    });
+    return cancel;
+  }
+  listenClose(callback) {
+    const store = this.store;
+    const { status } = store.getState();
+    if (status === "disconnected") {
+      callback();
     }
-    getOpen() {
-        if (!this.ws) {
-            return false;
+    const subscriptionOne = (selector, listener) => {
+      const unsubscribe = store.subscribe((newState, oldState) => {
+        if (selector(newState) !== selector(oldState)) {
+          listener(newState, oldState);
+          unsubscribe();
         }
-        return this.ws.readyState === WebSocket.OPEN;
+      });
+      return unsubscribe;
+    };
+    const cancel = subscriptionOne((state) => state.status, (newState, oldState) => {
+      if (newState.status === "disconnected") {
+        callback();
+      }
+    });
+    return cancel;
+  }
+  onMessage(fn, opts) {
+    const ws = this.ws;
+    const isJson = opts?.isJson ?? true;
+    const selector = opts?.selector;
+    const parseIfJson = (data) => {
+      try {
+        return JSON.parse(data);
+      } catch (e) {
+        return data;
+      }
+    };
+    const listener = (event) => {
+      const received = parseIfJson(event.data);
+      if (typeof received === "string" && !isJson) {
+        fn(received, event);
+      } else if (typeof received === "object" && isJson) {
+        fn(selector ? selector(received) : received, event);
+      } else {}
+    };
+    ws.addEventListener("message", listener);
+    return () => {
+      ws.removeEventListener("message", listener);
+    };
+  }
+  close() {
+    const ws = this.ws;
+    const store = this.store;
+    ws?.close?.();
+    this.ws = null;
+    store.getState().setConnected(false);
+    store.getState().setStatus("disconnected");
+  }
+  send(data, opts) {
+    const ws = this.ws;
+    const isJson = opts?.isJson ?? true;
+    const wrapper = opts?.wrapper;
+    if (!ws || ws.readyState !== WebSocket.OPEN) {
+      console.error("WebSocket is not open");
+      return;
     }
+    if (isJson) {
+      ws.send(JSON.stringify(wrapper ? wrapper(data) : data));
+    } else {
+      ws.send(data);
+    }
+  }
+  getOpen() {
+    if (!this.ws) {
+      return false;
+    }
+    return this.ws.readyState === WebSocket.OPEN;
+  }
 }
-
-export { QueryWs };
+export {
+  QueryWs
+};

package/dist/query.d.ts

@@ -250,13 +250,6 @@ declare class BaseQuery<T extends Query = Query, R extends {
     post<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
     get<R = any, P = any>(data: P, options?: DataOpts): Promise<Result<R>>;
 }
-/**
- * @deprecated
- * 前端调用后端QueryRouter, 默认路径 /client/router
- */
-declare class ClientQuery extends Query {
-    constructor(opts?: QueryOpts);
-}
 
-export { BaseQuery, ClientQuery, Query, adapter, setBaseResponse, wrapperError };
+export { BaseQuery, Query, adapter, setBaseResponse, wrapperError };
 export type { Data, DataOpts, Fn, QueryOptions, QueryOpts, Result };