@nxtedition/lib 15.1.5 → 15.1.6

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 (2) hide show
  1. package/http.js +36 -41
  2. package/package.json +1 -1
package/http.js CHANGED
@@ -57,37 +57,42 @@ module.exports.request = async function request(ctx, next) {
57
57
  reqLogger.trace('request started')
58
58
  }
59
59
 
60
- next()?.catch((err) => res.destroy(err))
61
-
62
- await new Promise((resolve) => {
63
- req
64
- .on('timeout', function () {
65
- this.destroy(new createError.RequestTimeout())
66
- })
67
- .on('error', function (err) {
68
- this.log.error({ err }, 'request error')
69
- })
70
- .on('end', function () {
71
- this.log.debug('request end')
72
- })
73
- .on('close', function () {
74
- this.log.debug('request close')
75
- })
76
- res
77
- .on('timeout', function () {
78
- this.destroy(new createError.RequestTimeout())
79
- })
80
- .on('error', function (err) {
81
- this.log.error({ err }, 'response error')
82
- })
83
- .on('finish', function () {
84
- this.log.debug('response finish')
85
- })
86
- .on('close', function () {
87
- this.log.debug('response close')
88
- resolve(this.errored ? Promise.reject(this.errored) : null)
89
- })
90
- })
60
+ await Promise.all([
61
+ next(),
62
+ new Promise((resolve, reject) => {
63
+ req
64
+ .on('timeout', function () {
65
+ this.destroy(new createError.RequestTimeout())
66
+ })
67
+ .on('error', function (err) {
68
+ this.log.error({ err }, 'request error')
69
+ })
70
+ .on('end', function () {
71
+ this.log.trace('request end')
72
+ })
73
+ .on('close', function () {
74
+ this.log.trace('request close')
75
+ })
76
+ res
77
+ .on('timeout', function () {
78
+ this.destroy(new createError.RequestTimeout())
79
+ })
80
+ .on('error', function (err) {
81
+ this.log.error({ err }, 'response error')
82
+ })
83
+ .on('finish', function () {
84
+ this.log.trace('response finish')
85
+ })
86
+ .on('close', function () {
87
+ this.log.trace('response close')
88
+ if (this.errored) {
89
+ reject(this.errored)
90
+ } else {
91
+ resolve(null)
92
+ }
93
+ })
94
+ }),
95
+ ])
91
96
 
92
97
  const responseTime = Math.round(performance.now() - startTime)
93
98
 
@@ -107,16 +112,6 @@ module.exports.request = async function request(ctx, next) {
107
112
  } catch (err) {
108
113
  const responseTime = Math.round(performance.now() - startTime)
109
114
 
110
- req.on('error', (err) => {
111
- if (res.statusCode > 500 || err.code !== 'ECONNRESET') {
112
- reqLogger.warn({ err }, 'request error')
113
- }
114
- })
115
-
116
- res.on('error', (err) => {
117
- reqLogger.warn({ err }, 'request error')
118
- })
119
-
120
115
  if (!res.headersSent && !res.destroyed) {
121
116
  res.statusCode = err.statusCode || 500
122
117
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nxtedition/lib",
3
- "version": "15.1.5",
3
+ "version": "15.1.6",
4
4
  "license": "MIT",
5
5
  "author": "Robert Nagy <robert.nagy@boffins.se>",
6
6
  "files": [