@ekhein/http-request 1.0.6 → 1.0.8

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

@@ -1,11 +1,14 @@
-import { AxiosInstance } from "axios";
+import { AxiosHeaders, AxiosInstance } from "axios";
 import { HttpRequestConfig } from "../types/http-request";
+export declare class HttpRequestHeaders extends AxiosHeaders {
+}
 export declare class HttpRequest {
     readonly instance: AxiosInstance;
     constructor(options: HttpRequestConfig);
     execute<R = any>(options: HttpRequestConfig): Promise<R>;
-    post<R = any>(url: string, data?: any): Promise<R>;
-    call<R = any>(path: string, data: object): Promise<R>;
+    post<R = any>(url: string, data?: any, opts?: HttpRequestConfig): Promise<R>;
+    call<R = any>(path: string, data: object, opts?: HttpRequestConfig): Promise<R>;
 }
+export * from './libs';
 export * from './exceptions';
 export type * from '../types/http-request';

package/dist/main.js

@@ -45,7 +45,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequest = void 0;
+exports.HttpRequest = exports.HttpRequestHeaders = void 0;
 const axios_1 = __importStar(require("axios"));
 const jsdom_1 = require("jsdom");
 const lodash_1 = require("lodash");
@@ -54,10 +54,14 @@ 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 HttpRequestHeaders extends axios_1.AxiosHeaders {
+}
+exports.HttpRequestHeaders = HttpRequestHeaders;
 class HttpRequest {
     constructor(options) {
         var _a, _b, _c, _d;
@@ -137,8 +141,13 @@ class HttpRequest {
                 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;
         }));
@@ -161,49 +170,54 @@ class HttpRequest {
             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((response) => __awaiter(this, void 0, void 0, function* () {
-            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);
+            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((_c = options.interceptorHooks) === null || _c === void 0 ? void 0 : _c.respondInterceptor, (_d = options.interceptorHooks) === null || _d === void 0 ? void 0 : _d.respondInterceptorCatch);
         /* Handler Timeout */
         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((response) => __awaiter(this, void 0, void 0, function* () { return response; }), (error) => __awaiter(this, void 0, void 0, function* () {
-            if (error instanceof exceptions_1.AxiosRetryableError) {
+            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;
@@ -216,18 +230,19 @@ class HttpRequest {
                 .request(options);
         });
     }
-    post(url, data) {
+    post(url, data, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.instance
-                .request({ method: "POST", serviceType: 1, url, data });
+                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 1, url, data }));
         });
     }
-    call(path, data) {
+    call(path, data, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.instance
-                .request({ method: "POST", serviceType: 2, path, data });
+                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 2, path, data }));
         });
     }
 }
 exports.HttpRequest = HttpRequest;
+__exportStar(require("./libs"), exports);
 __exportStar(require("./exceptions"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/main.js",
@@ -25,6 +25,7 @@
     "@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": "^25.0.1",
     "lodash": "^4.17.21",

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 {}