drop2run 0.2.0 → 0.3.0

package/README.md

@@ -72,7 +72,9 @@ DROP2RUN_TOKEN=d2r_...
 ```
 
 The environment wins over `~/.config/drop2run/config.json`, and that is the same file and precedence
-`@drop2run/mcp` uses, so signing in once covers both.
+`@drop2run/mcp` uses, so signing in once covers both — in either direction. That server runs the same
+two flows from its own `login` and `login_code` tools, so a sign-in done in a chat leaves this command
+line signed in too.
 
 `drop2run where` says which source is in force without printing the token, so "why is it using the wrong
 account" is answerable in an issue report or a CI log.

package/dist/index.js

@@ -1,10 +1,10 @@
 import { join, dirname, relative, sep, resolve } from "node:path";
 import { readFileSync, writeFileSync, chmodSync, renameSync, mkdirSync } from "node:fs";
 import { homedir, hostname } from "node:os";
-import { realpath, readdir, stat, readFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { randomBytes, createHash } from "node:crypto";
 import { createServer } from "node:http";
+import { realpath, readdir, stat, readFile } from "node:fs/promises";
 async function call(credentials, path, init2 = {}) {
   const response = await fetch(`${credentials.apiBaseUrl}/${path}`, {
     ...init2,
@@ -125,20 +125,188 @@ function clearToken(path = configPath()) {
   renameSync(temporary, path);
   return true;
 }
-function missingCredentialsMessage() {
-  return [
-    "No Drop2Run access token.",
-    "",
-    "Run `drop2run login` to sign in through a browser, which stores one for you.",
+function missingCredentialsMessage(surface = "cli") {
+  const signIn = surface === "mcp" ? [
+    "Call the `login` tool to sign in through a browser, which stores a token.",
     "",
+    "Where no browser can be opened on this machine — a container, a remote host — call",
+    "`login_code` instead and pass on the short code it gives you."
+  ] : ["Run `drop2run login` to sign in through a browser, which stores one for you."];
+  const byHand = surface === "mcp" ? [
+    "To set one without signing in here, create a token at",
+    "https://dropto.run/account/tokens and either:",
+    `  - put it in ${configPath()} as {"token": "d2r_..."}, which this`,
+    "    server reads on every call and needs no restart, or",
+    `  - set ${TOKEN_VARIABLE} in the environment and restart this server, since it reads`,
+    "    the environment it was started in."
+  ] : [
     "For CI, or where no browser can be opened, create a token at",
     "https://dropto.run/account/tokens and either:",
     `  - set ${TOKEN_VARIABLE} in the environment, or`,
-    `  - put it in ${configPath()} as {"token": "d2r_..."}`,
+    `  - put it in ${configPath()} as {"token": "d2r_..."}`
+  ];
+  return [
+    "No Drop2Run access token.",
+    "",
+    ...signIn,
+    "",
+    ...byHand,
     "",
     "The token is shown once when it is created and cannot be recovered afterwards."
   ].join("\n");
 }
+const TIMEOUT_MS = 5 * 60 * 1e3;
+function newAttempt() {
+  const verifier = randomBytes(32).toString("base64url");
+  return {
+    verifier,
+    challenge: createHash("sha256").update(verifier).digest("base64url"),
+    state: randomBytes(16).toString("base64url")
+  };
+}
+function clientName(surface) {
+  const clean2 = (value) => value.trim().replace(/[^A-Za-z0-9._-]/g, "-");
+  const label = "";
+  const raw = clean2(hostname()).slice(0, 64 - label.length);
+  return `${raw === "" ? "drop2run" : raw}${label}`;
+}
+function openBrowser(url) {
+  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn(command, [...args], { stdio: "ignore", detached: true });
+    child.unref();
+    child.on("error", () => {
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function listen(state) {
+  return new Promise((resolveListener, rejectListener) => {
+    let settle = null;
+    let fail = null;
+    const received = new Promise((resolveCode, rejectCode) => {
+      settle = resolveCode;
+      fail = rejectCode;
+    });
+    const server = createServer((request2, response) => {
+      const url = new URL(request2.url ?? "/", "http://127.0.0.1");
+      if (url.pathname !== "/cb") {
+        response.writeHead(404, { "Content-Type": "text/plain" });
+        response.end("Not found.\n");
+        return;
+      }
+      const code = url.searchParams.get("code") ?? "";
+      const returned = url.searchParams.get("state") ?? "";
+      if (returned !== state || code === "") {
+        respond(
+          response,
+          400,
+          "Sign-in could not be completed",
+          "This did not come from the sign-in that was started here. Nothing has been changed."
+        );
+        fail?.(new Error("The browser returned a response that did not match this sign-in."));
+        return;
+      }
+      respond(response, 200, "Signed in", "You can close this tab now.");
+      settle?.({ code });
+    });
+    server.on("error", (error) => {
+      rejectListener(error);
+      fail?.(error instanceof Error ? error : new Error(String(error)));
+    });
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+      if (address === null) {
+        rejectListener(new Error("Could not open a local port to receive the sign-in."));
+        return;
+      }
+      resolveListener({
+        port: address.port,
+        received,
+        close: () => server.close()
+      });
+    });
+  });
+}
+function respond(response, status, title, detail) {
+  response.writeHead(status, { "Content-Type": "text/html; charset=utf-8" });
+  response.end(
+    `<!doctype html><html lang="en"><head><meta charset="utf-8"><title>${title} — drop2run</title><style>body{font:16px/1.6 system-ui,sans-serif;margin:20vh auto;max-width:28rem;padding:0 1.5rem;color:#12211f}h1{font-size:1.4rem;margin:0 0 .5rem}p{margin:0;color:#64706e}@media(prefers-color-scheme:dark){body{background:#0d1413;color:#e8efee}p{color:#9aa8a6}}</style></head><body><h1>${title}</h1><p>${detail}</p></body></html>
+`
+  );
+}
+async function waitForCallback(received, timeoutMs = TIMEOUT_MS) {
+  let timer;
+  try {
+    return await Promise.race([
+      received,
+      new Promise((_, reject) => {
+        timer = setTimeout(
+          () => reject(new Error("Timed out waiting for the browser. Nothing has been changed.")),
+          timeoutMs
+        );
+      })
+    ]);
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+  }
+}
+function consentUrl(dashboardUrl, attempt, port, name) {
+  const url = new URL("/cli-auth", dashboardUrl);
+  url.searchParams.set("challenge", attempt.challenge);
+  url.searchParams.set("state", attempt.state);
+  url.searchParams.set("port", String(port));
+  url.searchParams.set("name", name);
+  return url.toString();
+}
+async function startDevice(apiBaseUrl, clientName2) {
+  const response = await fetch(`${apiBaseUrl}/auth/cli/device`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ clientName: clientName2 })
+  });
+  if (!response.ok) throw new Error(await problemDetail(response));
+  return await response.json();
+}
+async function pollDevice(apiBaseUrl, deviceCode) {
+  let response;
+  try {
+    response = await fetch(`${apiBaseUrl}/auth/cli/device/token`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ deviceCode })
+    });
+  } catch {
+    return { state: "pending" };
+  }
+  if (response.ok) {
+    const body = await response.json();
+    return { state: "granted", token: { token: body.token, name: body.name, email: body.email } };
+  }
+  const problem = await response.json().catch(() => null);
+  if (problem?.type === "authorization_pending") return { state: "pending" };
+  if (problem?.type === "slow_down") return { state: "slow_down" };
+  return {
+    state: "dead",
+    message: problem?.detail ?? `The API answered ${response.status}.`
+  };
+}
+async function problemDetail(response) {
+  const problem = await response.json().catch(() => null);
+  return problem?.detail ?? `The API answered ${response.status}.`;
+}
+async function exchange(apiBaseUrl, code, verifier) {
+  const response = await fetch(`${apiBaseUrl}/auth/cli/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ code, verifier })
+  });
+  if (!response.ok) throw new Error(await problemDetail(response));
+  const body = await response.json();
+  return { token: body.token, name: body.name, email: body.email };
+}
 const PROJECT_FILE = "drop2run.json";
 function projectPath(directory = process.cwd()) {
   return join(directory, PROJECT_FILE);
@@ -349,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`;
@@ -380,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,
@@ -392,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 }
     );
   }
@@ -530,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(
@@ -625,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
@@ -704,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;
@@ -727,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,
@@ -740,158 +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);
-}
-const TIMEOUT_MS = 5 * 60 * 1e3;
-function newAttempt() {
-  const verifier = randomBytes(32).toString("base64url");
-  return {
-    verifier,
-    challenge: createHash("sha256").update(verifier).digest("base64url"),
-    state: randomBytes(16).toString("base64url")
-  };
-}
-function clientName() {
-  const raw = hostname().trim().replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 64);
-  return raw === "" ? "drop2run-cli" : raw;
+function publishDirectory(credentials, directory, site, onProgress) {
+  return publish(credentials, directorySource(directory), site, onProgress);
 }
-function openBrowser(url) {
-  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
-  try {
-    const child = spawn(command, [...args], { stdio: "ignore", detached: true });
-    child.unref();
-    child.on("error", () => {
-    });
-    return true;
-  } catch {
-    return false;
+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;
   }
-}
-function listen(state) {
-  return new Promise((resolveListener, rejectListener) => {
-    let settle = null;
-    let fail = null;
-    const received = new Promise((resolveCode, rejectCode) => {
-      settle = resolveCode;
-      fail = rejectCode;
-    });
-    const server = createServer((request2, response) => {
-      const url = new URL(request2.url ?? "/", "http://127.0.0.1");
-      if (url.pathname !== "/cb") {
-        response.writeHead(404, { "Content-Type": "text/plain" });
-        response.end("Not found.\n");
-        return;
-      }
-      const code = url.searchParams.get("code") ?? "";
-      const returned = url.searchParams.get("state") ?? "";
-      if (returned !== state || code === "") {
-        respond(
-          response,
-          400,
-          "Sign-in could not be completed",
-          "This did not come from the sign-in that was started here. Nothing has been changed."
-        );
-        fail?.(new Error("The browser returned a response that did not match this sign-in."));
-        return;
-      }
-      respond(response, 200, "Signed in", "You can close this tab and go back to the terminal.");
-      settle?.({ code });
-    });
-    server.on("error", (error) => {
-      rejectListener(error);
-      fail?.(error instanceof Error ? error : new Error(String(error)));
-    });
-    server.listen(0, "127.0.0.1", () => {
-      const address = server.address();
-      if (address === null) {
-        rejectListener(new Error("Could not open a local port to receive the sign-in."));
-        return;
-      }
-      resolveListener({
-        port: address.port,
-        received,
-        close: () => server.close()
-      });
-    });
-  });
-}
-function respond(response, status, title, detail) {
-  response.writeHead(status, { "Content-Type": "text/html; charset=utf-8" });
-  response.end(
-    `<!doctype html><html lang="en"><head><meta charset="utf-8"><title>${title} — drop2run</title><style>body{font:16px/1.6 system-ui,sans-serif;margin:20vh auto;max-width:28rem;padding:0 1.5rem;color:#12211f}h1{font-size:1.4rem;margin:0 0 .5rem}p{margin:0;color:#64706e}@media(prefers-color-scheme:dark){body{background:#0d1413;color:#e8efee}p{color:#9aa8a6}}</style></head><body><h1>${title}</h1><p>${detail}</p></body></html>
-`
-  );
-}
-async function waitForCallback(received, timeoutMs = TIMEOUT_MS) {
-  let timer;
-  try {
-    return await Promise.race([
-      received,
-      new Promise((_, reject) => {
-        timer = setTimeout(
-          () => reject(new Error("Timed out waiting for the browser. Nothing has been changed.")),
-          timeoutMs
-        );
-      })
-    ]);
-  } finally {
-    if (timer !== void 0) clearTimeout(timer);
+  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 consentUrl(dashboardUrl, attempt, port, name) {
-  const url = new URL("/cli-auth", dashboardUrl);
-  url.searchParams.set("challenge", attempt.challenge);
-  url.searchParams.set("state", attempt.state);
-  url.searchParams.set("port", String(port));
-  url.searchParams.set("name", name);
-  return url.toString();
-}
-async function startDevice(apiBaseUrl, clientName2) {
-  const response = await fetch(`${apiBaseUrl}/auth/cli/device`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ clientName: clientName2 })
+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;
   });
-  if (!response.ok) throw new Error(await problemDetail(response));
-  return await response.json();
-}
-async function pollDevice(apiBaseUrl, deviceCode) {
-  let response;
-  try {
-    response = await fetch(`${apiBaseUrl}/auth/cli/device/token`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ deviceCode })
-    });
-  } catch {
-    return { state: "pending" };
-  }
-  if (response.ok) {
-    const body = await response.json();
-    return { state: "granted", token: { token: body.token, name: body.name, email: body.email } };
-  }
-  const problem = await response.json().catch(() => null);
-  if (problem?.type === "authorization_pending") return { state: "pending" };
-  if (problem?.type === "slow_down") return { state: "slow_down" };
-  return {
-    state: "dead",
-    message: problem?.detail ?? `The API answered ${response.status}.`
+  writer.done = () => {
+    if (!isTerminal || painted === 0) return;
+    write(`\r${" ".repeat(painted)}\r`);
+    painted = 0;
   };
-}
-async function problemDetail(response) {
-  const problem = await response.json().catch(() => null);
-  return problem?.detail ?? `The API answered ${response.status}.`;
-}
-async function exchange(apiBaseUrl, code, verifier) {
-  const response = await fetch(`${apiBaseUrl}/auth/cli/token`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ code, verifier })
-  });
-  if (!response.ok) throw new Error(await problemDetail(response));
-  const body = await response.json();
-  return { token: body.token, name: body.name, email: body.email };
+  return writer;
 }
 function failure(text) {
   return { text, json: { error: text }, code: 1 };
@@ -1035,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}
@@ -1052,6 +1139,8 @@ ${result.url}`,
     };
   } catch (error) {
     return failureFrom(error);
+  } finally {
+    report.done();
   }
 }
 async function init(directory, site) {
@@ -1240,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-C6bEGZf_.js").then(
+    const { version } = await import("./package-B5PgBI_i.js").then(
       (module) => module.default
     );
     return { text: version, json: { version }, code: 0 };
@@ -1270,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-C6bEGZf_.js → package-B5PgBI_i.js}

@@ -1,5 +1,5 @@
 const name = "drop2run";
-const version = "0.2.0";
+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.0",
+	"version": "0.3.0",
 	"description": "Publish a static site to Drop2Run from the command line.",
 	"license": "MIT",
 	"type": "module",