@platformatic/runtime 1.24.0 → 1.26.0

package/fixtures/configs/monorepo-hotreload.json

@@ -23,5 +23,10 @@
         "config": "platformatic.db.json"
       }
     }
+  },
+  "server": {
+    "logger": {
+      "level": "trace"
+    }
   }
 }

package/fixtures/management-api/platformatic.json

@@ -6,5 +6,9 @@
   "autoload": {
     "path": "./services"
   },
+  "server": {
+    "hostname": "127.0.0.1",
+    "port": 0
+  },
   "managementApi": true
 }

package/fixtures/management-api/services/service-1/platformatic.json

@@ -1,13 +1,5 @@
 {
   "$schema": "https://platformatic.dev/schemas/v1.22.0/service",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0,
-    "logger": {
-      "name": "service-with-logger",
-      "level": "trace"
-    }
-  },
   "service": {
     "openapi": true
   },

package/fixtures/management-api/services/service-2/platformatic.json

@@ -1,9 +1,5 @@
 {
   "$schema": "https://platformatic.dev/schemas/v1.22.0/service",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0
-  },
   "service": {
     "openapi": true
   },

package/lib/api.js

@@ -61,8 +61,6 @@ class RuntimeApi {
           if (this.#dispatcher) {
             await this.#dispatcher.close()
           }
-          await this.stopServices()
-
           setImmediate(process.exit) // Exit the worker thread.
           return
         }

package/lib/app.js

@@ -248,10 +248,12 @@ class PlatformaticApp {
   }
 
   #setuplogger (configManager) {
-    // Set the logger if not present
     configManager.current.server = configManager.current.server || {}
-    const childLogger = this.#logger.child({}, { level: configManager.current.server.logger?.level || 'info' })
-    configManager.current.server.logger = childLogger
+    const level = configManager.current.server.logger?.level
+
+    configManager.current.server.logger = level
+      ? this.#logger.child({ level })
+      : this.#logger
   }
 
   #startFileWatching () {

package/lib/management-api.js

@@ -2,30 +2,17 @@
 
 const { tmpdir, platform } = require('node:os')
 const { join } = require('node:path')
-const { readFile, mkdir, unlink } = require('node:fs/promises')
+const { createReadStream } = require('node:fs')
+const { readFile, readdir, mkdir, unlink } = require('node:fs/promises')
 const fastify = require('fastify')
-const { prettyFactory } = require('pino-pretty')
 const errors = require('./errors')
 const platformaticVersion = require('../package.json').version
 
-const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'pids')
-
-const pinoLogLevels = {
-  fatal: 60,
-  error: 50,
-  warn: 40,
-  info: 30,
-  debug: 20,
-  trace: 10
-}
+const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
+const runtimeTmpDir = join(PLATFORMATIC_TMP_DIR, process.pid.toString())
 
 async function createManagementApi (configManager, runtimeApiClient, loggingPort) {
-  let apiConfig = configManager.current.managementApi
-  if (!apiConfig || apiConfig === true) {
-    apiConfig = {}
-  }
-
-  const app = fastify(apiConfig)
+  const app = fastify()
   app.log.warn(
     'Runtime Management API is in the experimental stage. ' +
     'The feature is not subject to semantic versioning rules. ' +
@@ -128,27 +115,10 @@ async function createManagementApi (configManager, runtimeApiClient, loggingPort
         .send(res.body)
     })
 
-    app.get('/logs', { websocket: true }, async (connection, req) => {
-      const logLevel = req.query.level || 'info'
-      const pretty = req.query.pretty !== 'false'
-      const serviceId = req.query.serviceId || null
-
-      const logLevelNumber = pinoLogLevels[logLevel]
-      const prettify = prettyFactory()
-
+    app.get('/logs/live', { websocket: true }, async (connection, req) => {
       const handler = (message) => {
-        for (let log of message.logs) {
-          try {
-            const parsedLog = JSON.parse(log)
-            if (parsedLog.level < logLevelNumber) continue
-            if (serviceId && parsedLog.name !== serviceId) continue
-            if (pretty) {
-              log = prettify(parsedLog)
-            }
-            connection.socket.send(log)
-          } catch (err) {
-            console.error('Failed to parse log message: ', log, err)
-          }
+        for (const log of message.logs) {
+          connection.socket.send(log)
         }
       }
 
@@ -163,7 +133,41 @@ async function createManagementApi (configManager, runtimeApiClient, loggingPort
         loggingPort.off('message', handler)
       })
     })
-  }, { prefix: '/api' })
+
+    app.get('/logs/history', { websocket: true }, async (connection, req) => {
+      const runtimeTmpFiles = await readdir(runtimeTmpDir)
+      const runtimeLogFiles = runtimeTmpFiles
+        .filter((file) => file.startsWith('logs'))
+        .map((file) => join(runtimeTmpDir, file))
+        .sort()
+
+      if (runtimeLogFiles.length === 0) {
+        connection.end()
+        return
+      }
+
+      const streamLogFile = (fileIndex) => {
+        const file = runtimeLogFiles[fileIndex]
+        const isLastFile = fileIndex === runtimeLogFiles.length - 1
+
+        const stream = createReadStream(file)
+        stream.pipe(connection, { end: isLastFile })
+
+        stream.on('error', (err) => {
+          app.log.error(err, 'Error streaming log file')
+          connection.end()
+        })
+        stream.on('end', () => {
+          if (isLastFile) {
+            connection.end()
+            return
+          }
+          streamLogFile(fileIndex + 1)
+        })
+      }
+      streamLogFile(0)
+    })
+  }, { prefix: '/api/v1' })
 
   return app
 }
