@platformatic/runtime 1.33.0 → 1.35.1

package/fixtures/typescript/services/composer/.env

@@ -0,0 +1,4 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3000
+PLT_SERVER_LOGGER_LEVEL=info
+PLT_EXAMPLE_ORIGIN=

package/fixtures/typescript/services/movies/dist/plugin.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1(app) {
+}
+exports.default = default_1;
+//# sourceMappingURL=plugin.js.map

package/fixtures/typescript/services/movies/dist/plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../plugin.ts"],"names":[],"mappings":";;AAGe,KAAK,oBAAW,GAAoB;AACnD,CAAC;AADD,4BACC"}

package/fixtures/typescript/services/titles/.env

@@ -0,0 +1,3 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3002
+PLT_SERVER_LOGGER_LEVEL=info

package/fixtures/typescript/services/titles/dist/plugins/example.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1(fastify, opts) {
+    fastify.decorate('example', 'foobar');
+}
+exports.default = default_1;
+//# sourceMappingURL=example.js.map

package/fixtures/typescript/services/titles/dist/plugins/example.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"example.js","sourceRoot":"","sources":["../../plugins/example.ts"],"names":[],"mappings":";;AAGe,KAAK,oBAAW,OAAwB,EAAE,IAA0B;IACjF,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;AACvC,CAAC;AAFD,4BAEC"}

