@platformatic/composer 2.35.1 → 2.36.2

package/lib/proxy.js

@@ -5,6 +5,9 @@ const httpProxy = require('@fastify/http-proxy')
 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
@@ -128,13 +131,15 @@ module.exports = fp(async function (app, opts) {
     // Do not show proxied services in Swagger
     if (!service.openapi) {
       app.addHook('onRoute', routeOptions => {
-        if (routeOptions.url.startsWith(basePath)) {
+        if (routeOptions.config?.[kProxyRoute] && routeOptions.url.startsWith(basePath)) {
           routeOptions.schema ??= {}
           routeOptions.schema.hide = true
         }
       })
     }
 
+    const toReplace = url?.replace(/127\.0\.0\.1/, 'localhost').replace(/\[::\]/, 'localhost')
+
     const proxyOptions = {
       websocket: true,
       prefix,
@@ -143,8 +148,22 @@ module.exports = fp(async function (app, opts) {
       wsUpstream: url ?? origin,
       undici: dispatcher,
       destroyAgent: false,
-      internalRewriteLocationHeader,
+      config: {
+        [kProxyRoute]: true
+      },
+      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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/composer",
-  "version": "2.35.1",
+  "version": "2.36.2",
   "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.35.1",
-    "@platformatic/db": "2.35.1",
-    "@platformatic/config": "2.35.1"
+    "@platformatic/config": "2.36.2",
+    "@platformatic/client": "2.36.2",
+    "@platformatic/db": "2.36.2"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -56,7 +56,7 @@
     "graphql": "^16.8.1",
     "help-me": "^5.0.0",
     "json-schema-traverse": "^1.0.0",
-    "mercurius": "^15.0.0",
+    "mercurius": "^16.0.0",
     "minimist": "^1.2.8",
     "my-ua-parser": "^2.0.2",
     "nunjucks": "^3.2.4",
@@ -66,12 +66,12 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/generators": "2.35.1",
-    "@platformatic/config": "2.35.1",
-    "@platformatic/service": "2.35.1",
-    "@platformatic/telemetry": "2.35.1",
-    "@platformatic/utils": "^2.35.1",
-    "@platformatic/scalar-theme": "2.35.1"
+    "@platformatic/config": "2.36.2",
+    "@platformatic/generators": "2.36.2",
+    "@platformatic/service": "2.36.2",
+    "@platformatic/telemetry": "2.36.2",
+    "@platformatic/utils": "^2.36.2",
+    "@platformatic/scalar-theme": "2.36.2"
   },
   "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.35.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.36.2.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Composer",
   "type": "object",