@ekhein/http-request 1.0.22 → 1.0.24

package/dist/agent/index.d.ts

@@ -1,11 +1,11 @@
 import { CookieAgentOptions, HttpCookieAgent, HttpsCookieAgent } from 'http-cookie-agent/http';
-import { LiuGuanProxy, Phone4GProxy } from '../proxy';
-export declare const HttpCookieWithPhone4GProxyAgent: new (rest_0: {
+import { LiuGuanProxy, AndroidProxy } from '../proxy';
+export declare const HttpCookieWithAndroidProxyAgent: new (rest_0: {
     clientIp: string;
-}, rest_1: CookieAgentOptions) => Phone4GProxy;
-export declare const HttpsCookieWithPhone4GProxyAgent: new (rest_0: {
+}, rest_1: CookieAgentOptions) => AndroidProxy;
+export declare const HttpsCookieWithAndroidProxyAgent: new (rest_0: {
     clientIp: string;
-}, rest_1: CookieAgentOptions) => Phone4GProxy;
+}, rest_1: CookieAgentOptions) => AndroidProxy;
 export declare const HttpCookieWithLiuGuanProxyAgent: new (rest_0: {
     adcode?: string;
     visitorId?: string;

package/dist/agent/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpsCookieAgent = exports.HttpCookieAgent = exports.HttpsCookieWithLiuGuanProxyAgent = exports.HttpCookieWithLiuGuanProxyAgent = exports.HttpsCookieWithPhone4GProxyAgent = exports.HttpCookieWithPhone4GProxyAgent = void 0;
+exports.HttpsCookieAgent = exports.HttpCookieAgent = exports.HttpsCookieWithLiuGuanProxyAgent = exports.HttpCookieWithLiuGuanProxyAgent = exports.HttpsCookieWithAndroidProxyAgent = exports.HttpCookieWithAndroidProxyAgent = void 0;
 const http_1 = require("http-cookie-agent/http");
 Object.defineProperty(exports, "HttpCookieAgent", { enumerable: true, get: function () { return http_1.HttpCookieAgent; } });
 Object.defineProperty(exports, "HttpsCookieAgent", { enumerable: true, get: function () { return http_1.HttpsCookieAgent; } });
 const proxy_1 = require("../proxy");
-exports.HttpCookieWithPhone4GProxyAgent = (0, http_1.createCookieAgent)(proxy_1.Phone4GProxy);
-exports.HttpsCookieWithPhone4GProxyAgent = (0, http_1.createCookieAgent)(proxy_1.Phone4GProxy);
+exports.HttpCookieWithAndroidProxyAgent = (0, http_1.createCookieAgent)(proxy_1.AndroidProxy);
+exports.HttpsCookieWithAndroidProxyAgent = (0, http_1.createCookieAgent)(proxy_1.AndroidProxy);
 exports.HttpCookieWithLiuGuanProxyAgent = (0, http_1.createCookieAgent)(proxy_1.LiuGuanProxy);
 exports.HttpsCookieWithLiuGuanProxyAgent = (0, http_1.createCookieAgent)(proxy_1.LiuGuanProxy);

package/dist/http-request.js

@@ -89,8 +89,8 @@ class HttpRequest {
                 }
                 if (typeof request.useProxy === "object") {
                     if ("clientIp" in request.useProxy) {
-                        request.httpAgent = new agent_2.HttpCookieWithPhone4GProxyAgent(request.useProxy, { cookies });
-                        request.httpsAgent = new agent_2.HttpsCookieWithPhone4GProxyAgent(request.useProxy, { cookies });
+                        request.httpAgent = new agent_2.HttpCookieWithAndroidProxyAgent(request.useProxy, { cookies });
+                        request.httpsAgent = new agent_2.HttpsCookieWithAndroidProxyAgent(request.useProxy, { cookies });
                     }
                     else {
                         request.httpAgent = new agent_3.HttpCookieWithLiuGuanProxyAgent(request.useProxy, { cookies });

package/dist/proxy/{phone4g.proxy.d.ts → android.proxy.d.ts}

@@ -1,5 +1,5 @@
 import { ProxyAgent } from 'proxy-agent';
-export declare class Phone4GProxy extends ProxyAgent {
+export declare class AndroidProxy extends ProxyAgent {
     constructor(opts: {
         clientIp: string;
     });

package/dist/proxy/{phone4g.proxy.js → android.proxy.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Phone4GProxy = void 0;
+exports.AndroidProxy = void 0;
 const proxy_agent_1 = require("proxy-agent");
-class Phone4GProxy extends proxy_agent_1.ProxyAgent {
+class AndroidProxy extends proxy_agent_1.ProxyAgent {
     constructor(opts) {
         super({
             getProxyForUrl: () => {
@@ -11,4 +11,4 @@ class Phone4GProxy extends proxy_agent_1.ProxyAgent {
         });
     }
 }
-exports.Phone4GProxy = Phone4GProxy;
+exports.AndroidProxy = AndroidProxy;

package/dist/proxy/index.d.ts

@@ -1,2 +1,2 @@
 export { LiuGuanProxy } from './liuguan.proxy';
-export { Phone4GProxy } from './phone4g.proxy';
+export { AndroidProxy } from './android.proxy';

package/dist/proxy/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Phone4GProxy = exports.LiuGuanProxy = void 0;
+exports.AndroidProxy = exports.LiuGuanProxy = void 0;
 var liuguan_proxy_1 = require("./liuguan.proxy");
 Object.defineProperty(exports, "LiuGuanProxy", { enumerable: true, get: function () { return liuguan_proxy_1.LiuGuanProxy; } });
-var phone4g_proxy_1 = require("./phone4g.proxy");
-Object.defineProperty(exports, "Phone4GProxy", { enumerable: true, get: function () { return phone4g_proxy_1.Phone4GProxy; } });
+var android_proxy_1 = require("./android.proxy");
+Object.defineProperty(exports, "AndroidProxy", { enumerable: true, get: function () { return android_proxy_1.AndroidProxy; } });

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
+  "files": [
+    "dist", "types"
+  ],
   "scripts": {
     "build": "tsc"
   },

package/types/http-request.d.ts

@@ -8,7 +8,7 @@ export interface HttpLiuGuanProxy {
   unbindTime?: string
 }
 
-export interface HttpPhone4GProxy {
+export interface HttpAndroidProxy {
   clientIp: string
 }
 
@@ -31,7 +31,7 @@ export interface ExtendAxiosRequestConfig extends Record<string, any> {
   html?: boolean
   resolveBodyOnly?: boolean
   serviceType?: HttpServiceTypes[keyof HttpServiceTypes]
-  useProxy?: boolean | HttpLiuGuanProxy | HttpPhone4GProxy
+  useProxy?: boolean | HttpLiuGuanProxy | HttpAndroidProxy
   jar?: CookieJar
   interceptorHooks?: {
     requestInterceptor?: (config: ExtendInternalAxiosRequestConfig) => ExtendInternalAxiosRequestConfig | Promise<ExtendInternalAxiosRequestConfig>

package/src/agent/index.ts

@@ -1,11 +0,0 @@
-import { CookieAgentOptions, createCookieAgent, HttpCookieAgent, HttpsCookieAgent } from 'http-cookie-agent/http';
-import { LiuGuanProxy, Phone4GProxy } from '../proxy'
-
-export const HttpCookieWithPhone4GProxyAgent  = createCookieAgent<Phone4GProxy, [ConstructorParameters<typeof Phone4GProxy>[0], CookieAgentOptions]>(Phone4GProxy)
-export const HttpsCookieWithPhone4GProxyAgent = createCookieAgent<Phone4GProxy, [ConstructorParameters<typeof Phone4GProxy>[0], CookieAgentOptions]>(Phone4GProxy)
-export const HttpCookieWithLiuGuanProxyAgent  = createCookieAgent<LiuGuanProxy, [ConstructorParameters<typeof LiuGuanProxy>[0], CookieAgentOptions]>(LiuGuanProxy)
-export const HttpsCookieWithLiuGuanProxyAgent = createCookieAgent<LiuGuanProxy, [ConstructorParameters<typeof LiuGuanProxy>[0], CookieAgentOptions]>(LiuGuanProxy)
-export {
-  HttpCookieAgent,
-  HttpsCookieAgent
-}

package/src/exceptions/attempt.exception.ts

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

package/src/exceptions/index.ts

@@ -1,3 +0,0 @@
-
-export { HttpRequestAttemptException } from './attempt.exception';
-export { HttpRequestException } from './request.exception';

package/src/exceptions/request.exception.ts

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

package/src/headers/index.ts

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

package/src/headers/request.headers.ts

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

package/src/http-request.ts

@@ -1,228 +0,0 @@
-import axios, { AxiosInstance } from 'axios';
-import tldts from 'tldts';
-import * as cookie from 'cookie';
-import { JSDOM } from 'jsdom';
-import { Cookie, CookieJar } from 'tough-cookie';
-import { ServiceUnavailableException } from '@nestjs/common';
-import { Attempt } from '@ekhein/async-retry-decorator';
-import { ErrorHttpStatusCode, HttpErrorByCode } from '@nestjs/common/utils/http-error-by-code.util';
-import { FormData } from './libs';
-import { HttpRequestHeaders } from './headers';
-import { HttpRequestException, HttpRequestAttemptException } from './exceptions';
-import { HttpCookieAgent, HttpsCookieAgent } from './agent';
-import { HttpCookieWithPhone4GProxyAgent, HttpsCookieWithPhone4GProxyAgent } from './agent';
-import { HttpCookieWithLiuGuanProxyAgent, HttpsCookieWithLiuGuanProxyAgent } from './agent';
-import { HttpRequestConfig } from '../types';
-
-export class HttpRequest {
-
-  public readonly instance: AxiosInstance
-
-  constructor(
-    options: HttpRequestConfig = {}
-  ) {
-    /* Axios */
-    this.instance = axios.create({
-      ...Object.assign({
-        ["timeout"]: 30e3,
-        ["headers"]: {},
-        ["proxy"]: false,
-      }, options)
-    })
-    
-    /* Agent */
-    this.instance.interceptors.request.use(
-      async request => {
-        const jar     = Object(request.jar)
-        const cookies = Object({jar})
-        if (request.useProxy) {
-          if (typeof request.useProxy === "boolean") {
-            request.httpAgent  = new HttpCookieWithLiuGuanProxyAgent({}, {cookies})
-            request.httpsAgent = new HttpsCookieWithLiuGuanProxyAgent({}, {cookies})
-          }
-          if (typeof request.useProxy === "object") {
-            if ("clientIp" in request.useProxy) {
-              request.httpAgent  = new HttpCookieWithPhone4GProxyAgent(request.useProxy, {cookies})
-              request.httpsAgent = new HttpsCookieWithPhone4GProxyAgent(request.useProxy, {cookies})
-            } else {
-              request.httpAgent  = new HttpCookieWithLiuGuanProxyAgent(request.useProxy, {cookies})
-              request.httpsAgent = new HttpsCookieWithLiuGuanProxyAgent(request.useProxy, {cookies})
-            }
-          }
-        } else {
-          request.httpAgent  = new HttpCookieAgent({cookies})
-          request.httpsAgent = new HttpsCookieAgent({cookies})
-        }
-
-        return request
-      }
-    )
-    /* Set Cookie */
-    this.instance.interceptors.request.use(
-      async request => {
-        if (request.headers.cookie) {
-          const api     = new URL(request.url!, request.baseURL)
-          const parsed  = tldts.parse(api.href)
-          const cookies = cookie.parse(request.headers.cookie)
-          const domain1 = String(parsed.domain ?? parsed.hostname) /* 顶级域名 */
-          const website = Array(api.protocol, domain1).join("//")
-          const entries = Object.entries(cookies)
-          for (const [key, value] of entries) {
-            const cookie = new Cookie({...parsed, key, value})
-            await request.jar!.setCookie(cookie, website)
-          }
-        }
-        
-        return request
-      }
-    )
-    /* Cookie Jar */
-    this.instance.interceptors.request.use(
-      async request => {
-        if (!request.jar)
-          request.jar = new CookieJar()
-        return request
-      }
-    )
-    /* Headers */
-    this.instance.interceptors.request.use(
-      async request => {
-        if (request.headers) {
-          const headers = Object.entries(request.headers)
-          for (const [key, value] of headers) {
-            if (/^[a-zA-Z]+(?:[A-Z][a-z]*)*$/.test(key)) {
-              const lowerKey = String(key).replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()
-              request.headers.delete(key)
-              request.headers.set(lowerKey, value)
-            }
-          }
-        }
-
-        return request
-      }
-    )
-    /* Body */
-    this.instance.interceptors.request.use(
-      async request => {
-        if (request.body) {
-          request.headers.setContentType("application/json")
-          request.data = request.body
-        }
-        if (request.form) {
-          if (request.form instanceof FormData) {
-            request.data = request.form
-          } else {
-            request.headers.setContentType("application/x-www-form-urlencoded")
-            request.data = request.form
-          }
-        }
-        
-        return request
-      }
-    )
-    /* BaseURL */
-    this.instance.interceptors.request.use(
-      async request => {
-        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(
-      async request => {
-        if (request.serviceType == 1) {}
-        if (request.serviceType == 2) {
-          const group          = String(request.path).split("/").at(-2)
-          const action         = String(request.path).split("/").at(-1)
-          const invoke_timeout = Number(request.timeout! - 5e3)
-          request.url          = String("/business-demo/invoke")
-          request.params       = Object({group, action, invoke_timeout})
-        }
-
-        return request
-      }
-    )
-    /* Request Hook */
-    this.instance.interceptors.request.use(
-      options.interceptorHooks?.requestInterceptor,
-      options.interceptorHooks?.requestInterceptorCatch
-    )
-    
-    /* Response Hook */
-    this.instance.interceptors.response.use(
-      options.interceptorHooks?.respondInterceptor,
-      options.interceptorHooks?.respondInterceptorCatch,
-    )
-    /* Transform */
-    this.instance.interceptors.response.use(
-      async response => {
-        if (typeof response.headers == "object") {
-          if (response.headers instanceof HttpRequestHeaders) {
-            if (response.config.serviceType == 1) {
-              if (HttpErrorByCode[response.data.err as ErrorHttpStatusCode])
-                throw new HttpErrorByCode[response.data.err as ErrorHttpStatusCode](response.data.msg)
-              return response.data.res
-            }
-            if (response.config.serviceType == 2) {
-              if (response.data.status)
-                throw new ServiceUnavailableException(response.data.message)
-              return response.data.data
-            }
-            if (response.config.html) {
-              return new JSDOM(response.data)
-            }
-            if (response.config.resolveBodyOnly != false) {
-              return response.data
-            }
-          }
-        }
-
-        return response
-      }
-    )
-  }
-
-  @Attempt({
-    retries: 2,
-    ignore: [Error],
-    onError(error) {
-      if (error instanceof HttpRequestAttemptException) throw error
-      if (error instanceof HttpRequestException) {
-        switch(error.code) {
-          case HttpRequestException.ETIMEDOUT:
-          case HttpRequestException.ERR_NETWORK:
-          case HttpRequestException.ECONNABORTED: throw error
-        }
-      }
-    },
-  })
-  public async execute<R = any>(
-    options: HttpRequestConfig
-  ) {
-    return this.instance
-      .request<never, R>(options)
-  }
-
-  public async post<R = any>(
-    url: string,
-    data?: any,
-    opts: HttpRequestConfig = {}
-  ) {
-    return this.instance
-      .request<never, R>({...opts, method: "POST", serviceType: 1, data, url})
-  }
-
-  public async invoke<R = any>(
-    path: string,
-    data: object,
-    opts: HttpRequestConfig = {}
-  ) {
-    return this.instance
-      .request<never, R>({...opts, method: "POST", serviceType: 2, data, path})
-  }
-
-}

package/src/index.ts

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

package/src/libs/form-data.ts

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

package/src/libs/index.ts

@@ -1,2 +0,0 @@
-
-export { FormData } from './form-data';

package/src/proxy/index.ts

@@ -1,3 +0,0 @@
-
-export { LiuGuanProxy } from './liuguan.proxy';
-export { Phone4GProxy } from './phone4g.proxy';