@n8n/ai-utilities 0.32.3 → 0.32.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,17 +1,18 @@
1
+ import { type TransportSsrfPolicy } from '@n8n/backend-network/transport';
1
2
  import type { AgentOptions } from 'node:https';
2
- import type { LookupFunction } from 'node:net';
3
- import { Agent, ProxyAgent } from 'undici';
3
+ import type { Dispatcher } from 'undici';
4
4
  export interface AgentTimeoutOptions {
5
5
  headersTimeout?: number;
6
6
  bodyTimeout?: number;
7
7
  connectTimeout?: number;
8
8
  }
9
- export declare function getProxyAgent(targetUrl?: string, timeoutOptions?: AgentTimeoutOptions, lookup?: LookupFunction): Agent | ProxyAgent;
9
+ export type EgressFilter = TransportSsrfPolicy;
10
+ export declare function getProxyAgent(targetUrl: string | undefined, timeoutOptions: AgentTimeoutOptions | undefined, egressFilter: EgressFilter): Dispatcher;
10
11
  export interface ProxyFetchOptions {
11
12
  input: RequestInfo | URL;
12
13
  init?: RequestInit;
13
14
  timeoutOptions?: AgentTimeoutOptions;
14
- lookup: LookupFunction;
15
+ egressFilter: EgressFilter;
15
16
  }
16
- export declare function proxyFetch({ input, init, timeoutOptions, lookup, }: ProxyFetchOptions): Promise<Response>;
17
+ export declare function proxyFetch({ input, init, timeoutOptions, egressFilter, }: ProxyFetchOptions): Promise<Response>;
17
18
  export declare function getNodeProxyAgent(targetUrl?: string, agentOptions?: AgentOptions): import("https").Agent | undefined;
@@ -3,46 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getProxyAgent = getProxyAgent;
4
4
  exports.proxyFetch = proxyFetch;
5
5
  exports.getNodeProxyAgent = getNodeProxyAgent;
6
+ const egress_1 = require("@n8n/backend-network/egress");
6
7
  const proxy_1 = require("@n8n/backend-network/proxy");
7
- const node_dns_1 = require("node:dns");
8
- const undici_1 = require("undici");
8
+ const transport_1 = require("@n8n/backend-network/transport");
9
9
  const DEFAULT_TIMEOUT = parseInt(process.env.N8N_AI_TIMEOUT_MAX ?? '3600000', 10);
10
10
  const PROXY_FALLBACK_TARGET = 'https://example.nonexistent/';
