@cicctencent/agent-core 0.1.69 → 0.1.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/a2a/client.d.ts +39 -11
- package/dist/cjs/a2a/client.d.ts.map +1 -1
- package/dist/cjs/a2a/client.js +69 -22
- package/dist/cjs/a2a/client.js.map +1 -1
- package/dist/cjs/a2a/rest-client.d.ts +35 -9
- package/dist/cjs/a2a/rest-client.d.ts.map +1 -1
- package/dist/cjs/a2a/rest-client.js +65 -18
- package/dist/cjs/a2a/rest-client.js.map +1 -1
- package/dist/cjs/a2a/rest-runner.d.ts +6 -0
- package/dist/cjs/a2a/rest-runner.d.ts.map +1 -1
- package/dist/cjs/a2a/rest-runner.js +19 -7
- package/dist/cjs/a2a/rest-runner.js.map +1 -1
- package/dist/cjs/a2a/runner.d.ts +6 -0
- package/dist/cjs/a2a/runner.d.ts.map +1 -1
- package/dist/cjs/a2a/runner.js +24 -7
- package/dist/cjs/a2a/runner.js.map +1 -1
- package/dist/cjs/agent/tool-executor.d.ts +4 -1
- package/dist/cjs/agent/tool-executor.d.ts.map +1 -1
- package/dist/cjs/agent/tool-executor.js +17 -2
- package/dist/cjs/agent/tool-executor.js.map +1 -1
- package/dist/cjs/index.d.ts +6 -3
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +15 -10
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/llm/debug.d.ts.map +1 -1
- package/dist/cjs/llm/debug.js +4 -1
- package/dist/cjs/llm/debug.js.map +1 -1
- package/dist/cjs/mcp/base-client.d.ts +19 -4
- package/dist/cjs/mcp/base-client.d.ts.map +1 -1
- package/dist/cjs/mcp/base-client.js +28 -8
- package/dist/cjs/mcp/base-client.js.map +1 -1
- package/dist/cjs/mcp/http-client.d.ts +5 -5
- package/dist/cjs/mcp/http-client.d.ts.map +1 -1
- package/dist/cjs/mcp/http-client.js +26 -21
- package/dist/cjs/mcp/http-client.js.map +1 -1
- package/dist/cjs/mcp/proxy-agent.d.ts +2 -50
- package/dist/cjs/mcp/proxy-agent.d.ts.map +1 -1
- package/dist/cjs/mcp/proxy-agent.js +12 -174
- package/dist/cjs/mcp/proxy-agent.js.map +1 -1
- package/dist/cjs/mcp/stdio-client.d.ts +1 -1
- package/dist/cjs/mcp/stdio-client.d.ts.map +1 -1
- package/dist/cjs/mcp/stdio-client.js +1 -1
- package/dist/cjs/mcp/stdio-client.js.map +1 -1
- package/dist/cjs/mcp/types.d.ts +8 -2
- package/dist/cjs/mcp/types.d.ts.map +1 -1
- package/dist/cjs/tool/delegate.d.ts +21 -1
- package/dist/cjs/tool/delegate.d.ts.map +1 -1
- package/dist/cjs/tool/delegate.js +44 -7
- package/dist/cjs/tool/delegate.js.map +1 -1
- package/dist/cjs/tool/types.d.ts +8 -0
- package/dist/cjs/tool/types.d.ts.map +1 -1
- package/dist/cjs/utils/header-vars.d.ts +18 -0
- package/dist/cjs/utils/header-vars.d.ts.map +1 -0
- package/dist/cjs/utils/header-vars.js +71 -0
- package/dist/cjs/utils/header-vars.js.map +1 -0
- package/dist/cjs/utils/proxy-agent.d.ts +53 -0
- package/dist/cjs/utils/proxy-agent.d.ts.map +1 -0
- package/dist/cjs/utils/proxy-agent.js +154 -0
- package/dist/cjs/utils/proxy-agent.js.map +1 -0
- package/dist/cjs/utils/proxy.d.ts +53 -0
- package/dist/cjs/utils/proxy.d.ts.map +1 -0
- package/dist/cjs/utils/proxy.js +148 -0
- package/dist/cjs/utils/proxy.js.map +1 -0
- package/dist/cjs/utils/system-proxy.d.ts +15 -0
- package/dist/cjs/utils/system-proxy.d.ts.map +1 -0
- package/dist/cjs/utils/system-proxy.js +133 -0
- package/dist/cjs/utils/system-proxy.js.map +1 -0
- package/dist/esm/a2a/client.d.ts +39 -11
- package/dist/esm/a2a/client.d.ts.map +1 -1
- package/dist/esm/a2a/client.js +69 -22
- package/dist/esm/a2a/client.js.map +1 -1
- package/dist/esm/a2a/rest-client.d.ts +35 -9
- package/dist/esm/a2a/rest-client.d.ts.map +1 -1
- package/dist/esm/a2a/rest-client.js +65 -18
- package/dist/esm/a2a/rest-client.js.map +1 -1
- package/dist/esm/a2a/rest-runner.d.ts +6 -0
- package/dist/esm/a2a/rest-runner.d.ts.map +1 -1
- package/dist/esm/a2a/rest-runner.js +19 -7
- package/dist/esm/a2a/rest-runner.js.map +1 -1
- package/dist/esm/a2a/runner.d.ts +6 -0
- package/dist/esm/a2a/runner.d.ts.map +1 -1
- package/dist/esm/a2a/runner.js +24 -7
- package/dist/esm/a2a/runner.js.map +1 -1
- package/dist/esm/agent/tool-executor.d.ts +4 -1
- package/dist/esm/agent/tool-executor.d.ts.map +1 -1
- package/dist/esm/agent/tool-executor.js +17 -2
- package/dist/esm/agent/tool-executor.js.map +1 -1
- package/dist/esm/index.d.ts +6 -3
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/llm/debug.d.ts.map +1 -1
- package/dist/esm/llm/debug.js +4 -1
- package/dist/esm/llm/debug.js.map +1 -1
- package/dist/esm/mcp/base-client.d.ts +19 -4
- package/dist/esm/mcp/base-client.d.ts.map +1 -1
- package/dist/esm/mcp/base-client.js +28 -8
- package/dist/esm/mcp/base-client.js.map +1 -1
- package/dist/esm/mcp/http-client.d.ts +5 -5
- package/dist/esm/mcp/http-client.d.ts.map +1 -1
- package/dist/esm/mcp/http-client.js +25 -20
- package/dist/esm/mcp/http-client.js.map +1 -1
- package/dist/esm/mcp/proxy-agent.d.ts +2 -50
- package/dist/esm/mcp/proxy-agent.d.ts.map +1 -1
- package/dist/esm/mcp/proxy-agent.js +7 -168
- package/dist/esm/mcp/proxy-agent.js.map +1 -1
- package/dist/esm/mcp/stdio-client.d.ts +1 -1
- package/dist/esm/mcp/stdio-client.d.ts.map +1 -1
- package/dist/esm/mcp/stdio-client.js +1 -1
- package/dist/esm/mcp/stdio-client.js.map +1 -1
- package/dist/esm/mcp/types.d.ts +8 -2
- package/dist/esm/mcp/types.d.ts.map +1 -1
- package/dist/esm/tool/delegate.d.ts +21 -1
- package/dist/esm/tool/delegate.d.ts.map +1 -1
- package/dist/esm/tool/delegate.js +44 -7
- package/dist/esm/tool/delegate.js.map +1 -1
- package/dist/esm/tool/types.d.ts +8 -0
- package/dist/esm/tool/types.d.ts.map +1 -1
- package/dist/esm/utils/header-vars.d.ts +18 -0
- package/dist/esm/utils/header-vars.d.ts.map +1 -0
- package/dist/esm/utils/header-vars.js +65 -0
- package/dist/esm/utils/header-vars.js.map +1 -0
- package/dist/esm/utils/proxy-agent.d.ts +53 -0
- package/dist/esm/utils/proxy-agent.d.ts.map +1 -0
- package/dist/esm/utils/proxy-agent.js +115 -0
- package/dist/esm/utils/proxy-agent.js.map +1 -0
- package/dist/esm/utils/proxy.d.ts +53 -0
- package/dist/esm/utils/proxy.d.ts.map +1 -0
- package/dist/esm/utils/proxy.js +109 -0
- package/dist/esm/utils/proxy.js.map +1 -0
- package/dist/esm/utils/system-proxy.d.ts +15 -0
- package/dist/esm/utils/system-proxy.d.ts.map +1 -0
- package/dist/esm/utils/system-proxy.js +128 -0
- package/dist/esm/utils/system-proxy.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
// ============================================================
|
|
2
|
+
// Proxy — 通用 HTTP/HTTPS/SOCKS 代理解析工具(跨 MCP / A2A / LLM 的基础能力)
|
|
3
|
+
// ============================================================
|
|
4
|
+
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
5
|
+
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
6
|
+
return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
|
|
7
|
+
return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
return path;
|
|
11
|
+
};
|
|
12
|
+
/** 默认代理设置:全部分类走系统代理 */
|
|
13
|
+
export const DEFAULT_PROXY_SETTINGS = {
|
|
14
|
+
llm: { mode: 'system' },
|
|
15
|
+
mcp: { mode: 'system' },
|
|
16
|
+
fetch: { mode: 'system' },
|
|
17
|
+
};
|
|
18
|
+
// ---- Proxy URL 解析 ----
|
|
19
|
+
// 系统代理检测(环境变量 + macOS scutil + Windows 注册表)为通用基础能力,
|
|
20
|
+
// 统一放在 utils/system-proxy 中,供 LLM / MCP / Fetch 各分类复用。
|
|
21
|
+
import { getSystemProxyUrl } from "./system-proxy.js";
|
|
22
|
+
/**
|
|
23
|
+
* 根据分类代理配置解析代理 URL
|
|
24
|
+
*
|
|
25
|
+
* - `mode='system'`:自动检测系统代理(环境变量 + macOS scutil + Windows 注册表)
|
|
26
|
+
* - `mode='custom'`:使用用户指定的代理 URL
|
|
27
|
+
* - `mode='direct'`:不走代理,返回 undefined
|
|
28
|
+
*
|
|
29
|
+
* 返回代理 URL 字符串,需配合 createProxyDispatcher() 使用。
|
|
30
|
+
* 支持 http://、https://、socks4://、socks5:// 协议。
|
|
31
|
+
*
|
|
32
|
+
* @param category 分类代理配置
|
|
33
|
+
* @param label 日志标签(如 'LLM', 'MCP', 'Fetch')
|
|
34
|
+
* @returns 代理 URL 字符串,无代理时返回 undefined
|
|
35
|
+
*/
|
|
36
|
+
export function resolveProxyAgentForCategory(category, label = 'Proxy') {
|
|
37
|
+
if (!category)
|
|
38
|
+
return undefined;
|
|
39
|
+
let proxyUrl;
|
|
40
|
+
switch (category.mode) {
|
|
41
|
+
case 'direct':
|
|
42
|
+
console.debug(`[${label}] proxy mode: direct (no proxy)`);
|
|
43
|
+
return undefined;
|
|
44
|
+
case 'custom':
|
|
45
|
+
if (!category.url) {
|
|
46
|
+
console.debug(`[${label}] proxy mode: custom but no URL configured, falling back to direct`);
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
proxyUrl = category.url;
|
|
50
|
+
break;
|
|
51
|
+
case 'system':
|
|
52
|
+
default:
|
|
53
|
+
proxyUrl = getSystemProxyUrl();
|
|
54
|
+
if (!proxyUrl) {
|
|
55
|
+
console.debug(`[${label}] proxy mode: system, no system proxy detected`);
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
console.debug(`[${label}] using proxy: ${proxyUrl}`);
|
|
61
|
+
return proxyUrl;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* 根据代理 URL 创建 undici ProxyAgent dispatcher
|
|
65
|
+
*
|
|
66
|
+
* Node.js 原生 fetch() 不支持 RequestInit.proxy 选项,
|
|
67
|
+
* 需通过 dispatcher 传入 undici 的 ProxyAgent 来正确使用代理。
|
|
68
|
+
*
|
|
69
|
+
* 使用动态 import('undici') 避免浏览器环境静态解析失败。
|
|
70
|
+
* 仅在传入 proxyUrl 时才创建 ProxyAgent,无代理时返回 undefined。
|
|
71
|
+
*
|
|
72
|
+
* @param proxyUrl 代理 URL(如 http://127.0.0.1:7890),undefined 时不创建
|
|
73
|
+
* @returns ProxyAgent dispatcher 或 undefined
|
|
74
|
+
*/
|
|
75
|
+
export async function createProxyDispatcher(proxyUrl) {
|
|
76
|
+
if (!proxyUrl)
|
|
77
|
+
return undefined;
|
|
78
|
+
try {
|
|
79
|
+
// 动态 import undici(Node 18+ 内置),用变量规避静态模块解析错误
|
|
80
|
+
const modName = 'undici';
|
|
81
|
+
const { ProxyAgent } = await import(__rewriteRelativeImportExtension(modName));
|
|
82
|
+
if (!ProxyAgent)
|
|
83
|
+
return undefined;
|
|
84
|
+
return new ProxyAgent({ uri: proxyUrl });
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
console.warn(`[Proxy] Failed to create ProxyAgent for ${proxyUrl}, falling back to direct`);
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* 获取分类代理的有效 URL(用于 axios 等 HTTP 客户端)
|
|
93
|
+
*
|
|
94
|
+
* @returns 代理 URL 字符串,无代理时返回 undefined
|
|
95
|
+
*/
|
|
96
|
+
export function resolveProxyUrlForCategory(category) {
|
|
97
|
+
if (!category)
|
|
98
|
+
return undefined;
|
|
99
|
+
switch (category.mode) {
|
|
100
|
+
case 'direct':
|
|
101
|
+
return undefined;
|
|
102
|
+
case 'custom':
|
|
103
|
+
return category.url || undefined;
|
|
104
|
+
case 'system':
|
|
105
|
+
default:
|
|
106
|
+
return getSystemProxyUrl();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/utils/proxy.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,8DAA8D;AAC9D,+DAA+D;;;;;;;;;AAwB/D,uBAAuB;AACvB,MAAM,CAAC,MAAM,sBAAsB,GAAkB;IACnD,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;CAC1B,CAAC;AAEF,yBAAyB;AAEzB,oDAAoD;AACpD,uDAAuD;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,4BAA4B,CAC1C,QAA8B,EAC9B,KAAK,GAAG,OAAO;IAEf,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,IAAI,QAA4B,CAAC;IAEjC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,iCAAiC,CAAC,CAAC;YAC1D,OAAO,SAAS,CAAC;QAEnB,KAAK,QAAQ;YACX,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,oEAAoE,CAAC,CAAC;gBAC7F,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC;YACxB,MAAM;QAER,KAAK,QAAQ,CAAC;QACd;YACE,QAAQ,GAAG,iBAAiB,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,gDAAgD,CAAC,CAAC;gBACzE,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM;IACV,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,QAAQ,EAAE,CAAC,CAAC;IACrD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,QAAiB;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,CAAC;QACH,8CAA8C;QAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC;QACzB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,kCAAC,OAAO,EAAQ,CAAC;QACpD,IAAI,CAAC,UAAU;YAAE,OAAO,SAAS,CAAC;QAClC,OAAO,IAAI,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,2CAA2C,QAAQ,0BAA0B,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAA8B;IACvE,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC,GAAG,IAAI,SAAS,CAAC;QACnC,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,iBAAiB,EAAE,CAAC;IAC/B,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 从 Windows 注册表读取系统代理配置
|
|
3
|
+
* 仅 Windows 平台生效,其他平台返回 undefined。
|
|
4
|
+
* 结果带 TTL 缓存,避免重复查询注册表,同时保证系统设置变更后生效。
|
|
5
|
+
*/
|
|
6
|
+
export declare function getWindowsSystemProxy(): string | undefined;
|
|
7
|
+
/** 清除系统代理缓存(应用内修改代理设置、或希望强制重新探测时调用) */
|
|
8
|
+
export declare function clearSystemProxyCache(): void;
|
|
9
|
+
/**
|
|
10
|
+
* 获取系统代理 URL
|
|
11
|
+
* 优先级:环境变量 HTTPS_PROXY / HTTP_PROXY / ALL_PROXY > macOS scutil > Windows 注册表
|
|
12
|
+
* 环境变量每次实时读取(即时生效、零成本);OS 探测结果带 TTL 缓存 + 显式失效。
|
|
13
|
+
*/
|
|
14
|
+
export declare function getSystemProxyUrl(): string | undefined;
|
|
15
|
+
//# sourceMappingURL=system-proxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-proxy.d.ts","sourceRoot":"","sources":["../../../src/utils/system-proxy.ts"],"names":[],"mappings":"AAwEA;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,GAAG,SAAS,CA8B1D;AAED,uCAAuC;AACvC,wBAAgB,qBAAqB,IAAI,IAAI,CAO5C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAStD"}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
// ============================================================
|
|
2
|
+
// System Proxy — 通用系统代理检测工具(跨平台,与业务模块无关的基础方法)
|
|
3
|
+
// ============================================================
|
|
4
|
+
import { execSync } from 'child_process';
|
|
5
|
+
// ---- 缓存策略 ----
|
|
6
|
+
// macOS scutil / Windows 注册表探测都比较重(spawn 进程 / 读注册表),不能每次调用都执行;
|
|
7
|
+
// 但「永久缓存」又会导致系统级代理被直接修改后无法生效。
|
|
8
|
+
// 因此采用「TTL 缓存 + 显式失效」:
|
|
9
|
+
// - 性能:TTL 内复用结果,不重复探测;
|
|
10
|
+
// - 时效:超过 TTL 自动重新探测,确保系统设置变更(非经本应用)后最终生效;
|
|
11
|
+
// - 即时:应用内修改代理设置会调用 clearSystemProxyCache() 立即失效。
|
|
12
|
+
// 环境变量始终实时读取(零成本、即时生效),不参与缓存。
|
|
13
|
+
const OS_PROXY_TTL_MS = 30_000;
|
|
14
|
+
// ---- macOS 系统代理检测 ----
|
|
15
|
+
let _macProxy = null;
|
|
16
|
+
let _macProbed = false;
|
|
17
|
+
let _macTs = 0;
|
|
18
|
+
/**
|
|
19
|
+
* 从 macOS 系统偏好设置读取代理配置
|
|
20
|
+
* 通过 scutil --proxy 查询,仅 macOS 平台生效。
|
|
21
|
+
* 结果带 TTL 缓存,兼顾性能与「系统设置变更后生效」。
|
|
22
|
+
*/
|
|
23
|
+
function getMacOSSystemProxy() {
|
|
24
|
+
if (_macProbed && Date.now() - _macTs < OS_PROXY_TTL_MS)
|
|
25
|
+
return _macProxy ?? undefined;
|
|
26
|
+
let url;
|
|
27
|
+
if (process.platform === 'darwin') {
|
|
28
|
+
try {
|
|
29
|
+
const output = execSync('scutil --proxy', { encoding: 'utf-8', timeout: 3000 });
|
|
30
|
+
const parsed = {};
|
|
31
|
+
// scutil 输出格式: " Key : Value"
|
|
32
|
+
for (const line of output.split('\n')) {
|
|
33
|
+
const m = line.trim().match(/^(\w+)\s*:\s*(.+)$/);
|
|
34
|
+
if (m)
|
|
35
|
+
parsed[m[1]] = m[2].trim();
|
|
36
|
+
}
|
|
37
|
+
// 优先 HTTPS 代理,其次 HTTP 代理,最后 SOCKS 代理
|
|
38
|
+
if (parsed['HTTPSEnable'] === '1' && parsed['HTTPSProxy']) {
|
|
39
|
+
const port = parsed['HTTPSPort'] || '443';
|
|
40
|
+
url = `http://${parsed['HTTPSProxy']}:${port}`;
|
|
41
|
+
console.debug(`[Proxy] macOS system HTTPS proxy detected: ${url}`);
|
|
42
|
+
}
|
|
43
|
+
else if (parsed['HTTPEnable'] === '1' && parsed['HTTPProxy']) {
|
|
44
|
+
const port = parsed['HTTPPort'] || '80';
|
|
45
|
+
url = `http://${parsed['HTTPProxy']}:${port}`;
|
|
46
|
+
console.debug(`[Proxy] macOS system HTTP proxy detected: ${url}`);
|
|
47
|
+
}
|
|
48
|
+
else if (parsed['SOCKSEnable'] === '1' && parsed['SOCKSProxy']) {
|
|
49
|
+
const port = parsed['SOCKSPort'] || '1080';
|
|
50
|
+
url = `socks5://${parsed['SOCKSProxy']}:${port}`;
|
|
51
|
+
console.debug(`[Proxy] macOS system SOCKS proxy detected: ${url}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
url = undefined;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
_macProxy = url ?? null;
|
|
59
|
+
_macProbed = true;
|
|
60
|
+
_macTs = Date.now();
|
|
61
|
+
return _macProxy ?? undefined;
|
|
62
|
+
}
|
|
63
|
+
// ---- Windows 系统代理检测 ----
|
|
64
|
+
let _winProxy = null;
|
|
65
|
+
let _winProbed = false;
|
|
66
|
+
let _winTs = 0;
|
|
67
|
+
/**
|
|
68
|
+
* 从 Windows 注册表读取系统代理配置
|
|
69
|
+
* 仅 Windows 平台生效,其他平台返回 undefined。
|
|
70
|
+
* 结果带 TTL 缓存,避免重复查询注册表,同时保证系统设置变更后生效。
|
|
71
|
+
*/
|
|
72
|
+
export function getWindowsSystemProxy() {
|
|
73
|
+
if (_winProbed && Date.now() - _winTs < OS_PROXY_TTL_MS)
|
|
74
|
+
return _winProxy ?? undefined;
|
|
75
|
+
let url;
|
|
76
|
+
if (process.platform === 'win32') {
|
|
77
|
+
try {
|
|
78
|
+
const regPath = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings';
|
|
79
|
+
const output = execSync(`reg query "${regPath}" /v ProxyEnable`, { encoding: 'utf-8', timeout: 3000, windowsHide: true });
|
|
80
|
+
const enabledMatch = output.match(/ProxyEnable\s+REG_DWORD\s+0x(\d+)/i);
|
|
81
|
+
if (!enabledMatch || enabledMatch[1] === '0') {
|
|
82
|
+
url = undefined;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
const serverOutput = execSync(`reg query "${regPath}" /v ProxyServer`, { encoding: 'utf-8', timeout: 3000, windowsHide: true });
|
|
86
|
+
const serverMatch = serverOutput.match(/ProxyServer\s+REG_SZ\s+(.+)/i);
|
|
87
|
+
if (serverMatch) {
|
|
88
|
+
const proxyServer = serverMatch[1].trim();
|
|
89
|
+
// Windows 代理可能是 ip:port 格式,需要补全协议
|
|
90
|
+
url = proxyServer.includes('://') ? proxyServer : `http://${proxyServer}`;
|
|
91
|
+
console.debug(`[Proxy] Windows system proxy detected: ${url}`);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
url = undefined;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
_winProxy = url ?? null;
|
|
100
|
+
_winProbed = true;
|
|
101
|
+
_winTs = Date.now();
|
|
102
|
+
return _winProxy ?? undefined;
|
|
103
|
+
}
|
|
104
|
+
/** 清除系统代理缓存(应用内修改代理设置、或希望强制重新探测时调用) */
|
|
105
|
+
export function clearSystemProxyCache() {
|
|
106
|
+
_macProxy = null;
|
|
107
|
+
_macProbed = false;
|
|
108
|
+
_macTs = 0;
|
|
109
|
+
_winProxy = null;
|
|
110
|
+
_winProbed = false;
|
|
111
|
+
_winTs = 0;
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* 获取系统代理 URL
|
|
115
|
+
* 优先级:环境变量 HTTPS_PROXY / HTTP_PROXY / ALL_PROXY > macOS scutil > Windows 注册表
|
|
116
|
+
* 环境变量每次实时读取(即时生效、零成本);OS 探测结果带 TTL 缓存 + 显式失效。
|
|
117
|
+
*/
|
|
118
|
+
export function getSystemProxyUrl() {
|
|
119
|
+
return process.env.HTTPS_PROXY
|
|
120
|
+
|| process.env.https_proxy
|
|
121
|
+
|| process.env.HTTP_PROXY
|
|
122
|
+
|| process.env.http_proxy
|
|
123
|
+
|| process.env.ALL_PROXY
|
|
124
|
+
|| process.env.all_proxy
|
|
125
|
+
|| getMacOSSystemProxy()
|
|
126
|
+
|| getWindowsSystemProxy();
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=system-proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-proxy.js","sourceRoot":"","sources":["../../../src/utils/system-proxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cicctencent/agent-core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.72",
|
|
4
4
|
"description": "Core engine for AI agent — LLM orchestration, tool execution, MCP, skill routing, security, and memory pipeline.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/cjs/index.js",
|