@platformatic/gateway 3.43.0 → 3.45.0

package/config.d.ts

@@ -252,6 +252,7 @@ export interface PlatformaticGatewayConfig {
             routes?: string[];
             upstream?: string;
             prefix?: string;
+            rewritePrefix?: string;
             hostname?: string;
             custom?: {
               path: string;

package/lib/proxy.js

@@ -2,6 +2,7 @@ import httpProxy from '@fastify/http-proxy'
 import { ensureLoggableError, loadModule } from '@platformatic/foundation'
 import fp from 'fastify-plugin'
 import { createRequire } from 'node:module'
+import { resolve } from 'node:path'
 import { workerData } from 'node:worker_threads'
 import { getGlobalDispatcher } from 'undici'
 import { initMetrics } from './metrics.js'
@@ -19,7 +20,7 @@ function isLocalApplication (application) {
   return application.origin.endsWith('.plt.local')
 }
 
-async function resolveApplicationProxyParameters (application) {
+async function resolveApplicationProxyParameters (application, root) {
   // Get meta information from the application, if any, to eventually hook up to a TCP port
   // Only fetch meta for local applications - remote applications won't be in the runtime
   let allMeta = {}
@@ -30,7 +31,7 @@ async function resolveApplicationProxyParameters (application) {
 
   // If no prefix could be found, assume the application id
   let prefix = (application.proxy?.prefix ?? meta.prefix ?? application.id).replace(/(\/$)/g, '')
-  let rewritePrefix = ''
+  let rewritePrefix = application.proxy?.rewritePrefix ?? ''
   let internalRewriteLocationHeader = true
 
   if (meta.wantsAbsoluteUrls) {
@@ -43,17 +44,21 @@ async function resolveApplicationProxyParameters (application) {
 
     // The rewritePrefix purposely ignores application.proxy?.prefix to let
     // the application always being able to configure their value
-    rewritePrefix = meta.prefix ?? application.id
-    internalRewriteLocationHeader = false
+    if (!application.proxy?.rewritePrefix) {
+      rewritePrefix = meta.prefix ?? application.id
+      internalRewriteLocationHeader = false
+    }
   }
 
+  const require = createRequire(import.meta.filename)
+
   if (application.proxy?.custom) {
-    const custom = await loadModule(createRequire(import.meta.filename), application.proxy.custom.path)
+    const custom = await loadModule(require, resolve(root, application.proxy.custom.path))
     application.proxy.custom = custom
   }
 
   if (application.proxy?.ws?.hooks) {
-    const hooks = await loadModule(createRequire(import.meta.filename), application.proxy.ws.hooks.path)
+    const hooks = await loadModule(require, resolve(root, application.proxy.ws.hooks.path))
     application.proxy.ws.hooks = hooks
   }
 
@@ -77,6 +82,7 @@ let metrics
 async function proxyPlugin (app, opts) {
   const meta = { proxies: {} }
   const hostnameLessProxies = []
+  const root = opts.capability?.root ?? import.meta.dirname
 
   for (const application of opts.applications) {
     if (!application.proxy) {
@@ -87,7 +93,7 @@ async function proxyPlugin (app, opts) {
       }
     }
 
-    const parameters = await resolveApplicationProxyParameters(application)
+    const parameters = await resolveApplicationProxyParameters(application, root)
     const {
       prefix,
       origin,
@@ -181,7 +187,7 @@ async function proxyPlugin (app, opts) {
       prefix,
       rewritePrefix,
       upstream,
-      preRewrite,
+      preRewrite: application.proxy?.custom?.preRewrite ?? preRewrite,
       preValidation: application.proxy?.custom?.preValidation,
 
       websocket: true,

package/lib/schema.js

@@ -149,6 +149,7 @@ export const gateway = {
                   },
                   upstream: { type: 'string' },
                   prefix: { type: 'string' },
+                  rewritePrefix: { type: 'string' },
                   hostname: { type: 'string' },
                   custom: {
                     type: 'object',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/gateway",
-  "version": "3.43.0",
+  "version": "3.45.0",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -32,7 +32,7 @@
     "typescript": "^5.5.4",
     "why-is-node-running": "2",
     "ws": "^8.16.0",
-    "@platformatic/db": "3.43.0"
+    "@platformatic/db": "3.45.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -63,11 +63,11 @@
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^7.0.0",
-    "@platformatic/basic": "3.43.0",
-    "@platformatic/scalar-theme": "3.43.0",
-    "@platformatic/telemetry": "3.43.0",
-    "@platformatic/service": "3.43.0",
-    "@platformatic/foundation": "^3.43.0"
+    "@platformatic/basic": "3.45.0",
+    "@platformatic/foundation": "^3.45.0",
+    "@platformatic/scalar-theme": "3.45.0",
+    "@platformatic/service": "3.45.0",
+    "@platformatic/telemetry": "3.45.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/gateway/3.43.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/gateway/3.45.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Gateway Config",
   "type": "object",
@@ -837,6 +837,9 @@
                       "prefix": {
                         "type": "string"
                       },
+                      "rewritePrefix": {
+                        "type": "string"
+                      },
                       "hostname": {
                         "type": "string"
                       },