@ekhein/http-request 1.0.5 → 1.0.7

package/dist/exceptions/index.d.ts

@@ -1,2 +1,2 @@
-export { AxiosRetryableError } from './axiosRetryableError';
-export { AxiosRetryLimitError } from './axiosRetryLimitError';
+export { HttpRetryableError } from './retryableError';
+export { HttpRetryLimitError } from './retryLimitError';

package/dist/exceptions/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AxiosRetryLimitError = exports.AxiosRetryableError = void 0;
-var axiosRetryableError_1 = require("./axiosRetryableError");
-Object.defineProperty(exports, "AxiosRetryableError", { enumerable: true, get: function () { return axiosRetryableError_1.AxiosRetryableError; } });
-var axiosRetryLimitError_1 = require("./axiosRetryLimitError");
-Object.defineProperty(exports, "AxiosRetryLimitError", { enumerable: true, get: function () { return axiosRetryLimitError_1.AxiosRetryLimitError; } });
+exports.HttpRetryLimitError = exports.HttpRetryableError = void 0;
+var retryableError_1 = require("./retryableError");
+Object.defineProperty(exports, "HttpRetryableError", { enumerable: true, get: function () { return retryableError_1.HttpRetryableError; } });
+var retryLimitError_1 = require("./retryLimitError");
+Object.defineProperty(exports, "HttpRetryLimitError", { enumerable: true, get: function () { return retryLimitError_1.HttpRetryLimitError; } });

package/dist/exceptions/retryLimitError.d.ts

@@ -0,0 +1,4 @@
+import { AxiosError, InternalAxiosRequestConfig } from "axios";
+export declare class HttpRetryLimitError extends AxiosError {
+    constructor(config: InternalAxiosRequestConfig);
+}

package/dist/exceptions/retryLimitError.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRetryLimitError = void 0;
+const axios_1 = require("axios");
+class HttpRetryLimitError extends axios_1.AxiosError {
+    constructor(config) {
+        const code = String("AXIOS_RETRY_LIMIT_ERROR");
+        const message = String("Axios retry limit error");
+        super(message, code, config);
+    }
+}
+exports.HttpRetryLimitError = HttpRetryLimitError;

package/dist/exceptions/retryableError.d.ts

@@ -0,0 +1,4 @@
+import { AxiosError, InternalAxiosRequestConfig } from "axios";
+export declare class HttpRetryableError extends AxiosError {
+    constructor(config: InternalAxiosRequestConfig);
+}

package/dist/exceptions/retryableError.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRetryableError = void 0;
+const axios_1 = require("axios");
+class HttpRetryableError extends axios_1.AxiosError {
+    constructor(config) {
+        const code = String("AXIOS_RETRYABLE_ERROR");
+        const message = String("Axios retryable error");
+        super(message, code, config);
+    }
+}
+exports.HttpRetryableError = HttpRetryableError;

package/dist/libs/formData.d.ts

@@ -0,0 +1,3 @@
+import { default as _FormData } from "form-data";
+export declare class FormData extends _FormData {
+}

package/dist/libs/formData.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormData = void 0;
+const form_data_1 = __importDefault(require("form-data"));
+class FormData extends form_data_1.default {
+}
+exports.FormData = FormData;

package/dist/libs/index.d.ts

@@ -0,0 +1 @@
+export { FormData } from './formData';

package/dist/libs/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormData = void 0;
+var formData_1 = require("./formData");
+Object.defineProperty(exports, "FormData", { enumerable: true, get: function () { return formData_1.FormData; } });

package/dist/main.d.ts

@@ -7,5 +7,6 @@ export declare class HttpRequest {
     post<R = any>(url: string, data?: any): Promise<R>;
     call<R = any>(path: string, data: object): Promise<R>;
 }
+export * from './libs';
 export * from './exceptions';
-export * from '../types/http-request';
+export type * from '../types/http-request';

package/dist/main.js

@@ -35,6 +35,15 @@ var __importStar = (this && this.__importStar) || (function () {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequest = void 0;
 const axios_1 = __importStar(require("axios"));
@@ -45,25 +54,24 @@ const cookie_1 = require("cookie");
 const tldts_1 = require("tldts");
 const common_1 = require("@nestjs/common");
 const http_error_by_code_util_1 = require("@nestjs/common/utils/http-error-by-code.util");
+const libs_1 = require("./libs");
 const agent_1 = require("./agent");
 const agent_2 = require("./agent");
 const agent_3 = require("./agent");
 const exceptions_1 = require("./exceptions");
 class HttpRequest {
-    instance;
     constructor(options) {
+        var _a, _b, _c, _d;
         /* Axios */
-        this.instance = axios_1.default.create({
-            ...Object.assign({
-                ["headers"]: {},
-                ["retryLimit"]: 3,
-            }, options, {
-                ["proxy"]: false,
-                ["retryCount"]: 0,
-            })
-        });
+        this.instance = axios_1.default.create(Object.assign({}, Object.assign({
+            ["headers"]: {},
+            ["retryLimit"]: 3,
+        }, options, {
+            ["proxy"]: false,
+            ["retryCount"]: 0,
+        })));
         /* Set Http Agent */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             const jar = Object(request.jar);
             const cookies = Object({ jar });
             if (request.useProxy) {
@@ -87,9 +95,9 @@ class HttpRequest {
                 request.httpsAgent = new agent_1.HttpsCookieAgent({ cookies });
             }
             return request;
-        });
+        }));
         /* Set Cookie */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (request.headers.cookie) {
                 const api = new URL(request.url, request.baseURL);
                 const domain = (0, tldts_1.getDomain)(api.href); /* 一级域名 */
@@ -102,15 +110,15 @@ class HttpRequest {
                 }
             }
             return request;
