drop2run 0.2.1 → 0.3.0

package/dist/index.js

@@ -517,7 +517,7 @@ function renameOfLoneHtmlPage(paths) {
   const lower = only.toLowerCase();
   return lower.endsWith(".html") || lower.endsWith(".htm") ? only : null;
 }
-function formatBytes(bytes) {
+function formatBytes$1(bytes) {
   if (bytes < 1024) return `${bytes} B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
   if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
@@ -548,7 +548,7 @@ function checkLimits(files, limits) {
   if (oversized) {
     throw new DeployError(
       ClientErrorCode.FileTooLarge,
-      `${oversized.path} is ${formatBytes(oversized.bytes.length)}, and this plan allows ${formatBytes(limits.maxFileBytes)} per file.`,
+      `${oversized.path} is ${formatBytes$1(oversized.bytes.length)}, and this plan allows ${formatBytes$1(limits.maxFileBytes)} per file.`,
       {
         path: oversized.path,
         limit: limits.maxFileBytes,
@@ -560,7 +560,7 @@ function checkLimits(files, limits) {
   if (limits.maxSiteBytes !== null && total > limits.maxSiteBytes) {
     throw new DeployError(
       ClientErrorCode.TooLarge,
-      `That drop is ${formatBytes(total)}, and this plan allows ${formatBytes(limits.maxSiteBytes)}.`,
+      `That drop is ${formatBytes$1(total)}, and this plan allows ${formatBytes$1(limits.maxSiteBytes)}.`,
       { limit: limits.maxSiteBytes, actual: total }
     );
   }
@@ -698,7 +698,7 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
       });
       done += 1;
       uploadedBytes += file.bytes.length;
-      onProgress?.(done, targets.length, uploadedBytes);
+      onProgress?.(done, targets.length, uploadedBytes, file.path);
     }
   };
   const workers = Array.from(
@@ -793,12 +793,13 @@ async function deploy(source, siteId, onProgress, signal, options = {}) {
       prepared.upload,
       prepared.uploadUrl,
       hashed,
-      (done, _total, bytes) => onProgress({
+      (done, _total, bytes, path) => onProgress({
         type: "uploading",
         done: prepared.reused + done,
         total: prepared.total,
         bytes,
-        reused: prepared.reused
+        reused: prepared.reused,
+        path
       }),
       signal,
       options.upload
@@ -872,12 +873,12 @@ async function resolveSite(credentials, site) {
   );
   if (found === void 0) {
     throw new Error(
-      `No site of yours is called "${site}". Leave the site out to publish to a new one, or use list_sites to see what exists.`
+      `No site of yours is called "${site}". Leave the site out to publish to a new one, or list your sites to see what exists.`
     );
   }
   return found;
 }
-async function publish(credentials, source, site) {
+async function publish(credentials, source, site, onProgress) {
   const target = await resolveSite(credentials, site);
   let files = 0;
   let url = target.url;
@@ -895,6 +896,7 @@ async function publish(credentials, source, site) {
       failure2 = event.message;
       failureDetail = event.detail;
     }
+    onProgress?.(event);
   };
   await deploy(source, target.siteId, record, void 0, {
     baseUrl: credentials.apiBaseUrl,
@@ -908,8 +910,75 @@ async function publish(credentials, source, site) {
   });
   return { url, siteId: target.siteId, subdomain: target.subdomain, files, unchanged };
 }
-function publishDirectory(credentials, directory, site) {
-  return publish(credentials, directorySource(directory), site);
+function publishDirectory(credentials, directory, site, onProgress) {
+  return publish(credentials, directorySource(directory), site, onProgress);
+}
+const silentProgress = Object.assign(() => {
+}, { done: () => {
+} });
+const STEP = 1024;
+const UNITS = ["B", "KB", "MB", "GB"];
+function formatBytes(bytes) {
+  let value = bytes;
+  let unit = 0;
+  while (value >= STEP && unit < UNITS.length - 1) {
+    value /= STEP;
+    unit += 1;
+  }
+  return `${unit === 0 ? value : value.toFixed(1)} ${UNITS[unit]}`;
+}
+function shortenPath(path, width) {
+  if (path.length <= width) return path;
+  return `…${path.slice(path.length - width + 1)}`;
+}
+function describe(event, width = 80) {
+  switch (event.type) {
+    case "collecting":
+      return `Collected ${event.files.toLocaleString()} ${event.files === 1 ? "file" : "files"}`;
+    case "hashing":
+      return `Hashing ${event.done.toLocaleString()}/${event.total.toLocaleString()}`;
+    case "preparing":
+      return "Asking the server which files it already has";
+    case "uploading": {
+      const counted = `Uploading ${event.done.toLocaleString()}/${event.total.toLocaleString()}`;
+      const reused = event.reused === 0 ? "" : ` (${event.reused.toLocaleString()} already there)`;
+      const head = `${counted}${reused} · ${formatBytes(event.bytes)}`;
+      const room = width - head.length - 3;
+      return event.path === void 0 || room < 12 ? head : `${head} · ${shortenPath(event.path, room)}`;
+    }
+    case "completing":
+      return "Publishing";
+    // Both end the deploy, and the command prints the URL from the result it returns. Saying it here
+    // as well would print it twice, once on stderr and once on stdout.
+    case "done":
+    case "unchanged":
+    case "error":
+      return null;
+  }
+}
+function progressWriter(write, isTerminal, width = 80) {
+  let painted = 0;
+  let lastStage = null;
+  const writer = ((event) => {
+    const line = describe(event, width - 1);
+    if (line === null) return;
+    if (!isTerminal) {
+      if (event.type === lastStage) return;
+      lastStage = event.type;
+      write(`${line}
+`);
+      return;
+    }
+    lastStage = event.type;
+    write(`\r${line}${" ".repeat(Math.max(0, painted - line.length))}`);
+    painted = line.length;
+  });
+  writer.done = () => {
+    if (!isTerminal || painted === 0) return;
+    write(`\r${" ".repeat(painted)}\r`);
+    painted = 0;
+  };
+  return writer;
 }
 function failure(text) {
   return { text, json: { error: text }, code: 1 };
@@ -1053,14 +1122,14 @@ async function list() {
     code: 0
   };
 }
-async function deployCommand(directory, site) {
+async function deployCommand(directory, site, report = silentProgress) {
   const found = credentialsOr();
   if ("result" in found) return found.result;
   const project = readProject();
   const target = site ?? project?.siteId;
   const folder = directory ?? project?.dir ?? ".";
   try {
-    const result = await publishDirectory(found.credentials, resolve(folder), target);
+    const result = await publishDirectory(found.credentials, resolve(folder), target, report);
     const what = result.unchanged ? "Already up to date — nothing needed publishing." : `Published ${result.files.toLocaleString()} ${result.files === 1 ? "file" : "files"}.`;
     return {
       text: `${what}
@@ -1070,6 +1139,8 @@ ${result.url}`,
     };
   } catch (error) {
     return failureFrom(error);
+  } finally {
+    report.done();
   }
 }
 async function init(directory, site) {
@@ -1258,7 +1329,7 @@ async function run(argv) {
   const positional = argv.filter((argument) => !argument.startsWith("-"));
   const [command, ...rest] = positional;
   if (argv.includes("--version")) {
-    const { version } = await import("./package-D-UHpX_a.js").then(
+    const { version } = await import("./package-B5PgBI_i.js").then(
       (module) => module.default
     );
     return { text: version, json: { version }, code: 0 };
@@ -1288,8 +1359,14 @@ async function dispatch(command, rest, site, json, device, confirmed) {
       return logout();
     case "init":
       return await init(rest[0] ?? ".", site);
-    case "deploy":
-      return await deployCommand(rest[0], site);
+    case "deploy": {
+      const report = json ? silentProgress : progressWriter(
+        (text) => process.stderr.write(text),
+        process.stderr.isTTY === true,
+        process.stderr.columns ?? 80
+      );
+      return await deployCommand(rest[0], site, report);
+    }
     case "ls":
     case "list":
       return await list();

package/dist/{package-D-UHpX_a.js → package-B5PgBI_i.js}

@@ -1,5 +1,5 @@
 const name = "drop2run";
-const version = "0.2.1";
+const version = "0.3.0";
 const description = "Publish a static site to Drop2Run from the command line.";
 const license = "MIT";
 const type = "module";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drop2run",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"description": "Publish a static site to Drop2Run from the command line.",
 	"license": "MIT",
 	"type": "module",