wattpm 3.35.0 → 3.36.0

package/index.js

@@ -15,6 +15,7 @@ import { metricsCommand } from './lib/commands/metrics.js'
 import { pprofCommand } from './lib/commands/pprof.js'
 import { replCommand } from './lib/commands/repl.js'
 import { version } from './lib/schema.js'
+import { setSocket } from './lib/utils.js'
 
 export * from './lib/schema.js'
 
@@ -30,6 +31,10 @@ export async function main () {
       short: 'v',
       type: 'boolean'
     },
+    socket: {
+      short: 'S',
+      type: 'string'
+    },
     version: {
       short: 'V',
       type: 'boolean'
@@ -61,6 +66,10 @@ export async function main () {
     setVerbose(true)
   }
 
+  if (values.socket) {
+    setSocket(values.socket)
+  }
+
   let command
   const requestedCommand = unparsed[0] || 'help'
   let applicationCommandContext

package/lib/commands/applications.js

@@ -3,6 +3,7 @@ import { ensureLoggableError, logFatalError, parseArgs } from '@platformatic/fou
 import { bold } from 'colorette'
 import { readFile, stat, writeFile } from 'node:fs/promises'
 import { basename, isAbsolute, relative, resolve } from 'node:path'
+import { getSocket } from '../utils.js'
 
 async function updateConfigFile (path, update) {
   const contents = JSON.parse(await readFile(path, 'utf-8'))
@@ -25,7 +26,7 @@ export async function applicationsAddCommand (logger, args) {
     false
   )
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, applications] = await getMatchingRuntime(client, allPositionals)
     const config = await client.getRuntimeConfig(runtime.pid, true)
@@ -100,7 +101,7 @@ export async function applicationsRemoveCommand (logger, args) {
     false
   )
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, applications] = await getMatchingRuntime(client, positionals)
 

package/lib/commands/create.js

@@ -2,6 +2,7 @@ import { getExecutableName, getPackageManager, parseArgs } from '@platformatic/f
 import { bold } from 'colorette'
 import { spawn } from 'node:child_process'
 import { platform } from 'node:os'
+import { getSocket } from '../utils.js'
 
 export async function runDelegatedCommand (logger, packageManager, args) {
   if (!packageManager) {
@@ -15,6 +16,15 @@ export async function runDelegatedCommand (logger, packageManager, args) {
     args.unshift('-y')
   }
 
+  const socket = getSocket()
+  if (socket) {
+    if (packageManager === 'pnpm') {
+      args.push('--', '--socket', socket)
+    } else {
+      args.push('--socket', socket)
+    }
+  }
+
   logger.info(`Running ${bold(runner)} ${bold(args.join(' '))} ...`)
 
   const options = { stdio: 'inherit' }

package/lib/commands/execution.js

@@ -11,6 +11,7 @@ import { create } from '@platformatic/runtime'
 import { bold } from 'colorette'
 import { spawn } from 'node:child_process'
 import { createInterface } from 'node:readline'
+import { getSocket } from '../utils.js'
 
 export async function devCommand (logger, args) {
   const {
@@ -130,7 +131,7 @@ export async function startCommand (logger, args) {
 export async function stopCommand (logger, args) {
   const { positionals } = parseArgs(args, {}, false)
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime] = await getMatchingRuntime(client, positionals)
 
@@ -152,7 +153,7 @@ export async function stopCommand (logger, args) {
 export async function restartCommand (logger, args) {
   const { positionals } = parseArgs(args, {}, false)
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, applications] = await getMatchingRuntime(client, positionals)
 
@@ -178,7 +179,7 @@ export async function restartCommand (logger, args) {
 export async function reloadCommand (logger, args) {
   const { positionals } = parseArgs(args, {}, false)
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime] = await getMatchingRuntime(client, positionals)
 

package/lib/commands/help.js

@@ -43,6 +43,10 @@ export async function showGeneralHelp (logger) {
   const options = [
     { usage: '-V, --version', description: `Show ${executableId} version` },
     { usage: '-v, --verbose', description: 'Show more information' },
+    {
+      usage: '-S, --socket <path>',
+      description: 'Path for the control socket. If not specified, the default platform-specific location is used.'
+    },
     { usage: '--help', description: 'Show this help' }
   ]
 

package/lib/commands/inject.js

@@ -5,6 +5,7 @@ import { readFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
 import { finished } from 'node:stream/promises'
 import { setTimeout as sleep } from 'node:timers/promises'
+import { getSocket } from '../utils.js'
 
 function appendOutput (logger, stream, fullOutput, line) {
   if (isVerbose()) {
@@ -70,7 +71,7 @@ export async function injectCommand (logger, args) {
   )
 
   const outputStream = output ? createWriteStream(resolve(process.cwd(), output)) : process.stdout
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, positionals] = await getMatchingRuntime(client, allPositionals)
     let application = positionals[0]

package/lib/commands/management.js

@@ -3,6 +3,7 @@ import { ensureLoggableError, logFatalError, parseArgs } from '@platformatic/fou
 import { bold, reset } from 'colorette'
 import { sep } from 'node:path'
 import { getBorderCharacters, table } from 'table'
+import { getSocket } from '../utils.js'
 
 const ONE_DAY = 3600 * 24
 const ONE_HOUR = 3600
@@ -61,7 +62,7 @@ function formatDuration (duration) {
 }
 
 export async function psCommand (logger) {
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const runtimes = await client.getRuntimes()
 
@@ -92,7 +93,7 @@ export async function psCommand (logger) {
 
 export async function applicationsCommand (logger, args) {
   const { positionals } = parseArgs(args, {}, false)
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
 
   try {
     const [runtime] = await getMatchingRuntime(client, positionals)
@@ -130,7 +131,7 @@ export async function envCommand (logger, args) {
   const { values, positionals: allPositionals } = parseArgs(args, { table: { type: 'boolean', short: 't' } }, false)
 
   let application
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, positionals] = await getMatchingRuntime(client, allPositionals)
     application = positionals[0]
@@ -176,7 +177,7 @@ export async function configCommand (logger, args) {
   const { positionals: allPositionals } = parseArgs(args, {}, false)
 
   let application
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, positionals] = await getMatchingRuntime(client, allPositionals)
     application = positionals[0]

package/lib/commands/metrics.js

@@ -1,9 +1,10 @@
 import { getMatchingRuntime, RuntimeApiClient } from '@platformatic/control'
 import { ensureLoggableError, logFatalError, parseArgs } from '@platformatic/foundation'
 import { bold } from 'colorette'
+import { getSocket } from '../utils.js'
 
 export async function metricsCommand (logger, args) {
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const { values, positionals } = parseArgs(args, { format: { type: 'string', short: 'f', default: 'json' } }, false)
 

package/lib/commands/pprof.js

@@ -3,9 +3,10 @@ import { ensureLoggableError, logFatalError, parseArgs } from '@platformatic/fou
 import { bold } from 'colorette'
 import { writeFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
+import { getSocket } from '../utils.js'
 
 export async function pprofStartCommand (logger, args) {
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
 
   try {
     const { positionals, values } = parseArgs(
@@ -76,7 +77,7 @@ export async function pprofStartCommand (logger, args) {
 }
 
 export async function pprofStopCommand (logger, args) {
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
 
   try {
     const { positionals, values } = parseArgs(
@@ -177,11 +178,13 @@ export const help = {
       },
       {
         name: '--node-modules-source-maps, -n',
-        description: 'Comma-separated list of node_modules packages to load source maps from (e.g., "next,@next/next-server")'
+        description:
+          'Comma-separated list of node_modules packages to load source maps from (e.g., "next,@next/next-server")'
       },
       {
         name: '--dir, -d',
-        description: 'Directory to save the profile data to (default: current working directory). Only used with "stop" subcommand.'
+        description:
+          'Directory to save the profile data to (default: current working directory). Only used with "stop" subcommand.'
       }
     ],
     args: [

package/lib/commands/repl.js

@@ -3,6 +3,7 @@ import { ensureLoggableError, logFatalError, parseArgs } from '@platformatic/fou
 import { bold } from 'colorette'
 import { createInterface } from 'node:readline'
 import { getBorderCharacters, table } from 'table'
+import { getSocket } from '../utils.js'
 
 const tableConfig = {
   /* c8 ignore next */
@@ -15,7 +16,7 @@ const tableConfig = {
 export async function replCommand (logger, args) {
   const { positionals: allPositionals } = parseArgs(args, {}, false)
 
-  const client = new RuntimeApiClient()
+  const client = new RuntimeApiClient({ logger, socket: getSocket() })
   try {
     const [runtime, positionals] = await getMatchingRuntime(client, allPositionals)
     let application = positionals[0]
@@ -33,12 +34,7 @@ export async function replCommand (logger, args) {
           const { id, type, entrypoint } = app
           return [id, type, entrypoint ? 'Yes' : 'No']
         })
-        console.log(
-          table(
-            [[bold('Name'), bold('Type'), bold('Entrypoint')], ...rows],
-            tableConfig
-          )
-        )
+        console.log(table([[bold('Name'), bold('Type'), bold('Entrypoint')], ...rows], tableConfig))
         console.log('Usage: wattpm repl <application-name>\n')
         await client.close()
         return
@@ -60,7 +56,7 @@ export async function replCommand (logger, args) {
     })
 
     // Forward stdin to WebSocket
-    rl.on('line', (line) => {
+    rl.on('line', line => {
       ws.send(line + '\n')
     })
 
@@ -72,7 +68,7 @@ export async function replCommand (logger, args) {
     })
 
     // Forward WebSocket output to stdout
-    ws.on('message', (data) => {
+    ws.on('message', data => {
       process.stdout.write(data.toString())
     })
 
@@ -93,7 +89,7 @@ export async function replCommand (logger, args) {
       process.exit(0)
     })
 
-    ws.on('error', (error) => {
+    ws.on('error', error => {
       logger.error({ error: ensureLoggableError(error) }, 'WebSocket error')
       rl.close()
       client.close()
@@ -105,11 +101,7 @@ export async function replCommand (logger, args) {
     } else if (error.code === 'PLT_CTR_APPLICATION_NOT_FOUND') {
       return logFatalError(logger, 'Cannot find a matching application.')
     } else {
-      return logFatalError(
-        logger,
-        { error: ensureLoggableError(error) },
-        `Cannot start REPL: ${error.message}`
-      )
+      return logFatalError(logger, { error: ensureLoggableError(error) }, `Cannot start REPL: ${error.message}`)
     }
   }
 }
@@ -126,7 +118,8 @@ export const help = {
       },
       {
         name: 'application',
-        description: 'The application name (if omitted, auto-connects when single application or lists available applications)'
+        description:
+          'The application name (if omitted, auto-connects when single application or lists available applications)'
       }
     ],
     footer: `

package/lib/utils.js

@@ -0,0 +1,9 @@
+let socket
+
+export function setSocket (value) {
+  socket = value
+}
+
+export function getSocket () {
+  return socket
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "3.35.0",
+  "version": "3.36.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -25,24 +25,26 @@
     "lib"
   ],
   "dependencies": {
+    "@fastify/websocket": "^11.0.0",
     "colorette": "^2.0.20",
     "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/control": "3.35.0",
-    "@platformatic/runtime": "3.35.0",
-    "@platformatic/foundation": "3.35.0"
+    "@platformatic/control": "3.36.0",
+    "@platformatic/foundation": "3.36.0",
+    "@platformatic/runtime": "3.36.0"
   },
   "devDependencies": {
     "cleaner-spec-reporter": "^0.5.0",
     "eslint": "9",
     "execa": "^9.4.0",
+    "fastify": "5.7.4",
     "inspector-client": "^0.2.0",
     "json-schema-to-typescript": "^15.0.0",
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.0.0",
-    "@platformatic/node": "3.35.0"
+    "@platformatic/node": "3.36.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/3.35.0.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/3.36.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Runtime Config",
   "type": "object",
@@ -2070,6 +2070,10 @@
                 }
               },
               "additionalProperties": false
+            },
+            "socket": {
+              "type": "string",
+              "description": "Custom path for the control socket. If not specified, uses the default platform-specific location."
             }
           },
           "additionalProperties": false