@platformatic/runtime 1.30.0 → 1.31.1

package/fixtures/management-api/services/service-1/platformatic.json

@@ -6,8 +6,5 @@
   "plugins": {
     "paths": ["plugin.js"]
   },
-  "watch": true,
-  "metrics": {
-    "server": "parent"
-  }
+  "watch": true
 }

package/fixtures/management-api/services/service-2/platformatic.json

@@ -5,6 +5,5 @@
   },
   "plugins": {
     "paths": ["plugin.js"]
-  },
-  "metrics": true
+  }
 }

package/fixtures/sample-runtime-with-2-services/.env

@@ -0,0 +1,10 @@
+PLT_SERVER_HOSTNAME=0.0.0.0
+PORT=3042
+PLT_SERVER_LOGGER_LEVEL=info
+PLT_RIVAL_TYPESCRIPT=true
+PLT_RIVAL_FST_PLUGIN_OAUTH2_NAME=googleOAuth2
+PLT_RIVAL_FST_PLUGIN_OAUTH2_CREDENTIALS_CLIENT_ID=sample_client_id
+PLT_RIVAL_FST_PLUGIN_OAUTH2_CREDENTIALS_CLIENT_SECRET=sample_client_secret
+PLT_RIVAL_FST_PLUGIN_OAUTH2_REDIRECT_PATH=/login/google
+PLT_RIVAL_FST_PLUGIN_OAUTH2_CALLBACK_URI=http://localhost:3000/login/google/callback
+PLT_FOOBAR_TYPESCRIPT=true

package/fixtures/sample-runtime-with-2-services/package.json

@@ -0,0 +1,16 @@
+{
+  "scripts": {
+    "start": "platformatic start",
+    "test": "node --test test/*/*.test.js"
+  },
+  "devDependencies": {
+    "fastify": "^4.26.0"
+  },
+  "dependencies": {
+    "platformatic": "^1.25.0",
+    "@fastify/oauth2": "7.8.0"
+  },
+  "engines": {
+    "node": "^18.8.0 || >=20.6.0"
+  }
+}

package/fixtures/sample-runtime-with-2-services/platformatic.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.25.0/runtime",
+  "entrypoint": "rival",
+  "allowCycles": false,
+  "hotReload": true,
+  "autoload": {
+    "path": "services",
+    "exclude": [
+      "docs"
+    ]
+  },
+  "server": {
+    "hostname": "{PLT_SERVER_HOSTNAME}",
+    "port": "{PORT}",
+    "logger": {
+      "level": "{PLT_SERVER_LOGGER_LEVEL}"
+    }
+  }
+}

package/fixtures/sample-runtime-with-2-services/services/foobar/package.json

@@ -0,0 +1,16 @@
+{
+  "scripts": {
+    "start": "platformatic start",
+    "test": "node --test test/**"
+  },
+  "devDependencies": {
+    "fastify": "^4.26.0"
+  },
+  "dependencies": {
+    "platformatic": "^1.25.0",
+    "@platformatic/service": "^1.25.0"
+  },
+  "engines": {
+    "node": "^18.8.0 || >=20.6.0"
+  }
+}

package/fixtures/sample-runtime-with-2-services/services/foobar/platformatic.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.25.0/service",
+  "service": {
+    "openapi": true
+  },
+  "watch": true,
+  "plugins": {
+    "paths": [
+      {
+        "path": "./plugins",
+        "encapsulate": false
+      },
+      "./routes"
+    ],
+    "typescript": "{PLT_FOOBAR_TYPESCRIPT}",
+    "packages": []
+  }
+}

package/fixtures/sample-runtime-with-2-services/services/foobar/routes/root.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (fastify, opts) {
+  fastify.get('/', async function (request, reply) {
+    return { hello: 'from root' }
+  })
+}

package/fixtures/sample-runtime-with-2-services/services/rival/package.json

@@ -0,0 +1,16 @@
+{
+  "scripts": {
+    "start": "platformatic start",
+    "test": "node --test test/**"
+  },
+  "devDependencies": {
+    "fastify": "^4.26.0"
+  },
+  "dependencies": {
+    "platformatic": "^1.25.0",
+    "@platformatic/service": "^1.25.0"
+  },
+  "engines": {
+    "node": "^18.8.0 || >=20.6.0"
+  }
+}

