@honor-claw/yoyo 1.2.1-beta.1 → 1.2.1-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.2.1-beta.1",
+  "version": "1.2.1-beta.3",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",

package/src/cloud-channel/client.ts

@@ -26,7 +26,7 @@ export class ClawCloudSocketClient {
   private retryTimer: NodeJS.Timeout | null = null;
   private isManualClose = false;
   private isRetryPaused = false; // 重试状态
-  // ping/pong 配置
+  // ping 定时器（原生 ping + 业务 pingMessage）
   private pingTimer: NodeJS.Timeout | null = null;
   // 当前连接上下文
   private currentTraceId = "";
@@ -59,7 +59,6 @@ export class ClawCloudSocketClient {
     this.ws = new WebSocket(url, wsOptions);
     this.ws.on("open", this.handleOpen.bind(this, url, isRetry));
     this.ws.on("message", this.onMessage);
-    this.ws.on("ping", this.handlePing);
     this.ws.on("pong", this.handlePong);
     this.ws.on("close", this.handleClose);
     this.ws.on("error", this.handleError);
@@ -90,10 +89,6 @@ export class ClawCloudSocketClient {
     this.options.onOpen?.();
   };
 
-  private handlePing = (): void => {
-    useClawLogger().debug?.("[claw-cloud-socket] received ping from server");
-  };
-
   private handlePong = (): void => {
     useClawLogger().debug?.("[claw-cloud-socket] received pong from server");
   };
@@ -299,7 +294,7 @@ export class ClawCloudSocketClient {
   }
 
   /**
-   * 启动 ping 定时器
+   * 启动 ping 定时器，同时发送原生 ping 和业务 pingMessage
    */
   private startPingTimer(): void {
     this.pingTimer = setInterval(() => {
@@ -308,9 +303,26 @@ export class ClawCloudSocketClient {
         return;
       }
 
-      // 发送 ping
+      // 原生 ping
       this.ws.ping();
       useClawLogger().debug?.("[claw-cloud-socket] sent ping to server");
+
+      // 业务 pingMessage
+      const { deviceInfo } = this.options;
+      const pingMessage: YOYOClawServiceEvent = {
+        msgType: "pingMessage",
+        sourceRole: "yoyoclaw",
+        sourceDeviceId: deviceInfo.deviceId,
+        targetRole: "node",
+        port: deviceInfo.port,
+      };
+
+      try {
+        this.ws.send(JSON.stringify(pingMessage));
+        useClawLogger().debug?.("[claw-cloud-socket] sent pingMessage to server");
+      } catch {
+        useClawLogger().error("[claw-cloud-socket] failed to send pingMessage");
+      }
     }, PING_INTERVAL);
   }
 

package/src/cloud-channel/types.ts

@@ -18,8 +18,8 @@ export interface YOYOClawServiceEvent {
   sourceDeviceId: string;
   sourceDeviceInfo?: ClawDeviceInfo;
   targetRole?: DeviceRole;
-  targetDeviceId: string;
-  traceInfo: object;
+  targetDeviceId?: string;
+  traceInfo?: object;
   port: number | string;
   data?: string; // openclaw原生消息
   msgType:
@@ -28,7 +28,8 @@ export interface YOYOClawServiceEvent {
     | "deviceUnPairMessage"
     | "fetchContexts"
     | "updateContexts"
-    | "deviceControl";
+    | "deviceControl"
+    | "pingMessage";
   /**
    * 会话轮次等追加信息，只有配对消息有
    */

package/src/honor-auth/auth-result-html.ts

@@ -0,0 +1,241 @@
+const SUCCESS_ICON_SVG = `<svg aria-hidden="true" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="32" cy="32" r="30" fill="currentColor" opacity="0.12"/><circle cx="32" cy="32" r="21" fill="currentColor"/><path d="M22.5 32.5L29 39L42.5 25.5" stroke="white" stroke-width="4.5" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
+const FAILURE_ICON_SVG = `<svg aria-hidden="true" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="32" cy="32" r="30" fill="currentColor" opacity="0.12"/><circle cx="32" cy="32" r="21" fill="currentColor"/><path d="M24.5 24.5L39.5 39.5M39.5 24.5L24.5 39.5" stroke="white" stroke-width="4.5" stroke-linecap="round"/></svg>`;
+
+export interface PageDetailItem {
+  key: string;
+  value: string;
+}
+
+export interface ResultPageOptions {
+  pageTitle: string;
+  statusClass: "success" | "error";
+  title: string;
+  hintText: string;
+  details?: PageDetailItem[];
+}
+
+function escapeHtml(input: string): string {
+  return input
+    .replaceAll("&", "&amp;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;")
+    .replaceAll('"', "&quot;")
+    .replaceAll("'", "&#39;");
+}
+
+function buildDetailsHtml(details?: PageDetailItem[]): string {
+  if (!details || details.length === 0) {
+    return "";
+  }
+
+  const detailRows = details
+    .map((item) => {
+      return `<div class="detail-item"><span class="detail-key">${escapeHtml(item.key)}</span><span class="detail-value">${escapeHtml(item.value)}</span></div>`;
+    })
+    .join("");
+
+  return `<div class="details">${detailRows}</div>`;
+}
+
+export function getResultHtml(options: ResultPageOptions): string {
+  const icon = options.statusClass === "success" ? SUCCESS_ICON_SVG : FAILURE_ICON_SVG;
+
+  return `<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>${escapeHtml(options.pageTitle)}</title>
+    <style>
+      :root {
+        color-scheme: light;
+        --surface: rgba(255, 255, 255, 0.94);
+        --text: #172033;
+        --muted: #667085;
+        --faint: #98a2b3;
+        --border: rgba(23, 32, 51, 0.1);
+        --shadow: 0 22px 70px rgba(31, 41, 55, 0.14);
+        --success: #168255;
+        --error: #d14343;
+        --accent: #2563eb;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: grid;
+        place-items: center;
+        padding: 24px;
+        font-family:
+          "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif;
+        color: var(--text);
+        background:
+          linear-gradient(135deg, rgba(37, 99, 235, 0.09), transparent 34%),
+          linear-gradient(315deg, rgba(22, 130, 85, 0.12), transparent 38%),
+          #f6f8fb;
+      }
+
+      .card {
+        width: min(100%, 480px);
+        padding: 24px;
+        border-radius: 18px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        box-shadow: var(--shadow);
+        backdrop-filter: blur(10px);
+        text-align: center;
+      }
+
+      .brand {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 9px;
+        margin-bottom: 24px;
+        color: var(--text);
+        font-size: 15px;
+        font-weight: 700;
+      }
+
+      .brand-logo {
+        width: 26px;
+        height: 26px;
+        display: block;
+        border-radius: 8px;
+      }
+
+      .icon-wrap {
+        width: 96px;
+        height: 96px;
+        margin: 0 auto 20px;
+        border-radius: 50%;
+        display: grid;
+        place-items: center;
+        background: transparent;
+      }
+
+      .icon-wrap.success {
+        color: var(--success);
+        filter: drop-shadow(0 16px 28px rgba(22, 130, 85, 0.18));
+      }
+
+      .icon-wrap.error {
+        color: var(--error);
+        filter: drop-shadow(0 16px 28px rgba(209, 67, 67, 0.18));
+      }
+
+      .icon-wrap svg {
+        display: block;
+        width: 78px;
+        height: 78px;
+      }
+
+      h1 {
+        margin: 0;
+        font-size: 26px;
+        line-height: 1.2;
+        font-weight: 700;
+      }
+
+      .details {
+        margin: 18px 0 0;
+        padding: 0;
+        border-radius: 16px;
+        background: rgba(255, 255, 255, 0.72);
+        border: 1px solid rgba(29, 36, 51, 0.07);
+        overflow: hidden;
+        text-align: left;
+      }
+
+      .detail-item {
+        display: grid;
+        grid-template-columns: 64px minmax(0, 1fr);
+        gap: 10px;
+        padding: 12px 14px;
+        font-size: 13px;
+        line-height: 1.5;
+      }
+
+      .detail-item + .detail-item {
+        border-top: 1px solid rgba(29, 36, 51, 0.07);
+      }
+
+      .detail-key {
+        color: #7a808d;
+      }
+
+      .detail-value {
+        color: var(--text);
+        word-break: break-word;
+      }
+
+      .footer {
+        margin-top: 22px;
+        padding-top: 16px;
+        border-top: 1px solid rgba(29, 36, 51, 0.08);
+      }
+
+      .hint {
+        margin: 0;
+        font-size: 14px;
+        color: var(--muted);
+        line-height: 1.6;
+      }
+
+      .caption {
+        margin: 8px 0 0;
+        color: var(--faint);
+        font-size: 12px;
+        line-height: 1.5;
+      }
+
+      @media (max-width: 480px) {
+        body {
+          padding: 16px;
+        }
+
+        .card {
+          padding: 22px 18px 18px;
+          border-radius: 16px;
+        }
+
+        .brand {
+          margin-bottom: 22px;
+        }
+
+        h1 {
+          font-size: 23px;
+        }
+
+        .icon-wrap {
+          width: 84px;
+          height: 84px;
+        }
+
+        .icon-wrap svg {
+          width: 70px;
+          height: 70px;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <main class="card">
+      <div class="brand">
+        <span>YOYOClaw</span>
+      </div>
+      <div class="icon-wrap ${options.statusClass}">${icon}</div>
+      <h1>${escapeHtml(options.title)}</h1>
+      ${buildDetailsHtml(options.details)}
+      <div class="footer">
+        <p class="hint">${escapeHtml(options.hintText)}</p>
+        <p class="caption">浏览器不会自动关闭当前页面，保留或稍后关闭都不影响登录结果。</p>
+      </div>
+    </main>
+  </body>
+</html>`;
+}

package/src/honor-auth/callback-server.ts

@@ -2,10 +2,9 @@
  * 本地HTTP回调服务器 - 接收OAuth2授权回调
  */
 
-import * as fs from "fs";
 import { createServer, type IncomingMessage, type ServerResponse } from "http";
-import * as path from "path";
-import { URL } from "url";
+import { URL } from "node:url";
+import { getResultHtml } from "./auth-result-html.js";
 
 /**
  * 回调服务器选项
@@ -21,21 +20,6 @@ export interface CallbackServerOptions {
   onError?: (error: Error) => void;
 }
 
-const SUCCESS_ICON_SVG = `<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M28 56C43.464 56 56 43.464 56 28C56 12.536 43.464 0 28 0C12.536 0 0 12.536 0 28C0 43.464 12.536 56 28 56Z" fill="#28a745"/><path d="M39.6667 20.3333L24.5 35.5L16.3333 27.3333" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
-const FAILURE_ICON_SVG = `<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M28 56C43.464 56 56 43.464 56 28C56 12.536 43.464 0 28 0C12.536 0 0 12.536 0 28C0 43.464 12.536 56 28 56Z" fill="#dc3545"/><path d="M35 21L21 35M21 21L35 35" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
-
-function getResultHtml(message: string, success: boolean): string {
-  try {
-    const template = fs.readFileSync(path.join(__dirname, "auth-result.html"), "utf-8");
-    const icon = success ? SUCCESS_ICON_SVG : FAILURE_ICON_SVG;
-    return template.replace("{{MESSAGE}}", message).replace("{{ICON_SVG}}", icon);
-  } catch (error) {
-    // Fallback to simple text
-    console.error("Failed to read auth-result.html:", error);
-    return `<h1>${message}</h1>`;
-  }
-}
-
 /**
  * 启动本地回调服务器
  */
@@ -47,74 +31,148 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
     let hasReceivedCode = false;
     let promiseResolved = false;
 
+    const closeServer = () => {
+      if (serverClosed) {
+        return;
+      }
+      serverClosed = true;
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+      server.close();
+    };
+
+    const failAuthorization = (error: Error) => {
+      closeServer();
+      onError?.(error);
+      if (!promiseResolved) {
+        promiseResolved = true;
+        reject(error);
+      }
+    };
+
+    const closeServerSoon = (delayMs = 120) => {
+      setTimeout(() => {
+        closeServer();
+      }, delayMs);
+    };
+
     const server = createServer((req: IncomingMessage, res: ServerResponse) => {
       try {
         const url = new URL(req.url || "", `http://localhost:${port}`);
+        if (req.method !== "GET") {
+          res.writeHead(405, { "Content-Type": "text/html; charset=utf-8" });
+          res.end(
+            getResultHtml({
+              pageTitle: "请求方式不支持",
+              statusClass: "error",
+              title: "不支持的请求方式",
+              hintText: "请返回 OpenClaw 重新发起登录。",
+            }),
+          );
+          return;
+        }
+
         const code = url.searchParams.get("code") || "";
+        const oauthError = url.searchParams.get("error") || "";
+        const oauthErrorDescription =
+          url.searchParams.get("error_description") || url.searchParams.get("error_message") || "";
 
         if (code && !hasReceivedCode) {
           hasReceivedCode = true;
 
           // 返回成功响应
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end(getResultHtml("授权成功", true));
+          res.end(
+            getResultHtml({
+              pageTitle: "授权成功",
+              statusClass: "success",
+              title: "登录已完成",
+              hintText: "请返回 OpenClaw，登录流程会继续完成。",
+            }),
+          );
 
           // 延迟关闭服务器，确保响应已发送
-          setTimeout(() => {
-            if (!serverClosed) {
-              serverClosed = true;
-              if (timeoutId) {
-                clearTimeout(timeoutId);
-              }
-              server.close();
-            }
-          }, 100);
+          closeServerSoon();
 
           // 调用回调
           onCodeReceived(code);
+        } else if (oauthError && !hasReceivedCode) {
+          res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
+          res.end(
+            getResultHtml({
+              pageTitle: "授权失败",
+              statusClass: "error",
+              title: "未能完成授权",
+              hintText: "请返回 OpenClaw 重新发起登录。",
+              details: [
+                { key: "错误码", value: oauthError },
+                ...(oauthErrorDescription ? [{ key: "说明", value: oauthErrorDescription }] : []),
+              ],
+            }),
+          );
+
+          setTimeout(() => {
+            failAuthorization(
+              new Error(
+                oauthErrorDescription
+                  ? `authorization failed: ${oauthError} (${oauthErrorDescription})`
+                  : `authorization failed: ${oauthError}`,
+              ),
+            );
+          }, 120);
         } else if (!hasReceivedCode) {
-          // 返回错误响应
+          // 未拿到授权码时，直接提示并结束，避免一直等待到超时。
           res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
-          res.end(getResultHtml("授权失败：未获取到授权码", false));
+          res.end(
+            getResultHtml({
+              pageTitle: "授权失败",
+              statusClass: "error",
+              title: "回调参数不完整",
+              hintText: "请返回 OpenClaw 重新发起登录。",
+            }),
+          );
+
+          setTimeout(() => {
+            failAuthorization(new Error("authorization failed: no code in callback"));
+          }, 120);
         } else {
           // 重复请求，返回成功响应但不处理
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end(getResultHtml("授权成功", true));
+          res.end(
+            getResultHtml({
+              pageTitle: "登录已完成",
+              statusClass: "success",
+              title: "授权已经处理完成",
+              hintText: "请返回 OpenClaw，登录流程会继续完成。",
+            }),
+          );
         }
       } catch (error) {
         console.error("authorize callback error:", error);
         res.writeHead(500, { "Content-Type": "text/html; charset=utf-8" });
-        res.end(getResultHtml("授权失败：服务器内部错误", false));
+        res.end(
+          getResultHtml({
+            pageTitle: "服务异常",
+            statusClass: "error",
+            title: "回调服务出现异常",
+            hintText: "请返回 OpenClaw 后重新发起登录。",
+          }),
+        );
+        setTimeout(() => {
+          failAuthorization(new Error("authorization failed: callback server internal error"));
+        }, 120);
       }
     });
 
     server.on("error", (error) => {
-      if (!serverClosed) {
-        serverClosed = true;
-        if (timeoutId) {
-          clearTimeout(timeoutId);
-        }
-        onError?.(error);
-        if (!promiseResolved) {
-          promiseResolved = true;
-          reject(error);
-        }
-      }
+      failAuthorization(error);
     });
 
     server.listen(port, () => {
       // 设置超时
       timeoutId = setTimeout(() => {
-        if (!serverClosed) {
-          serverClosed = true;
-          server.close();
-          const error = new Error("authorize timeout");
-          onError?.(error);
-          if (!promiseResolved) {
-            promiseResolved = true;
-            reject(error);
-          }
-        }
+        failAuthorization(new Error("authorize timeout"));
       }, timeout);
     });
 

package/src/modules/device/providers/windows.ts

@@ -87,31 +87,30 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
   private async _initializeCache(): Promise<void> {
     try {
       // 并行获取所有注册表值
-      const [systemManufacturer, biosVendor, biosVendor2, systemManufacturer2] =
-        await Promise.all([
-          // 原有路径
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System",
-            "SystemManufacturer",
-          ),
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System",
-            "SystemBiosVendor",
-          ),
-          // 新增路径（BIOS 子键）
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
-            "Vendor",
-          ),
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
-            "SystemManufacturer",
-          ),
-        ]);
+      const [systemManufacturer, biosVendor, biosVendor2, systemManufacturer2] = await Promise.all([
+        // 原有路径
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System",
+          "SystemManufacturer",
+        ),
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System",
+          "SystemBiosVendor",
+        ),
+        // 新增路径（BIOS 子键）
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
+          "Vendor",
+        ),
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
+          "SystemManufacturer",
+        ),
+      ]);
 
       // 缓存 deviceBrand（检查多个来源）
       const manufacturerSources = [
@@ -126,7 +125,10 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
         this.cache.deviceBrand = "HONOR";
       } else {
         // 最后兜底：检查 HKLM:\SOFTWARE\HONOR 注册表键是否存在
-        const honorKeyExists = await registryKeyExistsAsync(Registry.HKLM, "\\SOFTWARE\\HONOR");
+        const honorKeyExists = await registryKeyExistsAsync(
+          Registry.HKLM,
+          "\\SOFTWARE\\HONOR\\PCManager",
+        );
         if (honorKeyExists) {
           this.cache.deviceBrand = "HONOR";
         } else {

package/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />