@within-7/jetr 0.7.1 → 0.7.3

package/dist/cli.js

@@ -147,6 +147,10 @@ var api = {
   async listDomains(name) {
     return json(`/sites/${name}/domains`);
   },
+  async lookupDomain(hostname) {
+    const data = await json(`/domains/lookup?hostname=${encodeURIComponent(hostname)}`);
+    return data.site;
+  },
   async addDomain(name, hostname) {
     return json(`/sites/${name}/domains`, {
       method: "POST",
@@ -469,8 +473,22 @@ 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("[paths...]", "Files or directory to deploy").action(async (paths) => {
+program.name("jetr").description(`Deploy static sites instantly to {name}.jetr.within-7.com
+
+  Just run "jetr" in any directory to deploy. First time? Run "jetr login" first.
+
+  The name can be a simple name (gets .jetr.within-7.com subdomain) or a full
+  domain like docs.within-7.com or blog.example.com for custom domain hosting.
+
+  Examples:
+    $ jetr                              Deploy current directory (random name or from .jetrrc)
+    $ jetr ./dist                       Deploy the ./dist directory
+    $ jetr ./dist my-blog               Deploy as my-blog.jetr.within-7.com
+    $ jetr ./dist docs.within-7.com     Deploy to custom domain (auto-configures route)
+    $ jetr ./dist blog.example.com      Deploy to external domain (shows DNS setup)
+    $ jetr index.html                   Deploy a single file
+    $ jetr *.html *.css my-site         Deploy multiple files to a named site`).version("0.7.1");
+program.argument("[paths...]", "directory, file(s), and/or site name to deploy").action(async (paths) => {
   const config = loadConfig();
   if (!config.token) {
     console.error(chalk2.red("Not logged in."));
@@ -487,21 +505,32 @@ program.argument("[paths...]", "Files or directory to deploy").action(async (pat
     console.log(chalk2.dim(`File mode: ${files.map((f) => basename2(f)).join(", ")}`));
   }
   const isCustomDomain = rawName.includes(".");
-  const siteName = isCustomDomain ? sanitizeName(rawName.replace(/\./g, "-")) || generateName() : sanitizeName(rawName) || generateName();
   const customHostname = isCustomDomain ? rawName.toLowerCase().trim() : null;
+  let siteName;
   const spinner = ora("").start();
   try {
-    await ensureSiteExists(spinner, siteName);
     if (customHostname) {
-      spinner.text = `Binding domain ${customHostname}...`;
-      try {
-        const domainResult = await api.addDomain(siteName, customHostname);
-        if (domainResult.route_registered) {
-          spinner.text = `Route registered for ${customHostname}`;
+      spinner.text = `Resolving ${customHostname}...`;
+      const existingSite = await api.lookupDomain(customHostname);
+      if (existingSite) {
+        siteName = existingSite;
+      } else {
+        if (customHostname.endsWith(".within-7.com")) {
+          siteName = customHostname.split(".")[0];
+        } else {
+          siteName = sanitizeName(customHostname.replace(/\./g, "-")) || generateName();
+        }
+        await ensureSiteExists(spinner, siteName);
+        spinner.text = `Binding ${customHostname}...`;
+        try {
+          await api.addDomain(siteName, customHostname);
+        } catch (e) {
+          if (!e.message.includes("already in use")) throw e;
         }
-      } catch (e) {
-        if (!e.message.includes("already in use")) throw e;
       }
+    } else {
+      siteName = sanitizeName(rawName) || generateName();
+      await ensureSiteExists(spinner, siteName);
     }
     const result = mode === "directory" ? await deploy(siteName, dir, (msg) => {
       spinner.text = msg;
@@ -539,7 +568,7 @@ program.argument("[paths...]", "Files or directory to deploy").action(async (pat
     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) => {
+program.command("login").description("Authenticate with auth-gateway (interactive prompts if args omitted)").argument("[user]", "your username").argument("[password]", "your password (hidden input if omitted)").option("--token <token>", "skip login, use a JWT token directly (for CI/scripts)").action(async (user, password, opts) => {
   if (opts?.token) {
     saveConfig({ token: opts.token });
     console.log(chalk2.green("\u2713 Token saved"));
@@ -571,7 +600,7 @@ program.command("login").description("Login with username and password").argumen
     process.exit(1);
   }
 });
-program.command("whoami").description("Show current login status").action(() => {
+program.command("whoami").description("Show who is logged in").action(() => {
   const config = loadConfig();
   if (!config.token) {
     console.log(chalk2.red("Not logged in."));
@@ -581,11 +610,11 @@ program.command("whoami").description("Show current login status").action(() =>
   console.log(`User:  ${chalk2.bold(config.user || "unknown")}`);
   console.log(`Token: ${config.token.slice(0, 20)}...`);
 });
-program.command("logout").description("Clear saved login credentials").action(() => {
+program.command("logout").description("Clear saved credentials (~/.jetr/config.json)").action(() => {
   saveConfig({ user: void 0, token: void 0 });
   console.log(chalk2.green("\u2713 Logged out"));
 });
-program.command("init").description("Create .jetrignore with default patterns").argument("[directory]", "Target directory", ".").action(async (directory) => {
+program.command("init").description("Generate .jetrignore with sensible defaults (node_modules, .env, .git, etc)").argument("[directory]", "target directory", ".").action(async (directory) => {
   const created = createJetrignore(resolve2(directory));
   if (created) {
     console.log(chalk2.green("\u2713 Created .jetrignore with default patterns"));
@@ -593,7 +622,7 @@ program.command("init").description("Create .jetrignore with default patterns").
     console.log(chalk2.yellow(".jetrignore already exists"));
   }
 });
-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) => {
+program.command("create").description("Create an empty site without deploying files").argument("<name>", "site name (e.g. my-blog) or domain (e.g. docs.example.com)").option("-p, --password <password>", "require password to view the site").option("-e, --expires <seconds>", "auto-delete after N seconds (e.g. 86400 = 1 day)", parseInt).action(async (name, opts) => {
   const spinner = ora("Creating site...").start();
   try {
     const site = await api.createSite(name, {
@@ -613,7 +642,7 @@ program.command("create").description("Create a new site").argument("<name>", "S
     process.exit(1);
   }
 });
-program.command("list").alias("ls").description("List your sites").action(async () => {
+program.command("list").alias("ls").description("List all your deployed sites").action(async () => {
   try {
     const { sites } = await api.listSites();
     if (sites.length === 0) {
@@ -638,7 +667,7 @@ program.command("list").alias("ls").description("List your sites").action(async
     process.exit(1);
   }
 });
-program.command("info").description("Show site details").argument("<name>", "Site name").action(async (name) => {
+program.command("info").description("Show site details: files, tokens, config").argument("<name>", "site name").action(async (name) => {
   try {
     const site = await api.getSite(name);
     console.log(`${chalk2.bold(site.name)}`);
@@ -677,7 +706,7 @@ program.command("info").description("Show site details").argument("<name>", "Sit
     process.exit(1);
   }
 });
-program.command("delete").alias("rm").description("Delete a site and all its files").argument("<name>", "Site name").action(async (name) => {
+program.command("delete").alias("rm").description("Permanently delete a site, all its files, and custom domains").argument("<name>", "site name").action(async (name) => {
   const spinner = ora(`Deleting ${name}...`).start();
   try {
     await api.deleteSite(name);
@@ -687,7 +716,7 @@ program.command("delete").alias("rm").description("Delete a site and all its fil
     process.exit(1);
   }
 });
-program.command("password").description("Set or remove site password").argument("<name>", "Site name").argument("[password]", "New password (omit to remove)").action(async (name, password) => {
+program.command("password").description("Set a visitor password, or remove it (omit password to remove)").argument("<name>", "site name").argument("[password]", "new password (omit to make site public)").action(async (name, password) => {
   try {
     const site = await api.updateSite(name, { password: password ?? null });
     if (site.password_protected) {
@@ -700,8 +729,8 @@ program.command("password").description("Set or remove site password").argument(
     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(
+var tokenCmd = program.command("token").description("Generate or revoke share links for password-protected sites");
+tokenCmd.command("create").description("Generate a share URL that bypasses password (e.g. for QA team)").argument("<site>", "site name").option("-n, --note <note>", "label for this token (e.g. 'QA team')").option("-e, --expires <seconds>", "auto-expire after N seconds", parseInt).action(
   async (site, opts) => {
     try {
       const token = await api.createToken(site, {
@@ -722,7 +751,7 @@ tokenCmd.command("create").description("Create a share token").argument("<site>"
     }
   }
 );
-tokenCmd.command("revoke").description("Revoke a share token").argument("<site>", "Site name").argument("<id>", "Token ID").action(async (site, id) => {
+tokenCmd.command("revoke").description("Revoke a share link (get ID from `jetr info <site>`)").argument("<site>", "site name").argument("<id>", "token ID").action(async (site, id) => {
   try {
     await api.revokeToken(site, id);
     console.log(chalk2.green(`\u2713 Token ${id} revoked`));

package/package.json

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