@within-7/jetr 0.6.0 → 0.7.1

package/dist/cli.js

@@ -478,48 +478,65 @@ program.argument("[paths...]", "Files or directory to deploy").action(async (pat
     process.exit(1);
   }
   const { mode, dir, files, explicitName } = parseDeployArgs(paths);
-  if (mode === "directory") {
-    const rcDir = dir;
-    let siteName = await resolveSiteName(rcDir, explicitName);
-    if (!siteName) {
-      siteName = generateName();
-      console.log(chalk2.dim(`Site name: ${siteName}`));
+  let rawName = mode === "directory" ? await resolveSiteName(dir, explicitName) : explicitName;
+  if (!rawName) {
+    rawName = generateName();
+    console.log(chalk2.dim(`Site name: ${rawName}`));
+  }
+  if (mode === "files") {
+    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;
+  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}`;
+        }
+      } catch (e) {
+        if (!e.message.includes("already in use")) throw e;
+      }
     }
-    siteName = sanitizeName(siteName);
-    if (!siteName) siteName = generateName();
-    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);
+    const result = mode === "directory" ? await deploy(siteName, dir, (msg) => {
+      spinner.text = msg;
+    }) : await deployFiles(siteName, files, (msg) => {
+      spinner.text = msg;
+    });
+    spinner.succeed("Deployed!");
+    console.log();
+    if (customHostname) {
+      console.log(`  ${chalk2.bold("Domain:")} ${chalk2.cyan(customHostname)}`);
+      console.log(`  ${chalk2.bold("Site:")}   ${chalk2.dim(siteName)}`);
+    } else {
+      console.log(`  ${chalk2.bold("Site:")}  ${chalk2.cyan(siteName)}`);
     }
-  } else {
-    console.log(chalk2.dim(`File mode: ${files.map((f) => basename2(f)).join(", ")}`));
-    let siteName = explicitName;
-    if (!siteName) {
-      siteName = generateName();
-      console.log(chalk2.dim(`Site name: ${siteName}`));
+    console.log(`  ${chalk2.bold("URL:")}   ${chalk2.green(customHostname ? `https://${customHostname}` : 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)}`);
+    if (customHostname) {
+      const isWithin7 = customHostname.endsWith(".within-7.com");
+      if (!isWithin7) {
+        console.log();
+        console.log(chalk2.yellow(`  DNS setup required:`));
+        console.log(`  ${customHostname}  CNAME  jetr-serve.lixilei.workers.dev`);
+      }
     }
-    siteName = sanitizeName(siteName);
-    if (!siteName) siteName = generateName();
-    const spinner = ora("").start();
-    try {
-      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);
+    console.log();
+    if (mode === "directory") {
+      const rc = loadRc(dir);
+      saveRc(dir, updateRc(rc, rawName));
     }
+  } 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) => {
@@ -714,44 +731,6 @@ tokenCmd.command("revoke").description("Revoke a share token").argument("<site>"
     process.exit(1);
   }
 });
-var domainCmd = program.command("domain").description("Manage custom domains");
-domainCmd.command("add").description("Add a custom domain to a site").argument("<site>", "Site name").argument("<hostname>", "Domain (e.g. docs.example.com)").action(async (site, hostname) => {
-  try {
-    const result = await api.addDomain(site, hostname);
-    console.log(chalk2.green(`\u2713 Domain added: ${result.hostname}`));
-    console.log();
-    console.log(`  Now set up DNS:`);
-    console.log(`  ${chalk2.cyan(result.hostname)}  CNAME  ${chalk2.dim(result.cname_target)}`);
-    console.log();
-  } catch (e) {
-    console.error(chalk2.red(e.message));
-    process.exit(1);
-  }
-});
-domainCmd.command("list").description("List custom domains for a site").argument("<site>", "Site name").action(async (site) => {
-  try {
-    const { domains } = await api.listDomains(site);
-    if (domains.length === 0) {
-      console.log(chalk2.dim("No custom domains. Run: jetr domain add <site> <hostname>"));
-      return;
-    }
-    for (const d of domains) {
-      console.log(`  ${chalk2.bold(d.hostname)}  ${chalk2.dim(`(id: ${d.id})`)}`);
-    }
-  } catch (e) {
-    console.error(chalk2.red(e.message));
-    process.exit(1);
-  }
-});
-domainCmd.command("remove").description("Remove a custom domain").argument("<site>", "Site name").argument("<id>", "Domain ID").action(async (site, id) => {
-  try {
-    await api.removeDomain(site, id);
-    console.log(chalk2.green(`\u2713 Domain removed`));
-  } catch (e) {
-    console.error(chalk2.red(e.message));
-    process.exit(1);
-  }
-});
 function parseDeployArgs(paths) {
   if (paths.length === 0) {
     return { mode: "directory", dir: "." };
@@ -821,17 +800,6 @@ async function ensureSiteExists(spinner, 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);

package/package.json

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