@platformatic/composer 2.71.0-alpha.1 → 2.71.1-alpha.0

package/lib/metrics.js

@@ -0,0 +1,12 @@
+export function initMetrics (prometheus) {
+  if (!prometheus?.registry || !prometheus?.client) return null
+  const { client, registry } = prometheus
+
+  return {
+    activeWsConnections: new client.Gauge({
+      name: 'active_ws_composer_connections',
+      help: 'Active Websocket composer connections in "@platformatic/composer"',
+      registers: [registry]
+    })
+  }
+}

package/lib/proxy.js

@@ -5,6 +5,7 @@ const { ensureLoggableError } = require('@platformatic/utils')
 const fp = require('fastify-plugin')
 const { workerData } = require('node:worker_threads')
 const { getGlobalDispatcher } = require('undici')
+const { initMetrics } = require('./metrics')
 
 const kITC = Symbol.for('plt.runtime.itc')
 const kProxyRoute = Symbol('plt.composer.proxy.route')
@@ -45,13 +46,15 @@ async function resolveServiceProxyParameters (service) {
     prefix,
     rewritePrefix,
     internalRewriteLocationHeader,
-    needsRootRedirect: meta.needsRootRedirect,
+    needsRootTrailingSlash: meta.needsRootTrailingSlash,
     needsRefererBasedRedirect: meta.needsRefererBasedRedirect,
     upstream: service.proxy?.upstream,
     ws: service.proxy?.ws
   }
 }
 
+let metrics
+
 module.exports = fp(async function (app, opts) {
   const meta = { proxies: {} }
   const hostnameLessProxies = []
@@ -72,7 +75,7 @@ module.exports = fp(async function (app, opts) {
       url,
       rewritePrefix,
       internalRewriteLocationHeader,
-      needsRootRedirect,
+      needsRootTrailingSlash,
       needsRefererBasedRedirect,
       ws
     } = parameters
@@ -81,34 +84,16 @@ 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 {
-          done()
+    let preRewrite = null
+
+    if (needsRootTrailingSlash) {
+      preRewrite = function preRewrite (url) {
+        if (url === basePath) {
+          url += '/'
         }
-      })
+
+        return url
+      }
     }
 
     /*
@@ -118,7 +103,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()
@@ -163,17 +148,28 @@ module.exports = fp(async function (app, opts) {
       )
       : null
 
+    if (!metrics) {
+      metrics = initMetrics(globalThis.platformatic?.prometheus)
+    }
+
     const proxyOptions = {
-      websocket: true,
       prefix,
       rewritePrefix,
       upstream: service.proxy?.upstream ?? origin,
+      preRewrite,
 
+      websocket: true,
       wsUpstream: ws?.upstream ?? url ?? origin,
       wsReconnect: ws?.reconnect,
       wsHooks: {
-        onConnect: ws?.hooks?.onConnect,
-        onDisconnect: ws?.hooks?.onDisconnect,
+        onConnect: (...args) => {
+          metrics?.activeWsConnections?.inc()
+          ws?.hooks?.onConnect(...args)
+        },
+        onDisconnect: (...args) => {
+          metrics?.activeWsConnections?.dec()
+          ws?.hooks?.onDisconnect(...args)
+        },
         onReconnect: ws?.hooks?.onReconnect,
         onPong: ws?.hooks?.onPong,
         onIncomingMessage: ws?.hooks?.onIncomingMessage,
@@ -185,6 +181,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.71.0-alpha.1",
+  "version": "2.71.1-alpha.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -25,6 +25,7 @@
     "neostandard": "^0.12.0",
     "openapi-schema-validator": "^12.1.3",
     "pino-test": "^1.0.1",
+    "prom-client": "^15.1.2",
     "self-cert": "^2.0.0",
     "single-user-cache": "^1.0.1",
     "split2": "^4.2.0",
@@ -32,20 +33,20 @@
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/client": "2.71.0-alpha.1",
-    "@platformatic/config": "2.71.0-alpha.1",
-    "@platformatic/db": "2.71.0-alpha.1"
+    "@platformatic/client": "2.71.1-alpha.0",
+    "@platformatic/config": "2.71.1-alpha.0",
+    "@platformatic/db": "2.71.1-alpha.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
-    "@fastify/http-proxy": "^11.1.1",
+    "@fastify/http-proxy": "^11.3.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.32.4",
     "ajv": "^8.12.0",
     "commist": "^3.2.0",
     "console-table-printer": "^2.12.0",
@@ -68,12 +69,12 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/config": "2.71.0-alpha.1",
-    "@platformatic/generators": "2.71.0-alpha.1",
-    "@platformatic/scalar-theme": "2.71.0-alpha.1",
-    "@platformatic/telemetry": "2.71.0-alpha.1",
-    "@platformatic/utils": "^2.71.0-alpha.1",
-    "@platformatic/service": "2.71.0-alpha.1"
+    "@platformatic/generators": "2.71.1-alpha.0",
+    "@platformatic/scalar-theme": "2.71.1-alpha.0",
+    "@platformatic/utils": "^2.71.1-alpha.0",
+    "@platformatic/service": "2.71.1-alpha.0",
+    "@platformatic/telemetry": "2.71.1-alpha.0",
+    "@platformatic/config": "2.71.1-alpha.0"
   },
   "scripts": {
     "test": "pnpm run lint && borp -T --timeout=1200000 -c 1 && tsd",

package/schema.json

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