@botiverse/oar 0.62.0 → 0.62.1
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.
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { EnvHttpProxyAgent } from "undici";
|
|
1
2
|
/** The slice of pi's SettingsManager the plane reads; structural for tests. */
|
|
2
3
|
export interface PiHttpSettings {
|
|
3
4
|
getGlobalSettings(): {
|
|
@@ -21,6 +22,15 @@ export interface PiHttpPlan {
|
|
|
21
22
|
export declare function planPiHttp(settings?: PiHttpSettings, env?: PiProxyEnv): PiHttpPlan;
|
|
22
23
|
/** Whether the plan changes anything over Node's default dispatcher. */
|
|
23
24
|
export declare function planNeedsDispatcher(plan: PiHttpPlan): boolean;
|
|
25
|
+
/**
|
|
26
|
+
* The dispatcher's options: the plan, plus the connection behavior pi's own
|
|
27
|
+
* dispatcher keeps (pi-coding-agent 1.2.0 core/http-dispatcher.js), so an
|
|
28
|
+
* embedded pi talks to providers and proxies the way `pi` does, and the host's
|
|
29
|
+
* global fetch keeps Node's protocol: HTTP/1.1 only (undici 8 would otherwise
|
|
30
|
+
* negotiate HTTP/2), CONNECT tunnels for http targets behind a proxy (as
|
|
31
|
+
* before undici 8.7), and pi's 2 s address-family attempt timeout.
|
|
32
|
+
*/
|
|
33
|
+
export declare function piDispatcherOptions(plan: PiHttpPlan): ConstructorParameters<typeof EnvHttpProxyAgent>[0];
|
|
24
34
|
/**
|
|
25
35
|
* Install the proxy plane before the first provider request: undici's
|
|
26
36
|
* global dispatcher becomes an `EnvHttpProxyAgent` built from the plan.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/runtimes/pi/http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/runtimes/pi/http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,iBAAiB,EAA4C,MAAM,QAAQ,CAAC;AAgC7G,+EAA+E;AAC/E,MAAM,WAAW,cAAc;IAC7B,iBAAiB,IAAI;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,oBAAoB,IAAI,MAAM,CAAC;CAChC;AAED,iFAAiF;AACjF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,YAAY,GAAG,aAAa,GAAG,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;AAExH,mGAAmG;AACnG,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5C;AAOD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,GAAE,UAAwB,GAAG,UAAU,CAO/F;AAkBD,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAG7D;AA6BD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,qBAAqB,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CASxG;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAgCjF"}
|
package/dist/runtimes/pi/http.js
CHANGED
|
@@ -49,6 +49,24 @@ async function loadUndici() {
|
|
|
49
49
|
throw error;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* The dispatcher's options: the plan, plus the connection behavior pi's own
|
|
54
|
+
* dispatcher keeps (pi-coding-agent 1.2.0 core/http-dispatcher.js), so an
|
|
55
|
+
* embedded pi talks to providers and proxies the way `pi` does, and the host's
|
|
56
|
+
* global fetch keeps Node's protocol: HTTP/1.1 only (undici 8 would otherwise
|
|
57
|
+
* negotiate HTTP/2), CONNECT tunnels for http targets behind a proxy (as
|
|
58
|
+
* before undici 8.7), and pi's 2 s address-family attempt timeout.
|
|
59
|
+
*/
|
|
60
|
+
export function piDispatcherOptions(plan) {
|
|
61
|
+
return {
|
|
62
|
+
allowH2: false,
|
|
63
|
+
proxyTunnel: true,
|
|
64
|
+
connect: { autoSelectFamilyAttemptTimeout: 2000 },
|
|
65
|
+
...(plan.httpProxy === undefined ? {} : { httpProxy: plan.httpProxy }),
|
|
66
|
+
...(plan.httpsProxy === undefined ? {} : { httpsProxy: plan.httpsProxy }),
|
|
67
|
+
...(plan.idleTimeoutMs === undefined ? {} : { headersTimeout: plan.idleTimeoutMs, bodyTimeout: plan.idleTimeoutMs }),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
52
70
|
/**
|
|
53
71
|
* Install the proxy plane before the first provider request: undici's
|
|
54
72
|
* global dispatcher becomes an `EnvHttpProxyAgent` built from the plan.
|
|
@@ -82,11 +100,7 @@ export async function configurePiHttp(settings) {
|
|
|
82
100
|
warnOnce(new Error("the host already set a global dispatcher"));
|
|
83
101
|
return false;
|
|
84
102
|
}
|
|
85
|
-
const dispatcher = new undici.EnvHttpProxyAgent(
|
|
86
|
-
...(plan.httpProxy === undefined ? {} : { httpProxy: plan.httpProxy }),
|
|
87
|
-
...(plan.httpsProxy === undefined ? {} : { httpsProxy: plan.httpsProxy }),
|
|
88
|
-
...(plan.idleTimeoutMs === undefined ? {} : { headersTimeout: plan.idleTimeoutMs, bodyTimeout: plan.idleTimeoutMs }),
|
|
89
|
-
});
|
|
103
|
+
const dispatcher = new undici.EnvHttpProxyAgent(piDispatcherOptions(plan));
|
|
90
104
|
undici.setGlobalDispatcher(dispatcher);
|
|
91
105
|
installed = { plan: key, dispatcher };
|
|
92
106
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/runtimes/pi/http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/runtimes/pi/http.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@botiverse/oar",
|
|
3
|
-
"version": "0.62.
|
|
3
|
+
"version": "0.62.1",
|
|
4
4
|
"description": "A programming interface for all agent harnesses: provider-independent contracts for controlling and observing agent runtimes",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|