@platformatic/basic 2.35.0 → 2.36.1

package/lib/utils.js

@@ -62,8 +62,10 @@ export function importFile (path) {
 /* c8 ignore next 6 */
 export function resolvePackage (root, pkg) {
   const require = createRequire(root)
-
-  return require.resolve(pkg, { paths: [root, ...require.main.paths] })
+  // We need to add the main module paths to the require.resolve call
+  // Note that `require.main` is not defined in `next` if we set sthe instrumentation hook reequired for ESM applications.
+  // see: https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/esm-support.md#instrumentation-hook-required-for-esm
+  return require.resolve(pkg, { paths: [root, ...require.main?.paths || []] })
 }
 
 export function cleanBasePath (basePath) {

package/lib/worker/child-manager.js

@@ -68,9 +68,6 @@ export class ChildManager extends ITC {
           const logs = Array.isArray(message.logs) ? message.logs : [message.logs]
           this._forwardLogs(logs)
         },
-        fetch: request => {
-          return this.#fetch(request)
-        },
         ...itcOpts.handlers
       }
     })
@@ -81,7 +78,7 @@ export class ChildManager extends ITC {
     this.#scripts = scripts
     this.#originalNodeOptions = process.env.NODE_OPTIONS
     this.#logger = globalThis.platformatic.logger
-    this.#server = createServer()
+    this.#server = createServer(this.#childProcessFetchHandler.bind(this))
     this.#socketPath ??= getSocketPath(this.#id)
     this.#clients = new Set()
     this.#requests = new Map()
@@ -246,13 +243,28 @@ export class ChildManager extends ITC {
     workerData.loggingPort.postMessage({ logs: logs.map(m => JSON.stringify(m)) })
   }
 
-  async #fetch (opts) {
-    const { statusCode, headers, body } = await request(opts)
+  async #childProcessFetchHandler (req, res) {
+    const { url, headers } = req
+
+    const requestOptions = { method: req.method, headers }
 
-    const rawPayload = Buffer.from(await body.arrayBuffer())
-    const payload = rawPayload.toString()
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+      requestOptions.body = req
+    }
 
-    return { statusCode, headers, body: payload, payload, rawPayload }
+    try {
+      const {
+        statusCode,
+        headers: responseHeaders,
+        body
+      } = await request(`http://${headers.host}${url ?? '/'}`, requestOptions)
+
+      res.writeHead(statusCode, responseHeaders)
+      body.pipe(res)
+    } catch (error) {
+      res.writeHead(502, { 'content-type': 'application/json' })
+      res.end(JSON.stringify(ensureLoggableError(error)))
+    }
   }
 
   #handleUnexpectedError (error, message, exitCode) {

package/lib/worker/child-process.js

@@ -11,7 +11,7 @@ import { basename, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { isMainThread } from 'node:worker_threads'
 import pino from 'pino'
-import { Agent, setGlobalDispatcher } from 'undici'
+import { Agent, Pool, setGlobalDispatcher } from 'undici'
 import { WebSocket } from 'ws'
 import { exitCodes } from '../errors.js'
 import { importFile } from '../utils.js'
@@ -19,9 +19,21 @@ import { getSocketPath } from './child-manager.js'
 
 const windowsNpmExecutables = ['npm-prefix.js', 'npm-cli.js']
 
-function createInterceptor (itc) {
+function createInterceptor () {
+  const pool = new Pool(
+    {
+      hostname: 'localhost',
+      protocol: 'http:'
+    },
+    {
+      socketPath: getSocketPath(process.env.PLT_MANAGER_ID),
+      keepAliveTimeout: 10,
+      keepAliveMaxTimeout: 10
+    }
+  )
+
   return function (dispatch) {
-    return async (opts, handler) => {
+    return (opts, handler) => {
       let url = opts.origin
       if (!(url instanceof URL)) {
         url = new URL(opts.path, url)
@@ -32,49 +44,17 @@ function createInterceptor (itc) {
         return dispatch(opts, handler)
       }
 
-      const headers = {
-        ...opts?.headers
-      }
-
-      delete headers.connection
-      delete headers['transfer-encoding']
-      headers.host = url.host
-
-      const requestOpts = {
-        ...opts,
-        headers
-      }
-      delete requestOpts.dispatcher
-
-      itc
-        .send('fetch', requestOpts)
-        .then(res => {
-          if (res.rawPayload && !Buffer.isBuffer(res.rawPayload)) {
-            res.rawPayload = Buffer.from(res.rawPayload.data)
+      // Route the call via the UNIX socket
+      return pool.dispatch(
+        {
+          ...opts,
+          headers: {
+            host: url.host,
+            ...opts?.headers
           }
-
-          const headers = []
-          for (const [key, value] of Object.entries(res.headers)) {
-            if (Array.isArray(value)) {
-              for (const v of value) {
-                headers.push(key)
-                headers.push(v)
-              }
-            } else {
-              headers.push(key)
-              headers.push(value)
-            }
-          }
-
-          handler.onHeaders(res.statusCode, headers, () => {}, res.statusMessage)
-          handler.onData(res.rawPayload)
-          handler.onComplete([])
-        })
-        .catch(e => {
-          handler.onError(new Error(e.message))
-        })
-
-      return true
+        },
+        handler
+      )
     }
   }
 }
@@ -198,8 +178,12 @@ export class ChildProcess extends ITC {
       registers: [registry]
     })
 
-    globalThis.platformatic.onHttpCacheHit = () => { cacheHitMetric.inc() }
-    globalThis.platformatic.onHttpCacheMiss = () => { cacheMissMetric.inc() }
+    globalThis.platformatic.onHttpCacheHit = () => {
+      cacheHitMetric.inc()
+    }
+    globalThis.platformatic.onHttpCacheMiss = () => {
+      cacheMissMetric.inc()
+    }
   }
 
   async #getMetrics ({ format } = {}) {
@@ -232,8 +216,8 @@ export class ChildProcess extends ITC {
 
       this.#logger = pino(pinoOptions)
 
-      Reflect.defineProperty(process, 'stdout', { value: createPinoWritable(this.#logger, 'info') })
-      Reflect.defineProperty(process, 'stderr', { value: createPinoWritable(this.#logger, 'error', true) })
+      Reflect.defineProperty(process, 'stdout', { value: createPinoWritable(this.#logger, 'info', false, 'STDOUT') })
+      Reflect.defineProperty(process, 'stderr', { value: createPinoWritable(this.#logger, 'error', true, 'STDERR') })
     } else {
       this.#logger = pino(pinoOptions)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.35.0",
+  "version": "2.36.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -24,11 +24,11 @@
     "split2": "^4.2.0",
     "undici": "^7.0.0",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.35.0",
-    "@platformatic/itc": "2.35.0",
-    "@platformatic/metrics": "2.35.0",
-    "@platformatic/telemetry": "2.35.0",
-    "@platformatic/utils": "2.35.0"
+    "@platformatic/config": "2.36.1",
+    "@platformatic/itc": "2.36.1",
+    "@platformatic/metrics": "2.36.1",
+    "@platformatic/utils": "2.36.1",
+    "@platformatic/telemetry": "2.36.1"
   },
   "devDependencies": {
     "borp": "^0.19.0",

package/schema.json

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