@platformatic/runtime 1.4.1 → 1.5.1

package/fixtures/express/platformatic.runtime.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.3.0/runtime",
+  "entrypoint": "b",
+  "autoload": {
+    "path": "./services",
+    "mappings": {
+      "a": {
+        "id": "a",
+        "config": "platformatic.service.json",
+        "useHttp": true
+      }
+    }
+  },
+  "server": {
+    "hostname": "127.0.0.1",
+    "port": 3000,
+    "logger": {
+      "level": "warn"
+    }
+  }
+}

package/fixtures/express/services/a/platformatic.service.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.3.0/service",
+  "server": {
+    "logger": {
+      "level": "warn"
+    }
+  },
+  "plugins": {
+    "paths": [{
+      "path": "plugin.js",
+      "encapsulate": false
+    }]
+  }
+}

package/fixtures/express/services/a/plugin.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const fastifyExpress = require('@fastify/express')
+const express = require('express')
+
+module.exports = async function (app) {
+  const router = express.Router()
+
+  router.use(function (req, res, next) {
+    res.setHeader('x-custom', true)
+    next()
+  })
+
+  router.get('/hello', (req, res) => {
+    res.status(200)
+    res.json({ hello: 'world' })
+  })
+
+  await app.register(fastifyExpress)
+
+  app.use(router)
+
+  app.get('/hello2', (req, res) => {
+    return { hello: 'world2' }
+  })
+}

package/fixtures/express/services/b/platformatic.service.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.3.0/service",
+  "server": {
+    "logger": {
+      "level": "warn"
+    }
+  },
+  "plugins": {
+    "paths": [{
+      "path": "plugin.js",
+      "encapsulate": false
+    }]
+  }
+}

package/fixtures/express/services/b/plugin.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { request } = require('undici')
+
+module.exports = async function (fastify) {
+  fastify.get('/hello', async (_, reply) => {
+    const res = await request('http://a.plt.local/hello')
+    reply.log.info('response received')
+    const data = await res.body.json()
+    return data
+  })
+
+  fastify.get('/hello2', async (_, reply) => {
+    const res = await request('http://a.plt.local/hello2')
+    reply.log.info('response received')
+    const data = await res.body.json()
+    return data
+  })
+}

package/lib/api.js

@@ -21,6 +21,12 @@ class RuntimeApi {
       let serverConfig = null
       if (config.server && service.entrypoint) {
         serverConfig = config.server
+      } else if (service.useHttp) {
+        serverConfig = {
+          port: 0,
+          host: '127.0.0.1',
+          keepAliveTimeout: 5000
+        }
       }
       const app = new PlatformaticApp(service, loaderPort, logger, serviceTelemetryConfig, serverConfig)
 

package/lib/app.js

@@ -126,7 +126,7 @@ class PlatformaticApp {
       this.#startFileWatching()
     }
 
-    if (this.appConfig.entrypoint) {
+    if (this.appConfig.entrypoint || this.appConfig.useHttp) {
       try {
         await this.server.start()
         /* c8 ignore next 5 */
@@ -232,11 +232,10 @@ class PlatformaticApp {
   }
 
   #setuplogger (configManager) {
-    // Set the logger if not present (and the config supports it).
-    if (configManager.current.server) {
-      const childLogger = this.#logger.child({}, { level: configManager.current.server.logger?.level || 'info' })
-      configManager.current.server.logger = childLogger
-    }
+    // Set the logger if not present
+    configManager.current.server = configManager.current.server || {}
+    const childLogger = this.#logger.child({}, { level: configManager.current.server.logger?.level || 'info' })
+    configManager.current.server.logger = childLogger
   }
 
   #startFileWatching () {

package/lib/build-server.js

@@ -6,7 +6,17 @@ const { buildServer: buildServerService } = require('@platformatic/service')
 const { loadConfig } = require('./load-config')
 
 async function buildServerRuntime (options = {}) {
+  const {
+    serviceMap,
+    loggingPort,
+    loggingMetadata
+  } = options
+
   if (!options.configManager) {
+    delete options.serviceMap
+    delete options.loggingPort
+    delete options.loggingMetadata
+
     // Instantiate a new config manager from the current options.
     const cm = new ConfigManager({
       ...platformaticRuntime.configManagerConfig,
@@ -14,6 +24,10 @@ async function buildServerRuntime (options = {}) {
     })
     await cm.parseAndValidate()
 
+    cm.current.loggingPort = loggingPort
+    cm.current.loggingMetadata = loggingMetadata
+    cm.current.serviceMap = serviceMap
+
     if (typeof options === 'string') {
       options = { configManager: cm }
     } else {

package/lib/config.js

@@ -33,13 +33,13 @@ async function _transformConfig (configManager) {
 
       const config = join(entryPath, configFilename)
 
-      services.push({ id, config, path: entryPath })
+      services.push({ id, config, path: entryPath, useHttp: !!mapping.useHttp })
     }
   }
 
   configManager.current.allowCycles = !!configManager.current.allowCycles
   configManager.current.serviceMap = new Map()
-  configManager.current.inspectorOptions = null
+  configManager.current.inspectorOptions = undefined
 
   let hasValidEntrypoint = false
 
@@ -276,10 +276,10 @@ async function wrapConfigInRuntimeConfig ({ configManager, args }) {
       coerceTypes: true,
       allErrors: true,
       strict: false
-    }
+    },
+    transformConfig () { return _transformConfig(this) }
   })
 
-  await _transformConfig(cm)
   await cm.parseAndValidate()
   return cm
 }

package/lib/schema.js

@@ -38,6 +38,9 @@ const platformaticRuntimeSchema = {
               },
               config: {
                 type: 'string'
+              },
+              useHttp: {
+                type: 'boolean'
               }
             }
           }
