rezo 1.0.29 → 1.0.31

package/dist/utils/http-config.js

@@ -2,9 +2,12 @@ import { RezoCookieJar } from './cookies.js';
 import RezoFormData from './form-data.js';
 import { RezoHeaders } from './headers.js';
 import { RezoURLSearchParams } from './data-operations.js';
-import path from "node:path";
-import { parseProxyString } from '../proxy/index.js';
+import { parseProxyString } from '../proxy/parse.js';
 import { createDefaultHooks, mergeHooks, serializeHooks } from '../core/hooks.js';
+const hasBuffer = typeof Buffer !== "undefined";
+function isBuffer(value) {
+  return hasBuffer && Buffer.isBuffer(value);
+}
 export const ERROR_INFO = {
   ECONNREFUSED: {
     code: -111,
@@ -314,7 +317,6 @@ export function prepareHTTPOptions(options, jar, addedOptions, config) {
       if (options.formData || options.multipart) {
         if (options.multipart instanceof RezoFormData || options.formData instanceof RezoFormData) {
           const body = options.multipart instanceof RezoFormData ? options.multipart : options.formData;
-          contentType = body.getContentType();
           fetchOptions.body = body;
         } else {
           const body = new RezoFormData;
@@ -323,27 +325,31 @@ export function prepareHTTPOptions(options, jar, addedOptions, config) {
             Object.entries(_body).forEach(([key, value]) => {
               if (value === null || value === undefined) {
                 body.append(key, "");
-              } else if (typeof value === "string" || Buffer.isBuffer(value)) {
+              } else if (typeof value === "string") {
+                body.append(key, value);
+              } else if (isBuffer(value)) {
                 body.append(key, value);
-              } else if (typeof value === "object" && typeof value.pipe === "function") {
+              } else if (value instanceof Blob) {
                 body.append(key, value);
               } else if (typeof value === "object" && value.value !== undefined) {
                 const val = value.value;
-                const opts = value.options || {};
-                if (typeof val === "string" || Buffer.isBuffer(val)) {
-                  body.append(key, val, opts);
+                const filename = value.options?.filename || value.filename;
+                if (typeof val === "string") {
+                  body.append(key, val);
+                } else if (isBuffer(val)) {
+                  body.append(key, val, filename);
+                } else if (val instanceof Blob) {
+                  body.append(key, val, filename);
                 } else {
-                  body.append(key, String(val), opts);
+                  body.append(key, String(val));
                 }
               } else {
                 body.append(key, String(value));
               }
             });
           }
-          contentType = body.getContentType();
           fetchOptions.body = body;
         }
-        fetchOptions.headers.set("Content-Type", contentType);
       } else if (options.form) {
         contentType = "application/x-www-form-urlencoded";
         if (typeof options.form === "object") {
@@ -375,17 +381,23 @@ export function prepareHTTPOptions(options, jar, addedOptions, config) {
           Object.entries(fetchOptions.body).forEach(([key, value]) => {
             if (value === null || value === undefined) {
               formData.append(key, "");
-            } else if (typeof value === "string" || Buffer.isBuffer(value)) {
+            } else if (typeof value === "string") {
               formData.append(key, value);
-            } else if (typeof value === "object" && typeof value.pipe === "function") {
+            } else if (isBuffer(value)) {
+              formData.append(key, value);
+            } else if (value instanceof Blob) {
               formData.append(key, value);
             } else if (typeof value === "object" && value.value !== undefined) {
               const val = value.value;
-              const opts = value.options || {};
-              if (typeof val === "string" || Buffer.isBuffer(val)) {
-                formData.append(key, val, opts);
+              const filename = value.options?.filename || value.filename;
+              if (typeof val === "string") {
+                formData.append(key, val);
+              } else if (isBuffer(val)) {
+                formData.append(key, val, filename);
+              } else if (val instanceof Blob) {
+                formData.append(key, val, filename);
               } else {
-                formData.append(key, String(val), opts);
+                formData.append(key, String(val));
               }
             } else {
               formData.append(key, String(value));
@@ -642,13 +654,21 @@ As a workaround, process.env.NODE_TLS_REJECT_UNAUTHORIZED is being set to '0'.
     } else if (!fs) {
       throw new Error(`You can only use this feature in nodejs module, not in Edge module.`);
     }
-    const name = path.basename(saveTo);
-    if (checkISPermission && checkISPermission(saveTo.length ? path.dirname(saveTo) : path.resolve(process.cwd()), fs)) {
-      const dir = name.length < saveTo.length ? path.dirname(saveTo) : path.join(process.cwd(), "download");
+    const basename = (p) => p.split(/[/\\]/).pop() || "";
+    const dirname = (p) => {
+      const parts = p.split(/[/\\]/);
+      parts.pop();
+      return parts.join("/") || ".";
+    };
+    const join = (...parts) => parts.join("/").replace(/\/+/g, "/");
+    const name = basename(saveTo);
+    const cwd = typeof process !== "undefined" && process.cwd ? process.cwd() : ".";
+    if (checkISPermission && checkISPermission(saveTo.length ? dirname(saveTo) : cwd, fs)) {
+      const dir = name.length < saveTo.length ? dirname(saveTo) : join(cwd, "download");
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
       }
-      fileName = path.join(dir, name);
+      fileName = join(dir, name);
       config.fileName = fileName;
     } else {
       throw new Error(`Permission denied to save to ${saveTo}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rezo",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Lightning-fast, enterprise-grade HTTP client for modern JavaScript. Full HTTP/2 support, intelligent cookie management, multiple adapters (HTTP, Fetch, cURL, XHR), streaming, proxy support (HTTP/HTTPS/SOCKS), and cross-environment compatibility.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -61,7 +61,6 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "form-data": "^4.0.4",
     "tough-cookie": "^5.1.2",
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.6",
@@ -211,12 +210,20 @@
     "./dist/platform/node.js": "./dist/platform/browser.js",
     "./dist/platform/node.cjs": "./dist/platform/browser.cjs",
     "./dist/adapters/http.js": "./dist/adapters/fetch.js",
-    "./dist/adapters/http.cjs": "./dist/adapters/fetch.cjs"
+    "./dist/adapters/http.cjs": "./dist/adapters/fetch.cjs",
+    "./dist/utils/cookies.js": "./dist/utils/cookies.browser.js",
+    "./dist/utils/cookies.cjs": "./dist/utils/cookies.browser.cjs",
+    "./dist/cache/response-cache.js": "./dist/cache/universal-response-cache.js",
+    "./dist/cache/response-cache.cjs": "./dist/cache/universal-response-cache.cjs"
   },
   "react-native": {
     "./dist/platform/node.js": "./dist/platform/react-native.js",
     "./dist/platform/node.cjs": "./dist/platform/react-native.cjs",
-    "./dist/adapters/http.js": "./dist/adapters/react-native.js"
+    "./dist/adapters/http.js": "./dist/adapters/react-native.js",
+    "./dist/utils/cookies.js": "./dist/utils/cookies.browser.js",
+    "./dist/utils/cookies.cjs": "./dist/utils/cookies.browser.cjs",
+    "./dist/cache/response-cache.js": "./dist/cache/universal-response-cache.js",
+    "./dist/cache/response-cache.cjs": "./dist/cache/universal-response-cache.cjs"
   },
   "files": [
     "dist/**/*",

package/dist/types/cookies.cjs

@@ -1,394 +0,0 @@
-const { CookieJar: TouchCookieJar, Cookie: TouchCookie } = require("tough-cookie");
-
-class Cookie extends TouchCookie {
-  constructor(options) {
-    super(options);
-  }
-  getExpires() {
-    let expires = 0;
-    if (this.expires && typeof this.expires !== "string") {
-      expires = Math.round(this.expires.getTime() / 1000);
-    } else if (this.maxAge) {
-      if (this.maxAge === "Infinity") {
-        expires = 2147483647;
-      } else if (this.maxAge === "-Infinity") {
-        expires = 0;
-      } else if (typeof this.maxAge === "number") {
-        expires = Math.round(Date.now() / 1000 + this.maxAge);
-      }
-    }
-    return expires;
-  }
-  toNetscapeFormat() {
-    const domain = !this.hostOnly ? this.domain.startsWith(".") ? this.domain : "." + this.domain : this.domain;
-    const secure = this.secure ? "TRUE" : "FALSE";
-    const expires = this.getExpires();
-    return `${domain}	TRUE	${this.path}	${secure}	${expires}	${this.key}	${this.value}`;
-  }
-  toSetCookieString() {
-    let str = this.cookieString();
-    if (this.expires instanceof Date) {
-      str += `; Expires=${this.expires.toUTCString()}`;
-    }
-    if (this.maxAge != null) {
-      str += `; Max-Age=${this.maxAge}`;
-    }
-    if (this.domain) {
-      str += `; Domain=${this.domain}`;
-    }
-    if (this.path) {
-      str += `; Path=${this.path}`;
-    }
-    if (this.secure) {
-      str += "; Secure";
-    }
-    if (this.httpOnly) {
-      str += "; HttpOnly";
-    }
-    if (this.sameSite) {
-      str += `; SameSite=${this.sameSite}`;
-    }
-    if (this.extensions) {
-      str += `; ${this.extensions.join("; ")}`;
-    }
-    return str;
-  }
-  getURL() {
-    if (!this.domain) {
-      return;
-    }
-    const protocol = this.secure ? "https://" : "http://";
-    const domain = this.domain.startsWith(".") ? this.domain.substring(1) : this.domain;
-    const path = this.path || "/";
-    return `${protocol}${domain}${path}`;
-  }
-}
-
-class CookieJar extends TouchCookieJar {
-  constructor(store, options) {
-    super(store, options);
-  }
-  generateCookies(data) {
-    const cookies = !data ? (this.toJSON()?.cookies || []).map((cookie) => new Cookie(cookie)) : data[0] instanceof Cookie ? data : data.map((cookie) => new Cookie(cookie instanceof TouchCookie ? cookie : Cookie.fromJSON(cookie)));
-    const netscape = cookies.map((cookie) => cookie.toNetscapeFormat());
-    const cookieString = cookies.map((cookie) => cookie.cookieString());
-    const setCookiesString = cookies.map((cookie) => cookie.toSetCookieString());
-    let netscapeString = `# Netscape HTTP Cookie File
-`;
-    netscapeString += `# This file was generated by Rezo HTTP client
-`;
-    netscapeString += `# https://github.com/yuniq-solutions/rezo
-`;
-    netscapeString += netscape.join(`
-`) || "";
-    return {
-      array: cookies,
-      serialized: this.toJSON()?.cookies || [],
-      netscape: netscapeString,
-      string: cookieString.join("; "),
-      setCookiesString
-    };
-  }
-  cookies() {
-    return this.generateCookies();
-  }
-  parseResponseCookies(cookies) {
-    return this.generateCookies(cookies);
-  }
-  static toNetscapeCookie(cookies) {
-    cookies = cookies.map((cookie) => {
-      return cookie instanceof Cookie ? cookie : new Cookie(Cookie.fromJSON(cookie));
-    });
-    let netscapeString = `# Netscape HTTP Cookie File
-`;
-    netscapeString += `# This file was generated by Rezo HTTP client
-`;
-    netscapeString += `# https://github.com/yuniq-solutions/rezo
-`;
-    netscapeString += cookies.map((cookie) => cookie.toNetscapeFormat()).join(`
-`) || "";
-    return netscapeString;
-  }
-  static toCookieString(cookies) {
-    cookies = cookies.map((cookie) => {
-      return cookie instanceof Cookie ? cookie : new Cookie(Cookie.fromJSON(cookie));
-    });
-    return cookies.map((cookie) => cookie.cookieString()).join("; ") || "";
-  }
-  toCookieString() {
-    return this.cookies().string;
-  }
-  toNetscapeCookie() {
-    return this.cookies().netscape;
-  }
-  toArray() {
-    return this.cookies().array;
-  }
-  toSetCookies() {
-    return this.cookies().setCookiesString;
-  }
-  toSerializedCookies() {
-    return this.cookies().serialized;
-  }
-  setCookiesSync(cookiesData, url) {
-    const cookies = [];
-    if (Array.isArray(cookiesData)) {
-      cookiesData.forEach((c) => {
-        const cookie = c instanceof Cookie ? c : typeof c === "string" ? new Cookie(Cookie.parse(c)) : new Cookie(Cookie.fromJSON(c));
-        let isFailed = 0;
-        while (isFailed < 2) {
-          try {
-            if (cookie) {
-              const _url = isFailed > 0 ? cookie.getURL() || url || this.getUrlFromCookie(cookie) : url || this.getUrlFromCookie(cookie);
-              if (_url) {
-                const __cookie = this.setCookieSync(cookie, _url);
-                if (__cookie) {
-                  cookies.push(__cookie);
-                }
-              }
-              isFailed = 4;
-              break;
-            } else {
-              isFailed++;
-            }
-          } catch (error) {
-            isFailed++;
-            if (isFailed > 1) {
-              break;
-            }
-          }
-        }
-      });
-    } else if (typeof cookiesData === "string") {
-      if (cookiesData.includes(",") && (cookiesData.includes("=") && (cookiesData.includes(";") || cookiesData.includes("expires=") || cookiesData.includes("path=")))) {
-        const setCookieStrings = this.splitSetCookiesString(cookiesData);
-        setCookieStrings.forEach((cookieStr) => {
-          const cookie = new Cookie(Cookie.parse(cookieStr));
-          let isFailed = 0;
-          while (isFailed < 2) {
-            try {
-              if (cookie) {
-                const _url = isFailed > 0 ? cookie.getURL() || url || this.getUrlFromCookie(cookie) : url || this.getUrlFromCookie(cookie);
-                if (_url) {
-                  const __cookie = this.setCookieSync(cookie, _url);
-                  if (__cookie) {
-                    cookies.push(__cookie);
-                  }
-                }
-                isFailed = 4;
-                break;
-              } else {
-                isFailed++;
-              }
-            } catch (error) {
-              isFailed++;
-              if (isFailed > 1) {
-                break;
-              }
-            }
-          }
-        });
-      } else if (cookiesData.includes("=") && cookiesData.includes(";")) {
-        const cookiePairs = cookiesData.split(";");
-        cookiePairs.forEach((pair) => {
-          const trimmedPair = pair.trim();
-          if (trimmedPair) {
-            const cookie = new Cookie({ key: trimmedPair.split("=")[0].trim(), value: trimmedPair.split("=")[1]?.trim() || "" });
-            let isFailed = 0;
-            while (isFailed < 2) {
-              try {
-                if (cookie) {
-                  const _url = isFailed > 0 ? cookie.getURL() || url || this.getUrlFromCookie(cookie) : url || this.getUrlFromCookie(cookie);
-                  if (_url) {
-                    const __cookie = this.setCookieSync(cookie, _url);
-                    if (__cookie) {
-                      cookies.push(__cookie);
-                    }
-                  }
-                  isFailed = 4;
-                  break;
-                } else {
-                  isFailed++;
-                }
-              } catch (error) {
-                isFailed++;
-                if (isFailed > 1) {
-                  break;
-                }
-              }
-            }
-          }
-        });
-      } else if (cookiesData.includes("\t") && /^\S+\t/.test(cookiesData)) {
-        const netscapeCookies = this.parseNetscapeCookies(cookiesData);
-        netscapeCookies.forEach((c) => {
-          const cookie = new Cookie(c);
-          let isFailed = 0;
-          while (isFailed < 2) {
-            try {
-              if (cookie) {
-                const _url = isFailed > 0 ? cookie.getURL() || url || this.getUrlFromCookie(cookie) : url || this.getUrlFromCookie(cookie);
-                if (_url) {
-                  const __cookie = this.setCookieSync(cookie, _url);
-                  if (__cookie) {
-                    cookies.push(__cookie);
-                  }
-                }
-                isFailed = 4;
-                break;
-              } else {
-                isFailed++;
-              }
-            } catch (error) {
-              isFailed++;
-              if (isFailed > 1) {
-                break;
-              }
-            }
-          }
-        });
-      } else if (cookiesData.includes("=")) {
-        const cookie = new Cookie(Cookie.parse(cookiesData));
-        let isFailed = 0;
-        while (isFailed < 2) {
-          try {
-            if (cookie) {
-              const _url = isFailed > 0 ? cookie.getURL() || url || this.getUrlFromCookie(cookie) : url || this.getUrlFromCookie(cookie);
-              if (_url) {
-                const __cookie = this.setCookieSync(cookie, _url);
-                if (__cookie) {
-                  cookies.push(__cookie);
-                }
-              }
-              isFailed = 4;
-              break;
-            } else {
-              isFailed++;
-            }
-          } catch (error) {
-            isFailed++;
-            if (isFailed > 1) {
-              break;
-            }
-          }
-        }
-      }
-    }
-    return this.generateCookies(cookies);
-  }
-  splitSetCookiesString(cookiesString) {
-    const result = [];
-    let currentCookie = "";
-    let withinValue = false;
-    for (let i = 0;i < cookiesString.length; i++) {
-      const char = cookiesString[i];
-      if (char === "," && !withinValue) {
-        result.push(currentCookie.trim());
-        currentCookie = "";
-        continue;
-      }
-      if (char === "=") {
-        withinValue = true;
-      } else if (char === ";") {
-        withinValue = false;
-      }
-      currentCookie += char;
-    }
-    if (currentCookie.trim()) {
-      result.push(currentCookie.trim());
-    }
-    return result;
-  }
-  getUrlFromCookie(cookie) {
-    if (!cookie.domain) {
-      return;
-    }
-    const proto = cookie.secure ? "https://" : "http://";
-    const domain = cookie.domain.startsWith(".") ? cookie.domain.substring(1) : cookie.domain;
-    const pathname = cookie.path || "/";
-    return `${proto}${domain}${pathname}`;
-  }
-  parseNetscapeCookies = (cookieText) => {
-    const lines = cookieText.split(`
-`).filter((line) => line.trim() !== "" && !line.startsWith("#"));
-    return lines.map((line) => {
-      const parts = line.split("\t");
-      if (parts.length < 7) {
-        throw new Error(`Invalid Netscape cookie format: ${line}`);
-      }
-      const [domain, _, path, secureStr, expiresStr, name, value] = parts;
-      let expires = null;
-      if (expiresStr !== "0" && expiresStr !== "") {
-        expires = new Date(parseInt(expiresStr, 10) * 1000);
-      }
-      return {
-        domain,
-        path,
-        secure: secureStr.toUpperCase() === "TRUE",
-        expires,
-        key: name,
-        value,
-        httpOnly: false,
-        sameSite: undefined
-      };
-    });
-  };
-  static netscapeCookiesToSetCookieArray(netscapeCookieText) {
-    const parseNetscapeCookies = (cookieText) => {
-      const lines = cookieText.split(`
-`).filter((line) => line.trim() !== "" && !line.startsWith("#"));
-      return lines.map((line) => {
-        const parts = line.split("\t");
-        if (parts.length < 7) {
-          throw new Error(`Invalid Netscape cookie format: ${line}`);
-        }
-        const [domain, _, path, secureStr, expiresStr, name, value] = parts;
-        let expires = null;
-        if (expiresStr !== "0" && expiresStr !== "") {
-          expires = new Date(parseInt(expiresStr, 10) * 1000);
-        }
-        return {
-          domain,
-          path,
-          secure: secureStr.toUpperCase() === "TRUE",
-          expires,
-          name,
-          value,
-          httpOnly: false,
-          sameSite: undefined
-        };
-      });
-    };
-    const cookieToSetCookieString = (cookie) => {
-      let setCookie = `${cookie.name}=${cookie.value}`;
-      if (cookie.domain) {
-        setCookie += `; Domain=${cookie.domain}`;
-      }
-      if (cookie.path) {
-        setCookie += `; Path=${cookie.path}`;
-      }
-      if (cookie.expires) {
-        setCookie += `; Expires=${cookie.expires.toUTCString()}`;
-      }
-      if (cookie.secure) {
-        setCookie += "; Secure";
-      }
-      if (cookie.httpOnly) {
-        setCookie += "; HttpOnly";
-      }
-      if (cookie.sameSite) {
-        setCookie += `; SameSite=${cookie.sameSite}`;
-      }
-      return setCookie;
-    };
-    try {
-      const cookies = parseNetscapeCookies(netscapeCookieText);
-      return cookies.map(cookieToSetCookieString);
-    } catch (error) {
-      return [];
-    }
-  }
-}
-
-exports.Cookie = Cookie;
-exports.CookieJar = CookieJar;