rezo 1.0.12 → 1.0.13

package/dist/adapters/fetch.js

@@ -1,7 +1,7 @@
 import { URL } from "node:url";
 import { RezoError } from '../errors/rezo-error.js';
 import { buildSmartError, builErrorFromResponse, buildDownloadError } from '../responses/buildError.js';
-import { Cookie } from '../utils/cookies.js';
+import { RezoCookieJar } from '../utils/cookies.js';
 import RezoFormData from '../utils/form-data.js';
 import { getDefaultConfig, prepareHTTPOptions } from '../utils/http-config.js';
 import { RezoHeaders } from '../utils/headers.js';
@@ -105,39 +105,69 @@ function sanitizeConfig(config) {
   delete sanitized.data;
   return sanitized;
 }
-function parseCookiesFromHeaders(headers, url) {
-  const cookies = {
+function parseCookiesFromHeaders(headers, url, config) {
+  let setCookieHeaders = [];
+  if (typeof headers.getSetCookie === "function") {
+    setCookieHeaders = headers.getSetCookie() || [];
+  } else {
+    const setCookieRaw = headers.get("set-cookie");
+    if (setCookieRaw) {
+      const splitPattern = /,(?=\s*[A-Za-z0-9_-]+=)/;
+      setCookieHeaders = setCookieRaw.split(splitPattern).map((s) => s.trim()).filter(Boolean);
+    }
+  }
+  if (setCookieHeaders.length === 0) {
+    return {
+      array: [],
+      serialized: [],
+      netscape: "",
+      string: "",
+      setCookiesString: []
+    };
+  }
+  const jar = new RezoCookieJar;
+  jar.setCookiesSync(setCookieHeaders, url);
+  if (config?.enableCookieJar && config?.cookieJar) {
+    config.cookieJar.setCookiesSync(setCookieHeaders, url);
+  }
+  const cookies = jar.cookies();
+  cookies.setCookiesString = setCookieHeaders;
+  return cookies;
+}
+function mergeRequestAndResponseCookies(config, responseCookies, url) {
+  const mergedCookiesArray = [];
+  const cookieKeyDomainMap = new Map;
+  if (config.requestCookies && config.requestCookies.length > 0) {
+    for (const cookie of config.requestCookies) {
+      const key = `${cookie.key}|${cookie.domain || ""}`;
+      mergedCookiesArray.push(cookie);
+      cookieKeyDomainMap.set(key, mergedCookiesArray.length - 1);
+    }
+  }
+  for (const cookie of responseCookies.array) {
+    const key = `${cookie.key}|${cookie.domain || ""}`;
+    const existingIndex = cookieKeyDomainMap.get(key);
+    if (existingIndex !== undefined) {
+      mergedCookiesArray[existingIndex] = cookie;
+    } else {
+      mergedCookiesArray.push(cookie);
+      cookieKeyDomainMap.set(key, mergedCookiesArray.length - 1);
+    }
+  }
+  if (mergedCookiesArray.length > 0) {
+    const mergedJar = new RezoCookieJar(mergedCookiesArray, url);
+    return mergedJar.cookies();
+  }
+  return {
     array: [],
     serialized: [],
-    netscape: "",
+    netscape: `# Netscape HTTP Cookie File
+# This file was generated by Rezo HTTP client
+# Based on uniqhtt cookie implementation
+`,
     string: "",
     setCookiesString: []
   };
-  const setCookieHeaders = headers.getSetCookie?.() || [];
-  for (const cookieStr of setCookieHeaders) {
-    cookies.setCookiesString.push(cookieStr);
-    const parts = cookieStr.split(";");
-    const [nameValue] = parts;
-    const [name, ...valueParts] = nameValue.split("=");
-    const value = valueParts.join("=");
-    if (name && value !== undefined) {
-      const cookie = new Cookie({
-        key: name.trim(),
-        value: value.trim(),
-        domain: new URL(url).hostname,
-        path: "/",
-        httpOnly: cookieStr.toLowerCase().includes("httponly"),
-        secure: cookieStr.toLowerCase().includes("secure"),
-        sameSite: "lax"
-      });
-      cookies.array.push(cookie);
-    }
-  }
-  cookies.string = cookies.array.map((c) => `${c.key}=${c.value}`).join("; ");
-  cookies.serialized = cookies.array.map((c) => c.toJSON());
-  cookies.netscape = cookies.array.map((c) => c.toNetscapeFormat()).join(`
-`);
-  return cookies;
 }
 function toFetchHeaders(headers) {
   const fetchHeaders = new Headers;
@@ -181,7 +211,7 @@ async function prepareFetchBody(body) {
         return new Uint8Array(buffer);
       }
     }
-    const nativeForm = body.toNativeFormData();
+    const nativeForm = await body.toNativeFormData();
     if (nativeForm) {
       return nativeForm;
     }
@@ -306,6 +336,8 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
       const response = await executeSingleFetchRequest(config, fetchOptions, requestCount, timing, _stats, streamResult, downloadResult, uploadResult);
       const statusOnNext = _stats.statusOnNext;
       if (response instanceof RezoError) {
+        if (!config.errors)
+          config.errors = [];
         config.errors.push({
           attempt: config.retryAttempts + 1,
           error: response,
@@ -316,28 +348,25 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
           throw response;
         }
         if (config.retry) {
+          let shouldRetry = false;
           if (config.retry.condition) {
             const isPassed = await config.retry.condition(response);
-            if (typeof isPassed === "boolean" && isPassed === false) {
-              throw response;
-            }
+            shouldRetry = isPassed === true;
           } else {
-            if (statusCodes && !statusCodes.includes(response.status || 0)) {
-              throw response;
-            }
-            if (maxRetries <= retries) {
-              throw response;
-            }
-            retries++;
-            if (retryDelay > 0) {
-              await new Promise((resolve) => setTimeout(resolve, incrementDelay ? retryDelay * retries : retryDelay));
-            }
+            shouldRetry = statusCodes ? statusCodes.includes(response.status || 0) : true;
           }
+          if (!shouldRetry || retries >= maxRetries) {
+            throw response;
+          }
+          retries++;
           config.retryAttempts++;
+          if (retryDelay > 0) {
+            await new Promise((resolve) => setTimeout(resolve, incrementDelay ? retryDelay * retries : retryDelay));
+          }
         }
         continue;
       }
-      if (statusOnNext === "success") {
+      if (statusOnNext === "success" || statusOnNext === "error") {
         return response;
       }
       if (statusOnNext === "redirect") {
@@ -418,7 +447,13 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
       config.isSecure = isSecure;
       config.finalUrl = url.href;
       config.network.protocol = isSecure ? "https" : "http";
+      config.network.httpVersion = undefined;
       config.timing.startTimestamp = timing.startTimestamp;
+      if (!config.transfer) {
+        config.transfer = { requestSize: 0, responseSize: 0, headerSize: 0, bodySize: 0 };
+      } else if (config.transfer.requestSize === undefined) {
+        config.transfer.requestSize = 0;
+      }
     }
     const reqHeaders = fetchOptions.headers instanceof RezoHeaders ? fetchOptions.headers.toObject() : fetchOptions.headers || {};
     const headers = toFetchHeaders(reqHeaders);
@@ -448,7 +483,26 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
           clearTimeout(timeoutId);
       });
     }
+    if (body instanceof RezoFormData) {
+      const contentType = body.getContentType();
+      if (contentType && !headers.has("content-type")) {
+        headers.set("content-type", contentType);
+      }
+    }
     const preparedBody = await prepareFetchBody(body);
+    if (config.transfer && body) {
+      if (typeof body === "string") {
+        config.transfer.requestSize = body.length;
+      } else if (body instanceof ArrayBuffer || body instanceof Uint8Array) {
+        config.transfer.requestSize = body.byteLength || body.length;
+      } else if (body instanceof URLSearchParams || body instanceof RezoURLSearchParams) {
+        config.transfer.requestSize = body.toString().length;
+      } else if (body instanceof RezoFormData) {
+        config.transfer.requestSize = body.getLengthSync();
+      } else if (typeof body === "object" && !(body instanceof Blob) && !(body instanceof ReadableStream)) {
+        config.transfer.requestSize = JSON.stringify(body).length;
+      }
+    }
     const fetchInit = {
       method: fetchOptions.method.toUpperCase(),
       headers,
@@ -482,7 +536,7 @@ 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);
+    const cookies = parseCookiesFromHeaders(response.headers, url.href, config);
     config.responseCookies = cookies;
     const location = response.headers.get("location");
     const isRedirect = status >= 300 && status < 400 && location;
@@ -564,23 +618,16 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
     const bodySize = bodyBuffer?.byteLength || (typeof responseData === "string" ? responseData.length : 0);
     config.transfer.bodySize = bodySize;
     config.transfer.responseSize = bodySize;
-    if (status >= 400) {
-      const error = builErrorFromResponse(`HTTP Error ${status}: ${statusText}`, {
-        status,
-        statusText,
-        headers: responseHeaders,
-        data: responseData
-      }, config, fetchOptions);
-      _stats.statusOnNext = "error";
-      return error;
-    }
-    _stats.statusOnNext = "success";
+    config.status = status;
+    config.statusText = statusText;
+    _stats.statusOnNext = status >= 400 ? "error" : "success";
+    const mergedCookies = mergeRequestAndResponseCookies(config, cookies, url.href);
     const finalResponse = {
       data: responseData,
       status,
       statusText,
       headers: responseHeaders,
-      cookies,
+      cookies: mergedCookies,
       config,
       contentType,
       contentLength: bodySize,
@@ -599,7 +646,7 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
           contentType,
           contentLength: buffer.length,
           finalUrl: url.href,
-          cookies,
+          cookies: mergedCookies,
           urls: buildUrlTree(config, url.href),
           fileName: config.fileName,
           fileSize: buffer.length,
@@ -646,7 +693,7 @@ async function executeSingleFetchRequest(config, fetchOptions, requestCount, tim
           contentLength: bodySize
         },
         finalUrl: url.href,
-        cookies,
+        cookies: mergedCookies,
         urls: buildUrlTree(config, url.href),
         uploadSize: config.transfer.requestSize || 0,
         timing: {

package/dist/adapters/http.cjs

@@ -821,10 +821,23 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
             }
           });
         });
