@platformatic/runtime 3.67.0 → 4.0.0-new-config.0

package/lib/errors.js

@@ -13,7 +13,11 @@ export const ERROR_PREFIX = 'PLT_RUNTIME'
 
 export const AddressInUseError = createError(
   `${ERROR_PREFIX}_EADDR_IN_USE`,
-  'The current port is in use by another application'
+  'Port %d is already in use by applications "%s" and "%s"'
+)
+export const WorkerAddressInUseError = createError(
+  `${ERROR_PREFIX}_WORKER_EADDR_IN_USE`,
+  'Port %d is already in use by another worker of the application "%s". Multiple workers can share a port only when the reusePort feature is available in your OS, otherwise set "server.portAssignment" to "perWorkerIncrement" in the application configuration or use a single worker.'
 )
 export const RuntimeExitedError = createError(
   `${ERROR_PREFIX}_RUNTIME_EXIT`,
@@ -98,14 +102,6 @@ export const NoConfigFileFoundError = createError(
   `${ERROR_PREFIX}_NO_CONFIG_FILE_FOUND`,
   "No config file found for application '%s'"
 )
-export const InvalidEntrypointError = createError(
-  `${ERROR_PREFIX}_INVALID_ENTRYPOINT`,
-  "Invalid entrypoint: '%s' does not exist"
-)
-export const MissingEntrypointError = createError(
-  `${ERROR_PREFIX}_MISSING_ENTRYPOINT`,
-  'Missing application entrypoint.'
-)
 export const MissingDependencyError = createError(`${ERROR_PREFIX}_MISSING_DEPENDENCY`, 'Missing dependency: "%s"')
 export const InspectAndInspectBrkError = createError(
   `${ERROR_PREFIX}_INSPECT_AND_INSPECT_BRK`,
@@ -228,10 +224,6 @@ export const HealthSignalTypeMustBeStringError = createError(
   `${ERROR_PREFIX}_HEALTH_SIGNAL_TYPE_MUST_BE_STRING`,
   'Health signal type must be a string, received "%s"'
 )
-export const CannotRemoveEntrypointError = createError(
-  `${ERROR_PREFIX}_CANNOT_REMOVE_ENTRYPOINT`,
-  'Cannot remove the entrypoint application.'
-)
 export const WorkerInterceptorNotReadyError = createError(
   `${ERROR_PREFIX}_WORKER_INTERCEPTOR_NOT_READY`,
   'The "%s" application worker interceptor is not ready'

package/lib/generator.js

@@ -1,4 +1,3 @@
-import createError from '@fastify/error'
 import {
   createEnvFileTool,
   defaultPackageManager,
@@ -23,44 +22,20 @@ const engines = {
   node: '>=22.19.0'
 }
 
-export const ERROR_PREFIX = 'PLT_RUNTIME_GEN'
-
-const NoApplicationNamedError = createError(
-  `${ERROR_PREFIX}_NO_APPLICATION_FOUND`,
-  "No application named '%s' has been added to this runtime."
-)
-const NoEntryPointError = createError(`${ERROR_PREFIX}_NO_ENTRYPOINT`, 'No entrypoint had been defined.')
-
-function getRuntimeWrappableProperties (skipServer) {
-  const wrappableProperties = {
+function getRuntimeWrappableProperties () {
+  return {
     logger: {
       level: '{PLT_SERVER_LOGGER_LEVEL}'
     },
     managementApi: '{PLT_MANAGEMENT_API}'
   }
-
-  if (!skipServer) {
-    wrappableProperties.server = {
-      hostname: '{PLT_SERVER_HOSTNAME}',
-      port: '{PORT}'
-    }
-  }
-
-  return wrappableProperties
 }
 
 function getRuntimeBaseEnvVars (config) {
-  const env = {}
-
-  if (!config.skipServer) {
-    env.PLT_SERVER_HOSTNAME = '127.0.0.1'
-    env.PORT = config.port || 3042
+  return {
+    PLT_SERVER_LOGGER_LEVEL: config.logLevel || 'info',
+    PLT_MANAGEMENT_API: true
   }
-
-  env.PLT_SERVER_LOGGER_LEVEL = config.logLevel || 'info'
-  env.PLT_MANAGEMENT_API = true
-
-  return env
 }
 
 export class RuntimeGenerator extends BaseGenerator {
@@ -73,7 +48,6 @@ export class RuntimeGenerator extends BaseGenerator {
     this.applicationsFolder = opts.applicationsFolder ?? 'applications'
     this.applications = []
     this.existingApplications = []
-    this.entryPoint = null
     this.packageManager = opts.packageManager ?? defaultPackageManager
   }
 
@@ -97,15 +71,6 @@ export class RuntimeGenerator extends BaseGenerator {
     application.setRuntime(this)
   }
 
-  setEntryPoint (entryPoint) {
-    const application =
-      this.existingApplications.includes(entryPoint) || this.applications.find(svc => svc.name === entryPoint)
-    if (!application) {
-      throw new NoApplicationNamedError(entryPoint)
-    }
-    this.entryPoint = application
-  }
-
   async generatePackageJson () {
     const template = {
       name: `${this.runtimeName}`,
@@ -165,8 +130,6 @@ export class RuntimeGenerator extends BaseGenerator {
 
       const { PLT_ROOT, ...existingEnvironment } = this.existingConfig[kMetadata].env
       this.config.env = existingEnvironment
-      this.config.port = this.config.env.PORT
-      this.entryPoint = this.existingConfig.applications.find(svc => svc.entrypoint)
       this.existingApplications = this.existingConfig.applications.map(s => s.id)
 
       this.updateRuntimeConfig(this.existingConfigRaw)
@@ -190,37 +153,42 @@ export class RuntimeGenerator extends BaseGenerator {
   }
 
   setApplicationsConfigValues () {
-    this.applications.forEach(({ application }) => {
+    let newApplicationOrdinal = 0
+    this.applications.forEach(({ name, application }) => {
       if (!application.config) {
         // set default config
         application.setConfig()
       }
+      const existingOrdinal = this.existingApplications.indexOf(name)
+      const ordinal = existingOrdinal === -1 ? this.existingApplications.length + newApplicationOrdinal++ : existingOrdinal
+      this.setApplicationPort(application, ordinal)
     })
   }
 
+  setApplicationPort (application, ordinal) {
+    if (application.config.port === 3042) {
+      application.setConfig({ port: 3042 + ordinal })
+    }
+  }
+
   async _getConfigFileContents () {
     const config = {
       $schema: `https://schemas.platformatic.dev/wattpm/${this.platformaticVersion}.json`,
-      entrypoint: this.entryPoint.name,
       watch: true,
       autoload: {
         path: this.config.autoload || this.applicationsFolder,
         exclude: ['docs']
       },
-      ...getRuntimeWrappableProperties(this.config.skipServer)
+      ...getRuntimeWrappableProperties()
     }
 
     return config
   }
 
   async _afterPrepare () {
-    if (!this.entryPoint) {
-      throw new NoEntryPointError()
-    }
     const applicationsEnv = await this.prepareApplicationFiles()
     this.addEnvVars({
       ...this.config.env,
-      ...this.getRuntimeEnv(),
       ...applicationsEnv
     })
 
@@ -258,21 +226,6 @@ export class RuntimeGenerator extends BaseGenerator {
 
   async prepareQuestions () {
     await this.populateFromExistingConfig()
-
-    if (this.existingConfig) {
-      return
-    }
-
-    if (!this.config.skipServer) {
-      // port
-      this.questions.push({
-        type: 'input',
-        name: 'port',
-        default: '3042',
-        message: 'What port do you want to use?',
-        filter: Number
-      })
-    }
   }
 
   setApplicationsDirectory () {
@@ -322,12 +275,6 @@ export class RuntimeGenerator extends BaseGenerator {
     // do nothing, makes no sense
   }
 
-  getRuntimeEnv () {
-    return {
-      PORT: this.config.port
-    }
-  }
-
   async postInstallActions () {
     for (const { application } of this.applications) {
       await application.postInstallActions()
@@ -451,6 +398,7 @@ export class RuntimeGenerator extends BaseGenerator {
         })
       }
       applicationInstance.setConfig(baseConfig)
+      this.setApplicationPort(applicationInstance, allNewApplicationsNames.indexOf(newApplication.name))
       applicationInstance.setConfigFields(newApplication.fields)
 
       const applicationEnvPrefix = `PLT_${applicationInstance.config.envPrefix}`
@@ -494,18 +442,6 @@ export class RuntimeGenerator extends BaseGenerator {
       contents: JSON.stringify(currrentPackageJson, null, 2)
     })
 
-    // set new entrypoint if specified
-    const newEntrypoint = newConfig.entrypoint
-    if (newEntrypoint) {
-      // load platformatic.json runtime config
-      const runtimePkgConfigFileData = JSON.parse(
-        await readFile(join(this.targetDirectory, this.runtimeConfig), 'utf-8')
-      )
-
-      this.setEntryPoint(newEntrypoint)
-      runtimePkgConfigFileData.entrypoint = newEntrypoint
-      this.updateRuntimeConfig(runtimePkgConfigFileData)
-    }
     await this.writeFiles()
     // save new env
     await envTool.save()
@@ -548,15 +484,6 @@ export class RuntimeGenerator extends BaseGenerator {
       tags: ['runtime-env']
     })
   }
-
-  updateConfigEntryPoint (entrypoint) {
-    // This can return null if the generator was not supposed to modify the config
-    const configObject = this.getRuntimeConfigFileObject()
-    const config = JSON.parse(configObject.contents)
-    config.entrypoint = entrypoint
-
-    this.updateRuntimeConfig(config)
-  }
 }
 
 export class WrappedGenerator extends BaseGenerator {
@@ -626,7 +553,7 @@ export class WrappedGenerator extends BaseGenerator {
   async #createConfigFile () {
     const config = {
       $schema: `https://schemas.platformatic.dev/${this.module}/${this.platformaticVersion}.json`,
-      runtime: getRuntimeWrappableProperties(this.config.skipServer)
+      runtime: getRuntimeWrappableProperties()
     }
 
     this.addFile({

package/lib/management-api.js

@@ -14,7 +14,7 @@ import { platform, tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { setTimeout as sleep } from 'node:timers/promises'
 import { createWebSocketStream } from 'ws'
-import { prepareApplication } from './config.js'
+import { prepareAddedApplications } from './config.js'
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'runtimes')
 
@@ -169,11 +169,9 @@ export async function managementApiPlugin (app, opts) {
       }
     }
 
-    for (let i = 0; i < applications.length; i++) {
-      applications[i] = await prepareApplication(config, applications[i], config.workers)
-    }
+    const prepared = await prepareAddedApplications(config, applications, runtime.getApplicationsIds())
 
-    const created = await runtime.addApplications(applications, request.query.start !== 'false')
+    const created = await runtime.addApplications(prepared, request.query.start !== 'false')
     reply.code(201)
     return created
   })

package/lib/management-handlers.js

@@ -3,7 +3,7 @@ import {
   kMetadata,
   validate
 } from '@platformatic/foundation'
-import { prepareApplication } from './config.js'
+import { prepareAddedApplications } from './config.js'
 
 const allOperations = [
   'getRuntimeStatus',
@@ -138,11 +138,9 @@ export function createManagementHandlers (runtime, allowedOperations) {
 
     validate(applicationSchema, applications, {}, true, config[kMetadata].root)
 
-    for (let i = 0; i < applications.length; i++) {
-      applications[i] = await prepareApplication(config, applications[i], config.workers)
-    }
+    const prepared = await prepareAddedApplications(config, applications, runtime.getApplicationsIds())
 
-    return runtime.addApplications(applications, start)
+    return runtime.addApplications(prepared, start)
   })
 
   register('removeApplications', async ({ ids }) => {