@zwa73/utils 1.0.199 → 1.0.201

package/dist/UtilCom.d.ts

@@ -39,10 +39,10 @@ export type QueryRequestData = NodeJS.Dict<string | number | boolean | readonly
 export type RequestProcFn = ((req: http.ClientRequest) => MPromise<void>);
 /**数据处理函数 */
 export type RequestReduceFn<T> = (acc: T, data: string) => MPromise<T>;
-declare const AcceptTypeList: readonly ["json", "raw"];
+declare const AcceptTypeList: readonly ["json", "string"];
 /**可用的接受类型 */
 type AcceptType = typeof AcceptTypeList[number];
-declare const SendTypeList: readonly ["json", "query", "formData", "none", "raw"];
+declare const SendTypeList: readonly ["json", "query", "formData", "none"];
 /**可用的发送类型 */
 type SendType = typeof SendTypeList[number];
 /**accept处理数据 */
@@ -56,7 +56,7 @@ type SendProc<T extends any[]> = {
     proc: (opt: RequestOption, ...args: T) => MPromise<RequestProcFn>;
 };
 declare const SendNoneProc: SendProc<[]>;
-declare const AcceptRawProc: AcceptProc<string, RequestResult<string> | undefined>;
+declare const AcceptStringProc: AcceptProc<string, RequestResult<string> | undefined>;
 /**send处理的参数 */
 type SendParams<T extends SendProc<any>> = T extends SendProc<infer T> ? T : never;
 /**accept处理的结果 */
@@ -100,7 +100,7 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
         headers: {
             "Content-Type": "application/json";
         };
-    }, SendProc<[JToken]>, AcceptProc<string, JToken>>;
+    }, SendProc<[JToken]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**收发皆为json的post预设 */
     postJson(): UtilCom<D & {
         method: "POST";
@@ -108,15 +108,15 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
         headers: {
             'Content-Type': "application/json";
         };
-    }, SendProc<[JToken]>, AcceptProc<string, JToken>>;
+    }, SendProc<[JToken]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**无查询参数获取json的get预设 */
     getJson(): UtilCom<D & {
         method: "GET";
-    }, SendProc<[]>, AcceptProc<string, JToken>>;
+    }, SendProc<[]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**有查询参数获取json的get预设 */
     queryJson(): UtilCom<D & {
         method: "GET";
-    }, SendProc<[QueryRequestData]>, AcceptProc<string, JToken>>;
+    }, SendProc<[QueryRequestData]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**收发皆为json的https-post预设 */
     static httpsPostJson(): UtilCom<{
         readonly protocol: "https:";
@@ -126,7 +126,7 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
         headers: {
             'Content-Type': "application/json";
         };
-    }, SendProc<[JToken]>, AcceptProc<string, JToken>>;
+    }, SendProc<[JToken]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**收发皆为json的http-post预设 */
     static httpPostJson(): UtilCom<{
         readonly protocol: "http:";
@@ -136,39 +136,41 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
         headers: {
             'Content-Type': "application/json";
         };
-    }, SendProc<[JToken]>, AcceptProc<string, JToken>>;
+    }, SendProc<[JToken]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**无查询参数获取json的https-get预设 */
     static httpsGetJson(): UtilCom<{
         readonly protocol: "https:";
     } & {
         method: "GET";
-    }, SendProc<[]>, AcceptProc<string, JToken>>;
+    }, SendProc<[]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**有查询参数获取json的https-get预设 */
     static httpsQueryJson(): UtilCom<{
         readonly protocol: "http:";
     } & {
         method: "GET";
-    }, SendProc<[QueryRequestData]>, AcceptProc<string, JToken>>;
+    }, SendProc<[QueryRequestData]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**无查询参数获取json的http-get预设 */
     static httpGetJson(): UtilCom<{
         readonly protocol: "http:";
     } & {
         method: "GET";
-    }, SendProc<[]>, AcceptProc<string, JToken>>;
+    }, SendProc<[]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
     /**有查询参数获取json的http-get预设 */
     static httpQueryJson(): UtilCom<{
         readonly protocol: "http:";
     } & {
         method: "GET";
-    }, SendProc<[QueryRequestData]>, AcceptProc<string, JToken>>;
-    /**接收数据类型*/
+    }, SendProc<[QueryRequestData]>, AcceptProc<string, RequestResult<JToken> | undefined>>;
+    /**预设的接收数据类型*/
     accept<T extends AcceptType>(t: T): {
-        readonly json: UtilCom<D, S, AcceptProc<string, JToken>>;
-        readonly raw: UtilCom<D, S, AcceptProc<string, RequestResult<string> | undefined>>;
+        readonly json: UtilCom<D, S, AcceptProc<string, RequestResult<JToken> | undefined>>;
+        readonly string: UtilCom<D, S, AcceptProc<string, RequestResult<string> | undefined>>;
     }[T];
