tiendu 0.3.1 → 0.5.0

package/lib/push.mjs

@@ -1,9 +1,9 @@
-import { readdir, readFile } from "node:fs/promises";
-import path from "node:path";
 import * as p from "@clack/prompts";
-import { zipSync } from "fflate";
 import { loadConfigOrFail, isBuiltTheme, getDistDir } from "./config.mjs";
 import { uploadPreviewZip } from "./api.mjs";
+import { createZipFromDirectory } from "./archive.mjs";
+import { build } from "./build.mjs";
+import { retryAsync } from "./retry.mjs";
 
 /** @param {number} bytes */
 const formatBytes = (bytes) => {
@@ -12,46 +12,40 @@ const formatBytes = (bytes) => {
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 };
 
-const isDotfile = (name) => name.startsWith(".");
+export const pushPreparedDirectoryToPreview = async ({
+  apiBaseUrl,
+  apiKey,
+  storeId,
+  previewKey,
+  rootDir,
+  spinner,
+  packMessage = "Packing files...",
+  uploadMessage,
+  retryMessage,
+}) => {
+  spinner.message(packMessage);
 
-/**
- * Recursively list all files, skipping dotfiles/dotdirs.
- * @param {string} rootDir
- * @param {string} currentDir
- * @returns {Promise<string[]>}
- */
-const listAllFiles = async (rootDir, currentDir) => {
-  const entries = await readdir(currentDir, { withFileTypes: true });
-  const files = [];
-  for (const entry of entries) {
-    if (isDotfile(entry.name)) continue;
-    const abs = path.join(currentDir, entry.name);
-    if (entry.isDirectory()) {
-      files.push(...(await listAllFiles(rootDir, abs)));
-    } else if (entry.isFile()) {
-      files.push(abs);
-    }
-  }
-  return files;
-};
+  const zipBuffer = await createZipFromDirectory(rootDir);
+  spinner.message(
+    uploadMessage ?? `Uploading to preview ${previewKey} (${formatBytes(zipBuffer.length)})...`,
+  );
 
-/**
- * Create a zip buffer from the current directory, skipping dotfiles.
- * @param {string} rootDir
- * @returns {Promise<Buffer>}
- */
-const createZipFromDirectory = async (rootDir) => {
-  const absoluteFiles = await listAllFiles(rootDir, rootDir);
-  /** @type {Record<string, Uint8Array>} */
-  const entries = {};
-  for (const abs of absoluteFiles) {
-    const rel = path.relative(rootDir, abs).split(path.sep).join("/");
-    entries[rel] = new Uint8Array(await readFile(abs));
-  }
-  return Buffer.from(zipSync(entries, { level: 6 }));
+  return retryAsync(
+    () => uploadPreviewZip(apiBaseUrl, apiKey, storeId, previewKey, zipBuffer),
+    {
+      attempts: 3,
+      shouldRetry: (uploadResult) => !uploadResult.ok && Boolean(uploadResult.retriable),
+      onRetry: async (uploadResult, nextAttempt) => {
+        spinner.message(
+          retryMessage?.(uploadResult, nextAttempt) ??
+            `Upload failed. Retrying ${nextAttempt}/3... ${uploadResult.error}`,
+        );
+      },
+    },
+  );
 };
 
-export const push = async () => {
+export const push = async ({ skipBuild = false } = {}) => {
   const { config, credentials } = await loadConfigOrFail();
 
   if (!config.previewKey) {
@@ -59,22 +53,27 @@ export const push = async () => {
     process.exit(1);
   }
 
-  const rootDir = (await isBuiltTheme()) ? getDistDir() : process.cwd();
+  const builtTheme = await isBuiltTheme();
+
+  if (builtTheme && !skipBuild) {
+    const result = await build();
+    if (!result.ok) {
+      process.exit(1);
+    }
+  }
+
+  const rootDir = builtTheme ? getDistDir() : process.cwd();
   const spinner = p.spinner();
   spinner.start("Packing files...");
 
-  const zipBuffer = await createZipFromDirectory(rootDir);
-  spinner.message(
-    `Uploading to preview ${config.previewKey} (${formatBytes(zipBuffer.length)})...`,
-  );
-
-  const result = await uploadPreviewZip(
-    config.apiBaseUrl,
-    credentials.apiKey,
-    config.storeId,
-    config.previewKey,
-    zipBuffer,
-  );
+  const result = await pushPreparedDirectoryToPreview({
+    apiBaseUrl: config.apiBaseUrl,
+    apiKey: credentials.apiKey,
+    storeId: config.storeId,
+    previewKey: config.previewKey,
+    rootDir,
+    spinner,
+  });
 
   if (!result.ok) {
     spinner.stop("Upload failed.", 1);

package/lib/retry.mjs

@@ -0,0 +1,69 @@
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * @template T
+ * @param {(attempt: number) => Promise<T>} operation
+ * @param {{
+ *   attempts?: number,
+ *   baseDelayMs?: number,
+ *   maxDelayMs?: number,
+ *   shouldRetry?: (result: T, attempt: number) => boolean,
+ *   shouldRetryError?: (error: unknown, attempt: number) => boolean,
+ *   onRetry?: (result: T, nextAttempt: number, delayMs: number) => void | Promise<void>,
+ *   onRetryError?: (error: unknown, nextAttempt: number, delayMs: number) => void | Promise<void>,
+ * }} [options]
+ * @returns {Promise<T>}
+ */
+export const retryAsync = async (operation, options = {}) => {
+  const {
+    attempts = 3,
+    baseDelayMs = 300,
+    maxDelayMs = 2000,
+    shouldRetry = () => false,
+    shouldRetryError = () => true,
+    onRetry,
+    onRetryError,
+  } = options;
+
+  let lastResult;
+  let lastError;
+
+  const getDelayMs = (attempt) =>
+    Math.min(maxDelayMs, baseDelayMs * 2 ** (attempt - 1)) +
+    Math.floor(Math.random() * 100);
+
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      const result = await operation(attempt);
+      lastResult = result;
+
+      if (!shouldRetry(result, attempt) || attempt === attempts) {
+        return result;
+      }
+
+      const delayMs = getDelayMs(attempt);
+
+      if (onRetry) {
+        await onRetry(result, attempt + 1, delayMs);
+      }
+
+      await sleep(delayMs);
+    } catch (error) {
+      lastError = error;
+
+      if (!shouldRetryError(error, attempt) || attempt === attempts) {
+        throw error;
+      }
+
+      const delayMs = getDelayMs(attempt);
+      if (onRetryError) {
+        await onRetryError(error, attempt + 1, delayMs);
+      }
+
+      await sleep(delayMs);
+    }
+  }
+
+  if (lastError) throw lastError;
+  return lastResult;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiendu",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "CLI para desarrollar y publicar temas en Tiendu",
   "type": "module",
   "bin": {
@@ -13,7 +13,7 @@
     "README.md"
   ],
   "scripts": {
-    "dev": "node bin/tiendu.mjs"
+    "dev": "node bin/tiendu.js"
   },
   "engines": {
     "node": ">=20"