@nxtedition/lib 15.0.13 → 15.0.15

package/errors.js

@@ -1,6 +1,7 @@
 const objectHash = require('object-hash')
 const fp = require('lodash/fp.js')
 const { toString } = Object.prototype
+const { SIGNALS } = require('./platform.js')
 
 module.exports.AbortError = class AbortError extends Error {
   constructor(message) {
@@ -77,6 +78,7 @@ module.exports.serializeError = function serializeError(error) {
     message = msg,
     errors,
     code,
+    signal,
     cause,
     body,
     statusCode,
@@ -85,6 +87,10 @@ module.exports.serializeError = function serializeError(error) {
     ...properties
   } = error
 
+  if (typeof signal === 'number') {
+    signal = SIGNALS[signal] ?? signal
+  }
+
   errors = Array.isArray(errors) ? errors.map(serializeError) : undefined
   cause = cause ? serializeError(cause) : undefined
 
@@ -96,6 +102,7 @@ module.exports.serializeError = function serializeError(error) {
       message,
       type,
       code,
+      signal,
       status,
       headers,
       data,

package/lib/undici/index.js

@@ -67,7 +67,6 @@ const dispatchers = {
   abort: require('./interceptor/abort.js'),
   catch: require('./interceptor/catch.js'),
   content: require('./interceptor/content.js'),
-  responseBodyDump: require('./interceptor/response-body-dump.js'),
   log: require('./interceptor/log.js'),
   redirect: require('./interceptor/redirect.js'),
   responseBodyRetry: require('./interceptor/response-body-retry.js'),
@@ -92,7 +91,6 @@ async function request(urlOrOpts, opts = {}) {
 
   const method = opts.method ?? (opts.body ? 'POST' : 'GET')
   const idempotent = opts.idempotent ?? (method === 'GET' || method === 'HEAD')
-  const dump = opts.dump ?? method === 'HEAD'
 
   let headers
   if (Array.isArray(opts.headers)) {
@@ -119,7 +117,6 @@ async function request(urlOrOpts, opts = {}) {
     signal: opts.signal,
     retry: opts.retry ?? 8,
     follow: { count: opts.maxRedirections ?? 8, ...opts.redirect, ...opts.follow },
-    dump,
     logger: opts.logger,
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.13",
+  "version": "15.0.15",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -13,6 +13,7 @@
     "http-client.js",
     "subtract-ranges.js",
     "serializers.js",
+    "platform.js",
     "elasticsearch.js",
     "merge-ranges.js",
     "http.js",

package/platform.js

@@ -0,0 +1,36 @@
+module.exports.SIGNALS =
+  {
+    linux: {
+      129: 'SIGHUP', //  1
+      130: 'SIGINT', //  2
+      131: 'SIGQUIT', //  3
+      132: 'SIGILL', //  4
+      133: 'SIGTRAP', //  5
+      134: 'SIGABRT', //  6
+      135: 'SIGBUS', //  7
+      136: 'SIGFPE', //  8
+      137: 'SIGKILL', //  9
+      138: 'SIGUSR1', // 10
+      139: 'SIGSEGV', // 11
+      140: 'SIGUSR2', // 12
+      141: 'SIGPIPE', // 13
+      142: 'SIGALRM', // 14
+      143: 'SIGTERM', // 15
+      144: 'SIGSTKFLT', // 16
+      145: 'SIGCHLD', // 17
+      146: 'SIGCONT', // 18
+      147: 'SIGSTOP', // 19
+      148: 'SIGTSTP', // 20
+      149: 'SIGTTIN', // 21
+      150: 'SIGTTOU', // 22
+      151: 'SIGURG', // 23
+      152: 'SIGXCPU', // 24
+      153: 'SIGXFSZ', // 25
+      154: 'SIGVTALRM', // 26
+      155: 'SIGPROF', // 27
+      156: 'SIGWINCH', // 28
+      157: 'SIGIO', // 29
+      158: 'SIGPWR', // 30
+      159: 'SIGSYS', // 31
+    },
+  }[process.platform] ?? {}

package/serializers.js

@@ -1,4 +1,5 @@
 const serializers = require('pino-std-serializers')
+const { SIGNALS } = require('./platform.js')
 
 function getHeader(obj, key) {
   return obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
@@ -29,6 +30,8 @@ function getHeaders(obj) {
 
 module.exports = {
   err: (err) => {
+    // TODO (fix): Merge with errors/serializeError?
+
     if (Array.isArray(err)) {
       err = err.length === 1 ? err[0] : new AggregateError(err)
     }
@@ -38,6 +41,10 @@ module.exports = {
       ret.data = JSON.stringify(ret.data)
     }
 
+    if (typeof ret.signal === 'number') {
+      ret.signal = SIGNALS[ret.signal] ?? String(ret.signal)
+    }
+
     return ret
   },
   res: (res) =>

package/lib/undici/interceptor/response-body-dump.js

@@ -1,46 +0,0 @@
-const { AbortError } = require('../../../errors')
-
-class Handler {
-  constructor(opts, { handler }) {
-    this.handler = handler
-    this.pos = 0
-  }
-
-  onConnect(abort) {
-    this.abort = abort
-    return this.handler.onConnect?.(abort)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent?.(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
-  }
-
-  onData(chunk) {
-    this.pos += chunk.length
-    if (this.pos < 128 * 1024) {
-      return true
-    }
-
-    this.handler.onComplete?.([])
-    this.handler = null
-
-    this.abort(new AbortError('dump'))
-
-    return false
-  }
-
-  onComplete(rawTrailers) {
-    return this.handler.onComplete?.([])
-  }
-
-  onError(err) {
-    return this.handler?.onError?.(err)
-  }
-}
-
-module.exports = (dispatch) => (opts, handler) =>
-  opts.dump ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)