@zwa73/utils 1.0.231 → 1.0.232

package/dist/UtilHttp.js

@@ -185,8 +185,8 @@ class UtilHttp {
                     UtilLogger_1.SLogger.http(`json accept 接受信息 data:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }), `result:`, UtilFunctions_1.UtilFunc.stringifyJToken(rest, { compress: true, space: 2 }));
                     return { ...rest, data: obj };
                 }
-                catch (e) {
-                    UtilLogger_1.SLogger.warn(`json accept 接收反馈错误:${e}`, UtilFunctions_1.UtilFunc.stringifyJToken(result, { compress: true, space: 2 }));
+                catch (err) {
+                    UtilLogger_1.SLogger.warn(`json accept 接收反馈错误:`, err, UtilFunctions_1.UtilFunc.stringifyJToken(result, { compress: true, space: 2 }));
                     return { ...result, raw: data, data: null };
                 }
             }
@@ -362,18 +362,29 @@ class UtilHttp {
      */
     static async request(option, proc, reduce, init) {
         const { protocol, timeout, ...baseReqOpt } = option;
+        const plusTimeout = (timeout ?? 0) + 1000;
         const hasTimeLimit = (timeout ? timeout >= 10_000 : false);
         const flagName = `UtilCom.request ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;
         const reduceQueue = new js_utils_1.PromiseQueue();
         let dataPromise = null;
         return new Promise(async (resolve, rejecte) => {
+            const finallyTimeout = hasTimeLimit
+                ? setTimeout(() => {
+                    UtilLogger_1.SLogger.warn(`${flagName} finallyTimeout 超时 ${timeout} ms, 终止请求`);
+                    req.destroy();
+                    resolve(undefined);
+                }, plusTimeout)
+                : undefined;
+            const finallyResolve = (t) => {
+                clearTimeout(finallyTimeout);
+                resolve(t);
+            };
             const resFunc = (res) => {
                 try {
                     //请求超时
                     if (hasTimeLimit) {
                         res.setTimeout(timeout, () => {
-                            UtilLogger_1.SLogger.warn(`${flagName} 接收反馈超时: ${timeout} ms`);
-                            res.destroy();
+                            UtilLogger_1.SLogger.warn(`${flagName} http.response 触发 ${timeout} ms 超时, 继续挂起等待`);
                         });
                     }
                     let mergedata = init;
@@ -383,16 +394,16 @@ class UtilHttp {
                             .enqueue(async () => mergedata = await reduce(mergedata, chunk))
                             .catch(err => {
                             UtilLogger_1.SLogger.error(`${flagName} reduce函数错误:`, err, `chunk:${chunk}\nmergedata:`, mergedata);
-                            resolve(undefined);
+                            finallyResolve(undefined);
                         });
                     });
                     res.on('error', err => {
                         UtilLogger_1.SLogger.warn(`${flagName} 接收反馈错误:`, err);
-                        resolve(undefined);
+                        finallyResolve(undefined);
                     });
                     res.on('end', async () => {
                         await dataPromise;
-                        resolve({
+                        finallyResolve({
                             headers: res.headers,
                             statusCode: res.statusCode,
                             data: mergedata,
@@ -401,7 +412,7 @@ class UtilHttp {
                 }
                 catch (err) {
                     UtilLogger_1.SLogger.warn(`${flagName} 未知错误:`, err);
-                    resolve(undefined);
+                    finallyResolve(undefined);
                     return;
                 }
             };
@@ -412,20 +423,19 @@ class UtilHttp {
             //请求超时
             if (hasTimeLimit) {
                 req.setTimeout(timeout, () => {
-                    UtilLogger_1.SLogger.warn(`${flagName} 发送请求超时: ${timeout} ms`);
-                    req.destroy();
+                    UtilLogger_1.SLogger.warn(`${flagName} http.request 触发 ${timeout} ms 超时, 继续挂起等待`);
                 });
             }
             req.on('error', err => {
                 UtilLogger_1.SLogger.warn(`${flagName} 发送请求错误:`, err);
-                resolve(undefined);
+                finallyResolve(undefined);
             });
             try {
                 await proc(req);
             }
             catch (err) {
                 UtilLogger_1.SLogger.error(`${flagName} proc函数错误:`, err);
-                resolve(undefined);
+                finallyResolve(undefined);
             }
         });
     }

package/package.json

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