clefbase 1.3.4 → 1.3.6

package/dist/cli-src/cli/api.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Raw API calls used by the CLI.
+ * api.ts — Raw API calls used by the CLI.
  * Written as plain fetch calls (not using HttpClient) so the CLI can be
  * bundled independently and doesn't pull in the full SDK at runtime.
  */
@@ -41,6 +41,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliApiError = void 0;
 exports.listSites = listSites;
 exports.createSite = createSite;
+exports.deleteSite = deleteSite;
+exports.getDnsStatus = getDnsStatus;
+exports.reprovisionDns = reprovisionDns;
 exports.createDeploy = createDeploy;
 exports.uploadFileBatch = uploadFileBatch;
 exports.finalizeDeploy = finalizeDeploy;
@@ -96,6 +99,27 @@ async function createSite(cfg, name, description) {
         body: JSON.stringify({ name, description }),
     });
 }
+/**
+ * Delete a site.
+ *
+ * First call (confirm=false): returns { requiresConfirmation: true, dnsRecord?, message }
+ * Second call (confirm=true, deleteDns?): actually deletes
+ */
+async function deleteSite(cfg, siteId, opts = {}) {
+    const params = new URLSearchParams();
+    if (opts.confirm)
+        params.set("confirm", "true");
+    if (opts.deleteDns)
+        params.set("deleteDns", "true");
+    const qs = params.toString() ? `?${params}` : "";
+    return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}${qs}`, { method: "DELETE", headers: adminHeaders(cfg) });
+}
+async function getDnsStatus(cfg, siteId) {
+    return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns`, { headers: adminHeaders(cfg) });
+}
+async function reprovisionDns(cfg, siteId) {
+    return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns/provision`, { method: "POST", headers: adminHeaders(cfg), body: JSON.stringify({}) });
+}
 async function createDeploy(cfg, siteId, entrypoint = "index.html") {
     return apiFetch(`${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/deploys`, {
         method: "POST",
@@ -108,7 +132,6 @@ async function uploadFileBatch(cfg, deployId, files) {
     const url = `${base(cfg)}/api/hosting/databases/${cfg.projectId}/deploys/${deployId}/files/batch`;
     let res;
     if (typeof FormData !== "undefined") {
-        // Node 18+ native FormData: Buffer must be wrapped in Blob/File
         const form = new FormData();
         for (const f of files) {
             const filename = f.path.split("/").pop() ?? f.path;
@@ -124,7 +147,6 @@ async function uploadFileBatch(cfg, deployId, files) {
         });
     }
     else {
-        // Older Node: use form-data package which natively accepts Buffers
         const mod = await Promise.resolve().then(() => __importStar(require("form-data")));
         const FormDataLegacy = mod.default;
         const form = new FormDataLegacy();

package/dist/cli-src/cli/commands/deploy.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDeploy = runDeploy;
 exports.runHostingInit = runHostingInit;
 exports.runStatus = runStatus;
+exports.runDnsStatus = runDnsStatus;
+exports.runDnsReprovision = runDnsReprovision;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -65,6 +67,9 @@ function fmtBytes(n) {
         return `${(n / 1024).toFixed(1)} KB`;
     return `${(n / (1024 * 1024)).toFixed(2)} MB`;
 }
+function siteUrl(site) {
+    return site.customDomain ? `https://${site.customDomain}` : site.previewUrl;
+}
 // ─── deploy ───────────────────────────────────────────────────────────────────
 async function runDeploy(opts) {
     const cwd = opts.cwd ?? process.cwd();
@@ -75,18 +80,24 @@ async function runDeploy(opts) {
     // ── Resolve / pick a site ─────────────────────────────────────────────────
     let siteId = opts.site ?? cfg.hosting?.siteId ?? "";
     let siteName = cfg.hosting?.siteName ?? "";
+    let previewUrl = "";
     if (!siteId) {
-        siteId = await pickOrCreateSite(cfg);
-        const sites = await (0, api_1.listSites)(cfg).catch(() => []);
-        siteName = sites.find(s => s.id === siteId)?.name ?? siteId;
+        const site = await pickOrCreateSite(cfg);
+        siteId = site.id;
+        siteName = site.name;
+        previewUrl = site.previewUrl;
         cfg.hosting = {
             siteId,
             siteName,
+            previewUrl,
             distDir: cfg.hosting?.distDir ?? "dist",
             entrypoint: cfg.hosting?.entrypoint ?? "index.html",
         };
         (0, config_1.saveConfig)(cfg, cwd);
     }
+    else {
+        previewUrl = cfg.hosting?.previewUrl ?? "";
+    }
     // ── Resolve dist dir ──────────────────────────────────────────────────────
     const distDir = opts.dir ?? cfg.hosting?.distDir ?? await promptDistDir(cwd);
     const absDir = path_1.default.isAbsolute(distDir) ? distDir : path_1.default.join(cwd, distDir);
@@ -111,9 +122,10 @@ async function runDeploy(opts) {
     }
     // ── Summary ───────────────────────────────────────────────────────────────
     console.log();
-    console.log(`  ${chalk_1.default.bold("Site:")}   ${siteName}  ${chalk_1.default.dim(siteId)}`);
-    console.log(`  ${chalk_1.default.bold("From:")}   ${path_1.default.relative(cwd, absDir)}`);
-    console.log(`  ${chalk_1.default.bold("Files:")}  ${files.length}  ${chalk_1.default.dim("(" + fmtBytes(totalBytes) + ")")}`);
+    console.log(`  ${chalk_1.default.bold("Site:")}      ${siteName}  ${chalk_1.default.dim(siteId)}`);
+    console.log(`  ${chalk_1.default.bold("Preview:")}   ${chalk_1.default.cyan(previewUrl || "(set after deploy)")}`);
+    console.log(`  ${chalk_1.default.bold("From:")}      ${path_1.default.relative(cwd, absDir)}`);
+    console.log(`  ${chalk_1.default.bold("Files:")}     ${files.length}  ${chalk_1.default.dim("(" + fmtBytes(totalBytes) + ")")}`);
     console.log();
     // ── Create deploy ─────────────────────────────────────────────────────────
     const deploySpinner = (0, ora_1.default)("Creating deploy…").start();
@@ -165,10 +177,30 @@ async function runDeploy(opts) {
         finSpinner.fail(`Finalize failed: ${err.message}`);
         process.exit(1);
     }
-    // ── Result ────────────────────────────────────────────────────────────────
-    const url = `${cfg.serverUrl.replace(/\/+$/, "")}/hosted/${cfg.projectId}/${siteId}`;
+    // ── Result — fetch the canonical URL from the live site record ────────────
+    // The previewUrl from the config may be stale (e.g. if the site was renamed)
+    // and a custom domain may have been added since init. Always fetch the live
+    // site record to get the correct canonical URL.
+    let canonicalUrl = previewUrl;
+    try {
+        // Fetch the current site record to get the canonical URL — it may differ
+        // from the config if the site was renamed or a custom domain was added.
+        const sites = await (0, api_1.listSites)(cfg);
+        const liveSite = sites.find(s => s.id === siteId);
+        if (liveSite) {
+            canonicalUrl = siteUrl(liveSite);
+            // Keep the config preview URL in sync for future deploys.
+            if (cfg.hosting && liveSite.previewUrl && cfg.hosting.previewUrl !== liveSite.previewUrl) {
+                cfg.hosting.previewUrl = liveSite.previewUrl;
+                (0, config_1.saveConfig)(cfg, cwd);
+            }
+        }
+    }
+    catch { /* best-effort — fall back to stored previewUrl */ }
     console.log();
-    console.log(chalk_1.default.green.bold(`  ✓  ${url}`));
+    if (canonicalUrl) {
+        console.log(chalk_1.default.green.bold(`  ✓  ${canonicalUrl}`));
+    }
     console.log();
 }
 // ─── hosting:init ─────────────────────────────────────────────────────────────
@@ -177,9 +209,7 @@ async function runHostingInit(cwd = process.cwd()) {
     console.log();
     console.log(chalk_1.default.bold.cyan("  Hosting Setup"));
     console.log();
-    const siteId = await pickOrCreateSite(cfg);
-    const sites = await (0, api_1.listSites)(cfg).catch(() => []);
-    const siteName = sites.find(s => s.id === siteId)?.name ?? siteId;
+    const site = await pickOrCreateSite(cfg);
     const { distDir } = await inquirer_1.default.prompt([{
             type: "input", name: "distDir",
             message: "Build output directory",
@@ -192,10 +222,20 @@ async function runHostingInit(cwd = process.cwd()) {
             default: cfg.hosting?.entrypoint ?? "index.html",
         }]);
     cfg.services.hosting = true;
-    cfg.hosting = { siteId, siteName, distDir: distDir.trim(), entrypoint: entrypoint.trim() };
+    cfg.hosting = {
+        siteId: site.id,
+        siteName: site.name,
+        previewUrl: site.previewUrl,
+        distDir: distDir.trim(),
+        entrypoint: entrypoint.trim(),
+    };
     (0, config_1.saveConfig)(cfg, cwd);
     console.log();
-    console.log(chalk_1.default.green(`  ✓  Linked to "${siteName}"`));
+    console.log(chalk_1.default.green(`  ✓  Linked to "${site.name}"`));
+    console.log(chalk_1.default.dim(`  Preview URL: ${site.previewUrl}`));
+    if (site.dnsWarning) {
+        console.log(chalk_1.default.yellow(`  ⚠  ${site.dnsWarning}`));
+    }
     console.log(chalk_1.default.dim("  Run `clefbase deploy` to go live."));
     console.log();
 }
@@ -218,15 +258,91 @@ async function runStatus(cwd = process.cwd()) {
         else {
             sp.succeed("Active deploy");
             const d = active.deploy;
-            const url = `${cfg.serverUrl.replace(/\/+$/, "")}/hosted/${cfg.projectId}/${cfg.hosting.siteId}`;
             console.log();
             console.log(`  ${chalk_1.default.bold("Site:")}     ${cfg.hosting.siteName}  ${chalk_1.default.dim(cfg.hosting.siteId)}`);
             console.log(`  ${chalk_1.default.bold("Deploy:")}   ${chalk_1.default.dim(d.id)}`);
             console.log(`  ${chalk_1.default.bold("Status:")}   ${chalk_1.default.green(d.status)}`);
             console.log(`  ${chalk_1.default.bold("Files:")}    ${d.fileCount}  ${chalk_1.default.dim(fmtBytes(d.totalBytes ?? 0))}`);
             console.log(`  ${chalk_1.default.bold("Deployed:")} ${new Date(d.finishedAt ?? d.createdAt).toLocaleString()}`);
-            console.log(`  ${chalk_1.default.bold("URL:")}      ${url}`);
+            if (cfg.hosting.previewUrl) {
+                console.log(`  ${chalk_1.default.bold("Preview:")}  ${chalk_1.default.cyan(cfg.hosting.previewUrl)}`);
+            }
+        }
+    }
+    catch (err) {
+        sp.fail(err.message);
+    }
+    console.log();
+}
+// ─── hosting:dns ──────────────────────────────────────────────────────────────
+async function runDnsStatus(cwd = process.cwd()) {
+    const cfg = (0, config_1.requireConfig)(cwd);
+    console.log();
+    console.log(chalk_1.default.bold("  DNS Status"));
+    console.log();
+    if (!cfg.hosting?.siteId) {
+        console.log(chalk_1.default.yellow("  No site linked. Run `clefbase hosting:init` first.\n"));
+        return;
+    }
+    const sp = (0, ora_1.default)("Checking DNS records…").start();
+    try {
+        const dns = await (0, api_1.getDnsStatus)(cfg, cfg.hosting.siteId);
+        sp.succeed("DNS checked");
+        console.log();
+        // Preview subdomain
+        console.log(`  ${chalk_1.default.bold("Preview subdomain:")}`);
+        console.log(`    URL:    ${chalk_1.default.cyan(dns.previewUrl)}`);
+        if (dns.preview.isCorrect) {
+            console.log(`    DNS:    ${chalk_1.default.green("✓ Correctly configured")}`);
+        }
+        else if (dns.preview.isConflict) {
+            console.log(`    DNS:    ${chalk_1.default.red("✗ Conflict — " + dns.preview.message)}`);
+            console.log(chalk_1.default.dim("    Run `clefbase hosting:dns:reprovision` to fix."));
+        }
+        else {
+            console.log(`    DNS:    ${chalk_1.default.yellow("⚠ Not yet provisioned")}`);
+            console.log(chalk_1.default.dim("    Run `clefbase hosting:dns:reprovision` to create the record."));
         }
+        // Custom domain
+        if (dns.customDomain) {
+            console.log();
+            console.log(`  ${chalk_1.default.bold("Custom domain:")}`);
+            console.log(`    Domain: ${dns.customDomain.domain}`);
+            if (dns.customDomain.cnameOk) {
+                console.log(`    DNS:    ${chalk_1.default.green("✓ CNAME correctly points to " + dns.customDomain.cnameTarget)}`);
+            }
+            else if (dns.customDomain.conflict) {
+                console.log(`    DNS:    ${chalk_1.default.red("✗ Conflict — existing record points to " + dns.customDomain.cnameTarget)}`);
+            }
+            else {
+                console.log(`    DNS:    ${chalk_1.default.yellow("⚠ CNAME not yet set")}`);
+                console.log(`    Add:    CNAME  ${dns.customDomain.instructions.name}  →  ${dns.customDomain.instructions.content}`);
+                console.log(chalk_1.default.dim(`    Note:   ${dns.customDomain.instructions.note}`));
+            }
+        }
+    }
+    catch (err) {
+        sp.fail(err.message);
+    }
+    console.log();
+}
+// ─── hosting:dns:reprovision ──────────────────────────────────────────────────
+async function runDnsReprovision(cwd = process.cwd()) {
+    const cfg = (0, config_1.requireConfig)(cwd);
+    if (!cfg.hosting?.siteId) {
+        console.error(chalk_1.default.red("\n  No site linked. Run `clefbase hosting:init` first.\n"));
+        process.exit(1);
+    }
+    const sp = (0, ora_1.default)(`Provisioning DNS for ${cfg.hosting.siteName}…`).start();
+    try {
+        const result = await (0, api_1.reprovisionDns)(cfg, cfg.hosting.siteId);
+        if (result.created) {
+            sp.succeed(chalk_1.default.green(`DNS record created: ${result.subdomain}`));
+        }
+        else {
+            sp.succeed(chalk_1.default.dim(`DNS record already correct: ${result.subdomain}`));
+        }
+        console.log(chalk_1.default.cyan(`  ${result.url}`));
     }
     catch (err) {
         sp.fail(err.message);
@@ -234,6 +350,11 @@ async function runStatus(cwd = process.cwd()) {
     console.log();
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────
+/**
+ * Interactive site picker / creator.
+ * Shows existing sites, allows creating a new one.
+ * On creation: enforces uniqueness, shows preview URL.
+ */
 async function pickOrCreateSite(cfg) {
     const sp = (0, ora_1.default)("Fetching sites…").start();
     let sites = [];
@@ -246,7 +367,10 @@ async function pickOrCreateSite(cfg) {
     }
     if (sites.length > 0) {
         const choices = [
-            ...sites.map(s => ({ name: `${s.name}  ${chalk_1.default.dim(s.id)}`, value: s.id })),
+            ...sites.map(s => ({
+                name: `${s.name}  ${chalk_1.default.dim(s.previewUrl || s.id)}`,
+                value: s.id,
+            })),
             { name: chalk_1.default.cyan("+ Create a new site"), value: "__new__" },
         ];
         const { chosen } = await inquirer_1.default.prompt([{
@@ -254,18 +378,43 @@ async function pickOrCreateSite(cfg) {
                 message: "Which site should receive this deploy?",
                 choices,
             }]);
-        if (chosen !== "__new__")
-            return chosen;
+        if (chosen !== "__new__") {
+            return sites.find(s => s.id === chosen);
+        }
+    }
+    return createSiteInteractive(cfg);
+}
+/** Prompt for a new site name, handle conflict errors with retry. */
+async function createSiteInteractive(cfg) {
+    while (true) {
+        const { name } = await inquirer_1.default.prompt([{
+                type: "input", name: "name",
+                message: "New site name (used as subdomain, e.g. my-app → my-app.preview.cleforyx.com)",
+                validate: (v) => v.trim().length >= 2 || "Must be at least 2 characters",
+            }]);
+        const s = (0, ora_1.default)(`Creating "${name.trim()}"…`).start();
+        try {
+            const site = await (0, api_1.createSite)(cfg, name.trim());
+            s.succeed(chalk_1.default.green(`Created "${site.name}"  →  ${chalk_1.default.cyan(site.previewUrl)}`));
+            if (site.dnsWarning) {
+                console.log(chalk_1.default.yellow(`  ⚠  ${site.dnsWarning}`));
+            }
+            return site;
+        }
+        catch (err) {
+            const message = err.message;
+            // 409 conflict — name already taken
+            if (message.toLowerCase().includes("already exists") || message.includes("409")) {
+                s.fail(chalk_1.default.red(message));
+                console.log(chalk_1.default.dim("  Please choose a different name.\n"));
+                // Loop to prompt again
+            }
+            else {
+                s.fail(message);
+                throw err;
+            }
+        }
     }
-    const { name } = await inquirer_1.default.prompt([{
-            type: "input", name: "name",
-            message: "New site name",
-            validate: (v) => v.trim().length > 0 || "Required",
-        }]);
-    const s = (0, ora_1.default)(`Creating "${name}"…`).start();
-    const site = await (0, api_1.createSite)(cfg, name.trim());
-    s.succeed(chalk_1.default.green(`Created "${site.name}"  ${chalk_1.default.dim(site.id)}`));
-    return site.id;
 }
 async function promptDistDir(cwd) {
     const { dir } = await inquirer_1.default.prompt([{

package/dist/cli-src/cli/index.js

@@ -79,6 +79,32 @@ program
         fatal(err);
     }
 });
+// ─── hosting:dns ──────────────────────────────────────────────────────────────
+program
+    .command("hosting:dns")
+    .alias("dns")
+    .description("Show DNS status for the linked site's preview and custom domains")
+    .action(async () => {
+    try {
+        await (0, deploy_1.runDnsStatus)();
+    }
+    catch (err) {
+        fatal(err);
+    }
+});
+// ─── hosting:dns:reprovision ──────────────────────────────────────────────────
+program
+    .command("hosting:dns:reprovision")
+    .alias("dns:reprovision")
+    .description("(Re-)provision the Cloudflare CNAME for the linked site")
+    .action(async () => {
+    try {
+        await (0, deploy_1.runDnsReprovision)();
+    }
+    catch (err) {
+        fatal(err);
+    }
+});
 // ─── info ─────────────────────────────────────────────────────────────────────
 program
     .command("info")
@@ -94,14 +120,16 @@ program
 // ─── help footer ─────────────────────────────────────────────────────────────
 program.addHelpText("after", `
 ${chalk_1.default.bold("Examples:")}
-  ${chalk_1.default.cyan("clefbase init")}                   Set up a new project
-  ${chalk_1.default.cyan("clefbase deploy")}                 Deploy your built site
-  ${chalk_1.default.cyan("clefbase deploy -d ./dist")}       Deploy from a specific directory
-  ${chalk_1.default.cyan("clefbase deploy -m \"v2 release\"")}  Deploy with a release note
-  ${chalk_1.default.cyan("clefbase hosting:init")}            Link or create a hosted site
-  ${chalk_1.default.cyan("clefbase hosting:status")}          Show current live deploy
-  ${chalk_1.default.cyan("clefbase hosting:sites")}           List all sites
-  ${chalk_1.default.cyan("clefbase info")}                   Show config & connection status
+  ${chalk_1.default.cyan("clefbase init")}                          Set up a new project
+  ${chalk_1.default.cyan("clefbase deploy")}                        Deploy your built site
+  ${chalk_1.default.cyan("clefbase deploy -d ./dist")}              Deploy from a specific directory
+  ${chalk_1.default.cyan("clefbase deploy -m \"v2 release\"")}       Deploy with a release note
+  ${chalk_1.default.cyan("clefbase hosting:init")}                   Link or create a hosted site
+  ${chalk_1.default.cyan("clefbase hosting:status")}                 Show current live deploy
+  ${chalk_1.default.cyan("clefbase hosting:sites")}                  List all sites
+  ${chalk_1.default.cyan("clefbase hosting:dns")}                    Show DNS status
+  ${chalk_1.default.cyan("clefbase hosting:dns:reprovision")}        Fix / create the preview CNAME
+  ${chalk_1.default.cyan("clefbase info")}                          Show config & connection status
 `);
 program.parse(process.argv);
 // ─── Helper ───────────────────────────────────────────────────────────────────