@zwa73/utils 1.0.216 → 1.0.217

package/dist/UtilCom.d.ts

@@ -32,6 +32,8 @@ export type RequestOption = {
         /**内容长度 一般无需填写 应为buffer长度而非字符串长度 */
         'Content-Length'?: number;
     };
+    /**响应buffer的编码 默认utf8 */
+    responseEncode?: BufferEncoding;
 } & http.RequestOptions;
 /**getquery请求所允许的数据 */
 export type QueryRequestData = NodeJS.Dict<string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>;
@@ -57,10 +59,11 @@ type SendProc<T extends any[]> = {
 };
 declare const SendNoneProc: SendProc<[]>;
 declare const AcceptStringProc: AcceptProc<string, RequestResult<string> | undefined>;
+declare const AcceptNoneProc: AcceptProc<undefined, undefined>;
 /**send处理的参数 */
-type SendParams<T extends SendProc<any>> = T extends SendProc<infer T> ? T : never;
+type SendParams<P extends SendProc<any>> = P extends SendProc<infer T> ? T : never;
 /**accept处理的结果 */
-type ParseResult<D extends AcceptProc<any, any>> = D extends AcceptProc<any, infer T> ? Awaited<T> : never;
+type ParseResult<P extends AcceptProc<any, any>> = P extends AcceptProc<any, infer T> ? Awaited<T> : never;
 /**网络请求工具 */
 export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<RequestOption, 'protocol'>>, S extends SendProc<any>, A extends AcceptProc<any, any>> {
     private _data;
@@ -165,9 +168,11 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
     accept<T extends AcceptType>(t: T): {
         readonly json: UtilCom<D, S, AcceptProc<string, RequestResult<JToken> | undefined>>;
         readonly string: UtilCom<D, S, AcceptProc<string, RequestResult<string> | undefined>>;
+        readonly none: UtilCom<D, S, AcceptProc<undefined, undefined>>;
     }[T];
     acceptJson(): UtilCom<D, S, AcceptProc<string, RequestResult<JToken> | undefined>>;
     acceptString(): UtilCom<D, S, typeof AcceptStringProc>;
+    acceptNone(): UtilCom<D, S, typeof AcceptNoneProc>;
     /**自定的接收数据类型*/
     acceptRaw<AD, AT>(proc: AcceptProc<AD, AT>): UtilCom<D, S, typeof proc>;
     /**预设的发送数据类型*/

package/dist/UtilCom.js

@@ -22,6 +22,11 @@ const AcceptStringProc = {
     reduce: (acc, dat) => acc + dat,
     parse: (result) => result
 };
+const AcceptNoneProc = {
+    init: undefined,
+    reduce: () => undefined,
+    parse: () => undefined
+};
 /**网络请求工具 */
 class UtilCom {
     _data;
@@ -128,6 +133,7 @@ class UtilCom {
         const map = {
             'json': this.acceptJson(),
             'string': this.acceptString(),
+            'none': this.acceptNone(),
         };
         return map[t];
     }
@@ -163,6 +169,10 @@ class UtilCom {
         this._accept = AcceptStringProc;
         return this;
     }
+    acceptNone() {
+        this._accept = AcceptNoneProc;
+        return this;
+    }
     /**自定的接收数据类型*/
     acceptRaw(proc) {
         this._accept = proc;
@@ -273,6 +283,7 @@ class UtilCom {
         const { protocol, timeout, ...baseReqOpt } = option;
         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 resFunc = (res) => {
@@ -281,15 +292,20 @@ class UtilCom {
                     if (hasTimeLimit) {
                         res.setTimeout(timeout, () => {
                             UtilLogger_1.SLogger.warn(`${flagName} 接收反馈超时: ${timeout} ms`);
-                            resolve(undefined);
+                            res.destroy();
                         });
                     }
                     let mergedata = init;
-                    res.setEncoding('utf8');
+                    res.setEncoding(option.responseEncode ?? 'utf8');
                     res.on('data', chunk => {
-                        dataPromise = js_utils_1.PromiseQueue.enqueue(flagName, async () => mergedata = await reduce(mergedata, chunk));
+                        dataPromise = reduceQueue
+                            .enqueue(async () => mergedata = await reduce(mergedata, chunk))
+                            .catch(e => {
+                            UtilLogger_1.SLogger.error(`${flagName} reduce函数错误:${e}\nchunk:${chunk}\nmergedata:`, mergedata);
+                            resolve(undefined);
+                        });
                     });
-                    res.on('error', (e) => {
+                    res.on('error', e => {
                         UtilLogger_1.SLogger.warn(`${flagName} 接收反馈错误:${e}`);
                         resolve(undefined);
                     });
@@ -319,11 +335,17 @@ class UtilCom {
                     req.destroy();
                 });
             }
-            req.on('error', (e) => {
+            req.on('error', e => {
                 UtilLogger_1.SLogger.warn(`${flagName} 发送请求错误:${e}`);
                 resolve(undefined);
             });
-            await proc(req);
+            try {
+                await proc(req);
+            }
+            catch (e) {
+                UtilLogger_1.SLogger.error(`${flagName} proc函数错误:${e}`);
+                resolve(undefined);
+            }
         });
     }
     /**构建query */

package/dist/UtilFileTools.d.ts

@@ -158,7 +158,7 @@ export declare namespace UtilFT {
      * @param opt.recursive - 搜索子目录
      * @returns 文件名路径数组
      */
-    function fileSearchRegex(dir: string, traitRegex: string, opt?: FileSearchRegexOpt): Promise<string[]>;
+    function fileSearchRegex(dir: string, traitRegex: string | RegExp, opt?: FileSearchRegexOpt): Promise<string[]>;
     /**搜索路径符合正则表达式的文件 同步版本
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
@@ -166,7 +166,7 @@ export declare namespace UtilFT {
      * @param opt.relative  - 搜索子目录
      * @returns 文件名路径数组
      */
-    function fileSearchRegexSync(dir: string, traitRegex: string, opt?: FileSearchRegexOpt): string[];
+    function fileSearchRegexSync(dir: string, traitRegex: string | RegExp, opt?: FileSearchRegexOpt): string[];
     /**搜索符合Glob匹配的文件
      * @param dir         - 起始目录
      * @param globPattern - glob匹配

package/package.json

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