@platformatic/runtime 2.52.0 → 2.52.1-alpha.0

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime2520Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime2521Alpha0Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/lib/runtime.js

@@ -6,11 +6,9 @@ const { once, EventEmitter } = require('node:events')
 const { createReadStream, watch, existsSync } = require('node:fs')
 const { readdir, readFile, stat, access } = require('node:fs/promises')
 const { STATUS_CODES } = require('node:http')
-const { hostname } = require('node:os')
 const { join } = require('node:path')
 const { setTimeout: sleep, setImmediate: sleepUntilNextTick } = require('node:timers/promises')
 const { Worker } = require('node:worker_threads')
-const split2 = require('split2')
 const ts = require('tail-file-stream')
 const { Agent, interceptors: undiciInterceptors, request } = require('undici')
 const { createThreadInterceptor } = require('undici-thread-interceptor')
@@ -1675,20 +1673,21 @@ class Runtime extends EventEmitter {
   }
 
   #handleWorkerStandardStreams (worker, serviceId, workerId) {
-    const pinoOptions = { level: 'trace', name: serviceId }
+    const binding = { name: serviceId }
 
     if (typeof workerId !== 'undefined') {
-      pinoOptions.base = { pid: process.pid, hostname: hostname(), worker: workerId }
+      binding.worker = workerId
     }
 
-    const logger = this.logger.child(pinoOptions)
+    const logger = this.logger.child(binding, { level: 'trace' })
 
     const selectors = {
       stdout: { level: 'info', caller: 'STDOUT' },
       stderr: { level: 'error', caller: 'STDERR' }
     }
 
-    worker.stdout.pipe(split2()).on('data', raw => {
+    worker.stdout.setEncoding('utf8')
+    worker.stdout.on('data', raw => {
       let selector = selectors.stdout
 
       if (raw.includes(kStderrMarker)) {
@@ -1701,39 +1700,52 @@ class Runtime extends EventEmitter {
 
     // Whatever is outputted here, it come from a direct process.stderr.write in the thread.
     // There's nothing we can do about it in regard of out of order logs due to a Node bug.
-    worker.stderr.pipe(split2()).on('data', raw => {
+    worker.stderr.setEncoding('utf8')
+    worker.stderr.on('data', raw => {
       this.#forwardThreadLog(logger, selectors.stderr, raw)
     })
   }
 
-  #forwardThreadLog (logger, { level, caller }, raw) {
+  #forwardThreadLog (logger, { level, caller }, data) {
     if (!this.#loggerDestination) {
       return
     }
 
-    // Attempt to check if the message is already in pino format. If so, we directly write it to the destination
-    let message
-    try {
-      message = JSON.parse(raw)
-    } catch (e) {
-      // No-op, we assume the message is raw
-    }
+    let plainMessages = ''
+    for (const raw of data.split('\n')) {
+      // First of all, try to parse the message as JSON
+      let message
+      try {
+        message = JSON.parse(raw)
+      } catch (e) {
+        // No-op, we assume the message is raw
+      }
+
+      // Not a Pino JSON, accumulate the message and continue
+      if (typeof message?.level !== 'number' || typeof message?.time !== 'number') {
+        plainMessages += (plainMessages.length ? '\n' : '') + raw
+        continue
+      }
+
+      // Before continuing, write any previous plain messages
+      if (plainMessages.length > 0) {
+        logger[level]({ caller }, plainMessages.replace(/\n$/, ''))
+        plainMessages = ''
+      }
 
-    // Not a pino message, output it
-    if (!message) {
-      // Log the message
-      logger[level]({ caller }, raw.replace(/\n$/, ''))
-    } else if (typeof message?.level === 'number' && typeof message?.time === 'number') {
+      // Now we directly write to the Pino destination
       this.#loggerDestination.lastLevel = message.level
       this.#loggerDestination.lastTime = message.time
       this.#loggerDestination.lastMsg = message.msg
       this.#loggerDestination.lastObj = message
       this.#loggerDestination.lastLogger = logger
 
-      // Remember to add '\n' back as split2 removed it
       this.#loggerDestination.write(raw + '\n')
-    } else {
-      logger[level]({ payload: message })
+    }
+
+    // Write whatever is left
+    if (plainMessages.length > 0) {
+      logger[level]({ caller }, plainMessages.replace(/\n$/, ''))
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.52.0",
+  "version": "2.52.1-alpha.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -37,12 +37,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.52.0",
-    "@platformatic/db": "2.52.0",
-    "@platformatic/node": "2.52.0",
-    "@platformatic/service": "2.52.0",
-    "@platformatic/sql-graphql": "2.52.0",
-    "@platformatic/sql-mapper": "2.52.0"
+    "@platformatic/composer": "2.52.1-alpha.0",
+    "@platformatic/node": "2.52.1-alpha.0",
+    "@platformatic/service": "2.52.1-alpha.0",
+    "@platformatic/sql-graphql": "2.52.1-alpha.0",
+    "@platformatic/sql-mapper": "2.52.1-alpha.0",
+    "@platformatic/db": "2.52.1-alpha.0"
   },
   "dependencies": {
     "@fastify/accepts": "^5.0.0",
@@ -76,13 +76,13 @@
     "undici": "^7.0.0",
     "undici-thread-interceptor": "^0.13.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.52.0",
-    "@platformatic/config": "2.52.0",
-    "@platformatic/generators": "2.52.0",
-    "@platformatic/itc": "2.52.0",
-    "@platformatic/telemetry": "2.52.0",
-    "@platformatic/utils": "2.52.0",
-    "@platformatic/ts-compiler": "2.52.0"
+    "@platformatic/basic": "2.52.1-alpha.0",
+    "@platformatic/config": "2.52.1-alpha.0",
+    "@platformatic/generators": "2.52.1-alpha.0",
+    "@platformatic/itc": "2.52.1-alpha.0",
+    "@platformatic/telemetry": "2.52.1-alpha.0",
+    "@platformatic/ts-compiler": "2.52.1-alpha.0",
+    "@platformatic/utils": "2.52.1-alpha.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.52.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.52.1-alpha.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {