@within-7/jetr 0.2.0 → 0.3.1

package/dist/cli.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
 // src/cli.ts
+import { resolve as resolve2, basename } from "path";
+import { existsSync as existsSync4, statSync as statSync2 } from "fs";
 import { Command } from "commander";
-import chalk from "chalk";
+import chalk2 from "chalk";
 import ora from "ora";
 
 // src/config.ts
@@ -277,12 +279,19 @@ async function deploy(siteName, directory, onProgress) {
     `Upload: ${diff.upload.length}, Delete: ${diff.delete.length}, Unchanged: ${diff.unchanged.length}`
   );
   if (diff.upload.length > 0) {
-    for (let i = 0; i < diff.upload.length; i++) {
-      const fp = diff.upload[i];
+    const CONCURRENCY = 10;
+    let completed = 0;
+    const total = diff.upload.length;
+    const uploadOne = async (fp) => {
       const absPath = join3(absDir, fp);
       const content = readFileSync3(absPath);
-      onProgress?.(`Uploading (${i + 1}/${diff.upload.length}) ${fp}`);
       await api.uploadFile(siteName, fp, content, diff.deploy_id, manifest[fp].hash);
+      completed++;
+      onProgress?.(`Uploading (${completed}/${total}) ${fp}`);
+    };
+    for (let i = 0; i < total; i += CONCURRENCY) {
+      const batch = diff.upload.slice(i, i + CONCURRENCY);
+      await Promise.all(batch.map(uploadOne));
     }
   }
   onProgress?.("Finalizing...");
@@ -297,56 +306,197 @@ async function deploy(siteName, directory, onProgress) {
   };
 }
 