-    acceptJson(): UtilCom<D, S, AcceptProc<string, JToken>>;
-    acceptRaw(): UtilCom<D, S, typeof AcceptRawProc>;
-    /**发送数据类型*/
+    acceptJson(): UtilCom<D, S, AcceptProc<string, RequestResult<JToken> | undefined>>;
+    acceptString(): UtilCom<D, S, typeof AcceptStringProc>;
+    /**自定的接收数据类型*/
+    acceptRaw<AD, AT>(proc: AcceptProc<AD, AT>): UtilCom<D, S, typeof proc>;
+    /**预设的发送数据类型*/
     send<T extends SendType>(t: T): {
         readonly json: UtilCom<D & {
             headers: {
@@ -182,7 +184,6 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
             };
         }, SendProc<[FormData]>, A>;
         readonly none: UtilCom<D, SendProc<[]>, A>;
-        readonly raw: UtilCom<D, SendProc<[(opt: RequestOption) => RequestProcFn]>, A>;
     }[T];
     /**利用 req.write 发送一段json */
     sendJson(): UtilCom<D & {
@@ -197,13 +198,14 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
             "Content-Type": "multipart/form-data";
         };
     }, SendProc<[FormData]>, A>;
-    sendRaw(): UtilCom<D, SendProc<[(opt: RequestOption) => RequestProcFn]>, A>;
     sendNone(): UtilCom<D, typeof SendNoneProc, A>;
+    /**自定的发送数据类型*/
+    sendRaw<T extends any[]>(proc: SendProc<T>): UtilCom<D, typeof proc, A>;
     /**发送请求
      * @param option - 网络请求选项
      * @param datas  - 数据对象
      */
