@honor-claw/yoyo 0.0.1-beta.2 → 0.0.1-beta.21

package/src/cloud-channel/types.ts

@@ -8,6 +8,9 @@ import {
   type DeviceRole,
 } from "../types.js";
 
+// 导入状态事件类型（可选导入，避免循环依赖）
+export type { StatusEvent } from "../services/connection/status-tracker/events.js";
+
 export interface YoyoClawMessage {
   sourceRole?: DeviceRole;
   sourceDeviceId: string;
@@ -17,6 +20,12 @@ export interface YoyoClawMessage {
   port: number | string;
   data?: string;
   msgType: "userMessage" | "devicePairMessage";
+  /**
+   * 会话轮次等追加信息，只有配对消息有
+   */
+  sessionInfo?: {
+    nodeConnectTimestamp: number;
+  };
 }
 
 /**
@@ -43,6 +52,12 @@ export interface YoyoClawSocketWrapper<T> {
   extData?: {
     offlineSocketId?: string;
   };
+  /**
+   * 会话轮次等追加信息，只有配对消息有
+   */
+  sessionInfo?: {
+    nodeConnectTimestamp: number;
+  }
 }
 
 /**
@@ -57,6 +72,8 @@ export interface ClawChannelConfig {
   onClose?: () => void;
   // 当前设备未注册回调
   onDeviceNotRegistered?: () => void;
+  // 状态事件回调（用于状态跟踪）
+  onStatusEvent?: (event: any) => void;
 }
 
 export interface ClawSocketSourceInfo {
@@ -78,4 +95,17 @@ export interface ClawSocketClientOptions {
   onRemoteDeviceOffline?: (sourceDeviceId: string) => void;
   // 当前设备未注册回调
   onDeviceNotRegistered?: () => void;
+  // 额外的请求头
+  extraHeaders?: Record<string, string>;
+  // 状态事件回调（用于状态跟踪）
+  onStatusEvent?: (event: any) => void;
+}
+
+/**
+ * 设备会话信息
+ */
+export interface DeviceSessionInfo {
+  sessionId: string;
+  timestamp: number;
+  sourceInfo: ClawSocketSourceInfo;
 }

package/src/commands/env/impl.ts

