@zwa73/utils 1.0.234 → 1.0.239

package/dist/UtilFunctions.d.ts

@@ -11,6 +11,8 @@ type ExecOpt = Partial<{
     nodeModules: string;
     /**工作路径 */
     cwd: string;
+    /**额外环境变量 */
+    env: string;
 }>;
 /**常用函数 */
 declare class _UtilFunc {
@@ -34,6 +36,7 @@ declare class _UtilFunc {
      * @param opt.errlvl       - 错误的日志等级
      * @param opt.nodeModules  - nodeModules文件夹路径
      * @param opt.cwd          - 执行目录
+     * @param opt.env          - 额外环境变量
      */
     static exec(command: string, opt?: ExecOpt): Promise<{
         stdout: string;

package/dist/UtilFunctions.js

@@ -72,11 +72,12 @@ class _UtilFunc {
      * @param opt.errlvl       - 错误的日志等级
      * @param opt.nodeModules  - nodeModules文件夹路径
      * @param opt.cwd          - 执行目录
+     * @param opt.env          - 额外环境变量
      */
     static async exec(command, opt) {
         return new Promise(async (resolve, reject) => {
             // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
-            const env = Object.create(process.env);
+            const env = Object.assign(Object.create(process.env), opt?.env ?? {});
             const penv = opt?.nodeModules
                 ? path_1.default.join(UtilFileTools_1.UtilFT.currosizePath(opt.nodeModules), '.bin')
                 : UtilFileTools_1.UtilFT.currosizePath(await exports.UtilFunc.memoize(UtilFileTools_1.UtilFT.findNodeModulesDir)(process.cwd(), '.bin') ?? '');

package/dist/UtilHttp.d.ts

@@ -2,6 +2,7 @@ import { AnyString, JToken, MPromise, PartialOption, StatusVerifyFn } from "./Ut
 import http from 'http';
 import { PromiseRetries } from "./UtilFunctions";
 import FormData from "form-data";
+import { PromiseQueue } from "@zwa73/js-utils";
 /**网络请求返回值 */
 export type RequestResult<T> = {
     /**响应头 */
@@ -13,6 +14,10 @@ export type RequestResult<T> = {
 };
 /**网络请求选项 */
 export type RequestOption = {
+    /**请求之间的间隔, 单位毫秒 默认 1
+     * 如果用promise并发请求可能会导致req.write提前中断, 为避免此问题需要设置请求间隔
+     */
+    interval?: number;
     /**请求协议 */
     protocol: 'http:' | 'https:';
     /**超时时间/毫秒  最小为10_000 默认无限 */
@@ -289,6 +294,8 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
     } : {
         option: OPT;
     })>): Promise<import("@zwa73/js-utils").PromiseRetryResult<ParseResult<A>>>;
+    /**控制请求间隔的队列 */
+    static requestQueue: PromiseQueue;
     /**发送网络请求
      * @param option     - 网络请求选项
      * @param reqProc    - 请求处理函数 需调用req.end()

package/dist/UtilHttp.js

@@ -366,6 +366,8 @@ class UtilHttp {
         const procFn = async () => this.once(arg);
         return UtilFunctions_1.UtilFunc.retryPromise(procFn, verify, retries);
     }
+    /**控制请求间隔的队列 */
+    static requestQueue = new js_utils_1.PromiseQueue();
     /**发送网络请求
      * @param option     - 网络请求选项
      * @param reqProc    - 请求处理函数 需调用req.end()
@@ -374,12 +376,15 @@ class UtilHttp {
     static async request(option, sendProc, acceptProc) {
         const { reduce: reqReduce, init: reqInit } = acceptProc;
         const { proc: reqProc } = sendProc;
-        const { protocol, timeout, ...baseReqOpt } = option;
-        const plusTimeout = (timeout ?? 0) + 1000;
-        const hasTimeLimit = (timeout ? timeout >= 10_000 : false);
+        const { protocol, timeout = 0, interval = 1, ...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));
         return new Promise(async (resolve, rejecte) => {
             const finallyTimeout = hasTimeLimit
                 ? setTimeout(() => {

package/package.json

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