@nxtedition/lib 14.0.25 → 14.0.26

package/app.js

@@ -4,6 +4,7 @@ const stream = require('node:stream')
 const { Buffer } = require('node:buffer')
 const net = require('net')
 const fp = require('lodash/fp.js')
+const assert = require('node:assert')
 
 module.exports = function (appConfig, onTerminate) {
   let ds
@@ -540,26 +541,19 @@ module.exports = function (appConfig, onTerminate) {
                       }
 
                       try {
-                        const { body } = await client.request({
+                        const { body, statusCode } = await client.request({
                           method: 'GET',
                           path: '/healthcheck',
                         })
                         await body.dump()
-                      } catch {
-                        try {
-                          const { body } = await client.request({
-                            method: 'GET',
-                            path: '/healthcheck',
-                          })
-                          await body.dump()
-                        } catch (err) {
-                          messages.push({
-                            id: 'app:ds_http_connection',
-                            level: 40,
-                            code: err.code,
-                            msg: 'ds: ' + err.message,
-                          })
-                        }
+                        assert(statusCode >= 200 && statusCode < 300)
+                      } catch (err) {
+                        messages.push({
+                          id: 'app:ds_http_connection',
+                          level: 40,
+                          code: err.code,
+                          msg: 'ds: ' + err.message,
+                        })
                       }
 
                       return messages

package/couch.js

@@ -453,81 +453,90 @@ module.exports = function (opts) {
       path += `?${querystring.stringify(params)}`
     }
 
+    const req = {
+      path,
+      origin: dbOrigin,
+      idempotent,
+      method,
+      body: typeof body === 'object' && body ? JSON.stringify(body) : body,
+      headers,
+    }
+
     return new Promise((resolve, reject) =>
-      client.dispatch(
-        {
-          path,
-          origin: dbOrigin,
-          idempotent,
-          method,
-          body: typeof body === 'object' && body ? JSON.stringify(body) : body,
-          headers,
-        },
-        {
-          resolve,
-          reject,
-          signal,
-          status: null,
-          headers: null,
-          abort: null,
-          data: '',
-          onConnect(abort) {
-            if (!this.signal) {
-              return
-            }
+      client.dispatch(req, {
+        resolve,
+        reject,
+        signal,
+        status: null,
+        headers: null,
+        abort: null,
+        data: '',
+        onConnect(abort) {
+          if (!this.signal) {
+            return
+          }
 
-            if (this.signal.aborted) {
-              abort()
-              return
-            }
+          if (this.signal.aborted) {
+            abort()
+            return
+          }
 
-            this.abort = abort
-            if ('addEventListener' in this.signal) {
-              this.signal.addEventListener('abort', abort)
+          this.abort = abort
+          if ('addEventListener' in this.signal) {
+            this.signal.addEventListener('abort', abort)
+          } else {
+            this.signal.addListener('abort', abort)
+          }
+        },
+        onHeaders(statusCode, headers) {
+          this.status = statusCode
+          this.headers = parseHeaders(headers)
+        },
+        onData(chunk) {
+          this.data += chunk
+        },
+        onComplete() {
+          if (this.signal) {
+            if ('removeEventListener' in this.signal) {
+              this.signal.removeEventListener('abort', this.abort)
             } else {
-              this.signal.addListener('abort', abort)
-            }
-          },
-          onHeaders(statusCode, headers) {
-            this.status = statusCode
-            this.headers = parseHeaders(headers)
-          },
-          onData(chunk) {
-            this.data += chunk
-          },
-          onComplete() {
-            if (this.signal) {
-              if ('removeEventListener' in this.signal) {
-                this.signal.removeEventListener('abort', this.abort)
-              } else {
-                this.signal.removeListener('abort', this.abort)
-              }
+              this.signal.removeListener('abort', this.abort)
             }
+          }
 
-            let data = this.data
-            if (this.headers['content-type']?.toLowerCase() === 'application/json') {
-              data = JSON.parse(this.data)
-            }
+          let data = this.data
+          if (this.headers['content-type']?.toLowerCase() === 'application/json') {
+            data = JSON.parse(this.data)
+          }
 
+          if (this.status < 200 || this.status >= 300) {
+            this.reject(
+              makeError(req, {
+                status: this.status,
+                headers: this.headers,
+                data: this.data,
+              })
+            )
+          } else {
             this.resolve({
               data,
               status: this.status,
               headers: this.headers,
             })
-          },
-          onError(err) {
-            if (this.signal) {
-              if ('removeEventListener' in this.signal) {
-                this.signal.removeEventListener('abort', this.abort)
-              } else {
-                this.signal.removeListener('abort', this.abort)
-              }
+          }
+        },
+        onError(err) {
+          if (this.signal) {
+            if ('removeEventListener' in this.signal) {
+              this.signal.removeEventListener('abort', this.abort)
+            } else {
+              this.signal.removeListener('abort', this.abort)
             }
+          }
 
-            this.reject(err)
-          },
-        }
-      )
+          this.reject(err)
+        },
+      })
     )
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.0.25",
+  "version": "14.0.26",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [