easy-vps 0.2.0 → 0.2.2

package/dist/services/deploy.js

@@ -227,6 +227,47 @@ function dockerRestart(config) {
     const name = (0, ssh_1.quote)(config.name);
     return [step('Restarting the container'), `docker restart ${name}`, `docker ps --filter name=${name}`].join('\n');
 }
+/**
+ * Generates a bash snippet that patches vite.config.{ts,js,mts,mjs} to add
+ * `preview.allowedHosts` for the deployment's domain.  Without this Vite 6+
+ * rejects incoming requests whose Host header doesn't match localhost.
+ *
+ * The snippet is idempotent — it skips files that already contain
+ * `allowedHosts` and silently does nothing when no vite config is found.
+ */
+function patchViteHosts(config) {
+    if (!config.domain)
+        return '';
+    const domain = config.domain;
+    return [
+        step('Patching vite.config for domain access'),
+        // Write a small Node helper to /tmp, then execute it per config file.
+        // A single-quoted heredoc (<<'EOF') keeps every character literal so
+        // backslashes in regexes and $-prefixed strings survive untouched.
+        `DOMAIN=${(0, ssh_1.quote)(domain)}`,
+        'cat > /tmp/patch-vite.js << \'VITEPATCH\'\n' +
+            'const fs = require("fs");\n' +
+            'const domain = process.argv[2];\n' +
+            'const cfg = process.argv[3];\n' +
+            'let src = fs.readFileSync(cfg, "utf8");\n' +
+            'const hostEntry = "allowedHosts: [\\"" + domain + "\\"],";\n' +
+            'if (/preview\\s*:\\s*\\{/.test(src)) {\n' +
+            '  src = src.replace(/(preview\\s*:\\s*\\{)/, "$1\\n    " + hostEntry);\n' +
+            '} else {\n' +
+            '  const lastBrace = src.lastIndexOf("}");\n' +
+            '  if (lastBrace !== -1) {\n' +
+            '    src = src.slice(0, lastBrace) + "  preview: {\\n    " + hostEntry + "\\n  },\\n" + src.slice(lastBrace);\n' +
+            '  }\n' +
+            '}\n' +
+            'fs.writeFileSync(cfg, src);\n' +
+            'VITEPATCH\n',
+        'for cfg in vite.config.ts vite.config.js vite.config.mts vite.config.mjs; do\n' +
+            '  if [ -f "$cfg" ] && ! grep -q \'allowedHosts\' "$cfg"; then\n' +
+            '    node /tmp/patch-vite.js "$DOMAIN" "$cfg"\n' +
+            '    echo "  Patched $cfg \\u2014 added allowedHosts for $DOMAIN"\n' +
+            '  fi\ndone',
+    ].join('\n');
+}
 /**
  * The whole deploy as one script. `set -e` stops at the first failing step, so a
  * broken build never reaches the run stage and the exit code reaches the UI.
@@ -272,11 +313,13 @@ else
   cd ${dir}
 fi`,
         'git --no-pager log -1 --pretty="cloned %h %s"',
+        patchViteHosts(config),
         step('Installing dependencies'),
         config.installCommand,
         step('Building'),
         config.buildCommand,
         config.runtime === 'pm2' ? pm2Start(config) : dockerStart(config),
+        'rm -f /tmp/patch-vite.js',
         `echo ""; echo "==> ${config.name} is live on port ${config.port}"`,
     ].join('\n');
 }
@@ -370,7 +413,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);
@@ -380,10 +426,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. */
@@ -447,11 +494,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.2.0",
+  "version": "0.2.2",
   "description": "Install dependencies, point domains, deploy apps and run Postgres on a VPS from one UI",
   "keywords": [
     "easy-vps",