@nxtedition/lib 15.0.14 → 15.0.16
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/errors.js +7 -0
- package/logger.js +2 -11
- package/package.json +5 -4
- package/platform.js +36 -0
- package/serializers.js +7 -0
package/errors.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const objectHash = require('object-hash')
|
|
2
2
|
const fp = require('lodash/fp.js')
|
|
3
3
|
const { toString } = Object.prototype
|
|
4
|
+
const { SIGNALS } = require('./platform.js')
|
|
4
5
|
|
|
5
6
|
module.exports.AbortError = class AbortError extends Error {
|
|
6
7
|
constructor(message) {
|
|
@@ -77,6 +78,7 @@ module.exports.serializeError = function serializeError(error) {
|
|
|
77
78
|
message = msg,
|
|
78
79
|
errors,
|
|
79
80
|
code,
|
|
81
|
+
signal,
|
|
80
82
|
cause,
|
|
81
83
|
body,
|
|
82
84
|
statusCode,
|
|
@@ -85,6 +87,10 @@ module.exports.serializeError = function serializeError(error) {
|
|
|
85
87
|
...properties
|
|
86
88
|
} = error
|
|
87
89
|
|
|
90
|
+
if (typeof signal === 'number') {
|
|
91
|
+
signal = SIGNALS[signal] ?? signal
|
|
92
|
+
}
|
|
93
|
+
|
|
88
94
|
errors = Array.isArray(errors) ? errors.map(serializeError) : undefined
|
|
89
95
|
cause = cause ? serializeError(cause) : undefined
|
|
90
96
|
|
|
@@ -96,6 +102,7 @@ module.exports.serializeError = function serializeError(error) {
|
|
|
96
102
|
message,
|
|
97
103
|
type,
|
|
98
104
|
code,
|
|
105
|
+
signal,
|
|
99
106
|
status,
|
|
100
107
|
headers,
|
|
101
108
|
data,
|
package/logger.js
CHANGED
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
const serializers = require('./serializers')
|
|
2
2
|
const pino = require('pino')
|
|
3
|
-
const { isMainThread } = require('node:worker_threads')
|
|
4
3
|
|
|
5
4
|
const isProduction = process.env.NODE_ENV === 'production'
|
|
6
5
|
|
|
7
6
|
module.exports.createLogger = function (
|
|
8
|
-
{
|
|
9
|
-
extreme = isProduction,
|
|
10
|
-
level = isProduction ? 'debug' : 'trace',
|
|
11
|
-
flushInterval = 1e3,
|
|
12
|
-
stream = null,
|
|
13
|
-
...options
|
|
14
|
-
} = {},
|
|
7
|
+
{ level = isProduction ? 'debug' : 'trace', flushInterval = 1e3, stream = null, ...options } = {},
|
|
15
8
|
onTerminate,
|
|
16
9
|
) {
|
|
17
10
|
if (!stream) {
|
|
@@ -25,10 +18,8 @@ module.exports.createLogger = function (
|
|
|
25
18
|
|
|
26
19
|
if (stream) {
|
|
27
20
|
// Do nothing...
|
|
28
|
-
} else if (!
|
|
21
|
+
} else if (!isProduction) {
|
|
29
22
|
stream = pino.destination({ fd: process.stdout.fd ?? 1, sync: true })
|
|
30
|
-
} else if (!isMainThread) {
|
|
31
|
-
stream = pino.destination({ fd: 1, sync: false })
|
|
32
23
|
} else {
|
|
33
24
|
stream = pino.destination({ sync: false, minLength: 4096 })
|
|
34
25
|
setInterval(() => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nxtedition/lib",
|
|
3
|
-
"version": "15.0.
|
|
3
|
+
"version": "15.0.16",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"author": "Robert Nagy <robert.nagy@boffins.se>",
|
|
6
6
|
"files": [
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
"http-client.js",
|
|
14
14
|
"subtract-ranges.js",
|
|
15
15
|
"serializers.js",
|
|
16
|
+
"platform.js",
|
|
16
17
|
"elasticsearch.js",
|
|
17
18
|
"merge-ranges.js",
|
|
18
19
|
"http.js",
|
|
@@ -93,12 +94,12 @@
|
|
|
93
94
|
"smpte-timecode": "^1.3.3",
|
|
94
95
|
"split-string": "^6.0.0",
|
|
95
96
|
"toobusy-js": "^0.5.1",
|
|
96
|
-
"undici": "^5.25.
|
|
97
|
+
"undici": "^5.25.4",
|
|
97
98
|
"url-join": "^4.0.0",
|
|
98
99
|
"xuid": "^4.1.2"
|
|
99
100
|
},
|
|
100
101
|
"devDependencies": {
|
|
101
|
-
"@types/node": "^20.
|
|
102
|
+
"@types/node": "^20.8.2",
|
|
102
103
|
"eslint": "^8.50.0",
|
|
103
104
|
"eslint-config-prettier": "^9.0.0",
|
|
104
105
|
"eslint-config-standard": "^17.0.0",
|
|
@@ -112,7 +113,7 @@
|
|
|
112
113
|
"prettier": "^3.0.3",
|
|
113
114
|
"rxjs": "^7.5.6",
|
|
114
115
|
"send": "^0.18.0",
|
|
115
|
-
"tap": "^18.
|
|
116
|
+
"tap": "^18.4.2"
|
|
116
117
|
},
|
|
117
118
|
"peerDependencies": {
|
|
118
119
|
"@elastic/elasticsearch": "^8.6.0",
|
package/platform.js
ADDED
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
module.exports.SIGNALS =
|
|
2
|
+
{
|
|
3
|
+
linux: {
|
|
4
|
+
129: 'SIGHUP', // 1
|
|
5
|
+
130: 'SIGINT', // 2
|
|
6
|
+
131: 'SIGQUIT', // 3
|
|
7
|
+
132: 'SIGILL', // 4
|
|
8
|
+
133: 'SIGTRAP', // 5
|
|
9
|
+
134: 'SIGABRT', // 6
|
|
10
|
+
135: 'SIGBUS', // 7
|
|
11
|
+
136: 'SIGFPE', // 8
|
|
12
|
+
137: 'SIGKILL', // 9
|
|
13
|
+
138: 'SIGUSR1', // 10
|
|
14
|
+
139: 'SIGSEGV', // 11
|
|
15
|
+
140: 'SIGUSR2', // 12
|
|
16
|
+
141: 'SIGPIPE', // 13
|
|
17
|
+
142: 'SIGALRM', // 14
|
|
18
|
+
143: 'SIGTERM', // 15
|
|
19
|
+
144: 'SIGSTKFLT', // 16
|
|
20
|
+
145: 'SIGCHLD', // 17
|
|
21
|
+
146: 'SIGCONT', // 18
|
|
22
|
+
147: 'SIGSTOP', // 19
|
|
23
|
+
148: 'SIGTSTP', // 20
|
|
24
|
+
149: 'SIGTTIN', // 21
|
|
25
|
+
150: 'SIGTTOU', // 22
|
|
26
|
+
151: 'SIGURG', // 23
|
|
27
|
+
152: 'SIGXCPU', // 24
|
|
28
|
+
153: 'SIGXFSZ', // 25
|
|
29
|
+
154: 'SIGVTALRM', // 26
|
|
30
|
+
155: 'SIGPROF', // 27
|
|
31
|
+
156: 'SIGWINCH', // 28
|
|
32
|
+
157: 'SIGIO', // 29
|
|
33
|
+
158: 'SIGPWR', // 30
|
|
34
|
+
159: 'SIGSYS', // 31
|
|
35
|
+
},
|
|
36
|
+
}[process.platform] ?? {}
|
package/serializers.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
const serializers = require('pino-std-serializers')
|
|
2
|
+
const { SIGNALS } = require('./platform.js')
|
|
2
3
|
|
|
3
4
|
function getHeader(obj, key) {
|
|
4
5
|
return obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
|
|
@@ -29,6 +30,8 @@ function getHeaders(obj) {
|
|
|
29
30
|
|
|
30
31
|
module.exports = {
|
|
31
32
|
err: (err) => {
|
|
33
|
+
// TODO (fix): Merge with errors/serializeError?
|
|
34
|
+
|
|
32
35
|
if (Array.isArray(err)) {
|
|
33
36
|
err = err.length === 1 ? err[0] : new AggregateError(err)
|
|
34
37
|
}
|
|
@@ -38,6 +41,10 @@ module.exports = {
|
|
|
38
41
|
ret.data = JSON.stringify(ret.data)
|
|
39
42
|
}
|
|
40
43
|
|
|
44
|
+
if (typeof ret.signal === 'number') {
|
|
45
|
+
ret.signal = SIGNALS[ret.signal] ?? String(ret.signal)
|
|
46
|
+
}
|
|
47
|
+
|
|
41
48
|
return ret
|
|
42
49
|
},
|
|
43
50
|
res: (res) =>
|