@platformatic/composer 2.27.1 → 2.28.0

package/config.d.ts

@@ -230,6 +230,7 @@ export interface PlatformaticComposer {
         | false
         | {
             prefix?: string;
+            hostname?: string;
           };
     }[];
     openapi?: {

package/index.js

@@ -12,6 +12,7 @@ const composerHook = require('./lib/composer-hook')
 const openapiGenerator = require('./lib/openapi-generator')
 const graphqlGenerator = require('./lib/graphql-generator')
 const { isSameGraphqlSchema, fetchGraphqlSubgraphs } = require('./lib/graphql-fetch')
+const notHostConstraints = require('./lib/proxy/not-host-constraints')
 const { isFetchable } = require('./lib/utils')
 const { ComposerStackable, ensureServices } = require('./lib/stackable')
 const errors = require('./lib/errors')
@@ -184,6 +185,13 @@ async function watchServices (app, opts) {
 }
 
 async function buildComposerStackable (options) {
+  options.context ??= {}
+  options.context.fastifyOptions ??= {
+    constraints: {
+      notHost: notHostConstraints
+    }
+  }
+
   return buildStackable(options, platformaticComposer, ComposerStackable)
 }
 

package/lib/proxy/not-host-constraints.js

@@ -0,0 +1,33 @@
+'use strict'
+
+module.exports = {
+  name: 'notHost',
+  storage: () => {
+    const store = []
+
+    return {
+      get (host) {
+        if (typeof host === 'string') {
+          for (const [hosts, value] of store) {
+            if (!hosts.includes(host)) {
+              return value
+            }
+          }
+        }
+
+        return null
+      },
+      set: (hosts, value) => {
+        store.push([hosts, value])
+      },
+      store
+    }
+  },
+  deriveConstraint: req => {
+    return req.headers.host || req.headers[':authority']
+  },
+  mustMatchWhenDerived: false,
+  validate () {
+    return true
+  }
+}

package/lib/proxy.js

@@ -36,6 +36,7 @@ async function resolveServiceProxyParameters (service) {
 
 module.exports = fp(async function (app, opts) {
   const meta = { proxies: {} }
+  const allDomains = opts.services.map(s => s.proxy?.hostname).filter(Boolean)
 
   for (const service of opts.services) {
     if (!service.proxy) {
@@ -134,7 +135,7 @@ module.exports = fp(async function (app, opts) {
       })
     }
 
-    await app.register(httpProxy, {
+    const proxyOptions = {
       websocket: true,
       prefix,
       rewritePrefix,
@@ -173,7 +174,24 @@ module.exports = fp(async function (app, opts) {
           reply.send(res.stream)
         }
       }
-    })
+    }
+
+    const host = service.proxy?.hostname
+    const notHost = allDomains.filter(d => d !== host)
+
+    if (host) {
+      await app.register(httpProxy, {
+        ...proxyOptions,
+        constraints: { host }
+      })
+
+      await app.register(httpProxy, {
+        ...proxyOptions,
+        ...(notHost.length ? { constraints: { notHost } } : {})
+      })
+    } else {
+      await app.register(httpProxy, proxyOptions)
+    }
   }
 
   opts.context?.stackable?.registerMeta(meta)

package/lib/schema.js

@@ -126,7 +126,8 @@ const composer = {
               {
                 type: 'object',
                 properties: {
-                  prefix: { type: 'string' }
+                  prefix: { type: 'string' },
+                  hostname: { type: 'string' }
                 },
                 required: [],
                 additionalProperties: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/composer",
-  "version": "2.27.1",
+  "version": "2.28.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -30,9 +30,9 @@
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/client": "2.27.1",
-    "@platformatic/config": "2.27.1",
-    "@platformatic/db": "2.27.1"
+    "@platformatic/client": "2.28.0",
+    "@platformatic/config": "2.28.0",
+    "@platformatic/db": "2.28.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -48,7 +48,7 @@
     "console-table-printer": "^2.12.0",
     "desm": "^1.3.1",
     "es-main": "^1.3.0",
-    "execa": "^8.0.1",
+    "execa": "^9.0.0",
     "fast-deep-equal": "^3.1.3",
     "fastify": "^5.0.0",
     "@platformatic/fastify-openapi-glue": "^5.0.0",
@@ -61,17 +61,17 @@
     "my-ua-parser": "^2.0.2",
     "nunjucks": "^3.2.4",
     "ora": "^6.3.1",
-    "pino": "^8.19.0",
+    "pino": "^9.0.0",
     "pino-pretty": "^13.0.0",
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/scalar-theme": "2.27.1",
-    "@platformatic/generators": "2.27.1",
-    "@platformatic/service": "2.27.1",
-    "@platformatic/telemetry": "2.27.1",
-    "@platformatic/utils": "^2.27.1",
-    "@platformatic/config": "2.27.1"
+    "@platformatic/config": "2.28.0",
+    "@platformatic/scalar-theme": "2.28.0",
+    "@platformatic/service": "2.28.0",
+    "@platformatic/utils": "^2.28.0",
+    "@platformatic/telemetry": "2.28.0",
+    "@platformatic/generators": "2.28.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.27.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.28.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Composer",
   "type": "object",
@@ -727,6 +727,9 @@
                     "properties": {
                       "prefix": {
                         "type": "string"
+                      },
+                      "hostname": {
+                        "type": "string"
                       }
                     },
                     "required": [],