@platformatic/composer 2.36.1 → 2.37.0

package/lib/proxy.js

@@ -7,6 +7,8 @@ const fp = require('fastify-plugin')
 const kITC = Symbol.for('plt.runtime.itc')
 const kProxyRoute = Symbol('plt.composer.proxy.route')
 
+const urlPattern = /^https?:\/\//
+
 async function resolveServiceProxyParameters (service) {
   // Get meta information from the service, if any, to eventually hook up to a TCP port
   const meta = (await globalThis[kITC]?.send('getServiceMeta', service.id))?.composer ?? { prefix: service.id }
@@ -136,6 +138,8 @@ module.exports = fp(async function (app, opts) {
       })
     }
 
+    const toReplace = url?.replace(/127\.0\.0\.1/, 'localhost').replace(/\[::\]/, 'localhost')
+
     const proxyOptions = {
       websocket: true,
       prefix,
@@ -147,8 +151,19 @@ module.exports = fp(async function (app, opts) {
       config: {
         [kProxyRoute]: true
       },
-      internalRewriteLocationHeader,
+      internalRewriteLocationHeader: false,
       replyOptions: {
+        rewriteHeaders: (headers) => {
+          let location = headers.location
+          if (location) {
+            location = location.replace(toReplace, '')
+            if (location && !urlPattern.test(location) && internalRewriteLocationHeader) {
+              location = location.replace(rewritePrefix, prefix)
+            }
+            headers.location = location
+          }
+          return headers
+        },
         rewriteRequestHeaders: (request, headers) => {
           const targetUrl = `${origin}${request.url}`
           const context = request.span?.context
@@ -168,7 +183,8 @@ module.exports = fp(async function (app, opts) {
             ...headers,
             ...telemetryHeaders,
             'x-forwarded-for': request.ip,
-            'x-forwarded-host': request.host
+            'x-forwarded-host': request.host,
+            'x-forwarded-proto': request.protocol,
           }
 
           return headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/composer",
-  "version": "2.36.1",
+  "version": "2.37.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -24,15 +24,16 @@
     "json-schema-to-typescript": "^15.0.0",
     "neostandard": "^0.12.0",
     "openapi-schema-validator": "^12.1.3",
+    "self-cert": "^2.0.0",
     "single-user-cache": "^1.0.1",
     "split2": "^4.2.0",
     "tsd": "^0.31.0",
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/client": "2.36.1",
-    "@platformatic/config": "2.36.1",
-    "@platformatic/db": "2.36.1"
+    "@platformatic/client": "2.37.0",
+    "@platformatic/db": "2.37.0",
+    "@platformatic/config": "2.37.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -41,6 +42,7 @@
     "@fastify/static": "^8.0.0",
     "@fastify/swagger": "^9.0.0",
     "@fastify/view": "^10.0.1",
+    "@platformatic/fastify-openapi-glue": "^5.0.0",
     "@platformatic/graphql-composer": "^0.10.0",
     "@scalar/fastify-api-reference": "^1.19.5",
     "ajv": "^8.12.0",
@@ -51,7 +53,6 @@
     "execa": "^9.0.0",
     "fast-deep-equal": "^3.1.3",
     "fastify": "^5.0.0",
-    "@platformatic/fastify-openapi-glue": "^5.0.0",
     "fastify-plugin": "^5.0.0",
     "graphql": "^16.8.1",
     "help-me": "^5.0.0",
@@ -66,12 +67,12 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/config": "2.36.1",
-    "@platformatic/generators": "2.36.1",
-    "@platformatic/scalar-theme": "2.36.1",
-    "@platformatic/telemetry": "2.36.1",
-    "@platformatic/utils": "^2.36.1",
-    "@platformatic/service": "2.36.1"
+    "@platformatic/config": "2.37.0",
+    "@platformatic/generators": "2.37.0",
+    "@platformatic/scalar-theme": "2.37.0",
+    "@platformatic/utils": "^2.37.0",
+    "@platformatic/telemetry": "2.37.0",
+    "@platformatic/service": "2.37.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.36.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.37.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Composer",
   "type": "object",