rezo 1.0.22 → 1.0.24

package/dist/adapters/fetch.cjs

@@ -129,7 +129,7 @@ function sanitizeConfig(config) {
   delete sanitized.data;
   return sanitized;
 }
-function parseCookiesFromHeaders(headers, url, config) {
+async function parseCookiesFromHeaders(headers, url, config) {
   let setCookieHeaders = [];
   if (typeof headers.getSetCookie === "function") {
     setCookieHeaders = headers.getSetCookie() || [];
@@ -149,13 +149,59 @@ function parseCookiesFromHeaders(headers, url, config) {
       setCookiesString: []
     };
   }
+  const tempJar = new RezoCookieJar;
+  tempJar.setCookiesSync(setCookieHeaders, url);
+  const parsedCookies = tempJar.cookies();
+  const acceptedCookies = [];
+  let hookError = null;
+  if (config?.hooks?.beforeCookie && config.hooks.beforeCookie.length > 0) {
+    for (const cookie of parsedCookies.array) {
+      let shouldAccept = true;
+      for (const hook of config.hooks.beforeCookie) {
+        try {
+          const result = await hook({
+            cookie,
+            source: "response",
+            url,
+            isValid: true
+          }, config);
+          if (result === false) {
+            shouldAccept = false;
+            break;
+          }
+        } catch (err) {
+          hookError = err;
+          if (config.debug) {
+            console.log("[Rezo Debug] beforeCookie hook error:", err);
+          }
+        }
+      }
+      if (shouldAccept) {
+        acceptedCookies.push(cookie);
+      }
+    }
+  } else {
+    acceptedCookies.push(...parsedCookies.array);
+  }
+  const acceptedCookieStrings = acceptedCookies.map((c) => c.cookieString());
   const jar = new RezoCookieJar;
-  jar.setCookiesSync(setCookieHeaders, url);
+  jar.setCookiesSync(acceptedCookieStrings, url);
   if (config?.enableCookieJar && config?.cookieJar) {
-    config.cookieJar.setCookiesSync(setCookieHeaders, url);
+    config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
   }
   const cookies = jar.cookies();
   cookies.setCookiesString = setCookieHeaders;
+  if (!hookError && config?.hooks?.afterCookie && config.hooks.afterCookie.length > 0) {
+    for (const hook of config.hooks.afterCookie) {
+      try {
+        await hook(acceptedCookies, config);
+      } catch (err) {
+        if (config.debug) {
+          console.log("[Rezo Debug] afterCookie hook error:", err);
+        }
+      }
+    }
+  }
   return cookies;
 }
 function mergeRequestAndResponseCookies(config, responseCookies, url) {
@@ -385,8 +431,14 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
           }
           retries++;
           config.retryAttempts++;
+          const currentDelay = incrementDelay ? retryDelay * retries : retryDelay;
+          if (config.hooks?.beforeRetry && config.hooks.beforeRetry.length > 0) {
+            for (const hook of config.hooks.beforeRetry) {
+              await hook(config, response, retries);
+            }
+          }
           if (retryDelay > 0) {
-            await new Promise((resolve) => setTimeout(resolve, incrementDelay ? retryDelay * retries : retryDelay));
+            await new Promise((resolve) => setTimeout(resolve, currentDelay));
           }
         }
         continue;
@@ -584,13 +636,17 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
     const responseHeaders = fromFetchHeaders(response.headers);
     const contentType = response.headers.get("content-type") || "";
     const contentLength = response.headers.get("content-length");