package/fixtures/sample-runtime-with-2-services/services/rival/platformatic.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.25.0/service",
+  "service": {
+    "openapi": true
+  },
+  "watch": true,
+  "plugins": {
+    "paths": [
+      {
+        "path": "./plugins",
+        "encapsulate": false
+      },
+      "./routes"
+    ],
+    "typescript": "{PLT_RIVAL_TYPESCRIPT}",
+    "packages": [
+      {
+        "name": "@fastify/oauth2",
+        "options": {
+          "name": "{PLT_RIVAL_FST_PLUGIN_OAUTH2_NAME}",
+          "credentials": {
+            "client": {
+              "id": "{PLT_RIVAL_FST_PLUGIN_OAUTH2_CREDENTIALS_CLIENT_ID}",
+              "secret": "{PLT_RIVAL_FST_PLUGIN_OAUTH2_CREDENTIALS_CLIENT_SECRET}"
+            }
+          },
+          "startRedirectPath": "{PLT_RIVAL_FST_PLUGIN_OAUTH2_REDIRECT_PATH}",
+          "callbackUri": "{PLT_RIVAL_FST_PLUGIN_OAUTH2_CALLBACK_URI}"
+        }
+      }
+    ]
+  }
+}

package/fixtures/sample-runtime-with-2-services/services/rival/routes/root.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (fastify, opts) {
+  fastify.get('/', async function (request, reply) {
+    return { hello: 'from root' }
+  })
+}

package/lib/app.js

@@ -73,6 +73,8 @@ class PlatformaticApp {
 
     try {
       await this.config.configManager.parseAndValidate()
+      await this.#updateConfig()
+
       this.#setuplogger(this.config.configManager)
       await this.server.restart()
     } catch (err) {
@@ -93,44 +95,9 @@ class PlatformaticApp {
     this.#started = true
 
     await this.#initializeConfig()
-    this.#originalWatch = this.config.configManager.current.watch
-    this.config.configManager.current.watch = { enabled: false }
-
-    const { configManager } = this.config
-    configManager.update({
-      ...configManager.current,
-      telemetry: this.#telemetryConfig
-    })
-
-    if (this.#serverConfig) {
-      configManager.update({
-        ...configManager.current,
-        server: this.#serverConfig
-      })
-    }
-
-    if (this.#hasManagementApi || configManager.current.metrics) {
-      configManager.update({
-        ...configManager.current,
-        metrics: {
-          server: 'parent',
-          defaultMetrics: { enabled: this.appConfig.entrypoint },
-          prefix: snakeCase(this.appConfig.id) + '_',
-          ...configManager.current.metrics
-        }
-      })
-    }
-
-    if (!this.appConfig.entrypoint) {
-      configManager.update({
-        ...configManager.current,
-        server: {
-          ...(configManager.current.server || {}),
-          trustProxy: true
-        }
-      })
-    }
+    await this.#updateConfig()
 
+    const configManager = this.config.configManager
     const config = configManager.current
 
     this.#setuplogger(configManager)
@@ -262,6 +229,46 @@ class PlatformaticApp {
     })
   }
 
+  async #updateConfig () {
+    this.#originalWatch = this.config.configManager.current.watch
+    this.config.configManager.current.watch = { enabled: false }
+
+    const { configManager } = this.config
+    configManager.update({
+      ...configManager.current,
+      telemetry: this.#telemetryConfig
+    })
+
+    if (this.#serverConfig) {
+      configManager.update({
+        ...configManager.current,
+        server: this.#serverConfig
+      })
+    }
+
+    if (this.#hasManagementApi || configManager.current.metrics) {
+      configManager.update({
+        ...configManager.current,
+        metrics: {
+          server: 'hide',
+          defaultMetrics: { enabled: this.appConfig.entrypoint },
+          prefix: snakeCase(this.appConfig.id) + '_',
+          ...configManager.current.metrics
+        }
+      })
+    }
+
+    if (!this.appConfig.entrypoint) {
+      configManager.update({
+        ...configManager.current,
+        server: {
+          ...(configManager.current.server || {}),
+          trustProxy: true
+        }
+      })
+    }
+  }
+
   #setuplogger (configManager) {
     configManager.current.server = configManager.current.server || {}
     const level = configManager.current.server.logger?.level

