@honor-claw/yoyo 1.1.2 → 1.1.4-beta.1

package/src/services/connection/status-tracker/types.ts

@@ -1,131 +1,131 @@
-/**
- * 状态跟踪类型定义
- * 定义连接状态的完整数据结构
- */
-
-/**
- * 连接状态类型
- */
-export type ConnectionStatus = 'idle' | 'connecting' | 'connected';
-
-/**
- * Gateway连接信息
- */
-export interface GatewayConnectionInfo {
-  sessionId: string;
-  hardwareDeviceId: string;
-  connectedAt: string;
-  deviceInfo: any;
-}
-
-/**
- * 物理设备信息
- */
-export interface PhysicalDeviceInfo {
-  hardwareDeviceId: string;
-  sessions: number;
-  lastActiveAt: string;
-  deviceInfo?: any;
-}
-
-/**
- * 云侧Socket状态信息
- */
-export interface CloudSocketStatus {
-  connected: boolean;
-  connectedAt: string | null;
-  lastDisconnectedAt: string | null;
-  retryCount: number;
-  lastError: string | null;
-  url: string;
-  readyState: number;
-}
-
-/**
- * Gateway连接统计
- */
-export interface GatewayStatus {
-  totalConnections: number;
-  activeConnections: number;
-  connections: GatewayConnectionInfo[];
-}
-
-/**
- * 物理设备统计
- */
-export interface DevicesStatus {
-  totalDevices: number;
-  uniqueHardwareDevices: number;
-  devices: PhysicalDeviceInfo[];
-}
-
-/**
- * 连接历史统计
- */
-export interface ConnectionHistory {
-  connectionCount: number;
-  disconnectionCount: number;
-  lastConnectionAt: string | null;
-  lastDisconnectionAt: string | null;
-}
-
-/**
- * 完整的连接状态数据
- */
-export interface ConnectionStatusData {
-  // 基础状态
-  status: ConnectionStatus;
-  updatedAt: string;
-
-  // 云侧Socket
-  cloudSocket: CloudSocketStatus;
-
-  // Gateway连接
-  gateway: GatewayStatus;
-
-  // 物理设备
-  devices: DevicesStatus;
-
-  // 连接历史
-  history: ConnectionHistory;
-}
-
-/**
- * 空的连接状态数据（初始化用）
- */
-export function createEmptyStatusData(): ConnectionStatusData {
-  const now = new Date().toISOString();
-  return {
-    status: 'idle',
-    updatedAt: now,
-
-    cloudSocket: {
-      connected: false,
-      connectedAt: null,
-      lastDisconnectedAt: null,
-      retryCount: 0,
-      lastError: null,
-      url: '',
-      readyState: 3, // WebSocket.CLOSED
-    },
-
-    gateway: {
-      totalConnections: 0,
-      activeConnections: 0,
-      connections: [],
-    },
-
-    devices: {
-      totalDevices: 0,
-      uniqueHardwareDevices: 0,
-      devices: [],
-    },
-
-    history: {
-      connectionCount: 0,
-      disconnectionCount: 0,
-      lastConnectionAt: null,
-      lastDisconnectionAt: null,
-    },
-  };
-}
+/**
+ * 状态跟踪类型定义
+ * 定义连接状态的完整数据结构
+ */
+
+/**
+ * 连接状态类型
+ */
+export type ConnectionStatus = 'idle' | 'connecting' | 'connected';
+
+/**
+ * Gateway连接信息
+ */
+export interface GatewayConnectionInfo {
+  sessionId: string;
+  hardwareDeviceId: string;
+  connectedAt: string;
+  deviceInfo: any;
+}
+
+/**
+ * 物理设备信息
+ */
+export interface PhysicalDeviceInfo {
+  hardwareDeviceId: string;
+  sessions: number;
+  lastActiveAt: string;
+  deviceInfo?: any;
+}
+
+/**
+ * 云侧Socket状态信息
+ */
+export interface CloudSocketStatus {
+  connected: boolean;
+  connectedAt: string | null;
+  lastDisconnectedAt: string | null;
+  retryCount: number;
+  lastError: string | null;
+  url: string;
+  readyState: number;
+}
+
+/**
+ * Gateway连接统计
+ */
+export interface GatewayStatus {
+  totalConnections: number;
+  activeConnections: number;
+  connections: GatewayConnectionInfo[];
+}
+
+/**
+ * 物理设备统计
+ */
+export interface DevicesStatus {
+  totalDevices: number;
+  uniqueHardwareDevices: number;
+  devices: PhysicalDeviceInfo[];
+}
+
+/**
+ * 连接历史统计
+ */
+export interface ConnectionHistory {
+  connectionCount: number;
+  disconnectionCount: number;
+  lastConnectionAt: string | null;
+  lastDisconnectionAt: string | null;
+}
+
+/**
+ * 完整的连接状态数据
+ */
+export interface ConnectionStatusData {
+  // 基础状态
+  status: ConnectionStatus;
+  updatedAt: string;
+
+  // 云侧Socket
+  cloudSocket: CloudSocketStatus;
+
+  // Gateway连接
+  gateway: GatewayStatus;
+
+  // 物理设备
+  devices: DevicesStatus;
+
+  // 连接历史
+  history: ConnectionHistory;
+}
+
+/**
+ * 空的连接状态数据（初始化用）
+ */
+export function createEmptyStatusData(): ConnectionStatusData {
+  const now = new Date().toISOString();
+  return {
+    status: 'idle',
+    updatedAt: now,
+
+    cloudSocket: {
+      connected: false,
+      connectedAt: null,
+      lastDisconnectedAt: null,
+      retryCount: 0,
+      lastError: null,
+      url: '',
+      readyState: 3, // WebSocket.CLOSED
+    },
+
+    gateway: {
+      totalConnections: 0,
+      activeConnections: 0,
+      connections: [],
+    },
+
+    devices: {
+      totalDevices: 0,
+      uniqueHardwareDevices: 0,
+      devices: [],
+    },
+
+    history: {
+      connectionCount: 0,
+      disconnectionCount: 0,
+      lastConnectionAt: null,
+      lastDisconnectionAt: null,
+    },
+  };
+}

