@honor-claw/yoyo 1.2.0-beta.2 → 1.2.0-beta.5

package/package.json

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

package/src/apis/claw-cloud.ts

@@ -125,6 +125,7 @@ export class ClawCloudClient {
       data = {
         clientId: params.authConfig.clientId,
         code: params.code,
+        redirectUri: "http://127.0.0.1:8081/deepLink",
       };
     }
 

package/src/apis/types.ts

@@ -90,6 +90,7 @@ export type TokenResponseV2 = {
 export interface ExchangeTokenRequest {
   clientId?: string;
   code?: string;
+  redirectUri?: string;
 }
 
 /**

package/src/cloud-channel/message-handler.ts

@@ -337,11 +337,11 @@ export class MessageHandler {
   /**
    * 处理来自Gateway的消息，转发到云侧
    */
-  private handleNodeGatewayMessage = (
+  private handleNodeGatewayMessage = async (
     sourceDeviceId: string,
     traceInfo: YOYOClawServiceEvent["traceInfo"],
     data: string,
-  ): void => {
+  ) => {
     const hardwareDeviceId = this.sessionManager.getHardwareDeviceId(sourceDeviceId);
     const sessionInfo = this.sessionManager.getSession(sourceDeviceId);
     const deviceId = sessionInfo?.sourceInfo.sourceDeviceInfo?.deviceId;
@@ -356,16 +356,36 @@ export class MessageHandler {
     try {
       // 使用当前接收到的socket对应deviceId的来源信息
       const targetDeviceId = sessionInfo.sourceInfo.sourceDeviceId;
+      const gatewayRawData = JSON.parse(data);
+      let cloudData = data;
+
+      // 收到NOT_PAIRED错误时，自动获取待配对设备并审批
+      if (!gatewayRawData.ok && gatewayRawData.error?.code === "NOT_PAIRED") {
+        try {
+          await this.handleAutoPair();
+          cloudData = JSON.stringify({
+            ok: true,
+            type: "res",
+            id: gatewayRawData.id,
+            payload: {
+              type: "hello-ok",
+            },
+          });
+          useClawLogger().info(`${LOG_PREFIX} auto pair succeefully`);
+        } catch (error) {
+          useClawLogger().error(`${LOG_PREFIX} auto pair failed: ${String(error)}`);
+        }
+      }
 
       useClawLogger().debug?.(
-        `${LOG_PREFIX} trans gateway msg to cloud device: ${targetDeviceId}, ${data.slice(0, 1000)}`,
+        `${LOG_PREFIX} trans gateway msg to cloud device: ${targetDeviceId}, ${cloudData.slice(0, 1000)}`,
       );
 
       const result = this.sendMessage(
         "userMessage",
         targetDeviceId,
         traceInfo,
-        data,
+        cloudData,
         undefined,
         deviceId,
       );
@@ -381,6 +401,29 @@ export class MessageHandler {
     }
   };
 
+  private async handleAutoPair(): Promise<void> {
+    const adminClient = this.adminClientManager.getClient();
+    if (!adminClient) {
+      useClawLogger().warn(`${LOG_PREFIX} admin client not available for auto pair`);
+      return;
+    }
+
+    useClawLogger().info(`${LOG_PREFIX} NOT_PAIRED detected, fetching pending pair list...`);
+    const pairList = await adminClient.devicePairList();
+    const pendingDevices = pairList.pending ?? [];
+
+    for (const device of pendingDevices) {
+      useClawLogger().info(
+        `${LOG_PREFIX} auto approving device: ${device.deviceId}, requestId: ${device.requestId}`,
+      );
+      await adminClient.devicePairApprove(device.requestId);
+    }
+
+    if (pendingDevices.length === 0) {
+      useClawLogger().info(`${LOG_PREFIX} no pending devices found for auto pair`);
+    }
+  }
+
   private async handleContextRequest(message: YOYOClawServiceEvent): Promise<void> {
     const { sourceDeviceId, traceInfo } = message;
     const msgType = message.msgType as ContextMsgType;

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

@@ -7,6 +7,8 @@ import type {
   PrimayModelResult,
   SessionListResult,
   SessionItem,
+  DevicePairListResult,
+  DevicePairApproveResult,
 } from "./types/protocol.js";
 import { SkillStatusReport } from "./types/skills.js";
 
@@ -56,6 +58,16 @@ export class AdminGatewayClient extends ProtocolGatewayClient {
     return (result.sessions?.find((session) => session?.key === "agent:main:main") ??
       {}) as SessionItem;
   }
+
+  async devicePairList(): Promise<DevicePairListResult> {
+    return this.sendRequest("device.pair.list", {}) as Promise<DevicePairListResult>;
+  }
+
+  async devicePairApprove(requestId: string): Promise<DevicePairApproveResult> {
+    return this.sendRequest("device.pair.approve", {
+      requestId,
+    }) as Promise<DevicePairApproveResult>;
+  }
 }
 
 export default AdminGatewayClient;

package/src/gateway-client/client.ts

@@ -41,10 +41,10 @@ export class GatewayClient {
       this.onOpen();
     });
 
-    this.ws.on("message", (data) => {
+    this.ws.on("message", async (data) => {
       const dataText = rawDataToString(data);
-      this.opts.onMessage?.(dataText);
-      this.onMessage(dataText);
+      await this.opts.onMessage?.(dataText);
+      await this.onMessage(dataText);
     });
 
     this.ws.on("close", (code, reason) => {
@@ -82,7 +82,7 @@ export class GatewayClient {
 
   protected onOpen(): void {}
 
-  protected onMessage(_data: string): void {}
+  protected onMessage(_data: string): void | Promise<void> {}
 
   protected onClose(_code: number, _reason: string): void {}
 

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

@@ -35,7 +35,7 @@ export type GatewayClientId = (typeof GATEWAY_CLIENT_IDS)[keyof typeof GATEWAY_C
 export type GatewayClientMode = (typeof GATEWAY_CLIENT_MODES)[keyof typeof GATEWAY_CLIENT_MODES];
 
 export interface GatewayClientOptions {
-  onMessage?: (data: string) => void;
+  onMessage?: (data: string) => void | Promise<void>;
   onOpen?: () => void;
   onClose?: (reason: string) => void;
   onError?: (error: Error) => void;

package/src/gateway-client/types/protocol.ts

@@ -143,3 +143,55 @@ export interface SessionItem {
   deliveryContext: Object[];
   lastChannel: string;
 }
+
+export interface PendingDevice {
+  requestId: string;
+  deviceId: string;
+  displayName?: string;
+  role?: string;
+  remoteIp?: string;
+  isRepair?: boolean;
+  ts?: number;
+}
+
+export interface DeviceTokenSummary {
+  id: string;
+  rotatedAtMs?: number;
+  revokedAtMs?: number;
+  lastUsedAtMs?: number;
+}
+
+export interface PairedDevice {
+  deviceId: string;
+  displayName?: string;
+  roles?: string[];
+  scopes?: string[];
+  remoteIp?: string;
+  tokens?: DeviceTokenSummary[];
+  createdAtMs?: number;
+  approvedAtMs?: number;
+}
+
+export interface DevicePairListResult {
+  ok: boolean;
+  pending?: PendingDevice[];
+  paired?: PairedDevice[];
+  error?: {
+    code: string;
+    message: string;
+    details?: unknown;
+    retryable?: boolean;
+  };
+}
+
+export interface DevicePairApproveResult {
+  ok: boolean;
+  requestId?: string;
+  device?: PairedDevice;
+  error?: {
+    code: string;
+    message: string;
+    details?: unknown;
+    retryable?: boolean;
+  };
+}