@kevisual/query 0.0.6 → 0.0.7-alpha.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { adapter } from './adapter.ts';
-import { QueryWs } from './ws.ts';
-export { QueryOpts };
+import { QueryWs, QueryWsOpts } from './ws.ts';
+export { QueryOpts, QueryWs };
 type Fn = (opts: {
     url?: string;
     headers?: Record<string, string>;
@@ -63,7 +63,9 @@ export declare class QueryClient<U = any, V = any> extends Query<U, V> {
     constructor(opts?: QueryOpts & {
         tokenName?: string;
         storage?: Storage;
+        io?: boolean;
     });
+    createWs(opts?: QueryWsOpts): void;
     getToken(): string;
     saveToken(token: string): void;
     removeToken(): void;

package/dist/index.js

@@ -117,22 +117,31 @@ class QueryWs {
     /**
      * 连接 WebSocket
      */
-    connect() {
+    async connect(opts) {
         const store = this.store;
         const connected = store.getState().connected;
         if (connected) {
-            return;
+            return Promise.resolve(true);
         }
-        const ws = this.ws || new WebSocket(this.url);
-        ws.onopen = () => {
-            store.getState().setConnected(true);
-            store.getState().setStatus('connected');
-        };
-        ws.onclose = () => {
-            store.getState().setConnected(false);
-            store.getState().setStatus('disconnected');
-            this.ws = null;
-        };
+        return new Promise((resolve, reject) => {
+            const ws = this.ws || new WebSocket(this.url);
+            const timeout = opts?.timeout || 5 * 60 * 1000; // 默认 2 分钟
+            let timer = setTimeout(() => {
+                console.error('WebSocket 连接超时');
+                reject('timeout');
+            }, timeout);
+            ws.onopen = () => {
+                store.getState().setConnected(true);
+                store.getState().setStatus('connected');
+                resolve(true);
+                clearTimeout(timer);
+            };
+            ws.onclose = () => {
+                store.getState().setConnected(false);
+                store.getState().setStatus('disconnected');
+                this.ws = null;
+            };
+        });
     }
     listenConnect(callback) {
         const store = this.store;
@@ -205,6 +214,12 @@ class QueryWs {
             ws.send(data);
         }
     }
+    getOpen() {
+        if (!this.ws) {
+            return false;
+        }
+        return this.ws.readyState === WebSocket.OPEN;
+    }
 }
 
 /**
@@ -287,7 +302,12 @@ class QueryClient extends Query {
             }
             return opts;
         };
-        this.qws = new QueryWs({ url: opts?.url });
+        if (opts?.io) {
+            this.createWs();
+        }
+    }
+    createWs(opts) {
+        this.qws = new QueryWs({ url: this.url });
     }
     getToken() {
         return this.storage.getItem(this.tokenName);
@@ -300,4 +320,4 @@ class QueryClient extends Query {
     }
 }
 
-export { Query, QueryClient, adapter };
+export { Query, QueryClient, QueryWs, adapter };

package/dist/ws.d.ts

@@ -7,7 +7,7 @@ type QueryWsStore = {
 };
 export type QuerySelectState = 'connecting' | 'connected' | 'disconnected';
 export type QueryWsStoreListener = (newState: QueryWsStore, oldState: QueryWsStore) => void;
-type QueryWsOpts = {
+export type QueryWsOpts = {
     url?: string;
     store?: StoreApi<QueryWsStore>;
     ws?: WebSocket;
@@ -28,7 +28,9 @@ export declare class QueryWs {
     /**
      * 连接 WebSocket
      */
-    connect(): void;
+    connect(opts?: {
+        timeout?: number;
+    }): Promise<unknown>;
     listenConnect(callback: () => void): () => void;
     onMessage<T = any, U = any>(fn: (data: U, event: MessageEvent) => void, opts?: {
         isJson?: boolean;
@@ -39,5 +41,6 @@ export declare class QueryWs {
         isJson?: boolean;
         wrapper?: (data: T) => U;
     }): void;
+    getOpen(): boolean;
 }
 export {};

package/dist/ws.js

@@ -76,22 +76,31 @@ class QueryWs {
     /**
      * 连接 WebSocket
      */
-    connect() {
+    async connect(opts) {
         const store = this.store;
         const connected = store.getState().connected;
         if (connected) {
-            return;
+            return Promise.resolve(true);
         }
-        const ws = this.ws || new WebSocket(this.url);
-        ws.onopen = () => {
-            store.getState().setConnected(true);
-            store.getState().setStatus('connected');
-        };
-        ws.onclose = () => {
-            store.getState().setConnected(false);
-            store.getState().setStatus('disconnected');
-            this.ws = null;
-        };
+        return new Promise((resolve, reject) => {
+            const ws = this.ws || new WebSocket(this.url);
+            const timeout = opts?.timeout || 5 * 60 * 1000; // 默认 2 分钟
+            let timer = setTimeout(() => {
+                console.error('WebSocket 连接超时');
+                reject('timeout');
+            }, timeout);
+            ws.onopen = () => {
+                store.getState().setConnected(true);
+                store.getState().setStatus('connected');
+                resolve(true);
+                clearTimeout(timer);
+            };
+            ws.onclose = () => {
+                store.getState().setConnected(false);
+                store.getState().setStatus('disconnected');
+                this.ws = null;
+            };
+        });
     }
     listenConnect(callback) {
         const store = this.store;
@@ -164,6 +173,12 @@ class QueryWs {
             ws.send(data);
         }
     }
+    getOpen() {
+        if (!this.ws) {
+            return false;
+        }
+        return this.ws.readyState === WebSocket.OPEN;
+    }
 }
 
 export { QueryWs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.6",
+  "version": "0.0.7-alpha.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/node-adapter.d.ts

@@ -1,8 +0,0 @@
-type AdapterOpts = {
-    url: string;
-    headers?: Record<string, string>;
-    body?: Record<string, any>;
-};
-export declare const nodeAdapter: (opts: AdapterOpts) => Promise<any>;
-export declare const adapter: (opts: AdapterOpts) => Promise<any>;
-export {};

package/dist/node-adapter.js

@@ -1,49 +0,0 @@
-import http from 'http';
-
-const nodeAdapter = async (opts) => {
-    return new Promise((resolve, reject) => {
-        const postData = JSON.stringify(opts.body || '');
-        const _url = new URL(opts.url);
-        const { hostname, port, pathname } = _url;
-        const options = {
-            hostname: hostname,
-            port: port,
-            path: pathname || '/api/router',
-            method: 'POST', // Assuming it's a POST request
-            headers: {
-                'Content-Type': 'application/json',
-                'Content-Length': Buffer.byteLength(postData),
-                ...opts.headers,
-            },
-        };
-        const req = http.request(options, (res) => {
-            let data = '';
-            // Collect data chunks
-            res.on('data', (chunk) => {
-                data += chunk;
-            });
-            // Resolve when the response is complete
-            res.on('end', () => {
-                try {
-                    const parsedData = JSON.parse(data);
-                    resolve(parsedData);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        });
-        // Handle request errors
-        req.on('error', (error) => {
-            reject(error);
-        });
-        // Write the request body and end the request
-        if (opts.body) {
-            req.write(postData);
-        }
-        req.end();
-    });
-};
-const adapter = nodeAdapter;
-
-export { adapter, nodeAdapter };