wok-server 0.7.0 → 0.7.2

package/dist/http-client/index.js

@@ -36,7 +36,8 @@ function doRequest(opts) {
             method: opts.method,
             headers: opts.headers,
             timeout: opts.timeout && opts.timeout > 0 ? opts.timeout : 5000,
-            rejectUnauthorized: false
+            rejectUnauthorized: false,
+            agent: opts.agent
         }, res => {
             const chunks = [];
             res.on('error', reject);
@@ -89,7 +90,8 @@ async function postJson(opts) {
         timeout: opts.timeout,
         method: 'POST',
         body: JSON.stringify(opts.body),
-        followRedirect: false
+        followRedirect: false,
+        agent: opts.agent
     });
     if (res.status !== 200) {
         if (res.body.byteLength < 1024) {
@@ -117,7 +119,8 @@ async function getJson(opts) {
         headers: opts.headers,
         timeout: opts.timeout,
         method: 'GET',
-        followRedirect: true
+        followRedirect: true,
+        agent: opts.agent
     });
     if (res.status !== 200) {
         if (res.body.byteLength < 1024) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wok-server",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "packageManager": "pnpm@8.9.0",
   "description": "一个基于 NodeJs 和 TypeScript 的后端框架，轻量级、克制、简洁。A lightweight, restrained, and concise backend framework based on Node.js and TypeScript.",
   "scripts": {

package/src/http-client/index.ts

@@ -1,5 +1,5 @@
-import { IncomingHttpHeaders, request as requestHttp } from 'http'
-import { request as requestHttps } from 'https'
+import { Agent as HttpAgent, IncomingHttpHeaders, request as requestHttp } from 'http'
+import { Agent as HttpsAgent, request as requestHttps } from 'https'
 import { URL } from 'url'
 
 /**
@@ -34,6 +34,10 @@ export interface HttpRequestOpts {
    * 是否跟随重定向
    */
   followRedirect?: boolean
+  /**
+   * HTTP/HTTPS Agent，用于连接复用、代理等高级配置
+   */
+  agent?: HttpAgent | HttpsAgent
 }
 /**
  * 响应信息.
@@ -86,7 +90,8 @@ export function doRequest(opts: HttpRequestOpts): Promise<HttpResponseInfo> {
         method: opts.method,
         headers: opts.headers,
         timeout: opts.timeout && opts.timeout > 0 ? opts.timeout : 5000,
-        rejectUnauthorized: false
+        rejectUnauthorized: false,
+        agent: opts.agent
       },
       res => {
         const chunks: any[] = []
@@ -136,7 +141,7 @@ export function doRequest(opts: HttpRequestOpts): Promise<HttpResponseInfo> {
  * @param opts
  */
 export async function postJson<T>(
-  opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout'> & { body: any }
+  opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout' | 'agent'> & { body: unknown }
 ): Promise<T> {
   const headers = Object.assign({}, opts.headers || {}, {
     'Content-Type': 'application/json; charset=utf-8'
@@ -148,7 +153,8 @@ export async function postJson<T>(
     timeout: opts.timeout,
     method: 'POST',
     body: JSON.stringify(opts.body),
-    followRedirect: false
+    followRedirect: false,
+    agent: opts.agent
   })
   if (res.status !== 200) {
     if (res.body.byteLength < 1024) {
@@ -173,7 +179,7 @@ export async function postJson<T>(
  * @param opts
  */
 export async function getJson<T>(
-  opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout'>
+  opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout' | 'agent'>
 ): Promise<T> {
   const res = await doRequest({
     url: opts.url,
@@ -181,7 +187,8 @@ export async function getJson<T>(
     headers: opts.headers,
     timeout: opts.timeout,
     method: 'GET',
-    followRedirect: true
+    followRedirect: true,
+    agent: opts.agent
   })
   if (res.status !== 200) {
     if (res.body.byteLength < 1024) {

package/types/http-client/index.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { IncomingHttpHeaders } from 'http';
+/// <reference types="node" />
+import { Agent as HttpAgent, IncomingHttpHeaders } from 'http';
+import { Agent as HttpsAgent } from 'https';
 /**
  * 请求选项.
  */
@@ -33,6 +35,10 @@ export interface HttpRequestOpts {
      * 是否跟随重定向
      */
     followRedirect?: boolean;
+    /**
+     * HTTP/HTTPS Agent，用于连接复用、代理等高级配置
+     */
+    agent?: HttpAgent | HttpsAgent;
 }
 /**
  * 响应信息.
@@ -61,11 +67,11 @@ export declare function doRequest(opts: HttpRequestOpts): Promise<HttpResponseIn
  * 发送 json 格式的 post 请求，body 是未序列化的普通对象，表示要发送的请求数据.
  * @param opts
  */
-export declare function postJson<T>(opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout'> & {
-    body: any;
+export declare function postJson<T>(opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout' | 'agent'> & {
+    body: unknown;
 }): Promise<T>;
 /**
  * get 请求获取 json 格式数据.
  * @param opts
  */
-export declare function getJson<T>(opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout'>): Promise<T>;
+export declare function getJson<T>(opts: Pick<HttpRequestOpts, 'url' | 'query' | 'headers' | 'timeout' | 'agent'>): Promise<T>;