@nxtedition/lib 15.0.22 → 15.0.24

package/app.js

@@ -1,6 +1,5 @@
 const os = require('node:os')
 const net = require('node:net')
-const assert = require('node:assert')
 const stream = require('node:stream')
 const { Buffer } = require('node:buffer')
 const { getDockerSecretsSync } = require('./docker-secrets')
@@ -408,7 +407,6 @@ module.exports = function (appConfig, onTerminate) {
   if (appConfig.status) {
     const rxjs = require('rxjs')
     const rx = require('rxjs/operators')
-    const undici = require('undici')
     const fp = require('lodash/fp')
     const hashString = require('./hash')
 
@@ -489,89 +487,80 @@ module.exports = function (appConfig, onTerminate) {
               )
             : rxjs.of({}),
           ds
-            ? new rxjs.Observable((o) => {
-                const client = new undici.Client(`http://${new URL(ds._url || ds.url).host}`, {
-                  keepAliveTimeout: 30e3,
-                })
-
-                const subscription = rxjs
-                  .timer(0, 10e3)
-                  .pipe(
-                    rx.exhaustMap(async () => {
-                      const messages = []
-
-                      if (ds.stats.record.records > 100e3) {
-                        messages.push({
-                          id: 'app:ds_record_records',
-                          level: 40,
-                          code: 'NXT_DEEPSTREAM_RECORDS_RECORDS',
-                          msg: 'ds: ' + ds.stats.record.records + ' records',
-                        })
-                      }
-
-                      if (ds.stats.record.pruning > 100e3) {
-                        messages.push({
-                          id: 'app:ds_record_pruning',
-                          level: 40,
-                          code: 'NXT_DEEPSTREAM_RECORDS_PRUNING',
-                          msg: 'ds: ' + ds.stats.record.pruning + ' pruning',
-                        })
-                      }
-
-                      if (ds.stats.record.pending > 10e3) {
-                        messages.push({
-                          id: 'app:ds_record_pending',
-                          level: 40,
-                          code: 'NXT_DEEPSTREAM_RECORDS_PENDING',
-                          msg: 'ds: ' + ds.stats.record.pending + ' pending',
-                        })
-                      }
-
-                      if (ds.stats.record.updating > 10e3) {
-                        messages.push({
-                          id: 'app:ds_record_updating',
-                          level: 40,
-                          code: 'NXT_DEEPSTREAM_RECORDS_UPDATING',
-                          msg: 'ds: ' + ds.stats.record.updating + ' updating',
-                        })
-                      }
-
-                      if (ds.stats.record.patching > 10e3) {
-                        messages.push({
-                          id: 'app:ds_record_patching',
-                          level: 40,
-                          code: 'NXT_DEEPSTREAM_RECORDS_PATCHING',
-                          msg: 'ds: ' + ds.stats.record.patching + ' patching',
-                        })
-                      }
-
-                      try {
-                        const { body, statusCode } = await client.request({
-                          method: 'GET',
-                          path: '/healthcheck',
-                        })
-                        await body.dump()
-                        assert(statusCode >= 200 && statusCode < 300)
-                      } catch (err) {
-                        messages.push({
-                          id: 'app:ds_http_connection',
+            ? rxjs.fromEvent(ds, 'connectionStateChanged').pipe(
+                rxjs.map((connectionState) =>
+                  connectionState === 'OPEN'
+                    ? [
+                        {
+                          id: 'app:ds_connection_state',
+                          level: 30,
+                          msg: 'ds: connected',
+                        },
+                      ]
+                    : [
+                        {
+                          id: 'app:ds_connection_state',
                           level: 40,
-                          code: err.code,
-                          msg: 'ds: ' + err.message,
-                        })
-                      }
-
-                      return messages
-                    }),
-                  )
-                  .subscribe(o)
-
-                return () => {
-                  client.destroy()
-                  subscription.unsubscribe()
-                }
-              }).pipe(rx.startWith([]), rx.distinctUntilChanged(fp.isEqual))
-            : rxjs.of({}),
+                          msg: 'ds: connecting',
+                        },
+                      ],
+                ),
+              )
+            : rxjs.of([]),
+          ds
+            ? rxjs.timer(0, 10e3).pipe(
+                rx.exhaustMap(async () => {
+                  const messages = []
+
+                  if (ds.stats.record.records > 100e3) {
+                    messages.push({
+                      id: 'app:ds_record_records',
+                      level: 40,
+                      code: 'NXT_DEEPSTREAM_RECORDS_RECORDS',
+                      msg: 'ds: ' + ds.stats.record.records + ' records',
+                    })
+                  }
+
+                  if (ds.stats.record.pruning > 100e3) {
+                    messages.push({
+                      id: 'app:ds_record_pruning',
+                      level: 40,
+                      code: 'NXT_DEEPSTREAM_RECORDS_PRUNING',
+                      msg: 'ds: ' + ds.stats.record.pruning + ' pruning',
+                    })
+                  }
+
+                  if (ds.stats.record.pending > 10e3) {
+                    messages.push({
+                      id: 'app:ds_record_pending',
+                      level: 40,
+                      code: 'NXT_DEEPSTREAM_RECORDS_PENDING',
+                      msg: 'ds: ' + ds.stats.record.pending + ' pending',
+                    })
+                  }
+
+                  if (ds.stats.record.updating > 10e3) {
+                    messages.push({
+                      id: 'app:ds_record_updating',
+                      level: 40,
+                      code: 'NXT_DEEPSTREAM_RECORDS_UPDATING',
+                      msg: 'ds: ' + ds.stats.record.updating + ' updating',
+                    })
+                  }
+
+                  if (ds.stats.record.patching > 10e3) {
+                    messages.push({
+                      id: 'app:ds_record_patching',
+                      level: 40,
+                      code: 'NXT_DEEPSTREAM_RECORDS_PATCHING',
+                      msg: 'ds: ' + ds.stats.record.patching + ' patching',
+                    })
+                  }
+
+                  return messages
+                }),
+              )
+            : rxjs.of([]),
           rxjs.timer(0, 10e3),
         ].filter(Boolean),
       )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.22",
