@platformatic/runtime 2.0.0-alpha.2 → 2.0.0-alpha.4

package/lib/management-api.js

@@ -1,22 +1,23 @@
 'use strict'
 
-const { tmpdir } = require('node:os')
-const { platform } = require('node:os')
+const { platform, tmpdir } = require('node:os')
 const { join } = require('node:path')
-const { mkdir, rm } = require('node:fs/promises')
+const { createDirectory, safeRemove } = require('@platformatic/utils')
+
 const fastify = require('fastify')
 const ws = require('ws')
-const { getRuntimeLogsDir } = require('./api-client.js')
+
 const errors = require('./errors')
+const { getRuntimeLogsDir } = require('./utils')
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
 
 async function managementApiPlugin (app, opts) {
   app.log.warn(
     'Runtime Management API is in the experimental stage. ' +
-    'The feature is not subject to semantic versioning rules. ' +
-    'Non-backward compatible changes or removal may occur in any future release. ' +
-    'Use of the feature is not recommended in production environments.'
+      'The feature is not subject to semantic versioning rules. ' +
+      'Non-backward compatible changes or removal may occur in any future release. ' +
+      'Use of the feature is not recommended in production environments.'
   )
 
   const runtime = opts.runtime
@@ -35,7 +36,7 @@ async function managementApiPlugin (app, opts) {
 
   app.post('/stop', async () => {
     app.log.debug('stop services')
-    await runtime.close()
+    await runtime.close(true)
   })
 
   app.post('/reload', async () => {
@@ -47,40 +48,40 @@ async function managementApiPlugin (app, opts) {
     return runtime.getServices()
   })
 
-  app.get('/services/:id', async (request) => {
+  app.get('/services/:id', async request => {
     const { id } = request.params
     app.log.debug('get service details', { id })
     return runtime.getServiceDetails(id)
   })
 
-  app.get('/services/:id/config', async (request) => {
+  app.get('/services/:id/config', async request => {
     const { id } = request.params
     app.log.debug('get service config', { id })
     return runtime.getServiceConfig(id)
   })
 
-  app.get('/services/:id/openapi-schema', async (request) => {
+  app.get('/services/:id/openapi-schema', async request => {
     const { id } = request.params
     app.log.debug('get openapi-schema', { id })
     return runtime.getServiceOpenapiSchema(id)
   })
 
-  app.get('/services/:id/graphql-schema', async (request) => {
+  app.get('/services/:id/graphql-schema', async request => {
     const { id } = request.params
     app.log.debug('get graphql-schema', { id })
     return runtime.getServiceGraphqlSchema(id)
   })
 
-  app.post('/services/:id/start', async (request) => {
+  app.post('/services/:id/start', async request => {
     const { id } = request.params
     app.log.debug('start service', { id })
     await runtime.startService(id)
   })
 
-  app.post('/services/:id/stop', async (request) => {
+  app.post('/services/:id/stop', async request => {
     const { id } = request.params
     app.log.debug('stop service', { id })
-    await runtime.stopService(id)
+    await runtime._stopService(id)
   })
 
   app.all('/services/:id/proxy/*', async (request, reply) => {
@@ -97,27 +98,22 @@ async function managementApiPlugin (app, opts) {
       url: requestUrl || '/',
       headers: request.headers,
       query: request.query,
-      body: request.body
+      body: request.body,
     }
 
     const res = await runtime.inject(id, injectParams)
 
-    reply
-      .code(res.statusCode)
-      .headers(res.headers)
-      .send(res.body)
+    reply.code(res.statusCode).headers(res.headers).send(res.body)
   })
 
-  app.get('/metrics/live', { websocket: true }, async (socket) => {
+  app.get('/metrics/live', { websocket: true }, async socket => {
     const cachedMetrics = runtime.getCachedMetrics()
     if (cachedMetrics.length > 0) {
-      const serializedMetrics = cachedMetrics
-        .map((metric) => JSON.stringify(metric))
-        .join('\n')
+      const serializedMetrics = cachedMetrics.map(metric => JSON.stringify(metric)).join('\n')
       socket.send(serializedMetrics + '\n')
     }
 
-    const eventHandler = (metrics) => {
+    const eventHandler = metrics => {
       const serializedMetrics = JSON.stringify(metrics)
       socket.send(serializedMetrics + '\n')
     }
@@ -147,7 +143,7 @@ async function managementApiPlugin (app, opts) {
     runtime.pipeLogsStream(stream, req.log, startLogId)
   })
 
-  app.get('/logs/indexes', async (req) => {
+  app.get('/logs/indexes', async req => {
     const returnAllIds = req.query.all === 'true'
 
     if (returnAllIds) {
@@ -168,16 +164,10 @@ async function managementApiPlugin (app, opts) {
 
     reply.hijack()
 
-    runtime.pipeLogsStream(
-      reply.raw,
-      req.log,
-      startLogId,
-      endLogId,
-      runtimePID
-    )
+    runtime.pipeLogsStream(reply.raw, req.log, startLogId, endLogId, runtimePID)
   })
 
-  app.get('/logs/:id', async (req) => {
+  app.get('/logs/:id', async req => {
     const logId = parseInt(req.params.id)
     const runtimePID = parseInt(req.query.pid) || process.pid
 
@@ -186,10 +176,7 @@ async function managementApiPlugin (app, opts) {
       throw new errors.LogFileNotFound(logId)
     }
 
-    const logFileStream = await runtime.getLogFileStream(
-      logId,
-      runtimePID
-    )
+    const logFileStream = await runtime.getLogFileStream(logId, runtimePID)
     return logFileStream
   })
 }
@@ -200,13 +187,11 @@ async function startManagementApi (runtime, configManager) {
   try {
     const runtimePIDDir = join(PLATFORMATIC_TMP_DIR, runtimePID.toString())
     if (platform() !== 'win32') {
-      await rm(runtimePIDDir, { recursive: true, force: true }).catch()
-      await mkdir(runtimePIDDir, { recursive: true })
+      await createDirectory(runtimePIDDir, true)
     }
 
     const runtimeLogsDir = getRuntimeLogsDir(configManager.dirname, process.pid)
-    await rm(runtimeLogsDir, { recursive: true, force: true }).catch()
-    await mkdir(runtimeLogsDir, { recursive: true })
+    await createDirectory(runtimeLogsDir, true)
 
     let socketPath = null
     if (platform() === 'win32') {
@@ -221,13 +206,13 @@ async function startManagementApi (runtime, configManager) {
 
     managementApi.addHook('onClose', async () => {
       if (platform() !== 'win32') {
-        await rm(runtimePIDDir, { recursive: true, force: true }).catch()
+        await safeRemove(runtimePIDDir)
       }
     })
 
     await managementApi.listen({ path: socketPath })
     return managementApi
-  /* c8 ignore next 4 */
+    /* c8 ignore next 4 */
   } catch (err) {
     console.error(err)
     process.exit(1)

package/lib/prom-server.js

@@ -2,7 +2,7 @@
 
 const fastify = require('fastify')
 
-async function startPrometheusServer (runtimeApiClient, opts) {
+async function startPrometheusServer (runtime, opts) {
   const host = opts.hostname ?? '0.0.0.0'
   const port = opts.port ?? 9090
   const metricsEndpoint = opts.endpoint ?? '/metrics'
@@ -10,10 +10,6 @@ async function startPrometheusServer (runtimeApiClient, opts) {
 
   const promServer = fastify({ name: 'Prometheus server' })
 
-  runtimeApiClient.on('close', async () => {
-    await promServer.close()
-  })
-
   let onRequestHook
   if (auth) {
     const { username, password } = auth
@@ -24,7 +20,7 @@ async function startPrometheusServer (runtimeApiClient, opts) {
           return reply.code(401).send({ message: 'Unauthorized' })
         }
         return done()
-      }
+      },
     })
     onRequestHook = promServer.basicAuth
   }
@@ -36,9 +32,9 @@ async function startPrometheusServer (runtimeApiClient, opts) {
     onRequest: onRequestHook,
     handler: async (req, reply) => {
       reply.type('text/plain')
-      const { metrics } = await runtimeApiClient.getMetrics('text')
+      const { metrics } = await runtime.getMetrics('text')
       return metrics
-    }
+    },
   })
 
   await promServer.listen({ port, host })
@@ -46,5 +42,5 @@ async function startPrometheusServer (runtimeApiClient, opts) {
 }
 
 module.exports = {
-  startPrometheusServer
+  startPrometheusServer,
 }