@webhikers/cli 1.0.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webhikers/cli",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "CLI for creating and deploying webhikers projects",
   "type": "module",
   "bin": {

package/src/commands/create.js

@@ -1,10 +1,11 @@
 import { execSync } from "child_process";
-import { existsSync, writeFileSync } from "fs";
+import { existsSync, writeFileSync, readFileSync } from "fs";
 import { resolve } from "path";
 import { loadConfig, getConfigPath } from "../utils/config-store.js";
 
 const TEMPLATE_REPO = "Webhikers/nextjs-vibe-starter";
 const GITHUB_ORG = "Webhikers";
+const DOMAIN_SUFFIX = "preview.webhikers.dev";
 
 function run(cmd, options = {}) {
   console.log(`  → ${cmd}`);
@@ -15,6 +16,28 @@ function runCapture(cmd) {
   return execSync(cmd, { encoding: "utf-8" }).trim();
 }
 
+async function coolifyApi(config, method, path, body) {
+  const url = `${config.coolifyUrl}/api/v1${path}`;
+  const options = {
+    method,
+    headers: {
+      Authorization: `Bearer ${config.coolifyToken}`,
+      "Content-Type": "application/json",
+    },
+  };
+  if (body) options.body = JSON.stringify(body);
+
+  const res = await fetch(url, options);
+  const data = await res.json();
+
+  if (!res.ok) {
+    throw new Error(
+      `Coolify API error (${res.status}): ${JSON.stringify(data)}`
+    );
+  }
+  return data;
+}
+
 export async function createCommand(name) {
   console.log(`\nCreating project: ${name}\n`);
 
@@ -44,10 +67,33 @@ export async function createCommand(name) {
 
   // --- 2. Create GitHub repo from template ---
   console.log("Creating GitHub repo from template...");
+
+  // Create repo first (without --clone, to avoid race condition)
   run(
-    `gh repo create ${GITHUB_ORG}/${name} --template ${TEMPLATE_REPO} --private --clone`
+    `gh repo create ${GITHUB_ORG}/${name} --template ${TEMPLATE_REPO} --private`
   );
 
+  // Wait for GitHub to finish creating the repo from template
+  console.log("  Waiting for GitHub to prepare the repository...");
+  const maxRetries = 12;
+  let cloned = false;
+  for (let i = 0; i < maxRetries; i++) {
+    await new Promise((r) => setTimeout(r, 5000));
+    try {
+      runCapture(`gh repo clone ${GITHUB_ORG}/${name} ${name}`);
+      cloned = true;
+      break;
+    } catch {
+      console.log(`  Retrying clone... (${i + 1}/${maxRetries})`);
+    }
+  }
+
+  if (!cloned) {
+    console.error("Error: Could not clone repo after 60 seconds.");
+    console.error(`Try manually: gh repo clone ${GITHUB_ORG}/${name}`);
+    process.exit(1);
+  }
+
   const projectDir = resolve(process.cwd(), name);
   if (!existsSync(projectDir)) {
     console.error(`Error: Expected directory ${projectDir} not found.`);
@@ -61,6 +107,8 @@ export async function createCommand(name) {
   // --- 4. Generate .env ---
   console.log("\nGenerating .env...");
   const payloadSecret = runCapture("openssl rand -hex 32");
+  const domain = `${name}.${DOMAIN_SUFFIX}`;
+  const siteUrl = `https://${domain}`;
   const envContent = [
     `PAYLOAD_SECRET=${payloadSecret}`,
     `SITE_URL=http://localhost:3000`,
@@ -70,18 +118,85 @@ export async function createCommand(name) {
   writeFileSync(resolve(projectDir, ".env"), envContent, "utf-8");
   console.log("  .env written (PAYLOAD_SECRET + SITE_URL)");
 
-  // --- 5. Setup Coolify deployment ---
+  // --- 5. Get git remote URL ---
+  let gitRepo;
+  try {
+    gitRepo = runCapture("git remote get-url origin", { cwd: projectDir });
+  } catch {
+    console.error("Error: No git remote 'origin' found.");
+    process.exit(1);
+  }
+
+  // --- 6. Setup Coolify deployment ---
   console.log("\nSetting up Coolify deployment...");
-  run(`npm run setup:deploy -- --name ${name}`, { cwd: projectDir });
+  console.log(`  Domain: ${domain}`);
+  console.log(`  Git repo: ${gitRepo}`);
+
+  // Create project
+  console.log("  Creating Coolify project...");
+  const project = await coolifyApi(config, "POST", "/projects", {
+    name,
+    description: `${name} — deployed via webhikers CLI`,
+  });
+  const projectUuid = project.uuid;
+  console.log(`  Project created: ${projectUuid}`);
+
+  // Create application
+  console.log("  Creating application...");
+  const app = await coolifyApi(config, "POST", "/applications/public", {
+    project_uuid: projectUuid,
+    server_uuid: config.serverUuid,
+    environment_name: "production",
+    git_repository: gitRepo,
+    git_branch: "master",
+    build_pack: "dockerfile",
+    ports_exposes: "3000",
+    instant_deploy: false,
+  });
+  const appUuid = app.uuid;
+  console.log(`  Application created: ${appUuid}`);
+
+  // Set domain
+  console.log(`  Setting domain to ${domain}...`);
+  await coolifyApi(config, "PATCH", `/applications/${appUuid}`, {
+    domains: `https://${domain}`,
+  });
+
+  // Set environment variables
+  console.log("  Setting environment variables...");
+  await coolifyApi(config, "POST", `/applications/${appUuid}/envs`, {
+    key: "PAYLOAD_SECRET",
+    value: payloadSecret,
+    is_build_time: true,
+  });
+  await coolifyApi(config, "POST", `/applications/${appUuid}/envs`, {
+    key: "SITE_URL",
+    value: siteUrl,
+    is_build_time: true,
+  });
+
+  // --- 7. Write .deploy.json ---
+  const deployConfig = {
+    serverIp: config.serverIp,
+    domain,
+    coolifyProjectUuid: projectUuid,
+    coolifyAppUuid: appUuid,
+  };
+  writeFileSync(
+    resolve(projectDir, ".deploy.json"),
+    JSON.stringify(deployConfig, null, 2) + "\n",
+    "utf-8"
+  );
+  console.log("  .deploy.json written");
 
-  // --- 6. Summary ---
+  // --- 8. Summary ---
   console.log("");
   console.log("=========================================");
   console.log("  Project created successfully!");
   console.log("=========================================");
   console.log("");
   console.log(`  Repo:    https://github.com/${GITHUB_ORG}/${name}`);
-  console.log(`  Domain:  https://${name}.preview.webhikers.dev`);
+  console.log(`  Domain:  https://${domain}`);
   console.log(`  Dir:     ${projectDir}`);
   console.log("");
   console.log("  MANUAL STEP:");