@rpcbase/cli 0.191.0 → 0.193.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.191.0",
+  "version": "0.193.0",
   "type": "module",
   "files": [
     "src"

package/src/cmd-deploy/index.js

@@ -1,4 +1,4 @@
-import { execSync } from "child_process"
+import { execFileSync, execSync } from "child_process"
 import fs from "fs"
 import os from "os"
 import path from "path"
@@ -246,9 +246,15 @@ export const deploy = async (argv) => {
   let preparedDeploy = null
 
   const ssh = async (command, stdioInherit = false) => {
-    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`
     log(`${command}`)
-    const out = execSync(sshCommand, {
+    const out = execFileSync("ssh", [
+      "-i",
+      keyPath,
+      "-o",
+      "StrictHostKeyChecking=no",
+      `${user}@${host}`,
+      command,
+    ], {
       stdio: (argv.verbose || stdioInherit) ? "inherit" : "pipe",
     })
     const res = out?.toString()?.trim() || ""
@@ -278,12 +284,50 @@ export const deploy = async (argv) => {
     await ssh(`cd ~/apps/${baseDeployDir}/infrastructure && RB_DEPLOY_DIR=${shellQuote(baseDeployDir)} node ctrl.js ${action}-instance ${instance} prod`, true)
   }
 
+  const printInstanceDiagnostics = async (instance) => {
+    const composePrefix = [
+      `cd ~/apps/${baseDeployDir}/infrastructure &&`,
+      `RB_DEPLOY_DIR=${shellQuote(baseDeployDir)}`,
+      "docker compose -p sample-app --env-file ../.env -f compose.yml -f compose.instances.yml",
+      `--profile instance-${instance}`,
+    ].join(" ")
+    const services = `server-${instance} worker-${instance}`
+
+    console.error(`Instance ${instance} diagnostics:`)
+    for (const command of [
+      `${composePrefix} ps ${services}`,
+      `${composePrefix} logs --tail=160 ${services}`,
+    ]) {
+      try {
+        await ssh(command, true)
+      } catch (error) {
+        console.error(`Failed to run diagnostics command: ${error instanceof Error ? error.message : error}`)
+      }
+    }
+  }
+
   const waitForInstance = async (instance, target) => {
     const port = Number(target?.port)
     if (!Number.isFinite(port) || port <= 0) throw new Error(`Cannot healthcheck instance ${instance}: invalid port`)
 
-    const url = `http://127.0.0.1:${port}/`
-    const healthcheckScript = `fetch(${JSON.stringify(url)}).then((res) => process.exit(res.status < 500 ? 0 : 1)).catch(() => process.exit(1))`
+    const healthPath = typeof target?.healthPath === "string" && target.healthPath.startsWith("/") ? target.healthPath : "/_healthcheck"
+    const url = `http://127.0.0.1:${port}${healthPath}`
+    const healthcheckScript = [
+      `const url = ${JSON.stringify(url)}`,
+      "const controller = new AbortController()",
+      "const timeout = setTimeout(() => controller.abort(), 2000)",
+      "fetch(url, { signal: controller.signal }).then(async (res) => {",
+      "  clearTimeout(timeout)",
+      "  if (res.status < 500) process.exit(0)",
+      "  const body = await res.text().catch(() => '')",
+      "  console.error(`healthcheck ${url} failed with status ${res.status}: ${body.slice(0, 500)}`)",
+      "  process.exit(1)",
+      "}).catch((error) => {",
+      "  clearTimeout(timeout)",
+      "  console.error(`healthcheck ${url} failed: ${error?.code || error?.name || 'Error'} ${error?.message || error}`)",
+      "  process.exit(1)",
+      "})",
+    ].join(";")
     for (let attempt = 1; attempt <= 60; attempt += 1) {
       try {
         await ssh(`node -e ${shellQuote(healthcheckScript)}`)
@@ -294,6 +338,7 @@ export const deploy = async (argv) => {
       }
     }
 
+    await printInstanceDiagnostics(instance)
     throw new Error(`Instance ${instance} did not become healthy at ${url}`)
   }
 

package/src/cmd-ssh.js

@@ -1,4 +1,4 @@
-import { execSync } from "child_process"
+import { execFileSync } from "child_process"
 import fs from "fs"
 import path from "path"
 import os from "os"
@@ -45,9 +45,15 @@ export const ssh = async (argv) => {
   let tempKeyPath = null
 
   const execSsh = async (command, stdioInherit = true) => {
-    const sshCommand = `ssh -i "${keyPath}" -o StrictHostKeyChecking=no ${user}@${host} "${command}"`
     log(`${command}`)
-    const out = execSync(sshCommand, {
+    const out = execFileSync("ssh", [
+      "-i",
+      keyPath,
+      "-o",
+      "StrictHostKeyChecking=no",
+      `${user}@${host}`,
+      command,
+    ], {
       stdio: (argv.verbose || stdioInherit) ? "inherit" : "pipe",
     })
     const res = out?.toString()?.trim() || ""