@zwa73/utils 1.0.38 → 1.0.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/UtilCom.js +16 -9
  2. package/package.json +1 -1
  3. package/src/UtilCom.ts +16 -10
package/dist/UtilCom.js CHANGED
@@ -22,33 +22,40 @@ var UtilCom;
22
22
  if (hasTimeLimit) {
23
23
  res.setTimeout(timeLimit, () => {
24
24
  //res.abort();
25
- throw funcName + " 接收反馈超时: " + timeLimit + " ms";
25
+ UtilLogger_1.SLogger.warn(funcName + " 接收反馈超时: " + timeLimit + " ms");
26
+ resolve(null);
27
+ return;
26
28
  });
27
29
  }
28
30
  let resdata = "";
29
31
  res.setEncoding('utf8');
30
32
  res.on('data', (chunk) => resdata += chunk);
31
33
  res.on('error', (e) => {
32
- throw funcName + " 接收反馈错误:" + e;
34
+ UtilLogger_1.SLogger.warn(funcName + " 接收反馈错误:" + e);
35
+ resolve(null);
36
+ return;
33
37
  });
34
38
  res.on('end', () => {
35
- if (resdata == "")
36
- throw funcName + " 接收反馈错误: resdata 为空";
39
+ if (resdata == "") {
40
+ UtilLogger_1.SLogger.warn(funcName + " 接收反馈错误: resdata 为空");
41
+ resolve(null);
42
+ return;
43
+ }
37
44
  try {
38
45
  let obj = JSON.parse(resdata);
39
- UtilLogger_1.SLogger.http(funcName + " 接受信息:", obj);
46
+ UtilLogger_1.SLogger.http(funcName + " 接受信息:", (0, UtilInterfaces_1.stringifyJToken)(obj));
40
47
  resolve(obj);
41
48
  return;
42
49
  }
43
50
  catch (e) {
44
- throw funcName + " 接收反馈错误:" + e + "\n原始字符串:" + resdata;
51
+ UtilLogger_1.SLogger.warn(funcName + " 接收反馈错误:" + e + "\n原始字符串:" + resdata);
52
+ resolve(null);
53
+ return;
45
54
  }
46
55
  });
47
56
  }
48
57
  catch (err) {
49
- if (typeof err != "string")
50
- throw err;
51
- UtilLogger_1.SLogger.warn(err);
58
+ UtilLogger_1.SLogger.warn(funcName + " 未知错误:" + err);
52
59
  resolve(null);
53
60
  return;
54
61
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zwa73/utils",
3
- "version": "1.0.38",
3
+ "version": "1.0.40",
4
4
  "description": "my utils",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/UtilCom.ts CHANGED
@@ -23,7 +23,9 @@ function sPost(type:"http"|"https",json:JObject,options:Object,timeLimit:number=
23
23
  if(hasTimeLimit){
24
24
  res.setTimeout(timeLimit, ()=>{
25
25
  //res.abort();
26
- throw funcName+" 接收反馈超时: "+timeLimit+" ms";
26
+ SLogger.warn(funcName+" 接收反馈超时: "+timeLimit+" ms");
27
+ resolve(null);
28
+ return;
27
29
  });
28
30
  }
29
31
 
@@ -32,30 +34,34 @@ function sPost(type:"http"|"https",json:JObject,options:Object,timeLimit:number=
32
34
  res.on('data',(chunk)=>resdata+=chunk);
33
35
 
34
36
  res.on('error',(e)=>{
35
- throw funcName+" 接收反馈错误:"+e;
37
+ SLogger.warn(funcName+" 接收反馈错误:"+e);
38
+ resolve(null);
39
+ return;
36
40
  });
37
41
 
38
42
  res.on('end',()=>{
39
- if(resdata=="")
40
- throw funcName+" 接收反馈错误: resdata 为空";
43
+ if(resdata==""){
44
+ SLogger.warn(funcName+" 接收反馈错误: resdata 为空");
45
+ resolve(null);
46
+ return;
47
+ }
41
48
  try{
42
49
  let obj = JSON.parse(resdata);
43
- SLogger.http(funcName+" 接受信息:",obj);
50
+ SLogger.http(funcName+" 接受信息:",stringifyJToken(obj));
44
51
  resolve(obj);
45
52
  return;
46
53
  }
47
54
  catch(e){
48
- throw funcName+" 接收反馈错误:"+e+"\n原始字符串:"+resdata;
55
+ SLogger.warn(funcName+" 接收反馈错误:"+e+"\n原始字符串:"+resdata);
56
+ resolve(null);
57
+ return;
49
58
  }
50
59
  });
51
60
  }catch(err){
52
- if(typeof err != "string")
53
- throw err;
54
- SLogger.warn(err);
61
+ SLogger.warn(funcName+" 未知错误:"+err);
55
62
  resolve(null);
56
63
  return;
57
64
  }
58
-
59
65
  };
60
66
  //路由 http/https
61
67
  let req:http.ClientRequest=null as any as http.ClientRequest;