@ekhein/http-request 1.0.18 → 1.0.20

package/dist/exceptions/attempt.exception.d.ts

@@ -0,0 +1,5 @@
+import { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { HttpRequestException } from './request.exception';
+export declare class HttpRequestAttemptException extends HttpRequestException {
+    constructor(message: string, config?: InternalAxiosRequestConfig, request?: any, response?: AxiosResponse);
+}

package/dist/exceptions/attempt.exception.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRequestAttemptException = void 0;
+const request_exception_1 = require("./request.exception");
+class HttpRequestAttemptException extends request_exception_1.HttpRequestException {
+    constructor(message, config, request, response) {
+        super(message, "ERR_REQ_ATTEMPT", config, request, response);
+    }
+}
+exports.HttpRequestAttemptException = HttpRequestAttemptException;

package/dist/exceptions/index.d.ts

@@ -1,2 +1,2 @@
-export { HttpRetryableError } from './retryableError';
-export { HttpRetryLimitError } from './retryLimitError';
+export { HttpRequestAttemptException } from './attempt.exception';
+export { HttpRequestException } from './request.exception';

package/dist/exceptions/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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; } });
+exports.HttpRequestException = exports.HttpRequestAttemptException = void 0;
+var attempt_exception_1 = require("./attempt.exception");
+Object.defineProperty(exports, "HttpRequestAttemptException", { enumerable: true, get: function () { return attempt_exception_1.HttpRequestAttemptException; } });
+var request_exception_1 = require("./request.exception");
+Object.defineProperty(exports, "HttpRequestException", { enumerable: true, get: function () { return request_exception_1.HttpRequestException; } });

package/dist/exceptions/request.exception.d.ts

@@ -0,0 +1 @@
+export { AxiosError as HttpRequestException } from 'axios';

package/dist/exceptions/request.exception.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRequestException = void 0;
+var axios_1 = require("axios");
+Object.defineProperty(exports, "HttpRequestException", { enumerable: true, get: function () { return axios_1.AxiosError; } });

package/dist/headers/index.d.ts

@@ -0,0 +1 @@
+export { HttpRequestHeaders } from './request.headers';

package/dist/headers/index.js

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

package/dist/headers/request.headers.d.ts

@@ -0,0 +1 @@
+export { AxiosHeaders as HttpRequestHeaders } from 'axios';

package/dist/headers/request.headers.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRequestHeaders = void 0;
+var axios_1 = require("axios");
+Object.defineProperty(exports, "HttpRequestHeaders", { enumerable: true, get: function () { return axios_1.AxiosHeaders; } });

package/dist/http-request.d.ts

@@ -0,0 +1,9 @@
+import { AxiosInstance } from 'axios';
+import { HttpRequestConfig } from '../types';
+export declare class HttpRequest {
+    readonly instance: AxiosInstance;
+    constructor(options?: HttpRequestConfig);
+    execute<R = any>(options: HttpRequestConfig): Promise<R>;
+    post<R = any>(url: string, data?: any, opts?: HttpRequestConfig): Promise<R>;
+    invoke<R = any>(path: string, data: object, opts?: HttpRequestConfig): Promise<R>;
+}

package/dist/{main.js → http-request.js}

@@ -54,29 +54,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequest = exports.FormData = exports.HttpRequestAttemptException = exports.HttpRequestException = exports.HttpRequestHeaders = void 0;
-const axios_1 = __importStar(require("axios"));
+exports.HttpRequest = void 0;
+const axios_1 = __importDefault(require("axios"));
 const tldts_1 = __importDefault(require("tldts"));
 const cookie = __importStar(require("cookie"));
 const jsdom_1 = require("jsdom");
-const form_data_1 = __importDefault(require("form-data"));
-Object.defineProperty(exports, "FormData", { enumerable: true, get: function () { return form_data_1.default; } });
 const tough_cookie_1 = require("tough-cookie");
 const common_1 = require("@nestjs/common");
 const async_retry_decorator_1 = require("@ekhein/async-retry-decorator");
 const http_error_by_code_util_1 = require("@nestjs/common/utils/http-error-by-code.util");
