@platformatic/runtime 3.28.2 → 3.29.0

package/lib/errors.js

@@ -144,3 +144,7 @@ export const CannotRemoveEntrypointError = createError(
   `${ERROR_PREFIX}_CANNOT_REMOVE_ENTRYPOINT`,
   'Cannot remove the entrypoint application.'
 )
+export const WorkerInterceptorNotReadyError = createError(
+  `${ERROR_PREFIX}_WORKER_INTERCEPTOR_NOT_READY`,
+  'The "%s" application worker interceptor is not ready'
+)

package/lib/runtime.js

@@ -35,7 +35,8 @@ import {
   MissingEntrypointError,
   MissingPprofCapture,
   RuntimeAbortedError,
-  WorkerNotFoundError
+  WorkerNotFoundError,
+  WorkerInterceptorNotReadyError
 } from './errors.js'
 import { abstractLogger, createLogger } from './logger.js'
 import { startManagementApi } from './management-api.js'
@@ -61,7 +62,8 @@ import {
   kWorkerId,
   kWorkersBroadcast,
   kWorkerStartTime,
-  kWorkerStatus
+  kWorkerStatus,
+  kInterceptorReadyPromise
 } from './worker/symbols.js'
 
 const kWorkerFile = join(import.meta.dirname, 'worker/main.js')
@@ -1640,11 +1642,13 @@ export class Runtime extends EventEmitter {
     if (enabled) {
       // Store locally
       this.#workers.set(workerId, worker)
-
-      // Setup the interceptor
-      this.#meshInterceptor.route(applicationId, worker)
     }
 
+    // Setup the interceptor
+    // kInterceptorReadyPromise resolves when the worker
+    // is ready to receive requests: after calling the replaceServer method
+    worker[kInterceptorReadyPromise] = this.#meshInterceptor.route(applicationId, worker)
+
     // Wait for initialization
     await waitEventFromITC(worker, 'init')
 
@@ -1884,6 +1888,8 @@ export class Runtime extends EventEmitter {
         this.#url = workerUrl
       }
 
+      await this.#waitForWorkerInterceptor(worker)
+
       worker[kWorkerStatus] = 'started'
       worker[kWorkerStartTime] = Date.now()
 
@@ -2034,7 +2040,7 @@ export class Runtime extends EventEmitter {
   }
 
   async #discardWorker (worker) {
-    this.#meshInterceptor.unroute(worker[kApplicationId], worker, true)
+    await this.#meshInterceptor.unroute(worker[kApplicationId], worker, true)
     worker.removeAllListeners('exit')
     await worker.terminate()
 
@@ -2128,7 +2134,6 @@ export class Runtime extends EventEmitter {
       }
 
       this.#workers.set(workerId, newWorker)
-      this.#meshInterceptor.route(applicationId, newWorker)
     } catch (e) {
       newWorker?.terminate?.()
       throw e
@@ -2336,7 +2341,7 @@ export class Runtime extends EventEmitter {
 
       let pinoLog
 
-      if (typeof message === 'object') {
+      if (message !== null && typeof message === 'object') {
         pinoLog =
           typeof message.level === 'number' &&
           // We want to accept both pino raw time (number) and time as formatted string
@@ -2794,4 +2799,24 @@ export class Runtime extends EventEmitter {
 
     this.#loggerContext.updatePrefixes(ids)
   }
+
+  async #waitForWorkerInterceptor (worker, timeout = 10000) {
+    const workerId = worker[kId]
+    const applicationId = worker[kApplicationId]
+
+    const interceptorReadyTimeout = setTimeout(() => {
+      this.logger.error(
+        { applicationId, workerId },
+        'The worker interceptor is not ready after 10s'
+      )
+      throw new WorkerInterceptorNotReadyError(applicationId)
+    }, timeout)
+
+    try {
+      await worker[kInterceptorReadyPromise]
+      worker[kInterceptorReadyPromise] = null
+    } finally {
+      clearTimeout(interceptorReadyTimeout)
+    }
+  }
 }

package/lib/worker/symbols.js

@@ -11,6 +11,7 @@ export const kWorkerStartTime = Symbol.for('plt.runtime.worker.startTime')
 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')
 
 // 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.28.2",
+  "version": "3.29.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -35,14 +35,14 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/db": "3.28.2",
-    "@platformatic/composer": "3.28.2",
-    "@platformatic/gateway": "3.28.2",
-    "@platformatic/node": "3.28.2",
-    "@platformatic/sql-graphql": "3.28.2",
-    "@platformatic/service": "3.28.2",
-    "@platformatic/sql-mapper": "3.28.2",
-    "@platformatic/wattpm-pprof-capture": "3.28.2"
+    "@platformatic/composer": "3.29.0",
+    "@platformatic/db": "3.29.0",
+    "@platformatic/node": "3.29.0",
+    "@platformatic/service": "3.29.0",
+    "@platformatic/sql-mapper": "3.29.0",
+    "@platformatic/sql-graphql": "3.29.0",
+    "@platformatic/wattpm-pprof-capture": "3.29.0",
+    "@platformatic/gateway": "3.29.0"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -69,14 +69,14 @@
     "sonic-boom": "^4.2.0",
     "systeminformation": "^5.27.11",
     "undici": "^7.0.0",
-    "undici-thread-interceptor": "^0.15.0",
+    "undici-thread-interceptor": "^1.0.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "3.28.2",
-    "@platformatic/generators": "3.28.2",
-    "@platformatic/foundation": "3.28.2",
-    "@platformatic/itc": "3.28.2",
-    "@platformatic/metrics": "3.28.2",
-    "@platformatic/telemetry": "3.28.2"
+    "@platformatic/basic": "3.29.0",
+    "@platformatic/foundation": "3.29.0",
+    "@platformatic/generators": "3.29.0",
+    "@platformatic/itc": "3.29.0",
+    "@platformatic/telemetry": "3.29.0",
+    "@platformatic/metrics": "3.29.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

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