@platformatic/runtime 2.6.1 → 2.8.0-alpha.1

package/config.d.ts

@@ -5,12 +5,13 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime261Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime280Alpha1Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;
   preload?: string;
   entrypoint?: string;
+  basePath?: string;
   autoload?: {
     path: string;
     exclude?: string[];
@@ -25,6 +26,7 @@ export type HttpsSchemasPlatformaticDevPlatformaticRuntime261Json = {
   services?: {
     [k: string]: unknown;
   }[];
+  workers?: number;
   web?: {
     [k: string]: unknown;
   }[];

package/eslint.config.js

@@ -4,5 +4,5 @@ const neostandard = require('neostandard')
 
 module.exports = neostandard({
   ts: true,
-  ignores: [...neostandard.resolveIgnoresFromGitignore(), 'test/tmp/**/*', 'dist/**/*'],
+  ignores: [...neostandard.resolveIgnoresFromGitignore(), 'test/tmp/**/*', 'dist/**/*']
 })

package/lib/config.js

@@ -71,7 +71,7 @@ async function _transformConfig (configManager, args) {
       const existingServiceId = services.findIndex(service => service.id === id)
 
       if (existingServiceId !== -1) {
-        services[existingServiceId] = service
+        services[existingServiceId] = { ...service, ...services[existingServiceId] }
       } else {
         services.push(service)
       }

package/lib/dependencies.js

@@ -4,6 +4,7 @@ const Topo = require('@hapi/topo')
 const { closest } = require('fastest-levenshtein')
 
 const errors = require('./errors')
+const { RoundRobinMap } = require('./worker/round-robin-map')
 
 function missingDependencyErrorMessage (clientName, service, services) {
   const closestName = closest(clientName, [...services.keys()])
@@ -20,15 +21,13 @@ function checkDependencies (services) {
   for (const service of services) {
     for (const dependency of service.dependencies) {
       if (dependency.local && !allServices.has(dependency.id)) {
-        throw new errors.MissingDependencyError(
-          missingDependencyErrorMessage(dependency.id, service, services)
-        )
+        throw new errors.MissingDependencyError(missingDependencyErrorMessage(dependency.id, service, services))
       }
     }
   }
 }
 
-function topologicalSort (services, config) {
+function topologicalSort (workers, config) {
   const topo = new Topo.Sorter()
 
   for (const service of config.services) {
@@ -39,21 +38,24 @@ function topologicalSort (services, config) {
     topo.add(service, {
       group: service.id,
       after: localDependencyIds,
-      manual: true,
+      manual: true
     })
   }
 
   config.services = topo.sort()
 
-  return new Map(Array.from(services.entries()).sort((a, b) => {
-    if (a[0] === b[0]) {
-      return 0
-    }
+  return new RoundRobinMap(
+    Array.from(workers.entries()).sort((a, b) => {
+      if (a[0] === b[0]) {
+        return 0
+      }
 
-    const aIndex = config.services.findIndex(s => s.id === a[0])
-    const bIndex = config.services.findIndex(s => s.id === b[0])
-    return aIndex - bIndex
-  }))
+      const aIndex = config.services.findIndex(s => s.id === a[0])
+      const bIndex = config.services.findIndex(s => s.id === b[0])
+      return aIndex - bIndex
+    }),
+    workers.configuration
+  )
 }
 
 module.exports = { checkDependencies, topologicalSort }

package/lib/errors.js

@@ -7,7 +7,9 @@ const ERROR_PREFIX = 'PLT_RUNTIME'
 module.exports = {
   AddressInUseError: createError(`${ERROR_PREFIX}_EADDR_IN_USE`, 'The current port is in use by another application'),
   RuntimeExitedError: createError(`${ERROR_PREFIX}_RUNTIME_EXIT`, 'The runtime exited before the operation completed'),
-  ServiceExitedError: createError(`${ERROR_PREFIX}_SERVICE_EXIT`, 'The service %s exited prematurely with error code %d'),
+  // The following two use the same code as we only need to differentiate the label
+  ServiceExitedError: createError(`${ERROR_PREFIX}_SERVICE_EXIT`, 'The service "%s" exited prematurely with error code %d'),
+  WorkerExitedError: createError(`${ERROR_PREFIX}_SERVICE_EXIT`, 'The worker %s of the service "%s" exited prematurely with error code %d'),
   UnknownRuntimeAPICommandError: createError(`${ERROR_PREFIX}_UNKNOWN_RUNTIME_API_COMMAND`, 'Unknown Runtime API command "%s"'),
   ServiceNotFoundError: createError(`${ERROR_PREFIX}_SERVICE_NOT_FOUND`, 'Service %s not found. Available services are: %s'),
   ServiceNotStartedError: createError(`${ERROR_PREFIX}_SERVICE_NOT_STARTED`, "Service with id '%s' is not started"),

package/lib/logger.js

@@ -6,17 +6,32 @@ const { isatty } = require('node:tty')
 const pino = require('pino')
 const pretty = require('pino-pretty')
 
+const customPrettifiers = {
+  name (name, _, obj) {
+    if (typeof obj.worker !== 'undefined') {
+      name += ':' + obj.worker
+      obj.worker = undefined // Do not show the worker in a separate line
+    }
+
+    return name
+  }
+}
+
 function createLogger (config, runtimeLogsDir) {
   const loggerConfig = { ...config.logger }
-  const cliStream = isatty(1) ? pretty() : pino.destination(1)
+
+  // PLT_RUNTIME_LOGGER_STDOUT is used in test to reduce verbosity
+  const cliStream = process.env.PLT_RUNTIME_LOGGER_STDOUT
+    ? pino.destination(process.env.PLT_RUNTIME_LOGGER_STDOUT)
+    : isatty(1)
+      ? pretty({ customPrettifiers })
+      : pino.destination(1)
 
   if (!config.managementApi) {
     return [pino(loggerConfig, cliStream), cliStream]
   }
 
-  const multiStream = pino.multistream([
-    { stream: cliStream, level: loggerConfig.level || 'info' },
-  ])
+  const multiStream = pino.multistream([{ stream: cliStream, level: loggerConfig.level || 'info' }])
 
   if (loggerConfig.transport) {
     const transport = pino.transport(loggerConfig.transport)
@@ -41,9 +56,9 @@ function createLogger (config, runtimeLogsDir) {
         mkdir: true,
         fsync: true,
         limit: {
-          count: logsLimitCount,
-        },
-      },
+          count: logsLimitCount
+        }
+      }
     })
 
     multiStream.add({ level: 'trace', stream: pinoRoll })

package/lib/management-api.js

@@ -92,7 +92,7 @@ async function managementApiPlugin (app, opts) {
   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) => {