@n8n/ai-utilities 0.33.0 → 0.33.1

package/dist/esm/utils/http-proxy-agent.d.ts

@@ -1,17 +1,18 @@
+import { type TransportSsrfPolicy } from '@n8n/backend-network/transport';
 import type { AgentOptions } from 'node:https';
-import type { LookupFunction } from 'node:net';
-import { Agent, ProxyAgent } from 'undici';
+import type { Dispatcher } from 'undici';
 export interface AgentTimeoutOptions {
     headersTimeout?: number;
     bodyTimeout?: number;
     connectTimeout?: number;
 }
-export declare function getProxyAgent(targetUrl?: string, timeoutOptions?: AgentTimeoutOptions, lookup?: LookupFunction): Agent | ProxyAgent;
+export type EgressFilter = TransportSsrfPolicy;
+export declare function getProxyAgent(targetUrl: string | undefined, timeoutOptions: AgentTimeoutOptions | undefined, egressFilter: EgressFilter): Dispatcher;
 export interface ProxyFetchOptions {
     input: RequestInfo | URL;
     init?: RequestInit;
     timeoutOptions?: AgentTimeoutOptions;
-    lookup: LookupFunction;
+    egressFilter: EgressFilter;
 }
-export declare function proxyFetch({ input, init, timeoutOptions, lookup, }: ProxyFetchOptions): Promise<Response>;
+export declare function proxyFetch({ input, init, timeoutOptions, egressFilter, }: ProxyFetchOptions): Promise<Response>;
 export declare function getNodeProxyAgent(targetUrl?: string, agentOptions?: AgentOptions): import("https").Agent | undefined;

package/dist/esm/utils/http-proxy-agent.js

@@ -3,46 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProxyAgent = getProxyAgent;
 exports.proxyFetch = proxyFetch;
 exports.getNodeProxyAgent = getNodeProxyAgent;
+const egress_1 = require("@n8n/backend-network/egress");
 const proxy_1 = require("@n8n/backend-network/proxy");
-const node_dns_1 = require("node:dns");
-const undici_1 = require("undici");
+const transport_1 = require("@n8n/backend-network/transport");
 const DEFAULT_TIMEOUT = parseInt(process.env.N8N_AI_TIMEOUT_MAX ?? '3600000', 10);
 const PROXY_FALLBACK_TARGET = 'https://example.nonexistent/';