+// src/rc.ts
+import { existsSync as existsSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+import { createInterface } from "readline";
+import chalk from "chalk";
+var RC_FILE = ".jetrrc";
+function loadRc(dir) {
+  const rcPath = join4(dir, RC_FILE);
+  if (!existsSync3(rcPath)) return {};
+  try {
+    return JSON.parse(readFileSync4(rcPath, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function saveRc(dir, config) {
+  writeFileSync3(join4(dir, RC_FILE), JSON.stringify(config, null, 2) + "\n");
+}
+function updateRc(config, siteName) {
+  if (!config.directory) {
+    config.directory = { default: siteName, history: [siteName] };
+  } else {
+    config.directory.default = siteName;
+    if (!config.directory.history.includes(siteName)) {
+      config.directory.history.push(siteName);
+    }
+  }
+  return config;
+}
+async function resolveSiteName(dir, explicitName) {
+  if (explicitName) return explicitName;
+  const rc = loadRc(dir);
+  const saved = rc.directory;
+  if (!saved) return null;
+  const history = saved.history || [saved.default];
+  const options = [
+    saved.default,
+    ...history.filter((h) => h !== saved.default)
+  ];
+  if (options.length === 1) {
+    console.log(chalk.dim(`Using saved site: ${options[0]}`));
+    return options[0];
+  }
+  return promptSelection(options);
+}
+async function promptSelection(options) {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  console.log();
+  console.log(chalk.bold("Previous deployments:"));
+  for (let i = 0; i < options.length; i++) {
+    const marker = i === 0 ? chalk.green(" (default)") : "";
+    console.log(`  ${chalk.cyan(String(i + 1))}) ${options[i]}${marker}`);
+  }
+  console.log(
+    `  ${chalk.cyan(String(options.length + 1))}) ${chalk.dim("Enter new site name")}`
+  );
+  console.log();
+  return new Promise((resolve3) => {
+    rl.question(chalk.bold("Select [1]: "), (answer) => {
+      rl.close();
+      const num = parseInt(answer, 10);
+      if (!answer || isNaN(num) || num < 1 || num > options.length + 1) {
+        resolve3(options[0]);
+      } else if (num <= options.length) {
+        resolve3(options[num - 1]);
+      } else {
+        const rl2 = createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+        rl2.question(chalk.bold("Site name: "), (name) => {
+          rl2.close();
+          resolve3(name.trim());
+        });
+      }
+    });
+  });
+}
+
 // src/cli.ts
 var program = new Command();
-program.name("jetr").description("CLI for Jetr static site hosting").version("0.2.0");
+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);
+  }
+  const config = loadConfig();
+  if (!config.token) {
+    console.error(chalk2.red("Not logged in."));
+    console.error(`Run: ${chalk2.cyan("jetr login <token>")}`);
+    console.error(
+      chalk2.dim("Get your token from auth-gateway: POST /user/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...";
+    try {
+      await api.getSite(siteName);
+    } catch {
+      spinner.text = `Creating site ${siteName}...`;
+      await api.createSite(siteName);
+    }
+    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("Save JWT token for authentication").argument("<token>", "JWT token from auth-gateway login").option("--api-url <url>", "API base URL").action((token, opts) => {
   saveConfig({ token, ...opts.apiUrl ? { apiUrl: opts.apiUrl } : {} });
-  console.log(chalk.green("\u2713 Token saved to ~/.jetr/config.json"));
+  console.log(chalk2.green("\u2713 Token saved to ~/.jetr/config.json"));
 });
 program.command("whoami").description("Show current config").action(() => {
   const config = loadConfig();
-  console.log(`API:   ${config.apiUrl}`);
-  console.log(`Token: ${config.token ? config.token.slice(0, 20) + "..." : chalk.red("not set")}`);
+  console.log(
+    `API:   ${config.apiUrl}`
+  );
+  console.log(
+    `Token: ${config.token ? config.token.slice(0, 20) + "..." : chalk2.red("not set")}`
+  );
 });
-program.command("init").description("Create a .jetrignore file with default patterns").argument("[directory]", "Target directory", ".").action(async (directory) => {
-  const { resolve: resolve2 } = await import("path");
+program.command("init").description("Create .jetrignore with default patterns").argument("[directory]", "Target directory", ".").action(async (directory) => {
   const created = createJetrignore(resolve2(directory));
   if (created) {
-    console.log(chalk.green("\u2713 Created .jetrignore with default patterns"));
+    console.log(chalk2.green("\u2713 Created .jetrignore with default patterns"));
   } else {
-    console.log(chalk.yellow(".jetrignore already exists"));
+    console.log(chalk2.yellow(".jetrignore already exists"));
   }
 });
-program.command("create").description("Create a new site").argument("<name>", "Site name (becomes {name}.jetr.within-7.com)").option("-p, --password <password>", "Set access password").option("-e, --expires <seconds>", "Expire after N seconds", parseInt).action(async (name, opts) => {
+program.command("create").description("Create a new site").argument("<name>", "Site name").option("-p, --password <password>", "Set access password").option("-e, --expires <seconds>", "Expire after N seconds", parseInt).action(async (name, opts) => {
   const spinner = ora("Creating site...").start();
   try {
     const site = await api.createSite(name, {
       password: opts.password,
       expires_in: opts.expires
     });
-    spinner.succeed(`Created ${chalk.bold(site.name)}`);
-    console.log(`  URL: ${chalk.cyan(site.url)}`);
-    if (site.password_protected) console.log(`  Password: ${chalk.yellow("enabled")}`);
-    if (site.expires_at) console.log(`  Expires: ${new Date(site.expires_at * 1e3).toISOString()}`);
-  } catch (e) {
-    spinner.fail(e.message);
-    process.exit(1);
-  }
-});
-program.command("deploy").description("Deploy a directory to a site").argument("<name>", "Site name").argument("[directory]", "Directory to deploy", ".").action(async (name, directory) => {
-  const spinner = ora("").start();
-  try {
-    const result = await deploy(name, directory, (msg) => {
-      spinner.text = msg;
-    });
-    spinner.succeed("Deployed!");
-    console.log(`  URL:       ${chalk.cyan(result.url)}`);
-    console.log(`  Uploaded:  ${result.filesUploaded} files`);
-    if (result.filesDeleted > 0) console.log(`  Deleted:   ${result.filesDeleted} files`);
-    if (result.filesUnchanged > 0) console.log(`  Unchanged: ${result.filesUnchanged} files`);
-    if (result.filesIgnored > 0) console.log(`  Ignored:   ${chalk.dim(`${result.filesIgnored} files`)}`);
-    console.log(`  Size:      ${formatBytes(result.totalSize)}`);
+    spinner.succeed(`Created ${chalk2.bold(site.name)}`);
+    console.log(`  URL: ${chalk2.cyan(site.url)}`);
+    if (site.password_protected)
+      console.log(`  Password: ${chalk2.yellow("enabled")}`);
+    if (site.expires_at)
+      console.log(
+        `  Expires: ${new Date(site.expires_at * 1e3).toISOString()}`
+      );
   } catch (e) {
     spinner.fail(e.message);
     process.exit(1);
@@ -356,51 +506,63 @@ program.command("list").alias("ls").description("List your sites").action(async
   try {
     const { sites } = await api.listSites();
     if (sites.length === 0) {
-      console.log(chalk.dim("No sites yet. Create one: jetr create <name>"));
+      console.log(
+        chalk2.dim("No sites yet. Run: jetr <directory> to deploy")
+      );
       return;
     }
     for (const s of sites) {
-      const lock = s.password_protected ? chalk.yellow(" \u{1F512}") : "";
-      const expire = s.expires_at ? chalk.dim(` expires ${new Date(s.expires_at * 1e3).toLocaleDateString()}`) : "";
+      const lock = s.password_protected ? chalk2.yellow(" \u{1F512}") : "";
+      const expire = s.expires_at ? chalk2.dim(
+        ` expires ${new Date(s.expires_at * 1e3).toLocaleDateString()}`
+      ) : "";
       console.log(
-        `  ${chalk.bold(s.name)}${lock}${expire}  ${chalk.dim(formatBytes(s.total_size))}  ${chalk.cyan(s.url)}`
+        `  ${chalk2.bold(s.name)}${lock}${expire}  ${chalk2.dim(formatBytes(s.total_size))}  ${chalk2.cyan(s.url)}`
       );
     }
-    console.log(chalk.dim(`
+    console.log(chalk2.dim(`
   ${sites.length} site(s)`));
   } catch (e) {
-    console.error(chalk.red(e.message));
+    console.error(chalk2.red(e.message));
     process.exit(1);
   }
 });
 program.command("info").description("Show site details").argument("<name>", "Site name").action(async (name) => {
   try {
     const site = await api.getSite(name);
-    console.log(`${chalk.bold(site.name)}`);
-    console.log(`  URL:       ${chalk.cyan(site.url)}`);
-    console.log(`  Password:  ${site.password_protected ? chalk.yellow("yes") : "no"}`);
-    console.log(`  Expires:   ${site.expires_at ? new Date(site.expires_at * 1e3).toISOString() : "never"}`);
+    console.log(`${chalk2.bold(site.name)}`);
+    console.log(`  URL:       ${chalk2.cyan(site.url)}`);
+    console.log(
+      `  Password:  ${site.password_protected ? chalk2.yellow("yes") : "no"}`
+    );
+    console.log(
+      `  Expires:   ${site.expires_at ? new Date(site.expires_at * 1e3).toISOString() : "never"}`
+    );
     console.log(`  Files:     ${site.files.length}`);
-    console.log(`  Created:   ${new Date(site.created_at * 1e3).toISOString()}`);
-    console.log(`  Updated:   ${new Date(site.updated_at * 1e3).toISOString()}`);
+    console.log(
+      `  Created:   ${new Date(site.created_at * 1e3).toISOString()}`
+    );
+    console.log(
+      `  Updated:   ${new Date(site.updated_at * 1e3).toISOString()}`
+    );
     if (site.files.length > 0) {
       console.log(`
-  ${chalk.dim("Files:")}`);
+  ${chalk2.dim("Files:")}`);
       for (const f of site.files) {
-        console.log(`    ${f.path}  ${chalk.dim(formatBytes(f.size))}`);
+        console.log(`    ${f.path}  ${chalk2.dim(formatBytes(f.size))}`);
       }
     }
     if (site.tokens.length > 0) {
       console.log(`
-  ${chalk.dim("Tokens:")}`);
+  ${chalk2.dim("Tokens:")}`);
       for (const t of site.tokens) {
         const note = t.note ? ` (${t.note})` : "";
         const exp = t.expires_at ? ` expires ${new Date(t.expires_at * 1e3).toLocaleDateString()}` : "";
-        console.log(`    ${t.id}${note}${chalk.dim(exp)}`);
+        console.log(`    ${t.id}${note}${chalk2.dim(exp)}`);
       }
     }
   } catch (e) {
-    console.error(chalk.red(e.message));
+    console.error(chalk2.red(e.message));
     process.exit(1);
   }
 });
@@ -408,7 +570,7 @@ program.command("delete").alias("rm").description("Delete a site and all its fil
   const spinner = ora(`Deleting ${name}...`).start();
   try {
     await api.deleteSite(name);
-    spinner.succeed(`Deleted ${chalk.bold(name)}`);
+    spinner.succeed(`Deleted ${chalk2.bold(name)}`);
   } catch (e) {
     spinner.fail(e.message);
     process.exit(1);
@@ -418,38 +580,43 @@ program.command("password").description("Set or remove site password").argument(
   try {
     const site = await api.updateSite(name, { password: password ?? null });
     if (site.password_protected) {
-      console.log(chalk.green(`\u2713 Password set for ${chalk.bold(name)}`));
+      console.log(chalk2.green(`\u2713 Password set for ${chalk2.bold(name)}`));
     } else {
-      console.log(chalk.green(`\u2713 Password removed from ${chalk.bold(name)}`));
+      console.log(chalk2.green(`\u2713 Password removed from ${chalk2.bold(name)}`));
     }
   } catch (e) {
-    console.error(chalk.red(e.message));
+    console.error(chalk2.red(e.message));
     process.exit(1);
   }
 });
 var tokenCmd = program.command("token").description("Manage share tokens");
-tokenCmd.command("create").description("Create a share token").argument("<site>", "Site name").option("-n, --note <note>", "Token note").option("-e, --expires <seconds>", "Expire after N seconds", parseInt).action(async (site, opts) => {
-  try {
-    const token = await api.createToken(site, {
-      note: opts.note,
-      expires_in: opts.expires
-    });
-    console.log(chalk.green("\u2713 Token created"));
-    console.log(`  ID:    ${token.id}`);
-    console.log(`  URL:   ${chalk.cyan(token.url)}`);
-    if (token.note) console.log(`  Note:  ${token.note}`);
-    if (token.expires_at) console.log(`  Expires: ${new Date(token.expires_at * 1e3).toISOString()}`);
-  } catch (e) {
-    console.error(chalk.red(e.message));
-    process.exit(1);
+tokenCmd.command("create").description("Create a share token").argument("<site>", "Site name").option("-n, --note <note>", "Token note").option("-e, --expires <seconds>", "Expire after N seconds", parseInt).action(
+  async (site, opts) => {
+    try {
+      const token = await api.createToken(site, {
+        note: opts.note,
+        expires_in: opts.expires
+      });
+      console.log(chalk2.green("\u2713 Token created"));
+      console.log(`  ID:    ${token.id}`);
+      console.log(`  URL:   ${chalk2.cyan(token.url)}`);
+      if (token.note) console.log(`  Note:  ${token.note}`);
+      if (token.expires_at)
+        console.log(
+          `  Expires: ${new Date(token.expires_at * 1e3).toISOString()}`
+        );
+    } catch (e) {
+      console.error(chalk2.red(e.message));
+      process.exit(1);
+    }
   }
-});
+);
 tokenCmd.command("revoke").description("Revoke a share token").argument("<site>", "Site name").argument("<id>", "Token ID").action(async (site, id) => {
   try {
     await api.revokeToken(site, id);
-    console.log(chalk.green(`\u2713 Token ${id} revoked`));
+    console.log(chalk2.green(`\u2713 Token ${id} revoked`));
   } catch (e) {
-    console.error(chalk.red(e.message));
+    console.error(chalk2.red(e.message));
     process.exit(1);
   }
 });

package/package.json

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