+        req.on("error", (error) => {
+          _stats.statusOnNext = "error";
+          updateTiming(config, timing, "", 0);
+          const e = buildSmartError(config, fetchOptions, error);
+          const eventEmitter = streamResult || downloadResult || uploadResult;
+          if (eventEmitter) {
+            eventEmitter.emit("error", e);
+          }
+          resolve(e);
+          return;
+        });
+        let bodyPiped = false;
         if (body) {
           if (body instanceof URLSearchParams || body instanceof RezoURLSearchParams) {
             req.write(body.toString());
           } else if (body instanceof FormData || body instanceof RezoFormData) {
+            bodyPiped = true;
             if (body instanceof RezoFormData) {
               req.setHeader("Content-Type", `multipart/form-data; boundary=${body.getBoundary()}`);
               body.pipe(req);
@@ -833,24 +846,18 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
               req.setHeader("Content-Type", `multipart/form-data; boundary=${form.getBoundary()}`);
               form.pipe(req);
             }
-          } else if (typeof body === "object" && !(body instanceof Buffer) && !(body instanceof Uint8Array) && !(body instanceof Readable)) {
+          } else if (body instanceof Readable) {
+            bodyPiped = true;
+            body.pipe(req);
+          } else if (typeof body === "object" && !(body instanceof Buffer) && !(body instanceof Uint8Array)) {
             req.write(JSON.stringify(body));
           } else {
             req.write(body);
           }
         }
-        req.end();
-        req.on("error", (error) => {
-          _stats.statusOnNext = "error";
-          updateTiming(config, timing, "", 0);
-          const e = buildSmartError(config, fetchOptions, error);
-          const eventEmitter = streamResult || downloadResult || uploadResult;
-          if (eventEmitter) {
-            eventEmitter.emit("error", e);
-          }
-          resolve(e);
-          return;
-        });
+        if (!bodyPiped) {
+          req.end();
+        }
       } catch (error) {
         _stats.statusOnNext = "error";
         updateTiming(config, timing, "", 0);

package/dist/adapters/http.js

@@ -821,10 +821,23 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
             }
           });
         });
+        req.on("error", (error) => {
+          _stats.statusOnNext = "error";
+          updateTiming(config, timing, "", 0);
+          const e = buildSmartError(config, fetchOptions, error);
+          const eventEmitter = streamResult || downloadResult || uploadResult;
+          if (eventEmitter) {
+            eventEmitter.emit("error", e);
+          }
+          resolve(e);
+          return;
+        });
+        let bodyPiped = false;
         if (body) {
           if (body instanceof URLSearchParams || body instanceof RezoURLSearchParams) {
             req.write(body.toString());
           } else if (body instanceof FormData || body instanceof RezoFormData) {
+            bodyPiped = true;
             if (body instanceof RezoFormData) {
               req.setHeader("Content-Type", `multipart/form-data; boundary=${body.getBoundary()}`);
               body.pipe(req);
@@ -833,24 +846,18 @@ async function request(config, fetchOptions, requestCount, timing, _stats, respo
               req.setHeader("Content-Type", `multipart/form-data; boundary=${form.getBoundary()}`);
               form.pipe(req);
             }
-          } else if (typeof body === "object" && !(body instanceof Buffer) && !(body instanceof Uint8Array) && !(body instanceof Readable)) {
+          } else if (body instanceof Readable) {
+            bodyPiped = true;
+            body.pipe(req);
+          } else if (typeof body === "object" && !(body instanceof Buffer) && !(body instanceof Uint8Array)) {
             req.write(JSON.stringify(body));
           } else {
             req.write(body);
           }
         }
-        req.end();
-        req.on("error", (error) => {
-          _stats.statusOnNext = "error";
-          updateTiming(config, timing, "", 0);
-          const e = buildSmartError(config, fetchOptions, error);
-          const eventEmitter = streamResult || downloadResult || uploadResult;
-          if (eventEmitter) {
-            eventEmitter.emit("error", e);
-          }
-          resolve(e);
-          return;
-        });
+        if (!bodyPiped) {
+          req.end();
+        }
       } catch (error) {
         _stats.statusOnNext = "error";
         updateTiming(config, timing, "", 0);