@platformatic/basic 3.41.0 → 3.43.0

package/config.d.ts

@@ -434,6 +434,7 @@ export interface PlatformaticBasicConfig {
     env?: {
       [k: string]: string;
     };
+    envfile?: string;
     sourceMaps?: boolean;
     nodeModulesSourceMaps?: string[];
     scheduler?: {

package/lib/capability.js

@@ -21,6 +21,7 @@ import { tracingChannel } from 'node:diagnostics_channel'
 import EventEmitter, { once } from 'node:events'
 import { existsSync } from 'node:fs'
 import { platform } from 'node:os'
+import { isAbsolute, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { workerData } from 'node:worker_threads'
 import pino from 'pino'
@@ -101,7 +102,7 @@ export class BaseCapability extends EventEmitter {
     this.subprocessForceClose = false
     this.subprocessTerminationSignal = 'SIGINT'
     this.logger = this._initializeLogger()
-    this.reuseTcpPorts = this.config.reuseTcpPorts ?? this.runtimeConfig.reuseTcpPorts
+    this.reuseTcpPorts = (this.config.reuseTcpPorts ?? this.runtimeConfig.reuseTcpPorts) && features.node.reusePort
     // True by default, can be overridden in subclasses. If false, it takes precedence over the runtime configuration
     this.exitOnUnhandledErrors = true
 
@@ -132,7 +133,9 @@ export class BaseCapability extends EventEmitter {
       setCustomHealthCheck: this.setCustomHealthCheck.bind(this),
       setCustomReadinessCheck: this.setCustomReadinessCheck.bind(this),
       notifyConfig: this.notifyConfig.bind(this),
-      logger: this.logger
+      logger: this.logger,
+      isEntrypoint: this.isEntrypoint,
+      reuseTcpPorts: this.reuseTcpPorts
     })
 
     if (globalThis.platformatic.prometheus) {
@@ -541,7 +544,8 @@ export class BaseCapability extends EventEmitter {
     })
 
     const [url, clientWs] = await once(this.childManager, 'url')
-    this.url = url
+
+    this.url = this._getEntrypointUrl(url)
     this.clientWs = clientWs
 
     await this._collectMetrics()
@@ -606,9 +610,8 @@ export class BaseCapability extends EventEmitter {
       runtimeBasePath: this.runtimeConfig?.basePath ?? null,
       wantsAbsoluteUrls: meta.gateway?.wantsAbsoluteUrls ?? false,
       exitOnUnhandledErrors: this.runtimeConfig.exitOnUnhandledErrors ?? true,
-      /* c8 ignore next 2 - else */
-      port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
       host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
+      port: this.serverConfig && typeof this.serverConfig.port === 'number' ? this.serverConfig.port : true,
       additionalServerOptions:
         typeof this.serverConfig?.backlog === 'number'
           ? {
@@ -655,7 +658,7 @@ export class BaseCapability extends EventEmitter {
     // This is not really important for the URL but sometimes it also a sign
     // that the process has been replaced and thus we need to update the client WebSocket
     childManager.on('url', (url, clientWs) => {
-      this.url = url
+      this.url = this._getEntrypointUrl(url)
       this.clientWs = clientWs
     })
   }
@@ -668,6 +671,16 @@ export class BaseCapability extends EventEmitter {
     // This ensures subprocess uses the same Node.js version as the parent
     if (executable === 'node') {
       executable = process.execPath
+      // Search for the command in node_modules if needed
+    } else if (!isAbsolute(executable) && this.config.application?.preferLocalCommands) {
+      const applicationExecutable = resolve(this.root, 'node_modules', '.bin', executable)
+      const projectExecutable = resolve(process.cwd(), 'node_modules', '.bin', executable)
+
+      if (existsSync(applicationExecutable)) {
+        executable = applicationExecutable
+      } else if (existsSync(projectExecutable)) {
+        executable = projectExecutable
+      }
     }
 
     /* c8 ignore next 3 */
@@ -780,6 +793,23 @@ export class BaseCapability extends EventEmitter {
     return promise
   }
 
+  _getEntrypointUrl (raw) {
+    const port = this.config.application?.entrypointPort
+
+    if (typeof port !== 'number') {
+      return raw
+    }
+
+    const url = new URL(raw)
+
+    if (url.hostname === '[::]' || url.hostname === '0.0.0.0') {
+      url.hostname = 'localhost'
+    }
+
+    url.port = this.config.application.entrypointPort
+    return url.toString()
+  }
+
   async #collectMetrics () {
     const metricsConfig = {
       defaultMetrics: true,

package/lib/schema.js

@@ -57,6 +57,17 @@ const buildableApplication = {
       },
       default: {},
       additionalProperties: false
+    },
+    entrypointPort: {
+      type: 'number'
+    },
+    changeDirectoryBeforeExecution: {
+      type: 'boolean',
+      default: false
+    },
+    preferLocalCommands: {
+      type: 'boolean',
+      default: true
     }
   },
   additionalProperties: false,

package/lib/worker/child-process.js

@@ -15,6 +15,7 @@ import { hostname, platform, tmpdir } from 'node:os'
 import { basename, join, resolve } from 'node:path'
 import { Duplex } from 'node:stream'
 import { fileURLToPath } from 'node:url'
+import { isMainThread } from 'node:worker_threads'
 import pino from 'pino'
 import { Agent, Pool, setGlobalDispatcher } from 'undici'
 import { WebSocket } from 'ws'
@@ -369,7 +370,7 @@ export class ChildProcess extends ITC {
     // Create a duplex stream that sends output via notify
     const replStream = new Duplex({
       read () {},
-      write: (chunk, encoding, callback) => {
+      write: (chunk, _encoding, callback) => {
         this.notify('repl:output', { data: chunk.toString() })
         callback()
       }
@@ -434,7 +435,7 @@ export class ChildProcess extends ITC {
     let promise = null
     const timeout = 1000
 
-    const sendHealthSignal = async (signal) => {
+    const sendHealthSignal = async signal => {
       if (typeof signal !== 'object') {
         throw new Error('Health signal must be an object')
       }
@@ -513,13 +514,21 @@ export class ChildProcess extends ITC {
           return
         }
 
-        const port = globalThis.platformatic.port
+        let port = globalThis.platformatic.port
         const host = globalThis.platformatic.host
+        const isEntrypoint = globalThis.platformatic.isEntrypoint
         const additionalOptions = globalThis.platformatic.additionalServerOptions ?? {}
 
-        if (port !== false) {
-          const hasFixedPort = typeof port === 'number'
-          options.port = hasFixedPort ? port : 0
+        if (typeof port !== 'number' && port !== false) {
+          port = 0
+        }
+
+        // Check if we need to override the port only if a static port is being requested
+        if (port !== false && port !== 0) {
+          // The user application has requested a specific port, which is not the entrypoint one. Override it.
+          if (options.port !== port && isEntrypoint) {
+            options.port = port
+          }
         }
 
         if (typeof host === 'string') {
@@ -711,6 +720,10 @@ async function main () {
     await importFile(script)
   }
 
+  if (data.config.application?.changeDirectoryBeforeExecution && data.root && isMainThread) {
+    process.chdir(fileURLToPath(data.root))
+  }
+
   const childProcess = new ChildProcess(executable)
   globalThis[Symbol.for('plt.children.itc')] = childProcess
   globalThis.platformatic.itc = childProcess

package/lib/worker/listeners.js

@@ -10,15 +10,22 @@ export function createServerListener (overridePort = true, overrideHost = false,
         return
       }
 
-      if (overridePort !== false) {
-        const hasFixedPort = typeof overridePort === 'number'
-        options.port = hasFixedPort ? overridePort : 0
+      if (typeof overridePort !== 'number' && overridePort !== false) {
+        overridePort = 0
       }
 
       if (typeof overrideHost === 'string') {
         options.host = overrideHost
       }
 
+      // Check if we need to override the port only if a static port is being requested
+      if (overridePort !== false && overridePort !== 0) {
+        // The user application has requested a specific port, which is not the entrypoint one. Override it.
+        if (options.port !== overridePort && globalThis.platformatic.isEntrypoint) {
+          options.port = overridePort
+        }
+      }
+
       Object.assign(options, additionalOptions)
       globalThis.platformatic?.events?.emitAndNotify('serverOptions', options)
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "3.41.0",
+  "version": "3.43.0",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,10 +25,10 @@
     "split2": "^4.2.0",
     "undici": "^7.0.0",
     "ws": "^8.18.0",
-    "@platformatic/foundation": "3.41.0",
-    "@platformatic/itc": "3.41.0",
-    "@platformatic/telemetry": "3.41.0",
-    "@platformatic/metrics": "3.41.0"
+    "@platformatic/foundation": "3.43.0",
+    "@platformatic/itc": "3.43.0",
+    "@platformatic/telemetry": "3.43.0",
+    "@platformatic/metrics": "3.43.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/3.41.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/3.43.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Basic Config",
   "type": "object",
@@ -1647,6 +1647,9 @@
             "type": "string"
           }
         },
+        "envfile": {
+          "type": "string"
+        },
         "sourceMaps": {
           "type": "boolean",
           "default": false