perf: optimize OpenClaw transport and coverage on JDK 17

Author: loong10k

pom.xml

@@ -191,7 +191,7 @@
                     <configuration>
                         <skip>false</skip>
                         <skipTests>false</skipTests>
-                        <argLine>-Xmx1024m -Dfile.encoding=UTF-8</argLine>
+                        <argLine>${argLine} -Xmx1024m -Dfile.encoding=UTF-8</argLine>
                         <additionalClasspathElements>
                             <additionalClasspathElement>${basedir}/target/test-classes</additionalClasspathElement>
                         </additionalClasspathElements>
@@ -304,7 +304,7 @@
                             <goal>check</goal>
                         </goals>
                         <configuration>
-                            <haltOnFailure>false</haltOnFailure>
+                            <haltOnFailure>true</haltOnFailure>
                             <rules>
                                 <rule>
                                     <element>BUNDLE</element>
@@ -355,7 +355,7 @@
                 <jdk>[1.8,)</jdk>
             </activation>
             <properties>
-                <central-maven-publishing-plugin.version>0.11.0</central-maven-publishing-plugin.version>
+                <maven-central-publishing-plugin.version>0.11.0</maven-central-publishing-plugin.version>
                 <additionalparam>-Xdoclint:none -Xlint:unchecked</additionalparam>
                 <maven-jacoco-plugin.version>0.8.15</maven-jacoco-plugin.version>
 
@@ -465,7 +465,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
         <maven.version>3.0</maven.version>
-        <okhttp3.version>5.4.0</okhttp3.version>
+        <okhttp3.version>4.12.0</okhttp3.version>
         <jackson.version>2.17.2</jackson.version>
         <commons-exec.version>1.6.0</commons-exec.version>
         <junit.version>5.11.4</junit.version>

src/main/java/io/github/easy4j/openclaw/OpenClawClient.java

@@ -40,7 +40,7 @@
  * </ul>
  *
  * <h3>构造器选择</h3>
- * <p>提供 8 个重载覆盖三类场景：</p>
+ * <p>提供多种构造器覆盖三类场景：</p>
  * <ul>
  *     <li>仅 HTTP / 仅 CLI：传入单个子配置，禁用另一子系统</li>
  *     <li>HTTP + CLI：传入两个子配置，子系统都按各自 {@code enabled} 决定</li>
