@within-7/jetr 0.4.2 → 0.5.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { resolve as resolve2, basename } from "path";
+import { resolve as resolve2, basename as basename2 } from "path";
 import { existsSync as existsSync4, statSync as statSync2 } from "fs";
 import { Command } from "commander";
 import chalk2 from "chalk";
@@ -252,6 +252,7 @@ function createJetrignore(dir) {
 }
 
 // src/deploy.ts
+import { basename } from "path";
 function hashFile(filePath) {
   const content = readFileSync3(filePath);
   const hash = createHash("sha256").update(content).digest("hex");
@@ -323,6 +324,49 @@ async function deploy(siteName, directory, onProgress) {
     totalSize: result.total_size
   };
 }
+async function deployFiles(siteName, filePaths, onProgress) {
+  onProgress?.(`Preparing ${filePaths.length} file(s)...`);
+  const manifest = {};
+  const absMap = {};
+  for (const fp of filePaths) {
+    const abs = resolve(fp);
+    const name = basename(abs);
+    const hash = hashFile(abs);
+    const size = statSync(abs).size;
+    manifest[name] = { hash, size };
+    absMap[name] = abs;
+  }
+  onProgress?.("Computing diff...");
+  const diff = await api.deployDiff(siteName, manifest);
+  onProgress?.(
+    `Upload: ${diff.upload.length}, Delete: ${diff.delete.length}, Unchanged: ${diff.unchanged.length}`
+  );
+  if (diff.upload.length > 0) {
+    const CONCURRENCY = 10;
+    let completed = 0;
+    const total = diff.upload.length;
+    const uploadOne = async (name) => {
+      const content = readFileSync3(absMap[name]);
+      await api.uploadFile(siteName, name, content, diff.deploy_id, manifest[name].hash);
+      completed++;
+      onProgress?.(`Uploading (${completed}/${total}) ${name}`);
+    };
+    for (let i = 0; i < total; i += CONCURRENCY) {
+      const batch = diff.upload.slice(i, i + CONCURRENCY);
+      await Promise.all(batch.map(uploadOne));
+    }
+  }
+  onProgress?.("Finalizing...");
+  const result = await api.finalize(siteName, diff.deploy_id);
+  return {
+    url: `https://${siteName}.jetr.within-7.com`,
+    filesUploaded: result.files_uploaded,
+    filesDeleted: result.files_deleted,
+    filesUnchanged: diff.unchanged.length,
+    filesIgnored: 0,
+    totalSize: result.total_size
+  };
+}
 
 // src/rc.ts
 import { existsSync as existsSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
@@ -409,71 +453,62 @@ async function promptSelection(options) {
 // src/cli.ts
 var program = new Command();
 program.name("jetr").description("Deploy static sites instantly").version("0.2.0");
-program.argument("[directory]", "Directory to deploy (default: current directory)").argument("[name]", "Site name (reads from .jetrrc if omitted)").option("--no-ignore", "Skip .jetrignore rules").action(async (directory, name) => {
-  const dir = resolve2(directory || ".");
-  if (!existsSync4(dir)) {
-    console.error(chalk2.red(`Path not found: ${dir}`));
-    process.exit(1);
-  }
-  if (!statSync2(dir).isDirectory()) {
-    console.error(chalk2.red(`Not a directory: ${dir}`));
-    process.exit(1);
-  }
+program.argument("[paths...]", "Files or directory to deploy").action(async (paths) => {
   const config = loadConfig();
   if (!config.token) {
     console.error(chalk2.red("Not logged in."));
     console.error(`Run: ${chalk2.cyan("jetr login")}`);
     process.exit(1);
   }
-  let siteName = await resolveSiteName(dir, name);
-  if (!siteName) {
-    const dirName = basename(resolve2(dir));
-    const { createInterface: createInterface2 } = await import("readline");
-    const rl = createInterface2({
-      input: process.stdin,
-      output: process.stdout
-    });
-    siteName = await new Promise((res) => {
-      rl.question(
-        chalk2.bold(`Site name [${dirName}]: `),
-        (answer) => {
-          rl.close();
-          res(answer.trim() || dirName);
-        }
-      );
-    });
-  }
-  siteName = siteName.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
-  if (!siteName) {
-    console.error(chalk2.red("Invalid site name"));
-    process.exit(1);
-  }
-  const spinner = ora("").start();
-  try {
-    spinner.text = "Checking site...";
+  const { mode, dir, files, explicitName } = parseDeployArgs(paths);
+  if (mode === "directory") {
+    const rcDir = dir;
+    let siteName = await resolveSiteName(rcDir, explicitName);
+    if (!siteName) {
+      const dirName = basename2(resolve2(rcDir));
+      siteName = await promptLine(`Site name [${dirName}]: `) || dirName;
+    }
+    siteName = sanitizeName(siteName);
+    if (!siteName) {
+      console.error(chalk2.red("Invalid site name"));
+      process.exit(1);
+    }
+    const spinner = ora("").start();
+    try {
+      await ensureSiteExists(spinner, siteName);
+      const result = await deploy(siteName, rcDir, (msg) => {
+        spinner.text = msg;
+      });
+      printDeployResult(spinner, siteName, result);
+      const rc = loadRc(rcDir);
+      saveRc(rcDir, updateRc(rc, siteName));
+    } catch (e) {
+      spinner.fail(e.message);
+      process.exit(1);
+    }
+  } else {
+    console.log(chalk2.dim(`File mode: ${files.map((f) => basename2(f)).join(", ")}`));
+    let siteName = explicitName;
+    if (!siteName) {
+      const defaultName = basename2(files[0], ".html").replace(/\.[^.]+$/, "");
+      siteName = await promptLine(`Site name [${defaultName}]: `) || defaultName;
+    }
+    siteName = sanitizeName(siteName);
+    if (!siteName) {
+      console.error(chalk2.red("Invalid site name"));
+      process.exit(1);
+    }
+    const spinner = ora("").start();
     try {
-      await api.getSite(siteName);
-    } catch {
-      spinner.text = `Creating site ${siteName}...`;
-      await api.createSite(siteName);
+      await ensureSiteExists(spinner, siteName);
+      const result = await deployFiles(siteName, files, (msg) => {
+        spinner.text = msg;
+      });
+      printDeployResult(spinner, siteName, result);
+    } catch (e) {
+      spinner.fail(e.message);
+      process.exit(1);
     }
-    const result = await deploy(siteName, dir, (msg) => {
-      spinner.text = msg;
-    });
-    spinner.succeed("Deployed!");
-    console.log();
-    console.log(`  ${chalk2.bold("Site:")}  ${chalk2.cyan(siteName)}`);
-    console.log(`  ${chalk2.bold("URL:")}   ${chalk2.green(result.url)}`);
-    console.log(
-      `  ${chalk2.bold("Files:")} ${result.filesUploaded} uploaded` + (result.filesDeleted > 0 ? `, ${result.filesDeleted} deleted` : "") + (result.filesUnchanged > 0 ? `, ${result.filesUnchanged} unchanged` : "") + (result.filesIgnored > 0 ? chalk2.dim(` (${result.filesIgnored} ignored)`) : "")
-    );
-    console.log(`  ${chalk2.bold("Size:")}  ${formatBytes(result.totalSize)}`);
-    console.log();
-    const rc = loadRc(dir);
-    saveRc(dir, updateRc(rc, siteName));
-  } catch (e) {
-    spinner.fail(e.message);
-    process.exit(1);
   }
 });
 program.command("login").description("Login with username and password").argument("[user]", "Username").argument("[password]", "Password").option("--token <token>", "Login directly with a JWT token").action(async (user, password, opts) => {
@@ -493,32 +528,7 @@ program.command("login").description("Login with username and password").argumen
     });
   }
   if (!password) {
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
-    process.stdout.write("Password: ");
-    const stdin = process.stdin;
-    const wasRaw = stdin.isRaw;
-    if (stdin.isTTY) stdin.setRawMode(true);
-    password = await new Promise((res) => {
-      let buf = "";
-      const onData = (ch) => {
-        const c = ch.toString();
-        if (c === "\n" || c === "\r" || c === "") {
-          if (stdin.isTTY) stdin.setRawMode(wasRaw ?? false);
-          stdin.removeListener("data", onData);
-          process.stdout.write("\n");
-          rl.close();
-          res(buf);
-        } else if (c === "") {
-          if (stdin.isTTY) stdin.setRawMode(wasRaw ?? false);
-          process.exit(1);
-        } else if (c === "\x7F" || c === "\b") {
-          buf = buf.slice(0, -1);
-        } else {
-          buf += c;
-        }
-      };
-      stdin.on("data", onData);
-    });
+    password = await readSecret("Password: ");
   }
   if (!user || !password) {
     console.error(chalk2.red("Username and password required"));
@@ -693,6 +703,94 @@ tokenCmd.command("revoke").description("Revoke a share token").argument("<site>"
     process.exit(1);
   }
 });
+function parseDeployArgs(paths) {
+  if (paths.length === 0) {
+    return { mode: "directory", dir: "." };
+  }
+  const first = resolve2(paths[0]);
+  if (existsSync4(first) && statSync2(first).isDirectory()) {
+    return { mode: "directory", dir: first, explicitName: paths[1] };
+  }
+  const files = [];
+  let explicitName;
+  for (const p of paths) {
+    const abs = resolve2(p);
+    if (existsSync4(abs) && statSync2(abs).isFile()) {
+      files.push(abs);
+    } else if (files.length > 0) {
+      explicitName = p;
+      break;
+    } else {
+      console.error(chalk2.red(`Not found: ${p}`));
+      process.exit(1);
+    }
+  }
+  if (files.length === 0) {
+    return { mode: "directory", dir: "." };
+  }
+  return { mode: "files", files, explicitName };
+}
+function sanitizeName(name) {
+  return name.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
+}
+async function promptLine(prompt) {
+  const { createInterface: createInterface2 } = await import("readline");
+  const rl = createInterface2({ input: process.stdin, output: process.stdout });
+  return new Promise((res) => {
+    rl.question(chalk2.bold(prompt), (a) => {
+      rl.close();
+      res(a.trim());
+    });
+  });
+}
+async function ensureSiteExists(spinner, siteName) {
+  spinner.text = "Checking site...";
+  try {
+    await api.getSite(siteName);
+  } catch {
+    spinner.text = `Creating site ${siteName}...`;
+    await api.createSite(siteName);
+  }
+}
+function printDeployResult(spinner, siteName, result) {
+  spinner.succeed("Deployed!");
+  console.log();
+  console.log(`  ${chalk2.bold("Site:")}  ${chalk2.cyan(siteName)}`);
+  console.log(`  ${chalk2.bold("URL:")}   ${chalk2.green(result.url)}`);
+  console.log(
+    `  ${chalk2.bold("Files:")} ${result.filesUploaded} uploaded` + (result.filesDeleted > 0 ? `, ${result.filesDeleted} deleted` : "") + (result.filesUnchanged > 0 ? `, ${result.filesUnchanged} unchanged` : "") + (result.filesIgnored > 0 ? chalk2.dim(` (${result.filesIgnored} ignored)`) : "")
+  );
+  console.log(`  ${chalk2.bold("Size:")}  ${formatBytes(result.totalSize)}`);
+  console.log();
+}
+function readSecret(prompt) {
+  return new Promise((resolve3) => {
+    process.stdout.write(prompt);
+    const stdin = process.stdin;
+    stdin.resume();
+    stdin.setRawMode(true);
+    stdin.setEncoding("utf8");
+    let buf = "";
+    const onData = (ch) => {
+      if (ch === "\n" || ch === "\r" || ch === "") {
+        stdin.setRawMode(false);
+        stdin.pause();
+        stdin.removeListener("data", onData);
+        process.stdout.write("\n");
+        resolve3(buf);
+      } else if (ch === "") {
+        stdin.setRawMode(false);
+        process.stdout.write("\n");
+        process.exit(1);
+      } else if (ch === "\x7F" || ch === "\b") {
+        buf = buf.slice(0, -1);
+      } else {
+        buf += ch;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
 function formatBytes(bytes) {
   if (bytes === 0) return "0 B";
   const units = ["B", "KB", "MB", "GB"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@within-7/jetr",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "CLI for Jetr static site hosting",
   "type": "module",
   "bin": {