@platformatic/runtime 1.18.0 → 1.20.0

package/fixtures/interceptors/external.js

@@ -0,0 +1,27 @@
+'use strict'
+
+const fastify = require('fastify')
+
+async function start (opts) {
+  const app = fastify()
+
+  // Dumb bearer token implementation
+  app.get('/hello', async (req, res) => {
+    // We just check if there is an authorization header,
+    // which is insecure,
+    if (req.headers.authorization) {
+      return { hello: 'world' }
+    } else {
+      res.code(401)
+      return { error: 'Unauthorized' }
+    }
+  })
+
+  return app
+}
+
+module.exports = start
+
+if (require.main === module) {
+  start({ logger: { name: 'external' } }).then(app => app.listen({ port: process.env.PORT || 3001 }))
+}

package/fixtures/interceptors/idp.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const fastify = require('fastify')
+const { createSigner } = require('fast-jwt')
+
+async function start (opts) {
+  const app = fastify(opts)
+  let port = opts.port
+
+  const signSync = createSigner({
+    key: 'secret',
+    expiresIn: '1h'
+  })
+
+  app.decorate('refreshToken', '')
+  app.decorate('signSync', signSync)
+
+  // Dump bearer token implementation
+  app.post('/token', async (req, res) => {
+    return { access_token: signSync({}) }
+  })
+
+  await app.listen({ port })
+
+  port = app.server.address().port
+
+  const refreshToken = signSync({
+    iss: `http://localhost:${port}`
+  })
+
+  app.refreshToken = refreshToken
+
+  app.log.info({ refreshToken }, 'refresh token')
+
+  return app
+}
+
+module.exports = start
+
+if (require.main === module) {
+  start({ logger: { name: 'idp' }, port: process.env.PORT || 3000 }).catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
+}

package/fixtures/interceptors/platformatic.runtime.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v1.20.0/runtime",
+  "entrypoint": "a",
+  "autoload": {
+    "path": "./services"
+  },
+  "server": {
+    "hostname": "127.0.0.1",
+    "port": "{{PORT}}",
+    "logger": {
+      "level": "info"
+    }
+  },
+  "undici": {
+    "interceptors": {
+      "Agent": [{
+        "module": "undici-oauth-interceptor",
+        "options": {
+          "refreshToken": "{{PLT_REFRESH_TOKEN}}",
+          "origins": ["{{PLT_EXTERNAL_SERVICE}}"],
+          "clientId": "my-client-id"
+        }
+      }]
+    }
+  }
+}

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

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

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

@@ -0,0 +1,15 @@
+'use strict'
+
+const { request } = require('undici')
+
+module.exports = async function (fastify, options) {
+  fastify.get('/hello', async (_, reply) => {
+    const res = await request(`${options.externalService}/hello`)
+    if (res.statusCode !== 200) {
+      reply.code(res.statusCode)
+    }
+    reply.log.info('response received')
+    const data = await res.body.json()
+    return data
+  })
+}

package/lib/api.js

@@ -1,7 +1,7 @@
 'use strict'
 
+const { getGlobalDispatcher, setGlobalDispatcher } = require('undici')
 const FastifyUndiciDispatcher = require('fastify-undici-dispatcher')
-const { setGlobalDispatcher, getGlobalDispatcher } = require('undici')
 const { PlatformaticApp } = require('./app')
 const errors = require('./errors')
 const { printSchema } = require('graphql')
@@ -29,20 +29,18 @@ class RuntimeApi {
           keepAliveTimeout: 5000
         }
       }
+
       const app = new PlatformaticApp(service, loaderPort, logger, serviceTelemetryConfig, serverConfig)
 
       this.#services.set(service.id, app)
     }
 
-    const globalAgent = getGlobalDispatcher()
-    const globalDispatcher = new FastifyUndiciDispatcher({
-      dispatcher: globalAgent,
+    this.#dispatcher = new FastifyUndiciDispatcher({
+      dispatcher: getGlobalDispatcher(),
       // setting the domain here allows for fail-fast scenarios
       domain: '.plt.local'
     })
-
-    setGlobalDispatcher(globalDispatcher)
-    this.#dispatcher = globalDispatcher
+    setGlobalDispatcher(this.#dispatcher)
   }
 
   async startListening (parentPort) {

package/lib/schema.js

@@ -105,6 +105,28 @@ const platformaticRuntimeSchema = {
         }
       }
     },
+    undici: {
+      agentOptions: {
+        type: 'object',
+        additionalProperties: true
+      },
+      interceptors: {
+        type: 'array',
+        items: {
+          type: 'object',
+          properties: {
+            module: {
+              type: 'string'
+            },
+            options: {
+              type: 'object',
+              additionalProperties: true
+            }
+          },
+          required: ['module', 'options']
+        }
+      }
+    },
     $schema: {
       type: 'string'
     }

package/lib/start.js

@@ -36,6 +36,9 @@ async function startWithConfig (configManager, env = process.env) {
   if (config.hotReload) {
     config.loaderFile = kLoaderFile
   }
+
+  const dirname = configManager.dirname
+
   // The configManager cannot be transferred to the worker, so remove it.
   delete config.configManager
 
@@ -43,7 +46,7 @@ async function startWithConfig (configManager, env = process.env) {
     /* c8 ignore next */
     execArgv: config.hotReload ? kWorkerExecArgv : [],
     transferList: config.loggingPort ? [config.loggingPort] : [],
-    workerData: { config },
+    workerData: { config, dirname },
     env
   })
 

package/lib/worker.js

@@ -1,8 +1,10 @@
 'use strict'
 
 const inspector = require('node:inspector')
-const { register } = require('node:module')
+const { register, createRequire } = require('node:module')
 const { isatty } = require('node:tty')
