htmlhost-cli 2.2.1 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlhost-cli",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Deploy HTML files from the terminal — htmlhost.co CLI",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -3,8 +3,9 @@
  */
 import { bold, dim, cyan, err } from "./ui.mjs";
 import { ApiError } from "./api.mjs";
+import { startUpdateCheck, applyUpdate } from "./update.mjs";
 
-const VERSION = "2.2.1";
+const VERSION = "2.3.0";
 
 const HELP = `
   ${bold("htmlhost")} ${dim(`v${VERSION}`)} — deploy HTML from the terminal
@@ -83,6 +84,9 @@ export async function run(argv) {
     return;
   }
 
+  // Start update check in parallel (non-blocking, won't slow the command)
+  const updatePromise = jsonMode ? Promise.resolve(null) : startUpdateCheck(VERSION);
+
   try {
     switch (command) {
       case "login": {
@@ -132,10 +136,18 @@ export async function run(argv) {
         await open(args);
         break;
       }
-      default:
+      default: {
+        // Handle common flag misspellings
+        if (command === "-version" || command === "version") {
+          console.log(VERSION);
+          console.log(dim(`  (Tip: use ${cyan("htmlhost -v")} or ${cyan("htmlhost --version")})`));
+          return;
+        }
+
         err(`Unknown command: ${command}`);
         console.log(`  Run ${cyan("htmlhost --help")} for usage.`);
         process.exit(1);
+      }
     }
   } catch (e) {
     if (e instanceof ApiError) {
@@ -144,4 +156,8 @@ export async function run(argv) {
     }
     throw e;
   }
+
+  // After command finishes, check if an update is available
+  const updateInfo = await updatePromise;
+  await applyUpdate(updateInfo);
 }

package/src/commands/deploy.mjs

@@ -3,11 +3,50 @@ import { basename, resolve, dirname, join, extname } from "node:path";
 import { createInterface } from "node:readline";
 import { createHash } from "node:crypto";
 import { post } from "../api.mjs";
-import { ok, err, info, cyan, dim, bold, yellow, green, formatBytes, mimeFromExt } from "../ui.mjs";
+import { ok, err, info, warn, cyan, dim, bold, yellow, green, formatBytes, mimeFromExt } from "../ui.mjs";
 import { checkRemoteChanges } from "./pull.mjs";
 
 const LINK_FILE = ".htmlhost";
 
+/**
+ * Upload a file to a presigned URL with automatic retry.
+ * Retries up to 3 times with exponential backoff on network errors.
+ */
+const MAX_RETRIES = 3;
+
+async function uploadWithRetry(url, contentType, buffer, filePath, fileSize) {
+  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      const res = await fetch(url, {
+        method: "PUT",
+        headers: { "Content-Type": contentType },
+        body: buffer,
+      });
+
+      if (!res.ok) {
+        throw new Error(`Server returned ${res.status}`);
+      }
+
+      ok(`Uploaded ${cyan(filePath)} ${dim(`(${formatBytes(fileSize)})`)}`);
+      return;
+    } catch (e) {
+      if (attempt < MAX_RETRIES) {
+        const delay = attempt * 2; // 2s, 4s
+        warn(
+          `Upload failed for ${cyan(filePath)} (${e.message}). ` +
+          `Retrying in ${delay}s… (${attempt}/${MAX_RETRIES})`
+        );
+        await new Promise((r) => setTimeout(r, delay * 1000));
+      } else {
+        err(
+          `Failed to upload ${cyan(filePath)} after ${MAX_RETRIES} attempts: ${e.message}`
+        );
+        process.exit(1);
+      }
+    }
+  }
+}
+
 /**
  * Default ignore patterns for directory deploys.
  * Matches directory names and file names/patterns.
@@ -434,24 +473,26 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
     let uploadedCount = 0;
     let skippedCount = 0;
 
+    // Write .htmlhost early so a crash mid-upload doesn't orphan the site
+    if (generatedSlug && !existingSlug) {
+      existingSlug = generatedSlug;
+      writeLink(dirPath, {
+        multipage: {
+          slug: existingSlug,
+          url: `${existingSlug}.htmlhost.co`,
+          pageCount: pagePayloads.length,
+        },
+      });
+    }
+
     for (const u of uploadUrls) {
       const file = assetFiles.find(f => f.relativePath === u.path);
       
       if (u.uploadUrl) {
-        const res = await fetch(u.uploadUrl, {
-          method: "PUT",
-          headers: { "Content-Type": u.mimeType },
-          body: file.buffer
-        });
-        
-        if (!res.ok) {
-          err(`Failed to upload ${u.path}`);
-          process.exit(1);
-        }
-        ok(`✓ Uploaded ${cyan(u.path)} ${dim(`(${formatBytes(file.size)})`)}`);
+        await uploadWithRetry(u.uploadUrl, u.mimeType, file.buffer, u.path, file.size);
         uploadedCount++;
       } else {
-        ok(`● Skipped (unchanged) ${cyan(u.path)} ${dim(`(${formatBytes(file.size)})`)}`);
+        ok(`Skipped (unchanged) ${cyan(u.path)} ${dim(`(${formatBytes(file.size)})`)}`)
         skippedCount++;
       }
       
@@ -463,10 +504,6 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
         hash: u.hash
       });
     }
-    
-    if (!existingSlug) {
-      existingSlug = generatedSlug;
-    }
   }
 
   // --- Deploy ---
@@ -506,10 +543,12 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
       return;
     }
 
+    const pc = data.pageCount || pagePayloads.length;
+    const ac = assetPayloads.length;
     console.log("");
     console.log(`  ${green("━".repeat(40))}`);
     ok(`${bold("Live")} at ${cyan(`https://${data.url}`)}`);
-    console.log(`   ${dim(`${data.pageCount || pagePayloads.length} pages · ${assetPayloads.length} assets · ${data.ttl} TTL`)}`);
+    console.log(`   ${dim(`${pc} page${pc !== 1 ? "s" : ""} · ${ac} asset${ac !== 1 ? "s" : ""} · ${data.ttl} TTL`)}`);
     console.log("");
 
     for (const { path: pagePath } of pagePayloads) {

package/src/update.mjs

@@ -0,0 +1,125 @@
+/**
+ * Auto-update checker for the htmlhost CLI.
+ *
+ * - Checks the npm registry for a newer version (non-blocking).
+ * - Throttles to at most once per 24 hours via ~/.htmlhostrc cache.
+ * - After the command finishes, prints a notice and auto-updates.
+ * - Skipped entirely in --json mode or CI environments.
+ */
+import { execSync } from "node:child_process";
+import { readConfig, writeConfig } from "./config.mjs";
+import { bold, dim, cyan, green, yellow, err as errMsg } from "./ui.mjs";
+
+const PACKAGE_NAME = "htmlhost-cli";
+const CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
+
+/**
+ * Start a non-blocking version check. Returns a promise that resolves
+ * to { latest, current, needsUpdate } or null if the check was skipped/failed.
+ */
+export function startUpdateCheck(currentVersion) {
+  // Skip in CI or if explicitly disabled
+  if (process.env.CI || process.env.HTMLHOST_NO_UPDATE_CHECK) {
+    return Promise.resolve(null);
+  }
+
+  // Throttle: check at most once per 24 hours
+  const config = readConfig();
+  const lastCheck = config.lastUpdateCheck || 0;
+  if (Date.now() - lastCheck < CHECK_INTERVAL_MS) {
+    // Still within throttle window — but if we know a newer version
+    // from the last check, surface it without re-fetching
+    if (config.latestVersion && config.latestVersion !== currentVersion) {
+      return Promise.resolve({
+        latest: config.latestVersion,
+        current: currentVersion,
+        needsUpdate: true,
+      });
+    }
+    return Promise.resolve(null);
+  }
+
+  // Non-blocking fetch to npm registry
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 5000); // 5s max
+
+  return fetch(`https://registry.npmjs.org/${PACKAGE_NAME}/latest`, {
+    signal: controller.signal,
+    headers: { Accept: "application/json" },
+  })
+    .then((res) => {
+      clearTimeout(timeout);
+      if (!res.ok) return null;
+      return res.json();
+    })
+    .then((data) => {
+      if (!data?.version) return null;
+
+      // Cache the result
+      writeConfig({
+        lastUpdateCheck: Date.now(),
+        latestVersion: data.version,
+      });
+
+      if (data.version === currentVersion) return null;
+
+      // Compare semver: only update if registry version is newer
+      if (!isNewer(data.version, currentVersion)) return null;
+
+      return {
+        latest: data.version,
+        current: currentVersion,
+        needsUpdate: true,
+      };
+    })
+    .catch(() => {
+      clearTimeout(timeout);
+      return null; // Silently ignore network errors
+    });
+}
+
+/**
+ * Simple semver comparison: returns true if a > b.
+ */
+function isNewer(a, b) {
+  const pa = a.split(".").map(Number);
+  const pb = b.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((pa[i] || 0) > (pb[i] || 0)) return true;
+    if ((pa[i] || 0) < (pb[i] || 0)) return false;
+  }
+  return false;
+}
+
+/**
+ * Print an update banner and attempt auto-update.
+ * Called after the main command finishes.
+ */
+export async function applyUpdate(updateInfo) {
+  if (!updateInfo?.needsUpdate) return;
+
+  const { latest, current } = updateInfo;
+
+  console.log("");
+  console.log(
+    `  ${yellow("⬆")}  Update available: ${dim(current)} → ${green(bold(latest))}`
+  );
+  console.log(`     Updating ${cyan(PACKAGE_NAME)}…`);
+
+  try {
+    execSync(`npm update -g ${PACKAGE_NAME}`, {
+      stdio: "pipe",
+      timeout: 30000, // 30s max
+    });
+    console.log(`  ${green("✓")}  Updated to v${latest}`);
+
+    // Clear cached version so we don't show the banner again
+    writeConfig({ latestVersion: latest });
+  } catch (e) {
+    // Permission error or other failure — show manual command
+    console.log(
+      `  ${yellow("!")}  Auto-update failed. Run manually:`
+    );
+    console.log(`     ${cyan(`sudo npm update -g ${PACKAGE_NAME}`)}`);
+  }
+}