-        });
+        }));
         /* Set Cookie Jar */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (!request.jar)
                 request.jar = new tough_cookie_1.CookieJar();
             return request;
-        });
+        }));
         /* Headers Format */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (request.headers) {
                 const headers = Object.entries(request.headers);
                 for (const [key, value] of headers) {
@@ -122,21 +130,26 @@ class HttpRequest {
                 }
             }
             return request;
-        });
+        }));
         /* Set Body */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (request.body) {
                 request.headers.setContentType("application/json");
                 request.data = request.body;
             }
             if (request.form) {
-                request.headers.setContentType("application/x-www-form-urlencoded");
-                request.data = request.form;
+                if (request.form instanceof libs_1.FormData) {
+                    request.data = request.form;
+                }
+                else {
+                    request.headers.setContentType("application/x-www-form-urlencoded");
+                    request.data = request.form;
+                }
             }
             return request;
-        });
+        }));
         /* Transform */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (request.serviceType == 1) { }
             if (request.serviceType == 2) {
                 const group = String(request.path).split("/").at(-2);
@@ -146,76 +159,87 @@ class HttpRequest {
                 request.params = Object({ group, action, invoke_timeout });
             }
             return request;
-        });
+        }));
         /* Call Custom Hook */
-        this.instance.interceptors.request.use(options.interceptorHooks?.requestInterceptor, options.interceptorHooks?.requestInterceptorCatch);
+        this.instance.interceptors.request.use((_a = options.interceptorHooks) === null || _a === void 0 ? void 0 : _a.requestInterceptor, (_b = options.interceptorHooks) === null || _b === void 0 ? void 0 : _b.requestInterceptorCatch);
         /* Save Origin Config */
-        this.instance.interceptors.request.use(async (request) => {
+        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             request.__origin__ = (0, lodash_1.cloneDeep)(request);
             return (request);
-        });
+        }));
+        /* Call Custom Hook */
+        this.instance.interceptors.response.use((_c = options.interceptorHooks) === null || _c === void 0 ? void 0 : _c.respondInterceptor, (_d = options.interceptorHooks) === null || _d === void 0 ? void 0 : _d.respondInterceptorCatch);
         /* Transform */
-        this.instance.interceptors.response.use(async (response) => {
-            if (response.config.serviceType == 1) {
-                if (http_error_by_code_util_1.HttpErrorByCode[response.data.err])
-                    throw new http_error_by_code_util_1.HttpErrorByCode[response.data.err](response.data.msg);
-                return response.data.res;
-            }
-            if (response.config.serviceType == 2) {
-                if (response.data.status)
-                    throw new common_1.ServiceUnavailableException(response.data.message);
-                return response.data.data;
-            }
-            if (response.config.resolveBodyOnly != false) {
-                if (response.config.html != true)
-                    return response.data;
-                return new jsdom_1.JSDOM(response.data);
+        this.instance.interceptors.response.use((response) => __awaiter(this, void 0, void 0, function* () {
+            if (typeof response.headers == "object") {
+                if (response.headers instanceof axios_1.AxiosHeaders) {
+                    if (response.config.serviceType == 1) {
+                        if (http_error_by_code_util_1.HttpErrorByCode[response.data.err])
+                            throw new http_error_by_code_util_1.HttpErrorByCode[response.data.err](response.data.msg);
+                        return response.data.res;
+                    }
+                    if (response.config.serviceType == 2) {
+                        if (response.data.status)
+                            throw new common_1.ServiceUnavailableException(response.data.message);
+                        return response.data.data;
+                    }
+                    if (response.config.html) {
+                        return new jsdom_1.JSDOM(response.data);
+                    }
+                    if (response.config.resolveBodyOnly != false) {
+                        return response.data;
+                    }
+                }
             }
             return response;
-        });
-        /* Call Custom Hook */
-        this.instance.interceptors.response.use(options.interceptorHooks?.respondInterceptor, options.interceptorHooks?.respondInterceptorCatch);
+        }));
         /* Handler Timeout */
-        this.instance.interceptors.response.use(async (response) => response, async (error) => {
+        this.instance.interceptors.response.use((response) => __awaiter(this, void 0, void 0, function* () { return response; }), (error) => __awaiter(this, void 0, void 0, function* () {
             if (error instanceof axios_1.AxiosError) {
                 if (!error.code)
-                    throw new exceptions_1.AxiosRetryableError(error.config);
+                    throw new exceptions_1.HttpRetryableError(error.config);
                 switch (error.code) {
                     case axios_1.AxiosError.ETIMEDOUT:
                     case axios_1.AxiosError.ERR_NETWORK:
                     case axios_1.AxiosError.ECONNABORTED:
-                        throw new exceptions_1.AxiosRetryableError(error.config);
+                        throw new exceptions_1.HttpRetryableError(error.config);
                 }
             }
             throw error;
-        });
+        }));
         /* Auto Retry */
-        this.instance.interceptors.response.use(async (response) => response, async (error) => {
-            if (error instanceof exceptions_1.AxiosRetryableError) {
+        this.instance.interceptors.response.use((response) => __awaiter(this, void 0, void 0, function* () { return response; }), (error) => __awaiter(this, void 0, void 0, function* () {
+            if (error instanceof exceptions_1.HttpRetryableError) {
                 const retryCount = error.config.__origin__.retryCount++;
                 const retryLimit = error.config.__origin__.retryLimit;
                 if (retryCount < retryLimit)
                     return this.instance.request(error.config.__origin__);
-                throw new exceptions_1.AxiosRetryLimitError(error.config);
+                throw new exceptions_1.HttpRetryLimitError(error.config);
             }
             else {
                 throw error;
             }
-        });
+        }));
     }
-    async execute(options) {
-        return this.instance
-            .request(options);
+    execute(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.instance
+                .request(options);
+        });
     }