-    const cookies = parseCookiesFromHeaders(response.headers, url.href, config);
+    const cookies = await parseCookiesFromHeaders(response.headers, url.href, config);
     config.responseCookies = cookies;
     const location = response.headers.get("location");
     const isRedirect = status >= 300 && status < 400 && location;
     if (isRedirect) {
       _stats.statusOnNext = "redirect";
-      _stats.redirectUrl = new URL(location, url).href;
+      const redirectUrlObj = new URL(location, url);
+      if (!redirectUrlObj.hash && url.hash) {
+        redirectUrlObj.hash = url.hash;
+      }
+      _stats.redirectUrl = redirectUrlObj.href;
       const partialResponse = {
         data: "",
         status,

package/dist/adapters/fetch.js

@@ -129,7 +129,7 @@ function sanitizeConfig(config) {
   delete sanitized.data;
   return sanitized;
 }
-function parseCookiesFromHeaders(headers, url, config) {
+async function parseCookiesFromHeaders(headers, url, config) {
   let setCookieHeaders = [];
   if (typeof headers.getSetCookie === "function") {
     setCookieHeaders = headers.getSetCookie() || [];
@@ -149,13 +149,59 @@ function parseCookiesFromHeaders(headers, url, config) {
       setCookiesString: []
     };
   }
+  const tempJar = new RezoCookieJar;
+  tempJar.setCookiesSync(setCookieHeaders, url);
+  const parsedCookies = tempJar.cookies();
+  const acceptedCookies = [];
+  let hookError = null;
+  if (config?.hooks?.beforeCookie && config.hooks.beforeCookie.length > 0) {
+    for (const cookie of parsedCookies.array) {
+      let shouldAccept = true;
+      for (const hook of config.hooks.beforeCookie) {
+        try {
+          const result = await hook({
+            cookie,
+            source: "response",
+            url,
+            isValid: true
+          }, config);
+          if (result === false) {
+            shouldAccept = false;
+            break;
+          }
+        } catch (err) {
+          hookError = err;
+          if (config.debug) {
+            console.log("[Rezo Debug] beforeCookie hook error:", err);
+          }
+        }
+      }
+      if (shouldAccept) {
+        acceptedCookies.push(cookie);
+      }
+    }
+  } else {
+    acceptedCookies.push(...parsedCookies.array);
+  }
+  const acceptedCookieStrings = acceptedCookies.map((c) => c.cookieString());
   const jar = new RezoCookieJar;
-  jar.setCookiesSync(setCookieHeaders, url);
+  jar.setCookiesSync(acceptedCookieStrings, url);
   if (config?.enableCookieJar && config?.cookieJar) {
-    config.cookieJar.setCookiesSync(setCookieHeaders, url);
+    config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
   }
   const cookies = jar.cookies();
   cookies.setCookiesString = setCookieHeaders;
+  if (!hookError && config?.hooks?.afterCookie && config.hooks.afterCookie.length > 0) {
+    for (const hook of config.hooks.afterCookie) {
+      try {
+        await hook(acceptedCookies, config);
+      } catch (err) {
+        if (config.debug) {
+          console.log("[Rezo Debug] afterCookie hook error:", err);
+        }
+      }
+    }
+  }
   return cookies;
 }
 function mergeRequestAndResponseCookies(config, responseCookies, url) {
@@ -385,8 +431,14 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
           }
           retries++;
           config.retryAttempts++;
+          const currentDelay = incrementDelay ? retryDelay * retries : retryDelay;
+          if (config.hooks?.beforeRetry && config.hooks.beforeRetry.length > 0) {
+            for (const hook of config.hooks.beforeRetry) {
+              await hook(config, response, retries);
+            }
+          }
           if (retryDelay > 0) {
-            await new Promise((resolve) => setTimeout(resolve, incrementDelay ? retryDelay * retries : retryDelay));
+            await new Promise((resolve) => setTimeout(resolve, currentDelay));
           }
         }
         continue;
@@ -584,13 +636,17 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
     const responseHeaders = fromFetchHeaders(response.headers);
     const contentType = response.headers.get("content-type") || "";
     const contentLength = response.headers.get("content-length");
-    const cookies = parseCookiesFromHeaders(response.headers, url.href, config);
+    const cookies = await parseCookiesFromHeaders(response.headers, url.href, config);
     config.responseCookies = cookies;
     const location = response.headers.get("location");
     const isRedirect = status >= 300 && status < 400 && location;
     if (isRedirect) {
       _stats.statusOnNext = "redirect";
-      _stats.redirectUrl = new URL(location, url).href;
+      const redirectUrlObj = new URL(location, url);
+      if (!redirectUrlObj.hash && url.hash) {
+        redirectUrlObj.hash = url.hash;
+      }
+      _stats.redirectUrl = redirectUrlObj.href;
       const partialResponse = {
         data: "",
         status,

package/dist/adapters/http.cjs

@@ -290,10 +290,19 @@ async function executeRequest(options, defaultOptions, jar) {
   try {
     const res = executeHttp1Request(config.fetchOptions, mainConfig, config.options, perform, d_options.fs, streamResponse, downloadResponse, uploadResponse);
     if (streamResponse) {
+      res.catch((err) => {
+        streamResponse.emit("error", err);
+      });
       return streamResponse;
     } else if (downloadResponse) {
+      res.catch((err) => {
+        downloadResponse.emit("error", err);
+      });
       return downloadResponse;
     } else if (uploadResponse) {
+      res.catch((err) => {
+        uploadResponse.emit("error", err);
+      });
       return uploadResponse;
     }
     const response = await res;
@@ -386,6 +395,11 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
             retries++;
             const currentDelay = incrementDelay ? retryDelay * retries : retryDelay;
             debugLog.retry(config, retries, maxRetries, responseStatusCode, currentDelay);
+            if (config.hooks?.beforeRetry && config.hooks.beforeRetry.length > 0) {
+              for (const hook of config.hooks.beforeRetry) {
+                await hook(config, response, retries);
+              }
+            }
             if (retryDelay > 0) {
               await new Promise((resolve) => setTimeout(resolve, currentDelay));
             }
@@ -411,17 +425,32 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         const addedOptions = {};
         const location = _stats.redirectUrl;
         if (!location || !_stats.redirectUrl) {
-          throw builErrorFromResponse("Redirect location not found", response, config, fetchOptions);
+          const redirectError = builErrorFromResponse("Redirect location not found", response, config, fetchOptions);
+          _stats.statusOnNext = "error";
+          if (!config.errors)
+            config.errors = [];
+          config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+          throw redirectError;
         }
         if (config.maxRedirects === 0) {
           config.maxRedirectsReached = true;
-          throw builErrorFromResponse(`Redirects are disabled (maxRedirects=0)`, response, config, fetchOptions);
+          const redirectError = builErrorFromResponse(`Redirects are disabled (maxRedirects=0)`, response, config, fetchOptions);
+          _stats.statusOnNext = "error";
+          if (!config.errors)
+            config.errors = [];
+          config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+          throw redirectError;
         }
         const enableCycleDetection = config.enableRedirectCycleDetection === true;
         if (enableCycleDetection) {
           const normalizedRedirectUrl = _stats.redirectUrl.toLowerCase();
           if (visitedUrls.has(normalizedRedirectUrl)) {
-            throw builErrorFromResponse(`Redirect cycle detected: attempting to revisit ${_stats.redirectUrl}`, response, config, fetchOptions);
+            const redirectError = builErrorFromResponse(`Redirect cycle detected: attempting to revisit ${_stats.redirectUrl}`, response, config, fetchOptions);
+            _stats.statusOnNext = "error";
+            if (!config.errors)
+              config.errors = [];
+            config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+            throw redirectError;
           }
           visitedUrls.add(normalizedRedirectUrl);
         }
@@ -438,15 +467,30 @@ async function executeHttp1Request(fetchOptions, config, options, perform, fs, s
         if (typeof onRedirect !== "undefined") {
           if (typeof onRedirect === "boolean") {
             if (!onRedirect) {
-              throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
+              const redirectError = builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
+              _stats.statusOnNext = "error";
+              if (!config.errors)
+                config.errors = [];
+              config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+              throw redirectError;
             }
           } else if (!onRedirect.redirect) {
-            throw builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
+            const redirectError = builErrorFromResponse("Redirect denied by user", response, config, fetchOptions);
+            _stats.statusOnNext = "error";
+            if (!config.errors)
+              config.errors = [];
+            config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+            throw redirectError;
           }
         }
         if (config.redirectCount >= config.maxRedirects && config.maxRedirects > 0) {
           config.maxRedirectsReached = true;
-          throw builErrorFromResponse(`Max redirects (${config.maxRedirects}) reached`, response, config, fetchOptions);
+          const redirectError = builErrorFromResponse(`Max redirects (${config.maxRedirects}) reached`, response, config, fetchOptions);
+          _stats.statusOnNext = "error";
+          if (!config.errors)
+            config.errors = [];
+          config.errors.push({ attempt: config.retryAttempts + 1, error: redirectError, duration: perform.now() });
+          throw redirectError;
         }
         config.redirectHistory.push({
           url: fetchOptions.fullUrl,
@@ -574,7 +618,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"];
-          updateCookies(config, headers, url.href);
+          await updateCookies(config, headers, url.href);
           const cookieArray = config.responseCookies?.array || [];
           delete headers["set-cookie"];
           _stats.redirectUrl = undefined;
@@ -641,7 +685,11 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
           if (isRedirected)
             _stats.statusOnNext = "redirect";
           if (isRedirected && location) {
-            _stats.redirectUrl = new URL(location, url).href;
+            const redirectUrlObj = new URL(location, url);
+            if (!redirectUrlObj.hash && url.hash) {
+              redirectUrlObj.hash = url.hash;
+            }
+            _stats.redirectUrl = redirectUrlObj.href;
             if (config.redirectCount) {
               config.redirectCount++;
             } else {
@@ -871,19 +919,52 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
             });
           }
         });
+        req.on("error", (err) => {
+          _stats.statusOnNext = "error";
+          const error = buildSmartError(config, fetchOptions, err);
+          resolve(error);
+        });
         req.on("socket", (socket) => {
-          if (socket && typeof socket.unref === "function") {
-            socket.unref();
+          if (socket && typeof socket.ref === "function") {
+            socket.ref();
           }
+          socket.on("error", (err) => {
+            _stats.statusOnNext = "error";
+            const error = buildSmartError(config, fetchOptions, err);
+            resolve(error);
+          });
+          socket.on("close", () => {
+            if (socket && typeof socket.unref === "function") {
+              socket.unref();
+            }
+          });
           timing.dnsStart = performance.now();
           config.timing.domainLookupStart = timing.dnsStart;
-          socket.on("lookup", () => {
+          socket.on("lookup", (err, address, family) => {
             if (!timing.dnsEnd) {
               timing.dnsEnd = performance.now();
               config.timing.domainLookupEnd = timing.dnsEnd;
               timing.tcpStart = performance.now();
               config.timing.connectStart = timing.tcpStart;
             }
+            if (config.hooks?.onDns && config.hooks.onDns.length > 0) {
+              const familyNum = typeof family === "number" ? family : family === "IPv6" ? 6 : 4;
+              for (const hook of config.hooks.onDns) {
+                try {
+                  hook({
+                    hostname: url.hostname,
+                    address: address || "",
+                    family: familyNum,
+                    duration: timing.dnsEnd - timing.dnsStart,
+                    timestamp: Date.now()
+                  }, config);
+                } catch (err) {
+                  if (config.debug) {
+                    console.log("[Rezo Debug] onDns hook error:", err);
+                  }
+                }
+              }
+            }
           });
           socket.on("secureConnect", () => {
             if (!timing.tlsEnd && timing.tlsStart) {
@@ -910,6 +991,31 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
               hostnameMatch: cert.subject?.CN === url.hostname,
               chainValid: true
             };
+            if (config.hooks?.onTls && config.hooks.onTls.length > 0) {
+              for (const hook of config.hooks.onTls) {
+                try {
+                  hook({
+                    protocol: tlsVersion,
+                    cipher: cipher?.name || "",
+                    authorized: !socket.authorizationError,
+                    authorizationError: socket.authorizationError,
+                    certificate: cert ? {
+                      subject: cert.subject?.CN || "",
+                      issuer: cert.issuer?.CN || "",
+                      validFrom: cert.valid_from || "",
+                      validTo: cert.valid_to || "",
+                      fingerprint: cert.fingerprint || ""
+                    } : undefined,
+                    duration: timing.tlsEnd - timing.tlsStart,
+                    timestamp: Date.now()
+                  }, config);
+                } catch (err) {
+                  if (config.debug) {
+                    console.log("[Rezo Debug] onTls hook error:", err);
+                  }
+                }
+              }
+            }
           });
           socket.on("connect", () => {
             if (!timing.tcpEnd) {
@@ -928,6 +1034,24 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
               config.network.localPort = localPort;
               config.network.family = remoteFamily;
             }
+            if (config.hooks?.onSocket && config.hooks.onSocket.length > 0) {
+              for (const hook of config.hooks.onSocket) {
+                try {
+                  hook({
+                    type: "connect",
+                    localAddress,
+                    localPort,
+                    remoteAddress,
+                    remotePort,
+                    timestamp: Date.now()
+                  }, socket);
+                } catch (err) {
+                  if (config.debug) {
+                    console.log("[Rezo Debug] onSocket hook error:", err);
+                  }
+                }
+              }
+            }
           });
         });
         req.on("error", (error) => {
@@ -1323,18 +1447,52 @@ function parseProxy(proxy, isScure = true, rejectUnauthorized = false) {
   }
   return rezoProxy(proxy);
 }
-function updateCookies(config, headers, url) {
+async function updateCookies(config, headers, url) {
   const cookies = headers["set-cookie"];
   if (cookies) {
     const jar = new RezoCookieJar;
+    const tempJar = new RezoCookieJar;
+    tempJar.setCookiesSync(cookies, url);
+    const parsedCookies = tempJar.cookies();
+    const acceptedCookies = [];
+    let hookError = null;
+    if (config.hooks?.beforeCookie && config.hooks.beforeCookie.length > 0) {
+      for (const cookie of parsedCookies.array) {
+        let shouldAccept = true;
+        for (const hook of config.hooks.beforeCookie) {
+          try {
+            const result = await hook({
+              cookie,
+              source: "response",
+              url,
+              isValid: true
+            }, config);
+            if (result === false) {
+              shouldAccept = false;
+              break;
+            }
+          } catch (err) {
+            hookError = err;
+            if (config.debug) {
+              console.log("[Rezo Debug] beforeCookie hook error:", err);
+            }
+          }
+        }
+        if (shouldAccept) {
+          acceptedCookies.push(cookie);
+        }
+      }
+    } else {
+      acceptedCookies.push(...parsedCookies.array);
+    }
+    const acceptedCookieStrings = acceptedCookies.map((c) => c.cookieString());
     if (config.enableCookieJar && config.cookieJar) {
-      config.cookieJar.setCookiesSync(cookies, url);
+      config.cookieJar.setCookiesSync(acceptedCookieStrings, url);
     }
-    jar.setCookiesSync(cookies, url);
+    jar.setCookiesSync(acceptedCookieStrings, url);
     if (config.useCookies) {
-      const parsedCookies = jar.cookies();
       const existingArray = config.responseCookies?.array || [];
-      for (const cookie of parsedCookies.array) {
+      for (const cookie of acceptedCookies) {
         const existingIndex = existingArray.findIndex((c) => c.key === cookie.key && c.domain === cookie.domain);
         if (existingIndex >= 0) {
           existingArray[existingIndex] = cookie;
@@ -1345,6 +1503,17 @@ function updateCookies(config, headers, url) {
       const mergedJar = new RezoCookieJar(existingArray, url);
       config.responseCookies = mergedJar.cookies();
     }
+    if (!hookError && config.hooks?.afterCookie && config.hooks.afterCookie.length > 0) {
+      for (const hook of config.hooks.afterCookie) {
+        try {
+          await hook(acceptedCookies, config);
+        } catch (err) {
+          if (config.debug) {
+            console.log("[Rezo Debug] afterCookie hook error:", err);
+          }
+        }
+      }
+    }
   }
 }