easy-vps 0.1.8 → 0.2.0

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,17 +238,21 @@ 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}`,
         // Embed the stored Github token straight into the clone URL so the fetch
         // authenticates without depending on the credential helper being picked up
-        // inside this streaming login shell. Falls back to the plain URL (credential
-        // helper still applies) when no token is configured.
+        // inside this streaming login shell. Prefers the panel's state file, then
+        // git's credential store, then falls back to the plain URL.
         `REPO=${(0, ssh_1.quote)(config.repository)}`,
         step('Resolving Github credentials'),
         'TOKEN=""\n' +
-            'if [ -f ~/.git-credentials ]; then\n' +
+            'if [ -f ~/.easy-vps/github.json ]; then\n' +
+            '  TOKEN=$(grep -o \'"token"[[:space:]]*:[[:space:]]*"[^"]*"\' ~/.easy-vps/github.json | head -n1 | sed -E \'s/.*:"([^"]*)"/\\1/\')\n' +
+            'fi\n' +
+            'if [ -z "$TOKEN" ] && [ -f ~/.git-credentials ]; then\n' +
             '  TOKEN=$(grep "github.com" ~/.git-credentials 2>/dev/null | head -n1 | sed -E "s#^https://([^@]+)@github.com#\\1#" | sed -E "s#^[^:]+:##")\n' +
             'fi\n' +
             'if [ -n "$TOKEN" ]; then\n' +
@@ -281,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

package/dist/services/github.d.ts

@@ -4,7 +4,7 @@ export interface GithubConfig {
     email: string;
     /** The stored personal access token; returned so the UI can prefill it. */
     personalAccessToken: string;
-    /** True when a token is already stored in the credential store on the server. */
+    /** True when a token is already stored on the server. */
     tokenSet: boolean;
 }
 /** Only the fields the user may change; each is optional on update. */
@@ -17,7 +17,8 @@ export interface GithubConfigPatch {
 export declare function getGithubConfig(remote: Remote): Promise<GithubConfig>;
 /**
  * Applies the supplied github identity over SSH and stores the personal access
- * token in git's credential store so HTTPS clones can authenticate. Returns the
- * resulting config (without the token, which is never sent back).
+ * token in git's credential store (so HTTPS clones authenticate) and in the
+ * panel's state file (the reliable source of truth for display and deploys).
+ * Returns the resulting config.
  */
 export declare function updateGithubConfig(remote: Remote, patch: GithubConfigPatch): Promise<GithubConfig>;

package/dist/services/github.js

@@ -4,18 +4,70 @@ exports.getGithubConfig = getGithubConfig;
 exports.updateGithubConfig = updateGithubConfig;
 // Github identity and credential configuration on the managed VPS, over SSH.
 const ssh_1 = require("./ssh");
+const STATE_DIR = '.easy-vps';
+const STATE_FILE = 'github.json';
 function safeTrim(value) {
     return typeof value === 'string' ? value.trim() : '';
 }
+/** Resolves the login user's home directory on the remote. */
+async function homeDir(remote) {
+    const { stdout } = await remote.exec('echo $HOME', 10_000);
+    return stdout.trim() || '';
+}
+/** Path to the panel-owned state file holding the github config. */
+async function statePath(remote) {
+    const home = await homeDir(remote);
+    return `${home}/${STATE_DIR}/${STATE_FILE}`;
+}
+/** Reads the panel's own state file; null when it has never been written. */
+async function readState(remote) {
+    const path = await statePath(remote);
+    if (!(await remote.exists(path)))
+        return null;
+    try {
+        const parsed = JSON.parse(await remote.readFile(path));
+        return {
+            username: parsed.username ?? '',
+            email: parsed.email ?? '',
+            token: parsed.token ?? '',
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/** Persists the github config to the panel's state file (written via tee). */
+async function writeState(remote, username, email, token) {
+    const home = await homeDir(remote);
+    const dir = `${home}/${STATE_DIR}`;
+    const path = `${dir}/${STATE_FILE}`;
+    await remote.exec(`mkdir -p ${(0, ssh_1.quote)(dir)}`);
+    await remote.writeFile(path, JSON.stringify({ username, email, token }));
+}
+/** Extracts a stored token from git's credential store, if present. */
+async function tokenFromCredentials(remote) {
+    const result = await remote.exec((0, ssh_1.loginShell)("cred=$(grep 'github.com' ~/.git-credentials 2>/dev/null | head -n1); " +
+        "if [ -n \"$cred\" ]; then " +
+        "printf '%s' \"$cred\" | sed -E 's#^https://([^@]+)@github.com#\\1#' | sed -E 's#^[^:]+:##'; " +
+        "fi"), 10_000);
+    return result.stdout.trim();
+}
 /** Reads the git identity currently configured for the remote user. */
 async function getGithubConfig(remote) {
+    // Prefer the panel's state file so display always reflects what was saved.
+    const state = await readState(remote);
+    if (state) {
+        return {
+            username: state.username,
+            email: state.email,
+            personalAccessToken: state.token,
+            tokenSet: state.token !== '',
+        };
+    }
+    // Fall back to git config + the credential store for partial setups.
     const nameResult = await remote.exec((0, ssh_1.loginShell)('git config --global --get user.name 2>/dev/null'), 10_000);
     const emailResult = await remote.exec((0, ssh_1.loginShell)('git config --global --get user.email 2>/dev/null'), 10_000);
-    const tokenResult = await remote.exec((0, ssh_1.loginShell)("cred=$(grep 'github.com' ~/.git-credentials 2>/dev/null | head -n1); " +
-        "if [ -n \"$cred\" ]; then " +
-        "printf '%s' \"$cred\" | sed -E 's#^https://([^@]+)@github.com/?$#\\1#' | sed -E 's#^[^:]+:##'; " +
-        "fi"), 10_000);
-    const token = tokenResult.stdout.trim();
+    const token = await tokenFromCredentials(remote);
     return {
         username: nameResult.stdout.trim(),
         email: emailResult.stdout.trim(),
@@ -25,13 +77,15 @@ async function getGithubConfig(remote) {
 }
 /**
  * Applies the supplied github identity over SSH and stores the personal access
- * token in git's credential store so HTTPS clones can authenticate. Returns the
- * resulting config (without the token, which is never sent back).
+ * token in git's credential store (so HTTPS clones authenticate) and in the
+ * panel's state file (the reliable source of truth for display and deploys).
+ * Returns the resulting config.
  */
 async function updateGithubConfig(remote, patch) {
-    const username = safeTrim(patch.username);
-    const email = safeTrim(patch.email);
-    const token = safeTrim(patch.personalAccessToken);
+    const existing = await getGithubConfig(remote);
+    const username = patch.username !== undefined ? safeTrim(patch.username) : existing.username;
+    const email = patch.email !== undefined ? safeTrim(patch.email) : existing.email;
+    const token = patch.personalAccessToken !== undefined ? safeTrim(patch.personalAccessToken) : existing.personalAccessToken;
     if (patch.username !== undefined && username === '') {
         throw new Error('Github username is required.');
     }
@@ -59,10 +113,14 @@ async function updateGithubConfig(remote, patch) {
             `printf '%s\\n' ${(0, ssh_1.quote)(url)} >> ~/.git-credentials; ` +
             `chmod 600 ~/.git-credentials`);
     }
-    const script = (0, ssh_1.loginShell)(commands.join('\n'));
-    const { code, stderr } = await remote.exec(script, 30_000);
-    if (code !== 0) {
-        throw new Error(`Failed to apply github configuration: ${stderr.trim()}`);
+    if (commands.length > 0) {
+        const script = (0, ssh_1.loginShell)(commands.join('\n'));
+        const { code, stderr } = await remote.exec(script, 30_000);
+        if (code !== 0) {
+            throw new Error(`Failed to apply github configuration: ${stderr.trim()}`);
+        }
     }
+    // Always persist the merged config to the panel's state file.
+    await writeState(remote, username, email, token);
     return getGithubConfig(remote);
 }

package/package.json

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