@platformatic/runtime 1.15.0 → 1.16.0

package/fixtures/dbApp/platformatic.db.json

@@ -23,5 +23,6 @@
     "paths": [
       "plugin.js"
     ]
-  }
+  },
+  "watch": false
 }

package/fixtures/start-command-in-runtime.js

@@ -1,14 +1,23 @@
 'use strict'
+
 const assert = require('node:assert')
-const { request } = require('undici')
+const { request, setGlobalDispatcher, Agent } = require('undici')
 const { startCommand } = require('..')
 
+setGlobalDispatcher(new Agent({
+  keepAliveTimeout: 1,
+  keepAliveMaxTimeout: 1
+}))
+
 async function main () {
   const entrypoint = await startCommand(['-c', process.argv[2]])
   const endpoint = process.argv[3] ?? '/'
   const res = await request(entrypoint + endpoint)
 
   assert.strictEqual(res.statusCode, 200)
+
+  // Consume the body so the service can end
+  await res.body.text()
   process.exit(42)
 }
 

package/lib/api.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const FastifyUndiciDispatcher = require('fastify-undici-dispatcher')
-const { Agent, setGlobalDispatcher } = require('undici')
+const { setGlobalDispatcher, getGlobalDispatcher } = require('undici')
 const { PlatformaticApp } = require('./app')
 const errors = require('./errors')
 const { printSchema } = require('graphql')
@@ -34,7 +34,7 @@ class RuntimeApi {
       this.#services.set(service.id, app)
     }
 
-    const globalAgent = new Agent()
+    const globalAgent = getGlobalDispatcher()
     const globalDispatcher = new FastifyUndiciDispatcher({
       dispatcher: globalAgent,
       // setting the domain here allows for fail-fast scenarios
@@ -73,6 +73,10 @@ class RuntimeApi {
       }
     }
 
+    if (this.#dispatcher) {
+      await this.#dispatcher.close()
+    }
+
     process.exit() // Exit the worker thread if all services are stopped
   }
 
@@ -132,12 +136,14 @@ class RuntimeApi {
   }
 
   async stopServices () {
+    const stopServiceReqs = [this.#dispatcher.close()]
     for (const service of this.#services.values()) {
       const serviceStatus = service.getStatus()
       if (serviceStatus === 'started') {
-        await service.stop()
+        stopServiceReqs.push(service.stop())
       }
     }
+    await Promise.all(stopServiceReqs)
   }
 
   async #restartServices () {

package/lib/config.js

@@ -33,7 +33,14 @@ async function _transformConfig (configManager) {
 
       const config = join(entryPath, configFilename)
 
-      services.push({ id, config, path: entryPath, useHttp: !!mapping.useHttp })
+      const service = { id, config, path: entryPath, useHttp: !!mapping.useHttp }
+      const existingServiceId = services.findIndex(service => service.id === id)
+
+      if (existingServiceId !== -1) {
+        services[existingServiceId] = service
+      } else {
+        services.push(service)
+      }
     }
   }
 

package/lib/start.js

@@ -48,7 +48,11 @@ async function startWithConfig (configManager, env = process.env) {
   })
 
   let exited = null
