190proof 1.0.98 → 1.0.99

package/dist/index.mjs

@@ -354,7 +354,7 @@ async function prepareOpenAIPayload(identifier, payload) {
   }
   return preparedPayload;
 }
-async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs) {
+async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs, requestTimeoutMs = 12e4) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const functionNames = openAiPayload.tools ? new Set(openAiPayload.tools.map((fn) => fn.function.name)) : null;
   const { endpoint, headers } = buildOpenAIRequestConfig(
@@ -363,6 +363,13 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
     openAiConfig
   );
   const controller = new AbortController();
+  const overallTimeout = setTimeout(() => {
+    logger_default.error(id, `Request timeout after ${requestTimeoutMs}ms`);
+    controller.abort();
+  }, requestTimeoutMs);
+  if (typeof overallTimeout === "object" && "unref" in overallTimeout) {
+    overallTimeout.unref();
+  }
   const response = await fetch(endpoint, {
     method: "POST",
     headers,
@@ -404,6 +411,7 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
       if (!jsonString)
         continue;
       if (jsonString.includes("[DONE]")) {
+        clearTimeout(overallTimeout);
         return parseStreamedResponse(
           id,
           paragraph,
@@ -456,24 +464,32 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
     }
   }
 }
-async function callOpenAI(id, openAiPayload, openAiConfig) {
+async function callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs = 12e4) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { endpoint, headers } = buildOpenAIRequestConfig(
     id,
     openAiPayload.model,
     openAiConfig
   );
-  const response = await fetch(endpoint, {
-    method: "POST",
-    headers,
-    body: JSON.stringify({ ...openAiPayload, stream: false })
-  });
-  if (!response.ok) {
-    const errorData = await response.json();
-    logger_default.error(id, "OpenAI API error:", errorData);
-    throw new Error(`OpenAI API Error: ${errorData.error.message}`);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), requestTimeoutMs);
+  let data;
+  try {
+    const response = await fetch(endpoint, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({ ...openAiPayload, stream: false }),
+      signal: controller.signal
+    });
+    if (!response.ok) {
+      const errorData = await response.json();
+      logger_default.error(id, "OpenAI API error:", errorData);
+      throw new Error(`OpenAI API Error: ${errorData.error.message}`);
+    }
+    data = await response.json();
+  } finally {
+    clearTimeout(timer);
   }
-  const data = await response.json();
   if (!((_a = data.choices) == null ? void 0 : _a.length)) {
     if (data.error) {
       logger_default.error(id, "OpenAI error:", data.error);
@@ -526,7 +542,7 @@ async function callOpenAI(id, openAiPayload, openAiConfig) {
     } : null
   };
 }
-async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries = 5, chunkTimeoutMs = 15e3) {
+async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries = 5, chunkTimeoutMs = 15e3, requestTimeoutMs = 12e4) {
   logger_default.log(
     id,
     "Calling OpenAI API with retries:",
@@ -544,10 +560,11 @@ async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries =
           id,
           openAiPayload,
           openAiConfig,
-          chunkTimeoutMs
+          chunkTimeoutMs,
+          requestTimeoutMs
         );
       } else {
-        return callOpenAI(id, openAiPayload, openAiConfig);
+        return callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs);
       }
     },
     {
@@ -683,7 +700,7 @@ async function prepareAnthropicPayload(_identifier, payload) {
   }
   return preparedPayload;
 }