+const libs_1 = require("./libs");
+const headers_1 = require("./headers");
+const exceptions_1 = require("./exceptions");
 const agent_1 = require("./agent");
 const agent_2 = require("./agent");
 const agent_3 = require("./agent");
-class HttpRequestHeaders extends axios_1.AxiosHeaders {
-}
-exports.HttpRequestHeaders = HttpRequestHeaders;
-class HttpRequestException extends axios_1.AxiosError {
-}
-exports.HttpRequestException = HttpRequestException;
-class HttpRequestAttemptException extends HttpRequestException {
-}
-exports.HttpRequestAttemptException = HttpRequestAttemptException;
 class HttpRequest {
     constructor(options = {}) {
         var _a, _b, _c, _d;
@@ -86,7 +78,7 @@ class HttpRequest {
             ["headers"]: {},
             ["proxy"]: false,
         }, options)));
-        /* Set Http Agent */
+        /* Agent */
         this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             const jar = Object(request.jar);
             const cookies = Object({ jar });
@@ -129,13 +121,13 @@ class HttpRequest {
             }
             return request;
         }));
-        /* Set Cookie Jar */
+        /* Cookie Jar */
         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 */
+        /* Headers */
         this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             if (request.headers) {
                 const headers = Object.entries(request.headers);
@@ -149,14 +141,14 @@ class HttpRequest {
             }
             return request;
         }));
-        /* Set Body */
+        /* Body */
         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) {
-                if (request.form instanceof form_data_1.default) {
+                if (request.form instanceof libs_1.FormData) {
                     request.data = request.form;
                 }
                 else {
@@ -188,14 +180,14 @@ class HttpRequest {
             }
             return request;
         }));
-        /* Call Custom Hook */
+        /* Request Hook */
         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);
