@zwa73/utils 1.0.29 → 1.0.31

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 (7) hide show
  1. package/dist/UtilCom.js +2 -1
  2. package/dist/UtilLogger.js +2 -1
  3. package/package.json +1 -1
  4. package/src/UtilCom.ts +2 -2
  5. package/src/UtilLogger.ts +3 -1
  6. package/test.js +3 -3
  7. package/testlog/log-2023-08-21.txt +93 -0
package/dist/UtilCom.js CHANGED
@@ -5,6 +5,7 @@ const UtilInterfaces_1 = require("./UtilInterfaces");
5
5
  const https = require("https");
6
6
  const http = require("http");
7
7
  const UtilLogger_1 = require("./UtilLogger");
8
+ const util_1 = require("util");
8
9
  function sPost(type, json, options, timeLimit = -1) {
9
10
  //转换为毫秒
10
11
  const hasTimeLimit = (timeLimit >= 10);
@@ -33,7 +34,7 @@ function sPost(type, json, options, timeLimit = -1) {
33
34
  throw funcName + " 接收反馈错误: resdata 为空";
34
35
  try {
35
36
  let obj = JSON.parse(resdata);
36
- UtilLogger_1.SLogger.http(funcName + " 接受信息:\n" + (0, UtilInterfaces_1.stringifyJToken)(obj));
37
+ UtilLogger_1.SLogger.http(funcName + " 接受信息:", (0, util_1.inspect)((0, UtilInterfaces_1.stringifyJToken)(obj)));
37
38
  resolve(obj);
38
39
  return;
39
40
  }
package/dist/UtilLogger.js CHANGED
@@ -4,6 +4,7 @@ exports.SLogger = void 0;
4
4
  const path = require("path");
5
5
  const winston = require("winston");
6
6
  const DailyRotateFile = require("winston-daily-rotate-file");
7
+ const util_1 = require("util");
7
8
  const logLevels = {
8
9
  fatal: 0,
9
10
  error: 1,
@@ -113,7 +114,7 @@ class SLogger {
113
114
  if (message == null)
114
115
  out = `<${typeof message}> ${typeof message}`;
115
116
  else if (typeof message !== "string")
116
- out = `<${typeof message}> ${message.toString()}`;
117
+ out = `<${typeof message}> ${(0, util_1.inspect)(message)}`;
117
118
  else
118
119
  out = message;
119
120
  strMessages.push(out);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zwa73/utils",
3
- "version": "1.0.29",
3
+ "version": "1.0.31",
4
4
  "description": "my utils",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/UtilCom.ts CHANGED
@@ -2,7 +2,7 @@ import { JObject, stringifyJToken } from "./UtilInterfaces";
2
2
  import * as https from 'https';
3
3
  import * as http from 'http';
4
4
  import { SLogger } from "./UtilLogger";
5
-
5
+ import {inspect} from 'util';
6
6
 
7
7
 
8
8
  function sPost(type:"http"|"https",json:JObject,options:Object,timeLimit:number=-1):Promise<JObject|null>{
@@ -38,7 +38,7 @@ function sPost(type:"http"|"https",json:JObject,options:Object,timeLimit:number=
38
38
  throw funcName+" 接收反馈错误: resdata 为空";
39
39
  try{
40
40
  let obj = JSON.parse(resdata);
41
- SLogger.http(funcName+" 接受信息:\n"+stringifyJToken(obj));
41
+ SLogger.http(funcName+" 接受信息:",inspect(stringifyJToken(obj)));
42
42
  resolve(obj);
43
43
  return;
44
44
  }
package/src/UtilLogger.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import * as path from 'path';
2
2
  import * as winston from 'winston';
3
3
  import * as DailyRotateFile from 'winston-daily-rotate-file';
4
+ import {inspect} from 'util';
5
+
4
6
 
5
7
  /**log等级 undefined相当于 silly */
6
8
  export type LogLevel = "fatal"|"error"|"warn"|"info"|"http"|"verbose"|"debug"|"silly"|undefined;
@@ -126,7 +128,7 @@ export class SLogger{
126
128
  if(message == null)
127
129
  out = `<${typeof message}> ${typeof message}`;
128
130
  else if(typeof message!=="string")
129
- out=`<${typeof message}> ${message.toString()}`;
131
+ out=`<${typeof message}> ${inspect(message)}`;
130
132
  else out = message;
131
133
  strMessages.push(out);
132
134
  }
package/test.js CHANGED
@@ -31,8 +31,8 @@ async function main(){
31
31
 
32
32
  main();
33
33
  let a= {a:1};
34
- //SLogger.createLogger("default","silly","./testlog","silly")
35
- SLogger.createLogger("default","silly");
34
+ SLogger.createLogger("default","silly","./testlog","silly")
35
+ //SLogger.createLogger("default","silly");
36
36
  SLogger.fatal('This is an fatal message');
37
37
  SLogger.error('This is an error message');
38
38
  SLogger.warn('This is a warning message');
@@ -43,5 +43,5 @@ SLogger.debug('This is a debug message');
43
43
  SLogger.silly('This is a silly message');
44
44
 
45
45
  SLogger.fatal('This is an info message',123,true);
46
- SLogger.info([1,2,3,4]);
46
+ SLogger.info({a:"1111111111111111111111111111111111111111111111111111111111111111111111111111111\n11111"});
47
47
 
package/testlog/log-2023-08-21.txt ADDED
@@ -0,0 +1,93 @@
1
+ [13:05:26] [FATAL]: This is an fatal message
2
+ [13:05:26] [ERROR]: This is an error message
3
+ [13:05:26] [WARN]: This is a warning message
4
+ [13:05:26] [INFO]: This is an info message
5
+ [13:05:26] [HTTP]: This is an http message
6
+ [13:05:26] [VERBOSE]: This is a verbose message
7
+ [13:05:26] [DEBUG]: This is a debug message
8
+ [13:05:26] [SILLY]: This is a silly message
9
+ [13:05:26] [FATAL]: This is an info message
10
+ <number> 123
11
+ <boolean> true
12
+ [13:05:26] [INFO]: <object> [ 1, 2, 3, 4 ]
13
+ [13:06:25] [FATAL]: This is an fatal message
14
+ [13:06:25] [ERROR]: This is an error message
15
+ [13:06:25] [WARN]: This is a warning message
16
+ [13:06:25] [INFO]: This is an info message
17
+ [13:06:25] [HTTP]: This is an http message
18
+ [13:06:25] [VERBOSE]: This is a verbose message
19
+ [13:06:25] [DEBUG]: This is a debug message
20
+ [13:06:25] [SILLY]: This is a silly message
21
+ [13:06:25] [FATAL]: This is an info message
22
+ <number> 123
23
+ <boolean> true
24
+ [13:06:25] [INFO]: <object> [
25
+ '1111111111111111111111111111111111111111111111111111111111111111111111111111111\n' +
26
+ '11111',
27
+ '222222222222222222222222222222222222222222222222222222222222222222222222222222222222'
28
+ ]
29
+ [13:31:26] [FATAL]: This is an fatal message
30
+ [13:31:26] [ERROR]: This is an error message
31
+ [13:31:26] [WARN]: This is a warning message
32
+ [13:31:26] [INFO]: This is an info message
33
+ [13:31:26] [HTTP]: This is an http message
34
+ [13:31:26] [VERBOSE]: This is a verbose message
35
+ [13:31:26] [DEBUG]: This is a debug message
36
+ [13:31:26] [SILLY]: This is a silly message
37
+ [13:31:26] [FATAL]: This is an info message
38
+ <number> 123
39
+ <boolean> true
40
+ [13:31:26] [INFO]: <object> [
41
+ '1111111111111111111111111111111111111111111111111111111111111111111111111111111
42
+ ' +
43
+ '11111',
44
+ '222222222222222222222222222222222222222222222222222222222222222222222222222222222222'
45
+ ]
46
+ [13:31:51] [FATAL]: This is an fatal message
47
+ [13:31:51] [ERROR]: This is an error message
48
+ [13:31:51] [WARN]: This is a warning message
49
+ [13:31:51] [INFO]: This is an info message
50
+ [13:31:51] [HTTP]: This is an http message
51
+ [13:31:51] [VERBOSE]: This is a verbose message
52
+ [13:31:51] [DEBUG]: This is a debug message
53
+ [13:31:51] [SILLY]: This is a silly message
54
+ [13:31:51] [FATAL]: This is an info message
55
+ <number> 123
56
+ <boolean> true
57
+ [13:31:51] [INFO]: <object> [
58
+ '1111111111111111111111111111111111111111111111111111111111111111111111111111111
59
+ ' +
60
+ '11111',
61
+ '222222222222222222222222222222222222222222222222222222222222222222222222222222222222'
62
+ ]
63
+ [13:32:55] [FATAL]: This is an fatal message
64
+ [13:32:55] [ERROR]: This is an error message
65
+ [13:32:55] [WARN]: This is a warning message
66
+ [13:32:55] [INFO]: This is an info message
67
+ [13:32:55] [HTTP]: This is an http message
68
+ [13:32:55] [VERBOSE]: This is a verbose message
69
+ [13:32:55] [DEBUG]: This is a debug message
70
+ [13:32:55] [SILLY]: This is a silly message
71
+ [13:32:55] [FATAL]: This is an info message
72
+ <number> 123
73
+ <boolean> true
74
+ [13:32:55] [INFO]: <object> [
75
+ '1111111111111111111111111111111111111111111111111111111111111111111111111111111\n' +
76
+ '11111',
77
+ '222222222222222222222222222222222222222222222222222222222222222222222222222222222222'
78
+ ]
79
+ [13:33:25] [FATAL]: This is an fatal message
80
+ [13:33:25] [ERROR]: This is an error message
81
+ [13:33:25] [WARN]: This is a warning message
82
+ [13:33:25] [INFO]: This is an info message
83
+ [13:33:25] [HTTP]: This is an http message
84
+ [13:33:25] [VERBOSE]: This is a verbose message
85
+ [13:33:25] [DEBUG]: This is a debug message
86
+ [13:33:25] [SILLY]: This is a silly message
87
+ [13:33:25] [FATAL]: This is an info message
88
+ <number> 123
89
+ <boolean> true
90
+ [13:33:25] [INFO]: <object> {
91
+ a: '1111111111111111111111111111111111111111111111111111111111111111111111111111111\n' +
92
+ '11111'
93
+ }