@platformatic/control 3.35.1 → 3.36.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { safeRemove } from '@platformatic/foundation'
+import { createDebugLogger, ensureLoggableError, safeRemove } from '@platformatic/foundation'
 import { exec, spawn } from 'node:child_process'
 import { access, readdir } from 'node:fs/promises'
 import { EOL, platform, tmpdir } from 'node:os'
@@ -93,10 +93,21 @@ export async function getMatchingRuntime (client, positionals) {
 export class RuntimeApiClient {
   #undiciClients = new Map()
   #webSockets = new Set()
+  #socketPath
+  #logger
+  #debugLogger
+
+  constructor (options = {}) {
+    this.#socketPath = options?.socket
+    this.#logger = options?.logger
+    this.#debugLogger = createDebugLogger('runtime:api')
+  }
 
   async getMatchingRuntime (opts = {}) {
     const runtimes = await this.getRuntimes()
 
+    this.#debugLogger('Found runtimes', runtimes)
+
     let runtime = null
     if (opts.pid) {
       runtime = runtimes.find(runtime => runtime.pid === parseInt(opts.pid))
@@ -112,12 +123,14 @@ export class RuntimeApiClient {
   }
 
   async getRuntimes () {
+    if (this.#socketPath) {
+      return [await this.getRuntimeMetadata(0)]
+    }
+
     const runtimePIDs = platform() === 'win32' ? await this.#getWindowsRuntimePIDs() : await this.#getUnixRuntimePIDs()
 
     const getMetadataRequests = await Promise.allSettled(
-      runtimePIDs.map(async runtimePID => {
-        return this.getRuntimeMetadata(runtimePID)
-      })
+      runtimePIDs.map(runtimePID => this.getRuntimeMetadata(runtimePID))
     )
 
     const runtimes = []
@@ -125,8 +138,18 @@ export class RuntimeApiClient {
       const runtimePID = runtimePIDs[i]
       const metadataRequest = getMetadataRequests[i]
 
+      this.#debugLogger(`Runtime ${runtimePID} get metadata result`, metadataRequest)
+
       if (metadataRequest.status === 'rejected') {
-        await this.#removeRuntimeTmpDir(runtimePID).catch(() => {})
+        // If it is just a non running runtime, we can remove its tmp dir, otherwise we log the error
+        if (metadataRequest.reason.code !== 'ECONNREFUSED') {
+          this.#logger?.warn(
+            { error: ensureLoggableError(metadataRequest.reason) },
+            `Failed to retrieve metadata for runtime with PID ${runtimePID}.`
+          )
+        } else {
+          await this.#removeRuntimeTmpDir(runtimePID).catch(() => {})
+        }
       } else {
         runtimes.push(metadataRequest.value)
       }
@@ -604,6 +627,10 @@ export class RuntimeApiClient {
   }
 
   #getSocketPathFromPid (pid) {
+    if (this.#socketPath) {
+      return this.#socketPath
+    }
+
     if (platform() === 'win32') {
       return PLATFORMATIC_PIPE_PREFIX + pid
     }
@@ -611,6 +638,8 @@ export class RuntimeApiClient {
   }
 
   async #getUnixRuntimePIDs () {
+    this.#debugLogger('Getting runtime PIDs from folder', PLATFORMATIC_TMP_DIR)
+
     try {
       await access(PLATFORMATIC_TMP_DIR)
     } catch {
@@ -620,18 +649,26 @@ export class RuntimeApiClient {
     const runtimeDirs = await readdir(PLATFORMATIC_TMP_DIR, { withFileTypes: true })
     const runtimePIDs = []
 
+    this.#debugLogger('Candidate runtime paths', runtimeDirs)
+
     for (const runtimeDir of runtimeDirs) {
       // Only consider directory that can be a PID
       if (runtimeDir.isDirectory() && runtimeDir.name.match(/^\d+$/)) {
         runtimePIDs.push(parseInt(runtimeDir.name))
       }
     }
+
+    this.#debugLogger('Runtime PIDS', runtimePIDs)
+
     return runtimePIDs
   }
 
   async #getWindowsRuntimePIDs () {
     const pipeNames = await this.#getWindowsNamedPipes()
     const runtimePIDs = []
+
+    this.#debugLogger('Available named pipes', pipeNames)
+
     for (const pipeName of pipeNames) {
       if (pipeName.startsWith(PLATFORMATIC_PIPE_PREFIX)) {
         const runtimePID = pipeName.replace(PLATFORMATIC_PIPE_PREFIX, '')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "3.35.1",
+  "version": "3.36.0",
   "description": "Platformatic Control",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,8 +23,8 @@
     "split2": "^4.2.0",
     "tsd": "^0.33.0",
     "typescript": "^5.5.4",
-    "@platformatic/runtime": "3.35.1",
-    "@platformatic/service": "3.35.1"
+    "@platformatic/runtime": "3.36.0",
+    "@platformatic/service": "3.36.0"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -34,7 +34,7 @@
     "table": "^6.8.1",
     "undici": "^7.0.0",
     "ws": "^8.16.0",
-    "@platformatic/foundation": "3.35.1"
+    "@platformatic/foundation": "3.36.0"
   },
   "engines": {
     "node": ">=22.19.0"