@platformatic/runtime 1.0.0 → 1.1.0

package/fixtures/server/overrides-service/platformatic.runtime.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v0.31.0/runtime",
+  "entrypoint": "echo",
+  "allowCycles": false,
+  "hotReload": true,
+  "autoload": {
+    "path": "services",
+    "exclude": [
+      "docs"
+    ]
+  },
+   "server": {
+    "hostname": "127.0.0.1",
+    "port": "14242",
+    "logger": {
+      "level": "info"
+    }
+  }
+}

package/fixtures/server/overrides-service/services/echo/platformatic.service.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v0.28.1/service", 
+  "service": {
+    "openapi": true
+  },
+  "plugins": {
+    "paths": [
+      "./routes"
+    ],
+    "typescript": false
+  },
+   "server": {
+    "hostname": "127.0.0.1",
+    "port": "14343",
+    "logger": {
+      "level": "info"
+    }
+  }
+}

package/fixtures/server/overrides-service/services/echo/routes/span.js

@@ -0,0 +1,8 @@
+'use strict'
+module.exports = async function (fastify, opts) {
+  // This returns the traceId set on the span by the service
+  fastify.get('/', async (request, reply) => {
+    const traceId = request.span.spanContext().traceId
+    return { traceId }
+  })
+}

package/fixtures/server/runtime-server/platformatic.runtime.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v0.31.0/runtime",
+  "entrypoint": "echo",
+  "allowCycles": false,
+  "hotReload": true,
+  "autoload": {
+    "path": "services",
+    "exclude": [
+      "docs"
+    ]
+  },
+   "server": {
+    "hostname": "127.0.0.1",
+    "port": "14242",
+    "logger": {
+      "level": "info"
+    }
+  }
+}

package/fixtures/server/runtime-server/services/echo/platformatic.service.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v0.28.1/service", 
+  "service": {
+    "openapi": true
+  },
+  "plugins": {
+    "paths": [
+      "./routes"
+    ],
+    "typescript": false
+  }
+}

package/fixtures/server/runtime-server/services/echo/routes/span.js

@@ -0,0 +1,8 @@
+'use strict'
+module.exports = async function (fastify, opts) {
+  // This returns the traceId set on the span by the service
+  fastify.get('/', async (request, reply) => {
+    const traceId = request.span.spanContext().traceId
+    return { traceId }
+  })
+}

package/lib/api.js

@@ -16,7 +16,13 @@ class RuntimeApi {
     for (let i = 0; i < config.services.length; ++i) {
       const service = config.services[i]
       const serviceTelemetryConfig = telemetryConfig ? { ...telemetryConfig, serviceName: `${telemetryConfig.serviceName}-${service.id}` } : null
-      const app = new PlatformaticApp(service, loaderPort, logger, serviceTelemetryConfig)
+
+      // If the service is an entrypoint and runtime server config is defined, use it.
+      let serverConfig = null
+      if (config.server && service.entrypoint) {
+        serverConfig = config.server
+      }
+      const app = new PlatformaticApp(service, loaderPort, logger, serviceTelemetryConfig, serverConfig)
 
       this.#services.set(service.id, app)
     }

package/lib/app.js

@@ -17,9 +17,10 @@ class PlatformaticApp {
   #fileWatcher
   #logger
   #telemetryConfig
+  #serverConfig
   #debouncedRestart
 
-  constructor (appConfig, loaderPort, logger, telemetryConfig) {
+  constructor (appConfig, loaderPort, logger, telemetryConfig, serverConfig) {
     this.appConfig = appConfig
     this.config = null
     this.#hotReload = false
@@ -33,6 +34,7 @@ class PlatformaticApp {
       name: this.appConfig.id
     })
     this.#telemetryConfig = telemetryConfig
+    this.#serverConfig = serverConfig
 
     /* c8 ignore next 4 */
     this.#debouncedRestart = debounce(() => {
@@ -93,6 +95,14 @@ class PlatformaticApp {
       ...configManager.current,
       telemetry: this.#telemetryConfig
     })
+
+    if (this.#serverConfig) {
+      configManager.update({
+        ...configManager.current,
+        server: this.#serverConfig
+      })
+    }
+
     const config = configManager.current
 
     this.#setuplogger(configManager)

package/lib/config.js

@@ -246,6 +246,7 @@ platformaticRuntime.configManagerConfig = {
     allErrors: true,
     strict: false
   },
+  envWhitelist: ['DATABASE_URL', 'PORT', 'HOSTNAME'],
   async transformConfig () {
     await _transformConfig(this)
   }

package/lib/schema.js

@@ -2,6 +2,7 @@
 'use strict'
 
 const telemetry = require('@platformatic/telemetry').schema
+const { server } = require('@platformatic/service').schema
 const pkg = require('../package.json')
 const version = 'v' + pkg.version
 const platformaticRuntimeSchema = {
@@ -44,6 +45,7 @@ const platformaticRuntimeSchema = {
       }
     },
     telemetry,
+    server,
     services: {
       type: 'array',
       default: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -17,38 +17,38 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "c8": "^8.0.0",
-    "execa": "^8.0.0",
+    "c8": "^8.0.1",
+    "execa": "^8.0.1",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
     "tsd": "^0.29.0",
-    "typescript": "^5.1.6",
-    "@platformatic/sql-graphql": "1.0.0",
-    "@platformatic/sql-mapper": "1.0.0"
+    "typescript": "^5.2.2",
+    "@platformatic/sql-mapper": "1.1.0",
+    "@platformatic/sql-graphql": "1.1.0"
   },
   "dependencies": {
+    "@fastify/error": "^3.3.0",
     "@hapi/topo": "^6.0.2",
-    "@fastify/error": "^3.2.1",
     "close-with-grace": "^1.2.0",
     "commist": "^3.2.0",
     "debounce": "^1.2.1",
     "desm": "^1.3.0",
-    "es-main": "^1.2.0",
+    "es-main": "^1.3.0",
     "fastest-levenshtein": "^1.0.16",
-    "fastify": "^4.18.0",
-    "fastify-undici-dispatcher": "^0.4.1",
+    "fastify": "^4.23.2",
+    "fastify-undici-dispatcher": "^0.4.2",
     "help-me": "^4.2.0",
     "minimist": "^1.2.8",
-    "pino": "^8.14.1",
-    "pino-pretty": "^10.0.0",
-    "undici": "^5.22.1",
-    "@platformatic/config": "1.0.0",
-    "@platformatic/composer": "1.0.0",
-    "@platformatic/service": "1.0.0",
-    "@platformatic/telemetry": "1.0.0",
-    "@platformatic/db": "1.0.0",
-    "@platformatic/utils": "1.0.0"
+    "pino": "^8.15.3",
+    "pino-pretty": "^10.2.0",
+    "undici": "^5.25.3",
+    "@platformatic/service": "1.1.0",
+    "@platformatic/db": "1.1.0",
+    "@platformatic/telemetry": "1.1.0",
+    "@platformatic/utils": "1.1.0",
+    "@platformatic/config": "1.1.0",
+    "@platformatic/composer": "1.1.0"
   },
   "standard": {
     "ignore": [