@@ -175,12 +179,11 @@ async function startManagementApi (configManager, runtimeApiClient, loggingPort)
   if (platform() === 'win32') {
     socketPath = '\\\\.\\pipe\\platformatic-' + runtimePID
   } else {
-    await mkdir(PLATFORMATIC_TMP_DIR, { recursive: true })
-    socketPath = join(PLATFORMATIC_TMP_DIR, `${runtimePID}.sock`)
+    socketPath = join(runtimeTmpDir, 'socket')
   }
 
   try {
-    await mkdir(PLATFORMATIC_TMP_DIR, { recursive: true })
+    await mkdir(runtimeTmpDir, { recursive: true })
     await unlink(socketPath).catch((err) => {
       if (err.code !== 'ENOENT') {
         throw new errors.FailedToUnlinkManagementApiSocket(err.message)

package/lib/worker.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const inspector = require('node:inspector')
+const { tmpdir } = require('node:os')
 const { register, createRequire } = require('node:module')
 const { isatty } = require('node:tty')
 const { pathToFileURL } = require('node:url')
@@ -18,6 +19,8 @@ const RuntimeApi = require('./api')
 const { MessagePortWritable } = require('./message-port-writable')
 let loaderPort
 
+const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
+
 if (typeof register === 'function' && workerData.config.loaderFile) {
   const { port1, port2 } = new MessageChannel()
   register(workerData.config.loaderFile, {
@@ -34,31 +37,41 @@ globalThis.fetch = undici.fetch
 
 const config = workerData.config
 
-let loggerConfig = config.server?.logger
-
-if (loggerConfig) {
-  loggerConfig = { ...loggerConfig }
-} else {
-  loggerConfig = {}
-}
+function createLogger (config) {
+  const loggerConfig = { ...config.server?.logger }
+  const cliStream = isatty(1) ? pretty() : pino.destination(1)
 
-const cliStream = isatty(1) ? pretty() : pino.destination(1)
+  if (!config.loggingPort && !config.managementApi) {
+    return pino(loggerConfig, cliStream)
+  }
 
-let logger = null
-if (config.loggingPort) {
-  const portStream = new MessagePortWritable({
-    metadata: config.loggingMetadata,
-    port: config.loggingPort
-  })
   const multiStream = pino.multistream([
-    { stream: portStream, level: 'trace' },
     { stream: cliStream, level: loggerConfig.level || 'info' }
   ])
-  logger = pino({ level: 'trace' }, multiStream)
-} else {
-  logger = pino(loggerConfig, cliStream)
+
+  if (loggerConfig.transport) {
+    const transport = pino.transport(loggerConfig.transport)
+    multiStream.add({ level: loggerConfig.level || 'info', stream: transport })
+  }
+  if (config.loggingPort) {
+    const portStream = new MessagePortWritable({
+      metadata: config.loggingMetadata,
+      port: config.loggingPort
+    })
+    multiStream.add({ level: 'trace', stream: portStream })
+  }
+  if (config.managementApi) {
+    const logsPath = join(PLATFORMATIC_TMP_DIR, process.pid.toString(), 'logs')
+    const pinoRoll = pino.transport({
+      target: 'pino-roll',
+      options: { file: logsPath, size: '5m', mkdir: true }
+    })
+    multiStream.add({ level: 'trace', stream: pinoRoll })
+  }
+  return pino({ level: 'trace' }, multiStream)
 }
 
+const logger = createLogger(config)
 if (config.server) {
   config.server.logger = logger
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -32,8 +32,8 @@
     "typescript": "^5.3.3",
     "undici-oauth-interceptor": "^0.4.2",
     "ws": "^8.16.0",
-    "@platformatic/sql-graphql": "1.24.0",
-    "@platformatic/sql-mapper": "1.24.0"
+    "@platformatic/sql-graphql": "1.26.0",
+    "@platformatic/sql-mapper": "1.26.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
@@ -53,15 +53,16 @@
     "minimist": "^1.2.8",
     "pino": "^8.17.2",
     "pino-pretty": "^10.3.1",
+    "pino-roll": "1.0.0-rc.1",
     "undici": "^6.6.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "1.24.0",
-    "@platformatic/config": "1.24.0",
-    "@platformatic/db": "1.24.0",
-    "@platformatic/generators": "1.24.0",
-    "@platformatic/service": "1.24.0",
-    "@platformatic/telemetry": "1.24.0",
-    "@platformatic/utils": "1.24.0"
+    "@platformatic/composer": "1.26.0",
+    "@platformatic/config": "1.26.0",
+    "@platformatic/generators": "1.26.0",
+    "@platformatic/db": "1.26.0",
+    "@platformatic/service": "1.26.0",
+    "@platformatic/utils": "1.26.0",
+    "@platformatic/telemetry": "1.26.0"
   },
   "standard": {
     "ignore": [