openai-ws-opencode 0.1.21 → 0.1.23
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/bin/setup.js +189 -13
- package/dist/constants.d.ts +1 -1
- package/dist/constants.js +1 -1
- package/dist/models/catalog.d.ts +1 -0
- package/dist/models/catalog.d.ts.map +1 -1
- package/dist/models/catalog.js.map +1 -1
- package/dist/models/defaults.d.ts +3 -0
- package/dist/models/defaults.d.ts.map +1 -1
- package/dist/models/defaults.js +20 -6
- package/dist/models/defaults.js.map +1 -1
- package/dist/models/resolve.d.ts +2 -2
- package/dist/models/resolve.d.ts.map +1 -1
- package/dist/models/resolve.js +46 -24
- package/dist/models/resolve.js.map +1 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +30 -11
- package/dist/plugin.js.map +1 -1
- package/dist/testing.d.ts +1 -1
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +1 -1
- package/dist/testing.js.map +1 -1
- package/dist/transport/bridge.d.ts.map +1 -1
- package/dist/transport/bridge.js +16 -0
- package/dist/transport/bridge.js.map +1 -1
- package/dist/transport/config.d.ts +3 -0
- package/dist/transport/config.d.ts.map +1 -1
- package/dist/transport/config.js +3 -0
- package/dist/transport/config.js.map +1 -1
- package/dist/transport/pool.d.ts +4 -0
- package/dist/transport/pool.d.ts.map +1 -1
- package/dist/transport/pool.js +111 -14
- package/dist/transport/pool.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/models/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAyB,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/models/resolve.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,MAAM,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA6ExD,QAAA,MAAM,qBAAqB,EAAE,MAsJ5B,CAAA;AAED,eAAe,qBAAqB,CAAA"}
|
package/dist/plugin.js
CHANGED
|
@@ -3,23 +3,30 @@ import { CODEX_API_BASE, CODEX_API_ENDPOINT, INTERNAL_AGENT_HEADER, INTERNAL_MOD
|
|
|
3
3
|
import { oauthMethods } from "./auth/oauth.js";
|
|
4
4
|
import { extractAccountId, refreshAccessToken, tokenExpiry } from "./auth/tokens.js";
|
|
5
5
|
import { fetchCodexCatalog, fetchOpenAIModelIds } from "./models/catalog.js";
|
|
6
|
-
import { OPENAI_WS_MODELS } from "./models/defaults.js";
|
|
6
|
+
import { CODEX_EFFECTIVE_CONTEXT_WINDOW, CODEX_OUTPUT_TOKEN_LIMIT, OPENAI_WS_MODELS } from "./models/defaults.js";
|
|
7
7
|
import { resolveModelsForApiKey, resolveModelsForOAuth } from "./models/resolve.js";
|
|
8
8
|
import { prepareHttpFallbackBody } from "./transport/body.js";
|
|
9
9
|
import { bridgeWebSocket } from "./transport/bridge.js";
|
|
10
|
-
import { closeConnections, ensureWarmConnection } from "./transport/pool.js";
|
|
10
|
+
import { closeConnections, ensureWarmConnection, invalidateStaleAuthConnections } from "./transport/pool.js";
|
|
11
11
|
import { extractTransportContext, httpAuthHeaders, transportIdentity } from "./transport/headers.js";
|
|
12
12
|
function stableHash(value) {
|
|
13
13
|
return crypto.createHash("sha256").update(JSON.stringify(value ?? "")).digest("hex").slice(0, 32);
|
|
14
14
|
}
|
|
15
|
-
const
|
|
16
|
-
|
|
15
|
+
const DEFAULT_BUNDLED_LIMIT = {
|
|
16
|
+
context: CODEX_EFFECTIVE_CONTEXT_WINDOW,
|
|
17
|
+
input: CODEX_EFFECTIVE_CONTEXT_WINDOW,
|
|
18
|
+
output: CODEX_OUTPUT_TOKEN_LIMIT,
|
|
19
|
+
};
|
|
20
|
+
function bundledLimitFor(modelID) {
|
|
17
21
|
if (typeof modelID === "string") {
|
|
18
22
|
const match = OPENAI_WS_MODELS[modelID];
|
|
19
23
|
if (match?.limit?.context)
|
|
20
|
-
return match.limit
|
|
24
|
+
return match.limit;
|
|
21
25
|
}
|
|
22
|
-
return
|
|
26
|
+
return DEFAULT_BUNDLED_LIMIT;
|
|
27
|
+
}
|
|
28
|
+
function isPositiveFinite(value) {
|
|
29
|
+
return typeof value === "number" && Number.isFinite(value) && value > 0;
|
|
23
30
|
}
|
|
24
31
|
async function resolveOAuthAuth(auth, client) {
|
|
25
32
|
const expiryBufferMs = 5 * 60 * 1000;
|
|
@@ -60,11 +67,20 @@ const OpenAIWebSocketPlugin = async ({ client }) => {
|
|
|
60
67
|
if (input.model.providerID !== PROVIDER_ID)
|
|
61
68
|
return;
|
|
62
69
|
const model = input.model;
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
70
|
+
const bundledLimit = bundledLimitFor(input.model.id ?? input.model.modelID);
|
|
71
|
+
const current = model.limit ?? {};
|
|
72
|
+
const context = isPositiveFinite(current.context) ? current.context : bundledLimit.context;
|
|
73
|
+
const inputCandidate = isPositiveFinite(current.input)
|
|
74
|
+
? current.input
|
|
75
|
+
: isPositiveFinite(bundledLimit.input)
|
|
76
|
+
? bundledLimit.input
|
|
77
|
+
: bundledLimit.context;
|
|
78
|
+
const output = isPositiveFinite(current.output) ? current.output : bundledLimit.output;
|
|
79
|
+
model.limit = {
|
|
80
|
+
context,
|
|
81
|
+
input: Math.min(inputCandidate, context),
|
|
82
|
+
output,
|
|
83
|
+
};
|
|
68
84
|
},
|
|
69
85
|
event: async ({ event }) => {
|
|
70
86
|
if (event.type === "session.deleted") {
|
|
@@ -88,6 +104,7 @@ const OpenAIWebSocketPlugin = async ({ client }) => {
|
|
|
88
104
|
provider.models = resolveModelsForApiKey(allowedIds, provider.models);
|
|
89
105
|
}
|
|
90
106
|
const identity = transportIdentity({ type: "api", apiKey });
|
|
107
|
+
invalidateStaleAuthConnections(identity.wsUrl, identity.wsHeaders);
|
|
91
108
|
ensureWarmConnection(identity.wsUrl, identity.wsHeaders);
|
|
92
109
|
return {
|
|
93
110
|
apiKey,
|
|
@@ -129,6 +146,7 @@ const OpenAIWebSocketPlugin = async ({ client }) => {
|
|
|
129
146
|
provider.models = resolveModelsForOAuth(catalog, provider.models);
|
|
130
147
|
}
|
|
131
148
|
const initialIdentity = transportIdentity({ type: "oauth", accessToken: initialAuth.accessToken, accountId: initialAuth.accountId });
|
|
149
|
+
invalidateStaleAuthConnections(initialIdentity.wsUrl, initialIdentity.wsHeaders);
|
|
132
150
|
ensureWarmConnection(initialIdentity.wsUrl, initialIdentity.wsHeaders);
|
|
133
151
|
return {
|
|
134
152
|
apiKey: initialAuth.accessToken,
|
|
@@ -139,6 +157,7 @@ const OpenAIWebSocketPlugin = async ({ client }) => {
|
|
|
139
157
|
throw new Error("OpenAI WebSocket OAuth auth is missing");
|
|
140
158
|
const { accessToken, accountId } = await resolveOAuthAuth(currentAuth, client);
|
|
141
159
|
const identity = transportIdentity({ type: "oauth", accessToken, accountId });
|
|
160
|
+
invalidateStaleAuthConnections(identity.wsUrl, identity.wsHeaders);
|
|
142
161
|
const url = typeof input === "string" ? new URL(input) : input instanceof URL ? input : new URL(input.url);
|
|
143
162
|
const context = extractTransportContext(init?.headers);
|
|
144
163
|
if (shouldBridge(url, init)) {
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,2BAA2B,EAC3B,uBAAuB,EACvB,eAAe,EACf,WAAW,GACZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,WAAW,EAAwB,MAAM,kBAAkB,CAAA;AAC1G,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/testing.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { oauthTesting } from "./auth/oauth.js";
|
|
2
2
|
export { prepareBody, prepareHttpFallbackBody } from "./transport/body.js";
|
|
3
3
|
export { apiKeyWebSocketHeaders, oauthWebSocketHeaders, extractTransportContext, transportIdentity } from "./transport/headers.js";
|
|
4
|
-
export { connectionPool, readyState, ensureWarmConnection, resetPoolForTesting, resetWebSocketConstructorForTesting, setWebSocketConstructorForTesting, } from "./transport/pool.js";
|
|
4
|
+
export { connectionPool, readyState, ensureWarmConnection, invalidateStaleAuthConnections, resetPoolForTesting, resetWebSocketConstructorForTesting, setWebSocketConstructorForTesting, } from "./transport/pool.js";
|
|
5
5
|
export { bridgeWebSocket } from "./transport/bridge.js";
|
|
6
6
|
export { fallbackCodexClientVersion, fetchCodexCatalog, fetchOpenAIModelIds, resetCatalogCacheForTesting, resolveCodexClientVersion } from "./models/catalog.js";
|
|
7
7
|
export { resolveModels, resolveModelsForApiKey, resolveModelsForOAuth, providerConfig } from "./models/resolve.js";
|
package/dist/testing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,EACL,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,mBAAmB,EACnB,mCAAmC,EACnC,iCAAiC,GAClC,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChK,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAClH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,EACL,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,mBAAmB,EACnB,mCAAmC,EACnC,iCAAiC,GAClC,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChK,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAClH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA"}
|
package/dist/testing.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { oauthTesting } from "./auth/oauth.js";
|
|
2
2
|
export { prepareBody, prepareHttpFallbackBody } from "./transport/body.js";
|
|
3
3
|
export { apiKeyWebSocketHeaders, oauthWebSocketHeaders, extractTransportContext, transportIdentity } from "./transport/headers.js";
|
|
4
|
-
export { connectionPool, readyState, ensureWarmConnection, resetPoolForTesting, resetWebSocketConstructorForTesting, setWebSocketConstructorForTesting, } from "./transport/pool.js";
|
|
4
|
+
export { connectionPool, readyState, ensureWarmConnection, invalidateStaleAuthConnections, resetPoolForTesting, resetWebSocketConstructorForTesting, setWebSocketConstructorForTesting, } from "./transport/pool.js";
|
|
5
5
|
export { bridgeWebSocket } from "./transport/bridge.js";
|
|
6
6
|
export { fallbackCodexClientVersion, fetchCodexCatalog, fetchOpenAIModelIds, resetCatalogCacheForTesting, resolveCodexClientVersion } from "./models/catalog.js";
|
|
7
7
|
export { resolveModels, resolveModelsForApiKey, resolveModelsForOAuth, providerConfig } from "./models/resolve.js";
|
package/dist/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,EACL,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,mBAAmB,EACnB,mCAAmC,EACnC,iCAAiC,GAClC,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChK,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAClH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,EACL,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,mBAAmB,EACnB,mCAAmC,EACnC,iCAAiC,GAClC,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChK,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAClH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/transport/bridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/transport/bridge.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAEpD,KAAK,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAwC/D,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,gBAAqB,EAC9B,MAAM,CAAC,EAAE,WAAW,EACpB,aAAa,CAAC,EAAE,aAAa,GAC5B,QAAQ,CA6KV"}
|
package/dist/transport/bridge.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { prepareBody } from "./body.js";
|
|
2
2
|
import { acquireConnection, closeConnection, closeConnections, isWebSocketPreStreamTransportError, sendPending, } from "./pool.js";
|
|
3
|
+
import { transportConfig } from "./config.js";
|
|
4
|
+
const encoder = new TextEncoder();
|
|
3
5
|
function abortPending(conn, error) {
|
|
4
6
|
const pending = conn.pending;
|
|
5
7
|
let closeAfterCancel;
|
|
@@ -46,6 +48,19 @@ export function bridgeWebSocket(wsUrl, headers, requestBody, isOAuth, context =
|
|
|
46
48
|
let finalized = false;
|
|
47
49
|
let fallbackStarted = false;
|
|
48
50
|
let streamController;
|
|
51
|
+
const enqueuePreFirstBytePing = () => {
|
|
52
|
+
const ping = transportConfig.preFirstBytePing;
|
|
53
|
+
if (!ping || !streamController)
|
|
54
|
+
return;
|
|
55
|
+
queueMicrotask(() => {
|
|
56
|
+
if (finalized || signal?.aborted || !streamController || conn?.pending?.framesReceived)
|
|
57
|
+
return;
|
|
58
|
+
try {
|
|
59
|
+
streamController.enqueue(encoder.encode(ping));
|
|
60
|
+
}
|
|
61
|
+
catch { }
|
|
62
|
+
});
|
|
63
|
+
};
|
|
49
64
|
const cleanupAbort = () => {
|
|
50
65
|
if (signal)
|
|
51
66
|
signal.removeEventListener("abort", onAbort);
|
|
@@ -171,6 +186,7 @@ export function bridgeWebSocket(wsUrl, headers, requestBody, isOAuth, context =
|
|
|
171
186
|
controller.error(abortError(signal));
|
|
172
187
|
return;
|
|
173
188
|
}
|
|
189
|
+
enqueuePreFirstBytePing();
|
|
174
190
|
if (signal)
|
|
175
191
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
176
192
|
const acquired = acquireConnection(wsUrl, headers, context, acquisitionController.signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/transport/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,kCAAkC,EAClC,WAAW,GAGZ,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/transport/bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,12 @@ export declare const transportConfig: {
|
|
|
3
3
|
maxReconnectAttempts: number;
|
|
4
4
|
reconnectBaseDelayMs: number;
|
|
5
5
|
reconnectMaxDelayMs: number;
|
|
6
|
+
reconnectJitterRatio: number;
|
|
7
|
+
retryAfterMaxDelayMs: number;
|
|
6
8
|
idleEvictMs: number;
|
|
7
9
|
staleReuseMs: number;
|
|
8
10
|
streamIdleTimeoutMs: number;
|
|
11
|
+
preFirstBytePing: string;
|
|
9
12
|
maxConnectionsPerScope: number;
|
|
10
13
|
connectionMaxAgeMs: number;
|
|
11
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/transport/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/transport/config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAa3B,CAAA"}
|
package/dist/transport/config.js
CHANGED
|
@@ -3,9 +3,12 @@ export const transportConfig = {
|
|
|
3
3
|
maxReconnectAttempts: 5,
|
|
4
4
|
reconnectBaseDelayMs: 100,
|
|
5
5
|
reconnectMaxDelayMs: 2_000,
|
|
6
|
+
reconnectJitterRatio: 0.5,
|
|
7
|
+
retryAfterMaxDelayMs: 10_000,
|
|
6
8
|
idleEvictMs: 120_000,
|
|
7
9
|
staleReuseMs: 60_000,
|
|
8
10
|
streamIdleTimeoutMs: 600_000,
|
|
11
|
+
preFirstBytePing: ":\n\n",
|
|
9
12
|
maxConnectionsPerScope: 4,
|
|
10
13
|
connectionMaxAgeMs: 55 * 60 * 1000,
|
|
11
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/transport/config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,gBAAgB,EAAE,MAAM;IACxB,oBAAoB,EAAE,CAAC;IACvB,oBAAoB,EAAE,GAAG;IACzB,mBAAmB,EAAE,KAAK;IAC1B,WAAW,EAAE,OAAO;IACpB,YAAY,EAAE,MAAM;IACpB,mBAAmB,EAAE,OAAO;IAC5B,sBAAsB,EAAE,CAAC;IACzB,kBAAkB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;CACnC,CAAA"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/transport/config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,gBAAgB,EAAE,MAAM;IACxB,oBAAoB,EAAE,CAAC;IACvB,oBAAoB,EAAE,GAAG;IACzB,mBAAmB,EAAE,KAAK;IAC1B,oBAAoB,EAAE,GAAG;IACzB,oBAAoB,EAAE,MAAM;IAC5B,WAAW,EAAE,OAAO;IACpB,YAAY,EAAE,MAAM;IACpB,mBAAmB,EAAE,OAAO;IAC5B,gBAAgB,EAAE,OAAO;IACzB,sBAAsB,EAAE,CAAC;IACzB,kBAAkB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;CACnC,CAAA"}
|
package/dist/transport/pool.d.ts
CHANGED
|
@@ -33,6 +33,7 @@ export interface PooledConnection {
|
|
|
33
33
|
contextKey: string;
|
|
34
34
|
busy: boolean;
|
|
35
35
|
warm: boolean;
|
|
36
|
+
staleAuth: boolean;
|
|
36
37
|
pending: PendingRequest | null;
|
|
37
38
|
activeSessionID?: string;
|
|
38
39
|
lastSessionID?: string;
|
|
@@ -52,6 +53,8 @@ export interface PooledConnection {
|
|
|
52
53
|
lastCloseCode?: number;
|
|
53
54
|
lastCloseReason?: string;
|
|
54
55
|
lastErrorMessage?: string;
|
|
56
|
+
retryAfterMs?: number;
|
|
57
|
+
frameCarryover: string;
|
|
55
58
|
idleTimer: ReturnType<typeof setTimeout> | null;
|
|
56
59
|
connectTimer: ReturnType<typeof setTimeout> | null;
|
|
57
60
|
retryTimer: ReturnType<typeof setTimeout> | null;
|
|
@@ -66,6 +69,7 @@ export declare const readyState: {
|
|
|
66
69
|
};
|
|
67
70
|
export declare function closeConnection(conn: PooledConnection, reason?: string, graceful?: boolean): void;
|
|
68
71
|
export declare function sendPending(conn: PooledConnection): boolean;
|
|
72
|
+
export declare function invalidateStaleAuthConnections(wsUrl: string, headers: Record<string, string>): void;
|
|
69
73
|
export declare function acquireConnection(wsUrl: string, headers: Record<string, string>, context: TransportContext, signal?: AbortSignal): PooledConnection | Promise<PooledConnection>;
|
|
70
74
|
export declare function ensureWarmConnection(wsUrl: string, headers: Record<string, string>): PooledConnection | undefined;
|
|
71
75
|
export declare function closeConnections(predicate?: (conn: PooledConnection) => boolean, message?: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/transport/pool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/transport/pool.ts"],"names":[],"mappings":"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"}
|
package/dist/transport/pool.js
CHANGED
|
@@ -128,9 +128,14 @@ function remove(conn) {
|
|
|
128
128
|
connectionPool.splice(index, 1);
|
|
129
129
|
detach(conn);
|
|
130
130
|
}
|
|
131
|
-
function retryDelay(attempt) {
|
|
131
|
+
function retryDelay(attempt, retryAfterMs) {
|
|
132
|
+
if (retryAfterMs !== undefined)
|
|
133
|
+
return Math.min(retryAfterMs, transportConfig.retryAfterMaxDelayMs);
|
|
132
134
|
const exponential = Math.min(transportConfig.reconnectMaxDelayMs, transportConfig.reconnectBaseDelayMs * 2 ** Math.max(0, attempt - 1));
|
|
133
|
-
|
|
135
|
+
const jitterRatio = Math.max(0, Math.min(1, transportConfig.reconnectJitterRatio));
|
|
136
|
+
if (jitterRatio === 0)
|
|
137
|
+
return exponential;
|
|
138
|
+
return Math.ceil(exponential * (1 - jitterRatio * Math.random()));
|
|
134
139
|
}
|
|
135
140
|
function closeSocket(conn, code, reason) {
|
|
136
141
|
try {
|
|
@@ -170,8 +175,14 @@ function release(conn) {
|
|
|
170
175
|
conn.activeAgent = undefined;
|
|
171
176
|
conn.busy = false;
|
|
172
177
|
conn.reconnectAttempts = 0;
|
|
178
|
+
conn.frameCarryover = "";
|
|
173
179
|
clearTimer(conn.idleTimer);
|
|
174
180
|
conn.idleTimer = null;
|
|
181
|
+
if (conn.staleAuth) {
|
|
182
|
+
removeAndDrain(conn);
|
|
183
|
+
closeSocket(conn, 1000, "auth changed");
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
175
186
|
if (!conn.warm) {
|
|
176
187
|
conn.idleTimer = unrefTimer(setTimeout(() => {
|
|
177
188
|
conn.idleTimer = null;
|
|
@@ -269,23 +280,71 @@ function schedulePendingIdleTimeout(conn, reason) {
|
|
|
269
280
|
fail(conn, new Error(formatFailureMessage(conn, `idle timeout waiting for websocket after ${reason}`)), true);
|
|
270
281
|
}, transportConfig.streamIdleTimeoutMs));
|
|
271
282
|
}
|
|
272
|
-
function
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
283
|
+
function decodeFrameData(data) {
|
|
284
|
+
if (typeof data === "string")
|
|
285
|
+
return data;
|
|
286
|
+
if (Buffer.isBuffer(data))
|
|
287
|
+
return data.toString("utf8");
|
|
288
|
+
if (data instanceof ArrayBuffer)
|
|
289
|
+
return Buffer.from(data).toString("utf8");
|
|
290
|
+
if (ArrayBuffer.isView(data))
|
|
291
|
+
return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("utf8");
|
|
292
|
+
return String(data);
|
|
293
|
+
}
|
|
294
|
+
function extractJsonValueLength(source) {
|
|
295
|
+
const first = source.charCodeAt(0);
|
|
296
|
+
if (first !== 0x7b && first !== 0x5b)
|
|
297
|
+
return -1;
|
|
298
|
+
let depth = 0;
|
|
299
|
+
let inString = false;
|
|
300
|
+
let escape = false;
|
|
301
|
+
for (let index = 0; index < source.length; index++) {
|
|
302
|
+
const char = source.charCodeAt(index);
|
|
303
|
+
if (inString) {
|
|
304
|
+
if (escape)
|
|
305
|
+
escape = false;
|
|
306
|
+
else if (char === 0x5c)
|
|
307
|
+
escape = true;
|
|
308
|
+
else if (char === 0x22)
|
|
309
|
+
inString = false;
|
|
310
|
+
continue;
|
|
311
|
+
}
|
|
312
|
+
if (char === 0x22)
|
|
313
|
+
inString = true;
|
|
314
|
+
else if (char === 0x7b || char === 0x5b)
|
|
315
|
+
depth += 1;
|
|
316
|
+
else if (char === 0x7d || char === 0x5d) {
|
|
317
|
+
depth -= 1;
|
|
318
|
+
if (depth === 0)
|
|
319
|
+
return index + 1;
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
return -1;
|
|
323
|
+
}
|
|
324
|
+
function parseFrames(data, carryover = "") {
|
|
325
|
+
let buffer = carryover + decodeFrameData(data);
|
|
279
326
|
const frames = [];
|
|
280
|
-
|
|
327
|
+
while (buffer.length > 0) {
|
|
328
|
+
buffer = buffer.replace(/^\s+/, "");
|
|
329
|
+
if (!buffer)
|
|
330
|
+
break;
|
|
331
|
+
const consumed = extractJsonValueLength(buffer);
|
|
332
|
+
if (consumed < 0)
|
|
333
|
+
break;
|
|
334
|
+
const candidate = buffer.slice(0, consumed);
|
|
335
|
+
buffer = buffer.slice(consumed);
|
|
281
336
|
try {
|
|
282
337
|
const parsed = JSON.parse(candidate);
|
|
283
|
-
if (parsed
|
|
338
|
+
if (Array.isArray(parsed)) {
|
|
339
|
+
frames.push(...parsed.filter((item) => Boolean(item) && typeof item === "object" && !Array.isArray(item)));
|
|
340
|
+
}
|
|
341
|
+
else if (parsed && typeof parsed === "object") {
|
|
284
342
|
frames.push(parsed);
|
|
343
|
+
}
|
|
285
344
|
}
|
|
286
345
|
catch { }
|
|
287
346
|
}
|
|
288
|
-
return frames;
|
|
347
|
+
return { frames, carryover: buffer };
|
|
289
348
|
}
|
|
290
349
|
function numberFrom(value) {
|
|
291
350
|
if (typeof value === "number")
|
|
@@ -417,6 +476,7 @@ function handlePreviousResponseNotFound(conn, pending) {
|
|
|
417
476
|
pending.framesReceived = false;
|
|
418
477
|
pending.finalMessageOutputReceived = false;
|
|
419
478
|
pending.processedAckSent = false;
|
|
479
|
+
conn.frameCarryover = "";
|
|
420
480
|
clearPendingTimer(pending);
|
|
421
481
|
if (conn.ws?.readyState !== readyState.OPEN || !sendPending(conn)) {
|
|
422
482
|
fail(conn, new Error("OpenAI WebSocket previous_response_not_found; retry without previous_response_id could not be sent"), true);
|
|
@@ -553,8 +613,21 @@ function closeReasonFrom(codeOrEvent, reason) {
|
|
|
553
613
|
}
|
|
554
614
|
return undefined;
|
|
555
615
|
}
|
|
616
|
+
function parseRetryAfterMs(source) {
|
|
617
|
+
const raw = headerValue(source, "retry-after");
|
|
618
|
+
if (!raw)
|
|
619
|
+
return undefined;
|
|
620
|
+
const seconds = Number(raw);
|
|
621
|
+
if (Number.isFinite(seconds) && seconds >= 0)
|
|
622
|
+
return seconds * 1000;
|
|
623
|
+
const date = Date.parse(raw);
|
|
624
|
+
if (!Number.isNaN(date))
|
|
625
|
+
return Math.max(0, date - Date.now());
|
|
626
|
+
return undefined;
|
|
627
|
+
}
|
|
556
628
|
function connect(conn) {
|
|
557
629
|
const generation = ++conn.generation;
|
|
630
|
+
conn.frameCarryover = "";
|
|
558
631
|
clearTimer(conn.retryTimer);
|
|
559
632
|
conn.retryTimer = null;
|
|
560
633
|
clearTimer(conn.connectTimer);
|
|
@@ -594,7 +667,9 @@ function connect(conn) {
|
|
|
594
667
|
fail(conn, new Error("unexpected binary websocket event"), true);
|
|
595
668
|
return;
|
|
596
669
|
}
|
|
597
|
-
|
|
670
|
+
const parsed = parseFrames(data, conn.frameCarryover);
|
|
671
|
+
conn.frameCarryover = parsed.carryover;
|
|
672
|
+
for (const frame of parsed.frames)
|
|
598
673
|
enqueueSSE(conn, frame);
|
|
599
674
|
};
|
|
600
675
|
const handleError = (error) => {
|
|
@@ -620,6 +695,7 @@ function connect(conn) {
|
|
|
620
695
|
const status = numberFrom(response?.statusCode);
|
|
621
696
|
if (status !== undefined)
|
|
622
697
|
conn.lastCloseCode = status;
|
|
698
|
+
conn.retryAfterMs = parseRetryAfterMs(response);
|
|
623
699
|
conn.lastCloseReason = `websocket handshake failed${status !== undefined ? ` with status ${status}` : ""}`;
|
|
624
700
|
handleSocketLoss(conn);
|
|
625
701
|
};
|
|
@@ -687,7 +763,10 @@ function handleSocketLoss(conn) {
|
|
|
687
763
|
conn.generation++;
|
|
688
764
|
pending.sent = false;
|
|
689
765
|
pending.writeCommitted = false;
|
|
766
|
+
conn.frameCarryover = "";
|
|
690
767
|
clearPendingTimer(pending);
|
|
768
|
+
const retryAfterMs = conn.retryAfterMs;
|
|
769
|
+
conn.retryAfterMs = undefined;
|
|
691
770
|
const priorWs = conn.ws;
|
|
692
771
|
detach(conn);
|
|
693
772
|
try {
|
|
@@ -704,7 +783,7 @@ function handleSocketLoss(conn) {
|
|
|
704
783
|
if (!connectionPool.includes(conn) || !conn.pending || conn.pending.done || conn.pending.sent || conn.pending.writeCommitted)
|
|
705
784
|
return;
|
|
706
785
|
connect(conn);
|
|
707
|
-
}, retryDelay(conn.reconnectAttempts)));
|
|
786
|
+
}, retryDelay(conn.reconnectAttempts, retryAfterMs)));
|
|
708
787
|
return;
|
|
709
788
|
}
|
|
710
789
|
fail(conn, new WebSocketPreStreamTransportError(formatFailureMessage(conn, "retry limit reached before response.create was sent")), true);
|
|
@@ -722,6 +801,7 @@ function create(wsUrl, headers, context = {}, warm = false) {
|
|
|
722
801
|
contextKey: key,
|
|
723
802
|
busy: false,
|
|
724
803
|
warm,
|
|
804
|
+
staleAuth: false,
|
|
725
805
|
pending: null,
|
|
726
806
|
lastResponseID: lastResponseIDByContext.get(key),
|
|
727
807
|
generation: 0,
|
|
@@ -731,6 +811,7 @@ function create(wsUrl, headers, context = {}, warm = false) {
|
|
|
731
811
|
idleTimer: null,
|
|
732
812
|
connectTimer: null,
|
|
733
813
|
retryTimer: null,
|
|
814
|
+
frameCarryover: "",
|
|
734
815
|
detach: null,
|
|
735
816
|
};
|
|
736
817
|
connectionPool.push(conn);
|
|
@@ -738,6 +819,8 @@ function create(wsUrl, headers, context = {}, warm = false) {
|
|
|
738
819
|
return conn;
|
|
739
820
|
}
|
|
740
821
|
function isReusable(conn, key, context, now) {
|
|
822
|
+
if (conn.staleAuth)
|
|
823
|
+
return false;
|
|
741
824
|
if (conn.busy)
|
|
742
825
|
return false;
|
|
743
826
|
if (conn.scopeKey !== key)
|
|
@@ -757,6 +840,18 @@ function isReusable(conn, key, context, now) {
|
|
|
757
840
|
function activeCount(key) {
|
|
758
841
|
return connectionPool.filter((conn) => conn.scopeKey === key && (conn.busy || conn.ws?.readyState === readyState.CONNECTING)).length;
|
|
759
842
|
}
|
|
843
|
+
export function invalidateStaleAuthConnections(wsUrl, headers) {
|
|
844
|
+
const currentHash = authScopeHash(headers);
|
|
845
|
+
for (const conn of [...connectionPool]) {
|
|
846
|
+
if (conn.wsUrl !== wsUrl || conn.scopeHash === currentHash)
|
|
847
|
+
continue;
|
|
848
|
+
conn.staleAuth = true;
|
|
849
|
+
if (conn.busy)
|
|
850
|
+
continue;
|
|
851
|
+
removeAndDrain(conn);
|
|
852
|
+
closeSocket(conn, 1000, "auth changed");
|
|
853
|
+
}
|
|
854
|
+
}
|
|
760
855
|
function cleanupStaleConnections(key, now) {
|
|
761
856
|
for (const candidate of [...connectionPool]) {
|
|
762
857
|
if (candidate.busy || candidate.scopeKey !== key)
|
|
@@ -773,6 +868,7 @@ function cleanupStaleConnections(key, now) {
|
|
|
773
868
|
}
|
|
774
869
|
}
|
|
775
870
|
function reserveConnection(wsUrl, headers, context) {
|
|
871
|
+
invalidateStaleAuthConnections(wsUrl, headers);
|
|
776
872
|
const key = contextScopeKey(wsUrl, headers, context);
|
|
777
873
|
const now = Date.now();
|
|
778
874
|
cleanupStaleConnections(key, now);
|
|
@@ -850,6 +946,7 @@ export function acquireConnection(wsUrl, headers, context, signal) {
|
|
|
850
946
|
return queueAcquire(wsUrl, headers, context, signal);
|
|
851
947
|
}
|
|
852
948
|
export function ensureWarmConnection(wsUrl, headers) {
|
|
949
|
+
invalidateStaleAuthConnections(wsUrl, headers);
|
|
853
950
|
const key = contextScopeKey(wsUrl, headers, {});
|
|
854
951
|
const now = Date.now();
|
|
855
952
|
cleanupStaleConnections(key, now);
|