@nxtedition/lib 16.0.1 → 16.0.4
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 +3 -3
- package/http.js +5 -17
- package/package.json +1 -1
package/errors.js
CHANGED
|
@@ -198,16 +198,16 @@ export function makeMessages(error, options) {
|
|
|
198
198
|
}
|
|
199
199
|
|
|
200
200
|
export function makeErrorString(err) {
|
|
201
|
-
err =
|
|
201
|
+
err = parseError(err)
|
|
202
202
|
|
|
203
203
|
let msg = err?.message || 'error'
|
|
204
204
|
|
|
205
205
|
if (err?.cause) {
|
|
206
|
-
msg += `caused by: ${
|
|
206
|
+
msg += `caused by: ${makeErrorString(err.cause)}`
|
|
207
207
|
}
|
|
208
208
|
|
|
209
209
|
if (Array.isArray(err?.errors)) {
|
|
210
|
-
msg += ': ' + err.errors.map((err) =>
|
|
210
|
+
msg += ': ' + err.errors.map((err) => makeErrorString(err)).join(', ')
|
|
211
211
|
}
|
|
212
212
|
|
|
213
213
|
return msg
|
package/http.js
CHANGED
|
@@ -67,29 +67,17 @@ export async function request(ctx, next) {
|
|
|
67
67
|
.on('error', function (err) {
|
|
68
68
|
this.log.error({ err }, 'request error')
|
|
69
69
|
})
|
|
70
|
-
.on('end', function () {
|
|
71
|
-
this.log.trace('request end')
|
|
72
|
-
})
|
|
73
|
-
.on('close', function () {
|
|
74
|
-
this.log.trace('request close')
|
|
75
|
-
})
|
|
76
70
|
res
|
|
77
71
|
.on('timeout', function () {
|
|
78
72
|
this.destroy(new createError.RequestTimeout())
|
|
79
73
|
})
|
|
80
74
|
.on('error', function (err) {
|
|
81
|
-
|
|
82
|
-
})
|
|
83
|
-
.on('finish', function () {
|
|
84
|
-
this.log.trace('response finish')
|
|
75
|
+
reject(err)
|
|
85
76
|
})
|
|
77
|
+
// TODO (fix): Use 'end' once we can trust that
|
|
78
|
+
// 'end' or 'error' will always be emitted.
|
|
86
79
|
.on('close', function () {
|
|
87
|
-
|
|
88
|
-
if (this.errored) {
|
|
89
|
-
reject(this.errored)
|
|
90
|
-
} else {
|
|
91
|
-
resolve(null)
|
|
92
|
-
}
|
|
80
|
+
resolve(null)
|
|
93
81
|
})
|
|
94
82
|
}),
|
|
95
83
|
])
|
|
@@ -214,7 +202,7 @@ export function createServer(options, ctx, middleware) {
|
|
|
214
202
|
middleware = Array.isArray(middleware) ? middleware : [middleware]
|
|
215
203
|
middleware = fp.values(middleware)
|
|
216
204
|
middleware = middleware.flat().filter(Boolean)
|
|
217
|
-
middleware = compose([
|
|
205
|
+
middleware = compose([request, ...middleware])
|
|
218
206
|
|
|
219
207
|
const factory = typeof ctx === 'function' ? ctx : () => ctx
|
|
220
208
|
|