@mepkg/maxios 1.1.0 → 2.0.0

package/package.json

@@ -17,7 +17,7 @@
     "axios": "1.16.1",
     "hpagent": "^1.2.0",
     "lodash-es": "^4.18.1",
-    "melperjs": "^15.0.0"
+    "melperjs": "^17.0.0"
   },
-  "version": "1.1.0"
+  "version": "2.0.0"
 }

package/src/maxios.js

@@ -1,7 +1,7 @@
 import {HttpProxyAgent, HttpsProxyAgent} from "hpagent";
-import {cookieDict, cookieHeader} from "melperjs";
-import axios from "axios";
+import {cookiesFromResponse, cookiesToHeader} from "melperjs";
 import {isNil, omitBy} from "lodash-es";
+import axios from "axios";
 
 
 export class Maxios {
@@ -10,13 +10,18 @@ export class Maxios {
         this.cookies = cookies;
         this.config = config || {};
 
-        this.config.responseType = "text";
+        this.config.responseType = config.responseType || "text";
         this.config.timeout = config.timeout || 10000;
 
         if (this.proxy) {
-            const proxyTimeout = this.config.timeout * 0.75 || undefined;
-            this.config.httpsAgent = new HttpsProxyAgent({proxy, timeout: proxyTimeout});
-            this.config.httpAgent = new HttpProxyAgent({proxy, timeout: proxyTimeout});
+            try {
+                const proxyTimeout = this.config.timeout * 0.75 || undefined;
+                this.config.httpsAgent = new HttpsProxyAgent({proxy, timeout: proxyTimeout});
+                this.config.httpAgent = new HttpProxyAgent({proxy, timeout: proxyTimeout});
+            } catch (e) {
+                e.message = "Proxy Error | " + e.message;
+                throw e;
+            }
         }
         this.client = axios.create(this.config);
 
@@ -98,7 +103,7 @@ export class Maxios {
 
     #responseCookies = (response) => {
         if (!this.cookies) return;
-        const parsed = cookieDict(response);
+        const parsed = cookiesFromResponse(response);
         Object.keys(parsed).forEach(key => {
             if (!parsed[key]) {
                 delete parsed[key];
@@ -111,7 +116,7 @@ export class Maxios {
         if (!this.cookies) return;
         request.headers = request.headers || {};
         if (!request.headers.cookie && !request.headers.Cookie) {
-            const header = cookieHeader(this.cookies);
+            const header = cookiesToHeader(this.cookies);
             header && (request.headers.cookie = header);
         }
     }

package/src/tls-client.js

@@ -1,4 +1,4 @@
-import {cookieDict, cookieHeader, Exception} from "melperjs";
+import {cookiesFromResponse, cookiesToHeader, Exception} from "melperjs";
 import {isNil, omitBy} from "lodash-es";
 import {maxios} from "./maxios.js";
 
@@ -16,11 +16,21 @@ export class TlsClient {
         impersonate = "chrome_windows",
         visit = null,
         maxRedirects = 0,
-        base64 = false,
+        requestBodyFormat = "text",
+        responseBodyFormat = "text",
         validateStatus = (status) => (status >= 200 && status <= 299) || (maxRedirects && status >= 300 && status <= 399)
     } = {}, cookies = {}) {
         this.proxy = proxy;
-        this.config = {timeout, httpVersion, impersonate, visit, maxRedirects, base64, validateStatus};
+        this.config = {
+            timeout,
+            httpVersion,
+            impersonate,
+            visit,
+            maxRedirects,
+            requestBodyFormat,
+            responseBodyFormat,
+            validateStatus
+        };
         this.cookies = cookies;
         this.tlsServer = tlsServer;
         if (!this.tlsServer.url) {
@@ -40,7 +50,8 @@ export class TlsClient {
                       impersonate,
                       visit,
                       maxRedirects,
-                      base64,
+                      requestBodyFormat,
+                      responseBodyFormat,
                       validateStatus
                   } = {}) {
         let tlsResponse;
@@ -67,7 +78,6 @@ export class TlsClient {
                 }
                 url = parsedUrl.toString();
             }
-            maxRedirects = maxRedirects ?? this.config.maxRedirects;
             const request = {
                 "method": method || "GET",
                 "url": url,
@@ -78,8 +88,9 @@ export class TlsClient {
                 "proxy": proxy || this.proxy || undefined,
                 "impersonate": impersonate || this.config.impersonate,
                 "visit": visit || this.config.visit,
-                "maxRedirects": maxRedirects,
-                "base64": base64 ?? this.config.base64,
+                "maxRedirects": maxRedirects ?? this.config.maxRedirects,
+                "requestBodyFormat": requestBodyFormat || this.config.requestBodyFormat,
+                "responseBodyFormat": responseBodyFormat || this.config.responseBodyFormat,
                 "key": this.tlsServer.key
             };
             this.#requestCookies(request);
@@ -171,7 +182,7 @@ export class TlsClient {
 
     #responseCookies = (response) => {
         if (!this.cookies) return;
-        const parsed = cookieDict(response);
+        const parsed = cookiesFromResponse(response);
         Object.keys(parsed).forEach(key => {
             if (!parsed[key]) {
                 delete parsed[key];
@@ -184,7 +195,7 @@ export class TlsClient {
         if (!this.cookies) return;
         request.headers = request.headers || {};
         if (!request.headers.cookie && !request.headers.Cookie) {
-            const header = cookieHeader(this.cookies);
+            const header = cookiesToHeader(this.cookies);
             header && (request.headers.cookie = header);
         }
     }