package/lib/errors.js

@@ -25,5 +25,7 @@ module.exports = {
   FailedToUnlinkManagementApiSocket: createError(`${ERROR_PREFIX}_FAILED_TO_UNLINK_MANAGEMENT_API_SOCKET`, 'Failed to unlink management API socket "%s"'),
   LogFileNotFound: createError(`${ERROR_PREFIX}_LOG_FILE_NOT_FOUND`, 'Log file with index %s not found', 404),
   CannotFindGeneratorForTemplateError: createError(`${ERROR_PREFIX}_CANNOT_FIND_GENERATOR_FOR_TEMPLATE`, 'Cannot find a generator for template "%s"'),
+
+  // TODO: should remove next one as it's not used anymore
   CannotRemoveServiceOnUpdateError: createError(`${ERROR_PREFIX}_CANNOT_REMOVE_SERVICE_ON_UPDATE`, 'Cannot remove service "%s" when updating a Runtime')
 }

package/lib/generator/runtime-generator.js

@@ -5,13 +5,13 @@ const { NoEntryPointError, NoServiceNamedError } = require('./errors')
 const generateName = require('boring-name-generator')
 const { join } = require('node:path')
 const { envObjectToString } = require('@platformatic/generators/lib/utils')
-const { readFile, readdir, stat } = require('node:fs/promises')
+const { readFile, readdir, stat, rm } = require('node:fs/promises')
 const { ConfigManager } = require('@platformatic/config')
 const { platformaticRuntime } = require('../config')
 const ServiceGenerator = require('@platformatic/service/lib/generator/service-generator')
 const DBGenerator = require('@platformatic/db/lib/generator/db-generator')
 const ComposerGenerator = require('@platformatic/composer/lib/generator/composer-generator')
-const { CannotFindGeneratorForTemplateError, CannotRemoveServiceOnUpdateError } = require('../errors')
+const { CannotFindGeneratorForTemplateError } = require('../errors')
 const { getServiceTemplateFromSchemaUrl } = require('@platformatic/generators/lib/utils')
 const { DotEnvTool } = require('dotenv-tool')
 const { getArrayDifference } = require('../utils')
