vite-uni-dev-tool 1.1.0 → 1.2.0

package/dist/v3/hooks/useWebsocket/index.ts

@@ -1,253 +1,253 @@
-import { ref, onUnmounted, type Ref } from 'vue';
-
-/**
- * WebSocket 连接状态枚举
- */
-export enum ReadyState {
-  Connecting = 0, // 连接中
-  Open = 1, // 已连接
-  Closing = 2, // 关闭中
-  Closed = 3, // 已关闭
-}
-
-/**
- * useWebsocket 配置参数
- */
-export interface Options {
-  /** 重连尝试次数限制，默认为 3 */
-  reconnectLimit?: number;
-  /** 重连时间间隔 (ms)，默认为 3000 */
-  reconnectInterval?: number;
-  /** 是否开启心跳检查，默认为 false */
-  heartbeat?: boolean;
-  /** 心跳检查间隔 (ms)，默认为 30000 */
-  heartbeatInterval?: number;
-  /** 心跳发送的内容，默认为 'ping' */
-  heartbeatMessage?: string | ArrayBuffer;
-  /** 是否手动控制连接，为 true 时需手动调用 connect()，默认为 false */
-  manual?: boolean;
-  /** 连接开启时的回调 */
-  onOpen?: (
-    instance: UniApp.SocketTask,
-    res: UniApp.OnSocketOpenCallbackResult,
-  ) => void;
-  /** 连接关闭时的回调 */
-  onClose?: (event: UniApp.OnSocketCloseOptions) => void;
-  /** 收到消息时的回调 */
-  onMessage?: (message: UniApp.OnSocketMessageCallbackResult) => void;
-  /** 连接发生错误时的回调 */
-  onError?: (event: UniApp.GeneralCallbackResult) => void;
-  /** WebSocket 子协议 */
-  protocols?: string[];
-}
-
-/**
- * useWebsocket 返回结果
- */
-export interface Result {
-  /** 最近收到的一条消息 */
-  latestMessage: Ref<UniApp.OnSocketMessageCallbackResult | undefined>;
-  /** 当前连接状态 */
-  readyState: Ref<ReadyState>;
-  /** 手动连接方法 */
-  connect: () => void;
-  /** 手动断开方法 */
-  disconnect: () => void;
-  /** 发送消息方法 */
-  sendMessage: (data: string | ArrayBuffer) => void;
-}
-
-/**
- * 封装 uni.connectSocket 的 hook，参考 ahooks useWebSocket
- *
- * @param url WebSocket 地址
- * @param options 配置项
- */
-const useWebsocket = (url: string, options: Options = {}): Result => {
-  const {
-    reconnectLimit = 3,
-    reconnectInterval = 3000,
-    heartbeat = false,
-    heartbeatInterval = 30000,
-    heartbeatMessage = 'ping',
-    manual = false,
-    onOpen,
-    onClose,
-    onMessage,
-    onError,
-    protocols,
-  } = options;
-
-  // 状态定义
-  const readyState = ref<ReadyState>(ReadyState.Closed);
-  const latestMessage = ref<UniApp.OnSocketMessageCallbackResult>();
-  const socketTask = ref<UniApp.SocketTask | null>(null);
-
-  // 内部辅助变量
-  let reconnectCount = 0;
-  let reconnectTimer: any = null;
-  let heartbeatTimer: any = null;
-  let isManualClose = false;
-
-  /**
-   * 清除心跳定时器
-   */
-  const clearHeartbeat = () => {
-    if (heartbeatTimer) {
-      clearInterval(heartbeatTimer);
-      heartbeatTimer = null;
-    }
-  };
-
-  /**
-   * 开始心跳
-   */
-  const startHeartbeat = () => {
-    if (!heartbeat) return;
-    clearHeartbeat();
-    heartbeatTimer = setInterval(() => {
-      if (readyState.value === ReadyState.Open && socketTask.value) {
-        // console.log('[useWebsocket] Heartbeat Ping');
-        socketTask.value.send({
-          data: heartbeatMessage,
-        });
-      }
-    }, heartbeatInterval);
-  };
-
-  /**
-   * 执行连接逻辑
-   */
-  const connect = () => {
-    // 如果有正在等待的重连，先清除
-    if (reconnectTimer) {
-      clearTimeout(reconnectTimer);
-      reconnectTimer = null;
-    }
-
-    // 清理旧的心跳
-    clearHeartbeat();
-
-    // 如果当前已有任务，先尝试关闭
-    if (socketTask.value) {
-      socketTask.value.close({});
-    }
-
-    readyState.value = ReadyState.Connecting;
-    isManualClose = false;
-
-    // 创建 Uni Socket 任务
-    const task = uni.connectSocket({
-      url,
-      protocols,
-      complete: () => {},
-    });
-
-    socketTask.value = task;
-
-    // 监听开启事件
-    task.onOpen((res) => {
-      readyState.value = ReadyState.Open;
-      reconnectCount = 0; // 重连计数归零
-      startHeartbeat(); // 开始心跳
-      onOpen?.(task, res);
-    });
-
-    // 监听消息事件
-    task.onMessage((res) => {
-      latestMessage.value = res;
-      onMessage?.(res);
-    });
-
-    // 监听错误事件
-    task.onError((res) => {
-      readyState.value = ReadyState.Closed;
-      clearHeartbeat();
-      onError?.(res);
-
-      // 只有非手动关闭才会尝试重连
-      if (!isManualClose) {
-        reconnect();
-      }
-    });
-
-    // 监听关闭事件
-    task.onClose((res) => {
-      readyState.value = ReadyState.Closed;
-      clearHeartbeat();
-      onClose?.(res);
-
-      // 如果非用户手动关闭，尝试重连
-      if (!isManualClose) {
-        reconnect();
-      }
-    });
-  };
-
-  /**
-   * 重连逻辑
-   */
-  const reconnect = () => {
-    if (reconnectCount < reconnectLimit && !isManualClose) {
-      reconnectTimer = setTimeout(() => {
-        reconnectCount++;
-        connect();
-      }, reconnectInterval);
-    }
-  };
-
-  /**
-   * 断开连接
-   */
-  const disconnect = () => {
-    isManualClose = true;
-    reconnectCount = reconnectLimit; // 标记停止重连循环
-    clearHeartbeat();
-    if (reconnectTimer) {
-      clearTimeout(reconnectTimer);
-      reconnectTimer = null;
-    }
-    if (socketTask.value) {
-      socketTask.value.close({});
-      socketTask.value = null;
-    }
-    readyState.value = ReadyState.Closed;
-  };
-
-  /**
-   * 发送消息
-   * @param data 字符串或二进制数据
-   */
-  const sendMessage = (data: string | ArrayBuffer) => {
-    if (readyState.value === ReadyState.Open && socketTask.value) {
-      socketTask.value.send({
-        data,
-      });
-    } else {
-      console.error(
-        '[useWebsocket] WebSocket is not open. Current state:',
-        readyState.value,
-      );
-    }
-  };
-
-  // 默认自动开始连接
-  if (!manual) {
-    connect();
-  }
-
-  // 组件卸载时自动清理
-  onUnmounted(() => {
-    disconnect();
-  });
-
-  return {
-    latestMessage,
-    readyState,
-    connect,
-    disconnect,
-    sendMessage,
-  };
-};
-
-export default useWebsocket;
+import { ref, onUnmounted, type Ref } from 'vue';
+
+/**
+ * WebSocket 连接状态枚举
+ */
+export enum ReadyState {
+  Connecting = 0, // 连接中
+  Open = 1, // 已连接
+  Closing = 2, // 关闭中
+  Closed = 3, // 已关闭
+}
+
+/**
+ * useWebsocket 配置参数
+ */
+export interface Options {
+  /** 重连尝试次数限制，默认为 3 */
+  reconnectLimit?: number;
+  /** 重连时间间隔 (ms)，默认为 3000 */
+  reconnectInterval?: number;
+  /** 是否开启心跳检查，默认为 false */
+  heartbeat?: boolean;
+  /** 心跳检查间隔 (ms)，默认为 30000 */
+  heartbeatInterval?: number;
+  /** 心跳发送的内容，默认为 'ping' */
+  heartbeatMessage?: string | ArrayBuffer;
+  /** 是否手动控制连接，为 true 时需手动调用 connect()，默认为 false */
+  manual?: boolean;
+  /** 连接开启时的回调 */
+  onOpen?: (
+    instance: UniApp.SocketTask,
+    res: UniApp.OnSocketOpenCallbackResult,
+  ) => void;
+  /** 连接关闭时的回调 */
+  onClose?: (event: UniApp.OnSocketCloseOptions) => void;
+  /** 收到消息时的回调 */
+  onMessage?: (message: UniApp.OnSocketMessageCallbackResult) => void;
+  /** 连接发生错误时的回调 */
+  onError?: (event: UniApp.GeneralCallbackResult) => void;
+  /** WebSocket 子协议 */
+  protocols?: string[];
+}
+
+/**
+ * useWebsocket 返回结果
+ */
+export interface Result {
+  /** 最近收到的一条消息 */
+  latestMessage: Ref<UniApp.OnSocketMessageCallbackResult | undefined>;
+  /** 当前连接状态 */
+  readyState: Ref<ReadyState>;
+  /** 手动连接方法 */
+  connect: () => void;
+  /** 手动断开方法 */
+  disconnect: () => void;
+  /** 发送消息方法 */
+  sendMessage: (data: string | ArrayBuffer) => void;
+}
+
+/**
+ * 封装 uni.connectSocket 的 hook，参考 ahooks useWebSocket
+ *
+ * @param url WebSocket 地址
+ * @param options 配置项
+ */
+const useWebsocket = (url: string, options: Options = {}): Result => {
+  const {
+    reconnectLimit = 3,
+    reconnectInterval = 3000,
+    heartbeat = false,
+    heartbeatInterval = 30000,
+    heartbeatMessage = 'ping',
+    manual = false,
+    onOpen,
+    onClose,
+    onMessage,
+    onError,
+    protocols,
+  } = options;
+
+  // 状态定义
+  const readyState = ref<ReadyState>(ReadyState.Closed);
+  const latestMessage = ref<UniApp.OnSocketMessageCallbackResult>();
+  const socketTask = ref<UniApp.SocketTask | null>(null);
+
+  // 内部辅助变量
+  let reconnectCount = 0;
+  let reconnectTimer: any = null;
+  let heartbeatTimer: any = null;
+  let isManualClose = false;
+
+  /**
+   * 清除心跳定时器
+   */
+  const clearHeartbeat = () => {
+    if (heartbeatTimer) {
+      clearInterval(heartbeatTimer);
+      heartbeatTimer = null;
+    }
+  };
+
+  /**
+   * 开始心跳
+   */
+  const startHeartbeat = () => {
+    if (!heartbeat) return;
+    clearHeartbeat();
+    heartbeatTimer = setInterval(() => {
+      if (readyState.value === ReadyState.Open && socketTask.value) {
+        // console.log('[useWebsocket] Heartbeat Ping');
+        socketTask.value.send({
+          data: heartbeatMessage,
+        });
+      }
+    }, heartbeatInterval);
+  };
+
+  /**
+   * 执行连接逻辑
+   */
+  const connect = () => {
+    // 如果有正在等待的重连，先清除
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+
+    // 清理旧的心跳
+    clearHeartbeat();
+
+    // 如果当前已有任务，先尝试关闭
+    if (socketTask.value) {
+      socketTask.value.close({});
+    }
+
+    readyState.value = ReadyState.Connecting;
+    isManualClose = false;
+
+    // 创建 Uni Socket 任务
+    const task = uni.connectSocket({
+      url,
+      protocols,
+      complete: () => {},
+    });
+
+    socketTask.value = task;
+
+    // 监听开启事件
+    task.onOpen((res) => {
+      readyState.value = ReadyState.Open;
+      reconnectCount = 0; // 重连计数归零
+      startHeartbeat(); // 开始心跳
+      onOpen?.(task, res);
+    });
+
+    // 监听消息事件
+    task.onMessage((res) => {
+      latestMessage.value = res;
+      onMessage?.(res);
+    });
+
+    // 监听错误事件
+    task.onError((res) => {
+      readyState.value = ReadyState.Closed;
+      clearHeartbeat();
+      onError?.(res);
+
+      // 只有非手动关闭才会尝试重连
+      if (!isManualClose) {
+        reconnect();
+      }
+    });
+
+    // 监听关闭事件
+    task.onClose((res) => {
+      readyState.value = ReadyState.Closed;
+      clearHeartbeat();
+      onClose?.(res);
+
+      // 如果非用户手动关闭，尝试重连
+      if (!isManualClose) {
+        reconnect();
+      }
+    });
+  };
+
+  /**
+   * 重连逻辑
+   */
+  const reconnect = () => {
+    if (reconnectCount < reconnectLimit && !isManualClose) {
+      reconnectTimer = setTimeout(() => {
+        reconnectCount++;
+        connect();
+      }, reconnectInterval);
+    }
+  };
+
+  /**
+   * 断开连接
+   */
+  const disconnect = () => {
+    isManualClose = true;
+    reconnectCount = reconnectLimit; // 标记停止重连循环
+    clearHeartbeat();
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+    if (socketTask.value) {
+      socketTask.value.close({});
+      socketTask.value = null;
+    }
+    readyState.value = ReadyState.Closed;
+  };
+
+  /**
+   * 发送消息
+   * @param data 字符串或二进制数据
+   */
+  const sendMessage = (data: string | ArrayBuffer) => {
+    if (readyState.value === ReadyState.Open && socketTask.value) {
+      socketTask.value.send({
+        data,
+      });
+    } else {
+      console.error(
+        '[useWebsocket] WebSocket is not open. Current state:',
+        readyState.value,
+      );
+    }
+  };
+
+  // 默认自动开始连接
+  if (!manual) {
+    connect();
+  }
+
+  // 组件卸载时自动清理
+  onUnmounted(() => {
+    disconnect();
+  });
+
+  return {
+    latestMessage,
+    readyState,
+    connect,
+    disconnect,
+    sendMessage,
+  };
+};
+
+export default useWebsocket;

