@platformatic/control 1.25.0 → 1.27.0

package/lib/logs.js

@@ -32,10 +32,10 @@ async function streamRuntimeLogsCommand (argv) {
   const logLevelNumber = pinoLogLevels[args.level]
   const prettify = prettyFactory()
 
-  const logsStream = client.getRuntimeLogsStream(runtime.pid)
+  const logsStream = client.getRuntimeLiveLogsStream(runtime.pid)
 
   logsStream.on('data', (data) => {
-    const logs = data.toString().split('\n')
+    const logs = data.toString().split('\n').filter(Boolean)
 
     for (let log of logs) {
       try {

package/lib/ps.js

@@ -55,7 +55,7 @@ function formatRuntimeTime (timeSeconds) {
 const tableConfig = {
   border: getBorderCharacters('void'),
   columnDefault: {
-    paddingLeft: 1,
+    paddingLeft: 0,
     paddingRight: 1
   },
   drawHorizontalLine: () => false

package/lib/runtime-api-client.js

@@ -9,7 +9,7 @@ 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 {
@@ -181,11 +181,22 @@ class RuntimeApiClient {
     }
   }
 
-  getRuntimeLogsStream (pid) {
+  getRuntimeLiveLogsStream (pid) {
     const socketPath = this.#getSocketPathFromPid(pid)
 
     const protocol = platform() === 'win32' ? 'ws+unix:' : 'ws+unix://'
-    const webSocketUrl = protocol + socketPath + ':/api/v1/logs'
+    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)
 
@@ -232,7 +243,7 @@ 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 () {
@@ -241,11 +252,10 @@ class RuntimeApiClient {
     } catch {
       return []
     }
-    const socketNames = await readdir(PLATFORMATIC_TMP_DIR)
+    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
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "1.25.0",
+  "version": "1.27.0",
   "description": "Platformatic Control",
   "main": "index.js",
   "bin": {
@@ -17,14 +17,14 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "borp": "^0.9.0",
+    "borp": "^0.10.0",
     "desm": "^1.3.0",
     "execa": "^8.0.1",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
     "tsd": "^0.30.4",
-    "@platformatic/runtime": "1.25.0"
+    "@platformatic/runtime": "1.27.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",