@wiajs/req 1.7.11 → 1.7.13

package/index.d.cts

@@ -1,3 +1,5 @@
+import type Agent, {AgentOpts} from '@wiajs/agent';
+
 interface RawAxiosHeaders {
   [key: string]: axios.AxiosHeaderValue;
 }
@@ -123,11 +125,11 @@ declare class Axios {
   };
   getUri(config?: axios.AxiosRequestConfig): string;
   request<T = any, R = axios.AxiosResponse<T>, D = any>(config: axios.AxiosRequestConfig<D>): Promise<R>;
-  get<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, config?: axios.AxiosRequestConfig<D>): Promise<R>;
+  get<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, param?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
+  post<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   delete<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   head<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   options<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, config?: axios.AxiosRequestConfig<D>): Promise<R>;
-  post<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   put<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   patch<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
   postForm<T = any, R = axios.AxiosResponse<T>, D = any>(url: string, data?: D, config?: axios.AxiosRequestConfig<D>): Promise<R>;
@@ -403,7 +405,8 @@ declare namespace axios {
     transport?: any;
     httpAgent?: any;
     httpsAgent?: any;
-    proxy?: AxiosProxyConfig | false;
+    agent?: AgentOpts;
+    agents?: Agent;
     cancelToken?: CancelToken;
     decompress?: boolean;
     transitional?: TransitionalOptions;
@@ -450,6 +453,7 @@ declare namespace axios {
   }
 
   interface AxiosResponse<T = any, D = any>  {
+    body: T;
     data: T;
     status: number;
     statusText: string;

package/index.d.ts

@@ -1,3 +1,5 @@
+import type Agent, {AgentOpts} from '@wiajs/agent';
+
 // TypeScript Version: 4.7
 export type AxiosHeaderValue = AxiosHeaders | string | string[] | number | boolean | null;
 
@@ -344,7 +346,8 @@ export interface AxiosRequestConfig<D = any> {
   transport?: any;
   httpAgent?: any;
   httpsAgent?: any;
-  proxy?: AxiosProxyConfig | false;
+  agent?: AgentOpts;
+  agents?: Agent;
   cancelToken?: CancelToken;
   decompress?: boolean;
   transitional?: TransitionalOptions;
@@ -391,6 +394,7 @@ export interface CreateAxiosDefaults<D = any> extends Omit<AxiosRequestConfig<D>
 }
 
 export interface AxiosResponse<T = any, D = any> {
+  body: T;
   data: T;
   status: number;
   statusText: string;
@@ -491,11 +495,11 @@ export class Axios {
   };
   getUri(config?: AxiosRequestConfig): string;
   request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D>): Promise<R>;
-  get<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
+  get<T = any, R = AxiosResponse<T>, D = any>(url: string, param?: D, config?: AxiosRequestConfig<D>): Promise<R>;
+  post<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
   delete<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
   head<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
   options<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
-  post<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
   put<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
   patch<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
   postForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;

package/lib/adapters/http.js

@@ -1,5 +1,5 @@
 import request from '@wiajs/request';
-import Agent from '@wiajs/agent';
+import { Agent } from '@wiajs/agent';
 import { log as Log, name } from '@wiajs/log';
 import utils from '../utils.js';
 import settle from '../core/settle.js';
@@ -24,7 +24,20 @@ import formDataToStream from '../helpers/formDataToStream.js';
 import readBlob from '../helpers/readBlob.js';
 import callbackify from '../helpers/callbackify.js';
 import { progressEventReducer, progressEventDecorator, asyncDecorator } from '../helpers/progressEventReducer.js';
-// import Agent from '../fea/agent.js'
+const px = {
+    host: '114.98.163.61:17813'
+};
+const agent = {
+    // proxy: `http://${px.host}`, // 高效、隧道
+    proxy: `socks://${px.host}`,
+    // 连接复用，目的主机如关闭，则重新连接，连接代理keepAlive需为true
+    keepAlive: true,
+    // 同一目的网址最大并发连接，超过排队，隧道代理或服务器限制并发时需设置，否则报错，默认值：Infinity
+    // maxSockets: 5, // 无连接，并发连接时，此参数无效，转发代理支持并发无需设置或设置并发数
+    // maxFreeSockets: 5, // 同一目的主机空闲最大连接，超过关闭。keepAlive true 时有效。默认值：256
+    // timeout: 10000, // 建立连接时长，缺省 30000
+    rejectUnauthorized: false
+};
 const log = Log({
     env: `wia:req:${name(import.meta.url)}`
 });
@@ -249,15 +262,15 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
             path,
             method,
             headers: headers.toJSON(),
-            agents: {
-                http: config.httpAgent,
-                https: config.httpsAgent
-            },
+            // agents: {http: config.httpAgent, https: config.httpsAgent},
+            agents,
             auth,
             protocol,
             family,
             beforeRedirect: dispatchBeforeRedirect,
-            beforeRedirects: {}
+            beforeRedirects: {},
+            http,
+            https
         };
         // cacheable-lookup integration hotfix
         if (!utils.isUndefined(lookup)) options.lookup = lookup;
@@ -271,6 +284,7 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         // 执行请求的具体对象
         _.transport = config.transport;
         const isHttpsRequest = isHttps.test(options.protocol);
+        // agents 优先于 agent，在 request中根据协议从 agents 中获取
         options.agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
         if (config.maxBodyLength > -1) options.maxBodyLength = config.maxBodyLength;
         else options.maxBodyLength = Number.POSITIVE_INFINITY;
@@ -487,7 +501,8 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
                                     abort(new CanceledError('Request stream has been aborted', config, req));
                                 }
                             });
-                            data.pipe(req); // stream 写入数据
+                            data.pipe(req) // stream 写入数据
+                            ;
                         } else req.end(data);
                     }
                 });

package/package.json

@@ -1,15 +1,10 @@
 {
 	"name": "@wiajs/req",
-	"version": "1.7.11",
+	"version": "1.7.13",
 	"description": "Promise And Stream based AXIOS client for the browser and node.js",
 	"type": "module",
 	"types": "index.d.ts",
 	"main": "index.js",
-	"browser": {
-		"./lib/adapters/http.js": "./lib/helpers/null.js",
-		"./lib/platform/node/index.js": "./lib/platform/browser/index.js",
-		"./lib/platform/node/classes/FormData.js": "./lib/helpers/null.js"
-	},
 	"exports": {
 		".": {
 			"types": {
@@ -38,6 +33,11 @@
 		"./unsafe/utils.js": "./lib/utils.js",
 		"./package.json": "./package.json"
 	},
+	"browser": {
+		"./src/adapters/http.js": "./lib/helpers/null.js",
+		"./src/platform/node/index.js": "./lib/platform/browser/index.js",
+		"./src/platform/node/classes/FormData.js": "./lib/helpers/null.js"
+	},
 	"scripts": {
 		"test": "npm run test:eslint && npm run test:mocha && npm run test:karma && npm run test:dtslint && npm run test:exports",
 		"test:eslint": "node bin/ssl_hotfix.js eslint lib/**/*.js",
@@ -142,9 +142,9 @@
 		"@rollup/plugin-alias": "^5.1.0"
 	},
 	"dependencies": {
-		"@wiajs/log": "^4.3.13",
-		"@wiajs/request": "^3.0.18",
-		"@wiajs/agent": "^1.0.13",
+		"@wiajs/log": "^4.3.19",
+		"@wiajs/request": "^3.0.20",
+		"@wiajs/agent": "^1.0.19",
 		"form-data": "^4.0.0",
 		"proxy-from-env": "^1.1.0"
 	},