-  worker.on('exit', () => {
+  let isWorkerAlive = true
+  worker.on('exit', (code) => {
+    // TODO(mcollina): refactor to not set this here
+    process.exitCode = code
+    isWorkerAlive = false
     configManager.fileWatcher?.stopWatching()
     if (typeof exited === 'function') {
       exited()
@@ -70,9 +74,14 @@ async function startWithConfig (configManager, env = process.env) {
       worker.postMessage({ signal: 'SIGUSR2' })
     })
 
+    // TODO(mcollina): refactor to not alter globals here
     closeWithGrace((event, cb) => {
-      worker.postMessage(event)
-      exited = cb
+      if (isWorkerAlive) {
+        worker.postMessage(event)
+        exited = cb
+      } else {
+        setImmediate(cb)
+      }
     })
 
     /* c8 ignore next 3 */

package/lib/worker.js

@@ -58,25 +58,6 @@ if (config.server) {
   config.server.logger = logger
 }
 
-/* c8 ignore next 4 */
-process.once('uncaughtException', (err) => {
-  logger.error({ err }, 'runtime error')
-  logger[pino.symbols.streamSym].flushSync?.()
-  setImmediate(() => {
-    process.exit(1)
-  })
-})
-
-// Tested by test/cli/start.test.mjs by C8 does not see it.
-/* c8 ignore next 4 */
-process.once('unhandledRejection', (err) => {
-  logger.error({ err }, 'runtime error')
-  logger[pino.symbols.streamSym].flushSync?.()
-  setImmediate(() => {
-    process.exit(1)
-  })
-})
-
 function main () {
   const { inspectorOptions } = workerData.config
 
@@ -93,6 +74,38 @@ function main () {
   runtime.startListening(parentPort)
 
   parentPort.postMessage('plt:init')
+
+  let stopping = false
+
+  async function stop () {
+    if (stopping) {
+      return
+    }
+
+    stopping = true
+    try {
+      await runtime.stopServices()
+    } catch (err) {
+      logger.error({ err }, 'error while stopping services')
+    }
+  }
+
+  /* c8 ignore next 4 */
+  process.on('uncaughtException', (err) => {
+    logger.error({ err }, 'runtime error')
+    stop().then(() => {
+      process.exit(1)
+    })
+  })
+
+  // Tested by test/cli/start.test.mjs by C8 does not see it.
+  /* c8 ignore next 4 */
+  process.on('unhandledRejection', (err) => {
+    logger.error({ err }, 'runtime error')
+    stop().then(() => {
+      process.exit(1)
+    })
+  })
 }
 
 main()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -28,8 +28,8 @@
     "standard": "^17.1.0",
     "tsd": "^0.29.0",
     "typescript": "^5.2.2",
-    "@platformatic/sql-mapper": "1.15.0",
-    "@platformatic/sql-graphql": "1.15.0"
+    "@platformatic/sql-graphql": "1.16.0",
+    "@platformatic/sql-mapper": "1.16.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.0",
@@ -44,18 +44,19 @@
     "fastify": "^4.24.1",
     "fastify-undici-dispatcher": "^0.5.0",
     "graphql": "^16.8.1",
-    "help-me": "^4.2.0",
+    "help-me": "^5.0.0",
     "minimist": "^1.2.8",
     "pino": "^8.16.0",
     "pino-pretty": "^10.2.3",
-    "undici": "^6.0.0",
-    "@platformatic/db": "1.15.0",
-    "@platformatic/config": "1.15.0",
-    "@platformatic/composer": "1.15.0",
-    "@platformatic/generators": "1.15.0",
-    "@platformatic/utils": "1.15.0",
-    "@platformatic/telemetry": "1.15.0",
-    "@platformatic/service": "1.15.0"
+    "undici": "^6.2.0",
+    "why-is-node-running": "^2.2.2",
+    "@platformatic/composer": "1.16.0",
+    "@platformatic/config": "1.16.0",
+    "@platformatic/generators": "1.16.0",
+    "@platformatic/service": "1.16.0",
+    "@platformatic/db": "1.16.0",
+    "@platformatic/telemetry": "1.16.0",
+    "@platformatic/utils": "1.16.0"
   },
   "standard": {
     "ignore": [
@@ -64,8 +65,8 @@
     ]
   },
   "scripts": {
-    "test": "npm run lint && node test.js test/cli/*.test.mjs && tsd",
-    "coverage": "npm run lint && c8 -x fixtures -x test node test.js && tsd",
+    "test": "npm run lint && node ./test/runner.js && tsd",
+    "coverage": "npm run lint && c8 -x fixtures -x test node ./test/runner.js && tsd",
     "lint": "standard | snazzy"
   }
 }

package/test.js

@@ -1,20 +0,0 @@
-'use strict'
-
-const { tap, spec } = require('node:test/reporters')
-const { run } = require('node:test')
-const path = require('node:path')
-const glob = require('glob').globSync
-
-/* eslint-disable new-cap */
-const reporter = process.stdout.isTTY ? new spec() : tap
-
-const files = [
-  ...glob(path.join(__dirname, 'test', '*.test.js')),
-  ...glob(path.join(__dirname, 'test', 'cli', '*.test.mjs'))
-]
-
-run({
-  files,
-  concurrency: 1,
-  timeout: 30000
-}).compose(reporter).pipe(process.stdout)