@platformatic/composer 2.70.0 → 2.70.1

package/config.d.ts

@@ -696,6 +696,7 @@ export interface PlatformaticComposer {
       [k: string]: unknown;
     };
     serviceTimeout?: number | string;
+    messagingTimeout?: number | string;
     env?: {
       [k: string]: string;
     };

package/lib/proxy.js

@@ -45,7 +45,7 @@ async function resolveServiceProxyParameters (service) {
     prefix,
     rewritePrefix,
     internalRewriteLocationHeader,
-    needsRootRedirect: meta.needsRootRedirect,
+    needsRootTrailingSlash: meta.needsRootTrailingSlash,
     needsRefererBasedRedirect: meta.needsRefererBasedRedirect,
     upstream: service.proxy?.upstream,
     ws: service.proxy?.ws
@@ -72,7 +72,7 @@ module.exports = fp(async function (app, opts) {
       url,
       rewritePrefix,
       internalRewriteLocationHeader,
-      needsRootRedirect,
+      needsRootTrailingSlash,
       needsRefererBasedRedirect,
       ws
     } = parameters
@@ -81,33 +81,15 @@ module.exports = fp(async function (app, opts) {
     const basePath = `/${prefix ?? ''}`.replaceAll(/\/+/g, '/').replace(/\/$/, '')
     const dispatcher = getGlobalDispatcher()
 
-    if (needsRootRedirect) {
-      app.addHook('preHandler', (req, reply, done) => {
-        if (req.url === basePath) {
-          app.inject(
-            {
-              method: req.method,
-              url: `${basePath}/`,
-              headers: req.headers,
-              payload: req.body
-            },
-            (err, result) => {
-              if (err) {
-                done(err)
-                return
-              }
-
-              const replyHeaders = result.headers
-              delete replyHeaders['content-length']
-              delete replyHeaders['transfer-encoding']
-
-              reply.code(result.statusCode).headers(replyHeaders).send(result.rawPayload)
-              done()
-            }
-          )
-        } else {
+    if (needsRootTrailingSlash) {
+      app.addHook('preHandler', function rootTrailingSlashPreHandler (req, reply, done) {
+        if (req.url !== basePath) {
           done()
+          return
         }
+
+        const { url, options } = reply.fromParameters(req.url + '/', req.params, prefix)
+        reply.from(url.replace(/\/+$/, '/'), options)
       })
     }
 
@@ -118,7 +100,7 @@ module.exports = fp(async function (app, opts) {
       from the Referer header.
     */
     if (needsRefererBasedRedirect) {
-      app.addHook('preHandler', (req, reply, done) => {
+      app.addHook('preHandler', function refererBasedRedirectPreHandler (req, reply, done) {
         // If the URL is already targeted to the service, do nothing
         if (req.url.startsWith(basePath)) {
           done()
@@ -164,11 +146,11 @@ module.exports = fp(async function (app, opts) {
       : null
 
     const proxyOptions = {
-      websocket: true,
       prefix,
       rewritePrefix,
       upstream: service.proxy?.upstream ?? origin,
 
+      websocket: true,
       wsUpstream: ws?.upstream ?? url ?? origin,
       wsReconnect: ws?.reconnect,
       wsHooks: {
@@ -185,6 +167,7 @@ module.exports = fp(async function (app, opts) {
       config: {
         [kProxyRoute]: true
       },
+
       internalRewriteLocationHeader: false,
       replyOptions: {
         rewriteHeaders: headers => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/composer",
-  "version": "2.70.0",
+  "version": "2.70.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -32,20 +32,20 @@
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/db": "2.70.0",
-    "@platformatic/client": "2.70.0",
-    "@platformatic/config": "2.70.0"
+    "@platformatic/config": "2.70.1",
+    "@platformatic/client": "2.70.1",
+    "@platformatic/db": "2.70.1"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
-    "@fastify/http-proxy": "^11.1.1",
+    "@fastify/http-proxy": "^11.2.0",
     "@fastify/reply-from": "^12.0.0",
     "@fastify/static": "^8.0.0",
     "@fastify/swagger": "^9.0.0",
     "@fastify/view": "^10.0.1",
     "@platformatic/fastify-openapi-glue": "^5.1.0",
     "@platformatic/graphql-composer": "^0.10.0",
-    "@scalar/fastify-api-reference": "1.31.8",
+    "@scalar/fastify-api-reference": "1.31.14",
     "ajv": "^8.12.0",
     "commist": "^3.2.0",
     "console-table-printer": "^2.12.0",
@@ -68,15 +68,15 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/config": "2.70.0",
-    "@platformatic/generators": "2.70.0",
-    "@platformatic/scalar-theme": "2.70.0",
-    "@platformatic/service": "2.70.0",
-    "@platformatic/telemetry": "2.70.0",
-    "@platformatic/utils": "^2.70.0"
+    "@platformatic/config": "2.70.1",
+    "@platformatic/scalar-theme": "2.70.1",
+    "@platformatic/service": "2.70.1",
+    "@platformatic/telemetry": "2.70.1",
+    "@platformatic/generators": "2.70.1",
+    "@platformatic/utils": "^2.70.1"
   },
   "scripts": {
-    "test": "pnpm run lint && borp -T --timeout=300000 -c 1 && tsd",
+    "test": "pnpm run lint && borp -T --timeout=1200000 -c 1 && tsd",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
     "build": "pnpm run gen-schema && pnpm run gen-types",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.70.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/composer/2.70.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Composer",
   "type": "object",
@@ -2317,6 +2317,18 @@
           ],
           "default": 300000
         },
+        "messagingTimeout": {
+          "anyOf": [
+            {
+              "type": "number",
+              "minimum": 1
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "default": 30000
+        },
         "env": {
           "type": "object",
           "additionalProperties": {