openclaw-openagent 1.0.13 → 1.0.14

package/src/util/http.ts

@@ -1,113 +0,0 @@
-/**
- * HTTP Utility — Lightweight GET/POST helpers
- *
- * Uses Node.js built-in http/https modules.
- * No external dependencies required.
- */
-
-import type { IncomingMessage, RequestOptions } from 'node:http';
-
-const DEFAULT_TIMEOUT_MS = 10_000;
-
-export interface HttpResponse<T = unknown> {
-  statusCode: number;
-  data: T;
-}
-
-/**
- * Perform an HTTP GET request and parse JSON response.
- */
-export async function httpGet<T = unknown>(
-  url: string,
-  options?: { headers?: Record<string, string>; timeoutMs?: number },
-): Promise<T> {
-  const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const isHttps = url.startsWith('https');
-  const client = await import(isHttps ? 'node:https' : 'node:http');
-
-  return new Promise<T>((resolve, reject) => {
-    const timeout = setTimeout(() => reject(new Error(`GET timeout: ${url}`)), timeoutMs);
-
-    const reqOptions: RequestOptions = {};
-    if (options?.headers) {
-      reqOptions.headers = options.headers;
-    }
-
-    client.get(url, reqOptions, (res: IncomingMessage) => {
-      let data = '';
-      res.on('data', (chunk: string) => (data += chunk));
-      res.on('end', () => {
-        clearTimeout(timeout);
-        if (res.statusCode && res.statusCode >= 400) {
-          try {
-            const errJson = JSON.parse(data) as { error?: string };
-            return reject(new Error(errJson.error || `HTTP ${res.statusCode}`));
-          } catch {
-            return reject(new Error(`HTTP ${res.statusCode}: ${data}`));
-          }
-        }
-        try {
-          resolve(JSON.parse(data) as T);
-        } catch {
-          reject(new Error('Failed to parse response'));
-        }
-      });
-    }).on('error', (err: Error) => {
-      clearTimeout(timeout);
-      reject(err);
-    });
-  });
-}
-
-/**
- * Perform an HTTP POST request with JSON body and parse JSON response.
- */
-export async function httpPost<T = unknown>(
-  url: string,
-  body: unknown,
-  timeoutMs = DEFAULT_TIMEOUT_MS,
-): Promise<T> {
-  const isHttps = url.startsWith('https');
-  const httpModule = await import(isHttps ? 'node:https' : 'node:http');
-
-  return new Promise<T>((resolve, reject) => {
-    const timeout = setTimeout(() => reject(new Error(`POST timeout: ${url}`)), timeoutMs);
-    const bodyStr = typeof body === 'string' ? body : JSON.stringify(body);
-
-    const options: RequestOptions = {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(bodyStr),
-      },
-    };
-
-    const req = httpModule.request(url, options, (res: IncomingMessage) => {
-      let data = '';
-      res.on('data', (chunk: string) => (data += chunk));
-      res.on('end', () => {
-        clearTimeout(timeout);
-        if (res.statusCode && res.statusCode >= 400) {
-          try {
-            const errJson = JSON.parse(data) as { error?: string };
-            return reject(new Error(errJson.error || `HTTP ${res.statusCode}`));
-          } catch {
-            return reject(new Error(`HTTP ${res.statusCode}: ${data}`));
-          }
-        }
-        try {
-          resolve(JSON.parse(data) as T);
-        } catch {
-          reject(new Error('Failed to parse response'));
-        }
-      });
-    });
-
-    req.on('error', (err: Error) => {
-      clearTimeout(timeout);
-      reject(err);
-    });
-    req.write(bodyStr);
-    req.end();
-  });
-}

package/src/util/logger.ts