-        /* Call Custom Hook */
+        /* Response 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 (typeof response.headers == "object") {
-                if (response.headers instanceof axios_1.AxiosHeaders) {
+                if (response.headers instanceof headers_1.HttpRequestHeaders) {
                     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);
@@ -216,18 +208,6 @@ class HttpRequest {
             }
             return response;
         }));
-        /* Handler Attempt */
-        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) {
-                switch (error.code) {
-                    case axios_1.AxiosError.ETIMEDOUT:
-                    case axios_1.AxiosError.ERR_NETWORK:
-                    case axios_1.AxiosError.ECONNABORTED: throw new HttpRequestAttemptException(error.message, error.code, error.config, error.request, error.response);
-                    default: throw new HttpRequestException(error.message, error.code, error.config, error.request, error.response);
-                }
-            }
-            throw error;
-        }));
     }
     execute(options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -253,9 +233,16 @@ __decorate([
     (0, async_retry_decorator_1.Attempt)({
         retries: 2,
         ignore: [Error],
-        onError(e) {
-            if (e instanceof HttpRequestAttemptException)
-                throw e;
+        onError(error) {
+            if (error instanceof exceptions_1.HttpRequestAttemptException)
+                throw error;
+            if (error instanceof exceptions_1.HttpRequestException) {
+                switch (error.code) {
+                    case exceptions_1.HttpRequestException.ETIMEDOUT:
+                    case exceptions_1.HttpRequestException.ERR_NETWORK:
+                    case exceptions_1.HttpRequestException.ECONNABORTED: throw error;
+                }
+            }
         },
     }),
     __metadata("design:type", Function),

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from './exceptions';
+export * from './libs';
+export * from './headers';
+export * from './http-request';

package/dist/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./exceptions"), exports);
+__exportStar(require("./libs"), exports);
+__exportStar(require("./headers"), exports);
+__exportStar(require("./http-request"), exports);

package/dist/libs/form-data.d.ts

@@ -0,0 +1 @@
+export { default as FormData } from 'form-data';

package/dist/libs/{formData.js → form-data.js}

@@ -4,7 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (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;
+var form_data_1 = require("form-data");
+Object.defineProperty(exports, "FormData", { enumerable: true, get: function () { return __importDefault(form_data_1).default; } });

package/dist/libs/index.d.ts

@@ -1 +1 @@
-export { FormData } from './formData';
+export { FormData } from './form-data';

package/dist/libs/index.js

@@ -1,5 +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; } });
+var form_data_1 = require("./form-data");
+Object.defineProperty(exports, "FormData", { enumerable: true, get: function () { return form_data_1.FormData; } });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "license": "MIT",
   "author": "ekhein",
-  "main": "./dist/main.js",
+  "main": "./dist/index.js",
+  "types": "./types/index.d.ts",
   "files": [
-    "dist",
-    "types"
+    "dist"
   ],
   "scripts": {
     "build": "tsc"
@@ -24,7 +24,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@ekhein/async-retry-decorator": "^1.10.3",
+    "@ekhein/async-retry-decorator": "^1.10.5",
     "@nestjs/common": "^10.0.0",
     "async-retry": "^1.3.3",
     "axios": "^1.12.2",

package/dist/exceptions/retryLimitError.d.ts

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

package/dist/exceptions/retryLimitError.js

@@ -1,12 +0,0 @@
-"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

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

package/dist/exceptions/retryableError.js

@@ -1,12 +0,0 @@
-"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

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

package/dist/main.d.ts

@@ -1,18 +0,0 @@
-import { AxiosError, AxiosHeaders, AxiosInstance } from "axios";
-import { default as FormData } from 'form-data';
-import { HttpRequestConfig } from "../types/http-request";
-export declare class HttpRequestHeaders extends AxiosHeaders {
-}
-export declare class HttpRequestException extends AxiosError {
-}
-export declare class HttpRequestAttemptException extends HttpRequestException {
-}
-export { FormData };
-export declare class HttpRequest {
-    readonly instance: AxiosInstance;
-    constructor(options?: HttpRequestConfig);
-    execute<R = any>(options: HttpRequestConfig): Promise<R>;
-    post<R = any>(url: string, data?: any, opts?: HttpRequestConfig): Promise<R>;
-    invoke<R = any>(path: string, data: object, opts?: HttpRequestConfig): Promise<R>;
-}
-export type * from '../types/http-request';

package/types/axios.d.ts

@@ -1,5 +0,0 @@
-import { ExtendAxiosRequestConfig } from "./http-request"
-
-declare module "axios" {
-  interface AxiosRequestConfig extends ExtendAxiosRequestConfig {}
-}

package/types/http-request.d.ts

@@ -1,48 +0,0 @@
-import { JSDOM } from 'jsdom';
-import { CookieJar } from 'tough-cookie';
-import { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestHeaders } from 'axios';
-
-export interface HttpLiuGuanProxy {
-  adcode?: string
-  visitorId?: string
-  unbindTime?: string
-}
-
-export interface HttpPhone4GProxy {
-  clientIp: string
-}
-
-export interface HttpServiceTypes {
-  NATIVE: 1
-  SEKIRO: 2
-}
-
-export interface ExtendInternalAxiosRequestConfig extends HttpRequestConfig, InternalAxiosRequestConfig {
-  headers: AxiosRequestHeaders;
-}
-
-export interface ExtendAxiosResponse extends AxiosResponse {
-  config: ExtendInternalAxiosRequestConfig
-}
-
-export interface ExtendAxiosRequestConfig extends Record<string, any> {
-  form?: any
-  body?: any
-  html?: boolean
-  resolveBodyOnly?: boolean
-  serviceType?: HttpServiceTypes[keyof HttpServiceTypes]
-  useProxy?: boolean | HttpLiuGuanProxy | HttpPhone4GProxy
-  jar?: CookieJar
-  interceptorHooks?: {
-    requestInterceptor?: (config: ExtendInternalAxiosRequestConfig) => ExtendInternalAxiosRequestConfig | Promise<ExtendInternalAxiosRequestConfig>
-    requestInterceptorCatch?: (error: any) => any
-    respondInterceptor?: (response: ExtendAxiosResponse) => ExtendAxiosResponse | Promise<ExtendAxiosResponse | any>
-    respondInterceptorCatch?: (error: any) => any
-  }
-}
-
-export interface HttpRequestConfig extends ExtendAxiosRequestConfig, AxiosRequestConfig {}
-
-export interface HttpResponse extends ExtendAxiosResponse {}
-
-export interface HTMLResponse extends JSDOM {}