dsh-provider-proxy 0.5.0 → 0.5.1

package/lib/index.js

@@ -134,6 +134,42 @@ import { ProxyAgent, Socks5ProxyAgent } from "undici";
 // src/config.ts
 import { createRequire } from "node:module";
 
+// src/proxy-address.ts
+var PROXY_HOST_INVALID = "\u4EE3\u7406\u5730\u5740\u53EA\u80FD\u586B IPv4\u3001IPv6 \u6216\u57DF\u540D";
+var IPV4 = /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
+var DOMAIN = /^(?=.*[a-z])(?=.{1,253}$)(?!.*\.\d+$)[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?)*$/i;
+var IPV6_CHARS = /^[0-9a-f:.]+$/i;
+function proxyHostProblem(rawHost) {
+  const host = (rawHost ?? "").trim().replace(/\.$/, "");
+  if (host.length === 0) return "\u672A\u586B\u5199\u4EE3\u7406\u5730\u5740";
+  if (IPV4.test(host)) return void 0;
+  if (host.includes(":") || host.startsWith("[")) {
+    const literal = host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
+    if (!IPV6_CHARS.test(literal)) return PROXY_HOST_INVALID;
+    try {
+      new URL(`http://[${literal}]:1`);
+      return void 0;
+    } catch {
+      return PROXY_HOST_INVALID;
+    }
+  }
+  return DOMAIN.test(host) ? void 0 : PROXY_HOST_INVALID;
+}
+function defaultProxyProblem(endpoint) {
+  const hostProblem = proxyHostProblem(endpoint.host);
+  if (hostProblem !== void 0) return hostProblem;
+  const port = endpoint.port ?? 0;
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    return "\u4EE3\u7406\u7AEF\u53E3\u65E0\u6548\uFF08\u9700\u4E3A 1-65535 \u7684\u6574\u6570\uFF09";
+  }
+  const hasUser = (endpoint.username ?? "").trim().length > 0;
+  const hasPassword = (endpoint.password ?? "").length > 0;
+  if (hasUser !== hasPassword) {
+    return hasUser ? "\u914D\u7F6E\u4E86\u4EE3\u7406\u7528\u6237\u540D\u4F46\u6CA1\u6709\u5BC6\u7801\uFF1B\u8BF7\u8865\u5168\u5BC6\u7801\u6216\u6E05\u7A7A\u7528\u6237\u540D" : "\u914D\u7F6E\u4E86\u4EE3\u7406\u5BC6\u7801\u4F46\u6CA1\u6709\u7528\u6237\u540D\uFF1B\u8BF7\u8865\u5168\u7528\u6237\u540D\u6216\u6E05\u7A7A\u5BC6\u7801";
+  }
+  return void 0;
+}
+
 // node_modules/@deepseek-ai/schemastery/lib/index.mjs
 var lib_exports = {};
 __export(lib_exports, {
@@ -1117,11 +1153,11 @@ function normalizeRoute(provider, raw, options) {
     return { ...value, port: value.port || 0, onlyHosts, bypassHosts, testTarget };
   }
   const host = value.host.trim();
-  if (host.length === 0) {
-    throw new TypeError(`dsh-provider-proxy: provider "${provider}" \u542F\u7528\u4E86\u4EE3\u7406\uFF0C\u4F46\u672A\u586B\u5199\u4EE3\u7406\u5730\u5740`);
-  }
-  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(host) || host.includes("/")) {
-    throw new TypeError(`dsh-provider-proxy: provider "${provider}" \u7684\u4EE3\u7406\u5730\u5740\u53EA\u586B\u4E3B\u673A\u540D\u6216 IP\uFF0C\u4E0D\u8981\u5E26\u534F\u8BAE\u524D\u7F00\u6216\u8DEF\u5F84`);
+  const hostProblem = proxyHostProblem(host);
+  if (hostProblem !== void 0) {
+    throw new TypeError(
+      hostProblem === "\u672A\u586B\u5199\u4EE3\u7406\u5730\u5740" ? `dsh-provider-proxy: provider "${provider}" \u542F\u7528\u4E86\u4EE3\u7406\uFF0C\u4F46\u672A\u586B\u5199\u4EE3\u7406\u5730\u5740` : `dsh-provider-proxy: provider "${provider}" \u7684${hostProblem}`
+    );
   }
   if (!Number.isInteger(value.port) || value.port < 1 || value.port > 65535) {
     throw new TypeError(
@@ -1131,25 +1167,6 @@ function normalizeRoute(provider, raw, options) {
   return { ...value, host, username: value.username.trim(), onlyHosts, bypassHosts, testTarget };
 }
 
-// src/proxy-address.ts
-function defaultProxyProblem(endpoint) {
-  const host = (endpoint.host ?? "").trim();
-  if (host.length === 0) return "\u672A\u586B\u5199\u4EE3\u7406\u5730\u5740";
-  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(host) || host.includes("/")) {
-    return "\u4EE3\u7406\u5730\u5740\u53EA\u586B\u4E3B\u673A\u540D\u6216 IP\uFF0C\u4E0D\u8981\u5E26\u534F\u8BAE\u524D\u7F00\u6216\u8DEF\u5F84";
-  }
-  const port = endpoint.port ?? 0;
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    return "\u4EE3\u7406\u7AEF\u53E3\u65E0\u6548\uFF08\u9700\u4E3A 1-65535 \u7684\u6574\u6570\uFF09";
-  }
-  const hasUser = (endpoint.username ?? "").length > 0;
-  const hasPassword = (endpoint.password ?? "").length > 0;
-  if (hasUser !== hasPassword) {
-    return hasUser ? "\u914D\u7F6E\u4E86\u4EE3\u7406\u7528\u6237\u540D\u4F46\u6CA1\u6709\u5BC6\u7801\uFF1B\u8BF7\u8865\u5168\u5BC6\u7801\u6216\u6E05\u7A7A\u7528\u6237\u540D" : "\u914D\u7F6E\u4E86\u4EE3\u7406\u5BC6\u7801\u4F46\u6CA1\u6709\u7528\u6237\u540D\uFF1B\u8BF7\u8865\u5168\u7528\u6237\u540D\u6216\u6E05\u7A7A\u5BC6\u7801";
-  }
-  return void 0;
-}
-
 // src/proxy-table.ts
 function proxyUrl(route) {
   const credentials = route.username.length === 0 ? "" : route.password.length > 0 && route.protocol !== "socks5" ? `${encodeURIComponent(route.username)}:${encodeURIComponent(route.password)}@` : `${encodeURIComponent(route.username)}@`;
@@ -1797,6 +1814,7 @@ export {
   name,
   normalizeDefaultProxy,
   normalizeRoute,
+  proxyHostProblem,
   proxyUrl
 };
 //# sourceMappingURL=index.js.map