@@ -71,6 +71,7 @@ public class OpenClawClient implements AutoCloseable {
     private final OpenClawToolInvokeClient toolsInvokeClient;
     private final OpenClawCli cli;
     private final OpenClawGatewayWsClient wsClient;
+    private final OkHttpClient ownedHttpClient;
 
     // ============================================================
     // 构造器（单配置 / 双配置 / 组合配置 × 自动或强制）
@@ -80,35 +81,44 @@ public class OpenClawClient implements AutoCloseable {
      * 仅 HTTP 子系统（CLI 禁用）。自动创建默认 {@link ObjectMapper} 与 {@link OkHttpClient}。
      */
     public OpenClawClient(OpenClawHttpClientConfig httpConfig) {
-        this(httpConfig, new OpenClawCliConfig(), new ObjectMapper(), new OkHttpClient());
+        this(httpConfig, new OpenClawCliConfig(), new ObjectMapper(),
+                OpenClawOkHttpClientFactory.create(httpConfig), true);
+    }
+
+    /**
+     * 仅 HTTP 子系统，使用调用方管理的共享 {@link OkHttpClient}。
+     * <p>适用于直接注入 Spring 容器中由 okhttp3-extension/starter 配置的客户端。</p>
+     */
+    public OpenClawClient(OpenClawHttpClientConfig httpConfig, OkHttpClient httpClient) {
+        this(httpConfig, new ObjectMapper(), httpClient);
     }
 
     /**
      * 仅 HTTP 子系统（CLI 禁用），强制注入共享 {@link ObjectMapper} 与 {@link OkHttpClient}。
      */
     public OpenClawClient(OpenClawHttpClientConfig httpConfig, ObjectMapper objectMapper, OkHttpClient httpClient) {
-        this(httpConfig, new OpenClawCliConfig(), objectMapper, httpClient);
+        this(httpConfig, new OpenClawCliConfig(), objectMapper, httpClient, false);
     }
 
     /**
      * 仅 CLI 子系统（HTTP 禁用）。自动创建默认 {@link ObjectMapper} 与 {@link OkHttpClient}。
      */
     public OpenClawClient(OpenClawCliConfig cliConfig) {
-        this(new OpenClawHttpClientConfig(), cliConfig, new ObjectMapper(), new OkHttpClient());
+        this(new OpenClawHttpClientConfig(), cliConfig, new ObjectMapper(), new OkHttpClient(), true);
     }
 
     /**
      * 仅 CLI 子系统（HTTP 禁用），强制注入共享 {@link ObjectMapper} 与 {@link OkHttpClient}。
      */
     public OpenClawClient(OpenClawCliConfig cliConfig, ObjectMapper objectMapper, OkHttpClient httpClient) {
-        this(new OpenClawHttpClientConfig(), cliConfig, objectMapper, httpClient);
+        this(new OpenClawHttpClientConfig(), cliConfig, objectMapper, httpClient, false);
     }
 
     /**
      * HTTP + CLI 子系统。自动创建默认 {@link ObjectMapper} 与 {@link OkHttpClient}。
      */
     public OpenClawClient(OpenClawHttpClientConfig httpConfig, OpenClawCliConfig cliConfig) {
-        this(httpConfig, cliConfig, new ObjectMapper(), new OkHttpClient());
+        this(httpConfig, cliConfig, new ObjectMapper(), OpenClawOkHttpClientFactory.create(httpConfig), true);
     }
 
     /**
@@ -121,10 +131,16 @@ public OpenClawClient(OpenClawHttpClientConfig httpConfig, OpenClawCliConfig cli
      */
     public OpenClawClient(OpenClawHttpClientConfig httpConfig, OpenClawCliConfig cliConfig,
                           ObjectMapper objectMapper, OkHttpClient httpClient) {
+        this(httpConfig, cliConfig, objectMapper, httpClient, false);
+    }
+
+    private OpenClawClient(OpenClawHttpClientConfig httpConfig, OpenClawCliConfig cliConfig,
+                           ObjectMapper objectMapper, OkHttpClient httpClient, boolean ownsHttpClient) {
         Objects.requireNonNull(httpConfig, "httpConfig");
         Objects.requireNonNull(cliConfig, "cliConfig");
         Objects.requireNonNull(objectMapper, "objectMapper");
         Objects.requireNonNull(httpClient, "httpClient");
+        this.ownedHttpClient = ownsHttpClient ? httpClient : null;
 
         boolean httpEnabled = httpConfig.isEnabled();
         boolean cliEnabled = cliConfig.isEnabled();
@@ -165,7 +181,16 @@ public OpenClawClient(OpenClawClientConfig config) {
         this(Objects.requireNonNull(config, "config").getHttp(),
                 config.getCli(),
                 new ObjectMapper(),
-                new OkHttpClient());
+                OpenClawOkHttpClientFactory.create(config.getHttp()),
+                true);
+    }
+
+    /**
+     * 使用组合配置和调用方管理的共享 {@link OkHttpClient}。
+     * <p>SDK 关闭时不会关闭、清空或重建该客户端的连接池和调度器。</p>
+     */
+    public OpenClawClient(OpenClawClientConfig config, OkHttpClient httpClient) {
+        this(config, new ObjectMapper(), httpClient);
     }
 
     /**
@@ -175,7 +200,8 @@ public OpenClawClient(OpenClawClientConfig config, ObjectMapper objectMapper, Ok
         this(Objects.requireNonNull(config, "config").getHttp(),
                 config.getCli(),
                 objectMapper,
-                httpClient);
+                httpClient,
+                false);
     }
 
     /**
@@ -198,6 +224,7 @@ public OpenClawClient(OpenClawHttpClientConfig httpConfig,
         this.toolsInvokeClient = toolsInvokeClient;
         this.cli = cli;
         this.wsClient = wsClient;
+        this.ownedHttpClient = null;
     }
 
     /**
@@ -386,6 +413,16 @@ public OpenClawChatClient chat() {
         return chatClient;
     }
 
+    /**
+     * 获取 HTTP 子系统实际使用的 {@link OkHttpClient}。
+     * <p>通过注入构造器传入时返回同一个实例，其生命周期仍由调用方管理。</p>
+     *
+     * @return HTTP 子系统使用的 OkHttpClient；HTTP 子系统禁用时返回 {@code null}
+     */
+    public OkHttpClient getOkHttpClient() {
+        return Objects.nonNull(chatClient) ? chatClient.getHttpClient() : null;
+    }
+
     /**
      * 获取 Embeddings 客户端。
      */
@@ -618,6 +655,7 @@ public void close() {
         closeQuietly(responsesClient);
         closeQuietly(toolsInvokeClient);
         closeQuietly(wsClient);
+        OpenClawOkHttpClientFactory.shutdown(ownedHttpClient);
     }
 
     /**

src/main/java/io/github/easy4j/openclaw/OpenClawHttpClientConfig.java

@@ -66,11 +66,32 @@ public class OpenClawHttpClientConfig {
     private boolean verifySsl = true;
 
     /** 连接超时（毫秒） */
-    private int connectTimeoutMillis = 15_000;
+    private int connectTimeoutMillis = 2_000;
 
     /** 读取超时（毫秒） */
     private int readTimeoutMillis = 120_000;
 
+    /** 写入超时（毫秒） */
+    private int writeTimeoutMillis = 10_000;
+
+    /** 整个调用超时（毫秒）；0 表示不额外限制，由读取超时控制 */
+    private int callTimeoutMillis;
+
+    /** 连接池最大空闲连接数 */
+    private int maxIdleConnections = 32;
+
+    /** 空闲连接保活时间（毫秒） */
+    private long keepAliveDurationMillis = 300_000L;
+
+    /** 异步请求最大并发数 */
+    private int maxRequests = 128;
+
+    /** 单主机异步请求最大并发数 */
+    private int maxRequestsPerHost = 64;
+
+    /** 遇到失效连接等传输故障时是否允许 OkHttp 自动恢复 */
+    private boolean retryOnConnectionFailure = true;
+
     /**
      * Gateway HTTP Webhooks 基础路径，对应 {@code hooks.path}，默认 {@code /hooks}。
      */

src/main/java/io/github/easy4j/openclaw/OpenClawOkHttpClientFactory.java

@@ -0,0 +1,63 @@
+package io.github.easy4j.openclaw;
+
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
+import okhttp3.OkHttpClient;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * OpenClaw 默认 OkHttpClient 工厂。
+ *
+ * <p>Spring 等容器已经提供 {@link OkHttpClient} 时应优先使用注入构造器；本工厂只负责
+ * SDK 独立运行场景，并保证 Chat、Tools、Responses 等客户端共享同一连接池。</p>
+ */
+public final class OpenClawOkHttpClientFactory {
+
+    private OpenClawOkHttpClientFactory() {
+    }
+
+    /**
+     * 按 HTTP 配置创建适合高并发长连接复用的客户端。
+     *
+     * @param config HTTP 配置
+     * @return SDK 自主管理的 OkHttpClient
+     */
+    public static OkHttpClient create(OpenClawHttpClientConfig config) {
+        Objects.requireNonNull(config, "config");
+        Dispatcher dispatcher = new Dispatcher();
+        dispatcher.setMaxRequests(Math.max(1, config.getMaxRequests()));
+        dispatcher.setMaxRequestsPerHost(Math.max(1, config.getMaxRequestsPerHost()));
+        ConnectionPool connectionPool = new ConnectionPool(
+                Math.max(1, config.getMaxIdleConnections()),
+                Math.max(1L, config.getKeepAliveDurationMillis()),
+                TimeUnit.MILLISECONDS);
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .dispatcher(dispatcher)
+                .connectionPool(connectionPool)
+                .connectTimeout(Math.max(1, config.getConnectTimeoutMillis()), TimeUnit.MILLISECONDS)
+                .readTimeout(Math.max(0, config.getReadTimeoutMillis()), TimeUnit.MILLISECONDS)
+                .writeTimeout(Math.max(1, config.getWriteTimeoutMillis()), TimeUnit.MILLISECONDS)
+                .callTimeout(Math.max(0, config.getCallTimeoutMillis()), TimeUnit.MILLISECONDS)
+                .retryOnConnectionFailure(config.isRetryOnConnectionFailure());
+        if (!config.isVerifySsl()) {
+            builder.hostnameVerifier((hostname, session) -> true);
+        }
+        return builder.build();
+    }
+
+    /**
+     * 释放 SDK 自建客户端资源。外部注入的客户端不得调用此方法。
+     *
+     * @param client SDK 自建客户端
+     */
+    public static void shutdown(OkHttpClient client) {
+        if (Objects.isNull(client)) {
+            return;
+        }
+        client.dispatcher().cancelAll();
+        client.connectionPool().evictAll();
+        client.dispatcher().executorService().shutdown();
+    }
+}