@nxtedition/lib 21.5.3 → 21.5.6

package/app.js

@@ -1,6 +1,5 @@
 import * as inspector from 'node:inspector'
 import os from 'node:os'
-import http from 'node:http'
 import net from 'node:net'
 import assert from 'node:assert'
 import stream from 'node:stream'
@@ -807,136 +806,46 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
-  if (appConfig.inspect !== false) {
-    // TODO (fix): What about cluster?
+  const inspectBC = new BroadcastChannel('nxt:inspect')
+  const inspectSet = new Set()
 
-    const inspectBC = new BroadcastChannel('nxt:inspect')
-    let inspectOpen = false
+  if (serviceWorkerId) {
+    inspectBC.onmessage = ({ data }) => {
+      const { type, id } = data
 
-    if (!isMainThread) {
-      inspectBC.onmessage = ({ data }) => {
-        const { type, id } = data
-
-        if (id !== threadId) {
-          return
-        }
-
-        if (type === 'inspect:open') {
-          // TODO (fix): What happens if you call inspect:open multiple times?
-          if (!inspectOpen) {
-            inspector.open(data.port, data.hostname)
-            inspectOpen = true
-          }
-        } else if (type === 'inspect:close') {
-          if (inspectOpen) {
-            inspector.close()
-            inspectOpen = false
-          }
-        }
+      if (id !== serviceWorkerId) {
+        return
       }
 
-      inspectBC.postMessage({
-        type: 'inspect:register',
-        id: threadId,
-        worker: {
-          id: threadId,
-          name: serviceName,
-          module: serviceModule,
-          version: serviceVersion,
-          workerId: serviceWorkerId,
-          instanceId: serviceInstanceId,
-          threadId,
-          processId: process.pid,
-        },
-      })
-      destroyers.unshift(() => {
-        if (inspectOpen) {
-          inspector.close()
-          inspectOpen = false
-        }
-        inspectBC.postMessage({ type: 'inspect:unregister', id: threadId })
-        setTimeout(() => {
-          inspectBC.close()
-        }, 100)
-      })
-    } else {
-      const inspectMap = new Set()
-
-      inspectBC.onmessage = ({ data }) => {
-        const { type, worker } = data
-
-        if (type === 'inspect:register') {
-          inspectMap.add(data.id, worker)
-        } else if (type === 'inspect:unregister') {
-          inspectMap.delete(data.id)
-        }
+      if (type === 'inspect:open') {
+        // TODO (fix): What happens if you call inspect:open multiple times?
+        inspector.open(data.port, data.hostname)
+      } else if (type === 'inspect:close') {
+        inspector.close()
       }
-      destroyers.unshift(() => inspectBC.close())
-
-      // TODO (fix): Determinisitc port also in dev mode... hash of something?
-      const port =
-        appConfig.inspect?.port ?? (isProduction ? 38603 : Math.floor(38000 + Math.random() * 1000))
-      const server = http
-        .createServer(async (req, res) => {
-          try {
-            // TOOD (fix); Better matching...
-            if (!req.url.startsWith('/inspect')) {
-              res.statusCode = 404
-              res.end()
-              return
-            }
-
-            if (req.method === 'GET') {
-              res.end(
-                JSON.stringify({
-                  workers: Array.from(inspectMap.values()),
-                }),
-              )
-              return
-            }
-
-            if (req.method === 'POST') {
-              const m = req.url.match(/^\/inspect\/([^/]+)/)
-              if (!m) {
-                res.statusCode = 404
-                res.end()
-                return
-              } else {
-                const { port, hostname } = await json(req)
-
-                // TODO (fix): What about return value & errors?
-                inspectBC.postMessage({
-                  type: port || hostname ? 'inspect:open' : 'inspect:close',
-                  id: m[1],
-                  port,
-                  hostname,
-                })
-
-                res.end()
-                return
-              }
-            }
-
-            res.statusCode = 405
-            res.end()
-          } catch (err) {
-            if (res.headersSent) {
-              res.destroy(err)
-            } else {
-              res.statusCode = 500
-              res.end()
-            }
-          }
-        })
-        .listen(port)
+    }
 
-      logger.debug({ port }, 'inspect listening')
+    inspectBC.postMessage({ type: 'inspect:register', id: serviceWorkerId })
+    destroyers.unshift(() => {
+      inspector.close()
+      inspectBC.postMessage({ type: 'inspect:unregister', id: serviceWorkerId })
+      setTimeout(() => {
+        inspectBC.close()
+      }, 100)
+    })
+  } else {
+    inspectBC.onmessage = ({ data }) => {
+      const { type } = data
 
-      destroyers.unshift(() => new Promise((resolve) => server.close(resolve)))
+      if (type === 'inspect:register') {
+        inspectSet.add(data.id)
+      } else if (type === 'inspect:unregister') {
+        inspectSet.delete(data.id)
+      }
     }
+    destroyers.unshift(() => inspectBC.close())
   }
 
-  // TODO (fix): Deprecate
   if (appConfig.http) {
     const httpConfig = { ...appConfig.http, ...config.http }
 
@@ -959,6 +868,36 @@ export function makeApp(appConfig, onTerminate) {
               return next()
             }
           },
+          async ({ req, res }, next) => {
+            if (req.url.startsWith('/inspect')) {
+              if (req.method === 'GET') {
+                res.end(JSON.stringify({ workers: Array.from(inspectSet).map((id) => ({ id })) }))
+              } else if (req.method === 'POST') {
+                const m = req.url.match(/^\/inspect\/([^/]+)/)
+                if (!m) {
+                  res.statusCode = 404
+                  res.end()
+                } else {
+                  const { port, hostname } = await json(req)
+
+                  // TODO (fix): What about return value & errors?
+                  inspectBC.postMessage({
+                    type: port || hostname ? 'inspect:open' : 'inspect:close',
+                    id: m[1],
+                    port,
+                    hostname,
+                  })
+
+                  res.end()
+                }
+              } else {
+                res.statusCode = 405
+                res.end()
+              }
+            } else {
+              return next()
+            }
+          },
           appConfig.http.request
             ? appConfig.http.request
             : typeof appConfig.http === 'function'

package/http.js

@@ -142,8 +142,8 @@ export async function request2(ctx, next) {
       // Do nothing...
     } else if (!res.writableEnded) {
       logger.debug({ res, elapsedTime }, 'request aborted')
-    } else if (res.statusCode >= 500) {
-      logger.error({ res, elapsedTime }, 'request error')
+    } else if (res.statusCode >= 500 || res.errored) {
+      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
       logger.warn({ res, elapsedTime }, 'request failed')
     } else {

package/package.json

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