Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

fix(sdk): read millisecond retry delays in rate limit reconnects (#2441)

Lanre Shittu90f3eff22df3
diff --git a/sdk/typescript/src/api.ts b/sdk/typescript/src/api.ts
index 3caf02628..aa8bcf0dc 100644
--- a/sdk/typescript/src/api.ts
+++ b/sdk/typescript/src/api.ts
@@ -6785,10 +6785,11 @@ function reconnectDetails(message: string): ScanReconnectDetails | undefined {
return undefined;
}
const delay =
- /\b(?:try again|retry)\s+in\s+(\d{1,6}(?:\.\d{1,3})?)\s*(?:s\b|seconds?\b)/iu.exec(
+ /\b(?:try again|retry)\s+in\s+(\d{1,7}(?:\.\d{1,3})?)\s*(?:(ms)\b|s\b|seconds?\b)/iu.exec(
message,
);
- const retryAfterSeconds = delay === null ? NaN : Number(delay[1]);
+ const retryAfterSeconds =
+ delay === null ? NaN : Number(delay[1]) / (delay[2] ? 1000 : 1);
return {
reason: "rate_limit",
...(Number.isFinite(retryAfterSeconds) &&
diff --git a/sdk/typescript/tests-ts/api-events.test.ts b/sdk/typescript/tests-ts/api-events.test.ts
index 7a79ad7b9..d286b7fb4 100644
--- a/sdk/typescript/tests-ts/api-events.test.ts
+++ b/sdk/typescript/tests-ts/api-events.test.ts
@@ -719,6 +719,9 @@ describe("one-shot scan events", () => {
"Reconnecting... 3/5 (Rate limit reached. Please try again in 999999s.)",
"Reconnecting... 4/5",
"Reconnecting... 5/5 (429 rate limit reached org-private)",
+ "Reconnecting... 6/8 (Rate limit reached for org-private. Please try again in 28ms.)",
+ "Reconnecting... 7/8 (Rate limit reached. Please try again in 3600000ms.)",
+ "Reconnecting... 8/8 (Rate limit reached. Please try again in 3600001ms.)",
])
yield { type: "error", message };
yield* completedEvents();
@@ -730,6 +733,9 @@ describe("one-shot scan events", () => {
[3, 5, { reason: "rate_limit" }],
[4, 5, undefined],
[5, 5, { reason: "rate_limit" }],
+ [6, 8, { reason: "rate_limit", retryAfterSeconds: 0.028 }],
+ [7, 8, { reason: "rate_limit", retryAfterSeconds: 3600 }],
+ [8, 8, { reason: "rate_limit" }],
]);
});