@ekhein/http-request 2.0.2 → 2.0.3

package/dist/http-request.d.ts

@@ -6,4 +6,6 @@ export declare class HttpRequest {
     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: object, opts?: HttpRequestConfig): Promise<R>;
+    call<R = any>(method: string, params: object, opts?: HttpRequestConfig): Promise<R>;
 }

package/dist/http-request.js

@@ -55,10 +55,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequest = void 0;
-const axios_1 = __importDefault(require("axios"));
+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");
@@ -159,26 +160,31 @@ class HttpRequest {
             }
             return request;
         }));
-        /* BaseURL */
-        this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
-            if (request.baseURL)
-                return request;
-            if (request.serviceType == 1)
-                request.baseURL = process.env.CORE_URL;
-            if (request.serviceType == 2)
-                request.baseURL = process.env.SEKIRO_URL;
-            return request;
-        }));
         /* Transform */
         this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
-            if (request.serviceType == 1) { }
+            if (request.serviceType == 1) {
+                request.baseURL = String(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}:3000/`);
+                request.body.jsonrpc = String("2.0");
+                request.body.id = (0, crypto_1.randomUUID)();
+            }
             return request;
         }));
         /* Request Hook */
@@ -199,6 +205,16 @@ class HttpRequest {
                             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);
                     }
@@ -228,6 +244,18 @@ class HttpRequest {
                 .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, params_1) {
+        return __awaiter(this, arguments, void 0, function* (method, params, opts = {}) {
+            return this.instance
+                .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 4, body: { method, params } }));
+        });
+    }
 }
 exports.HttpRequest = HttpRequest;
 __decorate([

package/package.json

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

package/types/http-request.d.ts

@@ -15,6 +15,8 @@ export interface HttpAndroidProxy {
 export interface HttpServiceTypes {
   NATIVE: 1
   SEKIRO: 2
+  SCRIPT: 3
+  JAYSON: 4
 }
 
 export interface ExtendInternalAxiosRequestConfig extends HttpRequestConfig, InternalAxiosRequestConfig {
@@ -29,6 +31,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