package/src/services/connection/types.ts

@@ -1,20 +1,20 @@
-import { ClawChannel } from "../../cloud-channel/channel.js";
-import { DeviceInfo, HonorUserInfo } from "../../types.js";
-
-/**
- * 连接状态
- */
-export type ConnectionStatus = "idle" | "connecting" | "connected";
-
-/**
- * 全局连接管理状态
- */
-export interface ClawConnection {
-  channel: ClawChannel | null;
-  status: ConnectionStatus;
-}
-
-export interface ClawConnectionConfig {
-  deviceInfo: DeviceInfo;
-  userInfo: HonorUserInfo;
-}
+import { ClawChannel } from "../../cloud-channel/channel.js";
+import { DeviceInfo, HonorUserInfo } from "../../types.js";
+
+/**
+ * 连接状态
+ */
+export type ConnectionStatus = "idle" | "connecting" | "connected";
+
+/**
+ * 全局连接管理状态
+ */
+export interface ClawConnection {
+  channel: ClawChannel | null;
+  status: ConnectionStatus;
+}
+
+export interface ClawConnectionConfig {
+  deviceInfo: DeviceInfo;
+  userInfo: HonorUserInfo;
+}

package/src/types.ts

@@ -1,64 +1,64 @@
-import { z } from "zod";
-import { YoyoPluginConfigSchema } from "./schemas.js";
-import { OpenClawConfig } from "openclaw/plugin-sdk";
-
-/**
- * 设备类型枚举
- */
-export type DeviceType = "phone" | "pad" | "pc";
-
-/**
- * 设备信息
- */
-export interface DeviceInfo {
-  deviceId: string;
-  deviceName: string;
-  /**
-   * phone、pad、pc
-   */
-  deviceType: DeviceType;
-  deviceModel: string;
-  /**
-   * 品牌信息
-   */
-  brand: string;
-  port: number;
-}
-
-/**
- * 设备角色
- */
-export type DeviceRole = "yoyoclaw" | "node";
-
-/**
- * 用户信息
- */
-export interface HonorUserInfo {
-  userId?: string;
-  token?: string;
-  userName?: string;
-}
-
-/**
- * 插件配置类型（存储在 openclaw.json 的 plugins.entries.yoyoclaw.config）
- * 从schemas.ts中的YoyoPluginConfigSchema推断而来
- */
-export type YoyoPluginConfig = z.infer<typeof YoyoPluginConfigSchema>;
-
-/**
- * 设备信息
- */
-export interface ClawDeviceInfo extends DeviceInfo {
-  /**
-   * 当前设备的连接状态
-   */
-  status?: number;
-  /**
-   * 当前用户的角色信息
-   */
-  role: DeviceRole;
-  /**
-   * 扩展信息，当前claw的配置token信息
-   */
-  bizExtInfo?: Pick<OpenClawConfig["gateway"]["auth"], 'token' |'password'>;
-}
+import { z } from "zod";
+import { YoyoPluginConfigSchema } from "./schemas.js";
+import { OpenClawConfig } from "openclaw/plugin-sdk";
+
+/**
+ * 设备类型枚举
+ */
+export type DeviceType = "phone" | "pad" | "pc";
+
+/**
+ * 设备信息
+ */
+export interface DeviceInfo {
+  deviceId: string;
+  deviceName: string;
+  /**
+   * phone、pad、pc
+   */
+  deviceType: DeviceType;
+  deviceModel: string;
+  /**
+   * 品牌信息
+   */
+  brand: string;
+  port: number;
+}
+
+/**
+ * 设备角色
+ */
+export type DeviceRole = "yoyoclaw" | "node";
+
+/**
+ * 用户信息
+ */
+export interface HonorUserInfo {
+  userId?: string;
+  token?: string;
+  userName?: string;
+}
+
+/**
+ * 插件配置类型（存储在 openclaw.json 的 plugins.entries.yoyoclaw.config）
+ * 从schemas.ts中的YoyoPluginConfigSchema推断而来
+ */
+export type YoyoPluginConfig = z.infer<typeof YoyoPluginConfigSchema>;
+
+/**
+ * 设备信息
+ */
+export interface ClawDeviceInfo extends DeviceInfo {
+  /**
+   * 当前设备的连接状态
+   */
+  status?: number;
+  /**
+   * 当前用户的角色信息
+   */
+  role: DeviceRole;
+  /**
+   * 扩展信息，当前claw的配置token信息
+   */
+  bizExtInfo?: Pick<NonNullable<NonNullable<OpenClawConfig['gateway']>['auth']>, 'token' |'password'>;
+}

