@ekhein/http-request 2.0.7 → 2.0.9

package/dist/http-request.d.ts

@@ -1,11 +1,23 @@
 import { AxiosInstance } from 'axios';
-import { HttpRequestConfig } from '../types';
+import { HttpRequestConfig, NativeClientConfig, ScriptClientConfig, SekiroClientConfig, JaysonClientConfig } from '../types';
 export declare class HttpRequest {
-    readonly instance: AxiosInstance;
+    protected 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>;
-    hook<R = any>(url: string, args: ArrayLike<any>, opts?: HttpRequestConfig): Promise<R>;
-    call<R = any>(method: string, args: ArrayLike<any>, opts?: HttpRequestConfig): Promise<R>;
+}
+export declare class NativeClient extends HttpRequest {
+    constructor(options?: NativeClientConfig);
+    post<R = any>(url: string, body?: any): Promise<R>;
+}
+export declare class SekiroClient extends HttpRequest {
+    constructor(options?: SekiroClientConfig);
+    invoke<R = any>(path: string, params?: Record<string, string>): Promise<R>;
+}
+export declare class ScriptClient extends HttpRequest {
+    constructor(options: ScriptClientConfig);
+    hook<R = any>(url: string, args: ArrayLike<any>): Promise<R>;
+}
+export declare class JaysonClient extends HttpRequest {
+    constructor(options: JaysonClientConfig);
+    call<R = any>(method: string, args: ArrayLike<any>): Promise<R>;
 }

package/dist/http-request.js

@@ -54,14 +54,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequest = void 0;
+exports.JaysonClient = exports.ScriptClient = exports.SekiroClient = exports.NativeClient = exports.HttpRequest = 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 crypto_1 = require("crypto");
 const lodash_1 = require("lodash");
-const path_to_regexp_1 = require("path-to-regexp");
 const tough_cookie_1 = require("tough-cookie");
 const common_1 = require("@nestjs/common");
 const async_retry_decorator_1 = require("@ekhein/async-retry-decorator");
@@ -137,7 +136,6 @@ class HttpRequest {
                     .entries(request.headers)
                     .forEach(([key, value]) => {
                     const name = (0, lodash_1.kebabCase)(key);
-                    request.headers.delete(key);
                     request.headers.set(name, value);
                 });
             }
@@ -160,63 +158,14 @@ class HttpRequest {
             }
             return request;
         }));
