htmlhost-cli 2.0.0 → 2.1.1

package/package.json

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

package/src/cli.mjs

@@ -4,7 +4,7 @@
 import { bold, dim, cyan, err } from "./ui.mjs";
 import { ApiError } from "./api.mjs";
 
-const VERSION = "2.0.0";
+const VERSION = "2.1.1";
 
 const HELP = `
   ${bold("htmlhost")} ${dim(`v${VERSION}`)} — deploy HTML from the terminal

package/src/commands/deploy.mjs

@@ -1,12 +1,8 @@
 import { readFileSync, writeFileSync, statSync, existsSync, readdirSync } from "node:fs";
-import { basename, resolve, dirname, join, extname, relative } from "node:path";
+import { basename, resolve, dirname, join, extname } from "node:path";
 import { createInterface } from "node:readline";
 import { post } from "../api.mjs";
-import { ok, err, info, cyan, dim, bold, yellow, green, formatBytes } from "../ui.mjs";
-import { processAssets } from "../assets.mjs";
-import { uploadFile } from "../api.mjs";
-import { getApi } from "../config.mjs";
-import { mimeFromExt } from "../ui.mjs";
+import { ok, err, info, cyan, dim, bold, yellow, green, formatBytes, mimeFromExt } from "../ui.mjs";
 
 const LINK_FILE = ".htmlhost";
 
@@ -347,66 +343,13 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
 
   console.log("");
 
-  // --- Upload non-HTML assets first ---
-  const api = getApi();
-  /** @type {Map<string, string>} relativePath → hosted URL */
-  const assetUrlMap = new Map();
-
-  if (assetFiles.length > 0) {
-    info(`Uploading ${cyan(bold(String(assetFiles.length)))} asset${assetFiles.length > 1 ? "s" : ""}…`);
-    console.log("");
-
-    for (const file of assetFiles) {
-      const fileName = basename(file.filePath);
-      const mime = mimeFromExt(fileName);
-
-      try {
-        const data = await uploadFile("/api/media", file.filePath, fileName, mime);
-        const hostedUrl = `${api}${data.url}`;
-        assetUrlMap.set(file.relativePath, hostedUrl);
-        ok(`${cyan(file.relativePath)} ${dim(`(${formatBytes(file.size)})`)} → ${dim("uploaded")}`);
-      } catch (e) {
-        err(`${file.relativePath}: ${e.message}`);
-      }
-    }
-
-    console.log("");
-  }
-
-  // --- Build page payloads (HTML files with asset URLs rewritten) ---
+  // --- Build page payloads (HTML files — no rewriting needed) ---
   info(`Processing ${cyan(bold(String(htmlFiles.length)))} page${htmlFiles.length > 1 ? "s" : ""}…`);
 
   const pagePayloads = [];
 
   for (const file of htmlFiles) {
-    let html = readFileSync(file.filePath, "utf8");
-
-    // Rewrite local asset references to hosted URLs
-    for (const [relPath, hostedUrl] of assetUrlMap) {
-      // Replace both quoted forms: "path" and 'path'
-      // Handle relative paths from the HTML file's perspective
-      const htmlDir = dirname(file.relativePath);
-      const assetFromHtml = htmlDir === "." ? relPath : relative(htmlDir, relPath);
-
-      // Replace the original reference and the relative-from-html reference
-      html = replaceAll(html, `"${relPath}"`, `"${hostedUrl}"`);
-      html = replaceAll(html, `'${relPath}'`, `'${hostedUrl}'`);
-      html = replaceAll(html, `"${assetFromHtml}"`, `"${hostedUrl}"`);
-      html = replaceAll(html, `'${assetFromHtml}'`, `'${hostedUrl}'`);
-
-      // Also handle ./ prefix
-      html = replaceAll(html, `"./${relPath}"`, `"${hostedUrl}"`);
-      html = replaceAll(html, `'./${relPath}'`, `'${hostedUrl}'`);
-      if (assetFromHtml !== relPath) {
-        html = replaceAll(html, `"./${assetFromHtml}"`, `"${hostedUrl}"`);
-        html = replaceAll(html, `'./${assetFromHtml}'`, `'${hostedUrl}'`);
-      }
-
-      // Handle url() in CSS
-      html = replaceAll(html, `url(${relPath})`, `url(${hostedUrl})`);
-      html = replaceAll(html, `url(${assetFromHtml})`, `url(${hostedUrl})`);
-      html = replaceAll(html, `url(./${relPath})`, `url(${hostedUrl})`);
-    }
+    const html = readFileSync(file.filePath, "utf8");
 
     // Derive page path
     let pagePath;
@@ -423,11 +366,32 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
     ok(`${cyan(file.relativePath)} → ${cyan(pagePath)}`);
   }
 
+  // --- Build asset payloads (non-HTML files as base64) ---
+  if (assetFiles.length > 0) {
+    console.log("");
+    info(`Packaging ${cyan(bold(String(assetFiles.length)))} asset${assetFiles.length > 1 ? "s" : ""}…`);
+  }
+
+  const assetPayloads = [];
+
+  for (const file of assetFiles) {
+    const content = readFileSync(file.filePath);
+    const base64 = content.toString("base64");
+    const mime = mimeFromExt(basename(file.filePath));
+
+    assetPayloads.push({
+      path: file.relativePath,
+      content: base64,
+      mimeType: mime,
+    });
+    ok(`${cyan(file.relativePath)} ${dim(`(${formatBytes(file.size)})`)}`);
+  }
+
   // --- Deploy ---
   console.log("");
   info(existingSlug ? `Deploying to ${cyan(existingSlug)}…` : "Deploying new site…");
 
-  const body = { pages: pagePayloads };
+  const body = { pages: pagePayloads, assets: assetPayloads };
   if (ttl) body.ttl = ttl;
   if (existingSlug) body.slug = existingSlug;
   if (title) body.title = title;
@@ -452,7 +416,7 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
     console.log("");
     console.log(`  ${green("━".repeat(40))}`);
     ok(`${bold("Live")} at ${cyan(`https://${data.url}`)}`);
-    console.log(`   ${dim(`${data.pageCount || pagePayloads.length} pages · ${data.ttl} TTL`)}`);
+    console.log(`   ${dim(`${data.pageCount || pagePayloads.length} pages · ${assetPayloads.length} assets · ${data.ttl} TTL`)}`);
     console.log("");
 
     for (const { path: pagePath } of pagePayloads) {
@@ -514,13 +478,6 @@ function findAllFiles(baseDir, currentDir) {
   return results;
 }
 
-/**
- * Replace all occurrences of `search` in `str` with `replacement`.
- */
-function replaceAll(str, search, replacement) {
-  return str.split(search).join(replacement);
-}
-
 function getFlag(args, flag) {
   const idx = args.indexOf(flag);
   if (idx === -1 || idx >= args.length - 1) return null;