wattpm 3.59.0 → 3.60.0

package/index.js

@@ -20,6 +20,28 @@ import { version } from './lib/schema.js'
 
 export * from './lib/schema.js'
 
+// Extract the -c/--config option from application command arguments, leaving
+// all the other arguments for the application command itself
+function extractConfigOption (args) {
+  const remaining = []
+  let config = null
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i]
+
+    if (arg === '-c' || arg === '--config') {
+      config = args[i + 1]
+      i++
+    } else if (arg.startsWith('--config=')) {
+      config = arg.slice('--config='.length)
+    } else {
+      remaining.push(arg)
+    }
+  }
+
+  return { config, remaining }
+}
+
 export async function main () {
   updateGlobals({ executable: this.executableId })
 
@@ -75,6 +97,7 @@ export async function main () {
   let command
   const requestedCommand = unparsed[0] || 'help'
   let applicationCommandContext
+  let applicationCommandArgs
   switch (requestedCommand) {
     case 'build':
       command = buildCommand
@@ -144,11 +167,14 @@ export async function main () {
       break
     default:
       if (requestedCommand) {
-        const applicationsCommands = await loadApplicationsCommands(this.executableName)
+        // Extract the -c/--config option, which selects the runtime configuration file
+        const { config: runtimeConfigFile, remaining } = extractConfigOption(unparsed.slice(1))
+        const applicationsCommands = await loadApplicationsCommands(this.executableName, runtimeConfigFile)
         const applicationCommand = applicationsCommands.commands[requestedCommand]
 
         if (applicationCommand) {
           applicationCommandContext = applicationsCommands.applications[requestedCommand]
+          applicationCommandArgs = remaining
           command = applicationCommand
         }
       }
@@ -168,7 +194,7 @@ export async function main () {
   if (applicationCommandContext) {
     const invocationCwd = process.cwd()
     process.chdir(applicationCommandContext.path)
-    return command.call(this, logger, applicationCommandContext.config, unparsed.slice(1), {
+    return command.call(this, logger, applicationCommandContext.config, applicationCommandArgs, {
       application: applicationCommandContext,
       cwd: invocationCwd,
       colorette,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "3.59.0",
+  "version": "3.60.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -30,10 +30,10 @@
     "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/control": "3.59.0",
-    "@platformatic/globals": "3.59.0",
-    "@platformatic/runtime": "3.59.0",
-    "@platformatic/foundation": "3.59.0"
+    "@platformatic/control": "3.60.0",
+    "@platformatic/globals": "3.60.0",
+    "@platformatic/foundation": "3.60.0",
+    "@platformatic/runtime": "3.60.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",
@@ -45,7 +45,7 @@
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.27.2",
-    "@platformatic/node": "3.59.0"
+    "@platformatic/node": "3.60.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/3.59.0.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/3.60.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Runtime Config",
   "type": "object",
@@ -2211,6 +2211,115 @@
         },
         {
           "type": "string"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            },
+            "hostname": {
+              "type": "string"
+            },
+            "port": {
+              "anyOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "string"
+                }
+              ]
+            },
+            "readiness": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "endpoint": {
+                      "type": "string"
+                    },
+                    "success": {
+                      "type": "object",
+                      "properties": {
+                        "statusCode": {
+                          "type": "number"
+                        },
+                        "body": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "fail": {
+                      "type": "object",
+                      "properties": {
+                        "statusCode": {
+                          "type": "number"
+                        },
+                        "body": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              ]
+            },
+            "liveness": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "endpoint": {
+                      "type": "string"
+                    },
+                    "success": {
+                      "type": "object",
+                      "properties": {
+                        "statusCode": {
+                          "type": "number"
+                        },
+                        "body": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    "fail": {
+                      "type": "object",
+                      "properties": {
+                        "statusCode": {
+                          "type": "number"
+                        },
+                        "body": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              ]
+            }
+          },
+          "additionalProperties": false
         }
       ],
       "default": true
@@ -2687,7 +2796,9 @@
                   "type": "string"
                 }
               ],
-              "default": 5000
+              "default": 5000,
+              "deprecated": true,
+              "description": "Deprecated. Health probe timeout configuration is no longer used."
             },
             "plugins": {
               "type": "array",
@@ -2763,6 +2874,50 @@
               ],
               "additionalProperties": false
             },
+            "opentelemetry": {
+              "type": "object",
+              "description": "Configuration for forwarding user OpenTelemetry metrics to an OTLP endpoint",
+              "properties": {
+                "enabled": {
+                  "anyOf": [
+                    {
+                      "type": "boolean"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "description": "Enable or disable OpenTelemetry metrics forwarding"
+                },
+                "endpoint": {
+                  "type": "string",
+                  "description": "OTLP metrics endpoint URL (e.g., http://collector:4318/v1/metrics)"
+                },
+                "interval": {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "default": 60000,
+                  "description": "Interval in milliseconds between metric forwards"
+                },
+                "headers": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  },
+                  "description": "Additional HTTP headers for authentication"
+                }
+              },
+              "required": [
+                "endpoint"
+              ],
+              "additionalProperties": false
+            },
             "httpCustomLabels": {
               "type": "array",
               "description": "Custom labels to add to HTTP metrics (http_request_all_duration_seconds). Each label extracts its value from an HTTP request header.",