@within-7/jetr 0.7.3 → 0.7.5

package/dist/cli.js

@@ -63,8 +63,26 @@ async function request(path, options = {}) {
     Authorization: `Bearer ${getToken()}`,
     ...options.headers || {}
   };
-  const res = await fetch(url, { ...options, headers });
-  return res;
+  const MAX_RETRIES = 3;
+  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      return await fetch(url, { ...options, headers });
+    } catch (e) {
+      const isLast = attempt === MAX_RETRIES;
+      const code = e.cause?.code || e.code || "";
+      const retryable = ["ECONNRESET", "ETIMEDOUT", "ECONNREFUSED", "EAI_AGAIN", "UND_ERR_CONNECT_TIMEOUT"].includes(code) || e.message === "fetch failed";
+      if (retryable && !isLast) {
+        const delay = attempt * 2e3;
+        await new Promise((r) => setTimeout(r, delay));
+        continue;
+      }
+      if (e.message === "fetch failed") {
+        throw new Error(`Network error: cannot reach ${config.apiUrl} (check internet connection)`);
+      }
+      throw new Error(`Network error: ${e.message}${code ? ` [${code}]` : ""}`);
+    }
+  }
+  throw new Error("Unreachable");
 }
 async function json(path, options = {}) {
   const res = await request(path, options);
@@ -824,7 +842,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.3",
+  "version": "0.7.5",
   "description": "CLI for Jetr static site hosting",
   "type": "module",
   "bin": {