@zwa73/utils 1.0.200 → 1.0.202

package/dist/UtilCom.d.ts

@@ -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,37 +136,37 @@ 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 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>>;
+    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>;

package/dist/UtilCom.js

@@ -9,7 +9,6 @@ const https_1 = __importDefault(require("https"));
 const UtilLogger_1 = require("./UtilLogger");
 const UtilFunctions_1 = require("./UtilFunctions");
 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", "string"];
@@ -136,8 +135,10 @@ class UtilCom {
             init: '',
             reduce: (acc, curr) => acc + curr,
             parse: (result) => {
-                if (result == undefined)
+                if (result == undefined) {
+                    UtilLogger_1.SLogger.warn(`json accept 接收反馈错误: 响应结果无效`);
                     return undefined;
+                }
                 const { data, ...rest } = result;
                 if (data.trim() == "") {
                     UtilLogger_1.SLogger.warn(`json accept 接收反馈错误: 原始字符串为空`, UtilFunctions_1.UtilFunc.stringifyJToken(result, { compress: true, space: 2 }));
@@ -339,14 +340,10 @@ exports.UtilCom = UtilCom;
 if (false)
     ((async () => {
         const t = await UtilCom.https().postJson()
-            .retry({
-            option: {
-                hostname: 'httpbin.org',
-                path: '/post',
-                timeout: 10000
-            },
-            verify: () => UtilSymbol_1.Success,
-            retries: {}
+            .once({
+            hostname: 'httpbin.org',
+            path: '/post',
+            timeout: 10000
         }, { test: 1 });
         console.log(t);
     })());

package/dist/UtilFunctions.js

@@ -387,8 +387,10 @@ class UtilFunc {
                 return `${ec}${str}${ec}`;
             return value;
         };
-        return JSON.stringify(token, compressReplacer, space)
-            .replace(new RegExp(`"${ec}(.*?)${ec}"`, 'g'), (match, p1) => p1.replace(/\\([\\"])/g, '$1'));
+        const result = JSON.stringify(token, compressReplacer, space);
+        if (typeof result != 'string')
+            return result;
+        return result.replace(new RegExp(`"${ec}(.*?)${ec}"`, 'g'), (match, p1) => p1.replace(/\\([\\"])/g, '$1'));
     }
     /**验证一个变量的类型是否为 T
      * @template T - 验证类型

package/package.json

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

package/src/UtilCom.ts

@@ -202,11 +202,14 @@ A extends AcceptProc<any,any>,
         return map[t];
     }
     acceptJson(){
-        const proc:AcceptProc<string,JToken>={
+        const proc:AcceptProc<string,RequestResult<JToken>|undefined>={
             init:'',
             reduce:(acc,curr)=>acc+curr,
             parse:(result)=>{
-                if(result==undefined) return undefined;
+                if(result==undefined){
+                    SLogger.warn(`json accept 接收反馈错误: 响应结果无效`);
+                    return undefined;
+                }
                 const {data,...rest} = result;
 
                 if(data.trim()==""){
@@ -444,14 +447,10 @@ A extends AcceptProc<any,any>,
 
 if(false)((async ()=>{
     const t = await UtilCom.https().postJson()
-        .retry({
-            option:{
-                hostname:'httpbin.org',
-                path:'/post',
-                timeout:10000
-            },
-            verify:()=>Success,
-            retries:{}
+        .once({
+            hostname:'httpbin.org',
+            path:'/post',
+            timeout:10000
         },{test:1});
     console.log(t);
 })())

package/src/UtilFunctions.ts

@@ -461,8 +461,9 @@ static stringifyJToken(token:JToken|IJData,opt?:StringifyOpt){
         return value;
     }
 
-    return JSON.stringify(token,compressReplacer,space)
-        .replace(new RegExp(`"${ec}(.*?)${ec}"`,'g'), (match, p1) =>
+    const result = JSON.stringify(token,compressReplacer,space);
+    if(typeof result!='string') return result;
+    return result.replace(new RegExp(`"${ec}(.*?)${ec}"`,'g'), (match, p1) =>
             p1.replace(/\\([\\"])/g, '$1'));
 }