@@ -0,0 +1,58 @@
+import { getConfigManager } from "../../modules/claw-configs/config-manager.js";
+import { useClawLogger } from "../../utils/logger.js";
+import type { Command } from "commander";
+
+export function registerEnvCommand(_: unknown, command: Command) {
+  const nextCommand = command
+    .command("env")
+    .description("Manage runtime environment (dev/test/production)")
+    .option("--set <env>", "Set environment: dev, test or production")
+    .option("--gray <tag>", "Set gray header")
+    .action(async (options) => {
+      const { set: setEnv, gray: grayTag } = options;
+      const logger = useClawLogger();
+
+      try {
+        const configManager = getConfigManager();
+
+        if (setEnv) {
+          // 设置环境
+          if (setEnv !== "test" && setEnv !== "dev" && setEnv !== "production") {
+            logger.error("❌ Invalid environment. Use 'test' or 'production'.");
+            return;
+          }
+
+          await configManager.updateEnv(setEnv);
+          logger.info(`✅ Environment set to: ${setEnv}`);
+        }
+
+        if (grayTag) {
+          // 设置灰度标签
+          await configManager.updateGrayTag(grayTag);
+          logger.info(`✅ Gray tag set to: ${grayTag}`);
+        } else if (grayTag === '') {
+          // 清除灰度标签
+          await configManager.updateGrayTag(undefined);
+          logger.info(`✅ Gray tag cleared`);
+        }
+
+        if (!setEnv && grayTag === undefined) {
+          // 获取当前环境信息
+          const currentEnv = configManager.getEnv();
+          const currentGrayTag = configManager.getGrayTag();
+          
+          logger.info(`📋 Current environment: ${currentEnv}`);
+          if (currentGrayTag) {
+            logger.info(`📋 Current gray tag: ${currentGrayTag}`);
+          } else {
+            logger.info(`📋 Gray tag: not set`);
+          }
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        logger.error(`❌ Failed to manage environment: ${errorMessage}`);
+      }
+    });
+
+  return nextCommand;
+}

package/src/commands/env/index.ts

@@ -0,0 +1 @@
+export * from './impl.js';

package/src/commands/index.ts

@@ -2,6 +2,8 @@ import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { registerLoginCommand } from "./login/index.js";
 import { registerStatusCommand } from "./status/index.js";
 import { registerLogoutCommand } from "./logout/index.js";
+import { registerEnvCommand } from "./env/index.js";
+import { isBetaVersion } from "../utils/version.js";
 
 export function registerCommands(api: OpenClawPluginApi) {
   api.registerCli(
@@ -10,9 +12,17 @@ export function registerCommands(api: OpenClawPluginApi) {
         .command("honor")
         .description("Commands for honor yoyoclaw");
 
+      // @ts-ignore
       registerLoginCommand(api, rootCommand);
+      // @ts-ignore
       registerStatusCommand(api, rootCommand);
-      // registerLogoutCommand(api, rootCommand);
+      // @ts-ignore
+      registerLogoutCommand(api, rootCommand);
+
+      // 只在 beta 版本时注册 env 命令
+      if (isBetaVersion()) {
+        registerEnvCommand(api, rootCommand);
+      }
     },
     { commands: ["honor"] }
   );

package/src/commands/login/impl.ts

@@ -1,20 +1,29 @@
 import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { performLogin } from "../../modules/login/impl.js";
 import { type Command } from "commander";
+import { isBetaVersion } from "../../utils/version.js";
 
 export function registerLoginCommand(api: OpenClawPluginApi, command: Command) {
-  const nextCommand = command
+  let nextCommand = command
     .command("login")
-    .description("Login to YOYOClaw and register devices")
-    .option("--skip-auth", "debug mode, no auth required")
+    .description("login to yoyoclaw and register devices");
+
+  if (isBetaVersion()) {
+    nextCommand = nextCommand.option(
+      "--skip-auth",
+      "debug mode, no auth required"
+    );
+  }
+
+  nextCommand = nextCommand
+    .option("-u, --userId <userId>", "user ID for direct login")
+    .option("--token <token>", "token for direct login")
     .action(async (options) => {
-      const { skipAuth } = options;
+      const { skipAuth, userId, token } = options;
 
-      api.logger.info(
-        `honor login CLI command called with skip auth: ${!!skipAuth}`
-      );
+      api.logger.debug?.('honor login CLI command called');
 
-      await performLogin({ noAuth: skipAuth });
+      await performLogin({ noAuth: skipAuth, userId, token });
     });
 
   return nextCommand;

package/src/commands/logout/impl.ts

@@ -0,0 +1,23 @@
+import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { type Command } from "commander";
+import { performLogout } from "../../honor-auth/cloud.js";
+
+export function registerLogoutCommand(api: OpenClawPluginApi, command: Command) {
+  const nextCommand = command
+    .command("logout")
+    .description("Logout and clear user configuration")
+    .action(async () => {
+      api.logger.info("logout CLI command called");
+
+      try {
+        await performLogout();
+        console.log("✅ Logout successful, gateway will automatically restart to handle new configuration");
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error("❌ Logout failed:", errorMessage);
+        throw error;
+      }
+    });
+
+  return nextCommand;
+}

package/src/commands/logout/index.ts

@@ -1,53 +1 @@
-import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { getConnectionManager } from "../../services/connection-manager.js";
-import { type Command } from "commander";
-
-export function registerLogoutCommand(api: OpenClawPluginApi, command: Command) {
-  const nextCommand = command
-    .command("logout")
-    .description("Logout and disconnect from YOYOClaw")
-    .option("--force", "Force logout without confirmation")
-    .action(async (options) => {
-      api.logger.info("honor logout CLI command called");
-
-      const { force } = options;
-      const connectionManager = getConnectionManager();
-      const isConnected = connectionManager.isConnected();
-      const connectedDevices = connectionManager.getConnectedDevices();
-
-      if (!isConnected) {
-        console.log("⚠️  当前未连接到 YOYOClaw");
-        return;
-      }
-
-      // 如果有活跃的设备连接且不是强制模式，提示确认
-      if (connectedDevices.length > 0 && !force) {
-        console.log(`⚠️  当前有 ${connectedDevices.length} 个活跃的设备连接:`);
-        for (const device of connectedDevices) {
-          console.log(`  - ${device}`);
-        }
-        console.log("\n⚠️  断开连接将停止所有设备间的通信");
-        console.log('💡 使用 --force 选项可以跳过此确认');
-        
-        // 注意：在命令行工具中，我们无法直接等待用户输入
-        // 这里我们给出提示，然后继续执行
-        console.log("\n🔌 正在断开连接...");
-      } else {
-        console.log("🔌 正在断开连接...");
-      }
-
-      try {
-        await connectionManager.cleanup();
-        console.log("✅ WebSocket 连接已关闭");
-        console.log("✅ 所有设备连接已清理");
-        console.log("✅ 资源已释放");
-        console.log("👋 已登出");
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error("❌ 登出失败:", errorMessage);
-        throw error;
-      }
-    });
-
-  return nextCommand;
-}
+export * from "./impl.js";

package/src/commands/status/index.ts

@@ -1,64 +1,194 @@
-import { type OpenClawPluginApi } from 'openclaw/plugin-sdk';
-import { type Command } from 'commander';
-import { getConnectionStatus } from '../../services/connection/impl.js';
+import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { type Command } from "commander";
+import { StatusStorage } from "../../services/connection/status-tracker/index.js";
+import type { ConnectionStatusData } from "../../services/connection/status-tracker/index.js";
+import { loadToken } from "../../honor-auth/token-manager.js";
 
-export function registerStatusCommand(api: OpenClawPluginApi, command: Command) {
+export function registerStatusCommand(
+  api: OpenClawPluginApi,
+  command: Command
+) {
   const nextCommand = command
-    .command('status')
-    .description('Show YOYOClaw connection status')
+    .command("status")
+    .description("Show YOYOClaw connection status")
     .action(async () => {
-      api.logger.info('YOYOClaw status CLI command called');
-
-      // 获取连接状态
-      const status = getConnectionStatus();
-
-      // 连接状态
-      const stateEmoji = getStateEmoji(status);
-      const stateText = getStateText(status);
-
-      api.logger.info(`连接状态: ${stateEmoji} ${stateText}`);
-
-      if (status === 'connected') {
-        // 已连接状态
-        api.logger.info('\n✅ YOYOClaw 连接正常');
-      } else if (status === 'connecting') {
-        // 连接中状态
-        api.logger.info('\n⏳ 正在建立连接...');
-      } else {
-        // 未连接状态
-        api.logger.info("\n💡 请先执行 'yoyoclaw login' 建立连接");
+      api.logger.debug?.("YOYOClaw status CLI command called");
+
+      // Check if user is logged in
+      const userInfo = await loadToken();
+      if (!userInfo) {
+        console.log("❌ You need to login first. Please run: openclaw honor login");
+        return;
       }
+
+      // Try to load detailed status from status file
+      const statusStorage = new StatusStorage();
+      const statusData = await statusStorage.load();
+
+      displayDetailedStatus(statusData);
     });
 
   return nextCommand;
 }
 
 /**
- * 获取状态对应的 emoji
+ * Display detailed status information
  */
-function getStateEmoji(status: 'idle' | 'connecting' | 'connected'): string {
+function displayDetailedStatus(statusData: ConnectionStatusData | null): void {
+  if (!statusData) {
+    console.log("\n❌ No status data available");
+    return;
+  }
+
+  // Cloud Socket status
+  console.log("\n📡 Cloud Socket:");
+  const cloudStatus = statusData.cloudSocket;
+  const cloudEmoji = cloudStatus.connected ? "✅" : "❌";
+  console.log(
+    `   Status: ${cloudEmoji} ${cloudStatus.connected ? "Connected" : "Disconnected"}`
+  );
+
+  if (cloudStatus.connectedAt) {
+    console.log(`   Connected at: ${formatDateTime(cloudStatus.connectedAt)}`);
+  }
+
+  if (cloudStatus.lastDisconnectedAt) {
+    console.log(
+      `   Last disconnected: ${formatDateTime(cloudStatus.lastDisconnectedAt)}`
+    );
+  }
+
+  console.log(`   Retry count: ${cloudStatus.retryCount}`);
+  console.log(`   Last error: ${cloudStatus.lastError || "None"}`);
+
+  // Gateway connection statistics
+  console.log("\n🌐 Gateway Connections:");
+  console.log(`   Total connections: ${statusData.gateway.totalConnections}`);
+  console.log(`   Active connections: ${statusData.gateway.activeConnections}`);
+
+  if (statusData.gateway.connections.length > 0) {
+    console.log("   ┌────────────────────────────┬────────────────────────────┬────────────┐");
+    console.log("   │ Session ID                 │ Hardware Device ID         │ Connected  │");
+    console.log("   ├────────────────────────────┼────────────────────────────┼────────────┤");
+
+    for (const conn of statusData.gateway.connections) {
+      const sessionId = truncateString(conn.sessionId, 26);
+      const deviceId = truncateString(conn.hardwareDeviceId, 26);
+      const connTime = formatTime(conn.connectedAt);
+      console.log(
+        `   │ ${sessionId.padEnd(28)}│ ${deviceId.padEnd(28)}│ ${connTime.padEnd(12)}│`
+      );
+    }
+
+    console.log("   └────────────────────────────┴────────────────────────────┴────────────┘");
+  }
+
+  // Physical device statistics
+  console.log("\n📱 Physical Devices:");
+  console.log(`   Unique devices: ${statusData.devices.uniqueHardwareDevices}`);
+
+  if (statusData.devices.devices.length > 0) {
+    console.log("   ┌────────────────────────────┬─────────┬────────────┐");
+    console.log("   │ Hardware Device ID         │ Sessions │ Last Active│");
+    console.log("   ├────────────────────────────┼─────────┼────────────┤");
+
+    for (const device of statusData.devices.devices) {
+      const deviceId = truncateString(device.hardwareDeviceId, 26);
+      const sessions = String(device.sessions).padEnd(9);
+      const lastActive = formatTime(device.lastActiveAt);
+      console.log(
+        `   │ ${deviceId.padEnd(28)}│ ${sessions}│ ${lastActive.padEnd(12)}│`
+      );
+    }
+
+    console.log("   └────────────────────────────┴─────────┴────────────┘");
+  }
+
+  // Connection history
+  console.log("\n📈 Connection History:");
+  console.log(`   Total connections: ${statusData.history.connectionCount}`);
+  console.log(`   Total disconnections: ${statusData.history.disconnectionCount}`);
+
+  if (statusData.history.lastConnectionAt) {
+    console.log(
+      `   Last connection: ${formatDateTime(statusData.history.lastConnectionAt)}`
+    );
+  }
+
+  if (statusData.history.lastDisconnectionAt) {
+    console.log(
+      `   Last disconnection: ${formatDateTime(statusData.history.lastDisconnectionAt)}`
+    );
+  }
+
+  // Update time
+  console.log("\n🕐 Status Updated At:");
+  console.log(`   ${formatDateTime(statusData.updatedAt)}`);
+}
+
+/**
+ * Get emoji for connection status
+ */
+function getStateEmoji(status: "idle" | "connecting" | "connected"): string {
   switch (status) {
-    case 'connected':
-      return '✅';
-    case 'connecting':
-      return '⏳';
-    case 'idle':
+    case "connected":
+      return "✅";
+    case "connecting":
+      return "⏳";
+    case "idle":
     default:
-      return '⚪';
+      return "⚪";
   }
 }
 
 /**
- * 获取状态对应的文本
+ * Get text for connection status
  */
-function getStateText(status: 'idle' | 'connecting' | 'connected'): string {
+function getStateText(status: "idle" | "connecting" | "connected"): string {
   switch (status) {
-    case 'connected':
-      return '已连接';
-    case 'connecting':
-      return '连接中';
-    case 'idle':
+    case "connected":
+      return "Connected";
+    case "connecting":
+      return "Connecting";
+    case "idle":
     default:
-      return '未连接';
+      return "Disconnected";
+  }
+}
+
+/**
+ * Format date time (YYYY-MM-DD HH:mm:ss)
+ */
+function formatDateTime(isoString: string): string {
+  const date = new Date(isoString);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+/**
+ * Format time (HH:mm:ss)
+ */
+function formatTime(isoString: string): string {
+  const date = new Date(isoString);
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+
+  return `${hours}:${minutes}:${seconds}`;
+}
+
+/**
+ * Truncate string with ellipsis
+ */
+function truncateString(str: string, maxLength: number): string {
+  if (str.length <= maxLength) {
+    return str;
   }
+  return str.substring(0, maxLength - 3) + "...";
 }

package/src/gateway-client/client.deprecated.ts

@@ -16,7 +16,7 @@ import {
 } from "./device/identity.js";
 import { buildDeviceAuthPayloadV3 } from "./device/auth.js";
 import type { DeviceIdentity } from "./device/types.js";
-import { rawDataToString } from "openclaw/plugin-sdk";
+import { rawDataToString } from "../utils/ws.js";
 
 /**
  * 插件 Gateway Client 配置选项（简化版）

package/src/gateway-client/client.ts

@@ -1,9 +1,7 @@
-import { rawDataToString } from "openclaw/plugin-sdk";
-import { WebSocket } from "ws";
-import { GatewayClientOptions } from "./types.js";
-import { useClawLogger } from "../utils/logger.js";
-
-const GATEWAY_SERVER_URL = "ws://127.0.0.1:18789";
+import { WebSocket } from 'ws';
+import { GatewayClientOptions } from './types.js';
+import { getConfigManager } from '../modules/claw-configs/config-manager.js';
+import { rawDataToString } from '../utils/ws.js';
 
 /**
  * 纯透传 Gateway Client
@@ -26,29 +24,28 @@ export class GatewayClient {
     if (this.closed) {
       return;
     }
-    const url = GATEWAY_SERVER_URL;
+
+    const configManager = getConfigManager();
+    const url = `ws://127.0.0.1:${configManager.getGatewayPort()}`;
     this.ws = new WebSocket(url, { maxPayload: 25 * 1024 * 1024 });
 
-    this.ws.on("open", () => {
+    this.ws.on('open', () => {
       this.opts.onOpen?.();
     });
 
-    this.ws.on("message", (data) => {
+    this.ws.on('message', data => {
       const dataText = rawDataToString(data);
-      useClawLogger().debug?.(`[yoyoclaw-gateway] received message:, ${dataText.slice(0, 500)}`);
       this.opts.onMessage?.(dataText);
     });
 
-    this.ws.on("close", (code, reason) => {
+    this.ws.on('close', (code, reason) => {
       const reasonText = rawDataToString(reason);
       this.ws = null;
-      useClawLogger().info(`[yoyoclaw-gateway] closed (${code}): ${reasonText}`);
-      this.opts.onClose?.();
+      this.opts.onClose?.(`code: ${code}, reason: ${reasonText ?? ''}`);
     });
 
-    this.ws.on("error", (err) => {
-      useClawLogger().error(`[yoyoclaw-gateway] error: ${String(err)}`);
-      this.opts.onClose?.();
+    this.ws.on('error', err => {
+      this.opts.onClose?.(`socket error: ${(err as Error).message}`);
     });
   }
 
@@ -66,11 +63,9 @@ export class GatewayClient {
    */
   send(data: Buffer | string): void {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      useClawLogger().error(
-        "[yoyoclaw-gateway] send failed: gateway not connected"
-      );
-      return;
+      throw new Error('gateway not connected');
     }
+
     this.ws.send(data);
   }
 }

package/src/gateway-client/types.ts

@@ -4,5 +4,5 @@
 export interface GatewayClientOptions {
   onMessage?: (data: string) => void; // 原始消息透传
   onOpen?: () => void;
-  onClose?: () => void;
-}
+  onClose?: (reason: string) => void;
+}