@openclaw/proxyline 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.2 - 2026-05-17
+
+- Fixed managed Undici proxy dispatchers so HTTPS proxy endpoints addressed by IP do not send invalid IP-literal SNI.
+
 ## 0.3.1 - 2026-05-16
 
 - Fixed `withBypass()` to scope temporary bypasses to the calling async context instead of process-wide state.

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAIV,eAAe,EACf,gBAAgB,EAIjB,MAAM,YAAY,CAAC;AA0tBpB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAgI3E;AAED,eAAO,MAAM,kBAAkB,yBAAmB,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAIV,eAAe,EACf,gBAAgB,EAIjB,MAAM,YAAY,CAAC;AAqwBpB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAgI3E;AAED,eAAO,MAAM,kBAAkB,yBAAmB,CAAC"}

package/dist/runtime.js

@@ -1,7 +1,8 @@
 import http from "node:http";
 import https from "node:https";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { Agent as UndiciAgent, Dispatcher, FormData as UndiciFormData, Headers as UndiciHeaders, Request as UndiciRequest, Response as UndiciResponse, errors as undiciErrors, fetch as undiciFetch, getGlobalDispatcher, ProxyAgent as UndiciProxyAgent, setGlobalDispatcher, } from "undici";
+import net from "node:net";
+import { Agent as UndiciAgent, Dispatcher, FormData as UndiciFormData, Headers as UndiciHeaders, Pool as UndiciPool, Request as UndiciRequest, Response as UndiciResponse, errors as undiciErrors, fetch as undiciFetch, getGlobalDispatcher, ProxyAgent as UndiciProxyAgent, setGlobalDispatcher, } from "undici";
 import { createAmbientProxyResolver, EMPTY_PROXY_ENV, resolveAmbientProxyForUrl, readProxyEnv, } from "./env.js";
 import { bindNodeHttpMethod, createDirectNodeAgent, createNodeProxyAgent, } from "./node-http.js";
 import { formatUrl, ProxylineError, redactProxyUrl, resolveProxyTlsCa, } from "./shared.js";
@@ -272,10 +273,40 @@ function resolveUndiciBaseOptions(options) {
 function createUndiciAgent(options) {
     return new UndiciAgent(resolveUndiciBaseOptions(options));
 }
+function isObjectRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stripIpServernameFromConnectOptions(options) {
+    if (!isObjectRecord(options) || typeof options.servername !== "string") {
+        return options;
+    }
+    const servername = options.servername.replace(/^\[|\]$/g, "");
+    if (net.isIP(servername) === 0) {
+        return options;
+    }
+    const next = { ...options };
+    delete next.servername;
+    return next;
+}
+function stripIpServernameFromConnect(connect) {
+    if (typeof connect !== "function") {
+        return connect;
+    }
+    return (options, callback) => connect(stripIpServernameFromConnectOptions(options), callback);
+}
+function createProxyClientFactory() {
+    return (origin, options) => {
+        const clientOptions = isObjectRecord(options)
+            ? { ...options, connect: stripIpServernameFromConnect(options.connect) }
+            : options;
+        return new UndiciPool(origin, clientOptions);
+    };
+}
 function createUndiciProxyAgent(proxyUrl, options) {
     return new UndiciProxyAgent({
         ...resolveUndiciBaseOptions(options.undici),
         uri: proxyUrl,
+        clientFactory: createProxyClientFactory(),
         ...(options.proxyCa !== undefined ? { proxyTls: { ca: options.proxyCa } } : {}),
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/proxyline",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Process-global proxy routing for Node.js.",
   "type": "module",
   "license": "MIT",

package/src/runtime.ts

@@ -1,11 +1,13 @@
 import http from "node:http";
 import https from "node:https";
 import { AsyncLocalStorage } from "node:async_hooks";
+import net from "node:net";
 import {
   Agent as UndiciAgent,
   Dispatcher,
   FormData as UndiciFormData,
   Headers as UndiciHeaders,
+  Pool as UndiciPool,
   Request as UndiciRequest,
   Response as UndiciResponse,
   errors as undiciErrors,
@@ -389,6 +391,11 @@ type UndiciDispatcherOptions = Readonly<{
   proxyCa: string | undefined;
   undici: ProxylineUndiciOptions | undefined;
 }>;
+type UndiciProxyAgentOptions = Exclude<ConstructorParameters<typeof UndiciProxyAgent>[0], string | URL>;
+type UndiciProxyClientFactory = NonNullable<
+  UndiciProxyAgentOptions["clientFactory"]
+>;
+type UnknownFunction = (...args: unknown[]) => unknown;
 
 function finiteNonNegativeInteger(value: number | undefined): number | undefined {
   return typeof value === "number" && Number.isFinite(value) && value >= 0
@@ -434,6 +441,43 @@ function createUndiciAgent(options: ProxylineUndiciOptions | undefined): UndiciA
   return new UndiciAgent(resolveUndiciBaseOptions(options));
 }
 
+function isObjectRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function stripIpServernameFromConnectOptions(options: unknown): unknown {
+  if (!isObjectRecord(options) || typeof options.servername !== "string") {
+    return options;
+  }
+  const servername = options.servername.replace(/^\[|\]$/g, "");
+  if (net.isIP(servername) === 0) {
+    return options;
+  }
+  const next = { ...options };
+  delete next.servername;
+  return next;
+}
+
+function stripIpServernameFromConnect(connect: unknown): unknown {
+  if (typeof connect !== "function") {
+    return connect;
+  }
+  return (options: unknown, callback: unknown): unknown =>
+    (connect as UnknownFunction)(stripIpServernameFromConnectOptions(options), callback);
+}
+
+function createProxyClientFactory(): UndiciProxyClientFactory {
+  return (origin: URL, options: object): Dispatcher => {
+    const clientOptions = isObjectRecord(options)
+      ? { ...options, connect: stripIpServernameFromConnect(options.connect) }
+      : options;
+    return new UndiciPool(
+      origin,
+      clientOptions as ConstructorParameters<typeof UndiciPool>[1],
+    );
+  };
+}
+
 function createUndiciProxyAgent(
   proxyUrl: string,
   options: UndiciDispatcherOptions,
@@ -441,6 +485,7 @@ function createUndiciProxyAgent(
   return new UndiciProxyAgent({
     ...resolveUndiciBaseOptions(options.undici),
     uri: proxyUrl,
+    clientFactory: createProxyClientFactory(),
     ...(options.proxyCa !== undefined ? { proxyTls: { ca: options.proxyCa } } : {}),
   } as ConstructorParameters<typeof UndiciProxyAgent>[0]);
 }