-    async post(url, data) {
-        return this.instance
-            .request({ method: "POST", serviceType: 1, url, data });
+    post(url, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.instance
+                .request({ method: "POST", serviceType: 1, url, data });
+        });
     }
-    async call(path, data) {
-        return this.instance
-            .request({ method: "POST", serviceType: 2, path, data });
+    call(path, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.instance
+                .request({ method: "POST", serviceType: 2, path, data });
+        });
     }
 }
 exports.HttpRequest = HttpRequest;
+__exportStar(require("./libs"), exports);
 __exportStar(require("./exceptions"), exports);
-__exportStar(require("../types/http-request"), exports);

package/dist/proxy/liuguan.proxy.js

@@ -21738,10 +21738,6 @@ exports.LIUGUAN_ADCODE_MAP = {
     }
 };
 class LiuGuanProxy extends proxy_agent_1.ProxyAgent {
-    orderNo = "O23113017495247478361"; /* 订单编号 */
-    orderPwd = "123456aa.."; /* 订单密码 */
-    duplicate = "1"; /* 是否按天去重 - 0:不去重 1:按天去重 */
-    switch = "0"; /* 异常自动切换 - 0:自动切换 1:不自动切换，返回代理异常 */
     constructor(opts) {
         super({
             getProxyForUrl: () => {
@@ -21767,6 +21763,10 @@ class LiuGuanProxy extends proxy_agent_1.ProxyAgent {
                 return (proxyURL.href);
             },
         });
+        this.orderNo = "O23113017495247478361"; /* 订单编号 */
+        this.orderPwd = "123456aa.."; /* 订单密码 */
+        this.duplicate = "1"; /* 是否按天去重 - 0:不去重 1:按天去重 */
+        this.switch = "0"; /* 异常自动切换 - 0:自动切换 1:不自动切换，返回代理异常 */
     }
 }
 exports.LiuGuanProxy = LiuGuanProxy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/main.js",
@@ -15,7 +15,7 @@
     "node": ">=18.0.0"
   },
   "devDependencies": {
-    "@types/jsdom": "^27.0.0",
+    "@types/jsdom": "^21.1.7",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.15.18",
     "tsx": "^4.19.4",
@@ -25,8 +25,9 @@
     "@nestjs/common": "^10.0.0",
     "axios": "^1.12.2",
     "cookie": "^1.0.2",
+    "form-data": "^4.0.4",
     "http-cookie-agent": "^7.0.2",
-    "jsdom": "^27.0.0",
+    "jsdom": "^25.0.1",
     "lodash": "^4.17.21",
     "proxy-agent": "^6.5.0",
     "tldts": "^7.0.16",

package/types/http-request.d.ts

@@ -1,5 +1,6 @@
-import { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestHeaders } from "axios"
-import { CookieJar } from "tough-cookie"
+import { JSDOM } from 'jsdom';
+import { CookieJar } from 'tough-cookie';
+import { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestHeaders } from 'axios';
 
 export interface HttpLiuGuanProxy {
   adcode?: string
@@ -45,3 +46,4 @@ export interface HttpRequestConfig extends ExtendAxiosRequestConfig, AxiosReques
 
 export interface HttpResponse extends ExtendAxiosResponse {}
 
+export interface HTMLResponse extends JSDOM {}