@ekhein/http-request 1.0.16 → 1.0.18

package/dist/main.d.ts

@@ -1,15 +1,18 @@
-import { AxiosHeaders, AxiosInstance } from "axios";
+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>;
-    call<R = any>(url: string, args?: Array<any>, opts?: HttpRequestConfig): Promise<R>;
 }
-export * from './libs';
-export * from './exceptions';
 export type * from '../types/http-request';

package/dist/main.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -32,8 +38,8 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -48,35 +54,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequest = exports.HttpRequestHeaders = void 0;
+exports.HttpRequest = exports.FormData = exports.HttpRequestAttemptException = exports.HttpRequestException = exports.HttpRequestHeaders = void 0;
 const axios_1 = __importStar(require("axios"));
 const tldts_1 = __importDefault(require("tldts"));
 const cookie = __importStar(require("cookie"));
 const jsdom_1 = require("jsdom");
-const lodash_1 = require("lodash");
+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 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 HttpRequestException extends axios_1.AxiosError {
+}
+exports.HttpRequestException = HttpRequestException;
+class HttpRequestAttemptException extends HttpRequestException {
+}
+exports.HttpRequestAttemptException = HttpRequestAttemptException;
 class HttpRequest {
     constructor(options = {}) {
         var _a, _b, _c, _d;
         /* Axios */
         this.instance = axios_1.default.create(Object.assign({}, Object.assign({
-            ["headers"]: {},
             ["timeout"]: 30e3,
-            ["retryLimit"]: 3,
-        }, options, {
+            ["headers"]: {},
             ["proxy"]: false,
-            ["retryCount"]: 0,
-        })));
+        }, options)));
         /* Set Http Agent */
         this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
             const jar = Object(request.jar);
@@ -147,7 +156,7 @@ class HttpRequest {
                 request.data = request.body;
             }
             if (request.form) {
-                if (request.form instanceof libs_1.FormData) {
+                if (request.form instanceof form_data_1.default) {
                     request.data = request.form;
                 }
                 else {
@@ -162,20 +171,9 @@ class HttpRequest {
             if (request.baseURL)
                 return request;
             if (request.serviceType == 1)
-                request.baseURL = String(process.env.CORE_URL);
+                request.baseURL = process.env.CORE_URL;
             if (request.serviceType == 2)
-                request.baseURL = String(process.env.SEKIRO_URL);
-            if (request.serviceType == 3)
-                request.baseURL = String("http://*:65000/script").replace("*", request.clientIp);
-            return request;
-        }));
-        /* Validate Status */
-        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
-            if (request.serviceType == 1) { }
-            if (request.serviceType == 2) { }
-            if (request.serviceType == 3) {
-                request.validateStatus = status => [200, 410, 500, 400].includes(status);
-            }
+                request.baseURL = process.env.SEKIRO_URL;
             return request;
         }));
         /* Transform */
@@ -188,19 +186,10 @@ class HttpRequest {
                 request.url = String("/business-demo/invoke");
                 request.params = Object({ group, action, invoke_timeout });
             }
-            if (request.serviceType == 3) {
-                const args = JSON.stringify(request.args);
-                request.form = Object({ args });
-            }
             return request;
         }));
         /* Call Custom 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);
-        /* Save Origin Config */
-        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 */
@@ -217,14 +206,6 @@ class HttpRequest {
                             throw new common_1.ServiceUnavailableException(response.data.message);
                         return response.data.data;
                     }
-                    if (response.config.serviceType == 3) {
-                        if (response.status == 200)
-                            return response.data.result;
-                        const exception = String(response.data.exception);
-                        const reason = Array.from(response.data.args).at(0);
-                        const message = Array.from([exception, reason]).join("::");
-                        throw new common_1.ServiceUnavailableException(message);
-                    }
                     if (response.config.html) {
                         return new jsdom_1.JSDOM(response.data);
                     }
@@ -235,33 +216,18 @@ class HttpRequest {
             }
             return response;
         }));
-        /* Handler Timeout */
+        /* 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) {
-                if (!error.code)
-                    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.HttpRetryableError(error.config);
+                    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;
         }));
-        /* 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.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.HttpRetryLimitError(error.config);
-            }
-            else {
-                throw error;
-            }
-        }));
     }
     execute(options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -281,13 +247,18 @@ class HttpRequest {
                 .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 2, data, path }));
         });
     }
-    call(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, args = [], opts = {}) {
-            return this.instance
-                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 3, args, url }));
-        });
-    }
 }
 exports.HttpRequest = HttpRequest;
-__exportStar(require("./libs"), exports);
-__exportStar(require("./exceptions"), exports);
+__decorate([
+    (0, async_retry_decorator_1.Attempt)({
+        retries: 2,
+        ignore: [Error],
+        onError(e) {
+            if (e instanceof HttpRequestAttemptException)
+                throw e;
+        },
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], HttpRequest.prototype, "execute", null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/main.js",
@@ -15,6 +15,7 @@
     "node": ">=18.0.0"
   },
   "devDependencies": {
+    "@types/async-retry": "^1.4.9",
     "@types/jsdom": "^21.1.7",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.15.18",
@@ -23,7 +24,9 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
+    "@ekhein/async-retry-decorator": "^1.10.3",
     "@nestjs/common": "^10.0.0",
+    "async-retry": "^1.3.3",
     "axios": "^1.12.2",
     "cookie": "^1.0.2",
     "form-data": "^4.0.4",

package/types/http-request.d.ts

@@ -15,7 +15,6 @@ export interface HttpPhone4GProxy {
 export interface HttpServiceTypes {
   NATIVE: 1
   SEKIRO: 2
-  DEVICE: 3
 }
 
 export interface ExtendInternalAxiosRequestConfig extends HttpRequestConfig, InternalAxiosRequestConfig {
@@ -31,7 +30,6 @@ export interface ExtendAxiosRequestConfig extends Record<string, any> {
   body?: any
   html?: boolean
   resolveBodyOnly?: boolean
-  retryLimit?: number
   serviceType?: HttpServiceTypes[keyof HttpServiceTypes]
   useProxy?: boolean | HttpLiuGuanProxy | HttpPhone4GProxy
   jar?: CookieJar