create-egregore 0.16.2 → 0.16.3

package/lib/auth.js

@@ -7,6 +7,7 @@ const https = require("node:https");
 
 const GITHUB_APP_CLIENT_ID = "Iv23li2obNsAjakoK2RE";   // GitHub App — founder flow (clean install screen)
 const OAUTH_APP_CLIENT_ID = "Ov23liYZjJbbbNgnJ9vH";    // OAuth App — join flow (repo:invite only)
+const SUPPORT_URL = "https://github.com/egregore-labs/egregore";
 
 function post(url, body) {
   return new Promise((resolve, reject) => {
@@ -45,6 +46,26 @@ function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 
+/**
+ * POST with retry + exponential backoff. Handles transient network errors
+ * (ECONNREFUSED, ECONNRESET, ETIMEDOUT) by retrying up to `retries` times
+ * with a 1s / 2s / 4s backoff. Throws the last error if all retries fail.
+ */
+async function postWithRetry(url, body, retries = 3) {
+  let lastErr;
+  for (let attempt = 0; attempt < retries; attempt++) {
+    try {
+      return await post(url, body);
+    } catch (err) {
+      lastErr = err;
+      if (attempt < retries - 1) {
+        await sleep(1000 * Math.pow(2, attempt));
+      }
+    }
+  }
+  throw lastErr;
+}
+
 function openBrowser(url) {
   const { execFile } = require("node:child_process");
   if (process.platform === "darwin") {
@@ -81,14 +102,27 @@ async function deviceFlow(ui, opts = {}) {
   const clientId = isJoin ? OAUTH_APP_CLIENT_ID : GITHUB_APP_CLIENT_ID;
   const scope = isJoin ? "repo:invite" : "";
 
-  // 1. Request device code
-  const codeResp = await post("https://github.com/login/device/code", {
-    client_id: clientId,
-    scope,
-  });
+  // 1. Request device code (with retry — handles transient network hiccups
+  //    and GitHub edge server blips that caused ECONNREFUSED in the field)
+  let codeResp;
+  try {
+    codeResp = await postWithRetry("https://github.com/login/device/code", {
+      client_id: clientId,
+      scope,
+    });
+  } catch (err) {
+    throw new Error(
+      `Could not reach GitHub after 3 attempts: ${err.message}\n` +
+      `Check your internet connection and try again.\n` +
+      `If this keeps happening, report it at ${SUPPORT_URL}/issues`
+    );
+  }
 
   if (!codeResp.device_code) {
-    throw new Error("Failed to start GitHub device flow");
+    throw new Error(
+      `GitHub device flow did not return a code.\n` +
+      `This is unusual — please report at ${SUPPORT_URL}/issues`
+    );
   }
 
   const { device_code, user_code, verification_uri, interval: pollInterval } = codeResp;
@@ -109,19 +143,40 @@ async function deviceFlow(ui, opts = {}) {
   ui.info("");
   openBrowser(verifyUrl);
 
-  // 3. Poll for token
+  // 3. Poll for token. Transient network errors (one bad packet, WiFi blip,
+  //    GitHub edge restart) must NOT kill the whole flow — the user might
+  //    be mid-authorize on the browser side. Catch per-poll errors and
+  //    continue; the outer 5-minute timeout handles genuinely broken networks.
   let interval = (pollInterval || 5) * 1000;
   const timeout = 300000; // 5 minutes
   const start = Date.now();
+  let consecutiveNetworkErrors = 0;
+  let networkWarningShown = false;
 
   while (Date.now() - start < timeout) {
     await sleep(interval);
 
-    const tokenResp = await post("https://github.com/login/oauth/access_token", {
-      client_id: clientId,
-      device_code,
-      grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-    });
+    let tokenResp;
+    try {
+      tokenResp = await post("https://github.com/login/oauth/access_token", {
+        client_id: clientId,
+        device_code,
+        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+      });
+      consecutiveNetworkErrors = 0;
+    } catch (err) {
+      consecutiveNetworkErrors++;
+      // After 3 consecutive failures, surface a note so the user knows
+      // something is off — but keep polling until the outer timeout.
+      if (consecutiveNetworkErrors >= 3 && !networkWarningShown) {
+        ui.warn(
+          `Network trouble reaching GitHub (${err.message}). Still trying.\n` +
+          `If this persists, report at ${SUPPORT_URL}/issues`
+        );
+        networkWarningShown = true;
+      }
+      continue;
+    }
 
     if (tokenResp.access_token) {
       return tokenResp.access_token;
@@ -135,10 +190,17 @@ async function deviceFlow(ui, opts = {}) {
       continue;
     }
 
-    throw new Error(tokenResp.error_description || tokenResp.error || "Auth failed");
+    throw new Error(
+      `${tokenResp.error_description || tokenResp.error || "Auth failed"}\n` +
+      `If you need help, see ${SUPPORT_URL}`
+    );
   }
 
-  throw new Error("Timed out waiting for authorization (5 minutes)");
+  throw new Error(
+    `Timed out waiting for authorization (5 minutes).\n` +
+    `If the browser tab didn't open, visit the verification URL manually and enter your code.\n` +
+    `If this keeps happening, report at ${SUPPORT_URL}/issues`
+  );
 }
 
 module.exports = { deviceFlow, openBrowser };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "description": "Set up Egregore for your team in one command",
   "license": "MIT",
   "bin": {