@cloudgrid-io/cli 0.3.2 → 0.4.0

package/dist/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command23 } from "commander";
-import { readFileSync as readFileSync10 } from "fs";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname2, join as join9 } from "path";
+import { Command as Command26 } from "commander";
+import { readFileSync as readFileSync12 } from "fs";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { dirname as dirname3, join as join11 } from "path";
 
 // src/utils.ts
 import { execa } from "execa";
@@ -212,6 +212,18 @@ var CloudGridApiClient = class {
   async getUsage(name) {
     return this.request("GET", `/apps/${name}/usage`);
   }
+  async rollback(name) {
+    return this.request("POST", `/apps/${name}/rollback`);
+  }
+  async getSource(name) {
+    return this.request("GET", `/apps/${name}/source`);
+  }
+  async reportError(data) {
+    return this.request("POST", "/errors", data);
+  }
+  async submitFeedback(data) {
+    return this.request("POST", "/feedback", data);
+  }
   // ── WebSocket tunnel ────────────────────────────────────────
   /**
    * Opens a local TCP server on `localPort`. For each incoming connection,
@@ -897,16 +909,50 @@ async function interactiveWizard(name, appDir) {
 
 // src/commands/dev.ts
 import { Command as Command3 } from "commander";
-import { existsSync as existsSync7, writeFileSync as writeFileSync5, readFileSync as readFileSync5, unlinkSync } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync7, writeFileSync as writeFileSync5, readFileSync as readFileSync6, unlinkSync } from "fs";
+import { join as join9 } from "path";
 import { tmpdir } from "os";
 import { createInterface } from "readline";
 import { execa as execa2 } from "execa";
 import chalk2 from "chalk";
 
+// src/services/error-reporter.ts
+import { readFileSync as readFileSync5 } from "fs";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { dirname as dirname2, join as join7 } from "path";
+var __dirname = dirname2(fileURLToPath2(import.meta.url));
+function getCliVersion() {
+  try {
+    const pkg2 = JSON.parse(readFileSync5(join7(__dirname, "../../package.json"), "utf-8"));
+    return pkg2.version || "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+async function reportError(opts) {
+  try {
+    if (!configExists()) return;
+    const cfg = loadConfig();
+    if (!cfg.jwt || !cfg.api_url) return;
+    const client = new CloudGridApiClient(cfg.api_url, cfg.jwt);
+    await client.reportError({
+      type: "error",
+      category: opts.category,
+      app: opts.app,
+      message: opts.message,
+      stack: opts.stack,
+      context: opts.context,
+      cli_version: getCliVersion(),
+      node_version: process.version,
+      platform: `${process.platform} ${process.arch}`
+    });
+  } catch {
+  }
+}
+
 // ../shared/src/generator/docker-compose.ts
 import { writeFileSync as writeFileSync4 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 function generateDockerCompose(opts) {
   const { outputPath, appDir, config, requires, sharedServices, portMap, token, apiUrl } = opts;
   const svcNames = Object.keys(config.services);
@@ -920,7 +966,7 @@ function generateDockerCompose(opts) {
     const containerPort = svc.type === "static" ? 80 : 8080;
     yaml += `  ${svcName}:
 `;
-    yaml += `    build: ${join7(appDir, "services", svcName)}
+    yaml += `    build: ${join8(appDir, "services", svcName)}
 `;
     yaml += `    ports:
 `;
@@ -933,12 +979,12 @@ function generateDockerCompose(opts) {
     if (svc.type === "static") {
       yaml += `    volumes:
 `;
-      yaml += `      - ${join7(appDir, "services", svcName, "public")}:/usr/share/nginx/html
+      yaml += `      - ${join8(appDir, "services", svcName, "public")}:/usr/share/nginx/html
 `;
     } else {
       yaml += `    volumes:
 `;
-      yaml += `      - ${join7(appDir, "services", svcName, "src")}:/app/src
+      yaml += `      - ${join8(appDir, "services", svcName, "src")}:/app/src
 `;
     }
     yaml += `    environment:
@@ -1000,10 +1046,10 @@ var RUNNERS = {
   static: (port) => ({ cmd: "npx", args: ["serve", "public/", "-l", String(port)] })
 };
 function checkDevLock(appDir) {
-  const lockPath = join8(appDir, LOCK_FILE);
+  const lockPath = join9(appDir, LOCK_FILE);
   if (!existsSync7(lockPath)) return;
   try {
-    const lock = JSON.parse(readFileSync5(lockPath, "utf-8"));
+    const lock = JSON.parse(readFileSync6(lockPath, "utf-8"));
     try {
       process.kill(lock.pid, 0);
       die2(`Dev already running for this app (PID ${lock.pid}). Stop it first (Ctrl+C) or use --force`);
@@ -1018,7 +1064,7 @@ function checkDevLock(appDir) {
   }
 }
 function writeDevLock(appDir, ports) {
-  writeFileSync5(join8(appDir, LOCK_FILE), JSON.stringify({
+  writeFileSync5(join9(appDir, LOCK_FILE), JSON.stringify({
     pid: process.pid,
     ports: Object.fromEntries(ports),
     startedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -1026,7 +1072,7 @@ function writeDevLock(appDir, ports) {
 }
 function removeDevLock(appDir) {
   try {
-    unlinkSync(join8(appDir, LOCK_FILE));
+    unlinkSync(join9(appDir, LOCK_FILE));
   } catch {
   }
 }
@@ -1038,9 +1084,24 @@ function prefixStream(stream, name, color) {
 }
 var devCommand = new Command3("dev").description("Start local development").option("--compose", "Use docker-compose instead of native processes").option("--force", "Ignore existing dev lock").action(async (opts) => {
   const appDir = process.cwd();
-  if (!existsSync7(join8(appDir, "cloudgrid.yaml"))) {
+  if (!existsSync7(join9(appDir, "cloudgrid.yaml"))) {
     die2("No cloudgrid.yaml found. Run: cloudgrid create <name>");
   }
+  let _devAppName;
+  try {
+    await runDev(appDir, opts);
+  } catch (err) {
+    reportError({
+      category: "dev",
+      message: err?.message || String(err),
+      stack: err?.stack,
+      app: _devAppName
+    }).catch(() => {
+    });
+    throw err;
+  }
+});
+async function runDev(appDir, opts) {
   if (!opts.force) checkDevLock(appDir);
   if (!configExists()) die2("No CLI config. Run: cloudgrid init");
   const cliConfig = loadConfig();
@@ -1116,7 +1177,7 @@ var devCommand = new Command3("dev").description("Start local development").opti
     process.exit(0);
   });
   if (opts.compose) {
-    tmpComposePath = join8(tmpdir(), `cloudgrid-${config.name}-compose.yaml`);
+    tmpComposePath = join9(tmpdir(), `cloudgrid-${config.name}-compose.yaml`);
     log.info("Starting docker-compose...");
     generateDockerCompose({
       outputPath: tmpComposePath,
@@ -1148,7 +1209,7 @@ var devCommand = new Command3("dev").description("Start local development").opti
       const runMode = svc.run || "job";
       const color = SERVICE_COLORS[svcNames.indexOf(svcName) % SERVICE_COLORS.length];
       if (runMode === "job") {
-        const svcDir = join8(appDir, "services", svcName);
+        const svcDir = join9(appDir, "services", svcName);
         const svcEnv = envMap.get(svcName) || {};
         log.info(`${color(svcName)}: Running cron job once...`);
         try {
@@ -1180,10 +1241,10 @@ var devCommand = new Command3("dev").description("Start local development").opti
       }
     }
     for (const svcName of svcNames) {
-      const svcDir = join8(appDir, "services", svcName);
+      const svcDir = join9(appDir, "services", svcName);
       const svcType = config.services[svcName].type;
       if (svcType === "cron") continue;
-      if ((svcType === "node" || svcType === "nextjs") && !existsSync7(join8(svcDir, "node_modules"))) {
+      if ((svcType === "node" || svcType === "nextjs") && !existsSync7(join9(svcDir, "node_modules"))) {
         const si = spinner(`Installing dependencies for ${svcName}...`);
         si.start();
         try {
@@ -1212,7 +1273,7 @@ var devCommand = new Command3("dev").description("Start local development").opti
       const svc = config.services[svcName];
       if (svc.type === "cron") continue;
       const port = portMap.get(svcName);
-      const svcDir = join8(appDir, "services", svcName);
+      const svcDir = join9(appDir, "services", svcName);
       const svcEnv = envMap.get(svcName);
       let runner = RUNNERS[svc.type];
       const color = SERVICE_COLORS[i % SERVICE_COLORS.length];
@@ -1238,11 +1299,11 @@ var devCommand = new Command3("dev").description("Start local development").opti
     await new Promise(() => {
     });
   }
-});
+}
 
 // src/commands/deploy.ts
 import { Command as Command4 } from "commander";
-import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
 import { execSync } from "child_process";
 var deployCommand = new Command4("deploy").description("Deploy app to production").action(async () => {
   if (!existsSync8("cloudgrid.yaml")) die2("No cloudgrid.yaml in current directory");
@@ -1253,10 +1314,21 @@ var deployCommand = new Command4("deploy").description("Deploy app to production
   console.log(`
 Deploying ${config.name} to production...
 `);
-  await serverBuild(config, apiClient);
+  try {
+    await serverBuild(config, apiClient);
+  } catch (err) {
+    reportError({
+      category: "deploy",
+      message: err?.message || String(err),
+      stack: err?.stack,
+      app: config?.name
+    }).catch(() => {
+    });
+    throw err;
+  }
 });
 async function serverBuild(config, apiClient) {
-  const cloudgridYaml = readFileSync6("cloudgrid.yaml", "utf-8");
+  const cloudgridYaml = readFileSync7("cloudgrid.yaml", "utf-8");
   const services = {};
   for (const [svcName, svc] of Object.entries(config.services)) {
     if (svc.type === "cron" && svc.run && (svc.run.startsWith("http://") || svc.run.startsWith("https://"))) {
@@ -1375,13 +1447,34 @@ var removeCommand = new Command6("remove").argument("<name>", "App name to remov
 // src/commands/logs.ts
 import { Command as Command7 } from "commander";
 import { existsSync as existsSync9 } from "fs";
-var logsCommand = new Command7("logs").argument("[name]", "App name (auto-detected from cloudgrid.yaml if in app dir)").option("-s, --service <service>", "Filter by service name").option("-t, --tail <lines>", "Number of lines to show", "100").description("Show app logs").action(async (name, opts) => {
+var logsCommand = new Command7("logs").argument("[name]", "App name (auto-detected from cloudgrid.yaml if in app dir)").option("-s, --service <service>", "Filter by service name").option("-t, --tail <lines>", "Number of lines to show", "100").option("--build", "Show Cloud Build logs for last deploy").description("Show app logs").action(async (name, opts) => {
   if (!configExists()) die2("No CLI config. Run: cloudgrid init");
   const appName = name || (existsSync9("cloudgrid.yaml") ? loadCloudGridYaml(process.cwd()).name : null);
   if (!appName) {
     die2("Provide app name or run from app directory");
   }
   const apiClient = createApiClient(loadConfig());
+  if (opts.build) {
+    try {
+      const { events } = await apiClient.listEvents(appName);
+      const latest = events?.[0];
+      if (latest?.context?.build_log_url) {
+        console.log(`Cloud Build logs for last deploy:`);
+        console.log(latest.context.build_log_url);
+      } else if (latest?.context?.build_id) {
+        console.log(`Cloud Build ID: ${latest.context.build_id}`);
+        console.log(`View logs at: https://console.cloud.google.com/cloud-build/builds/${latest.context.build_id}`);
+      } else {
+        console.log("No build logs available.");
+      }
+    } catch (err) {
+      if (err instanceof ApiError && err.code === "NOT_FOUND") {
+        die2(`App "${appName}" not found`);
+      }
+      throw err;
+    }
+    return;
+  }
   try {
     const logs = await apiClient.logs(appName, {
       service: opts.service,
@@ -1877,7 +1970,7 @@ adminCommand.command("revoke <email>").description("Revoke user access").action(
 
 // src/commands/secrets.ts
 import { Command as Command18 } from "commander";
-import { existsSync as existsSync15, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync8 } from "fs";
 var secretsCommand = new Command18("secrets").description("Manage app secrets");
 secretsCommand.command("set <name> [pairs...]").description("Set secrets (KEY=VALUE)").action(async (name, pairs) => {
   if (!configExists()) die2("Run: cloudgrid login");
@@ -1934,7 +2027,7 @@ secretsCommand.command("remove <name> <key>").description("Remove a secret").act
 secretsCommand.command("import <name> <file>").description("Import secrets from .env file").action(async (name, file) => {
   if (!configExists()) die2("Run: cloudgrid login");
   if (!existsSync15(file)) die2(`File not found: ${file}`);
-  const values = parseEnvFile(readFileSync7(file, "utf-8"));
+  const values = parseEnvFile(readFileSync8(file, "utf-8"));
   if (Object.keys(values).length === 0) die2("No valid KEY=VALUE pairs found");
   try {
     const result = await createApiClient().setSecrets(name, values);
@@ -1946,7 +2039,7 @@ secretsCommand.command("import <name> <file>").description("Import secrets from
 
 // src/commands/env-cmd.ts
 import { Command as Command19 } from "commander";
-import { existsSync as existsSync16, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync9 } from "fs";
 var envCommand = new Command19("env").description("Manage app environment variables");
 envCommand.command("set <name> [pairs...]").description("Set env vars (KEY=VALUE)").action(async (name, pairs) => {
   if (!configExists()) die2("Run: cloudgrid login");
@@ -1992,7 +2085,7 @@ envCommand.command("remove <name> <key>").description("Remove an env var").actio
 envCommand.command("import <name> <file>").description("Import env vars from .env file").action(async (name, file) => {
   if (!configExists()) die2("Run: cloudgrid login");
   if (!existsSync16(file)) die2(`File not found: ${file}`);
-  const values = parseEnvFile(readFileSync8(file, "utf-8"));
+  const values = parseEnvFile(readFileSync9(file, "utf-8"));
   if (Object.keys(values).length === 0) die2("No valid KEY=VALUE pairs found");
   try {
     const result = await createApiClient().setEnv(name, values);
@@ -2057,7 +2150,7 @@ var whoamiCommand = new Command21("whoami").description("Show current logged-in
 
 // src/commands/support.ts
 import { Command as Command22 } from "commander";
-import { existsSync as existsSync18, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync10 } from "fs";
 import { execSync as execSync4 } from "child_process";
 var supportCommand = new Command22("support").description("Generate a troubleshoot report to share with your admin").argument("[name]", "App name (defaults to current directory)").action(async (name) => {
   const lines = [];
@@ -2069,7 +2162,7 @@ var supportCommand = new Command22("support").description("Generate a troublesho
   lines.push("Cloud Grid Support Report");
   lines.push(`Generated: ${(/* @__PURE__ */ new Date()).toISOString()}`);
   try {
-    const pkg2 = JSON.parse(readFileSync9(new URL("../../package.json", import.meta.url), "utf-8"));
+    const pkg2 = JSON.parse(readFileSync10(new URL("../../package.json", import.meta.url), "utf-8"));
     add("CLI Version", pkg2.version);
   } catch {
     add("CLI Version", "unknown");
@@ -2085,7 +2178,7 @@ var supportCommand = new Command22("support").description("Generate a troublesho
   if (appName) {
     add("App", appName);
     if (existsSync18("cloudgrid.yaml")) {
-      add("cloudgrid.yaml", readFileSync9("cloudgrid.yaml", "utf-8"));
+      add("cloudgrid.yaml", readFileSync10("cloudgrid.yaml", "utf-8"));
     }
     if (configExists()) {
       const apiClient = createApiClient();
@@ -2152,10 +2245,171 @@ var supportCommand = new Command22("support").description("Generate a troublesho
   console.log("=".repeat(50) + "\n");
 });
 
+// src/commands/feedback.ts
+import { Command as Command23 } from "commander";
+import { existsSync as existsSync19, readFileSync as readFileSync11 } from "fs";
+var feedbackCommand = new Command23("feedback").description("Send feedback or report an issue to your admin").argument("<message>", "Your feedback message").action(async (message) => {
+  if (!configExists()) die2("Run: cloudgrid login");
+  const apiClient = createApiClient();
+  const appName = existsSync19("cloudgrid.yaml") ? loadCloudGridYaml(process.cwd()).name : null;
+  const context = {};
+  if (appName) {
+    try {
+      const status = await apiClient.request("GET", `/apps/${appName}`);
+      context.pod_status = (status.pods || []).map((p) => `${p.name}: ${p.status}`).join(", ");
+    } catch {
+    }
+    try {
+      const events = await apiClient.request("GET", `/apps/${appName}/events`);
+      const last = (events.events || [])[0];
+      if (last) context.last_deploy_status = last.status;
+    } catch {
+    }
+    try {
+      const envData = await apiClient.request("GET", `/apps/${appName}/env`);
+      context.env_keys = (envData.env || []).map((e) => e.key);
+    } catch {
+    }
+    try {
+      const secretsData = await apiClient.request("GET", `/apps/${appName}/secrets`);
+      context.secrets_count = (secretsData.secrets || []).length;
+    } catch {
+    }
+  }
+  try {
+    let pkg2 = {};
+    try {
+      pkg2 = JSON.parse(readFileSync11(new URL("../../package.json", import.meta.url), "utf-8"));
+    } catch {
+    }
+    await apiClient.request("POST", "/feedback", {
+      app: appName || "",
+      message,
+      cli_version: pkg2.version || "unknown",
+      node_version: process.version,
+      platform: `${process.platform} ${process.arch}`,
+      context
+    });
+    log.success("Feedback sent. Thank you!");
+  } catch (err) {
+    die2(`Failed to send feedback: ${err.message}`);
+  }
+});
+
+// src/commands/rollback.ts
+import { Command as Command24 } from "commander";
+import inquirer5 from "inquirer";
+import { existsSync as existsSync20 } from "fs";
+var rollbackCommand = new Command24("rollback").argument("[name]", "App name (auto-detected from cloudgrid.yaml if in app dir)").option("-y, --yes", "Skip confirmation prompt").description("Roll back app to previous successful deploy").action(async (name, opts) => {
+  if (!configExists()) die2("No CLI config. Run: cloudgrid init");
+  const appName = name || (existsSync20("cloudgrid.yaml") ? loadCloudGridYaml(process.cwd()).name : null);
+  if (!appName) {
+    die2("Provide app name or run from app directory");
+  }
+  console.log("");
+  console.log("WARNING: Rollback only reverts container images.");
+  console.log("Config, env vars, and secrets are NOT rolled back.");
+  console.log("");
+  if (!opts.yes) {
+    const { confirm } = await inquirer5.prompt([
+      {
+        type: "confirm",
+        name: "confirm",
+        message: `Roll back ${appName} to the previous successful deploy?`,
+        default: false
+      }
+    ]);
+    if (!confirm) {
+      log("Rollback cancelled.");
+      return;
+    }
+  }
+  const apiClient = createApiClient(loadConfig());
+  const s = spinner(`Rolling back ${appName}...`);
+  s.start();
+  try {
+    const result = await apiClient.rollback(appName);
+    s.succeed(`${appName} rolled back.`);
+    console.log("");
+    console.log(`URL: ${result.url}`);
+    if (result.services?.length) {
+      console.log("Services:");
+      for (const svc of result.services) {
+        console.log(`  ${svc.name}: ${svc.image}`);
+      }
+    }
+  } catch (err) {
+    s.fail("Rollback failed");
+    if (err instanceof ApiError && err.code === "NOT_FOUND") {
+      die2(`App "${appName}" not found or no previous version available`);
+    }
+    if (err instanceof ApiError && err.code === "DEPLOY_IN_PROGRESS") {
+      die2("A deploy is already in progress. Try again shortly.");
+    }
+    if (err instanceof ApiError) {
+      die2(`API error (${err.code}): ${err.message}`);
+    }
+    throw err;
+  }
+});
+
+// src/commands/pull.ts
+import { Command as Command25 } from "commander";
+import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync6, existsSync as existsSync21, readdirSync as readdirSync2 } from "fs";
+import { execSync as execSync5 } from "child_process";
+import { join as join10 } from "path";
+var pullCommand = new Command25("pull").description("Download app source from last deploy").argument("<name>", "App name").action(async (name) => {
+  if (!configExists()) die2("Run: cloudgrid login");
+  const apiClient = createApiClient();
+  let sourceData;
+  try {
+    sourceData = await apiClient.getSource(name);
+  } catch (err) {
+    if (err.code === "SOURCE_NOT_AVAILABLE") {
+      die2("Source not available \u2014 this app was deployed before source retention was enabled.\nRedeploy the app to enable: cloudgrid deploy");
+    }
+    if (err.code === "SOURCE_EXPIRED") {
+      die2("Source tarballs have expired (90-day retention). Redeploy to create new ones.");
+    }
+    die2(`Failed: ${err.message}`);
+  }
+  const services = sourceData.services || {};
+  if (Object.keys(services).length === 0) {
+    die2("No service sources found");
+  }
+  const appDir = join10(process.cwd(), name);
+  if (existsSync21(appDir)) {
+    const contents = readdirSync2(appDir);
+    if (contents.length > 0) {
+      log.warn(`Directory ./${name}/ already exists and is not empty. Files may be overwritten.`);
+    }
+  }
+  mkdirSync5(appDir, { recursive: true });
+  mkdirSync5(join10(appDir, "services"), { recursive: true });
+  for (const [svcName, url] of Object.entries(services)) {
+    const svcDir = join10(appDir, "services", svcName);
+    mkdirSync5(svcDir, { recursive: true });
+    log.step(`Downloading ${svcName}...`);
+    const res = await fetch(url);
+    if (!res.ok) die2(`Failed to download ${svcName}: ${res.status}`);
+    const buffer = Buffer.from(await res.arrayBuffer());
+    const tarPath = join10(svcDir, ".source.tar.gz");
+    writeFileSync6(tarPath, buffer);
+    execSync5(`tar -xzf .source.tar.gz --strip-components=0 --no-overwrite-dir -C .`, { cwd: svcDir });
+    execSync5(`rm .source.tar.gz`, { cwd: svcDir });
+    const traversalFiles = execSync5('find . -name "*..*"', { cwd: svcDir }).toString().trim();
+    if (traversalFiles) {
+      execSync5("rm -rf *", { cwd: svcDir });
+      die2(`Security: tarball contained path traversal attempt for service '${svcName}'`);
+    }
+  }
+  log.success(`Source downloaded to ./${name}/`);
+});
+
 // src/index.ts
-var __dirname = dirname2(fileURLToPath2(import.meta.url));
-var pkg = JSON.parse(readFileSync10(join9(__dirname, "../package.json"), "utf-8"));
-var program = new Command23();
+var __dirname2 = dirname3(fileURLToPath3(import.meta.url));
+var pkg = JSON.parse(readFileSync12(join11(__dirname2, "../package.json"), "utf-8"));
+var program = new Command26();
 program.name("cloudgrid").description("Deploy apps with a single YAML file").version(pkg.version).option("-v, --verbose", "Show detailed output");
 program.hook("preAction", (_thisCommand, _actionCommand) => {
   const opts = program.opts();
@@ -2183,6 +2437,9 @@ program.addCommand(envCommand);
 program.addCommand(usageCommand);
 program.addCommand(whoamiCommand);
 program.addCommand(supportCommand);
+program.addCommand(feedbackCommand);
+program.addCommand(rollbackCommand);
+program.addCommand(pullCommand);
 if (process.argv.includes("--verbose") || process.argv.includes("-v")) {
   setVerbose(true);
 }