@x12i/docify-export 1.1.1 → 1.2.0

package/dist/publish.js

@@ -4,16 +4,206 @@ import { join } from "node:path";
 import { DocifyConfigSchema, resolvePublishHostname, } from "@x12i/docify-core";
 const PAGES_MAX_FILES = 20_000;
 const PAGES_MAX_FILE_BYTES = 25 * 1024 * 1024;
-function defaultExec(command, args, opts) {
+const ACCOUNT_ID_RE = /\b([a-f0-9]{32})\b/gi;
+/** Never return an empty failure message when status ends with -failed. */
+export function failedMessage(r, fallback) {
+    const text = [r.stderr, r.stdout, r.error?.message]
+        .map((s) => (typeof s === "string" ? s.trim() : ""))
+        .find((s) => s.length > 0);
+    if (text)
+        return text;
+    if (r.status === null && r.error)
+        return r.error.message;
+    return fallback;
+}
+export function defaultExec(command, args, opts) {
+    // Interactive commands (OAuth consent) must reach the terminal, otherwise the
+    // login URL and prompt are captured and the user sees nothing to approve.
+    // On Windows, npx is typically a .cmd shim — spawn without shell yields empty pipes.
+    const useShell = process.platform === "win32" || command === "npx";
     const r = spawnSync(command, args, {
         encoding: "utf8",
         env: { ...process.env, ...opts?.env },
+        stdio: opts?.interactive ? "inherit" : "pipe",
+        shell: useShell,
     });
     return {
         status: r.status,
         stdout: r.stdout ?? "",
         stderr: r.stderr ?? "",
+        error: r.error,
+    };
+}
+/** Parse account ids (and optional names) from `wrangler whoami` text or JSON. */
+export function parseWhoamiAccounts(output) {
+    const trimmed = (output || "").trim();
+    if (!trimmed)
+        return [];
+    // JSON forms: { accounts: [{ id, name }] } or array of accounts
+    if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+        try {
+            const data = JSON.parse(trimmed);
+            const list = Array.isArray(data)
+                ? data
+                : data &&
+                    typeof data === "object" &&
+                    Array.isArray(data.accounts)
+                    ? data.accounts
+                    : null;
+            if (list) {
+                const fromJson = [];
+                for (const item of list) {
+                    if (!item || typeof item !== "object")
+                        continue;
+                    const id = typeof item.id === "string"
+                        ? item.id
+                        : typeof item.account_id === "string"
+                            ? item.account_id
+                            : "";
+                    if (!/^[a-f0-9]{32}$/i.test(id))
+                        continue;
+                    const name = typeof item.name === "string"
+                        ? item.name
+                        : undefined;
+                    fromJson.push({ id: id.toLowerCase(), name });
+                }
+                if (fromJson.length)
+                    return uniqueAccounts(fromJson);
+            }
+        }
+        catch {
+            // fall through to text parse
+        }
+    }
+    const accounts = [];
+    const lines = trimmed.split(/\r?\n/);
+    for (const line of lines) {
+        const ids = [...line.matchAll(ACCOUNT_ID_RE)].map((m) => m[1].toLowerCase());
+        if (!ids.length)
+            continue;
+        // Prefer last hex token on the line (typical whoami table: name … id)
+        const id = ids[ids.length - 1];
+        const namePart = line
+            .replace(ACCOUNT_ID_RE, "")
+            .replace(/[|\u2502]/g, " ")
+            .replace(/\s+/g, " ")
+            .trim();
+        accounts.push({
+            id,
+            name: namePart || undefined,
+        });
+    }
+    return uniqueAccounts(accounts);
+}
+function uniqueAccounts(list) {
+    const seen = new Set();
+    const out = [];
+    for (const a of list) {
+        if (seen.has(a.id))
+            continue;
+        seen.add(a.id);
+        out.push(a);
+    }
+    return out;
+}
+/** Parse Pages projects + custom domains from list --json or text. */
+export function parsePagesProjectList(output) {
+    const trimmed = (output || "").trim();
+    if (!trimmed)
+        return [];
+    if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+        try {
+            const data = JSON.parse(trimmed);
+            const list = Array.isArray(data)
+                ? data
+                : data &&
+                    typeof data === "object" &&
+                    Array.isArray(data.projects)
+                    ? data.projects
+                    : data &&
+                        typeof data === "object" &&
+                        Array.isArray(data.result)
+                        ? data.result
+                        : null;
+            if (list) {
+                const projects = [];
+                for (const item of list) {
+                    if (!item || typeof item !== "object")
+                        continue;
+                    const name = typeof item.name === "string"
+                        ? item.name
+                        : typeof item.project_name ===
+                            "string"
+                            ? item.project_name
+                            : "";
+                    if (!name)
+                        continue;
+                    const domains = collectDomains(item);
+                    projects.push({ name, domains });
+                }
+                if (projects.length)
+                    return projects;
+            }
+        }
+        catch {
+            // fall through
+        }
+    }
+    // Text fallback: lines that look like "name  domain1, domain2" or include *.pages.dev
+    const projects = [];
+    for (const line of trimmed.split(/\r?\n/)) {
+        const domainMatches = [
+            ...line.matchAll(/\b([a-z0-9][a-z0-9.-]*\.(?:pages\.dev|[a-z0-9.-]+\.[a-z]{2,}))\b/gi),
+        ].map((m) => m[1].toLowerCase());
+        const nameMatch = /^[\s|]*([a-z0-9][a-z0-9_-]*)/i.exec(line);
+        if (!nameMatch)
+            continue;
+        const name = nameMatch[1];
+        if (/^(name|project|id|created|account)$/i.test(name) ||
+            name.length < 2) {
+            continue;
+        }
+        projects.push({ name, domains: domainMatches });
+    }
+    return projects;
+}
+function collectDomains(item) {
+    const domains = [];
+    const push = (v) => {
+        if (typeof v === "string" && v.trim())
+            domains.push(v.trim().toLowerCase());
     };
+    const rec = item;
+    push(rec.subdomain);
+    push(rec.domain);
+    if (Array.isArray(rec.domains)) {
+        for (const d of rec.domains) {
+            if (typeof d === "string")
+                push(d);
+            else if (d && typeof d === "object") {
+                push(d.name);
+                push(d.domain);
+            }
+        }
+    }
+    if (Array.isArray(rec.aliases)) {
+        for (const a of rec.aliases)
+            push(a);
+    }
+    if (rec.canonical_deployment && typeof rec.canonical_deployment === "object") {
+        const cd = rec.canonical_deployment;
+        if (Array.isArray(cd.aliases))
+            for (const a of cd.aliases)
+                push(a);
+    }
+    return [...new Set(domains)];
+}
+function findProjectByHostname(projects, hostname) {
+    const host = hostname.toLowerCase().replace(/^https?:\/\//, "");
+    return projects.find((p) => p.domains.some((d) => {
+        const domain = d.toLowerCase().replace(/^https?:\/\//, "");
+        return domain === host;
+    }));
 }
 function countFiles(dir) {
     let count = 0;
@@ -35,6 +225,11 @@ function countFiles(dir) {
         walk(dir);
     return { count, tooLarge };
 }
+function formatAccountTable(accounts) {
+    return accounts
+        .map((a) => (a.name ? `  - ${a.name} (${a.id})` : `  - ${a.id}`))
+        .join("\n");
+}
 /**
  * Provider-neutral Docify publisher. Cloudflare Pages is the first adapter,
  * using Wrangler Direct Upload (no credentials written to the repo).
@@ -51,16 +246,82 @@ export function createDocifyPublisher(configInput, deps = {}) {
     const publishCfg = publish;
     const hostname = resolvePublishHostname(publishCfg);
     const customDomainUrl = `https://${hostname}`;
-    const project = publishCfg.projectName;
+    let project = publishCfg.projectName;
     const outputDir = config.build.outputDir;
+    const configuredAccountId = publishCfg.accountId ||
+        process.env.CLOUDFLARE_ACCOUNT_ID ||
+        process.env.CF_ACCOUNT_ID ||
+        "";
+    let effectiveAccountId = configuredAccountId;
+    const adoptExisting = deps.adoptExistingProject === true ||
+        publishCfg.adoptExistingProject === true;
+    const wranglerEnv = () => effectiveAccountId ? { CLOUDFLARE_ACCOUNT_ID: effectiveAccountId } : {};
+    const wrangler = (args, opts) => exec("npx", ["--yes", "wrangler", ...args], {
+        env: wranglerEnv(),
+        interactive: opts?.interactive,
+    });
+    const dashboardFor = (proj) => effectiveAccountId
+        ? `https://dash.cloudflare.com/${effectiveAccountId}/pages/view/${proj}`
+        : `https://dash.cloudflare.com/?to=/:account/pages/view/${proj}`;
     const baseResult = (environment, extra = {}) => ({
         provider: publishCfg.provider,
         project,
         environment,
         customDomainUrl,
         status: "ok",
+        dashboardUrl: dashboardFor(project),
         ...extra,
     });
+    function resolveAccount() {
+        if (configuredAccountId) {
+            effectiveAccountId = configuredAccountId;
+            return {
+                ok: true,
+                accountId: configuredAccountId,
+                accounts: [{ id: configuredAccountId }],
+            };
+        }
+        // Prefer JSON when Wrangler supports it; fall back to text.
+        let who = wrangler(["whoami", "--json"]);
+        let combined = `${who.stdout || ""}\n${who.stderr || ""}`;
+        let accounts = parseWhoamiAccounts(combined);
+        if (who.status !== 0 || accounts.length === 0) {
+            who = wrangler(["whoami"]);
+            combined = `${who.stdout || ""}\n${who.stderr || ""}`;
+            accounts = parseWhoamiAccounts(combined);
+        }
+        if (who.status !== 0 && accounts.length === 0) {
+            return {
+                ok: false,
+                status: "preflight-failed",
+                message: failedMessage(who, "Not logged in to Cloudflare. Run `docify publish connect`, then retry."),
+            };
+        }
+        if (accounts.length === 0) {
+            return {
+                ok: false,
+                status: "preflight-failed",
+                message: "No Cloudflare accounts visible. Run `docify publish connect`, then retry.",
+            };
+        }
+        if (accounts.length >= 2) {
+            const first = accounts[0].id;
+            return {
+                ok: false,
+                status: "preflight-failed",
+                message: [
+                    "More than one Cloudflare account is available; set publish.accountId (or CLOUDFLARE_ACCOUNT_ID) for non-interactive deploy.",
+                    "Accounts:",
+                    formatAccountTable(accounts),
+                    "Add to docify.config.json:",
+                    JSON.stringify({ publish: { accountId: first } }, null, 2),
+                    "(Pick the correct account id from the list above.)",
+                ].join("\n"),
+            };
+        }
+        effectiveAccountId = accounts[0].id;
+        return { ok: true, accountId: effectiveAccountId, accounts };
+    }
     async function verifyDeployment(baseUrl) {
         const checked = [];
         const failed = [];
@@ -82,7 +343,7 @@ export function createDocifyPublisher(configInput, deps = {}) {
             providerUrl: baseUrl,
         });
     }
-    function preflight() {
+    function preflightBuildLimits() {
         if (!existsSync(outputDir)) {
             throw new Error(`Build output missing: ${outputDir}. Run build first.`);
         }
@@ -94,68 +355,182 @@ export function createDocifyPublisher(configInput, deps = {}) {
             throw new Error(`Preflight failed: files exceed size limit:\n${tooLarge.slice(0, 10).join("\n")}`);
         }
     }
+    function runPreflight() {
+        try {
+            preflightBuildLimits();
+        }
+        catch (e) {
+            return baseResult("production", {
+                status: "preflight-failed",
+                message: e instanceof Error ? e.message : String(e),
+            });
+        }
+        const account = resolveAccount();
+        if (!account.ok) {
+            return baseResult("production", {
+                status: account.status,
+                message: account.message,
+            });
+        }
+        const { count } = countFiles(outputDir);
+        return baseResult("production", {
+            status: "preflight-ok",
+            message: `${count} files under ${PAGES_MAX_FILES}; account=${account.accountId}`,
+        });
+    }
+    function ensureAccountOrFail(environment = "production") {
+        const account = resolveAccount();
+        if (!account.ok) {
+            return baseResult(environment, {
+                status: account.status,
+                message: account.message,
+            });
+        }
+        return null;
+    }
+    function listProjects() {
+        let list = wrangler(["pages", "project", "list", "--json"]);
+        let projects = parsePagesProjectList(list.stdout || list.stderr || "");
+        if (list.status !== 0 || projects.length === 0) {
+            list = wrangler(["pages", "project", "list"]);
+            if (list.status !== 0) {
+                return {
+                    ok: false,
+                    result: baseResult("production", {
+                        status: "setup-failed",
+                        message: failedMessage(list, "Failed to list Cloudflare Pages projects"),
+                    }),
+                };
+            }
+            projects = parsePagesProjectList(list.stdout || list.stderr || "");
+        }
+        return { ok: true, projects };
+    }
     return {
         validateConfig() {
             return config;
         },
         async connect() {
             log("Connecting via Wrangler login (credentials stay outside the repo)…");
-            const r = exec("npx", ["--yes", "wrangler", "login"]);
+            log("Approve the Cloudflare consent screen in the browser window that opens.");
+            const r = wrangler(["login"], { interactive: true });
             if (r.status !== 0) {
                 return baseResult("production", {
                     status: "connect-failed",
-                    message: r.stderr || r.stdout || "wrangler login failed",
+                    message: failedMessage(r, "wrangler login failed"),
                 });
             }
-            const who = exec("npx", ["--yes", "wrangler", "whoami"]);
+            const who = wrangler(["whoami"]);
             return baseResult("production", {
                 status: "connected",
-                message: (who.stdout || "Connected").trim(),
+                message: (who.stdout || who.stderr || "Connected").trim() || "Connected",
+            });
+        },
+        async whoami() {
+            const who = wrangler(["whoami"]);
+            return baseResult("production", {
+                status: who.status === 0 ? "ok" : "whoami-failed",
+                message: who.status === 0
+                    ? (who.stdout || who.stderr || "").trim() || "ok"
+                    : failedMessage(who, "wrangler whoami failed"),
+                dashboardUrl: dashboardFor(project),
             });
         },
+        preflight: runPreflight,
         async setup() {
+            const accountFail = ensureAccountOrFail();
+            if (accountFail) {
+                return { ...accountFail, status: "setup-failed", message: accountFail.message };
+            }
             log(`Setting up Cloudflare Pages project "${project}" for ${hostname}…`);
-            const list = exec("npx", ["--yes", "wrangler", "pages", "project", "list"]);
-            const exists = (list.stdout || "").includes(project);
-            if (!exists) {
-                const confirmed = deps.confirm == null
-                    ? true
-                    : await deps.confirm(`Create Cloudflare Pages project "${project}"? Direct Upload projects cannot later switch to Git integration.`);
-                if (!confirmed) {
+            const listed = listProjects();
+            if (!listed.ok)
+                return listed.result;
+            const { projects } = listed;
+            const byHostname = findProjectByHostname(projects, hostname);
+            const nameExists = projects.some((p) => p.name === project);
+            if (byHostname) {
+                if (byHostname.name === project) {
                     return baseResult("production", {
-                        status: "setup-cancelled",
-                        message: "User cancelled project creation",
+                        status: "adopted-existing-project",
+                        message: `Hostname ${hostname} is already on Pages project "${project}". Associate custom domain in the dashboard if needed. Docify will not delete other domains.`,
+                        dashboardUrl: dashboardFor(project),
                     });
                 }
-                const created = exec("npx", [
-                    "--yes",
-                    "wrangler",
-                    "pages",
-                    "project",
-                    "create",
-                    project,
-                    "--production-branch",
-                    publishCfg.productionBranch,
-                ]);
-                if (created.status !== 0) {
+                if (!adoptExisting) {
                     return baseResult("production", {
                         status: "setup-failed",
-                        message: created.stderr || created.stdout,
+                        message: [
+                            `Hostname ${hostname} is already bound to Pages project "${byHostname.name}", but docify.config.json has projectName "${project}".`,
+                            `Set "projectName": "${byHostname.name}" (or pass --adopt / publish.adoptExistingProject: true) and retry.`,
+                        ].join("\n"),
+                        project: byHostname.name,
+                        dashboardUrl: dashboardFor(byHostname.name),
                     });
                 }
+                project = byHostname.name;
+                return baseResult("production", {
+                    status: "adopted-existing-project",
+                    message: `Adopted existing Pages project "${project}" that already serves ${hostname} (config projectName differed).`,
+                    dashboardUrl: dashboardFor(project),
+                });
+            }
+            if (nameExists) {
+                return baseResult("production", {
+                    status: "adopted-existing-project",
+                    message: `Associate custom domain ${hostname} in Cloudflare Pages if not already linked. Docify will not delete other domains.`,
+                    dashboardUrl: dashboardFor(project),
+                });
+            }
+            const confirmed = deps.confirm == null
+                ? true
+                : await deps.confirm(`Create Cloudflare Pages project "${project}"? Direct Upload projects cannot later switch to Git integration.`);
+            if (!confirmed) {
+                return baseResult("production", {
+                    status: "setup-cancelled",
+                    message: "User cancelled project creation",
+                });
+            }
+            const created = wrangler([
+                "pages",
+                "project",
+                "create",
+                project,
+                "--production-branch",
+                publishCfg.productionBranch,
+            ]);
+            if (created.status !== 0) {
+                return baseResult("production", {
+                    status: "setup-failed",
+                    message: failedMessage(created, "pages project create failed"),
+                });
             }
             return baseResult("production", {
-                status: exists ? "adopted-existing-project" : "project-created",
+                status: "project-created",
                 message: `Associate custom domain ${hostname} in Cloudflare Pages if not already linked. Docify will not delete other domains.`,
-                dashboardUrl: `https://dash.cloudflare.com/?to=/:account/pages/view/${project}`,
+                dashboardUrl: dashboardFor(project),
             });
         },
         async deployProduction() {
-            preflight();
+            try {
+                preflightBuildLimits();
+            }
+            catch (e) {
+                return baseResult("production", {
+                    status: "deploy-failed",
+                    message: e instanceof Error ? e.message : String(e),
+                });
+            }
+            const accountFail = ensureAccountOrFail();
+            if (accountFail) {
+                return {
+                    ...accountFail,
+                    status: "deploy-failed",
+                    message: accountFail.message,
+                };
+            }
             log(`Deploying ${outputDir} → Pages project ${project} (production)…`);
-            const r = exec("npx", [
-                "--yes",
-                "wrangler",
+            const r = wrangler([
                 "pages",
                 "deploy",
                 outputDir,
@@ -163,11 +538,12 @@ export function createDocifyPublisher(configInput, deps = {}) {
                 project,
                 "--branch",
                 publishCfg.productionBranch,
+                "--commit-dirty=true",
             ]);
             if (r.status !== 0) {
                 return baseResult("production", {
                     status: "deploy-failed",
-                    message: r.stderr || r.stdout,
+                    message: failedMessage(r, "pages deploy failed"),
                 });
             }
             const urlMatch = /https:\/\/[^\s]+/.exec(r.stdout);
@@ -182,14 +558,29 @@ export function createDocifyPublisher(configInput, deps = {}) {
             return {
                 ...verified,
                 providerUrl: providerUrl ?? verified.providerUrl,
-                message: r.stdout.trim(),
+                message: r.stdout.trim() || verified.message,
+                dashboardUrl: dashboardFor(project),
             };
         },
         async deployPreview(branch = "preview") {
-            preflight();
-            const r = exec("npx", [
-                "--yes",
-                "wrangler",
+            try {
+                preflightBuildLimits();
+            }
+            catch (e) {
+                return baseResult("preview", {
+                    status: "deploy-failed",
+                    message: e instanceof Error ? e.message : String(e),
+                });
+            }
+            const accountFail = ensureAccountOrFail("preview");
+            if (accountFail) {
+                return {
+                    ...accountFail,
+                    status: "deploy-failed",
+                    message: accountFail.message,
+                };
+            }
+            const r = wrangler([
                 "pages",
                 "deploy",
                 outputDir,
@@ -197,11 +588,12 @@ export function createDocifyPublisher(configInput, deps = {}) {
                 project,
                 "--branch",
                 branch,
+                "--commit-dirty=true",
             ]);
             if (r.status !== 0) {
                 return baseResult("preview", {
                     status: "deploy-failed",
-                    message: r.stderr || r.stdout,
+                    message: failedMessage(r, "pages deploy failed"),
                 });
             }
             const urlMatch = /https:\/\/[^\s]+/.exec(r.stdout);
@@ -210,12 +602,19 @@ export function createDocifyPublisher(configInput, deps = {}) {
                 status: "deployed",
                 providerUrl,
                 message: r.stdout.trim(),
+                dashboardUrl: dashboardFor(project),
             });
         },
         async getStatus() {
-            const r = exec("npx", [
-                "--yes",
-                "wrangler",
+            const accountFail = ensureAccountOrFail();
+            if (accountFail) {
+                return {
+                    ...accountFail,
+                    status: "status-failed",
+                    message: accountFail.message,
+                };
+            }
+            const r = wrangler([
                 "pages",
                 "deployment",
                 "list",
@@ -224,13 +623,23 @@ export function createDocifyPublisher(configInput, deps = {}) {
             ]);
             return baseResult("production", {
                 status: r.status === 0 ? "ok" : "status-failed",
-                message: (r.stdout || r.stderr).trim(),
+                message: r.status === 0
+                    ? (r.stdout || r.stderr).trim() || "ok"
+                    : failedMessage(r, "deployment list failed"),
+                dashboardUrl: dashboardFor(project),
             });
         },
         async listDeployments() {
-            const r = exec("npx", [
-                "--yes",
-                "wrangler",
+            const accountFail = ensureAccountOrFail();
+            if (accountFail) {
+                return {
+                    ...accountFail,
+                    status: "list-failed",
+                    message: accountFail.message,
+                    deployments: [],
+                };
+            }
+            const r = wrangler([
                 "pages",
                 "deployment",
                 "list",
@@ -240,7 +649,10 @@ export function createDocifyPublisher(configInput, deps = {}) {
             return {
                 ...baseResult("production", {
                     status: r.status === 0 ? "ok" : "list-failed",
-                    message: (r.stdout || r.stderr).trim(),
+                    message: r.status === 0
+                        ? (r.stdout || r.stderr).trim() || "ok"
+                        : failedMessage(r, "deployment list failed"),
+                    dashboardUrl: dashboardFor(project),
                 }),
                 deployments: [],
             };
@@ -250,14 +662,21 @@ export function createDocifyPublisher(configInput, deps = {}) {
                 deploymentId: id,
                 status: "ok",
                 message: `Inspect deployment ${id} in the Cloudflare dashboard`,
-                dashboardUrl: `https://dash.cloudflare.com/?to=/:account/pages/view/${project}`,
+                dashboardUrl: dashboardFor(project),
             });
         },
         verifyDeployment,
         async rollbackDeployment(id) {
-            const r = exec("npx", [
-                "--yes",
-                "wrangler",
+            const accountFail = ensureAccountOrFail();
+            if (accountFail) {
+                return {
+                    ...accountFail,
+                    deploymentId: id,
+                    status: "rollback-failed",
+                    message: accountFail.message,
+                };
+            }
+            const r = wrangler([
                 "pages",
                 "deployment",
                 "rollback",
@@ -269,14 +688,13 @@ export function createDocifyPublisher(configInput, deps = {}) {
                 return baseResult("production", {
                     deploymentId: id,
                     status: "rollback-failed",
-                    message: (r.stderr || r.stdout).trim() ||
-                        "Rollback failed. Use the Cloudflare Pages Deployments API rollback endpoint with a scoped API token.",
+                    message: failedMessage(r, "Rollback failed. Use the Cloudflare Pages Deployments API rollback endpoint with a scoped API token."),
                 });
             }
             return baseResult("production", {
                 deploymentId: id,
                 status: "rolled-back",
-                message: r.stdout.trim(),
+                message: r.stdout.trim() || `Rolled back ${id}`,
             });
         },
         async publish(opts = {}) {