@platformatic/basic 2.6.0 → 2.7.0

package/lib/base.js

@@ -3,6 +3,7 @@ import { collectMetrics } from '@platformatic/metrics'
 import { parseCommandString } from 'execa'
 import { spawn } from 'node:child_process'
 import { once } from 'node:events'
+import { workerData } from 'node:worker_threads'
 import { existsSync } from 'node:fs'
 import { platform } from 'node:os'
 import { pathToFileURL } from 'node:url'
@@ -34,6 +35,7 @@ export class BaseStackable {
     this.startHttpTimer = null
     this.endHttpTimer = null
     this.clientWs = null
+    this.runtimeConfig = workerData?.config ?? null
 
     // Setup the logger
     const pinoOptions = {
@@ -134,20 +136,12 @@ export class BaseStackable {
 
     this.logger.debug(`Executing "${command}" ...`)
 
+    const context = await this.#getChildManagerContext(basePath)
     this.childManager = new ChildManager({
       logger: this.logger,
       loader,
       scripts,
-      context: {
-        id: this.id,
-        // Always use URL to avoid serialization problem in Windows
-        root: pathToFileURL(this.root).toString(),
-        basePath,
-        logLevel: this.logger.level,
-        /* c8 ignore next 2 */
-        port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
-        host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true
-      }
+      context
     })
 
     try {
@@ -188,20 +182,12 @@ export class BaseStackable {
   async startWithCommand (command, loader) {
     const config = this.configManager.current
     const basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
+
+    const context = await this.#getChildManagerContext(basePath)
     this.childManager = new ChildManager({
       logger: this.logger,
       loader,
-      context: {
-        id: this.id,
-        // Always use URL to avoid serialization problem in Windows
-        root: pathToFileURL(this.root).toString(),
-        basePath,
-        logLevel: this.logger.level,
-        /* c8 ignore next 2 */
-        port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
-        host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
-        telemetry: this.telemetryConfig
-      }
+      context
     })
 
     this.childManager.on('config', config => {
@@ -312,4 +298,31 @@ export class BaseStackable {
       ? await this.metricsRegistry.getMetricsAsJSON()
       : await this.metricsRegistry.metrics()
   }
+
+  getMeta () {
+    return {
+      composer: {
+        wantsAbsoluteUrls: false
+      }
+    }
+  }
+
+  async #getChildManagerContext (basePath) {
+    const meta = await this.getMeta()
+
+    return {
+      id: this.id,
+      // Always use URL to avoid serialization problem in Windows
+      root: pathToFileURL(this.root).toString(),
+      basePath,
+      logLevel: this.logger.level,
+      isEntrypoint: this.isEntrypoint,
+      runtimeBasePath: this.runtimeConfig?.basePath ?? null,
+      wantsAbsoluteUrls: meta.composer?.wantsAbsoluteUrls ?? false,
+      /* c8 ignore next 2 */
+      port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
+      host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
+      telemetry: this.telemetryConfig
+    }
+  }
 }

package/lib/worker/child-process.js

@@ -16,6 +16,8 @@ import { WebSocket } from 'ws'
 import { exitCodes } from '../errors.js'
 import { importFile } from '../utils.js'
 import { getSocketPath, isWindows } from './child-manager.js'
+import diagnosticChannel from 'node:diagnostics_channel'
+import { ServerResponse } from 'node:http'
 
 function createInterceptor (itc) {
   return function (dispatch) {
@@ -248,6 +250,11 @@ export class ChildProcess extends ITC {
     }
 
     tracingChannel('net.server.listen').subscribe(subscribers)
+
+    const { isEntrypoint, runtimeBasePath, wantsAbsoluteUrls } = globalThis.platformatic
+    if (isEntrypoint && runtimeBasePath && !wantsAbsoluteUrls) {
+      stripBasePath(runtimeBasePath)
+    }
   }
 
   #setupInterceptors () {
@@ -270,6 +277,56 @@ export class ChildProcess extends ITC {
   }
 }
 
+function stripBasePath (basePath) {
+  const kBasePath = Symbol('kBasePath')
+
+  diagnosticChannel.subscribe('http.server.request.start', ({ request, response }) => {
+    if (request.url.startsWith(basePath)) {
+      request.url = request.url.slice(basePath.length)
+
+      if (request.url.charAt(0) !== '/') {
+        request.url = '/' + request.url
+      }
+
+      response[kBasePath] = basePath
+    }
+  })
+
+  const originWriteHead = ServerResponse.prototype.writeHead
+  const originSetHeader = ServerResponse.prototype.setHeader
+
+  ServerResponse.prototype.writeHead = function (statusCode, statusMessage, headers) {
+    if (this[kBasePath] !== undefined) {
+      if (headers === undefined && typeof statusMessage === 'object') {
+        headers = statusMessage
+        statusMessage = undefined
+      }
+
+      if (headers) {
+        for (const key in headers) {
+          if (
+            key.toLowerCase() === 'location' &&
+            !headers[key].startsWith(basePath)
+          ) {
+            headers[key] = basePath + headers[key]
+          }
+        }
+      }
+    }
+
+    return originWriteHead.call(this, statusCode, statusMessage, headers)
+  }
+
+  ServerResponse.prototype.setHeader = function (name, value) {
+    if (this[kBasePath]) {
+      if (name.toLowerCase() === 'location' && !value.startsWith(basePath)) {
+        value = basePath + value
+      }
+    }
+    originSetHeader.call(this, name, value)
+  }
+}
+
 async function main () {
   const dataPath = resolve(tmpdir(), 'platformatic', 'runtimes', `${process.env.PLT_MANAGER_ID}.json`)
   const { data, loader, scripts } = JSON.parse(await readFile(dataPath))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,11 +23,11 @@
     "split2": "^4.2.0",
     "undici": "^6.19.5",
     "ws": "^8.18.0",
-    "@platformatic/itc": "2.6.0",
-    "@platformatic/config": "2.6.0",
-    "@platformatic/telemetry": "2.6.0",
-    "@platformatic/utils": "2.6.0",
-    "@platformatic/metrics": "2.6.0"
+    "@platformatic/config": "2.7.0",
+    "@platformatic/itc": "2.7.0",
+    "@platformatic/telemetry": "2.7.0",
+    "@platformatic/metrics": "2.7.0",
+    "@platformatic/utils": "2.7.0"
   },
   "devDependencies": {
     "borp": "^0.18.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.6.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.7.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",