petadep 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "petadep",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Deploy GitHub repos to a VPS on push via webhooks",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -40,10 +40,31 @@ export async function initConfig({ configPath }) {
 }
 
 function createInterface() {
-  return readline.createInterface({
+  const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
+    terminal: true,
   });
+  rl._writeToOutput = function writeToOutput(stringToWrite) {
+    if (this.stdoutMuted) {
+      return;
+    }
+    this.output.write(stringToWrite);
+  };
+  return rl;
+}
+
+const colors = {
+  reset: "\u001b[0m",
+  bold: "\u001b[1m",
+  cyan: "\u001b[36m",
+  green: "\u001b[32m",
+  yellow: "\u001b[33m",
+  magenta: "\u001b[35m",
+};
+
+function color(text, code) {
+  return `${code}${text}${colors.reset}`;
 }
 
 function prompt(rl, question, defaultValue) {
@@ -56,50 +77,71 @@ function prompt(rl, question, defaultValue) {
   });
 }
 
-function promptHidden(question) {
+function promptHidden(rl, question) {
   return new Promise((resolve) => {
-    const input = process.stdin;
-    const output = process.stdout;
-    let value = "";
-
-    output.write(`${question}: `);
-    input.setRawMode(true);
-    input.resume();
-
-    function onData(chunk) {
-      const char = chunk.toString("utf8");
-      if (char === "\r" || char === "\n") {
-        input.setRawMode(false);
-        input.pause();
-        input.removeListener("data", onData);
-        output.write("\n");
-        resolve(value.trim());
-        return;
-      }
-      if (char === "\u0003") {
-        process.exit(1);
-      }
-      if (char === "\u007f") {
-        value = value.slice(0, -1);
-        return;
-      }
-      value += char;
-    }
-
-    input.on("data", onData);
+    rl.stdoutMuted = true;
+    rl.question(`${question}: `, (answer) => {
+      rl.stdoutMuted = false;
+      resolve(answer.trim());
+    });
   });
 }
 
+function normalizeRepo(input) {
+  const trimmed = input.trim();
+  const sshMatch = trimmed.match(/^git@github\.com:([^/]+\/[^/]+?)(\.git)?$/);
+  if (sshMatch) {
+    return sshMatch[1];
+  }
+  const httpsMatch = trimmed.match(/^https?:\/\/github\.com\/([^/]+\/[^/]+?)(\.git)?$/);
+  if (httpsMatch) {
+    return httpsMatch[1];
+  }
+  return trimmed;
+}
+
+function isValidRepoFormat(value) {
+  return /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(value);
+}
+
+async function promptRequired(rl, question, { normalize, validate, hint } = {}) {
+  let value = "";
+  while (!value) {
+    const answer = await prompt(rl, question, "");
+    const normalized = normalize ? normalize(answer || "") : (answer || "").trim();
+    value = normalized;
+    if (!value) {
+      console.log(color("This value is required. Try again.", colors.yellow));
+      continue;
+    }
+    if (validate && !validate(value)) {
+      const message = hint || "Invalid value. Try again.";
+      console.log(color(message, colors.yellow));
+      value = "";
+    }
+  }
+  return value;
+}
+
 export async function initConfigInteractive() {
   const rl = createInterface();
   try {
+    console.log(color("petadep setup", colors.bold + colors.magenta));
+    console.log(color("Let's create your webhook config.", colors.cyan));
     const port = await prompt(rl, "Port", "8787");
     const hookPath = await prompt(rl, "Webhook path", "/webhook");
-    const secretInput = await promptHidden("Secret (leave blank to auto-generate)");
-    const repo = await prompt(rl, "Repo (owner/repo)", "");
+    const secretInput = await promptHidden(
+      rl,
+      "Secret (leave blank to auto-generate)"
+    );
+    const repo = await promptRequired(rl, "Repo (owner/repo)", {
+      normalize: normalizeRepo,
+      validate: isValidRepoFormat,
+      hint: "Use owner/repo (example: toonami2907/ecommerce-pole). Git URLs are also accepted.",
+    });
     const branch = await prompt(rl, "Branch", "main");
     const env = await prompt(rl, "Env name", "production");
-    const workdir = await prompt(rl, "Workdir", "");
+    const workdir = await promptRequired(rl, "Workdir");
     const script = await prompt(rl, "Script path", "./deploy.sh");
     const logsDir = await prompt(rl, "Logs dir", "./logs");
     const sshKeyPath = await prompt(rl, "SSH key path (optional)", "");
@@ -120,19 +162,15 @@ export async function initConfigInteractive() {
       delete config.sshKeyPath;
     }
 
-    if (repo && workdir) {
-      config.deployments = [
-        { repo, branch, env, workdir, script },
-      ];
-    }
+    config.deployments = [{ repo, branch, env, workdir, script }];
 
     const resolvedPath = path.resolve(savePath);
     await fs.mkdir(path.dirname(resolvedPath), { recursive: true });
     await fs.writeFile(resolvedPath, JSON.stringify(config, null, 2));
 
-    console.log("Config created:", resolvedPath);
-    console.log("Webhook secret:", secret);
-    console.log(`Start agent: petadep agent --config ${resolvedPath}`);
+    console.log(color("Config created:", colors.green), resolvedPath);
+    console.log(color("Webhook secret:", colors.green), secret);
+    console.log(color("Start agent:", colors.cyan), `petadep agent --config ${resolvedPath}`);
   } finally {
     rl.close();
   }