@platformatic/composer 2.41.0 → 2.43.0

package/index.js

@@ -3,6 +3,7 @@
 const deepEqual = require('fast-deep-equal')
 const ConfigManager = require('@platformatic/config')
 const { platformaticService, buildServer, buildStackable } = require('@platformatic/service')
+const { isKeyEnabled } = require('@platformatic/utils')
 
 const { schema } = require('./lib/schema')
 const serviceProxy = require('./lib/proxy')
@@ -25,7 +26,7 @@ async function platformaticComposer (app, opts) {
   let hasGraphqlServices, hasOpenapiServices
 
   // When no services are specified, get the list from the runtime.
-  await ensureServices(config)
+  await ensureServices(opts.context?.stackable?.serviceId, config)
 
   const { services } = configManager.current.composer
 
@@ -48,6 +49,15 @@ async function platformaticComposer (app, opts) {
     generatedComposedOpenAPI = await openApiGenerator(app, config.composer)
   }
 
+  if (isKeyEnabled('healthCheck', config.server)) {
+    if (typeof config.server.healthCheck !== 'object') {
+      config.server.healthCheck = {}
+    }
+
+    const stackable = opts.context.stackable
+    config.server.healthCheck.fn = stackable.isHealthy.bind(stackable)
+  }
+
   app.register(serviceProxy, { ...config.composer, context: opts.context })
   await app.register(platformaticService, { config: { ...config, openapi: false }, context: opts.context })
 

package/lib/proxy.js

@@ -1,8 +1,9 @@
 'use strict'
 
-const { getGlobalDispatcher } = require('undici')
 const httpProxy = require('@fastify/http-proxy')
 const fp = require('fastify-plugin')
+const { workerData } = require('node:worker_threads')
+const { getGlobalDispatcher } = require('undici')
 
 const kITC = Symbol.for('plt.runtime.itc')
 const kProxyRoute = Symbol('plt.composer.proxy.route')
@@ -14,12 +15,18 @@ async function resolveServiceProxyParameters (service) {
   const meta = (await globalThis[kITC]?.send('getServiceMeta', service.id))?.composer ?? { prefix: service.id }
 
   // If no prefix could be found, assume the service id
-  const prefix = (service.proxy?.prefix ?? meta.prefix ?? service.id).replace(/(\/$)/g, '')
-
+  let prefix = (service.proxy?.prefix ?? meta.prefix ?? service.id).replace(/(\/$)/g, '')
   let rewritePrefix = ''
   let internalRewriteLocationHeader = true
 
   if (meta.wantsAbsoluteUrls) {
+    const basePath = workerData.config.basePath
+
+    // Strip the runtime basepath from the prefix when it comes from the service meta
+    if (basePath && !service.proxy?.prefix && prefix.startsWith(basePath)) {
+      prefix = prefix.substring(basePath.length)
+    }
+
     // The rewritePrefix purposely ignores service.proxy?.prefix to let
     // the service always being able to configure their value
     rewritePrefix = meta.prefix ?? service.id
@@ -138,7 +145,14 @@ module.exports = fp(async function (app, opts) {
       })
     }
 
-    const toReplace = url ? new RegExp(url.replace(/127\.0\.0\.1/, 'localhost').replace(/\[::\]/, 'localhost').replace('http://', 'https?://')) : null
+    const toReplace = url
+      ? new RegExp(
+        url
+          .replace(/127\.0\.0\.1/, 'localhost')
+          .replace(/\[::\]/, 'localhost')
+          .replace('http://', 'https?://')
+      )
+      : null
 
     const proxyOptions = {
       websocket: true,
@@ -153,7 +167,7 @@ module.exports = fp(async function (app, opts) {
       },
       internalRewriteLocationHeader: false,
       replyOptions: {
-        rewriteHeaders: (headers) => {
+        rewriteHeaders: headers => {
           let location = headers.location
           if (location) {
             if (toReplace) {
@@ -186,7 +200,7 @@ module.exports = fp(async function (app, opts) {
             ...telemetryHeaders,
             'x-forwarded-for': request.ip,
             'x-forwarded-host': request.host,
-            'x-forwarded-proto': request.protocol,
+            'x-forwarded-proto': request.protocol
           }
 
           request.log.trace({ headers }, 'rewritten headers before proxying')
@@ -209,6 +223,7 @@ module.exports = fp(async function (app, opts) {
     if (host) {
       await app.register(httpProxy, {
         ...proxyOptions,
+        prefix: '/',
         constraints: { host }
       })
 

package/lib/stackable.js

@@ -4,11 +4,12 @@ const { ServiceStackable } = require('@platformatic/service')
 
 const kITC = Symbol.for('plt.runtime.itc')
 
-async function ensureServices (config) {
+async function ensureServices (composerId, config) {
   if (config.composer?.services?.length) {
     return
   }
 
+  composerId ??= globalThis.platformatic?.serviceId
   config.composer ??= {}
   config.composer.services ??= []
 
@@ -17,16 +18,17 @@ async function ensureServices (config) {
 
   if (services) {
     config.composer.services = services
-      .filter(id => id !== globalThis.platformatic.serviceId) // Remove ourself
+      .filter(id => id !== composerId) // Remove ourself
       .map(id => ({ id, proxy: { prefix: `/${id}` } }))
   }
 }
 
 class ComposerStackable extends ServiceStackable {
   #meta
+  #dependencies
 
   async getBootstrapDependencies () {
-    await ensureServices(this.configManager.current)
+    await ensureServices(this.serviceId, this.configManager.current)
 
     // We do not call init() on purpose, as we don't want to load the app just yet.
 
@@ -43,23 +45,10 @@ class ComposerStackable extends ServiceStackable {
       )
     }
 
+    this.#dependencies = dependencies
     return dependencies
   }
 
-  async #parseDependency (id, urlString) {
-    let url = this.#getServiceUrl(id)
-
-    if (urlString) {
-      const remoteUrl = await this.configManager.replaceEnv(urlString)
-
-      if (remoteUrl) {
-        url = remoteUrl
-      }
-    }
-
-    return { id, url, local: url.endsWith('.plt.local') }
-  }
-
   registerMeta (meta) {
     this.#meta = Object.assign(this.#meta ?? {}, meta)
   }
@@ -74,8 +63,36 @@ class ComposerStackable extends ServiceStackable {
     }
   }
 
-  #getServiceUrl (id) {
-    return `http://${id}.plt.local`
+  async isHealthy () {
+    // Still booting, assume healthy
+    if (!this.#dependencies) {
+      return true
+    }
+
+    const composedServices = this.#dependencies.map(dep => dep.id)
+    const workers = await globalThis[kITC].send('getWorkers')
+
+    for (const worker of Object.values(workers)) {
+      if (composedServices.includes(worker.service) && !worker.status.startsWith('start')) {
+        return false
+      }
+    }
+
+    return true
+  }
+
+  async #parseDependency (id, urlString) {
+    let url = `http://${id}.plt.local`
+
+    if (urlString) {
+      const remoteUrl = await this.configManager.replaceEnv(urlString)
+
+      if (remoteUrl) {
+        url = remoteUrl
+      }
+    }
+
+    return { id, url, local: url.endsWith('.plt.local') }
   }
 }
 module.exports = { ComposerStackable, ensureServices }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/composer",
-  "version": "2.41.0",
+  "version": "2.43.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -31,9 +31,9 @@
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/client": "2.41.0",
-    "@platformatic/config": "2.41.0",
-    "@platformatic/db": "2.41.0"
+    "@platformatic/client": "2.43.0",
+    "@platformatic/db": "2.43.0",
+    "@platformatic/config": "2.43.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -67,12 +67,12 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/config": "2.41.0",
-    "@platformatic/scalar-theme": "2.41.0",
-    "@platformatic/generators": "2.41.0",
-    "@platformatic/utils": "^2.41.0",
-    "@platformatic/telemetry": "2.41.0",
-    "@platformatic/service": "2.41.0"
+    "@platformatic/config": "2.43.0",
+    "@platformatic/generators": "2.43.0",
+    "@platformatic/scalar-theme": "2.43.0",
+    "@platformatic/telemetry": "2.43.0",
+    "@platformatic/service": "2.43.0",
+    "@platformatic/utils": "^2.43.0"
   },
   "scripts": {
     "test": "pnpm run lint && borp -T --timeout=300000 -c 1 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.41.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.43.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Composer",
   "type": "object",