@platformatic/runtime 3.52.2 → 3.52.3

package/lib/runtime.js

@@ -61,6 +61,7 @@ import {
   kHealthCheckTimer,
   kId,
   kInterceptorReadyPromise,
+  kIsSubprocessHost,
   kITC,
   kLastHealthCheckELU,
   kStderrMarker,
@@ -73,6 +74,9 @@ import {
 
 const kWorkerFile = join(import.meta.dirname, 'worker/main.js')
 const kInspectorOptions = Symbol('plt.runtime.worker.inspectorOptions')
+const kHeapCheckCounter = Symbol('plt.runtime.worker.heapCheckCounter')
+const kLastHeapStats = Symbol('plt.runtime.worker.lastHeapStats')
+const kHealthITCTimeoutMs = 5000
 
 const MAX_LISTENERS_COUNT = 100
 
@@ -1515,12 +1519,57 @@ export class Runtime extends EventEmitter {
     return status
   }
 
-  async getWorkerHealth (worker, options = {}) {
-    // Use ITC to get health from the worker. This correctly forwards to child
-    // processes when the service uses startWithCommand (subprocess mode),
-    // instead of reading the coordinator thread's metrics.
-    const { currentELU, heapUsed, heapTotal } = await sendViaITC(worker, 'getHealth')
+  getWorkerHealth (worker, options = {}) {
+    // For subprocess workers we must round-trip through ITC to reach the child;
+    // for pure worker-thread workers we can read ELU/heap directly from the
+    // worker handle, which is served by Node's C++ layer and does not depend
+    // on the worker's event loop being responsive. Going through ITC for
+    // thread workers means a CPU-bound or stuck worker can freeze the whole
+    // health-collection loop, which in turn blocks the management API.
+    if (worker[kIsSubprocessHost]) {
+      return this.#getSubprocessWorkerHealth(worker, options)
+    }
 
+    const currentELU = worker.performance.eventLoopUtilization()
+    const previousELU = options.previousELU
+
+    let elu = currentELU
+    if (previousELU) {
+      elu = worker.performance.eventLoopUtilization(elu, previousELU)
+    }
+
+    if (!features.node.worker.getHeapStatistics) {
+      return { elu: elu.utilization, currentELU }
+    }
+
+    // Only refresh heap statistics every 60 health checks (once per minute).
+    // This keeps the common path fully synchronous — no promise allocation.
+    const counter = (worker[kHeapCheckCounter] ?? 0) + 1
+    worker[kHeapCheckCounter] = counter >= 60 ? 0 : counter
+
+    if (counter >= 60 || !worker[kLastHeapStats]) {
+      return worker.getHeapStatistics().then(({ used_heap_size: heapUsed, total_heap_size: heapTotal }) => {
+        worker[kLastHeapStats] = { heapUsed, heapTotal }
+        return { elu: elu.utilization, heapUsed, heapTotal, currentELU }
+      })
+    }
+
+    const { heapUsed, heapTotal } = worker[kLastHeapStats]
+    return { elu: elu.utilization, heapUsed, heapTotal, currentELU }
+  }
+
+  async #getSubprocessWorkerHealth (worker, options) {
+    // Bound the ITC call so a hung child cannot freeze the health loop.
+    // On timeout we fall back to last-known ELU with a null heap reading so
+    // that the loop keeps rescheduling and signals remain observable.
+    const result = await executeWithTimeout(sendViaITC(worker, 'getHealth'), kHealthITCTimeoutMs, kTimeout)
+
+    if (result === kTimeout) {
+      const previousELU = options.previousELU ?? worker.performance.eventLoopUtilization()
+      return { elu: 1, heapUsed: null, heapTotal: null, currentELU: previousELU }
+    }
+
+    const { currentELU, heapUsed, heapTotal } = result
     const previousELU = options.previousELU
     let elu = currentELU
     if (previousELU) {
@@ -1853,6 +1902,14 @@ export class Runtime extends EventEmitter {
       this.logger.trace({ event, payload, id: workerId, application: applicationId, worker: index }, 'Runtime event')
     })
 
+    // The worker notifies us when its capability has spawned a child process
+    // (e.g. Next.js in dev mode). From that point on health metrics must come
+    // from the child via ITC; for thread-only workers we keep reading the
+    // handle directly in getWorkerHealth().
+    worker[kITC].on('subprocess:started', () => {
+      worker[kIsSubprocessHost] = true
+    })
+
     worker[kITC].on('request:restart', async () => {
       // Do not restart applications that are not fully started yet or when the runtime is still starting.
       // The gateway sends request:restart when it receives application:added events,

package/lib/worker/symbols.js

@@ -12,6 +12,7 @@ export const kInterceptors = Symbol.for('plt.runtime.worker.interceptors')
 export const kLastHealthCheckELU = Symbol.for('plt.runtime.worker.lastHealthCheckELU')
 export const kLastWorkerScalerELU = Symbol.for('plt.runtime.worker.lastWorkerScalerELU')
 export const kInterceptorReadyPromise = Symbol.for('plt.runtime.worker.interceptorReadyPromise')
+export const kIsSubprocessHost = Symbol.for('plt.runtime.worker.isSubprocessHost')
 
 // This string marker should be safe to use since it belongs to Unicode private area
 export const kStderrMarker = '\ue002'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "3.52.2",
+  "version": "3.52.3",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -36,14 +36,14 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "3.52.2",
-    "@platformatic/gateway": "3.52.2",
-    "@platformatic/db": "3.52.2",
-    "@platformatic/node": "3.52.2",
-    "@platformatic/service": "3.52.2",
-    "@platformatic/sql-graphql": "3.52.2",
-    "@platformatic/sql-mapper": "3.52.2",
-    "@platformatic/wattpm-pprof-capture": "3.52.2"
+    "@platformatic/composer": "3.52.3",
+    "@platformatic/db": "3.52.3",
+    "@platformatic/gateway": "3.52.3",
+    "@platformatic/node": "3.52.3",
+    "@platformatic/service": "3.52.3",
+    "@platformatic/sql-mapper": "3.52.3",
+    "@platformatic/sql-graphql": "3.52.3",
+    "@platformatic/wattpm-pprof-capture": "3.52.3"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -73,12 +73,12 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^1.3.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "3.52.2",
-    "@platformatic/generators": "3.52.2",
-    "@platformatic/foundation": "3.52.2",
-    "@platformatic/metrics": "3.52.2",
-    "@platformatic/itc": "3.52.2",
-    "@platformatic/telemetry": "3.52.2"
+    "@platformatic/basic": "3.52.3",
+    "@platformatic/foundation": "3.52.3",
+    "@platformatic/generators": "3.52.3",
+    "@platformatic/metrics": "3.52.3",
+    "@platformatic/telemetry": "3.52.3",
+    "@platformatic/itc": "3.52.3"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/3.52.2.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/3.52.3.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Runtime Config",
   "type": "object",