refactor: consolidate timeout logic

elianiva · elianiva · commit b04d36347700 · 2025-09-05T22:20:51.000+07:00
diff --git a/src/api/providers/anthropic.ts b/src/api/providers/anthropic.ts
@@ -31,16 +31,7 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa
 		const apiKeyFieldName =
 			this.options.anthropicBaseUrl && this.options.anthropicUseAuthToken ? "authToken" : "apiKey"
 
-		let timeout = getApiRequestTimeout()
-
-		// match behaviour with other SDK where 0 means no timeout instead of instantly timing out
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new Anthropic({
 			baseURL: this.options.anthropicBaseUrl || undefined,
diff --git a/src/api/providers/base-openai-compatible-provider.ts b/src/api/providers/base-openai-compatible-provider.ts
@@ -57,15 +57,7 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
 			throw new Error("API key is required")
 		}
 
-		let timeout = getApiRequestTimeout()
-		// match behaviour with other SDK where 0 means no timeout instead of instantly timing out
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL,
diff --git a/src/api/providers/huggingface.ts b/src/api/providers/huggingface.ts
@@ -25,14 +25,7 @@ export class HuggingFaceHandler extends BaseProvider implements SingleCompletion
 			throw new Error("Hugging Face API key is required")
 		}
 
-		let timeout = getApiRequestTimeout()
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL: "https://router.huggingface.co/v1",
diff --git a/src/api/providers/lm-studio.ts b/src/api/providers/lm-studio.ts
@@ -29,16 +29,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 		// LM Studio uses "noop" as a placeholder API key
 		const apiKey = "noop"
 
-		let timeout = getApiRequestTimeout()
-
-		// match behaviour with other SDK where 0 means no timeout instead of instantly timing out
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/v1",
diff --git a/src/api/providers/ollama.ts b/src/api/providers/ollama.ts
@@ -36,16 +36,7 @@ export class OllamaHandler extends BaseProvider implements SingleCompletionHandl
 			headers["Authorization"] = `Bearer ${this.options.ollamaApiKey}`
 		}
 
-		let timeout = getApiRequestTimeout()
-
-		// match behaviour with other SDK where 0 means no timeout instead of instantly timing out
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL: (this.options.ollamaBaseUrl || "http://localhost:11434") + "/v1",
diff --git a/src/api/providers/openai-native.ts b/src/api/providers/openai-native.ts
@@ -64,14 +64,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 		}
 		const apiKey = this.options.openAiNativeApiKey ?? "not-provided"
 		{
-			let timeout = getApiRequestTimeout()
-			if (timeout === 0) {
-				// Use 2147483647 (2^31) as the maximum timeout value for setTimeout
-				// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-				// Values larger than this may be clamped to 1ms or cause unexpected behavior
-				// 2147483647 is safe as it's just above the limit but won't cause issues
-				timeout = 2147483647
-			}
+			const timeout = getApiRequestTimeout()
 			this.client = new OpenAI({ baseURL: this.options.openAiNativeBaseUrl, apiKey, timeout })
 		}
 	}
diff --git a/src/api/providers/openai.ts b/src/api/providers/openai.ts
@@ -49,16 +49,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 			...(this.options.openAiHeaders || {}),
 		}
 
