@zwa73/utils 1.0.240 → 1.0.242

package/dist/UtilHttp.d.ts

@@ -14,10 +14,6 @@ export type RequestResult<T> = {
 };
 /**网络请求选项 */
 export type RequestOption = {
-    /**请求之间的间隔, 单位毫秒 默认 1
-     * 如果用promise并发请求可能会导致req.write提前中断, 为避免此问题需要设置请求间隔
-     */
-    interval?: number;
     /**请求协议 */
     protocol: 'http:' | 'https:';
     /**超时时间/毫秒  最小为10_000 默认无限 */

package/dist/UtilHttp.js

@@ -242,9 +242,12 @@ class UtilHttp {
             this._data.headers ??= {};
             this._data.headers['Content-Length'] = Buffer.byteLength(data);
             return {
-                proc: req => {
-                    if (isPost)
-                        req.write(data);
+                proc: async (req) => {
+                    if (isPost) {
+                        const flushed = req.write(data);
+                        if (!flushed)
+                            await new Promise((resolve) => req.once('drain', resolve));
+                    }
                     req.end();
                 }
             };
@@ -294,9 +297,12 @@ class UtilHttp {
             this._data.headers ??= {};
             this._data.headers['Content-Length'] = Buffer.byteLength(data);
             return {
-                proc: req => {
-                    if (isPost)
-                        req.write(data);
+                proc: async (req) => {
+                    if (isPost) {
+                        const flushed = req.write(data);
+                        if (!flushed)
+                            await new Promise((resolve) => req.once('drain', resolve));
+                    }
                     req.end();
                 }
             };
@@ -376,15 +382,17 @@ class UtilHttp {
     static async request(option, sendProc, acceptProc) {
         const { reduce: reqReduce, init: reqInit } = acceptProc;
         const { proc: reqProc } = sendProc;
-        const { protocol, timeout = 0, interval = 1, ...baseReqOpt } = option;
+        const { protocol, timeout = 0, 
+        //interval = 0,
+        ...baseReqOpt } = option;
         const plusTimeout = timeout + 1000;
         const hasTimeLimit = timeout >= 10_000;
         const flagName = `UtilCom.request ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;
         const reduceQueue = new js_utils_1.PromiseQueue();
         let dataPromise = null;
         //等待间隔
-        if (UtilHttp.requestQueue.length > 0)
-            await UtilHttp.requestQueue.enqueue(async () => UtilFunctions_1.UtilFunc.sleep(interval));
+        //if(UtilHttp.requestQueue.length>0 && interval>0)
+        //    await UtilHttp.requestQueue.enqueue(async ()=>UtilFunc.sleep(interval));
         return new Promise(async (resolve, rejecte) => {
             const finallyTimeout = hasTimeLimit
                 ? setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.240",
+	"version": "1.0.242",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {