htmlhost-cli 2.1.3 → 2.1.4

package/package.json

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

package/src/commands/deploy.mjs

@@ -291,7 +291,7 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
 
   // Read existing link data
   const link = readLink(dirPath);
-  const existingSlug = explicitSlug || (!forceNew && link?.multipage?.slug) || null;
+  let existingSlug = explicitSlug || (!forceNew && link?.multipage?.slug) || null;
 
   // Calculate total size
   const totalSize = allFiles.reduce((sum, f) => sum + f.size, 0);
@@ -366,25 +366,65 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
     ok(`${cyan(file.relativePath)} → ${cyan(pagePath)}`);
   }
 
-  // --- Build asset payloads (non-HTML files as base64) ---
+  // --- Build asset payloads (presigned URL flow) ---
+  const assetPayloads = [];
+  
   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)})`)}`);
+    
+    const uploadUrlReqBody = {
+      slug: existingSlug || undefined,
+      isNewSite: !existingSlug,
+      html: pagePayloads[0]?.html || "",
+      assets: assetFiles.map(f => ({
+        path: f.relativePath,
+        sizeBytes: f.size,
+        mimeType: mimeFromExt(basename(f.filePath))
+      }))
+    };
+    
+    let urlData;
+    try {
+      urlData = await post("/api/sites/upload-url", uploadUrlReqBody);
+    } catch (e) {
+      err(`Failed to get upload URLs: ${e.message}`);
+      process.exit(1);
+    }
+    
+    const { slug: generatedSlug, uploadUrls } = urlData;
+    
+    console.log("");
+    info(`Uploading ${cyan(bold(String(assetFiles.length)))} asset${assetFiles.length > 1 ? "s" : ""}…`);
+    
+    for (const u of uploadUrls) {
+      const file = assetFiles.find(f => f.relativePath === u.path);
+      const buffer = readFileSync(file.filePath);
+      
+      const res = await fetch(u.uploadUrl, {
+        method: "PUT",
+        headers: { "Content-Type": u.mimeType },
+        body: buffer
+      });
+      
+      if (!res.ok) {
+        err(`Failed to upload ${u.path}`);
+        process.exit(1);
+      }
+      
+      assetPayloads.push({
+        path: u.path,
+        mimeType: u.mimeType,
+        sizeBytes: u.sizeBytes,
+        storageKey: u.storageKey
+      });
+      
+      ok(`✓ Uploaded ${cyan(u.path)} ${dim(`(${formatBytes(file.size)})`)}`);
+    }
+    
+    if (!existingSlug) {
+      existingSlug = generatedSlug;
+    }
   }
 
   // --- Deploy ---
@@ -393,7 +433,13 @@ async function deployDirectory(dirPath, { ttl, title, slug: explicitSlug, forceN
 
   const body = { pages: pagePayloads, assets: assetPayloads };
   if (ttl) body.ttl = ttl;
-  if (existingSlug) body.slug = existingSlug;
+  if (existingSlug) {
+    body.slug = existingSlug;
+    // We pass isNewSite only if the generated slug wasn't originally provided
+    if (!explicitSlug && !(!forceNew && link?.multipage?.slug)) {
+      body.isNewSite = true;
+    }
+  }
   if (title) body.title = title;
 
   try {