@rpcbase/cli 0.190.0 → 0.192.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.190.0",
+  "version": "0.192.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() || ""
@@ -283,9 +289,10 @@ export const deploy = async (argv) => {
     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))`
     for (let attempt = 1; attempt <= 60; attempt += 1) {
       try {
-        await ssh(`node -e "fetch('${url}').then((res)=>process.exit(res.status < 500 ? 0 : 1)).catch(()=>process.exit(1))"`)
+        await ssh(`node -e ${shellQuote(healthcheckScript)}`)
         console.log(`Instance ${instance} is healthy at ${url}`)
         return
       } catch {

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() || ""