@kevisual/query 0.0.14 → 0.0.15

package/dist/query-adapter.js

@@ -13,13 +13,21 @@ const adapter = async (opts, overloadOpts) => {
         controller.abort();
     }, timeout);
     let method = overloadOpts?.method || opts.method || 'POST';
-    let url = new URL(opts.url, window.location.origin);
+    let origin = '';
+    let url;
+    if (opts?.url?.startsWith('http')) {
+        url = new URL(opts.url);
+    }
+    else {
+        origin = window?.location?.origin || 'http://localhost:11015';
+        url = new URL(opts.url, origin);
+    }
     const isGet = method === 'GET';
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
     return fetch(url, {
-        method: method,
+        method: method.toUpperCase(),
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,

package/dist/query-browser.d.ts

@@ -40,14 +40,39 @@ declare class QueryWs {
     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;
@@ -102,7 +127,7 @@ type DataOpts = Partial<QueryOpts$1> & {
         req?: any;
         res?: any;
         fetch?: any;
-    }) => Promise<S>;
+    }) => Promise<Result<S>>;
 };
 /**
  * const query = new Query();

package/dist/query-browser.js

@@ -12,13 +12,21 @@ const adapter = async (opts, overloadOpts) => {
         controller.abort();
     }, timeout);
     let method = overloadOpts?.method || opts.method || 'POST';
-    let url = new URL(opts.url, window.location.origin);
+    let origin = '';
+    let url;
+    if (opts?.url?.startsWith('http')) {
+        url = new URL(opts.url);
+    }
+    else {
+        origin = window?.location?.origin || 'http://localhost:11015';
+        url = new URL(opts.url, origin);
+    }
     const isGet = method === 'GET';
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
     return fetch(url, {
-        method: method,
+        method: method.toUpperCase(),
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,
@@ -124,30 +132,42 @@ class QueryWs {
      */
     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 = this.ws || new WebSocket(this.url);
-            const timeout = opts?.timeout || 5 * 60 * 1000; // 默认 2 分钟
+            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 连接超时');
                 reject('timeout');
             }, timeout);
-            ws.onopen = () => {
+            ws.onopen = (ev) => {
                 store.getState().setConnected(true);
                 store.getState().setStatus('connected');
                 resolve(true);
                 clearTimeout(timer);
             };
-            ws.onclose = () => {
+            ws.onclose = (ev) => {
                 store.getState().setConnected(false);
                 store.getState().setStatus('disconnected');
                 this.ws = null;
             };
         });
     }
+    /**
+     * ws.onopen 必须用这个去获取，否者会丢失链接信息
+     * @param callback
+     * @returns
+     */
     listenConnect(callback) {
         const store = this.store;
         const { connected } = store.getState();
@@ -169,6 +189,28 @@ class QueryWs {
         });
         return cancel;
     }
+    listenClose(callback) {
+        const store = this.store;
+        const { status } = store.getState();
+        if (status === 'disconnected') {
+            callback();
+        }
+        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;
@@ -204,6 +246,13 @@ class QueryWs {
         store.getState().setConnected(false);
         store.getState().setStatus('disconnected');
     }
+    /**
+     * 发送消息
+     *
+     * @param data
+     * @param opts
+     * @returns
+     */
     send(data, opts) {
         const ws = this.ws;
         const isJson = opts?.isJson ?? true;

package/dist/query-ws.d.ts

@@ -32,14 +32,39 @@ declare class QueryWs {
     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;

package/dist/query-ws.js

@@ -70,30 +70,42 @@ class QueryWs {
      */
     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 = this.ws || new WebSocket(this.url);
-            const timeout = opts?.timeout || 5 * 60 * 1000; // 默认 2 分钟
+            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 连接超时');
                 reject('timeout');
             }, timeout);
-            ws.onopen = () => {
+            ws.onopen = (ev) => {
                 store.getState().setConnected(true);
                 store.getState().setStatus('connected');
                 resolve(true);
                 clearTimeout(timer);
             };
-            ws.onclose = () => {
+            ws.onclose = (ev) => {
                 store.getState().setConnected(false);
                 store.getState().setStatus('disconnected');
                 this.ws = null;
             };
         });
     }
+    /**
+     * ws.onopen 必须用这个去获取，否者会丢失链接信息
+     * @param callback
+     * @returns
+     */
     listenConnect(callback) {
         const store = this.store;
         const { connected } = store.getState();
@@ -115,6 +127,28 @@ class QueryWs {
         });
         return cancel;
     }
+    listenClose(callback) {
+        const store = this.store;
+        const { status } = store.getState();
+        if (status === 'disconnected') {
+            callback();
+        }
+        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;
@@ -150,6 +184,13 @@ class QueryWs {
         store.getState().setConnected(false);
         store.getState().setStatus('disconnected');
     }
+    /**
+     * 发送消息
+     *
+     * @param data
+     * @param opts
+     * @returns
+     */
     send(data, opts) {
         const ws = this.ws;
         const isJson = opts?.isJson ?? true;

package/dist/query.d.ts

@@ -64,7 +64,7 @@ type DataOpts = Partial<QueryOpts> & {
         req?: any;
         res?: any;
         fetch?: any;
-    }) => Promise<S>;
+    }) => Promise<Result<S>>;
 };
 /**
  * 设置基础响应, 设置 success 和 showError,

package/dist/query.js

@@ -12,13 +12,21 @@ const adapter = async (opts, overloadOpts) => {
         controller.abort();
     }, timeout);
     let method = overloadOpts?.method || opts.method || 'POST';
-    let url = new URL(opts.url, window.location.origin);
+    let origin = '';
+    let url;
+    if (opts?.url?.startsWith('http')) {
+        url = new URL(opts.url);
+    }
+    else {
+        origin = window?.location?.origin || 'http://localhost:11015';
+        url = new URL(opts.url, origin);
+    }
     const isGet = method === 'GET';
     if (isGet) {
         url.search = new URLSearchParams(opts.body).toString();
     }
     return fetch(url, {
-        method: method,
+        method: method.toUpperCase(),
         headers: {
             'Content-Type': 'application/json',
             ...opts.headers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,6 +9,7 @@
   "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"
   },
   "files": [