package/fixtures/typescript/services/titles/dist/routes/root.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1(fastify, opts) {
+    fastify.get('/', async (request, reply) => {
+        return { hello: fastify.example };
+    });
+    fastify.get('/titles', async (request, reply) => {
+        const movies = await fastify.client.getMovies({});
+        const titles = movies.map((movie) => movie.title);
+        return { titles };
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=root.js.map

package/fixtures/typescript/services/titles/dist/routes/root.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"root.js","sourceRoot":"","sources":["../../routes/root.ts"],"names":[],"mappings":";;AAUe,KAAK,oBAAW,OAAwB,EAAE,IAA0B;IACjF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACxC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACjD,OAAO,EAAE,MAAM,EAAE,CAAA;IACnB,CAAC,CAAC,CAAA;AACJ,CAAC;AAVD,4BAUC"}

package/fixtures/typescript-custom-flags/services/composer/.env

@@ -0,0 +1,4 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3000
+PLT_SERVER_LOGGER_LEVEL=info
+PLT_EXAMPLE_ORIGIN=

package/fixtures/typescript-custom-flags/services/movies/.env

@@ -0,0 +1,4 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3001
+PLT_SERVER_LOGGER_LEVEL=info
+DATABASE_URL=sqlite://./db.sqlite

package/fixtures/typescript-custom-flags/services/titles/.env

@@ -0,0 +1,3 @@
+PLT_SERVER_HOSTNAME=127.0.0.1
+PORT=3002
+PLT_SERVER_LOGGER_LEVEL=info

package/lib/api-client.js

@@ -1,9 +1,16 @@
 'use strict'
 
+const { tmpdir } = require('node:os')
+const { join } = require('node:path')
 const { once, EventEmitter } = require('node:events')
-const { randomUUID } = require('node:crypto')
-const errors = require('./errors')
+const { randomUUID, createHash } = require('node:crypto')
+const { createReadStream, watch } = require('node:fs')
+const { readdir, readFile, stat, access } = require('node:fs/promises')
 const { setTimeout: sleep } = require('node:timers/promises')
+const errors = require('./errors')
+const ts = require('tail-file-stream')
+
+const platformaticVersion = require('../package.json').version
 
 const MAX_LISTENERS_COUNT = 100
 const MAX_METRICS_QUEUE_LENGTH = 5 * 60 // 5 minutes in seconds
@@ -12,14 +19,18 @@ const COLLECT_METRICS_TIMEOUT = 1000
 class RuntimeApiClient extends EventEmitter {
   #exitCode
   #exitPromise
+  #configManager
+  #runtimeTmpDir
   #metrics
   #metricsTimeout
 
-  constructor (worker) {
+  constructor (worker, configManager) {
     super()
     this.setMaxListeners(MAX_LISTENERS_COUNT)
 
     this.worker = worker
+    this.#configManager = configManager
+    this.#runtimeTmpDir = getRuntimeTmpDir(configManager.dirname)
     this.#exitPromise = this.#exitHandler()
     this.worker.on('message', (message) => {
       if (message.operationId) {
@@ -28,6 +39,37 @@ class RuntimeApiClient extends EventEmitter {
     })
   }
 
+  async #getRuntimePackageJson () {
+    const runtimeDir = this.#configManager.dirname
+    const packageJsonPath = join(runtimeDir, 'package.json')
+    const packageJsonFile = await readFile(packageJsonPath, 'utf8')
+    const packageJson = JSON.parse(packageJsonFile)
+    return packageJson
+  }
+
+  async getRuntimeMetadata () {
+    const packageJson = await this.#getRuntimePackageJson()
+    const entrypointDetails = await this.getEntrypointDetails()
+
+    return {
+      pid: process.pid,
+      cwd: process.cwd(),
+      argv: process.argv,
+      uptimeSeconds: Math.floor(process.uptime()),
+      execPath: process.execPath,
+      nodeVersion: process.version,
+      projectDir: this.#configManager.dirname,
+      packageName: packageJson.name ?? null,
+      packageVersion: packageJson.version ?? null,
+      url: entrypointDetails?.url ?? null,
+      platformaticVersion
+    }
+  }
+
+  getRuntimeConfig () {
+    return this.#configManager.current
+  }
+
   async start () {
     const address = await this.#sendCommand('plt:start-services')
     this.emit('start', address)
@@ -217,6 +259,162 @@ class RuntimeApiClient extends EventEmitter {
     }, COLLECT_METRICS_TIMEOUT).unref()
   }
 
+  async pipeLogsStream (writableStream, logger, startLogId, endLogId, runtimePID) {
+    endLogId = endLogId || Infinity
+    runtimePID = runtimePID ?? process.pid
+
+    const runtimeLogFiles = await this.#getRuntimeLogFiles(runtimePID)
+    if (runtimeLogFiles.length === 0) {
+      writableStream.end()
+      return
+    }
+
+    let latestFileId = parseInt(runtimeLogFiles.at(-1).slice('logs.'.length))
+
+    let waiting = false
+    let fileStream = null
+    let fileId = startLogId ?? latestFileId
+
+    const runtimeLogsDir = this.#getRuntimeLogsDir(runtimePID)
+
+    const watcher = watch(runtimeLogsDir, async (event, filename) => {
+      if (event === 'rename' && filename.startsWith('logs')) {
+        const logFileId = parseInt(filename.slice('logs.'.length))
+        if (logFileId > latestFileId) {
+          latestFileId = logFileId
+          if (waiting) {
+            streamLogFile(++fileId)
+          }
+        }
+      }
+    }).unref()
+
+    const streamLogFile = () => {
+      if (fileId > endLogId) {
+        writableStream.end()
+        return
+      }
+
+      const fileName = 'logs.' + fileId
+      const filePath = join(runtimeLogsDir, fileName)
+
+      const prevFileStream = fileStream
+
+      fileStream = ts.createReadStream(filePath)
+      fileStream.pipe(writableStream, { end: false })
+
+      if (prevFileStream) {
+        prevFileStream.unpipe(writableStream)
+        prevFileStream.destroy()
+      }
+
+      fileStream.on('error', (err) => {
+        logger.error(err, 'Error streaming log file')
+        fileStream.destroy()
+        watcher.close()
+        writableStream.end()
+      })
+
+      fileStream.on('data', () => {
+        waiting = false
+      })
+
+      fileStream.on('eof', () => {
+        if (fileId >= endLogId) {
+          writableStream.end()
+          return
+        }
+        if (latestFileId > fileId) {
+          streamLogFile(++fileId)
+        } else {
+          waiting = true
+        }
+      })
+
+      return fileStream
+    }
+
+    streamLogFile(fileId)
+
+    writableStream.on('close', () => {
+      watcher.close()
+      fileStream.destroy()
+    })
+    writableStream.on('error', () => {
+      watcher.close()
+      fileStream.destroy()
+    })
+  }
+
+  async getLogIds () {
+    const runtimesLogFiles = await this.#getAllLogsFiles()
+    const runtimesLogsIds = []
+
+    for (const runtime of runtimesLogFiles) {
+      const runtimeLogIds = []
+      for (const logFile of runtime.runtimeLogFiles) {
+        const logId = parseInt(logFile.slice('logs.'.length))
+        runtimeLogIds.push(logId)
+      }
+      runtimesLogsIds.push({
+        pid: runtime.runtimePID,
+        indexes: runtimeLogIds
+      })
+    }
+
+    return runtimesLogsIds
+  }
+
+  async getLogFileStream (logFileId, runtimePID) {
+    const runtimeLogsDir = this.#getRuntimeLogsDir(runtimePID)
+    const filePath = join(runtimeLogsDir, `logs.${logFileId}`)
+    return createReadStream(filePath)
+  }
+
+  #getRuntimeLogsDir (runtimePID) {
+    return join(this.#runtimeTmpDir, runtimePID.toString(), 'logs')
+  }
+
+  async #getRuntimeLogFiles (runtimePID) {
+    const runtimeLogsDir = this.#getRuntimeLogsDir(runtimePID)
+    const runtimeLogsFiles = await readdir(runtimeLogsDir)
+    return runtimeLogsFiles
+      .filter((file) => file.startsWith('logs'))
+      .sort((log1, log2) => {
+        const index1 = parseInt(log1.slice('logs.'.length))
+        const index2 = parseInt(log2.slice('logs.'.length))
+        return index1 - index2
+      })
+  }
+
+  async #getAllLogsFiles () {
+    try {
+      await access(this.#runtimeTmpDir)
+    } catch (error) {
+      return []
+    }
+
+    const runtimePIDs = await readdir(this.#runtimeTmpDir)
+    const runtimesLogFiles = []
+
+    for (const runtimePID of runtimePIDs) {
+      const runtimeLogsDir = this.#getRuntimeLogsDir(runtimePID)
+      const runtimeLogsDirStat = await stat(runtimeLogsDir)
+      const runtimeLogFiles = await this.#getRuntimeLogFiles(runtimePID)
+      const lastModified = runtimeLogsDirStat.mtime
+
+      runtimesLogFiles.push({
+        runtimePID: parseInt(runtimePID),
+        runtimeLogFiles,
+        lastModified
+      })
+    }
+
+    return runtimesLogFiles.sort(
+      (runtime1, runtime2) => runtime1.lastModified - runtime2.lastModified
+    )
+  }
+
   async #sendCommand (command, params = {}) {
     const operationId = randomUUID()
 
@@ -248,4 +446,19 @@ class RuntimeApiClient extends EventEmitter {
   }
 }
 
-module.exports = RuntimeApiClient
+function getRuntimeTmpDir (runtimeDir) {
+  const platformaticTmpDir = join(tmpdir(), 'platformatic', 'applications')
+  const runtimeDirHash = createHash('md5').update(runtimeDir).digest('hex')
+  return join(platformaticTmpDir, runtimeDirHash)
+}
+
+function getRuntimeLogsDir (runtimeDir, runtimePID) {
+  const runtimeTmpDir = getRuntimeTmpDir(runtimeDir)
+  return join(runtimeTmpDir, runtimePID.toString(), 'logs')
+}
+
+module.exports = {
+  RuntimeApiClient,
+  getRuntimeTmpDir,
+  getRuntimeLogsDir
+}

package/lib/api.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { once } = require('node:events')
 const { getGlobalDispatcher, setGlobalDispatcher } = require('undici')
 const { createFastifyInterceptor } = require('fastify-undici-dispatcher')
 const { PlatformaticApp } = require('./app')
@@ -84,9 +85,11 @@ class RuntimeApi {
     }))
 
     for (const service of services) {
-      if (service.getStatus() === 'started') {
-        return
-      }
+      const serviceStatus = service.getStatus()
+      if (
+        serviceStatus === 'starting' ||
+        serviceStatus === 'started'
+      ) return
     }
 
     if (this.#dispatcher) {
@@ -159,6 +162,11 @@ class RuntimeApi {
     const stopServiceReqs = []
     for (const service of this.#services.values()) {
       const serviceStatus = service.getStatus()
+      if (serviceStatus === 'starting') {
+        stopServiceReqs.push(
+          once(service, 'start').then(() => service.stop())
+        )
+      }
       if (serviceStatus === 'started') {
         stopServiceReqs.push(service.stop())
       }
@@ -169,10 +177,13 @@ class RuntimeApi {
   async #restartServices () {
     let entrypointUrl = null
     for (const service of this.#services.values()) {
-      if (service.server) {
-        await service.restart(true)
+      const serviceStatus = service.getStatus()
+      if (serviceStatus === 'starting') {
+        await once(service, 'start')
       }
 
+      await service.restart(true)
+
       if (service.appConfig.entrypoint) {
         entrypointUrl = service.server.url
       }
@@ -236,18 +247,19 @@ class RuntimeApi {
   #getServiceConfig ({ id }) {
     const service = this.#getServiceById(id)
 
-    const { config } = service
-    if (!config) {
+    const serviceStatus = service.getStatus()
+    if (serviceStatus !== 'started') {
       throw new errors.ServiceNotStartedError(id)
     }
 
-    return config.configManager.current
+    return service.config.configManager.current
   }
 
   async #getServiceOpenapiSchema ({ id }) {
     const service = this.#getServiceById(id)
 
-    if (!service.config) {
+    const serviceStatus = service.getStatus()
+    if (serviceStatus !== 'started') {
       throw new errors.ServiceNotStartedError(id)
     }
 
@@ -267,7 +279,8 @@ class RuntimeApi {
   async #getServiceGraphqlSchema ({ id }) {
     const service = this.#getServiceById(id)
 
-    if (!service.config) {
+    const serviceStatus = service.getStatus()
+    if (serviceStatus !== 'started') {
       throw new errors.ServiceNotStartedError(id)
     }
 
@@ -293,7 +306,8 @@ class RuntimeApi {
       }
     }
 
-    if (!entrypoint.config) {
+    const entrypointStatus = entrypoint.getStatus()
+    if (entrypointStatus !== 'started') {
       throw new errors.ServiceNotStartedError(entrypoint.id)
     }
 
@@ -313,11 +327,23 @@ class RuntimeApi {
 
   async #startService ({ id }) {
     const service = this.#getServiceById(id)
-    await service.start()
+    const serviceStatus = service.getStatus()
+
+    if (serviceStatus === 'starting') {
+      await once(service, 'start')
+    } else {
+      await service.start()
+    }
   }
 
   async #stopService ({ id }) {
     const service = this.#getServiceById(id)
+    const serviceStatus = service.getStatus()
+
+    if (serviceStatus === 'starting') {
+      await once(service, 'start')
+    }
+
     await service.stop()
   }
 

package/lib/app.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { once } = require('node:events')
 const { dirname } = require('node:path')
+const { EventEmitter, once } = require('node:events')
 const { FileWatcher } = require('@platformatic/utils')
 const debounce = require('debounce')
 const { snakeCase } = require('change-case-all')
@@ -9,10 +9,10 @@ const { buildServer } = require('./build-server')
 const { loadConfig } = require('./load-config')
 const errors = require('./errors')
 
-class PlatformaticApp {
+class PlatformaticApp extends EventEmitter {
   #hotReload
   #loaderPort
-  #restarting
+  #starting
   #started
   #originalWatch
   #fileWatcher
@@ -23,13 +23,14 @@ class PlatformaticApp {
   #hasManagementApi
 
   constructor (appConfig, loaderPort, logger, telemetryConfig, serverConfig, hasManagementApi) {
+    super()
     this.appConfig = appConfig
     this.config = null
     this.#hotReload = false
     this.#loaderPort = loaderPort
-    this.#restarting = false
-    this.server = null
+    this.#starting = false
     this.#started = false
+    this.server = null
     this.#originalWatch = null
     this.#fileWatcher = null
     this.#hasManagementApi = !!hasManagementApi
@@ -47,19 +48,18 @@ class PlatformaticApp {
   }
 
   getStatus () {
-    if (this.#started) {
-      return 'started'
-    } else {
-      return 'stopped'
-    }
+    if (this.#starting) return 'starting'
+    if (this.#started) return 'started'
+    return 'stopped'
   }
 
   async restart (force) {
-    if (this.#restarting || !this.#started || (!this.#hotReload && !force)) {
+    if (this.#starting || !this.#started || (!this.#hotReload && !force)) {
       return
     }
 
-    this.#restarting = true
+    this.#starting = true
+    this.#started = false
 
     // The CJS cache should not be cleared from the loader because v20 moved
     // the loader to a different thread with a different CJS cache.
@@ -84,15 +84,18 @@ class PlatformaticApp {
       this.#logger.error({ err })
     }
 
-    this.#restarting = false
+    this.#started = true
+    this.#starting = false
+    this.emit('start')
+    this.emit('restart')
   }
 
   async start () {
-    if (this.#started) {
+    if (this.#starting || this.#started) {
       throw new errors.ApplicationAlreadyStartedError()
     }
 
-    this.#started = true
+    this.#starting = true
 
     await this.#initializeConfig()
     await this.#updateConfig()
@@ -136,10 +139,14 @@ class PlatformaticApp {
       // Make sure the server has run all the onReady hooks before returning.
       await this.server.ready()
     }
+
+    this.#started = true
+    this.#starting = false
+    this.emit('start')
   }
 
   async stop () {
-    if (!this.#started) {
+    if (!this.#started || this.#starting) {
       throw new errors.ApplicationNotStartedError()
     }
 
@@ -147,6 +154,8 @@ class PlatformaticApp {
     await this.server.close()
 
     this.#started = false
+    this.#starting = false
+    this.emit('stop')
   }
 
   async handleProcessLevelEvent ({ signal, err }) {
@@ -172,6 +181,10 @@ class PlatformaticApp {
       this.server.log.info({ signal }, 'received signal')
     }
 
+    if (this.#starting) {
+      await once(this, 'start')
+    }
+
     if (this.#started) {
       await this.stop()
       this.server.log.info('server stopped')

package/lib/config.js

@@ -13,7 +13,15 @@ async function _transformConfig (configManager) {
   const services = config.services ?? []
 
   if (config.autoload) {
-    const { path, exclude = [], mappings = {} } = config.autoload
+    const { exclude = [], mappings = {} } = config.autoload
+    let { path } = config.autoload
+
+    // This is a hack, but it's the only way to not fix the paths for the autoloaded services
+    // while we are upgrading the config
+    if (configManager._fixPaths) {
+      path = pathResolve(configManager.dirname, path)
+    }
+
     const entries = await readdir(path, { withFileTypes: true })
 
     for (let i = 0; i < entries.length; ++i) {
@@ -46,6 +54,7 @@ async function _transformConfig (configManager) {
   }
 
   configManager.current.allowCycles = !!configManager.current.allowCycles
+
   configManager.current.serviceMap = new Map()
   configManager.current.inspectorOptions = undefined
 
@@ -54,7 +63,9 @@ async function _transformConfig (configManager) {
   for (let i = 0; i < services.length; ++i) {
     const service = services[i]
 
-    service.config = pathResolve(service.path, service.config)
+    if (configManager._fixPaths) {
+      service.config = pathResolve(service.path, service.config)
+    }
     service.entrypoint = service.id === config.entrypoint
     service.hotReload = !!config.hotReload
     service.dependencies = []
@@ -74,6 +85,7 @@ async function _transformConfig (configManager) {
   }
 
   configManager.current.services = services
+
   await parseClientsAndComposer(configManager)
 
   if (!configManager.current.allowCycles) {

package/lib/management-api.js

@@ -1,18 +1,17 @@
 'use strict'
 
-const { tmpdir, platform } = require('node:os')
+const { tmpdir } = require('node:os')
+const { platform } = require('node:os')
 const { join } = require('node:path')
-const { readFile, mkdir, rm } = require('node:fs/promises')
+const { mkdir, rm } = require('node:fs/promises')
 const fastify = require('fastify')
 const ws = require('ws')
+const { getRuntimeLogsDir } = require('./api-client.js')
 const errors = require('./errors')
-const { pipeLogsStream, getLogFileStream, getLogIndexes } = require('./logs')
-const platformaticVersion = require('../package.json').version
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
-const runtimeTmpDir = join(PLATFORMATIC_TMP_DIR, process.pid.toString())
 
-async function createManagementApi (configManager, runtimeApiClient) {
+async function createManagementApi (runtimeApiClient) {
   const app = fastify()
   app.log.warn(
     'Runtime Management API is in the experimental stage. ' +
@@ -21,37 +20,15 @@ async function createManagementApi (configManager, runtimeApiClient) {
     'Use of the feature is not recommended in production environments.'
   )
 
-  async function getRuntimePackageJson (cwd) {
-    const packageJsonPath = join(cwd, 'package.json')
-    const packageJsonFile = await readFile(packageJsonPath, 'utf8')
-    const packageJson = JSON.parse(packageJsonFile)
-    return packageJson
-  }
-
   app.register(require('@fastify/websocket'))
 
   app.register(async (app) => {
     app.get('/metadata', async () => {
-      const packageJson = await getRuntimePackageJson(configManager.dirname).catch(() => ({}))
-      const entrypointDetails = await runtimeApiClient.getEntrypointDetails().catch(() => null)
-
-      return {
-        pid: process.pid,
-        cwd: process.cwd(),
-        argv: process.argv,
-        uptimeSeconds: Math.floor(process.uptime()),
-        execPath: process.execPath,
-        nodeVersion: process.version,
-        projectDir: configManager.dirname,
-        packageName: packageJson.name ?? null,
-        packageVersion: packageJson.version ?? null,
-        url: entrypointDetails?.url ?? null,
-        platformaticVersion
-      }
+      return runtimeApiClient.getRuntimeMetadata()
     })
 
     app.get('/config', async () => {
-      return configManager.current
+      return runtimeApiClient.getRuntimeConfig()
     })
 
     app.get('/env', async () => {
@@ -100,6 +77,11 @@ async function createManagementApi (configManager, runtimeApiClient) {
       const { id, '*': requestUrl } = request.params
       app.log.debug('proxy request', { id, requestUrl })
 
+      delete request.headers.connection
+      delete request.headers['content-length']
+      delete request.headers['content-encoding']
+      delete request.headers['transfer-encoding']
+
       const injectParams = {
         method: request.method,
         url: requestUrl || '/',
@@ -142,43 +124,67 @@ async function createManagementApi (configManager, runtimeApiClient) {
     })
 
     app.get('/logs/live', { websocket: true }, async (socket, req) => {
-      const startLogIndex = req.query.start ? parseInt(req.query.start) : null
+      const startLogId = req.query.start ? parseInt(req.query.start) : null
 
-      if (startLogIndex) {
-        const logIndexes = await getLogIndexes()
-        if (!logIndexes.includes(startLogIndex)) {
-          throw new errors.LogFileNotFound(startLogIndex)
+      if (startLogId) {
+        const logIds = await runtimeApiClient.getLogIds()
+        if (!logIds.includes(startLogId)) {
+          throw new errors.LogFileNotFound(startLogId)
         }
       }
 
       const stream = ws.createWebSocketStream(socket)
-      pipeLogsStream(stream, req.log, startLogIndex)
+      runtimeApiClient.pipeLogsStream(stream, req.log, startLogId)
     })
 
-    app.get('/logs/indexes', async () => {
-      const logIndexes = await getLogIndexes()
-      return { indexes: logIndexes }
+    app.get('/logs/indexes', async (req) => {
+      const returnAllIds = req.query.all === 'true'
+
+      const runtimesLogsIds = await runtimeApiClient.getLogIds()
+      if (returnAllIds) {
+        return runtimesLogsIds
+      }
+
+      if (runtimesLogsIds.length === 0) {
+        return []
+      }
+
+      return { indexes: runtimesLogsIds.at(-1).indexes }
     })
 
     app.get('/logs/all', async (req, reply) => {
-      const logIndexes = await getLogIndexes()
-      const startLogIndex = logIndexes.at(0)
-      const endLogIndex = logIndexes.at(-1)
+      const runtimePID = parseInt(req.query.pid) || process.pid
+
+      const allLogIds = await runtimeApiClient.getLogIds()
+      const logsIds = allLogIds.find((logs) => logs.pid === runtimePID)
+      const startLogId = logsIds.indexes.at(0)
+      const endLogId = logsIds.indexes.at(-1)
 
       reply.hijack()
-      pipeLogsStream(reply.raw, req.log, startLogIndex, endLogIndex)
+
+      runtimeApiClient.pipeLogsStream(
+        reply.raw,
+        req.log,
+        startLogId,
+        endLogId,
+        runtimePID
+      )
     })
 
     app.get('/logs/:id', async (req) => {
-      const { id } = req.params
+      const logId = parseInt(req.params.id)
+      const runtimePID = parseInt(req.query.pid) || process.pid
 
-      const logIndex = parseInt(id)
-      const logIndexes = await getLogIndexes()
-      if (!logIndexes.includes(logIndex)) {
-        throw new errors.LogFileNotFound(logIndex)
+      const allLogIds = await runtimeApiClient.getLogIds()
+      const runtimeLogsIds = allLogIds.find((logs) => logs.pid === runtimePID)
+      if (!runtimeLogsIds || !runtimeLogsIds.indexes.includes(logId)) {
+        throw new errors.LogFileNotFound(logId)
       }
 
-      const logFileStream = await getLogFileStream(logIndex)
+      const logFileStream = await runtimeApiClient.getLogFileStream(
+        logId,
+        runtimePID
+      )
       return logFileStream
     })
   }, { prefix: '/api/v1' })
@@ -186,35 +192,35 @@ async function createManagementApi (configManager, runtimeApiClient) {
   return app
 }
 
-async function startManagementApi (configManager, runtimeApiClient) {
+async function startManagementApi (runtimeApiClient, configManager) {
   const runtimePID = process.pid
 
-  let socketPath = null
-  if (platform() === 'win32') {
-    socketPath = '\\\\.\\pipe\\platformatic-' + runtimePID
-  } else {
-    socketPath = join(runtimeTmpDir, 'socket')
-  }
-
   try {
-    await rm(runtimeTmpDir, { recursive: true, force: true }).catch((err) => {
-      if (err.code !== 'ENOENT') {
-        throw new errors.FailedToUnlinkManagementApiSocket(err.message)
-      }
-    })
-    await mkdir(runtimeTmpDir, { recursive: true })
+    const runtimePIDDir = join(PLATFORMATIC_TMP_DIR, runtimePID.toString())
+    if (platform() !== 'win32') {
+      await rm(runtimePIDDir, { recursive: true, force: true }).catch()
+      await mkdir(runtimePIDDir, { recursive: true })
+    }
 
-    const managementApi = await createManagementApi(
-      configManager,
-      runtimeApiClient
-    )
+    const runtimeLogsDir = getRuntimeLogsDir(configManager.dirname, process.pid)
+    await rm(runtimeLogsDir, { recursive: true, force: true }).catch()
+    await mkdir(runtimeLogsDir, { recursive: true })
 
-    if (platform() !== 'win32') {
-      managementApi.addHook('onClose', async () => {
-        await rm(runtimeTmpDir, { recursive: true, force: true }).catch()
-      })
+    let socketPath = null
+    if (platform() === 'win32') {
+      socketPath = '\\\\.\\pipe\\platformatic-' + runtimePID.toString()
+    } else {
+      socketPath = join(runtimePIDDir, 'socket')
     }
 
+    const managementApi = await createManagementApi(runtimeApiClient)
+
+    managementApi.addHook('onClose', async () => {
+      if (platform() !== 'win32') {
+        await rm(runtimePIDDir, { recursive: true, force: true }).catch()
+      }
+    })
+
     await managementApi.listen({ path: socketPath })
     return managementApi
   /* c8 ignore next 4 */

package/lib/schema.js

@@ -10,6 +10,9 @@ const platformaticRuntimeSchema = {
   $schema: 'http://json-schema.org/draft-07/schema#',
   type: 'object',
   properties: {
+    $schema: {
+      type: 'string'
+    },
     autoload: {
       type: 'object',
       additionalProperties: false,
@@ -49,29 +52,6 @@ const platformaticRuntimeSchema = {
     },
     telemetry,
     server,
-    services: {
-      type: 'array',
-      default: [],
-      items: {
-        type: 'object',
-        required: ['id', 'path', 'config'],
-        properties: {
-          id: {
-            type: 'string'
-          },
-          path: {
-            type: 'string',
-            resolvePath: true
-          },
-          config: {
-            type: 'string'
-          },
-          useHttp: {
-            type: 'boolean'
-          }
-        }
-      }
-    },
     entrypoint: {
       type: 'string'
     },
@@ -144,9 +124,6 @@ const platformaticRuntimeSchema = {
         }
       }
     },
-    $schema: {
-      type: 'string'
-    },
     managementApi: {
       anyOf: [
         { type: 'boolean' },
@@ -194,6 +171,28 @@ const platformaticRuntimeSchema = {
           additionalProperties: false
         }
       ]
+    },
+    services: {
+      type: 'array',
+      items: {
+        type: 'object',
+        required: ['id', 'path', 'config'],
+        properties: {
+          id: {
+            type: 'string'
+          },
+          path: {
+            type: 'string',
+            resolvePath: true
+          },
+          config: {
+            type: 'string'
+          },
+          useHttp: {
+            type: 'boolean'
+          }
+        }
+      }
     }
   },
   anyOf: [

package/lib/start.js

@@ -13,7 +13,7 @@ const { loadConfig } = require('./load-config')
 const { startManagementApi } = require('./management-api')
 const { startPrometheusServer } = require('./prom-server.js')
 const { parseInspectorOptions, wrapConfigInRuntimeConfig } = require('./config')
-const RuntimeApiClient = require('./api-client.js')
+const { RuntimeApiClient, getRuntimeLogsDir } = require('./api-client.js')
 const errors = require('./errors')
 const pkg = require('../package.json')
 
@@ -41,6 +41,7 @@ async function buildRuntime (configManager, env = process.env) {
   }
 
   const dirname = configManager.dirname
+  const runtimeLogsDir = getRuntimeLogsDir(dirname, process.pid)
 
   // The configManager cannot be transferred to the worker, so remove it.
   delete config.configManager
@@ -49,7 +50,7 @@ async function buildRuntime (configManager, env = process.env) {
     /* c8 ignore next */
     execArgv: config.hotReload ? kWorkerExecArgv : [],
     transferList: config.loggingPort ? [config.loggingPort] : [],
-    workerData: { config, dirname },
+    workerData: { config, dirname, runtimeLogsDir },
     env
   })
 
@@ -101,13 +102,14 @@ async function buildRuntime (configManager, env = process.env) {
 
   await once(worker, 'message') // plt:init
 
-  const runtimeApiClient = new RuntimeApiClient(worker)
+  const runtimeApiClient = new RuntimeApiClient(
+    worker,
+    configManager,
+    runtimeLogsDir
+  )
 
   if (config.managementApi) {
-    managementApi = await startManagementApi(
-      configManager,
-      runtimeApiClient
-    )
+    managementApi = await startManagementApi(runtimeApiClient, configManager)
     runtimeApiClient.managementApi = managementApi
     runtimeApiClient.on('start', () => {
       runtimeApiClient.startCollectingMetrics()

package/lib/worker.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const inspector = require('node:inspector')
-const { tmpdir } = require('node:os')
 const { register, createRequire } = require('node:module')
 const { isatty } = require('node:tty')
 const { join } = require('node:path')
@@ -19,8 +18,6 @@ const { MessagePortWritable } = require('./message-port-writable')
 const loadInterceptors = require('./interceptors')
 let loaderPort
 
-const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
-
 if (typeof register === 'function' && workerData.config.loaderFile) {
   const { port1, port2 } = new MessageChannel()
   register(workerData.config.loaderFile, {
@@ -69,7 +66,7 @@ function createLogger (config) {
       logsLimitCount = 1
     }
 
-    const logsPath = join(PLATFORMATIC_TMP_DIR, process.pid.toString(), 'logs')
+    const logsPath = join(workerData.runtimeLogsDir, 'logs')
     const pinoRoll = pino.transport({
       target: 'pino-roll',
       options: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.33.0",
+  "version": "1.35.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -20,7 +20,7 @@
     "@fastify/express": "^2.3.0",
     "@fastify/formbody": "^7.4.0",
     "@matteo.collina/tspl": "^0.1.1",
-    "borp": "^0.10.0",
+    "borp": "^0.11.0",
     "c8": "^9.1.0",
     "execa": "^8.0.1",
     "express": "^4.18.3",
@@ -33,8 +33,8 @@
     "typescript": "^5.4.2",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/sql-graphql": "1.33.0",
-    "@platformatic/sql-mapper": "1.33.0"
+    "@platformatic/sql-mapper": "1.35.1",
+    "@platformatic/sql-graphql": "1.35.1"
   },
   "dependencies": {
     "ws": "^8.16.0",
@@ -62,13 +62,13 @@
     "tail-file-stream": "^0.1.0",
     "undici": "^6.9.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "1.33.0",
-    "@platformatic/config": "1.33.0",
-    "@platformatic/db": "1.33.0",
-    "@platformatic/telemetry": "1.33.0",
-    "@platformatic/service": "1.33.0",
-    "@platformatic/generators": "1.33.0",
-    "@platformatic/utils": "1.33.0"
+    "@platformatic/composer": "1.35.1",
+    "@platformatic/generators": "1.35.1",
+    "@platformatic/db": "1.35.1",
+    "@platformatic/config": "1.35.1",
+    "@platformatic/telemetry": "1.35.1",
+    "@platformatic/service": "1.35.1",
+    "@platformatic/utils": "1.35.1"
   },
   "standard": {
     "ignore": [

package/lib/logs.js

@@ -1,123 +0,0 @@
-'use strict'
-
-const { tmpdir } = require('node:os')
-const { join } = require('node:path')
-const { createReadStream, watch } = require('node:fs')
-const { readdir } = require('node:fs/promises')
-const ts = require('tail-file-stream')
-
-const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
-const runtimeTmpDir = join(PLATFORMATIC_TMP_DIR, process.pid.toString())
-
-async function getLogFiles () {
-  const runtimeTmpFiles = await readdir(runtimeTmpDir)
-  const runtimeLogFiles = runtimeTmpFiles
-    .filter((file) => file.startsWith('logs'))
-    .sort((log1, log2) => {
-      const index1 = parseInt(log1.slice('logs.'.length))
-      const index2 = parseInt(log2.slice('logs.'.length))
-      return index1 - index2
-    })
-  return runtimeLogFiles
-}
-
-async function pipeLogsStream (writableStream, logger, startLogIndex, endLogIndex) {
-  endLogIndex = endLogIndex || Infinity
-
-  const runtimeLogFiles = await getLogFiles()
-  if (runtimeLogFiles.length === 0) {
-    writableStream.end()
-    return
-  }
-
-  let latestFileIndex = parseInt(runtimeLogFiles.at(-1).slice('logs.'.length))
-
-  let waiting = false
-  let fileStream = null
-  let fileIndex = startLogIndex ?? latestFileIndex
-
-  const watcher = watch(runtimeTmpDir, async (event, filename) => {
-    if (event === 'rename' && filename.startsWith('logs')) {
-      const logFileIndex = parseInt(filename.slice('logs.'.length))
-      if (logFileIndex > latestFileIndex) {
-        latestFileIndex = logFileIndex
-        if (waiting) {
-          streamLogFile(++fileIndex)
-        }
-      }
-    }
-  }).unref()
-
-  const streamLogFile = () => {
-    if (fileIndex > endLogIndex) {
-      writableStream.end()
-      return
-    }
-
-    const fileName = 'logs.' + fileIndex
-    const filePath = join(runtimeTmpDir, fileName)
-
-    const prevFileStream = fileStream
-
-    fileStream = ts.createReadStream(filePath)
-    fileStream.pipe(writableStream, { end: false })
-
-    if (prevFileStream) {
-      prevFileStream.unpipe(writableStream)
-      prevFileStream.destroy()
-    }
-
-    fileStream.on('error', (err) => {
-      logger.error(err, 'Error streaming log file')
-      fileStream.destroy()
-      watcher.close()
-      writableStream.end()
-    })
-
-    fileStream.on('data', () => {
-      waiting = false
-    })
-
-    fileStream.on('eof', () => {
-      if (fileIndex >= endLogIndex) {
-        writableStream.end()
-        return
-      }
-      if (latestFileIndex > fileIndex) {
-        streamLogFile(++fileIndex)
-      } else {
-        waiting = true
-      }
-    })
-
-    return fileStream
-  }
-
-  streamLogFile(fileIndex)
-
-  writableStream.on('close', () => {
-    watcher.close()
-    fileStream.destroy()
-  })
-  writableStream.on('error', () => {
-    watcher.close()
-    fileStream.destroy()
-  })
-}
-
-async function getLogIndexes () {
-  const runtimeLogFiles = await getLogFiles()
-  return runtimeLogFiles
-    .map((file) => parseInt(file.slice('logs.'.length)))
-}
-
-async function getLogFileStream (logFileIndex) {
-  const filePath = join(runtimeTmpDir, `logs.${logFileIndex}`)
-  return createReadStream(filePath)
-}
-
-module.exports = {
-  pipeLogsStream,
-  getLogFileStream,
-  getLogIndexes
-}