rezo 1.0.12 → 1.0.14

package/dist/adapters/curl.cjs

@@ -6,8 +6,8 @@ const { spawn, execSync } = require("node:child_process");
 const { Readable } = require("node:stream");
 const { EventEmitter } = require("node:events");
 const { RezoError } = require('../errors/rezo-error.cjs');
-const { buildSmartError } = require('../responses/buildError.cjs');
-const { Cookie } = require('../utils/cookies.cjs');
+const { buildSmartError, builErrorFromResponse } = require('../responses/buildError.cjs');
+const { RezoCookieJar, Cookie } = require('../utils/cookies.cjs');
 const RezoFormData = require('../utils/form-data.cjs');
 const { existsSync } = require("node:fs");
 const { getDefaultConfig, prepareHTTPOptions } = require('../utils/http-config.cjs');
@@ -16,6 +16,24 @@ const { StreamResponse } = require('../responses/stream.cjs');
 const { DownloadResponse } = require('../responses/download.cjs');
 const { UploadResponse } = require('../responses/upload.cjs');
 const { RezoPerformance } = require('../utils/tools.cjs');
+function mergeRequestAndResponseCookies(requestCookies, responseCookies) {
+  if (!requestCookies || requestCookies.length === 0) {
+    return responseCookies;
+  }
+  if (responseCookies.length === 0) {
+    return requestCookies;
+  }
+  const cookieMap = new Map;
+  for (const cookie of requestCookies) {
+    const key = `${cookie.key}|${cookie.domain || ""}`;
+    cookieMap.set(key, cookie);
+  }
+  for (const cookie of responseCookies) {
+    const key = `${cookie.key}|${cookie.domain || ""}`;
+    cookieMap.set(key, cookie);
+  }
+  return Array.from(cookieMap.values());
+}
 
 class CurlCapabilities {
   static instance;
@@ -261,7 +279,7 @@ class CurlCommandBuilder {
     this.buildDownloadOptions(config, originalRequest, createdTempFiles);
     this.buildHeaders(config);
     this.buildRedirectOptions(config, originalRequest);
-    this.buildRequestBody(config, createdTempFiles);
+    this.buildRequestBody(config, originalRequest, createdTempFiles);
     if (originalRequest.onUploadProgress || originalRequest.onDownloadProgress) {
       this.addArg("--progress-bar");
     }
@@ -1290,11 +1308,11 @@ class CurlCommandBuilder {
       this.addArg("--max-redirs", "0");
     }
   }
-  buildRequestBody(config, tempFiles) {
-    if (!config.data) {
+  buildRequestBody(config, originalRequest, tempFiles) {
+    const data = originalRequest.body ?? config.data;
+    if (!data) {
       return;
     }
-    const data = config.data;
     if (typeof data === "string") {
       this.addArg("-d", data);
     } else if (Buffer.isBuffer(data)) {
@@ -1304,7 +1322,6 @@ class CurlCommandBuilder {
       this.addArg("--data-binary", `@${dataFile}`);
     } else if (data instanceof RezoFormData) {
       const formData = data;
-      const knownLength = formData.getLengthSync?.() || 0;
       const formDataFile = this.tempFiles.createTempFile("formdata", ".txt");
       const formBuffer = formData.getBuffer?.();
       if (formBuffer) {
@@ -1315,6 +1332,7 @@ class CurlCommandBuilder {
         if (boundary) {
           this.addArg("-H", `Content-Type: multipart/form-data; boundary=${boundary}`);
         }
+        this.addArg("-H", `Content-Length: ${formBuffer.length}`);
       }
     } else if (data instanceof Readable) {
       this.addArg("-d", "@-");
@@ -1324,7 +1342,8 @@ class CurlCommandBuilder {
   }
   buildWriteOutFormat() {
     return [
-      "\\n---CURL_STATS_START---",
+      `
+---CURL_STATS_START---`,
       "http_code:%{http_code}",
       "time_namelookup:%{time_namelookup}",
       "time_connect:%{time_connect}",
@@ -1344,7 +1363,8 @@ class CurlCommandBuilder {
       "ssl_verify_result:%{ssl_verify_result}",
       "content_type:%{content_type}",
       "---CURL_STATS_END---"
-    ].join("\\n");
+    ].join(`
+`);
   }
 }
 
@@ -1381,7 +1401,24 @@ class CurlResponseParser {
     const statusText = this.getStatusText(status);
     const headers = this.parseHeaders(headerSection);
     const rezoHeaders = new RezoHeaders(headers);
-    const cookies = this.parseCookies(headers);
+    const responseCookies = this.parseCookies(headers);
+    const mergedCookieArray = mergeRequestAndResponseCookies(config.requestCookies, responseCookies.array);
+    let cookies;
+    if (mergedCookieArray.length > 0) {
+      const mergedJar = new RezoCookieJar(mergedCookieArray, config.url || "");
+      cookies = mergedJar.cookies();
+    } else {
+      cookies = {
+        array: [],
+        serialized: [],
+        netscape: `# Netscape HTTP Cookie File
+# This file was generated by Rezo HTTP client
+# Based on uniqhtt cookie implementation
+`,
+        string: "",
+        setCookiesString: []
+      };
+    }
     let data;
     const contentType = stats["content_type"] || rezoHeaders.get("content-type") || "";
     const responseType = config.responseType || originalRequest.responseType || "auto";
@@ -1408,6 +1445,25 @@ class CurlResponseParser {
       durationMs: totalMs
     };
     config.timing = timing;
+    config.status = status;
+    config.statusText = statusText;
+    const isSecure = config.url?.startsWith("https") || false;
+    config.adapterUsed = "curl";
+    config.isSecure = isSecure;
+    config.finalUrl = stats["redirect_url"] || config.url || "";
+    if (!config.network) {
+      config.network = {};
+    }
+    config.network.protocol = isSecure ? "https" : "http";
+    config.network.httpVersion = headerSection.match(/HTTP\/([\d.]+)/)?.[1] || "1.1";
+    if (!config.transfer) {
+      config.transfer = { requestSize: 0, responseSize: 0, headerSize: 0, bodySize: 0 };
+    }
+    config.transfer.requestSize = parseInt(stats["size_upload"]) || 0;
+    config.transfer.responseSize = parseInt(stats["size_download"]) || responseBody.length;
+    config.transfer.bodySize = responseBody.length;
+    config.transfer.headerSize = headerSection.length;
+    config.responseCookies = cookies;
     const urls = [config.url];
     if (stats["redirect_url"]) {
       urls.push(stats["redirect_url"]);
@@ -1507,7 +1563,7 @@ class CurlExecutor {
   }
   buildFinalUrl(config) {
     let url = config.url;
-    if (config.baseURL) {
+    if (config.baseURL && !url.startsWith("http://") && !url.startsWith("https://")) {
       url = config.baseURL.replace(/\/$/, "") + "/" + url.replace(/^\//, "");
     }
     if (config.params && Object.keys(config.params).length > 0) {
@@ -1596,6 +1652,13 @@ class CurlExecutor {
       curl.on("close", (code) => {
         try {
           if (code !== 0 && code !== null) {
+            if (code === 22 && stdout) {
+              try {
+                const response = CurlResponseParser.parse(stdout, stderr, config, originalRequest);
+                resolve(response);
+                return;
+              } catch {}
+            }
             const errorCode = this.mapCurlErrorCode(code);
             const errorMessage = this.buildDetailedErrorMessage(code, stderr, config);
             const rezoError = new RezoError(errorMessage, config, errorCode);
@@ -1843,19 +1906,23 @@ async function executeRequest(options, defaultOptions, jar) {
       if (proxyManager && selectedProxy) {
         proxyManager.reportSuccess(selectedProxy);
       }
-      if (config.retry && response.status >= 400) {
-        const maxRetries = config.retry.maxRetries || 0;
-        const statusCodes = config.retry.statusCodes || [408, 429, 500, 502, 503, 504];
-        if (config.retryAttempts < maxRetries && statusCodes.includes(response.status)) {
-          const retryDelay = config.retry.retryDelay || 0;
-          const incrementDelay = config.retry.incrementDelay || false;
-          const delay = incrementDelay ? retryDelay * (config.retryAttempts + 1) : retryDelay;
-          if (delay > 0) {
-            await new Promise((resolve) => setTimeout(resolve, delay));
+      if (response.status >= 400) {
+        const httpError = builErrorFromResponse(`Request failed with status code ${response.status}`, response, config, originalRequest);
+        if (config.retry) {
+          const maxRetries = config.retry.maxRetries || 0;
+          const statusCodes = config.retry.statusCodes || [408, 429, 500, 502, 503, 504];
+          if (config.retryAttempts < maxRetries && statusCodes.includes(response.status)) {
+            const retryDelay = config.retry.retryDelay || 0;
+            const incrementDelay = config.retry.incrementDelay || false;
+            const delay = incrementDelay ? retryDelay * (config.retryAttempts + 1) : retryDelay;
+            if (delay > 0) {
+              await new Promise((resolve) => setTimeout(resolve, delay));
+            }
+            config.retryAttempts++;
+            return executeRequest(options, defaultOptions, jar);
           }
-          config.retryAttempts++;
-          return executeRequest(options, defaultOptions, jar);
         }
+        throw httpError;
       }
     }
     return result;

package/dist/adapters/curl.js

@@ -6,8 +6,8 @@ import { spawn, execSync } from "node:child_process";
 import { Readable } from "node:stream";
 import { EventEmitter } from "node:events";
 import { RezoError } from '../errors/rezo-error.js';
-import { buildSmartError } from '../responses/buildError.js';
-import { Cookie } from '../utils/cookies.js';
+import { buildSmartError, builErrorFromResponse } from '../responses/buildError.js';
+import { RezoCookieJar, Cookie } from '../utils/cookies.js';
 import RezoFormData from '../utils/form-data.js';
 import { existsSync } from "node:fs";
 import { getDefaultConfig, prepareHTTPOptions } from '../utils/http-config.js';
@@ -16,6 +16,24 @@ import { StreamResponse } from '../responses/stream.js';
 import { DownloadResponse } from '../responses/download.js';
 import { UploadResponse } from '../responses/upload.js';
 import { RezoPerformance } from '../utils/tools.js';
+function mergeRequestAndResponseCookies(requestCookies, responseCookies) {
+  if (!requestCookies || requestCookies.length === 0) {
+    return responseCookies;
+  }
+  if (responseCookies.length === 0) {
+    return requestCookies;
+  }
+  const cookieMap = new Map;
+  for (const cookie of requestCookies) {
+    const key = `${cookie.key}|${cookie.domain || ""}`;
+    cookieMap.set(key, cookie);
+  }
+  for (const cookie of responseCookies) {
+    const key = `${cookie.key}|${cookie.domain || ""}`;
+    cookieMap.set(key, cookie);
+  }
+  return Array.from(cookieMap.values());
+}
 
 class CurlCapabilities {
   static instance;
@@ -261,7 +279,7 @@ class CurlCommandBuilder {
     this.buildDownloadOptions(config, originalRequest, createdTempFiles);
     this.buildHeaders(config);
     this.buildRedirectOptions(config, originalRequest);
-    this.buildRequestBody(config, createdTempFiles);
+    this.buildRequestBody(config, originalRequest, createdTempFiles);
     if (originalRequest.onUploadProgress || originalRequest.onDownloadProgress) {
       this.addArg("--progress-bar");
     }
@@ -1290,11 +1308,11 @@ class CurlCommandBuilder {
       this.addArg("--max-redirs", "0");
     }
   }
-  buildRequestBody(config, tempFiles) {
-    if (!config.data) {
+  buildRequestBody(config, originalRequest, tempFiles) {
+    const data = originalRequest.body ?? config.data;
+    if (!data) {
       return;
     }
-    const data = config.data;
     if (typeof data === "string") {
       this.addArg("-d", data);
     } else if (Buffer.isBuffer(data)) {
@@ -1304,7 +1322,6 @@ class CurlCommandBuilder {
       this.addArg("--data-binary", `@${dataFile}`);
     } else if (data instanceof RezoFormData) {
       const formData = data;
-      const knownLength = formData.getLengthSync?.() || 0;
       const formDataFile = this.tempFiles.createTempFile("formdata", ".txt");
       const formBuffer = formData.getBuffer?.();
       if (formBuffer) {
@@ -1315,6 +1332,7 @@ class CurlCommandBuilder {
         if (boundary) {
           this.addArg("-H", `Content-Type: multipart/form-data; boundary=${boundary}`);
         }
+        this.addArg("-H", `Content-Length: ${formBuffer.length}`);
       }
     } else if (data instanceof Readable) {
       this.addArg("-d", "@-");
@@ -1324,7 +1342,8 @@ class CurlCommandBuilder {
   }
   buildWriteOutFormat() {
     return [
-      "\\n---CURL_STATS_START---",
+      `
+---CURL_STATS_START---`,
       "http_code:%{http_code}",
       "time_namelookup:%{time_namelookup}",
       "time_connect:%{time_connect}",
@@ -1344,7 +1363,8 @@ class CurlCommandBuilder {
       "ssl_verify_result:%{ssl_verify_result}",
       "content_type:%{content_type}",
       "---CURL_STATS_END---"
-    ].join("\\n");
+    ].join(`
+`);
   }
 }
 
@@ -1381,7 +1401,24 @@ class CurlResponseParser {
     const statusText = this.getStatusText(status);
     const headers = this.parseHeaders(headerSection);
     const rezoHeaders = new RezoHeaders(headers);
-    const cookies = this.parseCookies(headers);
+    const responseCookies = this.parseCookies(headers);
+    const mergedCookieArray = mergeRequestAndResponseCookies(config.requestCookies, responseCookies.array);
+    let cookies;
+    if (mergedCookieArray.length > 0) {
+      const mergedJar = new RezoCookieJar(mergedCookieArray, config.url || "");
+      cookies = mergedJar.cookies();
+    } else {
+      cookies = {
+        array: [],
+        serialized: [],
+        netscape: `# Netscape HTTP Cookie File
+# This file was generated by Rezo HTTP client
+# Based on uniqhtt cookie implementation
+`,
+        string: "",
+        setCookiesString: []
+      };
+    }
     let data;
     const contentType = stats["content_type"] || rezoHeaders.get("content-type") || "";
     const responseType = config.responseType || originalRequest.responseType || "auto";
@@ -1408,6 +1445,25 @@ class CurlResponseParser {
       durationMs: totalMs
     };
     config.timing = timing;
+    config.status = status;
+    config.statusText = statusText;
+    const isSecure = config.url?.startsWith("https") || false;
+    config.adapterUsed = "curl";
+    config.isSecure = isSecure;
+    config.finalUrl = stats["redirect_url"] || config.url || "";
+    if (!config.network) {
+      config.network = {};
+    }
+    config.network.protocol = isSecure ? "https" : "http";
+    config.network.httpVersion = headerSection.match(/HTTP\/([\d.]+)/)?.[1] || "1.1";
+    if (!config.transfer) {
+      config.transfer = { requestSize: 0, responseSize: 0, headerSize: 0, bodySize: 0 };
+    }
+    config.transfer.requestSize = parseInt(stats["size_upload"]) || 0;
+    config.transfer.responseSize = parseInt(stats["size_download"]) || responseBody.length;
+    config.transfer.bodySize = responseBody.length;
+    config.transfer.headerSize = headerSection.length;
+    config.responseCookies = cookies;
     const urls = [config.url];
     if (stats["redirect_url"]) {
       urls.push(stats["redirect_url"]);
@@ -1507,7 +1563,7 @@ class CurlExecutor {
   }
   buildFinalUrl(config) {
     let url = config.url;
-    if (config.baseURL) {
+    if (config.baseURL && !url.startsWith("http://") && !url.startsWith("https://")) {
       url = config.baseURL.replace(/\/$/, "") + "/" + url.replace(/^\//, "");
     }
     if (config.params && Object.keys(config.params).length > 0) {
@@ -1596,6 +1652,13 @@ class CurlExecutor {
       curl.on("close", (code) => {
         try {
           if (code !== 0 && code !== null) {
+            if (code === 22 && stdout) {
+              try {
+                const response = CurlResponseParser.parse(stdout, stderr, config, originalRequest);
+                resolve(response);
+                return;
+              } catch {}
+            }
             const errorCode = this.mapCurlErrorCode(code);
             const errorMessage = this.buildDetailedErrorMessage(code, stderr, config);
             const rezoError = new RezoError(errorMessage, config, errorCode);
@@ -1843,19 +1906,23 @@ export async function executeRequest(options, defaultOptions, jar) {
       if (proxyManager && selectedProxy) {
         proxyManager.reportSuccess(selectedProxy);
       }
-      if (config.retry && response.status >= 400) {
-        const maxRetries = config.retry.maxRetries || 0;
-        const statusCodes = config.retry.statusCodes || [408, 429, 500, 502, 503, 504];
-        if (config.retryAttempts < maxRetries && statusCodes.includes(response.status)) {
-          const retryDelay = config.retry.retryDelay || 0;
-          const incrementDelay = config.retry.incrementDelay || false;
-          const delay = incrementDelay ? retryDelay * (config.retryAttempts + 1) : retryDelay;
-          if (delay > 0) {
-            await new Promise((resolve) => setTimeout(resolve, delay));
+      if (response.status >= 400) {
+        const httpError = builErrorFromResponse(`Request failed with status code ${response.status}`, response, config, originalRequest);
+        if (config.retry) {
+          const maxRetries = config.retry.maxRetries || 0;
+          const statusCodes = config.retry.statusCodes || [408, 429, 500, 502, 503, 504];
+          if (config.retryAttempts < maxRetries && statusCodes.includes(response.status)) {
+            const retryDelay = config.retry.retryDelay || 0;
+            const incrementDelay = config.retry.incrementDelay || false;
+            const delay = incrementDelay ? retryDelay * (config.retryAttempts + 1) : retryDelay;
+            if (delay > 0) {
+              await new Promise((resolve) => setTimeout(resolve, delay));
+            }
+            config.retryAttempts++;
+            return executeRequest(options, defaultOptions, jar);
           }
-          config.retryAttempts++;
-          return executeRequest(options, defaultOptions, jar);
         }
+        throw httpError;
       }
     }
     return result;

package/dist/adapters/entries/curl.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted

package/dist/adapters/entries/fetch.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted

package/dist/adapters/entries/http.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted

package/dist/adapters/entries/http2.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted

package/dist/adapters/entries/react-native.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted

package/dist/adapters/entries/xhr.d.ts

@@ -314,11 +314,19 @@ export declare class RezoFormData extends NodeFormData {
 	toBuffer(): Buffer;
 	/**
 	 * Create RezoFormData from object
+	 * Properly handles nested objects by JSON.stringify-ing them
 	 * @param {Record<string, any>} obj - Object to convert
 	 * @param {Options} options - Optional RezoFormData options
 	 * @returns {RezoFormData}
 	 */
 	static fromObject(obj: Record<string, any>, options?: Options): RezoFormData;
+	/**
+	 * Helper to append a value to FormData with proper type handling
+	 * @param {RezoFormData} formData - The form data to append to
+	 * @param {string} key - The field name
+	 * @param {any} value - The value to append
+	 */
+	private static appendValue;
 	/**
 	 * Convert to URL query string
 	 * Warning: File, Blob, and binary data will be omitted