@nxtedition/lib 22.1.1 → 22.1.3

package/app.js

@@ -818,61 +818,46 @@ export function makeApp(appConfig, onTerminate) {
       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 === threadId) {
+          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
+            }
           }
         }
       }
-
-      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 Map()
 
       inspectBC.onmessage = ({ data }) => {
-        const { type, worker } = data
+        const { type, worker, id } = data
 
         if (type === 'inspect:register') {
           inspectMap.set(data.id, worker)
         } else if (type === 'inspect:unregister') {
           inspectMap.delete(data.id)
+        } else if (id === threadId) {
+          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
+            }
+          }
         }
       }
-      destroyers.unshift(() => inspectBC.close())
 
       // TODO (fix): Determinisitc port also in dev mode... hash of something?
       const port =
@@ -938,6 +923,31 @@ export function makeApp(appConfig, onTerminate) {
 
       destroyers.unshift(() => new Promise((resolve) => server.close(resolve)))
     }
+
+    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)
+    })
   }
 
   if (appConfig.utils !== false && !cluster.isWorker) {

package/package.json

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