easy-vps 0.1.9 → 0.2.1

package/dist/services/deploy.js

@@ -58,6 +58,12 @@ const domains = __importStar(require("./domain"));
 const ssh_1 = require("./ssh");
 /** Where clones live on the VPS, under the login user's home. */
 const APPS_DIR = '"$HOME/easy-vps-apps"';
+// A non-interactive login shell misses tools installed outside the system
+// prefix — nvm's node/npm in particular — so the user's install/build/run
+// commands can't find them. Seed PATH the same way the system service does.
+const PATH_PRIMER = 'export PATH="/usr/local/bin:/usr/bin:/snap/bin:$PATH"; ' +
+    'for nvm_bin in "$HOME"/.nvm/versions/node/*/bin; do ' +
+    '[ -d "$nvm_bin" ] && PATH="$PATH:$nvm_bin"; done; export PATH;';
 /** Names are validated on the way in; this is the guard for any other caller. */
 const SAFE_NAME = /^[a-z0-9][a-z0-9._-]*$/i;
 // remote.writeFile()/readFile() single-quote their path argument, so a literal
@@ -232,6 +238,7 @@ function buildScript(config) {
     // Double quotes, not quote(): the shell has to expand $HOME itself.
     const dir = `"$HOME/easy-vps-apps/${config.name}"`;
     return [
+        PATH_PRIMER,
         'set -e',
         `echo "==> Deploying ${config.name} (${config.domain ?? `port ${config.port}`})"`,
         `mkdir -p ${APPS_DIR}`,
@@ -284,6 +291,7 @@ function rebuildScript(config) {
         throw new Error('Invalid project name');
     const dir = `"$HOME/easy-vps-apps/${config.name}"`;
     return [
+        PATH_PRIMER,
         'set -e',
         `echo "==> Rebuilding ${config.name} (${config.domain ?? `port ${config.port}`})"`,
         `if [ ! -d "$HOME/easy-vps-apps/${config.name}/.git" ]; then
@@ -362,7 +370,10 @@ async function clones(remote) {
         '  name=$(basename "$dir")',
         '  repo=$(git -C "$dir" config --get remote.origin.url 2>/dev/null)',
         '  branch=$(git -C "$dir" rev-parse --abbrev-ref HEAD 2>/dev/null)',
-        '  printf "%s\\t%s\\t%s\\n" "$name" "$repo" "$branch"',
+        // The port is the authoritative one (it's what Nginx proxies to); read it
+        // from the deploy config the panel mirrors next to the clone.
+        '  port=$(grep -oE \'"port"[[:space:]]*:[[:space:]]*[0-9]+\' "$dir/.easy-vps.json" 2>/dev/null | grep -oE \'[0-9]+\' | head -n1)',
+        '  printf "%s\\t%s\\t%s\\t%s\\n" "$name" "$repo" "$branch" "$port"',
         'done',
     ].join('\n');
     const { stdout, code } = await remote.exec((0, ssh_1.loginShell)(script), 15_000);
@@ -372,10 +383,11 @@ async function clones(remote) {
         .split('\n')
         .map((line) => line.split('\t'))
         .filter((parts) => parts[0]?.trim())
-        .map(([name, repository, branch]) => ({
+        .map(([name, repository, branch, port]) => ({
         name: name.trim(),
         repository: repository?.trim() ?? '',
         branch: branch?.trim() || 'main',
+        port: port?.trim() ? Number(port.trim()) : undefined,
     }));
 }
 /** PM2 processes by name, with the port they were started on. */
@@ -439,11 +451,13 @@ async function list(remote) {
         domains.list(remote).catch(() => []),
     ]);
     const domainForPort = new Map(configured.map((entry) => [entry.port, entry.domain]));
-    return cloned.map(({ name, repository, branch }) => {
+    return cloned.map(({ name, repository, branch, port: configPort }) => {
         const process = pm2.get(name);
         const container = docker.get(name);
         const runtime = container && !process ? 'docker' : 'pm2';
-        const port = process?.port ?? container?.port ?? 0;
+        // Prefer the saved deploy config's port (authoritative for the domain
+        // mapping); fall back to what PM2/Docker report, then 0.
+        const port = configPort ?? process?.port ?? container?.port ?? 0;
         let status = 'unknown';
         if (process)
             status = process.status === 'online' ? 'running' : 'stopped';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-vps",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Install dependencies, point domains, deploy apps and run Postgres on a VPS from one UI",
   "keywords": [
     "easy-vps",