@within-7/jetr 0.7.2 → 0.7.4

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",
@@ -501,21 +505,32 @@ program.argument("[paths...]", "directory, file(s), and/or site name to deploy")
     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;
@@ -809,7 +824,11 @@ async function ensureSiteExists(spinner, siteName) {
   spinner.text = "Checking site...";
   try {
     await api.getSite(siteName);
-  } catch {
+  } catch (e) {
+    const msg = e.message || "";
+    if (msg.includes("Forbidden")) {
+      throw new Error(`Site "${siteName}" belongs to another user`);
+    }
     spinner.text = `Creating site ${siteName}...`;
     await api.createSite(siteName);
   }

package/package.json

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