@platformatic/runtime 2.45.0 → 2.46.0

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2450Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2460Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/lib/runtime.js

@@ -274,11 +274,23 @@ class Runtime extends EventEmitter {
     if (this.#inspectorServer) {
       await this.#inspectorServer.close()
     }
-    await this.#meshInterceptor.close()
-    for (const service of this.#servicesIds) {
+
+    // Stop the entrypoint first so that no new requests are accepted
+    if (this.#entrypointId) {
+      await this.stopService(this.#entrypointId, silent)
+    }
+
+    // Stop services in reverse order to ensure services which depend on others are stopped first
+    for (const service of this.#servicesIds.reverse()) {
+      // The entrypoint has been stopped above
+      if (service === this.#entrypointId) {
+        continue
+      }
+
       await this.stopService(service, silent)
     }
 
+    await this.#meshInterceptor.close()
     this.#updateStatus('stopped')
   }
 
@@ -1131,7 +1143,7 @@ class Runtime extends EventEmitter {
     worker[kFullId] = workerId
     worker[kServiceId] = serviceId
     worker[kWorkerId] = workersCount > 1 ? index : undefined
-    worker[kWorkerStatus] = 'init'
+    worker[kWorkerStatus] = 'boot'
     worker[kForwardEvents] = false
 
     if (inspectorOptions) {
@@ -1214,8 +1226,8 @@ class Runtime extends EventEmitter {
 
     // This must be done here as the dependencies are filled above
     worker[kConfig] = { ...serviceConfig, health }
-    worker[kWorkerStatus] = 'boot'
-    this.emit('service:worker:boot', eventPayload)
+    worker[kWorkerStatus] = 'init'
+    this.emit('service:worker:init', eventPayload)
 
     return worker
   }
@@ -1405,8 +1417,8 @@ class Runtime extends EventEmitter {
       return
     }
 
-    // Starting should be aborted, discard the worker
-    if (worker[kWorkerStatus] !== 'started') {
+    // Boot should be aborted, discard the worker
+    if (worker[kWorkerStatus] === 'boot') {
       return this.#discardWorker(worker)
     }
 
@@ -1466,6 +1478,7 @@ class Runtime extends EventEmitter {
   }
 
   async #discardWorker (worker) {
+    this.#meshInterceptor.unroute(worker[kServiceId], worker, true)
     worker.removeAllListeners('exit')
     await worker.terminate()
 

package/lib/worker/itc.js

@@ -86,7 +86,7 @@ function setupITC (app, service, dispatcher) {
           await once(app, 'start')
         }
 
-        if (status !== 'stopped') {
+        if (status.startsWith('start')) {
           // This gives a chance to a stackable to perform custom logic
           globalThis.platformatic.events.emit('stop')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.45.0",
+  "version": "2.46.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -37,12 +37,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.45.0",
-    "@platformatic/db": "2.45.0",
-    "@platformatic/service": "2.45.0",
-    "@platformatic/node": "2.45.0",
-    "@platformatic/sql-graphql": "2.45.0",
-    "@platformatic/sql-mapper": "2.45.0"
+    "@platformatic/db": "2.46.0",
+    "@platformatic/composer": "2.46.0",
+    "@platformatic/node": "2.46.0",
+    "@platformatic/sql-mapper": "2.46.0",
+    "@platformatic/sql-graphql": "2.46.0",
+    "@platformatic/service": "2.46.0"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -74,15 +74,15 @@
     "tail-file-stream": "^0.2.0",
     "thread-cpu-usage": "^0.2.0",
     "undici": "^7.0.0",
-    "undici-thread-interceptor": "^0.12.2",
+    "undici-thread-interceptor": "^0.13.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.45.0",
-    "@platformatic/generators": "2.45.0",
-    "@platformatic/config": "2.45.0",
-    "@platformatic/itc": "2.45.0",
-    "@platformatic/ts-compiler": "2.45.0",
-    "@platformatic/telemetry": "2.45.0",
-    "@platformatic/utils": "2.45.0"
+    "@platformatic/basic": "2.46.0",
+    "@platformatic/config": "2.46.0",
+    "@platformatic/generators": "2.46.0",
+    "@platformatic/telemetry": "2.46.0",
+    "@platformatic/itc": "2.46.0",
+    "@platformatic/ts-compiler": "2.46.0",
+    "@platformatic/utils": "2.46.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.45.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.46.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {