@platformatic/control 1.24.0 → 1.26.0

package/lib/logs.js

@@ -1,8 +1,18 @@
 'use strict'
 
 const { parseArgs } = require('node:util')
+const { prettyFactory } = require('pino-pretty')
 const RuntimeApiClient = require('./runtime-api-client')
 
+const pinoLogLevels = {
+  fatal: 60,
+  error: 50,
+  warn: 40,
+  info: 30,
+  debug: 20,
+  trace: 10
+}
+
 async function streamRuntimeLogsCommand (argv) {
   const args = parseArgs({
     args: argv,
@@ -10,7 +20,7 @@ async function streamRuntimeLogsCommand (argv) {
       pid: { type: 'string', short: 'p' },
       name: { type: 'string', short: 'n' },
       level: { type: 'string', short: 'l', default: 'info' },
-      pretty: { type: 'boolean', default: true },
+      pretty: { type: 'string', default: 'true' },
       service: { type: 'string', short: 's' }
     },
     strict: false
@@ -19,19 +29,30 @@ async function streamRuntimeLogsCommand (argv) {
   const client = new RuntimeApiClient()
   const runtime = await client.getMatchingRuntime(args)
 
-  const options = {}
-  if (args.level !== undefined) {
-    options.level = args.level
-  }
-  if (args.pretty !== undefined) {
-    options.pretty = args.pretty
-  }
-  if (args.service !== undefined) {
-    options.serviceId = args.service
-  }
-
-  const logsStream = client.getRuntimeLogsStream(runtime.pid, options)
-  logsStream.pipe(process.stdout)
+  const logLevelNumber = pinoLogLevels[args.level]
+  const prettify = prettyFactory()
+
+  const logsStream = client.getRuntimeLiveLogsStream(runtime.pid)
+
+  logsStream.on('data', (data) => {
+    const logs = data.toString().split('\n').filter(Boolean)
+
+    for (let log of logs) {
+      try {
+        const parsedLog = JSON.parse(log)
+        if (parsedLog.level < logLevelNumber) continue
+        if (args.service && parsedLog.name !== args.service) continue
+        if (args.pretty !== 'false') {
+          log = prettify(parsedLog)
+        } else {
+          log += '\n'
+        }
+        process.stdout.write(log)
+      } catch (err) {
+        console.error('Failed to parse log message: ', log, err)
+      }
+    }
+  })
 
   process.on('SIGINT', () => {
     logsStream.destroy()

package/lib/runtime-api-client.js

@@ -3,13 +3,13 @@
 const { tmpdir, platform, EOL } = require('node:os')
 const { join } = require('node:path')
 const { exec, spawn } = require('node:child_process')
-const { readdir } = require('node:fs/promises')
+const { readdir, unlink, access } = require('node:fs/promises')
 const { Readable } = require('node:stream')
 const { Client } = require('undici')
 const WebSocket = require('ws')
 const errors = require('./errors.js')
 
-const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'pids')
+const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
 const PLATFORMATIC_PIPE_PREFIX = '\\\\.\\pipe\\platformatic-'
 
 class RuntimeApiClient {
@@ -44,16 +44,25 @@ class RuntimeApiClient {
       })
     )
 
-    return getMetadataRequests
-      .filter(result => result.status === 'fulfilled')
-      .map(result => result.value)
+    const runtimes = []
+    for (let i = 0; i < runtimePIDs.length; i++) {
+      const runtimePID = runtimePIDs[i]
+      const metadataRequest = getMetadataRequests[i]
+
+      if (metadataRequest.status === 'rejected') {
+        await this.#removeRuntimeSocket(runtimePID).catch(() => {})
+      } else {
+        runtimes.push(metadataRequest.value)
+      }
+    }
+    return runtimes
   }
 
   async getRuntimeMetadata (pid) {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/metadata',
+      path: '/api/v1/metadata',
       method: 'GET'
     })
 
@@ -70,7 +79,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/services',
+      path: '/api/v1/services',
       method: 'GET'
     })
 
@@ -87,7 +96,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: `/api/services/${serviceId}/config`,
+      path: `/api/v1/services/${serviceId}/config`,
       method: 'GET'
     })
 
@@ -104,7 +113,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/config',
+      path: '/api/v1/config',
       method: 'GET'
     })
 
@@ -121,7 +130,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/env',
+      path: '/api/v1/env',
       method: 'GET'
     })
 
@@ -148,7 +157,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/reload',
+      path: '/api/v1/reload',
       method: 'POST'
     })
 
@@ -162,7 +171,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/stop',
+      path: '/api/v1/stop',
       method: 'POST'
     })
 
@@ -172,15 +181,22 @@ class RuntimeApiClient {
     }
   }
 
-  getRuntimeLogsStream (pid, options) {
+  getRuntimeLiveLogsStream (pid) {
     const socketPath = this.#getSocketPathFromPid(pid)
-    let query = ''
-    if (options.level || options.pretty || options.serviceId) {
-      query = '?' + new URLSearchParams(options).toString()
-    }
 
     const protocol = platform() === 'win32' ? 'ws+unix:' : 'ws+unix://'
-    const webSocketUrl = protocol + socketPath + ':/api/logs' + query
+    const webSocketUrl = protocol + socketPath + ':/api/v1/logs/live'
+    const webSocketStream = new WebSocketStream(webSocketUrl)
+    this.#webSockets.add(webSocketStream.ws)
+
+    return webSocketStream
+  }
+
+  getRuntimeHistoryLogsStream (pid) {
+    const socketPath = this.#getSocketPathFromPid(pid)
+
+    const protocol = platform() === 'win32' ? 'ws+unix:' : 'ws+unix://'
+    const webSocketUrl = protocol + socketPath + ':/api/v1/logs/history'
     const webSocketStream = new WebSocketStream(webSocketUrl)
     this.#webSockets.add(webSocketStream.ws)
 
@@ -191,7 +207,7 @@ class RuntimeApiClient {
     const client = this.#getUndiciClient(pid)
 
     const response = await client.request({
-      path: `/api/services/${serviceId}/proxy` + options.url,
+      path: `/api/v1/services/${serviceId}/proxy` + options.url,
       method: options.method,
       headers: options.headers,
       query: options.query,
@@ -227,15 +243,19 @@ class RuntimeApiClient {
     if (platform() === 'win32') {
       return PLATFORMATIC_PIPE_PREFIX + pid
     }
-    return join(PLATFORMATIC_TMP_DIR, `${pid}.sock`)
+    return join(PLATFORMATIC_TMP_DIR, pid.toString(), 'socket')
   }
 
   async #getUnixRuntimePIDs () {
-    const socketNames = await readdir(PLATFORMATIC_TMP_DIR)
+    try {
+      await access(PLATFORMATIC_TMP_DIR)
+    } catch {
+      return []
+    }
+    const runtimeDirs = await readdir(PLATFORMATIC_TMP_DIR)
     const runtimePIDs = []
-    for (const socketName of socketNames) {
-      const runtimePID = socketName.replace('.sock', '')
-      runtimePIDs.push(parseInt(runtimePID))
+    for (const runtimeDirName of runtimeDirs) {
+      runtimePIDs.push(parseInt(runtimeDirName))
     }
     return runtimePIDs
   }
@@ -268,6 +288,13 @@ class RuntimeApiClient {
       )
     })
   }
+
+  async #removeRuntimeSocket (pid) {
+    if (platform() !== 'win32') {
+      const socketPath = this.#getSocketPathFromPid(pid)
+      await unlink(socketPath)
+    }
+  }
 }
 
 class WebSocketStream extends Readable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "Platformatic Control",
   "main": "index.js",
   "bin": {
@@ -24,14 +24,14 @@
     "split2": "^4.2.0",
     "standard": "^17.1.0",
     "tsd": "^0.30.4",
-    "@platformatic/runtime": "1.24.0"
+    "@platformatic/runtime": "1.26.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
     "commist": "^3.2.0",
+    "help-me": "^5.0.0",
     "pino": "^8.17.2",
     "pino-pretty": "^10.3.1",
-    "help-me": "^5.0.0",
     "table": "^6.8.1",
     "undici": "^6.6.0",
     "ws": "^8.16.0"