rezo 1.0.41 → 1.0.43

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,13 +591,13 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         } else {
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, fetchOptions.method);
         }
-        if (response.cookies?.array?.length > 0 && config.cookieJar) {
-          const jar = config.cookieJar;
+        const jarToSync = rootJar || config.cookieJar;
+        if (response.cookies?.array?.length > 0 && jarToSync) {
           try {
-            jar.setCookiesSync(response.cookies.array, fromUrl);
+            jarToSync.setCookiesSync(response.cookies.array, fromUrl);
           } catch (e) {}
         }
-        const __ = prepareHTTPOptions(fetchOptions, config.cookieJar, addedOptions, config);
+        const __ = prepareHTTPOptions(fetchOptions, jarToSync, addedOptions, config);
         fetchOptions = __.fetchOptions;
         config = __.config;
         options = __.options;
@@ -625,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;
@@ -679,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;
@@ -1618,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;
@@ -1657,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) {

package/dist/adapters/http.js

@@ -21,7 +21,7 @@ import { getGlobalDNSCache } from '../cache/dns-cache.js';
 import { ResponseCache } from '../cache/response-cache.js';
 import { getGlobalAgentPool } from '../utils/agent-pool.js';
 import { StagedTimeoutManager, parseStagedTimeouts } from '../utils/staged-timeout.js';
-import dns from "dns";
+import dns from "node:dns";
 const debugLog = {
   requestStart: (config, url, method) => {
     if (config.debug) {
@@ -302,7 +302,7 @@ export 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 @@ export 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,13 +591,13 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         } else {
           debugLog.redirect(config, fromUrl, fetchOptions.fullUrl, redirectCode, fetchOptions.method);
         }
-        if (response.cookies?.array?.length > 0 && config.cookieJar) {
-          const jar = config.cookieJar;
+        const jarToSync = rootJar || config.cookieJar;
+        if (response.cookies?.array?.length > 0 && jarToSync) {
           try {
-            jar.setCookiesSync(response.cookies.array, fromUrl);
+            jarToSync.setCookiesSync(response.cookies.array, fromUrl);
           } catch (e) {}
         }
-        const __ = prepareHTTPOptions(fetchOptions, config.cookieJar, addedOptions, config);
+        const __ = prepareHTTPOptions(fetchOptions, jarToSync, addedOptions, config);
         fetchOptions = __.fetchOptions;
         config = __.config;
         options = __.options;
@@ -625,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;
@@ -679,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;
@@ -1618,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;
@@ -1657,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) {