-async function callAnthropic(id, payload, config) {
+async function callAnthropic(id, payload, config, requestTimeoutMs = 12e4) {
   var _a, _b, _c;
   const anthropicMessages = jigAnthropicMessages(payload.messages);
   const tools = (_a = payload.functions) == null ? void 0 : _a.map((f) => ({
@@ -733,7 +750,7 @@ async function callAnthropic(id, payload, config) {
           "anthropic-version": "2023-06-01",
           "anthropic-beta": "tools-2024-04-04"
         },
-        timeout: 6e4
+        timeout: requestTimeoutMs
       }
     );
     data = response.data;
@@ -803,11 +820,11 @@ ${text}` : text;
     usage
   };
 }
-async function callAnthropicWithRetries(id, payload, config, retries = 5) {
+async function callAnthropicWithRetries(id, payload, config, retries = 5, requestTimeoutMs = 12e4) {
   return withRetries(
     id,
     "Anthropic",
-    () => callAnthropic(id, payload, config),
+    () => callAnthropic(id, payload, config, requestTimeoutMs),
     {
       retries
     }
@@ -843,7 +860,6 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   const preparedPayload = {
     model: payload.model,
     messages: [],
-    requestTimeoutMs: payload.requestTimeoutMs,
     tools: payload.functions ? {
       functionDeclarations: payload.functions.map((fn) => ({
         name: fn.name,
@@ -928,8 +944,8 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   }
   return preparedPayload;
 }
-async function callGoogleAI(id, payload) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+async function callGoogleAI(id, payload, requestTimeoutMs = 12e4) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
   const contents = jigGoogleMessages(payload.messages);
   const requestBody = {
     contents,
@@ -952,50 +968,47 @@ async function callGoogleAI(id, payload) {
           "content-type": "application/json",
           "x-goog-api-key": process.env.GEMINI_API_KEY
         },
-        // Per-attempt timeout. Defaults to 60s; callers pass a larger value via
-        // payload.requestTimeoutMs for slow, large generations (e.g. single-file
-        // app codegen) so a long-but-valid response isn't cut short.
-        timeout: (_a = payload.requestTimeoutMs) != null ? _a : 6e4
+        timeout: requestTimeoutMs
       }
     );
     response = httpResponse.data;
   } catch (err) {
-    const apiError = (_c = (_b = err == null ? void 0 : err.response) == null ? void 0 : _b.data) == null ? void 0 : _c.error;
+    const apiError = (_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.error;
     const wrapped = new Error(
       (apiError == null ? void 0 : apiError.message) || (err == null ? void 0 : err.message) || "Google AI API request failed"
     );
-    wrapped.status = (_e = apiError == null ? void 0 : apiError.status) != null ? _e : (_d = err == null ? void 0 : err.response) == null ? void 0 : _d.status;
+    wrapped.status = (_d = apiError == null ? void 0 : apiError.status) != null ? _d : (_c = err == null ? void 0 : err.response) == null ? void 0 : _c.status;
     wrapped.code = apiError == null ? void 0 : apiError.code;
     wrapped.details = apiError == null ? void 0 : apiError.details;
-    wrapped.promptFeedback = (_g = (_f = err == null ? void 0 : err.response) == null ? void 0 : _f.data) == null ? void 0 : _g.promptFeedback;
+    wrapped.promptFeedback = (_f = (_e = err == null ? void 0 : err.response) == null ? void 0 : _e.data) == null ? void 0 : _f.promptFeedback;
     throw wrapped;
   }
   let text = "";
   const files = [];
   const reasoningParts = [];
   const functionCalls = [];
-  for (const part of ((_j = (_i = (_h = response.candidates) == null ? void 0 : _h[0]) == null ? void 0 : _i.content) == null ? void 0 : _j.parts) || []) {
+  for (const part of ((_i = (_h = (_g = response.candidates) == null ? void 0 : _g[0]) == null ? void 0 : _h.content) == null ? void 0 : _i.parts) || []) {
     if (part.thought) {
       reasoningParts.push(part);
       continue;
     }
     if (part.functionCall) {
       functionCalls.push({
-        id: (_k = part.functionCall.id) != null ? _k : `call_${functionCalls.length}`,
-        name: (_l = part.functionCall.name) != null ? _l : "",
-        arguments: (_m = part.functionCall.args) != null ? _m : {},
+        id: (_j = part.functionCall.id) != null ? _j : `call_${functionCalls.length}`,
+        name: (_k = part.functionCall.name) != null ? _k : "",
+        arguments: (_l = part.functionCall.args) != null ? _l : {},
         thoughtSignature: part.thoughtSignature
       });
       continue;
     }
     if (part.text)
       text += part.text;
-    if ((_n = part.inlineData) == null ? void 0 : _n.data) {
+    if ((_m = part.inlineData) == null ? void 0 : _m.data) {
       files.push({ mimeType: "image/png", data: part.inlineData.data });
     }
   }
   if (!text && !functionCalls.length && !files.length) {
-    const candidate = (_o = response.candidates) == null ? void 0 : _o[0];
+    const candidate = (_n = response.candidates) == null ? void 0 : _n[0];
     const finishReason = candidate == null ? void 0 : candidate.finishReason;
     logger_default.error(id, "Missing text & functions in Google AI API response:", {
       finishReason,
@@ -1030,10 +1043,10 @@ async function callGoogleAI(id, payload) {
     function_calls: functionCalls,
     reasoningDetails: reasoningParts.length ? reasoningParts : void 0,
     usage: response.usageMetadata ? {
-      prompt_tokens: (_p = response.usageMetadata.promptTokenCount) != null ? _p : 0,
-      completion_tokens: (_q = response.usageMetadata.candidatesTokenCount) != null ? _q : 0,
-      total_tokens: (_r = response.usageMetadata.totalTokenCount) != null ? _r : 0,
-      cached_tokens: (_s = response.usageMetadata.cachedContentTokenCount) != null ? _s : 0
+      prompt_tokens: (_o = response.usageMetadata.promptTokenCount) != null ? _o : 0,
+      completion_tokens: (_p = response.usageMetadata.candidatesTokenCount) != null ? _p : 0,
+      total_tokens: (_q = response.usageMetadata.totalTokenCount) != null ? _q : 0,
+      cached_tokens: (_r = response.usageMetadata.cachedContentTokenCount) != null ? _r : 0
     } : null
   };
 }
@@ -1054,9 +1067,9 @@ function removeImagesFromGooglePayload(payload) {
   }
   return removedImages;
 }
-async function callGoogleAIWithRetries(id, payload, retries = 5) {
+async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
   let hasTriedWithoutImages = false;
-  return withRetries(id, "Google AI", () => callGoogleAI(id, payload), {
+  return withRetries(id, "Google AI", () => callGoogleAI(id, payload, requestTimeoutMs), {
     retries,
     onError: (error2, attempt) => {
       var _a, _b;
@@ -1183,7 +1196,7 @@ function prepareGroqPayload(payload) {
     temperature: payload.temperature
   };
 }
-async function callGroq(id, payload) {
+async function callGroq(id, payload, requestTimeoutMs = 12e4) {
   var _a, _b, _c, _d, _e, _f, _g;
   const response = await axios.post(
     "https://api.groq.com/openai/v1/chat/completions",
@@ -1192,7 +1205,8 @@ async function callGroq(id, payload) {
       headers: {
         "content-type": "application/json",
         Authorization: `Bearer ${process.env.GROQ_API_KEY}`
-      }
+      },
+      timeout: requestTimeoutMs
     }
   );
   if (response.data.error) {
@@ -1240,8 +1254,10 @@ async function callGroq(id, payload) {
     } : null
   };
 }
-async function callGroqWithRetries(id, payload, retries = 5) {
-  return withRetries(id, "Groq", () => callGroq(id, payload), { retries });
+async function callGroqWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
+  return withRetries(id, "Groq", () => callGroq(id, payload, requestTimeoutMs), {
+    retries
+  });
 }
 function prepareOpenRouterPayload(payload) {
   var _a;
@@ -1257,7 +1273,7 @@ function prepareOpenRouterPayload(payload) {
     provider: payload.provider
   };
 }
-async function callOpenRouter(id, payload) {
+async function callOpenRouter(id, payload, requestTimeoutMs = 12e4) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const response = await axios.post(
     "https://openrouter.ai/api/v1/chat/completions",
@@ -1266,7 +1282,8 @@ async function callOpenRouter(id, payload) {
       headers: {
         "content-type": "application/json",
         Authorization: `Bearer ${process.env.OPENROUTER_API_KEY}`
-      }
+      },
+      timeout: requestTimeoutMs
     }
   );
   if (response.data.error) {
@@ -1315,8 +1332,13 @@ async function callOpenRouter(id, payload) {
     } : null
   };
 }
-async function callOpenRouterWithRetries(id, payload, retries = 5) {
-  return withRetries(id, "OpenRouter", () => callOpenRouter(id, payload), { retries });
+async function callOpenRouterWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
+  return withRetries(
+    id,
+    "OpenRouter",
+    () => callOpenRouter(id, payload, requestTimeoutMs),
+    { retries }
+  );
 }
 var VALID_PROVIDERS = ["openai", "anthropic", "google", "groq", "openrouter"];
 var ENUM_PROVIDER_MAP = [
@@ -1356,16 +1378,19 @@ function parseModelString(model) {
   );
 }
 async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeoutMs = 15e3) {
+  var _a;
   try {
     const { provider, modelId } = parseModelString(aiPayload.model);
     const routingPayload = { ...aiPayload, model: modelId };
+    const requestTimeoutMs = (_a = aiPayload.requestTimeoutMs) != null ? _a : 12e4;
     switch (provider) {
       case "anthropic":
         return await callAnthropicWithRetries(
           id,
           await prepareAnthropicPayload(id, routingPayload),
           aiConfig,
-          retries
+          retries,
+          requestTimeoutMs
         );
       case "openai":
         return await callOpenAiWithRetries(
@@ -1373,25 +1398,29 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
           await prepareOpenAIPayload(id, routingPayload),
           aiConfig,
           retries,
-          chunkTimeoutMs
+          chunkTimeoutMs,
+          requestTimeoutMs
         );
       case "groq":
         return await callGroqWithRetries(
           id,
           prepareGroqPayload(routingPayload),
-          retries
+          retries,
+          requestTimeoutMs
         );
       case "google":
         return await callGoogleAIWithRetries(
           id,
           await prepareGoogleAIPayload(id, routingPayload),
-          retries
+          retries,
+          requestTimeoutMs
         );
       case "openrouter":
         return await callOpenRouterWithRetries(
           id,
           prepareOpenRouterPayload(routingPayload),
-          retries
+          retries,
+          requestTimeoutMs
         );
     }
   } catch (error2) {