+const { pathToFileURL } = require('node:url')
+const { join } = require('node:path')
 const {
   MessageChannel,
   parentPort,
@@ -10,6 +12,7 @@ const {
 } = require('node:worker_threads')
 const undici = require('undici')
 const pino = require('pino')
+const { setGlobalDispatcher, Agent } = require('undici')
 const RuntimeApi = require('./api')
 const { MessagePortWritable } = require('./message-port-writable')
 let loaderPort
@@ -58,7 +61,48 @@ if (config.server) {
   config.server.logger = logger
 }
 
-function main () {
+let stop
+
+/* c8 ignore next 4 */
+process.on('uncaughtException', (err) => {
+  logger.error({ err }, 'runtime uncaught exception')
+
+  if (stop) {
+    stop().then(() => {
+      process.exit(1)
+    })
+  } else {
+    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 unhandled rejection')
+
+  if (stop) {
+    stop().then(() => {
+      process.exit(1)
+    })
+  } else {
+    process.exit(1)
+  }
+})
+
+async function loadInterceptor (_require, module, options) {
+  const url = pathToFileURL(_require.resolve(module))
+  const interceptor = (await import(url)).default
+  return interceptor(options)
+}
+
+function loadInterceptors (_require, interceptors) {
+  return Promise.all(interceptors.map(async ({ module, options }) => {
+    return loadInterceptor(_require, module, options)
+  }))
+}
+
+async function main () {
   const { inspectorOptions } = workerData.config
 
   if (inspectorOptions) {
@@ -70,6 +114,23 @@ function main () {
     inspector.open(inspectorOptions.port, inspectorOptions.host, inspectorOptions.breakFirstLine)
   }
 
+  const interceptors = {}
+
+  if (config.undici?.interceptors) {
+    const _require = createRequire(join(workerData.dirname, 'package.json'))
+    for (const key of ['Agent', 'Pool', 'Client']) {
+      if (config.undici.interceptors[key]) {
+        interceptors[key] = await loadInterceptors(_require, config.undici.interceptors[key])
+      }
+    }
+  }
+
+  const globalDispatcher = new Agent({
+    ...config.undici,
+    interceptors
+  })
+  setGlobalDispatcher(globalDispatcher)
+
   const runtime = new RuntimeApi(workerData.config, logger, loaderPort)
   runtime.startListening(parentPort)
 
@@ -77,7 +138,7 @@ function main () {
 
   let stopping = false
 
-  async function stop () {
+  stop = async function () {
     if (stopping) {
       return
     }
@@ -89,23 +150,7 @@ function main () {
       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)
-    })
-  })
 }
 
+// No need to catch this because there is the unhadledRejection handler on top.
 main()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -18,45 +18,48 @@
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
     "@fastify/express": "^2.3.0",
-    "c8": "^9.0.0",
+    "borp": "^0.9.0",
+    "c8": "^9.1.0",
     "execa": "^8.0.1",
     "express": "^4.18.2",
+    "fast-jwt": "^3.3.3",
     "glob": "^10.3.10",
     "pino-abstract-transport": "^1.1.0",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
-    "tsd": "^0.30.0",
-    "typescript": "^5.2.2",
-    "@platformatic/sql-graphql": "1.18.0",
-    "@platformatic/sql-mapper": "1.18.0"
+    "tsd": "^0.30.4",
+    "typescript": "^5.3.3",
+    "undici-oauth-interceptor": "^0.4.2",
+    "@platformatic/sql-graphql": "1.20.0",
+    "@platformatic/sql-mapper": "1.20.0"
   },
   "dependencies": {
-    "@fastify/error": "^3.4.0",
+    "@fastify/error": "^3.4.1",
     "@hapi/topo": "^6.0.2",
     "boring-name-generator": "^1.0.3",
     "close-with-grace": "^1.2.0",
     "commist": "^3.2.0",
     "debounce": "^2.0.0",
-    "desm": "^1.3.0",
+    "desm": "^1.3.1",
     "es-main": "^1.3.0",
     "fastest-levenshtein": "^1.0.16",
-    "fastify": "^4.24.1",
+    "fastify": "^4.26.0",
     "fastify-undici-dispatcher": "^0.5.0",
     "graphql": "^16.8.1",
     "help-me": "^5.0.0",
     "minimist": "^1.2.8",
-    "pino": "^8.16.0",
-    "pino-pretty": "^10.2.3",
-    "undici": "^6.2.0",
+    "pino": "^8.17.2",
+    "pino-pretty": "^10.3.1",
+    "undici": "^6.6.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/config": "1.18.0",
-    "@platformatic/db": "1.18.0",
-    "@platformatic/generators": "1.18.0",
-    "@platformatic/service": "1.18.0",
-    "@platformatic/telemetry": "1.18.0",
-    "@platformatic/utils": "1.18.0",
-    "@platformatic/composer": "1.18.0"
+    "@platformatic/composer": "1.20.0",
+    "@platformatic/config": "1.20.0",
+    "@platformatic/generators": "1.20.0",
+    "@platformatic/db": "1.20.0",
+    "@platformatic/service": "1.20.0",
+    "@platformatic/telemetry": "1.20.0",
+    "@platformatic/utils": "1.20.0"
   },
   "standard": {
     "ignore": [
@@ -65,8 +68,8 @@
     ]
   },
   "scripts": {
-    "test": "npm run lint && node ./test/runner.js && tsd",
-    "coverage": "npm run lint && c8 -x fixtures -x test node ./test/runner.js && tsd",
+    "test": "npm run lint && borp --concurrency=1 --timeout=120000 && tsd",
+    "coverage": "npm run lint && borp -X=fixtures -X=test -C --concurrency=1 --timeout=120000 && tsd",
     "lint": "standard | snazzy"
   }
 }