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

package/src/apis/http-client.ts

@@ -1,239 +1,239 @@
-/**
- * HTTP 请求客户端封装
- * 基于 undici 实现
- */
-
-import { request, type Dispatcher, ProxyAgent } from "undici";
-import { getProxyUrl, shouldUseProxy } from "../utils/proxy.js";
-
-/**
- * HTTP 客户端配置
- */
-export interface HttpClientOptions {
-  defaultHeaders?: Record<string, string>;
-  defaultTimeout?: number;
-  /**
-   * 代理地址，例如：http://127.0.0.1:7890
-   * 如果不设置，则使用环境变量 HTTP_PROXY 或 HTTPS_PROXY
-   */
-  proxy?: string;
-}
-
-/**
- * HTTP 请求配置
- */
-export interface HttpRequestConfig {
-  url: string;
-  method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
-  headers?: Record<string, string>;
-  body?: string | object | null;
-  timeout?: number;
-  query?: Record<string, string | number | boolean | undefined>;
-  /**
-   * 是否禁用代理（默认 false）
-   */
-  disableProxy?: boolean;
-}
-
-/**
- * HTTP 响应
- */
-export interface HttpResponse<T = unknown> {
-  data: T;
-  status: number;
-  headers: Record<string, string | string[] | undefined>;
-}
-
-/**
- * HTTP 错误
- */
-export class HttpError extends Error {
-  constructor(public status: number, public data: unknown, message: string) {
-    super(message);
-    this.name = "HttpError";
-  }
-}
-
-/**
- * HTTP 客户端类
- */
-export class HttpClient {
-  private baseUrl: string;
-  private defaultHeaders: Record<string, string>;
-  private defaultTimeout: number;
-  private proxyAgent?: ProxyAgent;
-
-  constructor(baseUrl: string, options?: HttpClientOptions) {
-    this.baseUrl = baseUrl.replace(/\/$/, "");
-    this.defaultHeaders = options?.defaultHeaders || {};
-    this.defaultTimeout = options?.defaultTimeout || 30000;
-
-    // 初始化代理 agent，使用统一的代理配置获取逻辑
-    const proxyUrl = getProxyUrl(options?.proxy);
-
-    if (proxyUrl) {
-      this.proxyAgent = new ProxyAgent(proxyUrl);
-    }
-  }
-
-  /**
-   * 执行 HTTP 请求
-   */
-  async request<T = unknown>(
-    config: HttpRequestConfig
-  ): Promise<HttpResponse<T>> {
-    const {
-      method = "GET",
-      headers = {},
-      body,
-      timeout = this.defaultTimeout,
-      query,
-    } = config;
-
-    // 构建 URL
-    let url = config.url;
-    if (!url.startsWith("http://") && !url.startsWith("https://")) {
-      url = `${this.baseUrl}${url.startsWith("/") ? "" : "/"}${url}`;
-    }
-
-    // 添加查询参数
-    if (query && Object.keys(query).length > 0) {
-      const params = new URLSearchParams();
-      Object.entries(query).forEach(([key, value]) => {
-        if (value !== undefined) {
-          params.append(key, String(value));
-        }
-      });
-      const queryString = params.toString();
-      if (queryString) {
-        url += (url.includes("?") ? "&" : "?") + queryString;
-      }
-    }
-
-    // 合并请求头
-    const mergedHeaders: Record<string, string> = {
-      ...this.defaultHeaders,
-      ...headers,
-    };
-
-    // 设置 Content-Type
-    if (body && !mergedHeaders["Content-Type"]) {
-      mergedHeaders["Content-Type"] = "application/json";
-    }
-
-    // 准备请求体
-    let requestBody: string | undefined;
-    if (body !== null && body !== undefined) {
-      if (typeof body === "string") {
-        requestBody = body;
-      } else {
-        requestBody = JSON.stringify(body);
-      }
-    }
-
-    try {
-      const dispatcher: Dispatcher = shouldUseProxy(
-        getProxyUrl(),
-        config.disableProxy
-      ) && this.proxyAgent
-        ? this.proxyAgent
-        : undefined;
-
-      const response = await request(url, {
-        method,
-        headers: mergedHeaders as HeadersInit,
-        body: requestBody,
-        headersTimeout: timeout,
-        bodyTimeout: timeout,
-        dispatcher,
-      });
-
-      // 读取响应体
-      const responseBody = await response.body.text();
-      let data: T;
-
-      try {
-        data = responseBody ? JSON.parse(responseBody) : ({} as T);
-      } catch {
-        data = responseBody as unknown as T;
-      }
-
-      // 检查响应状态
-      if (response.statusCode >= 200 && response.statusCode < 300) {
-        return {
-          data,
-          status: response.statusCode,
-          headers: response.headers as Record<
-            string,
-            string | string[] | undefined
-          >,
-        };
-      } else {
-        throw new HttpError(
-          response.statusCode,
-          data,
-          `HTTP request failed with status ${response.statusCode}`
-        );
-      }
-    } catch (error) {
-      if (error instanceof HttpError) {
-        throw error;
-      }
-      throw new Error(
-        `HTTP request failed: ${
-          error instanceof Error ? error.message : String(error)
-        }`
-      );
-    }
-  }
-
-  /**
-   * GET 请求
-   */
-  async get<T = unknown>(
-    url: string,
-    config?: Omit<HttpRequestConfig, "url" | "method">
-  ): Promise<HttpResponse<T>> {
-    return this.request<T>({ ...config, url, method: "GET" });
-  }
-
-  /**
-   * POST 请求
-   */
-  async post<T = unknown>(
-    url: string,
-    config?: Omit<HttpRequestConfig, "url" | "method">
-  ): Promise<HttpResponse<T>> {
-    return this.request<T>({ ...config, url, method: "POST" });
-  }
-
-  /**
-   * PUT 请求
-   */
-  async put<T = unknown>(
-    url: string,
-    config?: Omit<HttpRequestConfig, "url" | "method">
-  ): Promise<HttpResponse<T>> {
-    return this.request<T>({ ...config, url, method: "PUT" });
-  }
-
-  /**
-   * DELETE 请求
-   */
-  async delete<T = unknown>(
-    url: string,
-    config?: Omit<HttpRequestConfig, "url" | "method">
-  ): Promise<HttpResponse<T>> {
-    return this.request<T>({ ...config, url, method: "DELETE" });
-  }
-
-  /**
-   * PATCH 请求
-   */
-  async patch<T = unknown>(
-    url: string,
-    config?: Omit<HttpRequestConfig, "url" | "method">
-  ): Promise<HttpResponse<T>> {
-    return this.request<T>({ ...config, url, method: "PATCH" });
-  }
-}
+/**
+ * HTTP 请求客户端封装
+ * 基于 undici 实现
+ */
+
+import { request, type Dispatcher, ProxyAgent } from "undici";
+import { getProxyUrl, shouldUseProxy } from "../utils/proxy.js";
+
+/**
+ * HTTP 客户端配置
+ */
+export interface HttpClientOptions {
+  defaultHeaders?: Record<string, string>;
+  defaultTimeout?: number;
+  /**
+   * 代理地址，例如：http://127.0.0.1:7890
+   * 如果不设置，则使用环境变量 HTTP_PROXY 或 HTTPS_PROXY
+   */
+  proxy?: string;
+}
+
+/**
+ * HTTP 请求配置
+ */
+export interface HttpRequestConfig {
+  url: string;
+  method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+  headers?: Record<string, string>;
+  body?: string | object | null;
+  timeout?: number;
+  query?: Record<string, string | number | boolean | undefined>;
+  /**
+   * 是否禁用代理（默认 false）
+   */
+  disableProxy?: boolean;
+}
+
+/**
+ * HTTP 响应
+ */
+export interface HttpResponse<T = unknown> {
+  data: T;
+  status: number;
+  headers: Record<string, string | string[] | undefined>;
+}
+
+/**
+ * HTTP 错误
+ */
+export class HttpError extends Error {
+  constructor(public status: number, public data: unknown, message: string) {
+    super(message);
+    this.name = "HttpError";
+  }
+}
+
+/**
+ * HTTP 客户端类
+ */
+export class HttpClient {
+  private baseUrl: string;
+  private defaultHeaders: Record<string, string>;
+  private defaultTimeout: number;
+  private proxyAgent?: ProxyAgent;
+
+  constructor(baseUrl: string, options?: HttpClientOptions) {
+    this.baseUrl = baseUrl.replace(/\/$/, "");
+    this.defaultHeaders = options?.defaultHeaders || {};
+    this.defaultTimeout = options?.defaultTimeout || 30000;
+
+    // 初始化代理 agent，使用统一的代理配置获取逻辑
+    const proxyUrl = getProxyUrl(options?.proxy);
+
+    if (proxyUrl) {
+      this.proxyAgent = new ProxyAgent(proxyUrl);
+    }
+  }
+
+  /**
+   * 执行 HTTP 请求
+   */
+  async request<T = unknown>(
+    config: HttpRequestConfig
+  ): Promise<HttpResponse<T>> {
+    const {
+      method = "GET",
+      headers = {},
+      body,
+      timeout = this.defaultTimeout,
+      query,
+    } = config;
+
+    // 构建 URL
+    let url = config.url;
+    if (!url.startsWith("http://") && !url.startsWith("https://")) {
+      url = `${this.baseUrl}${url.startsWith("/") ? "" : "/"}${url}`;
+    }
+
+    // 添加查询参数
+    if (query && Object.keys(query).length > 0) {
+      const params = new URLSearchParams();
+      Object.entries(query).forEach(([key, value]) => {
+        if (value !== undefined) {
+          params.append(key, String(value));
+        }
+      });
+      const queryString = params.toString();
+      if (queryString) {
+        url += (url.includes("?") ? "&" : "?") + queryString;
+      }
+    }
+
+    // 合并请求头
+    const mergedHeaders: Record<string, string> = {
+      ...this.defaultHeaders,
+      ...headers,
+    };
+
+    // 设置 Content-Type
+    if (body && !mergedHeaders["Content-Type"]) {
+      mergedHeaders["Content-Type"] = "application/json";
+    }
+
+    // 准备请求体
+    let requestBody: string | undefined;
+    if (body !== null && body !== undefined) {
+      if (typeof body === "string") {
+        requestBody = body;
+      } else {
+        requestBody = JSON.stringify(body);
+      }
+    }
+
+    try {
+      const dispatcher: Dispatcher = shouldUseProxy(
+        getProxyUrl(),
+        config.disableProxy
+      ) && this.proxyAgent
+        ? this.proxyAgent
+        : undefined;
+
+      const response = await request(url, {
+        method,
+        headers: mergedHeaders as HeadersInit,
+        body: requestBody,
+        headersTimeout: timeout,
+        bodyTimeout: timeout,
+        dispatcher,
+      });
+
+      // 读取响应体
+      const responseBody = await response.body.text();
+      let data: T;
+
+      try {
+        data = responseBody ? JSON.parse(responseBody) : ({} as T);
+      } catch {
+        data = responseBody as unknown as T;
+      }
+
+      // 检查响应状态
+      if (response.statusCode >= 200 && response.statusCode < 300) {
+        return {
+          data,
+          status: response.statusCode,
+          headers: response.headers as Record<
+            string,
+            string | string[] | undefined
+          >,
+        };
+      } else {
+        throw new HttpError(
+          response.statusCode,
+          data,
+          `HTTP request failed with status ${response.statusCode}`
+        );
+      }
+    } catch (error) {
+      if (error instanceof HttpError) {
+        throw error;
+      }
+      throw new Error(
+        `HTTP request failed: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    }
+  }
+
+  /**
+   * GET 请求
+   */
+  async get<T = unknown>(
+    url: string,
+    config?: Omit<HttpRequestConfig, "url" | "method">
+  ): Promise<HttpResponse<T>> {
+    return this.request<T>({ ...config, url, method: "GET" });
+  }
+
+  /**
+   * POST 请求
+   */
+  async post<T = unknown>(
+    url: string,
+    config?: Omit<HttpRequestConfig, "url" | "method">
+  ): Promise<HttpResponse<T>> {
+    return this.request<T>({ ...config, url, method: "POST" });
+  }
+
+  /**
+   * PUT 请求
+   */
+  async put<T = unknown>(
+    url: string,
+    config?: Omit<HttpRequestConfig, "url" | "method">
+  ): Promise<HttpResponse<T>> {
+    return this.request<T>({ ...config, url, method: "PUT" });
+  }
+
+  /**
+   * DELETE 请求
+   */
+  async delete<T = unknown>(
+    url: string,
+    config?: Omit<HttpRequestConfig, "url" | "method">
+  ): Promise<HttpResponse<T>> {
+    return this.request<T>({ ...config, url, method: "DELETE" });
+  }
+
+  /**
+   * PATCH 请求
+   */
+  async patch<T = unknown>(
+    url: string,
+    config?: Omit<HttpRequestConfig, "url" | "method">
+  ): Promise<HttpResponse<T>> {
+    return this.request<T>({ ...config, url, method: "PATCH" });
+  }
+}

package/src/apis/index.ts

@@ -1,8 +1,8 @@
-/**
- * Claw Cloud API 模块
- */
-export { createClawCloudClient, ClawCloudClient } from './claw-cloud.js';
-export { HttpClient, HttpError, type HttpRequestConfig, type HttpResponse } from './http-client.js';
-export { createHonorAuthClient, HonorAuthClient } from './honor-auth.js';
-export * from './types.js';
-export * from './helpers.js';
+/**
+ * Claw Cloud API 模块
+ */
+export { createClawCloudClient, ClawCloudClient } from './claw-cloud.js';
+export { HttpClient, HttpError, type HttpRequestConfig, type HttpResponse } from './http-client.js';
+export { createHonorAuthClient, HonorAuthClient } from './honor-auth.js';
+export * from './types.js';
+export * from './helpers.js';

package/src/apis/types.ts

@@ -1,73 +1,77 @@
-/**
- * 设备注册接口相关类型定义
- */
-import type { ClawDeviceInfo, DeviceRole } from "../types.js";
-
-/**
- * 设备注册请求体
- */
-export interface DeviceRegistryRequest {
-  businessTag: "YOYO_CLAW";
-  role: DeviceRole;
-  deviceInfo: Omit<ClawDeviceInfo, "role">;
-}
-
-export interface HttpApiWrapper<T = any> {
-  code: string;
-  success: boolean;
-  cnMessage: string;
-  data?: T;
-}
-
-/**
- * 设备注册响应体
- */
-export type DeviceRegistryResponse = HttpApiWrapper;
-
-/**
- * 设备注册请求头
- */
-export interface DeviceRegistryHeaders {
-  "x-trace-id": string;
-  "x-udid"?: string;
-  "x-device-id"?: string;
-  /**
-   * token信息
-   */
-  "x-jwt-token"?: string;
-  /**
-   * 用户id加密后的信息
-   */
-  authorization?: string;
-  /**
-   * 端用，claw侧不需要
-   */
-  // authorization?: string;
-  // debug mode
-  "x-agw-userId"?: string;
-}
-
-/**
- * 用户登出请求体
- */
-export interface UserLogoutRequest {
-  businessTag: "YOYO_CLAW";
-  deviceInfo: Omit<ClawDeviceInfo, "role">;
-}
-
-/**
- * 用户登出响应体
- */
-export type UserLogoutResponse = HttpApiWrapper;
-
-/**
- * 用户登出请求头
- */
-export interface UserLogoutHeaders {
-  "x-trace-id": string;
-  "x-udid"?: string;
-  "x-device-id"?: string;
-  "x-jwt-token"?: string;
-  authorization?: string;
-  "x-agw-userId"?: string;
-}
+/**
+ * 设备注册接口相关类型定义
+ */
+import type { ClawDeviceInfo, DeviceRole } from "../types.js";
+
+/**
+ * 设备注册请求体
+ */
+export interface DeviceRegistryRequest {
+  businessTag: "YOYO_CLAW";
+  role: DeviceRole;
+  deviceInfo: Omit<ClawDeviceInfo, "role"> & {
+    manufacture: string;
+  };
+}
+
+export interface HttpApiWrapper<T = unknown> {
+  code: string;
+  success: boolean;
+  cnMessage: string;
+  data?: T;
+}
+
+/**
+ * 设备注册响应体
+ */
+export type DeviceRegistryResponse = HttpApiWrapper;
+
+/**
+ * 设备注册请求头
+ */
+export interface DeviceRegistryHeaders {
+  "x-trace-id": string;
+  "x-udid"?: string;
+  "x-device-id"?: string;
+  /**
+   * token信息
+   */
+  "x-jwt-token"?: string;
+  /**
+   * 用户id加密后的信息
+   */
+  authorization?: string;
+  /**
+   * 端用，claw侧不需要
+   */
+  // authorization?: string;
+  // debug mode
+  "x-agw-userId"?: string;
+}
+
+/**
+ * 用户登出请求体
+ */
+export interface UserLogoutRequest {
+  businessTag: "YOYO_CLAW";
+  deviceInfo: Omit<ClawDeviceInfo, "role"> & {
+    manufacture: string;
+  };
+}
+
+/**
+ * 用户登出响应体
+ */
+export type UserLogoutResponse = HttpApiWrapper;
+
+/**
+ * 用户登出请求头
+ */
+export interface UserLogoutHeaders {
+  "x-trace-id": string;
+  "x-udid"?: string;
+  "x-device-id"?: string;
+  "x-jwt-token"?: string;
+  authorization?: string;
+  "x-agw-userId"?: string;
+}