package/src/utils/id.ts

@@ -1,8 +1,8 @@
-import { customAlphabet } from 'nanoid';
-
-const Alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
-const uuidGenerator = customAlphabet(Alphabet, 32);
-
-export function uuid(size?: number) {
-  return uuidGenerator(size);
-}
+import { customAlphabet } from 'nanoid';
+
+const Alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
+const uuidGenerator = customAlphabet(Alphabet, 32);
+
+export function uuid(size?: number) {
+  return uuidGenerator(size);
+}

package/src/utils/jwt.ts

@@ -1,37 +1,37 @@
-/**
- * JWT Token 生成工具
- */
-
-import jwt from 'jsonwebtoken';
-
-const SECRET = 'EIAMTDO~_IFR@XKKA+OKSK%ZUHPIF%Z!';
-const EXPIRATION_MS = 604800; // 7天
-
-interface JwtClaims {
-  rt: string;
-}
-
-/**
- * 生成 JWT Token
- * @param userId 用户ID
- * @returns JWT Token 字符串
- */
-export function generateAuthorization(userId: string): string {
-  try {
-    
-    const claims: JwtClaims = {
-      rt: 'rtValue',
-    };
-
-    const payload = {
-      ...claims,
-      sub: userId,
-      iat: Math.floor(Date.now() / 1000),
-      exp: Math.floor((Date.now() + EXPIRATION_MS) / 1000),
-    };
-
-    return jwt.sign(payload, SECRET, { algorithm: 'HS256' });
-  } catch (error) {
-    throw new Error(`generateAuthorization error: ${error instanceof Error ? error.message : String(error)}`);
-  }
-}
+/**
+ * JWT Token 生成工具
+ */
+
+import jwt from 'jsonwebtoken';
+
+const SECRET = 'EIAMTDO~_IFR@XKKA+OKSK%ZUHPIF%Z!';
+const EXPIRATION_MS = 604800; // 7天
+
+interface JwtClaims {
+  rt: string;
+}
+
+/**
+ * 生成 JWT Token
+ * @param userId 用户ID
+ * @returns JWT Token 字符串
+ */
+export function generateAuthorization(userId: string): string {
+  try {
+    
+    const claims: JwtClaims = {
+      rt: 'rtValue',
+    };
+
+    const payload = {
+      ...claims,
+      sub: userId,
+      iat: Math.floor(Date.now() / 1000),
+      exp: Math.floor((Date.now() + EXPIRATION_MS) / 1000),
+    };
+
+    return jwt.sign(payload, SECRET, { algorithm: 'HS256' });
+  } catch (error) {
+    throw new Error(`generateAuthorization error: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}

package/src/utils/logger.ts

@@ -1,20 +1,20 @@
-import { type PluginLogger } from "openclaw/plugin-sdk";
-
-let logger: PluginLogger | null = null;
-
-export function setClawLogger(next: PluginLogger) {
-  logger = next;
-}
-
-export function useClawLogger(): PluginLogger {
-  if (!logger) {
-    // 返回console兜底实现
-    return {
-      debug: console.debug,
-      info: console.log,
-      warn: console.warn,
-      error: console.error,
-    };
-  }
-  return logger;
-}
+import { type PluginLogger } from "openclaw/plugin-sdk";
+
+let logger: PluginLogger | null = null;
+
+export function setClawLogger(next: PluginLogger) {
+  logger = next;
+}
+
+export function useClawLogger(): PluginLogger {
+  if (!logger) {
+    // 返回console兜底实现
+    return {
+      debug: console.debug,
+      info: console.log,
+      warn: console.warn,
+      error: console.error,
+    };
+  }
+  return logger;
+}

package/src/utils/proxy.ts

@@ -1,58 +1,58 @@
-/**
- * 代理工具类
- * 提供统一的代理配置获取逻辑
- */
-
-import { HttpProxyAgent } from 'http-proxy-agent';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-
-/**
- * 获取代理 URL
- * 优先级：配置的 proxy > HTTP_PROXY/http_proxy > HTTPS_PROXY/https_proxy
- * @param proxy 配置的代理地址
- * @returns 代理 URL
- */
-export function getProxyUrl(proxy?: string): string | undefined {
-  return (
-    proxy ||
-    process.env.HTTP_PROXY ||
-    process.env.http_proxy ||
-    process.env.HTTPS_PROXY ||
-    process.env.https_proxy
-  );
-}
-
-/**
- * 检查是否需要使用代理
- * @param proxyUrl 代理 URL
- * @param disableProxy 是否禁用代理
- * @returns 是否需要使用代理
- */
-export function shouldUseProxy(proxyUrl?: string, disableProxy?: boolean): boolean {
-  return !disableProxy && !!proxyUrl;
-}
-
-/**
- * 创建 WebSocket 代理 Agent
- * @param url WebSocket URL
- * @param proxy 代理地址
- * @returns 代理 Agent
- */
-export function createWebSocketProxyAgent(
-  url: string,
-  proxy?: string
-): HttpProxyAgent<string> | HttpsProxyAgent<string> | undefined {
-  const proxyUrl = getProxyUrl(proxy);
-
-  if (!proxyUrl) {
-    return undefined;
-  }
-
-  if (url.startsWith('wss://')) {
-    return new HttpsProxyAgent(proxyUrl);
-  } else if (url.startsWith('ws://')) {
-    return new HttpProxyAgent(proxyUrl);
-  }
-
-  return undefined;
-}
+/**
+ * 代理工具类
+ * 提供统一的代理配置获取逻辑
+ */
+
+import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+
+/**
+ * 获取代理 URL
+ * 优先级：配置的 proxy > HTTP_PROXY/http_proxy > HTTPS_PROXY/https_proxy
+ * @param proxy 配置的代理地址
+ * @returns 代理 URL
+ */
+export function getProxyUrl(proxy?: string): string | undefined {
+  return (
+    proxy ||
+    process.env.HTTP_PROXY ||
+    process.env.http_proxy ||
+    process.env.HTTPS_PROXY ||
+    process.env.https_proxy
+  );
+}
+
+/**
+ * 检查是否需要使用代理
+ * @param proxyUrl 代理 URL
+ * @param disableProxy 是否禁用代理
+ * @returns 是否需要使用代理
+ */
+export function shouldUseProxy(proxyUrl?: string, disableProxy?: boolean): boolean {
+  return !disableProxy && !!proxyUrl;
+}
+
+/**
+ * 创建 WebSocket 代理 Agent
+ * @param url WebSocket URL
+ * @param proxy 代理地址
+ * @returns 代理 Agent
+ */
+export function createWebSocketProxyAgent(
+  url: string,
+  proxy?: string
+): HttpProxyAgent<string> | HttpsProxyAgent<string> | undefined {
+  const proxyUrl = getProxyUrl(proxy);
+
+  if (!proxyUrl) {
+    return undefined;
+  }
+
+  if (url.startsWith('wss://')) {
+    return new HttpsProxyAgent(proxyUrl);
+  } else if (url.startsWith('ws://')) {
+    return new HttpProxyAgent(proxyUrl);
+  }
+
+  return undefined;
+}