@zwa73/utils 1.0.196 → 1.0.197

package/dist/UtilCom.d.ts

@@ -96,6 +96,8 @@ export declare class UtilCom<D extends Partial<ComRequestOption>, S extends Send
     }, S, A>;
     /**补充参数 */
     option<OPT extends Partial<ComRequestOption>>(opt: OPT): UtilCom<D & OPT, S, A>;
+    /**收发皆为json的预设 */
+    json(): UtilCom<D, SendProc<[JsonType<D>]>, AcceptProc<string, JToken>>;
     /**接收数据类型*/
     accept<T extends AcceptType>(t: T): {
         readonly json: UtilCom<D, S, AcceptProc<string, JToken>>;

package/dist/UtilCom.js

@@ -52,6 +52,12 @@ class UtilCom {
         return new UtilCom({ ...this._data, ...opt }, this._send, this._accept);
     }
     //#endregion
+    //#region 快速预设
+    /**收发皆为json的预设 */
+    json() {
+        return this.sendJson().acceptJson();
+    }
+    //#endregion
     //#region 接收数据类型
     /**接收数据类型*/
     accept(t) {
@@ -182,8 +188,7 @@ class UtilCom {
     static async comReq(comReqOpt, procReq, reduceData, initData) {
         const { protocol, timeout, ...baseReqOpt } = comReqOpt;
         const hasTimeLimit = (timeout ? timeout >= 10_000 : false);
-        const flagName = `UtilCom.${protocol}${baseReqOpt.method}`;
-        const postflag = `comReq:${UtilFunctions_1.UtilFunc.genUUID()}`;
+        const flagName = `UtilCom.comReq ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;
         let dataPromise = null;
         return new Promise(async (resolve, rejecte) => {
             const resFunc = (res) => {
@@ -198,7 +203,7 @@ class UtilCom {
                     let mergedata = initData;
                     res.setEncoding('utf8');
                     res.on('data', chunk => {
-                        dataPromise = UtilFunctions_1.UtilFunc.queueProc(postflag, async () => mergedata = await reduceData(mergedata, chunk));
+                        dataPromise = UtilFunctions_1.UtilFunc.queueProc(flagName, async () => mergedata = await reduceData(mergedata, chunk));
                     });
                     res.on('error', (e) => {
                         UtilLogger_1.SLogger.warn(`${flagName} 接收反馈错误:${e}`);

package/package.json

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

package/src/UtilCom.ts

@@ -123,6 +123,13 @@ A extends AcceptProc<any,any>,
     }
     //#endregion
 
+    //#region 快速预设
+    /**收发皆为json的预设 */
+    json(){
+        return this.sendJson().acceptJson();
+    }
+    //#endregion
+
     //#region 接收数据类型
     /**接收数据类型*/
     accept<T extends AcceptType>(t:T){
@@ -268,9 +275,8 @@ A extends AcceptProc<any,any>,
 
         const hasTimeLimit = (timeout ? timeout>=10_000 : false );
 
-        const flagName = `UtilCom.${protocol}${baseReqOpt.method}`;
+        const flagName = `UtilCom.comReq ${protocol}${baseReqOpt.method} ${UtilFunc.genUUID()}`;
 
-        const postflag = `comReq:${UtilFunc.genUUID()}`;
         let dataPromise:Promise<any>|null = null;
 
         return new Promise<ComResp<T>|undefined>(async (resolve, rejecte)=>{
@@ -287,7 +293,7 @@ A extends AcceptProc<any,any>,
                     let mergedata:T = initData;
                     res.setEncoding('utf8');
                     res.on('data', chunk => {
-                        dataPromise = UtilFunc.queueProc(postflag,async()=>mergedata=await reduceData(mergedata,chunk))
+                        dataPromise = UtilFunc.queueProc(flagName,async()=>mergedata=await reduceData(mergedata,chunk))
                     });
 
                     res.on('error',(e)=>{