-let sharedAgent;
-function getProxyAgent(targetUrl, timeoutOptions, lookup = node_dns_1.lookup) {
-    const proxyUrl = (0, proxy_1.resolveProxyUrl)(targetUrl, PROXY_FALLBACK_TARGET);
-    const agentOptions = {
+let sharedDispatcher;
+function toSsrfOption(egressFilter) {
+    if (egressFilter === egress_1.passthroughEgressFilter) {
+        return 'disabled';
+    }
+    return egressFilter;
+}
+function getProxyAgent(targetUrl, timeoutOptions, egressFilter) {
+    const proxyRequired = (0, proxy_1.isProxyRequired)(targetUrl, PROXY_FALLBACK_TARGET);
+    const ssrf = toSsrfOption(egressFilter);
+    const timeouts = {
         headersTimeout: timeoutOptions?.headersTimeout ?? DEFAULT_TIMEOUT,
         bodyTimeout: timeoutOptions?.bodyTimeout ?? DEFAULT_TIMEOUT,
         ...(timeoutOptions?.connectTimeout !== undefined && {
             connectTimeout: timeoutOptions.connectTimeout,
         }),
     };
-    if (proxyUrl) {
-        return new undici_1.ProxyAgent({ uri: proxyUrl, ...agentOptions });
-    }
-    const isDefaultCase = !timeoutOptions && !process.env.N8N_AI_TIMEOUT_MAX && lookup === node_dns_1.lookup;
+    const isDefaultCase = !proxyRequired && !timeoutOptions && !process.env.N8N_AI_TIMEOUT_MAX && ssrf === 'disabled';
     if (isDefaultCase) {
-        sharedAgent ??= new undici_1.Agent({ ...agentOptions, connect: { lookup } });
-        return sharedAgent;
+        sharedDispatcher ??= (0, transport_1.buildDispatcher)(false, 'disabled', { timeouts });
+        return sharedDispatcher;
     }
-    return new undici_1.Agent({ ...agentOptions, connect: { lookup } });
+    return (0, transport_1.buildDispatcher)(proxyRequired ? 'env' : false, ssrf, { timeouts });
 }
-async function proxyFetch({ input, init, timeoutOptions, lookup, }) {
+async function proxyFetch({ input, init, timeoutOptions, egressFilter, }) {
     const isRequest = typeof input !== 'string' && !(input instanceof URL);
     const targetUrl = isRequest ? input.url : input.toString();
-    const dispatcher = getProxyAgent(targetUrl, timeoutOptions, lookup);
-    return (await (0, undici_1.fetch)(targetUrl, {
-        ...(isRequest && {
-            method: input.method,
-            headers: [...input.headers],
-            body: input.body === null ? undefined : await input.arrayBuffer(),
-            signal: input.signal,
-            redirect: input.redirect,
-        }),
+    const dispatcher = getProxyAgent(targetUrl, timeoutOptions, egressFilter);
+    if (!isRequest)
+        return await (0, transport_1.dispatchedFetch)(dispatcher, input, init);
+    return await (0, transport_1.dispatchedFetch)(dispatcher, targetUrl, {
+        method: input.method,
+        headers: [...input.headers],
+        body: input.body === null ? undefined : await input.arrayBuffer(),
+        signal: input.signal,
+        redirect: input.redirect,
         ...init,
-        dispatcher,
-    }));
+    });
 }
 function getNodeProxyAgent(targetUrl, agentOptions) {
     const proxyUrl = (0, proxy_1.resolveProxyUrl)(targetUrl, PROXY_FALLBACK_TARGET);

package/dist/esm/utils/http-proxy-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-proxy-agent.js","sourceRoot":"","sources":["../../../src/utils/http-proxy-agent.ts"],"names":[],"mappings":";;;;;AAkBA,sDAAoF;AACpF,uCAAmD;AAInD,mCAAiE;AAejE,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,SAAS,EAAE,EAAE,CAAC,CAAC;AAMlF,MAAM,qBAAqB,GAAG,8BAA8B,CAAC;AAO7D,IAAI,WAA8B,CAAC;AAkBnC,uBACC,SAAkB,EAClB,cAAoC,EACpC,MAAM,GAAmB,iBAAa;IAEtC,MAAM,QAAQ,GAAG,IAAA,uBAAe,EAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG;QACpB,cAAc,EAAE,cAAc,EAAE,cAAc,IAAI,eAAe;QACjE,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,eAAe;QAC3D,GAAG,CAAC,cAAc,EAAE,cAAc,KAAK,SAAS,IAAI;YACnD,cAAc,EAAE,cAAc,CAAC,cAAc;SAC7C,CAAC;KACF,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,mBAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,aAAa,GAClB,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,MAAM,KAAK,iBAAa,CAAC;IAEhF,IAAI,aAAa,EAAE,CAAC;QACnB,WAAW,KAAK,IAAI,cAAK,CAAC,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,OAAO,IAAI,cAAK,CAAC,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC;AAoBM,KAAK,qBAAqB,EAChC,KAAK,EACL,IAAI,EACJ,cAAc,EACd,MAAM,GACa;IAGnB,MAAM,SAAS,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAOpE,OAAO,CAAC,MAAM,IAAA,cAAW,EAAC,SAAS,EAAE;QACpC,GAAG,CAAC,SAAS,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE;YACjE,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACxB,CAAC;QACF,GAAI,IAA0C;QAC9C,UAAU;KACV,CAAC,CAAwB,CAAC;AAC5B,CAAC;AAUD,2BAAkC,SAAkB,EAAE,YAA2B;IAChF,MAAM,QAAQ,GAAG,IAAA,uBAAe,EAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAEnE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,OAAO,IAAA,6BAAqB,EAAC,SAAS,IAAI,qBAAqB,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC1F,CAAC"}
+{"version":3,"file":"http-proxy-agent.js","sourceRoot":"","sources":["../../../src/utils/http-proxy-agent.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/ai-utilities",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "description": "Utilities for building AI nodes in n8n",
   "types": "dist/esm/index.d.ts",
   "module": "dist/esm/index.js",
@@ -135,11 +135,11 @@
     "@langchain/openai": "1.4.4",
     "langchain": "1.2.30",
     "lodash": "4.18.1",
-    "@n8n/api-types": "1.40.0",
-    "@n8n/backend-network": "1.14.0",
+    "@n8n/api-types": "1.40.1",
+    "@n8n/backend-network": "1.14.1",
     "@n8n/typescript-config": "1.12.0",
     "@n8n/utils": "1.48.0",
-    "n8n-workflow": "2.40.0",
+    "n8n-workflow": "2.40.1",
     "tmp-promise": "3.0.3",
     "js-tiktoken": "1.0.21",
     "@thednp/dommatrix": "^3.1.1",