package/dist/v3/styles/theme.ts

@@ -1,12 +1,12 @@
-export const THEME_MAIN_COLORS: Record<string, string> = {
-  light: '#9254de',
-  dark: '#9254de',
-  eye: '#6c71c4',
-  midnight: '#38bdf8',
-  gulf: '#2dd4bf',
-  lava: '#f97316',
-};
-
-export const getThemeMainColor = (theme: string = 'light') => {
-  return THEME_MAIN_COLORS[theme] || THEME_MAIN_COLORS.light;
-};
+export const THEME_MAIN_COLORS: Record<string, string> = {
+  light: '#9254de',
+  dark: '#9254de',
+  eye: '#6c71c4',
+  midnight: '#38bdf8',
+  gulf: '#2dd4bf',
+  lava: '#f97316',
+};
+
+export const getThemeMainColor = (theme: string = 'light') => {
+  return THEME_MAIN_COLORS[theme] || THEME_MAIN_COLORS.light;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-uni-dev-tool",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "vite-uni-dev-tool, debug, uni-app, 一处编写，到处调试",
   "keywords": [
     "vite",
@@ -33,6 +33,14 @@
       "types": "./dist/core.d.ts",
       "import": "./dist/core.js"
     },
+    "./hooks/*": {
+      "types": "./dist/v3/hooks/*/index.d.ts",
+      "import": "./dist/v3/hooks/*/index.ts"
+    },
+    "./dist/v3/hooks/*": {
+      "types": "./dist/v3/hooks/*/index.d.ts",
+      "import": "./dist/v3/hooks/*/index.ts"
+    },
     "./dist/*": "./dist/*",
     "./shims-uni.d.ts": "./dist/shims-uni.d.ts"
   },