@nxtedition/lib 23.9.0 → 23.9.2

package/http.js

@@ -146,7 +146,7 @@ function noop() {}
 const pendingSet = (globalThis._nxt_lib_http_pending ??= new Set())
 
 export async function upgradeMiddleware(ctx, next) {
-  const { req, socket, logger } = ctx
+  const { req, socket } = ctx
   const startTime = performance.now()
 
   let aborted = false
@@ -160,7 +160,6 @@ export async function upgradeMiddleware(ctx, next) {
   })
 
   const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
-  const reqLogger = isHealthcheck ? null : logger.child({ req })
 
   pendingSet.add(ctx)
   try {
@@ -168,7 +167,9 @@ export async function upgradeMiddleware(ctx, next) {
       req.resume() // Dump the body if there is one.
     }
 
-    reqLogger?.debug('stream started')
+    if (!isHealthcheck) {
+      ctx.logger?.debug({ req }, 'stream started')
+    }
 
     const thenable = next()
 
@@ -183,15 +184,15 @@ export async function upgradeMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (socket.errored) {
-      reqLogger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
+      ctx.logger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
     } else if (!socket.writableEnded) {
-      reqLogger?.debug({ req, socket, elapsedTime }, 'stream aborted')
+      ctx.logger?.debug({ req, socket, elapsedTime }, 'stream aborted')
     } else if (socket.statusCode >= 500) {
-      reqLogger?.error({ req, socket, elapsedTime }, 'stream error')
+      ctx.logger?.error({ req, socket, elapsedTime }, 'stream error')
     } else if (socket.statusCode >= 400) {
-      reqLogger?.warn({ req, socket, elapsedTime }, 'stream failed')
+      ctx.logger?.warn({ req, socket, elapsedTime }, 'stream failed')
     } else {
-      reqLogger?.debug({ req, socket, elapsedTime }, 'stream completed')
+      ctx.logger?.debug({ req, socket, elapsedTime }, 'stream completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -200,11 +201,11 @@ export async function upgradeMiddleware(ctx, next) {
     const elapsedTime = performance.now() - startTime
 
     if (req.aborted || aborted || (!socket.errored && socket.closed) || err.name === 'AbortError') {
-      reqLogger?.debug({ socket, err, elapsedTime }, 'stream aborted')
+      ctx.logger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
     } else if (statusCode < 500) {
-      reqLogger?.warn({ socket, err, elapsedTime }, 'stream failed')
+      ctx.logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
     } else {
-      reqLogger?.error({ socket, err, elapsedTime }, 'stream error')
+      ctx.logger?.error({ err, req, socket, elapsedTime }, 'stream error')
     }
     socket.destroy(err)
   } finally {
@@ -212,20 +213,19 @@ export async function upgradeMiddleware(ctx, next) {
 
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
-      reqLogger?.warn('socket destroyed')
+      ctx.logger?.warn('socket destroyed')
     }
   }
 }
 
 export async function requestMiddleware(ctx, next) {
-  const { req, res, logger } = ctx
+  const { req, res } = ctx
   const startTime = performance.now()
 
   req.on('error', noop)
   res.on('error', noop)
 
   const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
-  const reqLogger = isHealthcheck ? null : logger.child({ req })
 
   pendingSet.add(ctx)
   try {
@@ -233,7 +233,9 @@ export async function requestMiddleware(ctx, next) {
       req.resume() // Dump the body if there is one.
     }
 
-    reqLogger?.debug('request started')
+    if (!isHealthcheck) {
+      ctx.logger?.debug('request started')
+    }
 
     if (ctx.id) {
       res.setHeader('request-id', ctx.id)
@@ -252,15 +254,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      reqLogger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
+      ctx.logger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      reqLogger?.debug({ req, res, elapsedTime }, 'request aborted')
+      ctx.logger?.debug({ req, res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      reqLogger?.error({ req, res, elapsedTime }, 'request error')
+      ctx.logger?.error({ req, res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      reqLogger?.warn({ req, res, elapsedTime }, 'request failed')
+      ctx.logger?.warn({ req, res, elapsedTime }, 'request failed')
     } else {
-      reqLogger?.debug({ req, res, elapsedTime }, 'request completed')
+      ctx.logger?.debug({ req, res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -300,7 +302,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        reqLogger?.warn({ err }, 'invalid headers')
+        ctx.logger?.warn({ req, err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -315,17 +317,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        reqLogger?.warn({ res, err, elapsedTime }, 'request failed')
+        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        reqLogger?.error({ res, err, elapsedTime }, 'request error')
+        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
       }
     } else {
       if (req.aborted || (!res.errored && res.closed) || err.name === 'AbortError') {
-        reqLogger?.debug({ res, err, elapsedTime }, 'request aborted')
+        ctx.logger?.debug({ req, res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        reqLogger?.warn({ res, err, elapsedTime }, 'request failed')
+        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        reqLogger?.error({ res, err, elapsedTime }, 'request error')
+        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
@@ -334,7 +336,7 @@ export async function requestMiddleware(ctx, next) {
 
     if (!res.writableEnded && !res.destroyed) {
       res.destroy()
-      reqLogger?.warn('request destroyed')
+      ctx.logger?.warn({ req }, 'request destroyed')
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.9.0",
+  "version": "23.9.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/util/template/javascript.js

@@ -45,13 +45,17 @@ class FetchEntry {
     this.status = null
     this.error = null
 
-    let { headers, body } = options
+    let { headers, body, method } = options ?? {}
 
     if (fp.isPlainObject(body) || fp.isArray(body)) {
       headers = { 'content-type': 'application/json', ...headers }
       body = JSON.stringify(body)
     }
 
+    if (!method && body) {
+      method = 'POST'
+    }
+
     try {
       request(resource, {
         ...options,
@@ -573,6 +577,12 @@ export default function ({ ds, proxify, compiler, logger }) {
         throw new Error(`invalid argument: state (${state})`)
       }
 
+      if (typeof state === 'string') {
+        state = ds.record.STATE[state.toUpperCase()]
+      } else if (state == null) {
+        state = ds.record.STATE.SERVER
+      }
+
       const key = '' + (name ?? '') + SEP + (path ?? '') + SEP + (state ?? '')
       const entry = this._getEntry(key, RecordEntry, { ds, name, path, state })