11
- let sharedAgent;
12
- function getProxyAgent(targetUrl, timeoutOptions, lookup = node_dns_1.lookup) {
13
- const proxyUrl = (0, proxy_1.resolveProxyUrl)(targetUrl, PROXY_FALLBACK_TARGET);
14
- const agentOptions = {
11
+ let sharedDispatcher;
12
+ function toSsrfOption(egressFilter) {
13
+ if (egressFilter === egress_1.passthroughEgressFilter) {
14
+ return 'disabled';
15
+ }
16
+ return egressFilter;
17
+ }
18
+ function getProxyAgent(targetUrl, timeoutOptions, egressFilter) {
19
+ const proxyRequired = (0, proxy_1.isProxyRequired)(targetUrl, PROXY_FALLBACK_TARGET);
20
+ const ssrf = toSsrfOption(egressFilter);
21
+ const timeouts = {
15
22
  headersTimeout: timeoutOptions?.headersTimeout ?? DEFAULT_TIMEOUT,
16
23
  bodyTimeout: timeoutOptions?.bodyTimeout ?? DEFAULT_TIMEOUT,
17
24
  ...(timeoutOptions?.connectTimeout !== undefined && {
18
25
  connectTimeout: timeoutOptions.connectTimeout,
19
26
  }),
20
27
  };
21
- if (proxyUrl) {
22
- return new undici_1.ProxyAgent({ uri: proxyUrl, ...agentOptions });
23
- }
24
- const isDefaultCase = !timeoutOptions && !process.env.N8N_AI_TIMEOUT_MAX && lookup === node_dns_1.lookup;
28
+ const isDefaultCase = !proxyRequired && !timeoutOptions && !process.env.N8N_AI_TIMEOUT_MAX && ssrf === 'disabled';
25
29
  if (isDefaultCase) {
26
- sharedAgent ??= new undici_1.Agent({ ...agentOptions, connect: { lookup } });
27
- return sharedAgent;
30
+ sharedDispatcher ??= (0, transport_1.buildDispatcher)(false, 'disabled', { timeouts });
31
+ return sharedDispatcher;
28
32
  }
29
- return new undici_1.Agent({ ...agentOptions, connect: { lookup } });
33
+ return (0, transport_1.buildDispatcher)(proxyRequired ? 'env' : false, ssrf, { timeouts });
30
34
  }
31
- async function proxyFetch({ input, init, timeoutOptions, lookup, }) {
35
+ async function proxyFetch({ input, init, timeoutOptions, egressFilter, }) {
32
36
  const isRequest = typeof input !== 'string' && !(input instanceof URL);
33
37
  const targetUrl = isRequest ? input.url : input.toString();
34
- const dispatcher = getProxyAgent(targetUrl, timeoutOptions, lookup);
35
- return (await (0, undici_1.fetch)(targetUrl, {
36
- ...(isRequest && {
37
- method: input.method,
38
- headers: [...input.headers],
39
- body: input.body === null ? undefined : await input.arrayBuffer(),
40
- signal: input.signal,
41
- redirect: input.redirect,
42
- }),
38
+ const dispatcher = getProxyAgent(targetUrl, timeoutOptions, egressFilter);
39
+ if (!isRequest)
40
+ return await (0, transport_1.dispatchedFetch)(dispatcher, input, init);
41
+ return await (0, transport_1.dispatchedFetch)(dispatcher, targetUrl, {
42
+ method: input.method,
43
+ headers: [...input.headers],
44
+ body: input.body === null ? undefined : await input.arrayBuffer(),
45
+ signal: input.signal,
46
+ redirect: input.redirect,
43
47
  ...init,
44
- dispatcher,
45
- }));
48
+ });
46
49
  }
47
50
  function getNodeProxyAgent(targetUrl, agentOptions) {
48
51
  const proxyUrl = (0, proxy_1.resolveProxyUrl)(targetUrl, PROXY_FALLBACK_TARGET);
@@ -1 +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"}
1
+ {"version":3,"file":"http-proxy-agent.js","sourceRoot":"","sources":["../../../src/utils/http-proxy-agent.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@n8n/ai-utilities",
3
- "version": "0.32.3",
3
+ "version": "0.32.4",
4
4
  "description": "Utilities for building AI nodes in n8n",
5
5
  "types": "dist/esm/index.d.ts",
6
6
  "module": "dist/esm/index.js",
@@ -99,8 +99,8 @@
99
99
  },
100
100
  "files": [
101
101
  "dist",
102
- "LICENSE.md",
103
- "LICENSE_EE.md"
102
+ "LICENSE_EE.md",
103
+ "LICENSE.md"
104
104
  ],
105
105
  "devDependencies": {
106
106
  "@types/json-schema": "^7.0.15",
@@ -128,12 +128,12 @@
128
128
  "@langchain/openai": "1.4.4",
129
129
  "langchain": "1.2.30",
130
130
  "lodash": "4.18.1",
131
- "@n8n/api-types": "1.39.3",
132
- "@n8n/backend-network": "1.13.3",
133
- "@n8n/config": "2.37.0",
131
+ "@n8n/api-types": "1.39.4",
132
+ "@n8n/backend-network": "1.13.4",
133
+ "@n8n/config": "2.37.1",
134
134
  "@n8n/typescript-config": "1.11.0",
135
135
  "@n8n/utils": "1.47.0",
136
- "n8n-workflow": "2.39.1",
136
+ "n8n-workflow": "2.39.2",
137
137
  "tmp-promise": "3.0.3",
138
138
  "js-tiktoken": "1.0.21",
139
139
  "@thednp/dommatrix": "^3.1.1",