@mepkg/maxios 1.0.0 → 1.2.0

package/package.json

@@ -14,10 +14,10 @@
     "test:watch": "node --test --watch 'tests/**/*.test.js'"
   },
   "dependencies": {
-    "axios": "1.16.0",
+    "axios": "1.16.1",
     "hpagent": "^1.2.0",
     "lodash-es": "^4.18.1",
-    "melperjs": "^15.0.0"
+    "melperjs": "^17.0.0"
   },
-  "version": "1.0.0"
+  "version": "1.2.0"
 }

package/src/maxios.js

@@ -1,25 +1,29 @@
 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 {
     constructor(proxy = null, config = {}, cookies = {}) {
         this.proxy = proxy;
         this.cookies = cookies;
-        config = config || {};
+        this.config = config || {};
+
+        this.config.responseType = config.responseType || "text";
+        this.config.timeout = config.timeout || 10000;
 
-        const axiosOptions = {
-            responseType: 'text',
-            timeout: config.timeout ?? 10000
-        };
         if (this.proxy) {
-            const proxyTimeout = axiosOptions.timeout * 0.75 || undefined;
-            axiosOptions.httpsAgent = new HttpsProxyAgent({proxy, timeout: proxyTimeout});
-            axiosOptions.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(axiosOptions);
+        this.client = axios.create(this.config);
 
         this.client.interceptors.request.use((request) => {
             this.#requestCookies(request);
@@ -99,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];
@@ -112,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";
 
@@ -78,7 +78,7 @@ export class TlsClient {
                 "proxy": proxy || this.proxy || undefined,
                 "impersonate": impersonate || this.config.impersonate,
                 "visit": visit || this.config.visit,
-                "redirects": maxRedirects,
+                "maxRedirects": maxRedirects,
                 "base64": base64 ?? this.config.base64,
                 "key": this.tlsServer.key
             };
@@ -171,7 +171,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 +184,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);
         }
     }