diff --git a/typescript/src/model.ts b/typescript/src/model.ts index c4988bc7..6c9d6978 100644 --- a/typescript/src/model.ts +++ b/typescript/src/model.ts @@ -246,7 +246,12 @@ function createFetchLanguageModel(url: string, headers: object, defaultParams: o async function complete(prompt: string | PromptSection[]) { dispatcherPromise ??= resolveProxyDispatcher(proxy); - const dispatcher = await dispatcherPromise; + let dispatcher: RequestInit["dispatcher"]; + try { + dispatcher = await dispatcherPromise; + } catch (e) { + return error(`REST API fetch error: ${getErrorMessage(e)}`); + } let retryCount = 0; const retryMaxAttempts = model.retryMaxAttempts ?? 3; const retryPauseMs = model.retryPauseMs ?? 1000; @@ -339,7 +344,12 @@ function createResponsesFetchLanguageModel(url: string, headers: object, default async function complete(prompt: string | PromptSection[]) { dispatcherPromise ??= resolveProxyDispatcher(proxy); - const dispatcher = await dispatcherPromise; + let dispatcher: RequestInit["dispatcher"]; + try { + dispatcher = await dispatcherPromise; + } catch (e) { + return error(`REST API fetch error: ${getErrorMessage(e)}`); + } let retryCount = 0; const retryMaxAttempts = model.retryMaxAttempts ?? 3; const retryPauseMs = model.retryPauseMs ?? 1000; @@ -560,7 +570,8 @@ async function importUndici() { try { return await import("undici"); } catch (e) { - if (e instanceof Error && /Cannot find module|ERR_MODULE_NOT_FOUND/.test(e.message)) { + if (e instanceof Error && "code" in e && e.code === "ERR_MODULE_NOT_FOUND" && + /Cannot find (?:module|package) ['"]undici['"]/.test(e.message)) { throw new Error( `A proxy was configured, but the optional "undici" package is not installed. ` + `Run "npm install undici" to enable proxy support.` diff --git a/typescript/tests/model.test.mjs b/typescript/tests/model.test.mjs index 81b08f64..6f93ddcc 100644 --- a/typescript/tests/model.test.mjs +++ b/typescript/tests/model.test.mjs @@ -7,10 +7,34 @@ import { test, describe, after } from "node:test"; import assert from "node:assert/strict"; +import { cpSync, mkdtempSync, rmSync } from "node:fs"; +import { createRequire } from "node:module"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; // Load the compiled module from dist import { createOpenAILanguageModel, createAzureOpenAILanguageModel, createLanguageModel } from "../dist/index.js"; +test("missing optional undici returns an actionable result for both API paths", async () => { + const dir = mkdtempSync(join(tmpdir(), "typechat-no-undici-")); + try { + for (const name of ["model", "result"]) { + cpSync(new URL(`../dist/${name}.js`, import.meta.url), join(dir, `${name}.js`)); + } + const { createOpenAILanguageModel: isolatedModel } = createRequire(join(dir, "model.js"))("./model.js"); + for (const endpoint of ["https://api.openai.com/v1/chat/completions", "https://api.openai.com/v1/responses"]) { + const model = isolatedModel("sk-test", "gpt-4", endpoint, "", { proxyUrl: "http://localhost:8080" }); + const result = await model.complete("test"); + assert.deepEqual(result, { + success: false, + message: 'REST API fetch error: A proxy was configured, but the optional "undici" package is not installed. Run "npm install undici" to enable proxy support.' + }); + } + } finally { + rmSync(dir, { recursive: true, force: true }); + } +}); + // --------------------------------------------------------------------------- // Helpers: build mock Response objects // --------------------------------------------------------------------------- @@ -531,4 +555,3 @@ describe("request timeout and response size limits", () => { assert.equal(result.data, "Streamed!"); }); }); -