dimorder-orderapp-lib 1.7.6 → 1.7.7
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.
- package/dist/libs/Logger.d.ts +4 -3
- package/dist/libs/Logger.d.ts.map +1 -1
- package/dist/libs/Logger.js +33 -35
- package/dist/libs/Logger.js.map +1 -1
- package/package.json +1 -1
package/dist/libs/Logger.d.ts
CHANGED
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
import { AxiosResponse } from 'axios';
|
|
3
3
|
import { ILogLabels, TEnv, TLogLevel } from '../types/Logger';
|
|
4
4
|
export default class Logger {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
static readonly LOG_MAX_LENGTH = 500;
|
|
6
|
+
static readonly LOG_MAX_SIZE = 256000;
|
|
7
|
+
static readonly FLUSH_INTERVAL = 5000;
|
|
8
|
+
static ObjectSize(object: any): number;
|
|
8
9
|
token: string;
|
|
9
10
|
loggerUrl: string;
|
|
10
11
|
flushIntervalId: NodeJS.Timeout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/libs/Logger.ts"],"names":[],"mappings":";AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAG5C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/libs/Logger.ts"],"names":[],"mappings":";AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAG5C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,MAAM,CAAC,QAAQ,CAAC,cAAc,OAAM;IACpC,MAAM,CAAC,QAAQ,CAAC,YAAY,UAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,cAAc,QAAO;IAErC,MAAM,CAAC,UAAU,CAAE,MAAM,EAAE,GAAG,GAAG,MAAM;IAQvC,KAAK,EAAG,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IAEjB,eAAe,EAAG,MAAM,CAAC,OAAO,CAAA;IAChC,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,GAAG,EAAE,CAAK;gBAEH,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU;IAO1C,KAAK,IAAK,IAAI;IASd,IAAI,IAAK,IAAI;IAIb,aAAa,CAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC,WAAW,CAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIpC,SAAS,CAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIhC,MAAM,CAAE,WAAW,EAAE,IAAI,GAAG,IAAI;IAIhC,GAAG,CAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IA6B7F,KAAK,IAAK,IAAI;IA2Bd,UAAU,IAAK,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS;CAsBvD"}
|
package/dist/libs/Logger.js
CHANGED
|
@@ -8,21 +8,26 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
8
8
|
const sizeof_1 = require("sizeof");
|
|
9
9
|
class Logger {
|
|
10
10
|
constructor(url, info) {
|
|
11
|
-
this.LOG_MAX_LENGTH = 500;
|
|
12
|
-
this.LOG_MAX_SIZE = 256000;
|
|
13
|
-
this.FLUSH_INTERVAL = 5000;
|
|
14
11
|
this.logs = [];
|
|
15
12
|
this.loggerUrl = url;
|
|
16
13
|
this.labels = info;
|
|
17
14
|
this.start();
|
|
18
15
|
}
|
|
16
|
+
static ObjectSize(object) {
|
|
17
|
+
try {
|
|
18
|
+
return (0, sizeof_1.sizeof)(object);
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
return Logger.LOG_MAX_SIZE;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
19
24
|
start() {
|
|
20
25
|
if (this.flushIntervalId != null) {
|
|
21
26
|
this.stop();
|
|
22
27
|
}
|
|
23
28
|
this.flushIntervalId = setInterval(() => {
|
|
24
29
|
this.flush();
|
|
25
|
-
},
|
|
30
|
+
}, Logger.FLUSH_INTERVAL);
|
|
26
31
|
}
|
|
27
32
|
stop() {
|
|
28
33
|
clearInterval(this.flushIntervalId);
|
|
@@ -40,24 +45,25 @@ class Logger {
|
|
|
40
45
|
this.labels.environment = environment;
|
|
41
46
|
}
|
|
42
47
|
log(level, data, timestamp) {
|
|
43
|
-
|
|
48
|
+
const newLog = {
|
|
44
49
|
level,
|
|
45
50
|
data,
|
|
46
51
|
timestamp,
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
52
|
+
};
|
|
53
|
+
const stashLogSize = Logger.ObjectSize(this.logs); // 現存的 logs 大小
|
|
54
|
+
let newLogSize = Logger.ObjectSize(newLog); // 新的 log 大小
|
|
55
|
+
if (newLogSize > Logger.LOG_MAX_SIZE) {
|
|
56
|
+
// 單一 log 大小已超過限制，將 newLog 改成只送出 message 並留下警告
|
|
57
|
+
newLog.level = 'warn';
|
|
58
|
+
newLog.data = { message: newLog.data.message, warning: `log size over limit ${Logger.LOG_MAX_SIZE} bytes, send message without other data`, size: newLogSize };
|
|
59
|
+
newLogSize = Logger.ObjectSize(newLog); // 更新 size
|
|
51
60
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}
|
|
59
|
-
else if (this.logs.length >= this.LOG_MAX_LENGTH ||
|
|
60
|
-
logSize >= this.LOG_MAX_SIZE) {
|
|
61
|
+
// 加入 log
|
|
62
|
+
this.logs.push(newLog);
|
|
63
|
+
if (['error', 'warn'].includes(level) || // 遇到 error 或 warn level 的 log 就優先送出
|
|
64
|
+
this.logs.length >= Logger.LOG_MAX_LENGTH || // 加入新的 log 後長度達到限制，立即送出
|
|
65
|
+
stashLogSize + newLogSize >= Logger.LOG_MAX_SIZE // 加入新 log 後大小達到上限，立即送出
|
|
66
|
+
) {
|
|
61
67
|
this.flush();
|
|
62
68
|
}
|
|
63
69
|
}
|
|
@@ -66,19 +72,14 @@ class Logger {
|
|
|
66
72
|
return;
|
|
67
73
|
const logs = lodash_1.default.clone(this.logs);
|
|
68
74
|
this.logs = [];
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
logSize = (0, sizeof_1.sizeof)(logs);
|
|
72
|
-
}
|
|
73
|
-
catch (error) {
|
|
74
|
-
logSize = this.LOG_MAX_SIZE;
|
|
75
|
-
}
|
|
76
|
-
if (logSize >= this.LOG_MAX_SIZE) {
|
|
75
|
+
const logSize = Logger.ObjectSize(logs);
|
|
76
|
+
if (logSize >= Logger.LOG_MAX_SIZE) {
|
|
77
77
|
// 超過大小時，最後一筆放入 logs 下一次再送
|
|
78
78
|
const lastLog = logs.pop();
|
|
79
79
|
this.logs.push(lastLog);
|
|
80
80
|
}
|
|
81
|
-
axios_1.default
|
|
81
|
+
axios_1.default
|
|
82
|
+
.post(this.loggerUrl, {
|
|
82
83
|
logs,
|
|
83
84
|
labels: lodash_1.default.chain(this.labels).omitBy(lodash_1.default.isNull).omitBy(lodash_1.default.isUndefined).value(),
|
|
84
85
|
})
|
|
@@ -91,14 +92,8 @@ class Logger {
|
|
|
91
92
|
return;
|
|
92
93
|
const logs = lodash_1.default.clone(this.logs);
|
|
93
94
|
this.logs = [];
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
logSize = (0, sizeof_1.sizeof)(logs);
|
|
97
|
-
}
|
|
98
|
-
catch (error) {
|
|
99
|
-
logSize = this.LOG_MAX_SIZE;
|
|
100
|
-
}
|
|
101
|
-
if (logSize >= this.LOG_MAX_SIZE) {
|
|
95
|
+
const logSize = Logger.ObjectSize(logs);
|
|
96
|
+
if (logSize >= Logger.LOG_MAX_SIZE) {
|
|
102
97
|
// 超過大小時，最後一筆放入 logs 下一次再送
|
|
103
98
|
const lastLog = logs.pop();
|
|
104
99
|
this.logs.push(lastLog);
|
|
@@ -110,4 +105,7 @@ class Logger {
|
|
|
110
105
|
}
|
|
111
106
|
}
|
|
112
107
|
exports.default = Logger;
|
|
108
|
+
Logger.LOG_MAX_LENGTH = 500;
|
|
109
|
+
Logger.LOG_MAX_SIZE = 256000;
|
|
110
|
+
Logger.FLUSH_INTERVAL = 5000;
|
|
113
111
|
//# sourceMappingURL=Logger.js.map
|
package/dist/libs/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/libs/Logger.ts"],"names":[],"mappings":";;;;;AAAA,kDAA4C;AAC5C,oDAAsB;AACtB,mCAA+B;AAG/B,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/libs/Logger.ts"],"names":[],"mappings":"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"}
|