@platformatic/basic 2.37.0 → 2.38.0

package/lib/base.js

@@ -8,7 +8,6 @@ import { hostname, platform } from 'node:os'
 import { pathToFileURL } from 'node:url'
 import { workerData } from 'node:worker_threads'
 import pino from 'pino'
-import split2 from 'split2'
 import { NonZeroExitCode } from './errors.js'
 import { cleanBasePath } from './utils.js'
 import { ChildManager } from './worker/child-manager.js'
@@ -21,7 +20,7 @@ export class BaseStackable {
   #subprocessStarted
   #metricsCollected
 
-  constructor (type, version, options, root, configManager) {
+  constructor (type, version, options, root, configManager, standardStreams = {}) {
     options.context.worker ??= { count: 1, index: 0 }
 
     this.type = type
@@ -45,6 +44,8 @@ export class BaseStackable {
     this.endHttpTimer = null
     this.clientWs = null
     this.runtimeConfig = deepmerge(options.context?.runtimeConfig ?? {}, workerData?.config ?? {})
+    this.stdout = standardStreams?.stdout ?? process.stdout
+    this.stderr = standardStreams?.stderr ?? process.stderr
 
     // Setup the logger
     const pinoOptions = {
@@ -59,7 +60,7 @@ export class BaseStackable {
       pinoOptions.base = { pid: process.pid, hostname: hostname(), worker: this.workerId }
     }
 
-    this.logger = pino(pinoOptions)
+    this.logger = pino(pinoOptions, standardStreams?.stdout)
 
     // Setup globals
     this.registerGlobals({
@@ -182,27 +183,7 @@ export class BaseStackable {
     try {
       await this.childManager?.inject()
 
-      const subprocess = this.spawn(command)
-      subprocess.stdout.setEncoding('utf8')
-      subprocess.stderr.setEncoding('utf8')
-
-      // Wait for the process to be started
-      await new Promise((resolve, reject) => {
-        subprocess.on('spawn', resolve)
-        subprocess.on('error', reject)
-      })
-
-      // Route anything not catched by child process logger to the logger manually
-      /* c8 ignore next 3 */
-      subprocess.stdout.pipe(split2()).on('data', line => {
-        this.logger.info(line)
-      })
-
-      /* c8 ignore next 3 */
-      subprocess.stderr.pipe(split2()).on('data', line => {
-        this.logger.error(line)
-      })
-
+      const subprocess = await this.spawn(command)
       const [exitCode] = await once(subprocess, 'exit')
 
       if (exitCode !== 0) {
@@ -250,28 +231,7 @@ export class BaseStackable {
 
     try {
       await this.childManager.inject()
-
-      this.subprocess = this.spawn(command)
-      this.subprocess.stdout.setEncoding('utf8')
-      this.subprocess.stderr.setEncoding('utf8')
-
-      // Route anything not catched by child process logger to the logger manually
-      /* c8 ignore next 3 */
-      this.subprocess.stdout.pipe(split2()).on('data', line => {
-        this.logger.info(line)
-      })
-
-      /* c8 ignore next 3 */
-      this.subprocess.stderr.pipe(split2()).on('data', line => {
-        this.logger.error(line)
-      })
-
-      // Wait for the process to be started
-      await new Promise((resolve, reject) => {
-        this.subprocess.on('spawn', resolve)
-        this.subprocess.on('error', reject)
-      })
-
+      this.subprocess = await this.spawn(command)
       this.#subprocessStarted = true
     } catch (e) {
       this.childManager.close()
@@ -327,13 +287,28 @@ export class BaseStackable {
     return this.childManager
   }
 
-  spawn (command) {
+  async spawn (command) {
     const [executable, ...args] = parseCommandString(command)
 
     /* c8 ignore next 3 */
-    return platform() === 'win32'
-      ? spawn(command, { cwd: this.root, shell: true, windowsVerbatimArguments: true })
-      : spawn(executable, args, { cwd: this.root })
+    const subprocess =
+      platform() === 'win32'
+        ? spawn(command, { cwd: this.root, shell: true, windowsVerbatimArguments: true })
+        : spawn(executable, args, { cwd: this.root })
+
+    subprocess.stdout.setEncoding('utf8')
+    subprocess.stderr.setEncoding('utf8')
+
+    subprocess.stdout.pipe(this.stdout, { end: false })
+    subprocess.stderr.pipe(this.stderr, { end: false })
+
+    // Wait for the process to be started
+    await new Promise((resolve, reject) => {
+      subprocess.on('spawn', resolve)
+      subprocess.on('error', reject)
+    })
+
+    return subprocess
   }
 
   async _collectMetrics () {
@@ -437,8 +412,7 @@ export class BaseStackable {
       /* c8 ignore next 2 */
       port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
       host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
-      telemetryConfig: this.telemetryConfig,
-      interceptLogging: typeof workerData?.loggingPort !== 'undefined'
+      telemetryConfig: this.telemetryConfig
     }
   }
 }

package/lib/worker/child-manager.js

@@ -7,7 +7,6 @@ import { register } from 'node:module'
 import { platform, tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { workerData } from 'node:worker_threads'
 import { request } from 'undici'
 import { WebSocketServer } from 'ws'
 import { exitCodes } from '../errors.js'
@@ -60,16 +59,8 @@ export class ChildManager extends ITC {
     scripts ??= []
 
     super({
-      name: 'child-manager',
       ...itcOpts,
-      handlers: {
-        log: message => {
-          /* c8 ignore next */
-          const logs = Array.isArray(message.logs) ? message.logs : [message.logs]
-          this._forwardLogs(logs)
-        },
-        ...itcOpts.handlers
-      }
+      name: 'child-manager'
     })
 
     this.#id = generateChildrenId(context)
@@ -238,11 +229,6 @@ export class ChildManager extends ITC {
     this.#server.close()
   }
 
-  /* c8 ignore next 3 */
-  _forwardLogs (logs) {
-    workerData.loggingPort.postMessage({ logs: logs.map(m => JSON.stringify(m)) })
-  }
-
   async #childProcessFetchHandler (req, res) {
     const { url, headers } = req
 

package/lib/worker/child-process.js

@@ -1,6 +1,6 @@
 import { ITC } from '@platformatic/itc'
 import { client, collectMetrics } from '@platformatic/metrics'
-import { createPinoWritable, ensureLoggableError, features } from '@platformatic/utils'
+import { disablePinoDirectWrite, ensureFlushedWorkerStdio, ensureLoggableError, features } from '@platformatic/utils'
 import diagnosticChannel, { tracingChannel } from 'node:diagnostics_channel'
 import { EventEmitter, once } from 'node:events'
 import { readFile } from 'node:fs/promises'
@@ -194,6 +194,9 @@ export class ChildProcess extends ITC {
   }
 
   #setupLogger () {
+    disablePinoDirectWrite()
+    ensureFlushedWorkerStdio()
+
     // Since this is executed by user code, make sure we only override this in the main thread
     // The rest will be intercepted by the BaseStackable.
     const pinoOptions = {
@@ -209,18 +212,7 @@ export class ChildProcess extends ITC {
       }
     }
 
-    if (isMainThread && globalThis.platformatic.interceptLogging) {
-      pinoOptions.transport = {
-        target: new URL('./child-transport.js', import.meta.url).toString()
-      }
-
-      this.#logger = pino(pinoOptions)
-
-      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)
-    }
+    this.#logger = pino(pinoOptions)
   }
 
   #setupServer () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.37.0",
+  "version": "2.38.0",
   "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.37.0",
-    "@platformatic/itc": "2.37.0",
-    "@platformatic/telemetry": "2.37.0",
-    "@platformatic/metrics": "2.37.0",
-    "@platformatic/utils": "2.37.0"
+    "@platformatic/itc": "2.38.0",
+    "@platformatic/config": "2.38.0",
+    "@platformatic/telemetry": "2.38.0",
+    "@platformatic/metrics": "2.38.0",
+    "@platformatic/utils": "2.38.0"
   },
   "devDependencies": {
     "borp": "^0.19.0",

package/schema.json

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