@@ -62,6 +65,9 @@ const platformaticRuntimeSchema = {
           },
           config: {
             type: 'string'
+          },
+          useHttp: {
+            type: 'boolean'
           }
         }
       }
@@ -82,6 +88,23 @@ const platformaticRuntimeSchema = {
     allowCycles: {
       type: 'boolean'
     },
+    inspectorOptions: {
+      type: 'object',
+      properties: {
+        host: {
+          type: 'string'
+        },
+        port: {
+          type: 'number'
+        },
+        breakFirstLine: {
+          type: 'boolean'
+        },
+        hotReloadDisabled: {
+          type: 'boolean'
+        }
+      }
+    },
     $schema: {
       type: 'string'
     }
@@ -89,7 +112,8 @@ const platformaticRuntimeSchema = {
   anyOf: [
     { required: ['autoload', 'entrypoint'] },
     { required: ['services', 'entrypoint'] }
-  ]
+  ],
+  additionalProperties: false
 }
 
 module.exports.schema = platformaticRuntimeSchema

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -17,19 +17,21 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
+    "@fastify/express": "^2.3.0",
     "c8": "^8.0.1",
     "execa": "^8.0.1",
+    "express": "^4.18.2",
     "glob": "^10.3.10",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
     "tsd": "^0.29.0",
     "typescript": "^5.2.2",
-    "@platformatic/sql-graphql": "1.4.1",
-    "@platformatic/sql-mapper": "1.4.1"
+    "@platformatic/sql-graphql": "1.5.1",
+    "@platformatic/sql-mapper": "1.5.1"
   },
   "dependencies": {
-    "@fastify/error": "^3.3.0",
+    "@fastify/error": "^3.4.0",
     "@hapi/topo": "^6.0.2",
     "close-with-grace": "^1.2.0",
     "commist": "^3.2.0",
@@ -37,19 +39,19 @@
     "desm": "^1.3.0",
     "es-main": "^1.3.0",
     "fastest-levenshtein": "^1.0.16",
-    "fastify": "^4.23.2",
+    "fastify": "^4.24.1",
     "fastify-undici-dispatcher": "^0.5.0",
     "help-me": "^4.2.0",
     "minimist": "^1.2.8",
-    "pino": "^8.15.3",
-    "pino-pretty": "^10.2.0",
-    "undici": "^5.25.4",
-    "@platformatic/composer": "1.4.1",
-    "@platformatic/config": "1.4.1",
-    "@platformatic/db": "1.4.1",
-    "@platformatic/service": "1.4.1",
-    "@platformatic/telemetry": "1.4.1",
-    "@platformatic/utils": "1.4.1"
+    "pino": "^8.16.0",
+    "pino-pretty": "^10.2.3",
+    "undici": "^5.26.3",
+    "@platformatic/composer": "1.5.1",
+    "@platformatic/config": "1.5.1",
+    "@platformatic/db": "1.5.1",
+    "@platformatic/service": "1.5.1",
+    "@platformatic/telemetry": "1.5.1",
+    "@platformatic/utils": "1.5.1"
   },
   "standard": {
     "ignore": [