+  "version": "15.0.24",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -20,6 +20,7 @@
     "deepstream.js",
     "logger.js",
     "mime.js",
+    "proxy.js",
     "trace.js",
     "weakCache.js",
     "couch.js",

package/proxy.js

@@ -0,0 +1,106 @@
+const createError = require('http-errors')
+const net = require('net')
+
+// This expression matches hop-by-hop headers.
+// These headers are meaningful only for a single transport-level connection,
+// and must not be retransmitted by proxies or cached.
+const HOP_EXPR =
+  /^(te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
+
+// Removes hop-by-hop and pseudo headers.
+// Updates via and forwarded headers.
+// Only hop-by-hop headers may be set using the Connection general header.
+module.exports.reduceHeaders = function reduceHeaders(
+  { id, headers, proxyName, httpVersion, socket },
+  fn,
+  acc,
+) {
+  let via
+  let forwarded
+  let host
+  let authority
+  let connection
+
+  const entries = Object.entries(headers)
+
+  for (const [key, val] of entries) {
+    const len = key.length
+    if (len === 3 && !via && key.toLowerCase() === 'via') {
+      via = val
+    } else if (len === 4 && !host && key.toLowerCase() === 'host') {
+      host = val
+    } else if (len === 9 && !forwarded && key.toLowerCase() === 'forwarded') {
+      forwarded = val
+    } else if (len === 10 && !connection && key.toLowerCase() === 'connection') {
+      connection = val
+    } else if (len === 10 && !authority && key.toLowerCase() === ':authority') {
+      authority = val
+    }
+  }
+
+  let remove
+  if (connection && !HOP_EXPR.test(connection)) {
+    remove = connection.split(/,\s*/)
+  }
+
+  for (const [key, val] of entries) {
+    if (key.charAt(0) !== ':' && !remove?.includes(key) && !HOP_EXPR.test(key)) {
+      acc = fn(acc, key, val)
+    }
+  }
+
+  if (socket) {
+    const forwardedHost = authority || host
+    acc = fn(
+      acc,
+      'forwarded',
+      (forwarded ? forwarded + ', ' : '') +
+        [
+          socket.localAddress && `by=${printIp(socket.localAddress, socket.localPort)}`,
+          socket.remoteAddress && `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
+          `proto=${socket.encrypted ? 'https' : 'http'}`,
+          forwardedHost && `host="${forwardedHost}"`,
+        ].join(';'),
+    )
+  } else if (forwarded) {
+    // The forwarded header should not be included in response.
+    throw new createError.BadGateway()
+  }
+
+  if (proxyName) {
+    if (via) {
+      if (via.split(',').some((name) => name.endsWith(proxyName))) {
+        throw new createError.LoopDetected()
+      }
+      via += ', '
+    } else {
+      via = ''
+    }
+    via += `${httpVersion} ${proxyName}`
+  }
+
+  if (via) {
+    acc = fn(acc, 'via', via)
+  }
+
+  if (id) {
+    acc = fn(acc, 'request-id', id)
+  }
+
+  return acc
+}
+
+function printIp(address, port) {
+  const isIPv6 = net.isIPv6(address)
+  let str = `${address}`
+  if (isIPv6) {
+    str = `[${str}]`
+  }
+  if (port) {
+    str = `${str}:${port}`
+  }
+  if (isIPv6 || port) {
+    str = `"${str}"`
+  }
+  return str
+}