@platformatic/runtime 3.15.0 → 3.17.0

package/index.js

@@ -143,6 +143,12 @@ export async function create (configOrRoot, sourceOrConfig, context) {
   if (context?.start) {
     let port = config.server?.port
 
+    await runtime.init()
+
+    if (context.reloaded) {
+      runtime.logger.info('The application has been successfully reloaded.')
+    }
+
     while (true) {
       try {
         await runtime.start()

package/lib/generator.js

@@ -1,5 +1,6 @@
 import createError from '@fastify/error'
 import {
+  createEnvFileTool,
   defaultPackageManager,
   findConfigurationFile,
   generateDashedName,
@@ -50,12 +51,6 @@ function getRuntimeBaseEnvVars (config) {
   }
 }
 
-// This is needed as dotenv-tool is not loading with ESM currently
-export function createDotenvTool (...args) {
-  const { DotEnvTool } = createRequire(import.meta.url)('dotenv-tool')
-  return new DotEnvTool(...args)
-}
-
 export class RuntimeGenerator extends BaseGenerator {
   constructor (opts) {
     super({
@@ -371,8 +366,8 @@ export class RuntimeGenerator extends BaseGenerator {
     // check all applications are present with the same template
     const allCurrentApplicationsNames = this.applications.map(s => s.name)
     const allNewApplicationsNames = newConfig.applications.map(s => s.name)
-    // load dotenv tool
-    const envTool = createDotenvTool({
+    // load env file tool
+    const envTool = createEnvFileTool({
       path: join(this.targetDirectory, '.env')
     })
 

package/lib/management-api.js

@@ -1,11 +1,18 @@
 import fastifyAccepts from '@fastify/accepts'
 import fastifyWebsocket from '@fastify/websocket'
-import { createDirectory, safeRemove } from '@platformatic/foundation'
+import {
+  applications as applicationSchema,
+  createDirectory,
+  kMetadata,
+  safeRemove,
+  validate
+} from '@platformatic/foundation'
 import fastify from 'fastify'
 import { platform, tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { setTimeout as sleep } from 'node:timers/promises'
 import { createWebSocketStream } from 'ws'
+import { prepareApplication } from './config.js'
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
 
@@ -14,6 +21,26 @@ export async function managementApiPlugin (app, opts) {
 
   const runtime = opts.runtime
 
+  async function deleteApplications (ids, reply) {
+    const validIds = runtime.getApplicationsIds()
+
+    for (const id of ids) {
+      if (!validIds.includes(id)) {
+        reply.code(404)
+
+        return {
+          error: 'Not Found',
+          message: `Application with id "${id}" not found.`,
+          statusCode: 404
+        }
+      }
+    }
+
+    const removed = await runtime.removeApplications(ids)
+    reply.code(202)
+    return removed
+  }
+
   app.get('/status', async () => {
     const status = runtime.getRuntimeStatus()
     return { status }
@@ -23,8 +50,16 @@ export async function managementApiPlugin (app, opts) {
     return runtime.getRuntimeMetadata()
   })
 
-  app.get('/config', async () => {
-    return runtime.getRuntimeConfig()
+  app.get('/config', async request => {
+    const metadata = request.query.metadata === 'true'
+    const rawConfig = await runtime.getRuntimeConfig(metadata)
+
+    if (metadata) {
+      const { [kMetadata]: __metadata, ...config } = rawConfig
+      return { ...config, __metadata }
+    }
+
+    return rawConfig
   })
 
   app.get('/env', async () => {
@@ -46,12 +81,60 @@ export async function managementApiPlugin (app, opts) {
     return runtime.getApplications()
   })
 
+  app.post('/applications', async (request, reply) => {
+    let applications = request.body
+
+    if (!Array.isArray(applications)) {
+      applications = [applications]
+    }
+
+    const config = runtime.getRuntimeConfig(true)
+
+    try {
+      validate(applicationSchema, applications, {}, true, config[kMetadata].root)
+    } catch (err) {
+      reply.code(400)
+
+      return {
+        statusCode: 400,
+        error: 'Bad Request',
+        message: 'Invalid applications configuration.',
+        validationErrors: err.validationErrors
+      }
+    }
+
+    for (let i = 0; i < applications.length; i++) {
+      applications[i] = await prepareApplication(config, applications[i])
+    }
+
+    const created = await runtime.addApplications(applications, request.query.start !== 'false')
+    reply.code(201)
+    return created
+  })
+
+  app.delete('/applications', async (request, reply) => {
+    if (!Array.isArray(request.body)) {
+      reply.code(404)
+      return {
+        statusCode: 404,
+        error: 'Bad Request',
+        message: 'Invalid applications IDs.'
+      }
+    }
+
+    return deleteApplications(request.body, reply)
+  })
+
   app.get('/applications/:id', async request => {
     const { id } = request.params
     app.log.debug('get application details', { id })
     return runtime.getApplicationDetails(id)
   })
 
+  app.delete('/applications/:id', async (request, reply) => {
+    return deleteApplications([request.params.id], reply)
+  })
+
   app.get('/applications/:id/config', async request => {
     const { id } = request.params
     app.log.debug('get application config', { id })
@@ -195,7 +278,7 @@ export async function managementApiPlugin (app, opts) {
     })
   })
 
-  app.get('/logs/live', { websocket: true }, async (socket, req) => {
+  app.get('/logs/live', { websocket: true }, async socket => {
     runtime.addLoggerDestination(createWebSocketStream(socket))
   })
 }

package/lib/runtime.js

@@ -222,7 +222,7 @@ export class Runtime extends EventEmitter {
     await this.addApplications(this.#config.applications)
     await this.#setDispatcher(config.undici)
 
-    if (config.scheduler) {
+    if (config.scheduler && !this.#context.build) {
       this.#scheduler = startScheduler(config.scheduler, this.#dispatcher, logger)
     }
 
@@ -477,7 +477,13 @@ export class Runtime extends EventEmitter {
       await this.startApplications(toStart)
     }
 
+    const created = []
+    for (const { id } of applications) {
+      created.push(await this.getApplicationDetails(id))
+    }
+
     this.#updateLoggingPrefixes()
+    return created
   }
 
   async removeApplications (applications, silent = false) {
@@ -485,6 +491,13 @@ export class Runtime extends EventEmitter {
       throw new CannotRemoveEntrypointError()
     }
 
+    const removed = []
+    for (const application of applications) {
+      const details = await this.getApplicationDetails(application)
+      details.status = 'removed'
+      removed.push(details)
+    }
+
     await this.stopApplications(applications, silent, true)
 
     for (const application of applications) {
@@ -498,6 +511,7 @@ export class Runtime extends EventEmitter {
     }
 
     this.#updateLoggingPrefixes()
+    return removed
   }
 
   async startApplications (applicationsToStart, silent = false) {
@@ -1191,7 +1205,7 @@ export class Runtime extends EventEmitter {
       throw e
     }
 
-    const { entrypoint, localUrl } = application[kConfig]
+    const { entrypoint, localUrl, config, path } = application[kConfig]
 
     const status = await sendViaITC(application, 'getStatus')
     const { type, version, dependencies } = await sendViaITC(application, 'getApplicationInfo')
@@ -1199,6 +1213,8 @@ export class Runtime extends EventEmitter {
     const applicationDetails = {
       id,
       type,
+      config,
+      path,
       status,
       dependencies,
       version,
@@ -1596,7 +1612,7 @@ export class Runtime extends EventEmitter {
             await this.startApplication(applicationId)
           }
 
-          this.logger.info(`The application "${applicationId}" has been successfully reloaded ...`)
+          this.logger.info(`The application "${applicationId}" has been successfully reloaded.`)
           this.emitAndNotify('application:worker:reloaded', eventPayload)
 
           if (applicationConfig.entrypoint) {

package/lib/worker/main.js

@@ -4,7 +4,6 @@ import {
   disablePinoDirectWrite,
   getPrivateSymbol
 } from '@platformatic/foundation'
-import dotenv from 'dotenv'
 import { subscribe } from 'node:diagnostics_channel'
 import { EventEmitter } from 'node:events'
 import { ServerResponse } from 'node:http'
@@ -110,9 +109,11 @@ async function main () {
 
   globalThis.platformatic.logger.debug({ envfile }, 'Loading envfile...')
 
-  dotenv.config({
-    path: envfile
-  })
+  try {
+    process.loadEnvFile(envfile)
+  } catch {
+    // Ignore if the file doesn't exist, similar to dotenv behavior
+  }
 
   if (runtimeConfig.env) {
     Object.assign(process.env, runtimeConfig.env)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "3.15.0",
+  "version": "3.17.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/composer": "3.15.0",
-    "@platformatic/db": "3.15.0",
-    "@platformatic/gateway": "3.15.0",
-    "@platformatic/node": "3.15.0",
-    "@platformatic/sql-graphql": "3.15.0",
-    "@platformatic/service": "3.15.0",
-    "@platformatic/sql-mapper": "3.15.0",
-    "@platformatic/wattpm-pprof-capture": "3.15.0"
+    "@platformatic/db": "3.17.0",
+    "@platformatic/composer": "3.17.0",
+    "@platformatic/gateway": "3.17.0",
+    "@platformatic/node": "3.17.0",
+    "@platformatic/service": "3.17.0",
+    "@platformatic/sql-graphql": "3.17.0",
+    "@platformatic/sql-mapper": "3.17.0",
+    "@platformatic/wattpm-pprof-capture": "3.17.0"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -57,8 +57,6 @@
     "colorette": "^2.0.20",
     "cron": "^4.1.0",
     "debounce": "^2.0.0",
-    "dotenv": "^16.4.5",
-    "dotenv-tool": "^0.1.1",
     "fastest-levenshtein": "^1.0.16",
     "fastify": "^5.0.0",
     "graphql": "^16.8.1",
@@ -73,12 +71,12 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.15.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "3.15.0",
-    "@platformatic/foundation": "3.15.0",
-    "@platformatic/metrics": "3.15.0",
-    "@platformatic/generators": "3.15.0",
-    "@platformatic/itc": "3.15.0",
-    "@platformatic/telemetry": "3.15.0"
+    "@platformatic/basic": "3.17.0",
+    "@platformatic/itc": "3.17.0",
+    "@platformatic/generators": "3.17.0",
+    "@platformatic/foundation": "3.17.0",
+    "@platformatic/metrics": "3.17.0",
+    "@platformatic/telemetry": "3.17.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

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