-        /* Transform */
-        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (request.serviceType == 1) {
-                request.baseURL = String((_a = request.baseURL) !== null && _a !== void 0 ? _a : process.env.CORE_URL);
-            }
-            if (request.serviceType == 2) {
-                const group = (0, path_to_regexp_1.compile)(request.path)(request.params).split("/").at(-2);
-                const action = (0, path_to_regexp_1.compile)(request.path)(request.params).split("/").at(-1);
-                const invoke_timeout = Number(request.timeout - 5e3);
-                request.params = Object({ group, action, invoke_timeout });
-                request.baseURL = String(process.env.SEKIRO_URL);
-                request.url = String("/business-demo/invoke");
-            }
-            if (request.serviceType == 3) {
-                request.validateStatus = status => status <= 500;
-                request.baseURL = String(`http://${request.clientIp}:65000/script`);
-                request.form = Object({
-                    args: JSON.stringify([...request.args])
-                });
-            }
-            if (request.serviceType == 4) {
-                request.baseURL = String(`http://${request.clientIp}:65001/`);
-                request.body.params = Array.from(request.args);
-                request.body.jsonrpc = String("2.0");
-                request.body.id = (0, crypto_1.randomUUID)();
-            }
-            return request;
-        }));
         /* 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);
         /* 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 (typeof (response === null || response === void 0 ? void 0 : response.headers) == "object") {
                 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);
-                        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.serviceType == 3) {
-                        if (response.status != axios_1.HttpStatusCode.Ok)
-                            throw new common_1.ServiceUnavailableException(response.data.exception);
-                        return response.data.result;
-                    }
-                    if (response.config.serviceType == 4) {
-                        if (response.data.error)
-                            throw new common_1.ServiceUnavailableException(response.data.error.message);
-                        return response.data.result;
-                    }
                     if (response.config.html) {
                         return new jsdom_1.JSDOM(response.data);
                     }
@@ -234,30 +183,6 @@ class HttpRequest {
                 .request(options);
         });
     }
-    post(url_1, data_1) {
-        return __awaiter(this, arguments, void 0, function* (url, data, opts = {}) {
-            return this.instance
-                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 1, data, url }));
-        });
-    }
-    invoke(path_1, data_1) {
-        return __awaiter(this, arguments, void 0, function* (path, data, opts = {}) {
-            return this.instance
-                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 2, data, path }));
-        });
-    }
-    hook(url_1, args_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 }));
-        });
-    }
-    call(method_1, args_1) {
-        return __awaiter(this, arguments, void 0, function* (method, args, opts = {}) {
-            return this.instance
-                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 4, args, body: { method } }));
-        });
-    }
 }
 exports.HttpRequest = HttpRequest;
 __decorate([
@@ -280,3 +205,136 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], HttpRequest.prototype, "execute", null);
+class NativeClient extends HttpRequest {
+    constructor(options) {
+        var _a, _b;
+        super({
+            timeout: (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 10e3,
+            baseURL: (_b = options === null || options === void 0 ? void 0 : options.baseURL) !== null && _b !== void 0 ? _b : process.env.CORE_URL,
+            headers: options === null || options === void 0 ? void 0 : options.headers,
+            interceptorHooks: {
+                respondInterceptor(response) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        const errcode = response.data.err;
+                        if (http_error_by_code_util_1.HttpErrorByCode[errcode])
+                            throw new http_error_by_code_util_1.HttpErrorByCode[errcode](response.data.msg);
+                        return response.data.res;
+                    });
+                },
+            },
+        });
+    }
+    post(url, body) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.instance
+                .request({
+                method: "POST",
+                url,
+                body,
+            });
+        });
+    }
+}
+exports.NativeClient = NativeClient;
+class SekiroClient extends HttpRequest {
+    constructor(options) {
+        var _a, _b, _c;
+        super({
+            timeout: (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 10e3 * 1.2,
+            baseURL: (_b = options === null || options === void 0 ? void 0 : options.baseURL) !== null && _b !== void 0 ? _b : process.env.SEKIRO_URL,
+            params: {
+                invoke_timeout: (_c = options === null || options === void 0 ? void 0 : options.timeout) !== null && _c !== void 0 ? _c : 10e3
+            },
+            interceptorHooks: {
+                respondInterceptor(response) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (response.data.status)
+                            throw new common_1.ServiceUnavailableException(response.data.message);
+                        return response.data.data;
+                    });
+                },
+            }
+        });
+    }
+    invoke(path_1) {
+        return __awaiter(this, arguments, void 0, function* (path, params = {}) {
+            const group = String(path).split("/").at(-2);
+            const action = String(path).split("/").at(-1);
+            return this.instance
+                .request({
+                method: "POST",
+                url: "/business-demo/invoke",
+                body: Object.assign(Object.assign({}, params), { group, action })
+            });
+        });
+    }
+}
+exports.SekiroClient = SekiroClient;
+class ScriptClient extends HttpRequest {
+    constructor(options) {
+        super({
+            timeout: 10e3,
+            baseURL: `http://${options.clientIp}:65000/script`,
+            validateStatus: status => status <= 500,
+            interceptorHooks: {
+                respondInterceptor(response) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        var _a;
+                        if (response.status != axios_1.HttpStatusCode.Ok) {
+                            const reason = Array.from([response.data.exception, (_a = response.data.args) === null || _a === void 0 ? void 0 : _a[0]]).join("::");
+                            throw new common_1.ServiceUnavailableException(reason);
+                        }
+                        return response.data.result;
+                    });
+                },
+            }
+        });
+    }
+    hook(url, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            args = Array.from(args);
+            args = JSON.stringify(args);
+            return this.instance
+                .request({
+                method: "POST",
+                url,
+                form: {
+                    args
+                }
+            });
+        });
+    }
+}
+exports.ScriptClient = ScriptClient;
+class JaysonClient extends HttpRequest {
+    constructor(options) {
+        super({
+            timeout: 10e3,
+            baseURL: `http://${options.clientIp}:65001/`,
+            interceptorHooks: {
+                respondInterceptor(response) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (response.data.error)
+                            throw new common_1.ServiceUnavailableException(response.data.error.message);
+                        return response.data.result;
+                    });
+                },
+            }
+        });
+    }
+    call(method, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = (0, crypto_1.randomUUID)();
+            const params = Array.from(args);
+            const jsonrpc = String("2.0");
+            return this.instance
+                .request({
+                method: "POST",
+                body: {
+                    method, params, jsonrpc, id
+                }
+            });
+        });
+    }
+}
+exports.JaysonClient = JaysonClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/http-request",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/index.js",

package/types/http-request.d.ts

@@ -12,13 +12,6 @@ export interface HttpAndroidProxy {
   clientIp: string
 }
 
-export interface HttpServiceTypes {
-  NATIVE: 1
-  SEKIRO: 2
-  SCRIPT: 3
-  JAYSON: 4
-}
-
 export interface ExtendInternalAxiosRequestConfig extends HttpRequestConfig, InternalAxiosRequestConfig {
   headers: AxiosRequestHeaders;
 }
@@ -31,9 +24,7 @@ export interface ExtendAxiosRequestConfig extends Record<string, any> {
   form?: any
   body?: any
   html?: boolean
-  clientIp?: string
   resolveBodyOnly?: boolean
-  serviceType?: HttpServiceTypes[keyof HttpServiceTypes]
   useProxy?: boolean | HttpLiuGuanProxy | HttpAndroidProxy
   jar?: CookieJar
   interceptorHooks?: {
@@ -46,6 +37,18 @@ export interface ExtendAxiosRequestConfig extends Record<string, any> {
 
 export interface HttpRequestConfig extends ExtendAxiosRequestConfig, AxiosRequestConfig {}
 
+export interface NativeClientConfig extends Pick<HttpRequestConfig, "baseURL" | "timeout" | "headers"> {}
+
+export interface SekiroClientConfig extends Pick<HttpRequestConfig, "baseURL" | "timeout"> {}
+
+export interface ScriptClientConfig {
+  clientIp: string
+}
+
+export interface JaysonClientConfig {
+  clientIp: string
+}
+
 export interface HttpResponse extends ExtendAxiosResponse {}
 
 export interface HTMLResponse extends JSDOM {}