@@ -357,7 +357,30 @@ class RuntimeGenerator extends BaseGenerator {
 
     const removedServices = getArrayDifference(allCurrentServicesNames, allNewServicesNames)
     if (removedServices.length > 0) {
-      throw new CannotRemoveServiceOnUpdateError(removedServices.join(', '))
+      for (const removedService of removedServices) {
+        // handle service delete
+
+        // delete env variables
+        const s = this.services.find((f) => f.name === removedService)
+        const allKeys = envTool.getKeys()
+        allKeys.forEach((k) => {
+          if (k.startsWith(`PLT_${s.service.config.envPrefix}`)) {
+            envTool.deleteKey(k)
+          }
+        })
+
+        // delete dependencies
+        const servicePackageJson = JSON.parse(await readFile(join(this.targetDirectory, 'services', s.name, 'platformatic.json')))
+        if (servicePackageJson.plugins && servicePackageJson.plugins.packages) {
+          servicePackageJson.plugins.packages
+            .forEach((p) => {
+              delete (currrentPackageJson.dependencies[p.name])
+            })
+        }
+        // delete directory
+        await rm(join(this.targetDirectory, 'services', s.name), { recursive: true })
+      }
+      // throw new CannotRemoveServiceOnUpdateError(removedServices.join(', '))
     }
 
     // handle new services
@@ -368,7 +391,8 @@ class RuntimeGenerator extends BaseGenerator {
       const baseConfig = {
         isRuntimeContext: true,
         targetDirectory: join(this.targetDirectory, 'services', newService.name),
-        serviceName: newService.name
+        serviceName: newService.name,
+        plugin: true
       }
       if (allCurrentServicesNames.includes(newService.name)) {
         // update existing services env values
@@ -383,6 +407,7 @@ class RuntimeGenerator extends BaseGenerator {
         pluginsToRemove.forEach((p) => delete currentRuntimeDependencies[p])
       }
       serviceInstance.setConfig(baseConfig)
+      serviceInstance.setConfigFields(newService.fields)
 
       const serviceEnvPrefix = `PLT_${serviceInstance.config.envPrefix}`
       for (const plug of newService.plugins) {
@@ -399,15 +424,20 @@ class RuntimeGenerator extends BaseGenerator {
         }
       }
       allServicesDependencies = { ...allServicesDependencies, ...serviceInstance.config.dependencies }
-      await serviceInstance.prepare()
+      const afterPrepareMetadata = await serviceInstance.prepare()
       await serviceInstance.writeFiles()
       // cleanup runtime env removing keys not present anymore in service plugins
       const allKeys = envTool.getKeys()
       allKeys.forEach((k) => {
-        if (k.startsWith('PLT_') && !runtimeAddedEnvKeys.includes(k)) {
+        if (k.startsWith(`${serviceEnvPrefix}_FST_PLUGIN`) && !runtimeAddedEnvKeys.includes(k)) {
           envTool.deleteKey(k)
         }
       })
+
+      // add service env variables to runtime env
+      Object.entries(afterPrepareMetadata.env).forEach(([key, value]) => {
+        envTool.addKey(key, value)
+      })
     }
 
     // update runtime package.json dependencies

package/lib/management-api.js

@@ -2,7 +2,7 @@
 
 const { tmpdir, platform } = require('node:os')
 const { join } = require('node:path')
-const { readFile, mkdir, unlink } = require('node:fs/promises')
+const { readFile, mkdir, rm } = require('node:fs/promises')
 const fastify = require('fastify')
 const ws = require('ws')
 const errors = require('./errors')
@@ -197,12 +197,12 @@ async function startManagementApi (configManager, runtimeApiClient) {
   }
 
   try {
-    await mkdir(runtimeTmpDir, { recursive: true })
-    await unlink(socketPath).catch((err) => {
+    await rm(runtimeTmpDir, { recursive: true, force: true }).catch((err) => {
       if (err.code !== 'ENOENT') {
         throw new errors.FailedToUnlinkManagementApiSocket(err.message)
       }
     })
+    await mkdir(runtimeTmpDir, { recursive: true })
 
     const managementApi = await createManagementApi(
       configManager,
@@ -211,7 +211,7 @@ async function startManagementApi (configManager, runtimeApiClient) {
 
     if (platform() !== 'win32') {
       managementApi.addHook('onClose', async () => {
-        await unlink(socketPath).catch(() => {})
+        await rm(runtimeTmpDir, { recursive: true, force: true }).catch()
       })
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.30.0",
+  "version": "1.31.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -33,8 +33,8 @@
     "typescript": "^5.4.2",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/sql-mapper": "1.30.0",
-    "@platformatic/sql-graphql": "1.30.0"
+    "@platformatic/sql-graphql": "1.31.1",
+    "@platformatic/sql-mapper": "1.31.1"
   },
   "dependencies": {
     "ws": "^8.16.0",
@@ -62,13 +62,13 @@
     "tail-file-stream": "^0.1.0",
     "undici": "^6.9.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "1.30.0",
-    "@platformatic/db": "1.30.0",
-    "@platformatic/config": "1.30.0",
-    "@platformatic/generators": "1.30.0",
-    "@platformatic/service": "1.30.0",
-    "@platformatic/telemetry": "1.30.0",
-    "@platformatic/utils": "1.30.0"
+    "@platformatic/composer": "1.31.1",
+    "@platformatic/config": "1.31.1",
+    "@platformatic/db": "1.31.1",
+    "@platformatic/generators": "1.31.1",
+    "@platformatic/service": "1.31.1",
+    "@platformatic/telemetry": "1.31.1",
+    "@platformatic/utils": "1.31.1"
   },
   "standard": {
     "ignore": [