-		let timeout = getApiRequestTimeout()
-
-		// match behaviour with other SDK where 0 means no timeout instead of instantly timing out
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		if (isAzureAiInference) {
 			// Azure AI Inference Service (e.g., for DeepSeek) uses a different path structure
diff --git a/src/api/providers/openrouter.ts b/src/api/providers/openrouter.ts
@@ -96,14 +96,7 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 		const baseURL = this.options.openRouterBaseUrl || "https://openrouter.ai/api/v1"
 		const apiKey = this.options.openRouterApiKey ?? "not-provided"
 
-		let timeout = getApiRequestTimeout()
-		if (timeout === 0) {
-			// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is the safe maximum value that won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 		this.client = new OpenAI({ baseURL, apiKey, defaultHeaders: DEFAULT_HEADERS, timeout })
 	}
 
diff --git a/src/api/providers/qwen-code.ts b/src/api/providers/qwen-code.ts
@@ -65,14 +65,7 @@ export class QwenCodeHandler extends BaseProvider implements SingleCompletionHan
 		if (!this.client) {
 			// Create the client instance with dummy key initially
 			// The API key will be updated dynamically via ensureAuthenticated
-			let timeout = getApiRequestTimeout()
-			if (timeout === 0) {
-				// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
-				// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-				// Values larger than this may be clamped to 1ms or cause unexpected behavior
-				// 2147483647 is the safe maximum value that won't cause issues
-				timeout = 2147483647
-			}
+			const timeout = getApiRequestTimeout()
 			this.client = new OpenAI({
 				apiKey: "dummy-key-will-be-replaced",
 				baseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
diff --git a/src/api/providers/requesty.ts b/src/api/providers/requesty.ts
@@ -54,14 +54,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan
 
 		const apiKey = this.options.requestyApiKey ?? "not-provided"
 
-		let timeout = getApiRequestTimeout()
-		if (timeout === 0) {
-			// Use 2147483647 (2^31) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is safe as it's just above the limit but won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL: this.baseURL,
diff --git a/src/api/providers/router-provider.ts b/src/api/providers/router-provider.ts
@@ -46,14 +46,7 @@ export abstract class RouterProvider extends BaseProvider {
 		this.defaultModelId = defaultModelId
 		this.defaultModelInfo = defaultModelInfo
 
-		let timeout = getApiRequestTimeout()
-		if (timeout === 0) {
-			// Use 2147483647 (2^31) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is safe as it's just above the limit but won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL,
diff --git a/src/api/providers/utils/__tests__/timeout-config.spec.ts b/src/api/providers/utils/__tests__/timeout-config.spec.ts
@@ -41,20 +41,20 @@ describe("getApiRequestTimeout", () => {
 		expect(timeout).toBe(1200000) // 1200 seconds in milliseconds
 	})
 
-	it("should handle zero timeout (no timeout)", () => {
+	it("should handle zero timeout (no timeout) by returning safe maximum", () => {
 		mockGetConfig.mockReturnValue(0)
 
 		const timeout = getApiRequestTimeout()
 
-		expect(timeout).toBe(0) // No timeout
+		expect(timeout).toBe(2147483647) // Safe maximum for setTimeout
 	})
 
-	it("should handle negative values by clamping to 0", () => {
+	it("should handle negative values by clamping to safe maximum", () => {
 		mockGetConfig.mockReturnValue(-100)
 
 		const timeout = getApiRequestTimeout()
 
-		expect(timeout).toBe(0) // Negative values should be clamped to 0
+		expect(timeout).toBe(2147483647) // Negative values should be clamped to 0, then converted to safe maximum
 	})
 
 	it("should handle null by using default", () => {
diff --git a/src/api/providers/utils/timeout-config.ts b/src/api/providers/utils/timeout-config.ts
@@ -3,7 +3,7 @@ import * as vscode from "vscode"
 /**
  * Gets the API request timeout from VSCode configuration with validation.
  *
- * @returns The timeout in milliseconds. Returns 0 for no timeout.
+ * @returns The timeout in milliseconds. Returns 2147483647 for no timeout (when config is 0).
  */
 export function getApiRequestTimeout(): number {
 	// Get timeout with validation to ensure it's a valid non-negative number
@@ -17,5 +17,17 @@ export function getApiRequestTimeout(): number {
 	// Allow 0 (no timeout) but clamp negative values to 0
 	const timeoutSeconds = configTimeout < 0 ? 0 : configTimeout
 
-	return timeoutSeconds * 1000 // Convert to milliseconds
+	// Convert to milliseconds
+	const timeoutMs = timeoutSeconds * 1000
+
+	// Handle the special case where 0 means "no timeout"
+	// Use 2147483647 (2^31 - 1) as the maximum timeout value for setTimeout
+	// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
+	// Values larger than this may be clamped to 1ms or cause unexpected behavior
+	// 2147483647 is the safe maximum value that won't cause issues
+	if (timeoutMs === 0) {
+		return 2147483647
+	}
+
+	return timeoutMs
 }
diff --git a/src/api/providers/xai.ts b/src/api/providers/xai.ts
@@ -28,14 +28,7 @@ export class XAIHandler extends BaseProvider implements SingleCompletionHandler
 
 		const apiKey = this.options.xaiApiKey ?? "not-provided"
 
-		let timeout = getApiRequestTimeout()
-		if (timeout === 0) {
-			// Use 2147483647 (2^31) as the maximum timeout value for setTimeout
-			// JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)
-			// Values larger than this may be clamped to 1ms or cause unexpected behavior
-			// 2147483647 is safe as it's just above the limit but won't cause issues
-			timeout = 2147483647
-		}
+		const timeout = getApiRequestTimeout()
 
 		this.client = new OpenAI({
 			baseURL: "https://api.x.ai/v1",

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio`
`64`	`64`	`}`
`65`	`65`	`const apiKey = this.options.openAiNativeApiKey ?? "not-provided"`
`66`	`66`	`{`
`67`		`- let timeout = getApiRequestTimeout()`
`68`		`- if (timeout === 0) {`
`69`		`- // Use 2147483647 (2^31) as the maximum timeout value for setTimeout`
`70`		`- // JavaScript's setTimeout has a maximum delay limit of 2147483647ms (32-bit signed integer max)`
`71`		`- // Values larger than this may be clamped to 1ms or cause unexpected behavior`
`72`		`- // 2147483647 is safe as it's just above the limit but won't cause issues`
`73`		`- timeout = 2147483647`
`74`		`- }`
	`67`	`+ const timeout = getApiRequestTimeout()`
`75`	`68`	`this.client = new OpenAI({ baseURL: this.options.openAiNativeBaseUrl, apiKey, timeout })`
`76`	`69`	`}`
`77`	`70`	`}`