@platformatic/control 2.0.0-alpha.15 → 2.0.0-alpha.17

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,6 +18,7 @@ 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.'),

package/lib/reload.js

@@ -8,16 +8,16 @@ async function reloadRuntimeCommand (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()
   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/runtime-api-client.js

@@ -62,7 +62,7 @@ class RuntimeApiClient {
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/metadata',
-      method: 'GET',
+      method: 'GET'
     })
 
     if (statusCode !== 200) {
@@ -79,7 +79,7 @@ class RuntimeApiClient {
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/services',
-      method: 'GET',
+      method: 'GET'
     })
 
     if (statusCode !== 200) {
@@ -91,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`,
-      method: 'GET',
+      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',
-      method: 'GET',
+      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) {
@@ -130,7 +141,7 @@ class RuntimeApiClient {
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/env',
-      method: 'GET',
+      method: 'GET'
     })
 
     if (statusCode !== 200) {
@@ -142,22 +153,57 @@ 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',
-      method: 'POST',
+      path: '/api/v1/restart',
+      method: 'POST'
     })
 
     if (statusCode !== 200) {
@@ -171,7 +217,7 @@ class RuntimeApiClient {
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/stop',
-      method: 'POST',
+      method: 'POST'
     })
 
     if (statusCode !== 200) {
@@ -210,7 +256,7 @@ class RuntimeApiClient {
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/' + logsId,
       method: 'GET',
-      query: { pid: runtimePID },
+      query: { pid: runtimePID }
     })
 
     if (statusCode !== 200) {
@@ -228,7 +274,7 @@ class RuntimeApiClient {
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/all',
       method: 'GET',
-      query: { pid: runtimePID },
+      query: { pid: runtimePID }
     })
 
     if (statusCode !== 200) {
@@ -246,7 +292,7 @@ class RuntimeApiClient {
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/indexes',
       method: 'GET',
-      query: { all },
+      query: { all }
     })
 
     if (statusCode !== 200) {
@@ -268,7 +314,7 @@ class RuntimeApiClient {
       method: options.method,
       headers: options.headers,
       query: options.query,
-      body: options.body,
+      body: options.body
     })
     return response
   }
@@ -289,7 +335,7 @@ class RuntimeApiClient {
       undiciClient = new Client(
         {
           hostname: 'localhost',
-          protocol: 'http:',
+          protocol: 'http:'
         },
         { socketPath }
       )
@@ -312,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
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.17",
   "description": "Platformatic Control",
   "main": "index.js",
   "bin": {
@@ -25,8 +25,8 @@
     "split2": "^4.2.0",
     "tsd": "^0.31.0",
     "typescript": "^5.5.4",
-    "@platformatic/runtime": "2.0.0-alpha.15",
-    "@platformatic/service": "2.0.0-alpha.15"
+    "@platformatic/service": "2.0.0-alpha.17",
+    "@platformatic/runtime": "2.0.0-alpha.17"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -37,7 +37,7 @@
     "table": "^6.8.1",
     "undici": "^6.9.0",
     "ws": "^8.16.0",
-    "@platformatic/utils": "2.0.0-alpha.15"
+    "@platformatic/utils": "2.0.0-alpha.17"
   },
   "scripts": {
     "test": "pnpm run lint && pnpm run unit",