rezo 1.0.36 → 1.0.38

package/dist/adapters/fetch.cjs

@@ -197,7 +197,15 @@ function buildUrlTree(config, finalUrl) {
     const urlStr = typeof config.url === "string" ? config.url : config.url.toString();
     urls.push(urlStr);
   }
-  if (finalUrl && (urls.length === 0 || urls[0] !== finalUrl)) {
+  if (config.redirectHistory && config.redirectHistory.length > 0) {
+    for (const redirect of config.redirectHistory) {
+      const redirectUrl = typeof redirect.url === "string" ? redirect.url : redirect.url?.toString?.() || "";
+      if (redirectUrl && urls[urls.length - 1] !== redirectUrl) {
+        urls.push(redirectUrl);
+      }
+    }
+  }
+  if (finalUrl && (urls.length === 0 || urls[urls.length - 1] !== finalUrl)) {
     urls.push(finalUrl);
   }
   return urls.length > 0 ? urls : [finalUrl];
@@ -264,7 +272,7 @@ async function parseCookiesFromHeaders(headers, url, config) {
   const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
   const jar = new RezoCookieJar;
   jar.setCookiesSync(acceptedCookieStrings, url);
-  if (config?.enableCookieJar && config?.cookieJar) {
+  if (!config?.disableCookieJar && config?.cookieJar) {
     config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
   }
   const cookies = jar.cookies();

package/dist/adapters/fetch.js

@@ -197,7 +197,15 @@ function buildUrlTree(config, finalUrl) {
     const urlStr = typeof config.url === "string" ? config.url : config.url.toString();
     urls.push(urlStr);
   }
-  if (finalUrl && (urls.length === 0 || urls[0] !== finalUrl)) {
+  if (config.redirectHistory && config.redirectHistory.length > 0) {
+    for (const redirect of config.redirectHistory) {
+      const redirectUrl = typeof redirect.url === "string" ? redirect.url : redirect.url?.toString?.() || "";
+      if (redirectUrl && urls[urls.length - 1] !== redirectUrl) {
+        urls.push(redirectUrl);
+      }
+    }
+  }
+  if (finalUrl && (urls.length === 0 || urls[urls.length - 1] !== finalUrl)) {
     urls.push(finalUrl);
   }
   return urls.length > 0 ? urls : [finalUrl];
@@ -264,7 +272,7 @@ async function parseCookiesFromHeaders(headers, url, config) {
   const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
   const jar = new RezoCookieJar;
   jar.setCookiesSync(acceptedCookieStrings, url);
-  if (config?.enableCookieJar && config?.cookieJar) {
+  if (!config?.disableCookieJar && config?.cookieJar) {
     config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
   }
   const cookies = jar.cookies();

package/dist/adapters/http.cjs

@@ -19,6 +19,8 @@ const { buildDownloadError, buildDecompressionError, buildSmartError, builErrorF
 const { isSameDomain, RezoPerformance } = require('../utils/tools.cjs');
 const { getGlobalDNSCache } = require('../cache/dns-cache.cjs');
 const { ResponseCache } = require('../cache/response-cache.cjs');
+const { getGlobalAgentPool } = require('../utils/agent-pool.cjs');
+const { StagedTimeoutManager, parseStagedTimeouts } = require('../utils/staged-timeout.cjs');
 const dns = require("dns");
 const debugLog = {
   requestStart: (config, url, method) => {
@@ -185,7 +187,15 @@ function buildUrlTree(config, finalUrl) {
     const urlStr = typeof config.url === "string" ? config.url : config.url.toString();
     urls.push(urlStr);
   }
-  if (finalUrl && (urls.length === 0 || urls[0] !== finalUrl)) {
+  if (config.redirectHistory && config.redirectHistory.length > 0) {
+    for (const redirect of config.redirectHistory) {
+      const redirectUrl = typeof redirect.url === "string" ? redirect.url : redirect.url?.toString?.() || "";
+      if (redirectUrl && urls[urls.length - 1] !== redirectUrl) {
+        urls.push(redirectUrl);
+      }
+    }
+  }
+  if (finalUrl && (urls.length === 0 || urls[urls.length - 1] !== finalUrl)) {
     urls.push(finalUrl);
   }
   return urls.length > 0 ? urls : [finalUrl];
@@ -466,7 +476,8 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
           status: response.status,
           headers: response.headers,
           sameDomain: isSameDomain(fetchOptions.fullUrl, _stats.redirectUrl),
-          method: fetchOptions.method.toUpperCase()
+          method: fetchOptions.method.toUpperCase(),
+          body: config.originalBody
         }) : undefined;
         if (typeof onRedirect !== "undefined") {
           if (typeof onRedirect === "boolean") {
@@ -478,7 +489,7 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
               config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
               throw redirectError;
             }
-          } else if (!onRedirect.redirect) {
+          } else if (!onRedirect.redirect && !onRedirect.withoutBody && !("body" in onRedirect)) {
             const redirectError = builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
             _stats.statusOnNext = "error";
             if (!config.errors)
@@ -517,24 +528,55 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         delete options.params;
         const fromUrl = fetchOptions.fullUrl;
         fetchOptions.fullUrl = location;
-        if (typeof onRedirect === "object" && onRedirect.redirect) {
-          const method = onRedirect.method || fetchOptions.method;
+        const normalizedRedirect = typeof onRedirect === "object" ? onRedirect.redirect || onRedirect.withoutBody || "body" in onRedirect : undefined;
+        if (typeof onRedirect === "object" && normalizedRedirect) {
+          const method = onRedirect.redirect ? onRedirect.method || fetchOptions.method : fetchOptions.method;
           config.method = method;
-          options.fullUrl = onRedirect.url;
-          fetchOptions.fullUrl = onRedirect.url;
+          if (onRedirect.redirect && onRedirect.url) {
+            options.fullUrl = onRedirect.url;
+            fetchOptions.fullUrl = onRedirect.url;
+          }
           if (onRedirect.withoutBody) {
             delete options.body;
-          } else if (onRedirect.body) {
+            delete fetchOptions.body;
+            config.originalBody = undefined;
+            if (fetchOptions.headers instanceof RezoHeaders) {
+              fetchOptions.headers.delete("Content-Type");
+              fetchOptions.headers.delete("Content-Length");
+            }
+          } else if ("body" in onRedirect) {
             options.body = onRedirect.body;
+            fetchOptions.body = onRedirect.body;
+            config.originalBody = onRedirect.body;
+          } else if (redirectCode === 307 || redirectCode === 308) {
+            const methodUpper = method.toUpperCase();
+            if ((methodUpper === "POST" || methodUpper === "PUT" || methodUpper === "PATCH") && config.originalBody !== undefined) {
+              options.body = config.originalBody;
+              fetchOptions.body = config.originalBody;
+            }
+          } else {
+            delete options.body;
+            delete fetchOptions.body;
+            if (fetchOptions.headers instanceof RezoHeaders) {
+              fetchOptions.headers.delete("Content-Type");
+              fetchOptions.headers.delete("Content-Length");
+            }
           }
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, method);
-          if (onRedirect.setHeaders) {
+          if (onRedirect.redirect && onRedirect.setHeaders) {
             addedOptions.customHeaders = onRedirect.setHeaders;
           }
         } else if (response.status === 301 || response.status === 302 || response.status === 303) {
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, "GET");
           options.method = "GET";
+          fetchOptions.method = "GET";
+          config.method = "GET";
           delete options.body;
+          delete fetchOptions.body;
+          if (fetchOptions.headers instanceof RezoHeaders) {
+            fetchOptions.headers.delete("Content-Type");
+            fetchOptions.headers.delete("Content-Length");
+          }
         } else {
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, fetchOptions.method);
         }
@@ -603,8 +645,17 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
         eventEmitter.emit("start", startEvent);
       }
       const requestOptions = buildHTTPOptions(fetchOptions, isSecure, url);
+      const stagedTimeoutConfig = parseStagedTimeouts(fetchOptions.timeout);
+      const timeoutManager = new StagedTimeoutManager(stagedTimeoutConfig, config, fetchOptions);
+      if (timeoutManager.hasPhase("total")) {
+        timeoutManager.startPhase("total");
+      }
       try {
         const req = httpModule.request(requestOptions, async (res) => {
+          timeoutManager.clearPhase("headers");
+          if (timeoutManager.hasPhase("body")) {
+            timeoutManager.startPhase("body");
+          }
           if (!timing.firstByteTime) {
             timing.firstByteTime = performance.now();
             config.timing.responseStart = timing.firstByteTime;
@@ -896,9 +947,11 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
                 uploadResult.emit("done", uploadFinishEvent);
                 uploadResult._markFinished();
               }
+              timeoutManager.clearAll();
               resolve(finalResponse);
             });
             decompressedStream.on("error", (err) => {
+              timeoutManager.clearAll();
               _stats.statusOnNext = "error";
               updateTiming(config, timing, contentLength || "", contentLengthCounter, res.rawHeaders);
               if (_stats.redirectUrl) {
@@ -924,12 +977,36 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
           }
         });
         req.on("error", (err) => {
+          timeoutManager.clearAll();
           _stats.statusOnNext = "error";
           const error = buildSmartError(config, fetchOptions, err);
           resolve(error);
         });
         req.on("socket", (socket) => {
+          timeoutManager.setSocket(socket);
+          timeoutManager.setRequest(req);
+          timeoutManager.setTimeoutCallback((phase, elapsed) => {
+            _stats.statusOnNext = "error";
+            const error = timeoutManager.createTimeoutError(phase, elapsed);
+            const eventEmitter = streamResult || downloadResult || uploadResult;
+            if (eventEmitter) {
+              eventEmitter.emit("error", error);
+            }
+            resolve(error);
+          });
+          const isAlreadyConnected = !socket.connecting && (socket.readyState === "open" || socket.writable === true);
+          if (isAlreadyConnected) {
+            timeoutManager.clearPhase("connect");
+            if (timeoutManager.hasPhase("headers")) {
+              timeoutManager.startPhase("headers");
+            }
+          } else {
+            if (timeoutManager.hasPhase("connect")) {
+              timeoutManager.startPhase("connect");
+            }
+          }
           socket.on("error", (err) => {
+            timeoutManager.clearAll();
             _stats.statusOnNext = "error";
             const error = buildSmartError(config, fetchOptions, err);
             resolve(error);
@@ -963,6 +1040,10 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
             }
           });
           socket.on("secureConnect", () => {
+            timeoutManager.clearPhase("connect");
+            if (timeoutManager.hasPhase("headers")) {
+              timeoutManager.startPhase("headers");
+            }
             if (!timing.tlsEnd && timing.tlsStart) {
               timing.tlsEnd = performance.now();
               config.timing.connectEnd = timing.tlsEnd;
@@ -1015,6 +1096,12 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
             }
           });
           socket.on("connect", () => {
+            if (!isSecure) {
+              timeoutManager.clearPhase("connect");
+              if (timeoutManager.hasPhase("headers")) {
+                timeoutManager.startPhase("headers");
+              }
+            }
             if (!timing.tcpEnd) {
               timing.tcpEnd = performance.now();
               config.timing.connectEnd = timing.tcpEnd;
@@ -1052,6 +1139,7 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
           });
         });
         req.on("error", (error) => {
+          timeoutManager.clearAll();
           _stats.statusOnNext = "error";
           updateTiming(config, timing, "", 0);
           const e = buildSmartError(config, fetchOptions, error);
@@ -1198,20 +1286,42 @@ function buildHTTPOptions(fetchOptions, isSecure, url) {
     useSecureContext = true,
     auth,
     dnsCache: dnsCacheOption,
-    keepAlive = false,
-    keepAliveMsecs = 60000
+    keepAlive = true,
+    keepAliveMsecs = 60000,
+    useAgentPool = true
   } = fetchOptions;
-  const secureContext = isSecure && useSecureContext ? new https.Agent({
-    secureContext: createSecureContext(),
-    servername: url.host,
-    rejectUnauthorized,
-    keepAlive,
-    keepAliveMsecs: keepAlive ? keepAliveMsecs : undefined
-  }) : undefined;
-  const customAgent = url.protocol === "https:" && httpsAgent ? httpsAgent : httpAgent ? httpAgent : undefined;
-  const agent = parseProxy(proxy, isSecure, rejectUnauthorized) || customAgent || secureContext;
+  let agent;
+  if (httpAgent || httpsAgent) {
+    agent = isSecure ? httpsAgent : httpAgent;
+  } else if (proxy) {
+    agent = parseProxy(proxy, isSecure, rejectUnauthorized);
+  } else if (useAgentPool) {
+    const agentPool = getGlobalAgentPool({
+      keepAlive: true,
+      keepAliveMsecs,
+      maxSockets: 256,
+      maxFreeSockets: 64,
+      dnsCache: dnsCacheOption !== false
+    });
+    if (isSecure) {
+      agent = agentPool.getHttpsAgent({
+        rejectUnauthorized,
+        servername: url.hostname
+      });
+    } else {
+      agent = agentPool.getHttpAgent();
+    }
+  } else if (isSecure && useSecureContext) {
+    agent = new https.Agent({
+      secureContext: createSecureContext(),
+      servername: url.hostname,
+      rejectUnauthorized,
+      keepAlive,
+      keepAliveMsecs: keepAlive ? keepAliveMsecs : undefined
+    });
+  }
   let lookup;
-  if (dnsCacheOption) {
+  if (dnsCacheOption !== false && !useAgentPool) {
     if (!dnsCache) {
       const cacheOptions = typeof dnsCacheOption === "object" ? {
         enable: true,
@@ -1275,7 +1385,7 @@ async function setInitialConfig(config, fetchOptions, isSecure, url, httpModule,
         http1: true,
         http2: config.http2,
         compression: true,
-        cookies: config.enableCookieJar,
+        cookies: !config.disableCookieJar,
         redirects: config.maxRedirects > 0,
         proxy: !!proxy,
         timeout: !!timeout,
@@ -1285,7 +1395,7 @@ async function setInitialConfig(config, fetchOptions, isSecure, url, httpModule,
     config.features = {
       http2: !!config.http2,
       compression: !!config.compression?.enabled,
-      cookies: !!config.enableCookieJar,
+      cookies: !config.disableCookieJar,
       redirects: config.maxRedirects > 0,
       proxy: !!proxy,
       timeout: !!timeout,
@@ -1383,10 +1493,34 @@ function emitRedirect(emitter, headers, status, statusText, sourceUri, destinati
 }
 function createSecureContext() {
   return tls.createSecureContext({
-    ecdhCurve: "X25519:prime256v1:secp384r1:secp521r1",
-    honorCipherOrder: true,
-    ciphers: "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA256:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA",
-    sigalgs: "ecdsa_secp256r1_sha256:rsa_pss_rsae_sha256:rsa_pkcs1_sha256:ecdsa_secp384r1_sha384:rsa_pss_rsae_sha384:rsa_pkcs1_sha384:ecdsa_secp521r1_sha512:rsa_pss_rsae_sha512:rsa_pkcs1_sha512",
+    ecdhCurve: "X25519:prime256v1:secp384r1",
+    ciphers: [
+      "TLS_AES_128_GCM_SHA256",
+      "TLS_AES_256_GCM_SHA384",
+      "TLS_CHACHA20_POLY1305_SHA256",
+      "ECDHE-ECDSA-AES128-GCM-SHA256",
+      "ECDHE-RSA-AES128-GCM-SHA256",
+      "ECDHE-ECDSA-AES256-GCM-SHA384",
+      "ECDHE-RSA-AES256-GCM-SHA384",
+      "ECDHE-ECDSA-CHACHA20-POLY1305",
+      "ECDHE-RSA-CHACHA20-POLY1305",
+      "ECDHE-RSA-AES128-SHA",
+      "ECDHE-RSA-AES256-SHA",
+      "AES128-GCM-SHA256",
+      "AES256-GCM-SHA384",
+      "AES128-SHA",
+      "AES256-SHA"
+    ].join(":"),
+    sigalgs: [
+      "ecdsa_secp256r1_sha256",
+      "ecdsa_secp384r1_sha384",
+      "rsa_pss_rsae_sha256",
+      "rsa_pss_rsae_sha384",
+      "rsa_pss_rsae_sha512",
+      "rsa_pkcs1_sha256",
+      "rsa_pkcs1_sha384",
+      "rsa_pkcs1_sha512"
+    ].join(":"),
     minVersion: "TLSv1.2",
     maxVersion: "TLSv1.3",
     sessionTimeout: 3600
@@ -1421,25 +1555,62 @@ function generateSessionId() {
 function generateTraceId() {
   return `trc_${Date.now()}_${Math.random().toString(36).substring(2, 15)}`;
 }
+const proxyAgentCache = new Map;
+const PROXY_AGENT_EVICTION_MS = 60000;
+function buildProxyAgentKey(proxy, isSecure, rejectUnauthorized) {
+  if (typeof proxy === "string") {
+    return `str:${proxy}:${isSecure}:${rejectUnauthorized}`;
+  }
+  const p = proxy;
+  const authKey = p.auth ? `${p.auth.username}:${p.auth.password}` : "";
+  return `obj:${p.protocol}://${p.host}:${p.port}:${authKey}:${isSecure}:${rejectUnauthorized}`;
+}
+function evictStaleProxyAgents() {
+  const now = Date.now();
+  for (const [key, entry] of proxyAgentCache) {
+    if (now - entry.lastUsed > PROXY_AGENT_EVICTION_MS) {
+      try {
+        entry.agent.destroy();
+      } catch {}
+      proxyAgentCache.delete(key);
+    }
+  }
+}
+let lastProxyEviction = 0;
 function parseProxy(proxy, isScure = true, rejectUnauthorized = false) {
   if (!proxy) {
     return;
   }
+  const now = Date.now();
+  if (now - lastProxyEviction > PROXY_AGENT_EVICTION_MS / 2) {
+    evictStaleProxyAgents();
+    lastProxyEviction = now;
+  }
+  const cacheKey = buildProxyAgentKey(proxy, isScure, rejectUnauthorized);
+  const cached = proxyAgentCache.get(cacheKey);
+  if (cached) {
+    cached.lastUsed = now;
+    return cached.agent;
+  }
+  let agent;
   if (typeof proxy === "string") {
     if (proxy.startsWith("http://")) {
-      return rezoProxy(`http://${proxy.slice(7)}`, "http");
+      agent = rezoProxy(`http://${proxy.slice(7)}`, "http");
     } else if (proxy.startsWith("https://")) {
-      return rezoProxy(`https://${proxy.slice(8)}`, "https");
+      agent = rezoProxy(`https://${proxy.slice(8)}`, "https");
+    } else {
+      agent = rezoProxy(proxy);
     }
-    return rezoProxy(proxy);
-  }
-  if (proxy.protocol === "http" || proxy.protocol === "https") {
-    return rezoProxy({
+  } else if (proxy.protocol === "http" || proxy.protocol === "https") {
+    agent = rezoProxy({
       ...proxy,
       client: !isScure ? "http" : "https"
     });
+  } else {
+    agent = rezoProxy(proxy);
   }
-  return rezoProxy(proxy);
+  proxyAgentCache.set(cacheKey, { agent, lastUsed: now });
+  return agent;
 }
 async function updateCookies(config, headers, url) {
   const cookies = headers["set-cookie"];
@@ -1480,7 +1651,7 @@ async function updateCookies(config, headers, url) {
       acceptedCookies.push(...parsedCookies.array);
     }
     const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
-    if (config.enableCookieJar && config.cookieJar) {
+    if (!config.disableCookieJar && config.cookieJar) {
       config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
     }
     jar.setCookiesSync(acceptedCookieStrings, url);