@@ -1,131 +0,0 @@
-/**
- * OpenAgent Plugin — Logger
- *
- * 统一日志模块，写入 OpenClaw 标准日志目录。
- * 禁止在 Gateway 运行时使用任何 console 输出。
- *
- * 级别控制优先级：环境变量 > 默认 DEBUG（产品发布后改为 INFO）
- */
-
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-
-import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/infra-runtime";
-
-// ── 常量 ──
-
-const LOG_DIR: string = resolvePreferredOpenClawTmpDir();
-
-const SUBSYSTEM = "gateway/channels/openagent";
-const HOSTNAME: string = os.hostname() || "unknown";
-
-const LEVEL_IDS: Record<string, number> = {
-  TRACE: 1,
-  DEBUG: 2,
-  INFO: 3,
-  WARN: 4,
-  ERROR: 5,
-  FATAL: 6,
-};
-
-const DEFAULT_LEVEL = "DEBUG";
-
-// ── 级别控制 ──
-
-/**
- * 解析最终日志级别。
- * 优先级：环境变量 > 默认 DEBUG
- */
-function resolveMinLevel(): number {
-  const env = process.env.OPENCLAW_LOG_LEVEL?.toUpperCase();
-  if (env && env in LEVEL_IDS) return LEVEL_IDS[env];
-
-  return LEVEL_IDS[DEFAULT_LEVEL];
-}
-
-let minLevelId: number = resolveMinLevel();
-
-/** 运行时动态修改日志级别 */
-export function setLogLevel(level: string): void {
-  const upper = level.toUpperCase();
-  if (!(upper in LEVEL_IDS)) {
-    throw new Error(`Invalid log level: ${level}. Valid: ${Object.keys(LEVEL_IDS).join(", ")}`);
-  }
-  minLevelId = LEVEL_IDS[upper];
-}
-
-// ── 时间格式化 ──
-
-function toLocalISO(now: Date): string {
-  const offsetMs = -now.getTimezoneOffset() * 60_000;
-  const sign = offsetMs >= 0 ? "+" : "-";
-  const abs = Math.abs(now.getTimezoneOffset());
-  const hh = String(Math.floor(abs / 60)).padStart(2, "0");
-  const mm = String(abs % 60).padStart(2, "0");
-  return new Date(now.getTime() + offsetMs).toISOString().replace("Z", `${sign}${hh}:${mm}`);
-}
-
-function resolveLogPath(): string {
-  const dateKey = toLocalISO(new Date()).slice(0, 10);
-  return path.join(LOG_DIR, `openclaw-${dateKey}.log`);
-}
-
-// ── 写入 ──
-
-let logDirEnsured = false;
-
-function writeLog(level: string, message: string): void {
-  const levelId = LEVEL_IDS[level] ?? LEVEL_IDS.INFO;
-  if (levelId < minLevelId) return;
-
-  const now = new Date();
-  const entry = JSON.stringify({
-    "0": SUBSYSTEM,
-    "1": message,
-    _meta: {
-      runtime: "node",
-      runtimeVersion: process.versions.node,
-      hostname: HOSTNAME,
-      name: SUBSYSTEM,
-      parentNames: ["openclaw"],
-      date: now.toISOString(),
-      logLevelId: levelId,
-      logLevelName: level,
-    },
-    time: toLocalISO(now),
-  });
-
-  try {
-    if (!logDirEnsured) {
-      fs.mkdirSync(LOG_DIR, { recursive: true });
-      logDirEnsured = true;
-    }
-    fs.appendFileSync(resolveLogPath(), `${entry}\n`, "utf-8");
-  } catch {
-    // 写日志失败不应阻塞业务
-  }
-}
-
-// ── 导出 ──
-
-export type Logger = {
-  trace(message: string): void;
-  debug(message: string): void;
-  info(message: string): void;
-  warn(message: string): void;
-  error(message: string): void;
-  fatal(message: string): void;
-  getLogFilePath(): string;
-};
-
-export const logger: Logger = {
-  trace(message: string): void { writeLog("TRACE", message); },
-  debug(message: string): void { writeLog("DEBUG", message); },
-  info(message: string): void  { writeLog("INFO", message); },
-  warn(message: string): void  { writeLog("WARN", message); },
-  error(message: string): void { writeLog("ERROR", message); },
-  fatal(message: string): void { writeLog("FATAL", message); },
-
-  getLogFilePath(): string { return resolveLogPath(); },
-};

package/src/util/url-resolver.ts

@@ -1,77 +0,0 @@
-/**
- * Shared URL resolution helper.
- *
- * Resolves a possibly-relative URL against an optional base URL.
- * Used by remote-agent-tool (WebUI continuation) and download-file-tool (artifact download).
- */
-
-export function resolveOasnAccessUrl(accessApiBase: string | undefined, url: string): string {
-  if (!url) return url;
-  if (/^https?:\/\//i.test(url)) return url;
-  if (!accessApiBase) return url;
-  try {
-    return resolveOasnRelativeUrl(accessApiBase, url);
-  } catch {
-    return url;
-  }
-}
-
-/**
- * Resolve an OASN API/WebUI-relative path without losing env prefixes such as
- * `/e/limj1`. `new URL('/api/..', 'https://host/e/limj1')` resets to the
- * origin root, so use explicit path joining for env-scoped public bases.
- */
-export function resolveOasnRelativeUrl(accessApiBase: string, path: string): string {
-  const base = accessApiBase.replace(/\/+$/, '');
-  const suffix = path.startsWith('/') ? path : `/${path}`;
-  return new URL(`${base}${suffix}`).toString();
-}
-
-/**
- * Resolve a WebUI continuation URL for user-facing browser clicks.
- *
- * WebUI auth is Owner-cookie based, so the clickable URL must use the same
- * public origin as the claim/login flow. API-key calls can use an internal
- * Access base, but browser links cannot reuse cookies across IP/domain origins.
- */
-export function resolveOasnWebuiUrl(
-  accessApiBase: string | undefined,
-  claimUrl: string | undefined,
-  url: string,
-): string {
-  if (!url) return url;
-
-  const claimPublicBase = publicBaseOfClaimUrl(claimUrl);
-  if (!claimPublicBase || !isWebuiUrl(url, accessApiBase || claimPublicBase)) {
-    return resolveOasnAccessUrl(accessApiBase, url);
-  }
-
-  try {
-    const absolute = new URL(resolveOasnAccessUrl(accessApiBase || claimPublicBase, url));
-    const webuiIndex = absolute.pathname.indexOf('/webui/');
-    const path = webuiIndex >= 0 ? absolute.pathname.slice(webuiIndex) : absolute.pathname;
-    return resolveOasnRelativeUrl(claimPublicBase, `${path}${absolute.search}${absolute.hash}`);
-  } catch {
-    return resolveOasnAccessUrl(accessApiBase, url);
-  }
-}
-
-function publicBaseOfClaimUrl(value: string | undefined): string | undefined {
-  if (!value) return undefined;
-  try {
-    const parsed = new URL(value);
-    const claimPathIndex = parsed.pathname.indexOf('/agents/claim');
-    if (claimPathIndex <= 0) return parsed.origin;
-    return `${parsed.origin}${parsed.pathname.slice(0, claimPathIndex)}`;
-  } catch {
-    return undefined;
-  }
-}
-
-function isWebuiUrl(url: string, base: string): boolean {
-  try {
-    return /(?:^|\/)webui\//.test(new URL(resolveOasnAccessUrl(base, url)).pathname);
-  } catch {
-    return false;
-  }
-}