@platformatic/control 2.0.0-alpha.2 → 2.0.0-alpha.21

package/control.js

@@ -17,7 +17,7 @@ const streamRuntimeLogsCommand = require('./lib/logs')
 
 const help = helpMe({
   dir: join(__dirname, 'help'),
-  ext: '.txt'
+  ext: '.txt',
 })
 
 const program = commist({ maxDistance: 2 })
@@ -42,9 +42,9 @@ async function runControl (argv) {
   const args = parseArgs({
     args: argv,
     options: {
-      version: { type: 'boolean', short: 'v' }
+      version: { type: 'boolean', short: 'v' },
     },
-    strict: false
+    strict: false,
   }).values
 
   if (args.version && argv[0] !== 'inject') {
@@ -79,5 +79,5 @@ module.exports = {
   stopRuntimeCommand,
   restartRuntimeCommand,
   injectRuntimeCommand,
-  streamRuntimeLogsCommand
+  streamRuntimeLogsCommand,
 }

package/eslint.config.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('neostandard')({})

package/index.js

@@ -3,5 +3,5 @@
 const RuntimeApiClient = require('./lib/runtime-api-client')
 
 module.exports = {
-  RuntimeApiClient
+  RuntimeApiClient,
 }

package/lib/config.js

@@ -9,9 +9,9 @@ async function getRuntimeConfigCommand (argv) {
     options: {
       pid: { type: 'string', short: 'p' },
       name: { type: 'string', short: 'n' },
-      service: { type: 'string', short: 's' }
+      service: { type: 'string', short: 's' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/lib/env.js

@@ -8,9 +8,9 @@ async function getRuntimeEnvCommand (argv) {
     args: argv,
     options: {
       pid: { type: 'string', short: 'p' },
-      name: { type: 'string', short: 'n' }
+      name: { type: 'string', short: 'n' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/lib/errors.js

@@ -6,6 +6,7 @@ const ERROR_PREFIX = 'PLT_CTR'
 
 module.exports = {
   RuntimeNotFound: createError(`${ERROR_PREFIX}_RUNTIME_NOT_FOUND`, 'Runtime not found.'),
+  ServiceNotFound: createError(`${ERROR_PREFIX}_SERVICE_NOT_FOUND`, 'Service not found.'),
   MissingRuntimeIdentifier: createError(`${ERROR_PREFIX}_MISSING_RUNTIME_IDENTIFIER`, 'Runtime name or PID is required.'),
   MissingRequestURL: createError(`${ERROR_PREFIX}_MISSING_REQUEST_URL`, 'Request URL is required.'),
   FailedToGetRuntimeMetadata: createError(`${ERROR_PREFIX}_FAILED_TO_GET_RUNTIME_METADATA`, 'Failed to get runtime metadata %s.'),
@@ -17,8 +18,9 @@ module.exports = {
   FailedToStopRuntime: createError(`${ERROR_PREFIX}_FAILED_TO_STOP_RUNTIME`, 'Failed to stop the runtime %s.'),
   FailedToReloadRuntime: createError(`${ERROR_PREFIX}_FAILED_TO_RELOAD_RUNTIME`, 'Failed to reload the runtime %s.'),
   FailedToGetRuntimeConfig: createError(`${ERROR_PREFIX}_FAILED_TO_GET_RUNTIME_CONFIG`, 'Failed to get runtime config %s.'),
+  FailedToGetRuntimeServiceEnv: createError(`${ERROR_PREFIX}_FAILED_TO_GET_RUNTIME_SERVICE_ENV`, 'Failed to get runtime service environment variables %s.'),
   FailedToGetRuntimeServiceConfig: createError(`${ERROR_PREFIX}_FAILED_TO_GET_RUNTIME_SERVICE_CONFIG`, 'Failed to get runtime service config %s.'),
   FailedToGetRuntimeHistoryLogs: createError(`${ERROR_PREFIX}_FAILED_TO_GET_HISTORY_LOGS`, 'Failed to get history logs %s.'),
   FailedToGetRuntimeAllLogs: createError(`${ERROR_PREFIX}_FAILED_TO_GET_RUNTIME_ALL_LOGS`, 'Failed to get runtime all logs %s.'),
-  FailedToGetRuntimeLogIndexes: createError(`${ERROR_PREFIX}_FAILED_TO_GET_HISTORY_LOGS_COUNT`, 'Failed to get history logs count %s.')
+  FailedToGetRuntimeLogIndexes: createError(`${ERROR_PREFIX}_FAILED_TO_GET_HISTORY_LOGS_COUNT`, 'Failed to get history logs count %s.'),
 }

package/lib/inject.js

@@ -17,9 +17,9 @@ async function injectRuntimeCommand (argv) {
       data: { type: 'string', short: 'd' },
       include: { type: 'boolean', short: 'i', default: false },
       verbose: { type: 'boolean', short: 'v', default: false },
-      output: { type: 'string', short: 'o' }
+      output: { type: 'string', short: 'o' },
     },
-    strict: false
+    strict: false,
   })
 
   const client = new RuntimeApiClient()

package/lib/logs.js

@@ -10,7 +10,7 @@ const pinoLogLevels = {
   warn: 40,
   info: 30,
   debug: 20,
-  trace: 10
+  trace: 10,
 }
 
 async function streamRuntimeLogsCommand (argv) {
@@ -21,9 +21,9 @@ async function streamRuntimeLogsCommand (argv) {
       name: { type: 'string', short: 'n' },
       level: { type: 'string', short: 'l', default: 'info' },
       pretty: { type: 'string', default: 'true' },
-      service: { type: 'string', short: 's' }
+      service: { type: 'string', short: 's' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/lib/ps.js

@@ -6,29 +6,29 @@ const RuntimeApiClient = require('./runtime-api-client')
 const tableColumns = [
   {
     value: 'pid',
-    alias: 'PID'
+    alias: 'PID',
   },
   {
     value: 'packageName',
-    alias: 'NAME'
+    alias: 'NAME',
   },
   {
     value: 'platformaticVersion',
-    alias: 'PLT'
+    alias: 'PLT',
   },
   {
     value: 'uptimeSeconds',
     alias: 'TIME',
-    formatter: formatRuntimeTime
+    formatter: formatRuntimeTime,
   },
   {
     value: 'url',
-    alias: 'URL'
+    alias: 'URL',
   },
   {
     value: 'projectDir',
-    alias: 'PWD'
-  }
+    alias: 'PWD',
+  },
 ]
 
 function formatRuntimeTime (timeSeconds) {
@@ -56,9 +56,9 @@ const tableConfig = {
   border: getBorderCharacters('void'),
   columnDefault: {
     paddingLeft: 0,
-    paddingRight: 1
+    paddingRight: 1,
   },
-  drawHorizontalLine: () => false
+  drawHorizontalLine: () => false,
 }
 
 async function printRuntimes (runtimes) {

package/lib/reload.js

@@ -16,8 +16,8 @@ async function reloadRuntimeCommand (argv) {
   const client = new RuntimeApiClient()
   const runtime = await client.getMatchingRuntime(args)
 
-  await client.reloadRuntime(runtime.pid)
-  console.log(`Reloaded runtime "${runtime.packageName}".`)
+  const child = await client.reloadRuntime(runtime.pid)
+  console.log(`Reloaded runtime "${runtime.packageName}". The new PID is ${child.pid}.`)
 
   await client.close()
 }

package/lib/restart.js

@@ -8,9 +8,9 @@ async function restartRuntimeCommand (argv) {
     args: argv,
     options: {
       pid: { type: 'string', short: 'p' },
-      name: { type: 'string', short: 'n' }
+      name: { type: 'string', short: 'n' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/lib/runtime-api-client.js

@@ -3,11 +3,12 @@
 const { tmpdir, platform, EOL } = require('node:os')
 const { join } = require('node:path')
 const { exec, spawn } = require('node:child_process')
-const { readdir, rm, access } = require('node:fs/promises')
+const { readdir, access } = require('node:fs/promises')
 const { Readable } = require('node:stream')
 const { Client } = require('undici')
 const WebSocket = require('ws')
 const errors = require('./errors.js')
+const { safeRemove } = require('@platformatic/utils')
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
 const PLATFORMATIC_PIPE_PREFIX = '\\\\.\\pipe\\platformatic-'
@@ -34,12 +35,10 @@ class RuntimeApiClient {
   }
 
   async getRuntimes () {
-    const runtimePIDs = platform() === 'win32'
-      ? await this.#getWindowsRuntimePIDs()
-      : await this.#getUnixRuntimePIDs()
+    const runtimePIDs = platform() === 'win32' ? await this.#getWindowsRuntimePIDs() : await this.#getUnixRuntimePIDs()
 
     const getMetadataRequests = await Promise.allSettled(
-      runtimePIDs.map(async (runtimePID) => {
+      runtimePIDs.map(async runtimePID => {
         return this.getRuntimeMetadata(runtimePID)
       })
     )
@@ -92,38 +91,49 @@ class RuntimeApiClient {
     return runtimeServices
   }
 
-  async getRuntimeServiceConfig (pid, serviceId) {
+  async getRuntimeConfig (pid) {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: `/api/v1/services/${serviceId}/config`,
+      path: '/api/v1/config',
       method: 'GET'
     })
 
     if (statusCode !== 200) {
       const error = await body.text()
-      throw new errors.FailedToGetRuntimeServiceConfig(error)
+      throw new errors.FailedToGetRuntimeConfig(error)
     }
 
-    const serviceConfig = await body.json()
-    return serviceConfig
+    const runtimeConfig = await body.json()
+    return runtimeConfig
   }
 
-  async getRuntimeConfig (pid) {
+  async getRuntimeServiceConfig (pid, serviceId) {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/v1/config',
+      path: `/api/v1/services/${serviceId}/config`,
       method: 'GET'
     })
 
     if (statusCode !== 200) {
       const error = await body.text()
-      throw new errors.FailedToGetRuntimeConfig(error)
+      let jsonError
+      try {
+        jsonError = JSON.parse(error)
+      } catch {
+        // No-op
+      }
+
+      if (jsonError?.code === 'PLT_RUNTIME_SERVICE_NOT_FOUND') {
+        throw new errors.ServiceNotFound(error)
+      }
+
+      throw new errors.FailedToGetRuntimeServiceConfig(error)
     }
 
-    const runtimeConfig = await body.json()
-    return runtimeConfig
+    const serviceConfig = await body.json()
+    return serviceConfig
   }
 
   async getRuntimeEnv (pid) {
@@ -143,21 +153,56 @@ class RuntimeApiClient {
     return runtimeEnv
   }
 
-  async restartRuntime (pid, options = {}) {
+  async getRuntimeServiceEnv (pid, serviceId) {
+    const client = this.#getUndiciClient(pid)
+
+    const { statusCode, body } = await client.request({
+      path: `/api/v1/services/${serviceId}/env`,
+      method: 'GET'
+    })
+
+    if (statusCode !== 200) {
+      const error = await body.text()
+      let jsonError
+      try {
+        jsonError = JSON.parse(error)
+      } catch {
+        // No-op
+      }
+
+      if (jsonError?.code === 'PLT_RUNTIME_SERVICE_NOT_FOUND') {
+        throw new errors.ServiceNotFound(error)
+      }
+
+      throw new errors.FailedToGetRuntimeServiceEnv(error)
+    }
+
+    const serviceConfig = await body.json()
+    return serviceConfig
+  }
+
+  async reloadRuntime (pid, options = {}) {
     const runtime = await this.getMatchingRuntime({ pid })
 
     await this.stopRuntime(pid)
 
     const [startCommand, ...startArgs] = runtime.argv
-    const child = spawn(startCommand, startArgs, { cwd: runtime.cwd, ...options })
+    const child = spawn(startCommand, startArgs, { cwd: runtime.cwd, ...options, stdio: 'ignore', detached: true })
+
+    await new Promise((resolve, reject) => {
+      child.on('spawn', resolve)
+      child.on('error', reject)
+    })
+
+    child.unref()
     return child
   }
 
-  async reloadRuntime (pid) {
+  async restartRuntime (pid) {
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
-      path: '/api/v1/reload',
+      path: '/api/v1/restart',
       method: 'POST'
     })
 
@@ -287,10 +332,13 @@ class RuntimeApiClient {
     let undiciClient = this.#undiciClients.get(pid)
     if (!undiciClient) {
       const socketPath = this.#getSocketPathFromPid(pid)
-      undiciClient = new Client({
-        hostname: 'localhost',
-        protocol: 'http:'
-      }, { socketPath })
+      undiciClient = new Client(
+        {
+          hostname: 'localhost',
+          protocol: 'http:'
+        },
+        { socketPath }
+      )
 
       this.#undiciClients.set(pid, undiciClient)
     }
@@ -310,10 +358,15 @@ class RuntimeApiClient {
     } catch {
       return []
     }
-    const runtimeDirs = await readdir(PLATFORMATIC_TMP_DIR)
+
+    const runtimeDirs = await readdir(PLATFORMATIC_TMP_DIR, { withFileTypes: true })
     const runtimePIDs = []
-    for (const runtimeDirName of runtimeDirs) {
-      runtimePIDs.push(parseInt(runtimeDirName))
+
+    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))
+      }
     }
     return runtimePIDs
   }
@@ -332,24 +385,20 @@ class RuntimeApiClient {
 
   async #getWindowsNamedPipes () {
     return new Promise((resolve, reject) => {
-      exec(
-        '[System.IO.Directory]::GetFiles("\\\\.\\pipe\\")',
-        { shell: 'powershell.exe' },
-        (err, stdout) => {
-          if (err) {
-            reject(err)
-            return
-          }
-          const namedPipes = stdout.split(EOL)
-          resolve(namedPipes)
+      exec('[System.IO.Directory]::GetFiles("\\\\.\\pipe\\")', { shell: 'powershell.exe' }, (err, stdout) => {
+        if (err) {
+          reject(err)
+          return
         }
-      )
+        const namedPipes = stdout.split(EOL)
+        resolve(namedPipes)
+      })
     })
   }
 
   async #removeRuntimeTmpDir (pid) {
     const runtimeDir = join(PLATFORMATIC_TMP_DIR, pid.toString())
-    await rm(runtimeDir, { recursive: true, force: true })
+    await safeRemove(runtimeDir)
   }
 }
 
@@ -358,13 +407,13 @@ class WebSocketStream extends Readable {
     super()
     this.ws = new WebSocket(url)
 
-    this.ws.on('message', (data) => {
+    this.ws.on('message', data => {
       this.push(data)
     })
     this.ws.on('close', () => {
       this.push(null)
     })
-    this.ws.on('error', (err) => {
+    this.ws.on('error', err => {
       this.emit('error', new errors.FailedToStreamRuntimeLogs(err.message))
     })
     this.on('close', () => {

package/lib/services.js

@@ -7,28 +7,28 @@ const RuntimeApiClient = require('./runtime-api-client')
 const tableColumns = [
   {
     value: 'id',
-    alias: 'NAME'
+    alias: 'NAME',
   },
   {
     value: 'type',
-    alias: 'TYPE'
+    alias: 'TYPE',
   },
   {
     value: 'entrypoint',
     alias: 'ENTRYPOINT',
     formatter: (entrypoint) => {
       return entrypoint ? 'yes' : 'no'
-    }
-  }
+    },
+  },
 ]
 
 const tableConfig = {
   border: getBorderCharacters('void'),
   columnDefault: {
     paddingLeft: 0,
-    paddingRight: 1
+    paddingRight: 1,
   },
-  drawHorizontalLine: () => false
+  drawHorizontalLine: () => false,
 }
 
 async function printRuntimeServices (services) {
@@ -56,9 +56,9 @@ async function getRuntimeServicesCommand (argv) {
     args: argv,
     options: {
       pid: { type: 'string', short: 'p' },
-      name: { type: 'string', short: 'n' }
+      name: { type: 'string', short: 'n' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/lib/stop.js

@@ -8,9 +8,9 @@ async function stopRuntimeCommand (argv) {
     args: argv,
     options: {
       pid: { type: 'string', short: 'p' },
-      name: { type: 'string', short: 'n' }
+      name: { type: 'string', short: 'n' },
     },
-    strict: false
+    strict: false,
   }).values
 
   const client = new RuntimeApiClient()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.21",
   "description": "Platformatic Control",
   "main": "index.js",
   "bin": {
@@ -17,29 +17,31 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "borp": "^0.16.0",
+    "borp": "^0.17.0",
     "desm": "^1.3.1",
+    "eslint": "9",
     "execa": "^8.0.1",
-    "snazzy": "^9.0.0",
+    "neostandard": "^0.11.1",
     "split2": "^4.2.0",
-    "standard": "^17.1.0",
     "tsd": "^0.31.0",
-    "@platformatic/runtime": "2.0.0-alpha.2"
+    "typescript": "^5.5.4",
+    "@platformatic/service": "2.0.0-alpha.21",
+    "@platformatic/runtime": "2.0.0-alpha.21"
   },
   "dependencies": {
-    "@fastify/error": "^3.4.1",
+    "@fastify/error": "^4.0.0",
     "commist": "^3.2.0",
     "help-me": "^5.0.0",
-    "pino": "^8.19.0",
+    "pino": "^9.0.0",
     "pino-pretty": "^11.0.0",
     "table": "^6.8.1",
     "undici": "^6.9.0",
-    "ws": "^8.16.0"
+    "ws": "^8.16.0",
+    "@platformatic/utils": "2.0.0-alpha.21"
   },
   "scripts": {
     "test": "pnpm run lint && pnpm run unit",
-    "unit": "borp --concurrency=1 --timeout 60000",
-    "build": "node lib/schema.js | json2ts > config.d.ts",
-    "lint": "standard | snazzy"
+    "unit": "borp --concurrency=1 --timeout=180000",
+    "lint": "eslint"
   }
 }