-    once(option: PartialOption<RequestOption, D>, ...datas: SendParams<S>): Promise<any>;
+    once(option: PartialOption<RequestOption, D>, ...datas: SendParams<S>): Promise<ParseResult<A>>;
     /**重复发送网络请求
      * @param option  - 网络请求选项
      * @param verify  - 有效性验证函数

package/dist/UtilCom.js

@@ -12,12 +12,12 @@ const querystring_1 = __importDefault(require("querystring"));
 const UtilSymbol_1 = require("./UtilSymbol");
 const http_proxy_agent_1 = __importDefault(require("http-proxy-agent"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
-const AcceptTypeList = ["json", "raw"];
-const SendTypeList = ["json", "query", "formData", "none", "raw"];
+const AcceptTypeList = ["json", "string"];
+const SendTypeList = ["json", "query", "formData", "none"];
 const SendNoneProc = {
     proc: (opt) => (req) => void req.end()
 };
-const AcceptRawProc = {
+const AcceptStringProc = {
     init: '',
     reduce: (acc, dat) => acc + dat,
     parse: (result) => result
@@ -35,11 +35,11 @@ class UtilCom {
     //#region 流式创建
     /**设为https请求 */
     static https() {
-        return new UtilCom({ protocol: 'https:' }, SendNoneProc, AcceptRawProc);
+        return new UtilCom({ protocol: 'https:' }, SendNoneProc, AcceptStringProc);
     }
     /**设为http请求 */
     static http() {
-        return new UtilCom({ protocol: 'http:' }, SendNoneProc, AcceptRawProc);
+        return new UtilCom({ protocol: 'http:' }, SendNoneProc, AcceptStringProc);
     }
     /**设为get方式的请求 */
     get() {
@@ -123,11 +123,11 @@ class UtilCom {
     }
     //#endregion
     //#region 接收数据类型
-    /**接收数据类型*/
+    /**预设的接收数据类型*/
     accept(t) {
         const map = {
             'json': this.acceptJson(),
-            'raw': this.acceptRaw(),
+            'string': this.acceptString(),
         };
         return map[t];
     }
@@ -145,7 +145,7 @@ class UtilCom {
                 }
                 try {
                     const obj = JSON.parse(data.trim());
-                    UtilLogger_1.SLogger.http(`json accept 接受信息:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }));
+                    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) {
@@ -157,20 +157,24 @@ class UtilCom {
         this._accept = proc;
         return this;
     }
-    acceptRaw() {
-        this._accept = AcceptRawProc;
+    acceptString() {
+        this._accept = AcceptStringProc;
+        return this;
+    }
+    /**自定的接收数据类型*/
+    acceptRaw(proc) {
+        this._accept = proc;
         return this;
     }
     //#endregion
     //#region 发送数据类型
-    /**发送数据类型*/
+    /**预设的发送数据类型*/
     send(t) {
         const map = {
             'json': this.sendJson(),
             'query': this.sendQuery(),
             'formData': this.sendFormData(),
             'none': this.sendNone(),
-            'raw': this.sendRaw(),
         };
         return map[t];
     }
@@ -223,17 +227,15 @@ class UtilCom {
         this._data.headers['Content-Type'] = 'multipart/form-data';
         return this;
     }
-    sendRaw() {
-        const proc = {
-            proc: (opt, fn) => fn(opt),
-        };
-        this._send = proc;
-        return this;
-    }
     sendNone() {
         this._send = SendNoneProc;
         return this;
     }
+    /**自定的发送数据类型*/
+    sendRaw(proc) {
+        this._send = proc;
+        return this;
+    }
     //#endregion
     /**发送请求
      * @param option - 网络请求选项

package/package.json

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

package/src/UtilCom.ts

@@ -59,10 +59,10 @@ export type RequestProcFn = ((req:http.ClientRequest)=>MPromise<void>);
 export type RequestReduceFn<T> = (acc:T,data:string)=>MPromise<T>;
 
 
-const AcceptTypeList = ["json","raw"]as const;
+const AcceptTypeList = ["json","string"]as const;
 /**可用的接受类型 */
 type AcceptType = typeof AcceptTypeList[number];
-const SendTypeList = ["json","query","formData","none","raw"] as const;
+const SendTypeList = ["json","query","formData","none"] as const;
 /**可用的发送类型 */
 type SendType = typeof SendTypeList[number];
 
@@ -79,11 +79,12 @@ type SendProc<T extends any[]> = {
 const SendNoneProc:SendProc<[]> = {
     proc:(opt)=>(req)=>void req.end()
 }
-const AcceptRawProc:AcceptProc<string,RequestResult<string>|undefined> = {
+const AcceptStringProc:AcceptProc<string,RequestResult<string>|undefined> = {
     init  :'',
     reduce:(acc:string,dat:string)=>acc+dat,
     parse :(result:RequestResult<string>|undefined)=>result
 }
+
 /**send处理的参数 */
 type SendParams<T extends SendProc<any>> = T extends SendProc<infer T>
     ? T : never;
@@ -102,11 +103,11 @@ A extends AcceptProc<any,any>,
     //#region 流式创建
     /**设为https请求 */
     static https(){
-        return new UtilCom({protocol:'https:'} as const,SendNoneProc,AcceptRawProc);
+        return new UtilCom({protocol:'https:'} as const,SendNoneProc,AcceptStringProc);
     }
     /**设为http请求 */
     static http(){
-        return new UtilCom({protocol:'http:'} as const,SendNoneProc,AcceptRawProc);
+        return new UtilCom({protocol:'http:'} as const,SendNoneProc,AcceptStringProc);
     }
     /**设为get方式的请求 */
     get(){
@@ -192,16 +193,16 @@ A extends AcceptProc<any,any>,
     //#endregion
 
     //#region 接收数据类型
-    /**接收数据类型*/
+    /**预设的接收数据类型*/
     accept<T extends AcceptType>(t:T){
         const map = {
-            'json':this.acceptJson(),
-            'raw' :this.acceptRaw(),
+            'json'  :this.acceptJson(),
+            'string':this.acceptString(),
         } as const;
         return map[t];
     }
     acceptJson(){
-        const proc:AcceptProc<string,JToken>={
+        const proc:AcceptProc<string,RequestResult<JToken>|undefined>={
             init:'',
             reduce:(acc,curr)=>acc+curr,
             parse:(result)=>{
@@ -214,7 +215,12 @@ A extends AcceptProc<any,any>,
                 }
                 try{
                     const obj = JSON.parse(data.trim()) as JToken;
-                    SLogger.http(`json accept 接受信息:`,UtilFunc.stringifyJToken(obj,{compress:true,space:2}));
+                    SLogger.http(
+                        `json accept 接受信息 data:`,
+                        UtilFunc.stringifyJToken(obj,{compress:true,space:2}),
+                        `result:`,
+                        UtilFunc.stringifyJToken(rest,{compress:true,space:2})
+                    );
                     return{...rest,data:obj};
                 }
                 catch(e){
@@ -224,23 +230,27 @@ A extends AcceptProc<any,any>,
             }
         }
         this._accept = proc as any;
-        return this as any as UtilCom<D,S,typeof proc>; 
+        return this as any as UtilCom<D,S,typeof proc>;
+    }
+    acceptString(){
+        this._accept = AcceptStringProc as any;
+        return this as any as UtilCom<D,S,typeof AcceptStringProc>;
     }
-    acceptRaw(){
-        this._accept = AcceptRawProc as any;
-        return this as any as UtilCom<D,S,typeof AcceptRawProc>;
+    /**自定的接收数据类型*/
+    acceptRaw<AD,AT>(proc:AcceptProc<AD,AT>){
+        this._accept = proc as any;
+        return this as any as UtilCom<D,S,typeof proc>;
     }
     //#endregion
 
     //#region 发送数据类型
-    /**发送数据类型*/
+    /**预设的发送数据类型*/
     send<T extends SendType>(t:T){
         const map = {
             'json'      :this.sendJson(),
             'query'     :this.sendQuery(),
             'formData'  :this.sendFormData(),
             'none'      :this.sendNone(),
-            'raw'       :this.sendRaw(),
         } as const;
         return map[t];
     }
@@ -298,17 +308,15 @@ A extends AcceptProc<any,any>,
             headers:{ 'Content-Type': 'multipart/form-data' }
         }, typeof proc, A>;
     }
-    sendRaw(){
-        const proc: SendProc<[(opt:RequestOption)=>RequestProcFn]> = {
-            proc: (opt: RequestOption, fn: ((opt:RequestOption)=>RequestProcFn)) => fn(opt),
-        };
-        this._send = proc as any;
-        return this as any as UtilCom<D, typeof proc, A>;
-    }
     sendNone(){
         this._send = SendNoneProc as any;
         return this as any as UtilCom<D,typeof SendNoneProc,A>;
     }
+    /**自定的发送数据类型*/
+    sendRaw<T extends any[]>(proc:SendProc<T>){
+        this._send = proc as any;
+        return this as any as UtilCom<D, typeof proc, A>;
+    }
     //#endregion
 
     /**发送请求
@@ -320,7 +328,7 @@ A extends AcceptProc<any,any>,
         const proc = await this._send.proc(fullopt,...datas as any[]);
         const {reduce,init,parse} = this._accept;
         const res = await UtilCom.request(fullopt,proc,reduce,init);
-        return parse(res);
+        return parse(res) as ParseResult<A>;
     }
     /**重复发送网络请求  
      * @param option  - 网络请求选项