rezo 1.0.40 → 1.0.42

package/dist/adapters/curl.cjs

@@ -195,7 +195,7 @@ function buildUrlTree(config, finalUrl) {
   }
   return urls.length > 0 ? urls : [finalUrl];
 }
-async function updateCookies(config, cookieStrings, url) {
+async function updateCookies(config, cookieStrings, url, rootJar) {
   if (!cookieStrings || cookieStrings.length === 0)
     return;
   const tempJar = new RezoCookieJar;
@@ -233,8 +233,9 @@ async function updateCookies(config, cookieStrings, url) {
     acceptedCookies.push(...parsedCookies.array);
   }
   const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
-  if (!config.disableCookieJar && config.cookieJar) {
-    config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
+  const jarToUpdate = rootJar || config.cookieJar;
+  if (!config.disableCookieJar && jarToUpdate) {
+    jarToUpdate.setCookiesSync(acceptedCookieStrings, url);
   }
   if (config.useCookies) {
     const existingArray = config.responseCookies?.array || [];
@@ -2148,6 +2149,9 @@ async function executeRequest(options, defaultOptions, jar) {
       }
     }
   }
+  if (!config.requestId) {
+    config.requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+  }
   debugLog.requestStart(config, requestUrl, method);
   let streamResponse;
   let downloadResponse;
@@ -2201,6 +2205,11 @@ async function executeRequest(options, defaultOptions, jar) {
       const duration = perform.now();
       debugLog.response(config, response.status, response.statusText, duration);
       debugLog.cookies(config, response.cookies?.array?.length || 0);
+      if (response.cookies?.setCookiesString?.length > 0 && jar) {
+        try {
+          jar.setCookiesSync(response.cookies.setCookiesString, response.finalUrl || requestUrl);
+        } catch (e) {}
+      }
       if (cache) {
         if (response.status === 304 && cachedEntry) {
           const responseHeaders = response.headers instanceof RezoHeaders ? Object.fromEntries(response.headers.entries()) : response.headers;

package/dist/adapters/curl.js

@@ -195,7 +195,7 @@ function buildUrlTree(config, finalUrl) {
   }
   return urls.length > 0 ? urls : [finalUrl];
 }
-async function updateCookies(config, cookieStrings, url) {
+async function updateCookies(config, cookieStrings, url, rootJar) {
   if (!cookieStrings || cookieStrings.length === 0)
     return;
   const tempJar = new RezoCookieJar;
@@ -233,8 +233,9 @@ async function updateCookies(config, cookieStrings, url) {
     acceptedCookies.push(...parsedCookies.array);
   }
   const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
-  if (!config.disableCookieJar && config.cookieJar) {
-    config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
+  const jarToUpdate = rootJar || config.cookieJar;
+  if (!config.disableCookieJar && jarToUpdate) {
+    jarToUpdate.setCookiesSync(acceptedCookieStrings, url);
   }
   if (config.useCookies) {
     const existingArray = config.responseCookies?.array || [];
@@ -2148,6 +2149,9 @@ export async function executeRequest(options, defaultOptions, jar) {
       }
     }
   }
+  if (!config.requestId) {
+    config.requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+  }
   debugLog.requestStart(config, requestUrl, method);
   let streamResponse;
   let downloadResponse;
@@ -2201,6 +2205,11 @@ export async function executeRequest(options, defaultOptions, jar) {
       const duration = perform.now();
       debugLog.response(config, response.status, response.statusText, duration);
       debugLog.cookies(config, response.cookies?.array?.length || 0);
+      if (response.cookies?.setCookiesString?.length > 0 && jar) {
+        try {
+          jar.setCookiesSync(response.cookies.setCookiesString, response.finalUrl || requestUrl);
+        } catch (e) {}
+      }
       if (cache) {
         if (response.status === 304 && cachedEntry) {
           const responseHeaders = response.headers instanceof RezoHeaders ? Object.fromEntries(response.headers.entries()) : response.headers;

package/dist/adapters/fetch.cjs

@@ -90,9 +90,24 @@ const debugLog = {
       }
     }
   },
-  complete: (config, url) => {
+  redirect: (config, fromUrl, toUrl, statusCode, method) => {
     if (config.debug) {
-      console.log(`[Rezo Debug] Request complete: ${url}`);
+      console.log(`[Rezo Debug] Redirect ${statusCode}: ${fromUrl}`);
+      console.log(`[Rezo Debug]        → ${toUrl} (${method})`);
+    }
+    if (config.trackUrl) {
+      console.log(`[Rezo Track]   ↳ ${statusCode} → ${toUrl}`);
+    }
+  },
+  complete: (config, url, redirectCount, duration) => {
+    if (config.debug) {
+      console.log(`[Rezo Debug] Complete: ${url}`);
+      if (redirectCount && redirectCount > 0) {
+        console.log(`[Rezo Debug] Redirects: ${redirectCount}`);
+      }
+      if (duration) {
+        console.log(`[Rezo Debug] Total Duration: ${duration.toFixed(2)}ms`);
+      }
       console.log(`[Rezo Debug] ─────────────────────────────────────
 `);
     }
@@ -435,7 +450,7 @@ async function executeRequest(options, defaultOptions, jar) {
     uploadResponse = new UploadResponse(url);
   }
   try {
-    const res = executeFetchRequest(fetchOptions, mainConfig, options, perform, streamResponse, downloadResponse, uploadResponse);
+    const res = executeFetchRequest(fetchOptions, mainConfig, options, perform, streamResponse, downloadResponse, uploadResponse, jar);
     if (streamResponse) {
       return streamResponse;
     } else if (downloadResponse) {
@@ -462,7 +477,7 @@ async function executeRequest(options, defaultOptions, jar) {
     throw error;
   }
 }
-async function executeFetchRequest(fetchOptions, config, options, perform, streamResult, downloadResult, uploadResult) {
+async function executeFetchRequest(fetchOptions, config, options, perform, streamResult, downloadResult, uploadResult, rootJar) {
   let requestCount = 0;
   const _stats = { statusOnNext: "abort" };
   let retries = 0;
@@ -479,6 +494,11 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
   const visitedUrls = new Set;
   let totalAttempts = 0;
   config.setSignal();
+  if (!config.requestId) {
+    config.requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+  }
+  const requestUrl = fetchOptions.fullUrl ? String(fetchOptions.fullUrl) : "";
+  debugLog.requestStart(config, requestUrl, fetchOptions.method || "GET");
   const eventEmitter = streamResult || downloadResult || uploadResult;
   if (eventEmitter) {
     eventEmitter.emit("initiated");
@@ -530,6 +550,8 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
         continue;
       }
       if (statusOnNext === "success") {
+        const totalDuration = performance.now() - timing.startTime;
+        debugLog.complete(config, response.finalUrl || requestUrl, config.redirectCount, totalDuration);
         return response;
       }
       if (statusOnNext === "error") {
@@ -579,12 +601,13 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
           status: response.status,
           headers: response.headers,
           sameDomain: isSameDomain(fetchOptions.fullUrl, location),
-          method: fetchOptions.method.toUpperCase()
+          method: fetchOptions.method.toUpperCase(),
+          body: config.originalBody
         }) : undefined;
         if (typeof onRedirect !== "undefined") {
           if (typeof onRedirect === "boolean" && !onRedirect) {
             throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
-          } else if (typeof onRedirect === "object" && !onRedirect.redirect) {
+          } else if (typeof onRedirect === "object" && !onRedirect.redirect && !onRedirect.withoutBody && !("body" in onRedirect)) {
             throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
           }
         }
@@ -604,13 +627,78 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
         });
         perform.reset();
         config.redirectCount++;
-        if (response.status === 301 || response.status === 302 || response.status === 303) {
-          if (config.treat302As303 !== false || response.status === 303) {
-            options.method = "GET";
+        const fromUrl = fetchOptions.fullUrl;
+        fetchOptions.fullUrl = location;
+        const normalizedRedirect = typeof onRedirect === "object" ? onRedirect.redirect || onRedirect.withoutBody || "body" in onRedirect : undefined;
+        if (typeof onRedirect === "object" && normalizedRedirect) {
+          let method;
+          const userMethod = onRedirect.method;
+          if (redirectCode === 301 || redirectCode === 302 || redirectCode === 303) {
+            method = userMethod || "GET";
+          } else {
+            method = userMethod || fetchOptions.method;
+          }
+          config.method = method;
+          options.method = method;
+          fetchOptions.method = method;
+          if (onRedirect.redirect && onRedirect.url) {
+            options.fullUrl = onRedirect.url;
+            fetchOptions.fullUrl = onRedirect.url;
+          }
+          if (onRedirect.withoutBody) {
+            delete options.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.redirect && onRedirect.setHeaders) {
+            if (fetchOptions.headers instanceof RezoHeaders) {
+              for (const [key, value] of Object.entries(onRedirect.setHeaders)) {
+                fetchOptions.headers.set(key, value);
+              }
+            }
+          }
+        } else if (redirectCode === 301 || redirectCode === 302 || redirectCode === 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);
+        }
+        const jarToSync = rootJar || config.cookieJar;
+        if (response.cookies?.array?.length > 0 && jarToSync) {
+          try {
+            jarToSync.setCookiesSync(response.cookies.array, fromUrl);
+          } catch (e) {}
         }
-        fetchOptions.fullUrl = location;
         delete options.params;
         requestCount++;
         continue;
@@ -640,7 +728,6 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
       } else if (config.transfer.requestSize === undefined) {
         config.transfer.requestSize = 0;
       }
-      debugLog.requestStart(config, url.href, fetchOptions.method?.toUpperCase() || "GET");
     }
     const reqHeaders = fetchOptions.headers instanceof RezoHeaders ? fetchOptions.headers.toObject() : fetchOptions.headers || {};
     const headers = toFetchHeaders(reqHeaders);
@@ -903,7 +990,6 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
       uploadResult.emit("done", uploadFinishEvent);
       uploadResult._markFinished();
     }
-    debugLog.complete(config, url.href);
     return finalResponse;
   } catch (error) {
     _stats.statusOnNext = "error";

package/dist/adapters/fetch.js

@@ -90,9 +90,24 @@ const debugLog = {
       }
     }
   },
-  complete: (config, url) => {
+  redirect: (config, fromUrl, toUrl, statusCode, method) => {
     if (config.debug) {
-      console.log(`[Rezo Debug] Request complete: ${url}`);
+      console.log(`[Rezo Debug] Redirect ${statusCode}: ${fromUrl}`);
+      console.log(`[Rezo Debug]        → ${toUrl} (${method})`);
+    }
+    if (config.trackUrl) {
+      console.log(`[Rezo Track]   ↳ ${statusCode} → ${toUrl}`);
+    }
+  },
+  complete: (config, url, redirectCount, duration) => {
+    if (config.debug) {
+      console.log(`[Rezo Debug] Complete: ${url}`);
+      if (redirectCount && redirectCount > 0) {
+        console.log(`[Rezo Debug] Redirects: ${redirectCount}`);
+      }
+      if (duration) {
+        console.log(`[Rezo Debug] Total Duration: ${duration.toFixed(2)}ms`);
+      }
       console.log(`[Rezo Debug] ─────────────────────────────────────
 `);
     }
@@ -435,7 +450,7 @@ export async function executeRequest(options, defaultOptions, jar) {
     uploadResponse = new UploadResponse(url);
   }
   try {
-    const res = executeFetchRequest(fetchOptions, mainConfig, options, perform, streamResponse, downloadResponse, uploadResponse);
+    const res = executeFetchRequest(fetchOptions, mainConfig, options, perform, streamResponse, downloadResponse, uploadResponse, jar);
     if (streamResponse) {
       return streamResponse;
     } else if (downloadResponse) {
@@ -462,7 +477,7 @@ export async function executeRequest(options, defaultOptions, jar) {
     throw error;
   }
 }
-async function executeFetchRequest(fetchOptions, config, options, perform, streamResult, downloadResult, uploadResult) {
+async function executeFetchRequest(fetchOptions, config, options, perform, streamResult, downloadResult, uploadResult, rootJar) {
   let requestCount = 0;
   const _stats = { statusOnNext: "abort" };
   let retries = 0;
@@ -479,6 +494,11 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
   const visitedUrls = new Set;
   let totalAttempts = 0;
   config.setSignal();
+  if (!config.requestId) {
+    config.requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+  }
+  const requestUrl = fetchOptions.fullUrl ? String(fetchOptions.fullUrl) : "";
+  debugLog.requestStart(config, requestUrl, fetchOptions.method || "GET");
   const eventEmitter = streamResult || downloadResult || uploadResult;
   if (eventEmitter) {
     eventEmitter.emit("initiated");
@@ -530,6 +550,8 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
         continue;
       }
       if (statusOnNext === "success") {
+        const totalDuration = performance.now() - timing.startTime;
+        debugLog.complete(config, response.finalUrl || requestUrl, config.redirectCount, totalDuration);
         return response;
       }
       if (statusOnNext === "error") {
@@ -579,12 +601,13 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
           status: response.status,
           headers: response.headers,
           sameDomain: isSameDomain(fetchOptions.fullUrl, location),
-          method: fetchOptions.method.toUpperCase()
+          method: fetchOptions.method.toUpperCase(),
+          body: config.originalBody
         }) : undefined;
         if (typeof onRedirect !== "undefined") {
           if (typeof onRedirect === "boolean" && !onRedirect) {
             throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
-          } else if (typeof onRedirect === "object" && !onRedirect.redirect) {
+          } else if (typeof onRedirect === "object" && !onRedirect.redirect && !onRedirect.withoutBody && !("body" in onRedirect)) {
             throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
           }
         }
@@ -604,13 +627,78 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
         });
         perform.reset();
         config.redirectCount++;
-        if (response.status === 301 || response.status === 302 || response.status === 303) {
-          if (config.treat302As303 !== false || response.status === 303) {
-            options.method = "GET";
+        const fromUrl = fetchOptions.fullUrl;
+        fetchOptions.fullUrl = location;
+        const normalizedRedirect = typeof onRedirect === "object" ? onRedirect.redirect || onRedirect.withoutBody || "body" in onRedirect : undefined;
+        if (typeof onRedirect === "object" && normalizedRedirect) {
+          let method;
+          const userMethod = onRedirect.method;
+          if (redirectCode === 301 || redirectCode === 302 || redirectCode === 303) {
+            method = userMethod || "GET";
+          } else {
+            method = userMethod || fetchOptions.method;
+          }
+          config.method = method;
+          options.method = method;
+          fetchOptions.method = method;
+          if (onRedirect.redirect && onRedirect.url) {
+            options.fullUrl = onRedirect.url;
+            fetchOptions.fullUrl = onRedirect.url;
+          }
+          if (onRedirect.withoutBody) {
+            delete options.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.redirect && onRedirect.setHeaders) {
+            if (fetchOptions.headers instanceof RezoHeaders) {
+              for (const [key, value] of Object.entries(onRedirect.setHeaders)) {
+                fetchOptions.headers.set(key, value);
+              }
+            }
+          }
+        } else if (redirectCode === 301 || redirectCode === 302 || redirectCode === 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);
+        }
+        const jarToSync = rootJar || config.cookieJar;
+        if (response.cookies?.array?.length > 0 && jarToSync) {
+          try {
+            jarToSync.setCookiesSync(response.cookies.array, fromUrl);
+          } catch (e) {}
         }
-        fetchOptions.fullUrl = location;
         delete options.params;
         requestCount++;
         continue;
@@ -640,7 +728,6 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
       } else if (config.transfer.requestSize === undefined) {
         config.transfer.requestSize = 0;
       }
-      debugLog.requestStart(config, url.href, fetchOptions.method?.toUpperCase() || "GET");
     }
     const reqHeaders = fetchOptions.headers instanceof RezoHeaders ? fetchOptions.headers.toObject() : fetchOptions.headers || {};
     const headers = toFetchHeaders(reqHeaders);
@@ -903,7 +990,6 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
       uploadResult.emit("done", uploadFinishEvent);
       uploadResult._markFinished();
     }
-    debugLog.complete(config, url.href);
     return finalResponse;
   } catch (error) {
     _stats.statusOnNext = "error";

package/dist/adapters/http.cjs

@@ -21,7 +21,7 @@ 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 dns = require("node:dns");
 const debugLog = {
   requestStart: (config, url, method) => {
     if (config.debug) {
@@ -302,7 +302,7 @@ async function executeRequest(options, defaultOptions, jar) {
     }
   }
   try {
-    const res = executeHttp1Request(config.fetchOptions, mainConfig, config.options, perform, d_options.fs, streamResponse, downloadResponse, uploadResponse);
+    const res = executeHttp1Request(config.fetchOptions, mainConfig, config.options, perform, d_options.fs, streamResponse, downloadResponse, uploadResponse, jar);
     if (streamResponse) {
       res.catch((err) => {
         streamResponse.emit("error", err);
@@ -344,7 +344,7 @@ async function executeRequest(options, defaultOptions, jar) {
     throw error;
   }
 }
-async function executeHttp1Request(fetchOptions, config, options, perform, fs, streamResult, downloadResult, uploadResult) {
+async function executeHttp1Request(fetchOptions, config, options, perform, fs, streamResult, downloadResult, uploadResult, rootJar) {
   let requestCount = 0;
   const _stats = { statusOnNext: "abort" };
   let responseStatusCode;
@@ -363,6 +363,9 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
   config.setSignal();
   const timeoutClearInstanse = config.timeoutClearInstanse;
   delete config.timeoutClearInstanse;
+  if (!config.requestId) {
+    config.requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+  }
   const requestUrl = fetchOptions.fullUrl ? String(fetchOptions.fullUrl) : "";
   debugLog.requestStart(config, requestUrl, fetchOptions.method || "GET");
   const eventEmitter = streamResult || downloadResult || uploadResult;
@@ -376,7 +379,7 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
       throw error;
     }
     try {
-      const response = await request(config, fetchOptions, requestCount, timing, _stats, responseStatusCode, fs, streamResult, downloadResult, uploadResult);
+      const response = await request(config, fetchOptions, requestCount, timing, _stats, responseStatusCode, fs, streamResult, downloadResult, uploadResult, rootJar);
       const statusOnNext = _stats.statusOnNext;
       if (response instanceof RezoError) {
         const fileName = config.fileName;
@@ -530,8 +533,16 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         fetchOptions.fullUrl = location;
         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;
+          let method;
+          const userMethod = onRedirect.method;
+          if (redirectCode === 301 || redirectCode === 302 || redirectCode === 303) {
+            method = userMethod || "GET";
+          } else {
+            method = userMethod || fetchOptions.method;
+          }
           config.method = method;
+          options.method = method;
+          fetchOptions.method = method;
           if (onRedirect.redirect && onRedirect.url) {
             options.fullUrl = onRedirect.url;
             fetchOptions.fullUrl = onRedirect.url;
@@ -580,7 +591,13 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         } else {
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, fetchOptions.method);
         }
-        const __ = prepareHTTPOptions(fetchOptions, config.cookieJar, addedOptions, config);
+        const jarToSync = rootJar || config.cookieJar;
+        if (response.cookies?.array?.length > 0 && jarToSync) {
+          try {
+            jarToSync.setCookiesSync(response.cookies.array, fromUrl);
+          } catch (e) {}
+        }
+        const __ = prepareHTTPOptions(fetchOptions, jarToSync, addedOptions, config);
         fetchOptions = __.fetchOptions;
         config = __.config;
         options = __.options;
@@ -619,7 +636,7 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
     }
   }
 }
-async function request(config, fetchOptions, requestCount, timing, _stats, responseStatusCode, fs, streamResult, downloadResult, uploadResult) {
+async function request(config, fetchOptions, requestCount, timing, _stats, responseStatusCode, fs, streamResult, downloadResult, uploadResult, rootJar) {
   return await new Promise(async (resolve) => {
     try {
       const { fullUrl, body, fileName: filename } = fetchOptions;
@@ -673,7 +690,7 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
           const location = headers["location"] || headers["Location"];
           const contentLength = headers["content-length"];
           const cookies = headers["set-cookie"];
-          await updateCookies(config, headers, url.href);
+          await updateCookies(config, headers, url.href, rootJar);
           const cookieArray = config.responseCookies?.array || [];
           delete headers["set-cookie"];
           _stats.redirectUrl = undefined;
@@ -1612,7 +1629,7 @@ function parseProxy(proxy, isScure = true, rejectUnauthorized = false) {
   proxyAgentCache.set(cacheKey, { agent, lastUsed: now });
   return agent;
 }
-async function updateCookies(config, headers, url) {
+async function updateCookies(config, headers, url, rootJar) {
   const cookies = headers["set-cookie"];
   if (cookies) {
     const jar = new RezoCookieJar;
@@ -1651,8 +1668,9 @@ async function updateCookies(config, headers, url) {
       acceptedCookies.push(...parsedCookies.array);
     }
     const acceptedCookieStrings = acceptedCookies.map((c) => c.toSetCookieString());
-    if (!config.disableCookieJar && config.cookieJar) {
-      config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
+    const jarToUpdate = rootJar || config.cookieJar;
+    if (!config.disableCookieJar && jarToUpdate) {
+      jarToUpdate.setCookiesSync(acceptedCookieStrings, url);
     }
     jar.setCookiesSync(acceptedCookieStrings, url);
     if (config.useCookies) {