@bragduck/cli 2.29.2 → 2.30.2

package/dist/index.js

@@ -9,11 +9,11 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_tsx@4.21.0_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var init_esm_shims = __esm({
-  "node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.6_tsx@4.21.0_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -46,7 +46,7 @@ var init_constants = __esm({
       TIMEOUT_MS: 12e4,
       // 2 minutes
       MIN_PORT: 8e3,
-      MAX_PORT: 9e3
+      MAX_PORT: 8004
     };
     API_ENDPOINTS = {
       AUTH: {
@@ -729,92 +729,95 @@ async function findAvailablePort() {
 async function startOAuthCallbackServer(expectedState) {
   const port = await findAvailablePort();
   const timeout = OAUTH_CONFIG.TIMEOUT_MS;
-  return new Promise((resolve, reject) => {
+  const callbackUrl = `http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`;
+  return new Promise((resolveHandle, rejectHandle) => {
     let server = null;
     let timeoutId = null;
-    const cleanup = () => {
-      if (timeoutId) {
-        globalThis.clearTimeout(timeoutId);
-      }
-      if (server) {
-        if (typeof server.closeAllConnections === "function") {
-          server.closeAllConnections();
-        }
-        server.close(() => {
-          logger.debug("OAuth server closed");
-        });
-        server.unref();
-      }
-    };
-    const handleRequest = (req, res) => {
-      const parsedUrl = parse(req.url || "", true);
-      logger.debug(`OAuth callback received: ${req.url}`);
-      if (parsedUrl.pathname === OAUTH_CONFIG.CALLBACK_PATH) {
-        const { code, state, error, error_description } = parsedUrl.query;
-        if (error) {
-          const errorMsg = error_description || error;
-          logger.debug(`OAuth error: ${errorMsg}`);
-          res.writeHead(400, { "Content-Type": "text/html" });
-          res.end(ERROR_HTML(String(errorMsg)));
-          cleanup();
-          reject(new OAuthError(`OAuth error: ${errorMsg}`));
-          return;
+    const resultPromise = new Promise((resolveResult, rejectResult) => {
+      const cleanup = () => {
+        if (timeoutId) {
+          globalThis.clearTimeout(timeoutId);
         }
-        if (!code || !state) {
-          const errorMsg = "Missing code or state parameter";
-          logger.debug(errorMsg);
-          res.writeHead(400, { "Content-Type": "text/html" });
-          res.end(ERROR_HTML(errorMsg));
-          cleanup();
-          reject(new OAuthError(errorMsg));
-          return;
+        if (server) {
+          if (typeof server.closeAllConnections === "function") {
+            server.closeAllConnections();
+          }
+          server.close(() => {
+            logger.debug("OAuth server closed");
+          });
+          server.unref();
         }
-        if (state !== expectedState) {
-          const errorMsg = "Invalid state parameter (possible CSRF attack)";
-          logger.debug(errorMsg);
-          res.writeHead(400, { "Content-Type": "text/html" });
-          res.end(ERROR_HTML(errorMsg));
-          cleanup();
-          reject(new OAuthError(errorMsg));
+      };
+      const handleRequest = (req, res) => {
+        const parsedUrl = parse(req.url || "", true);
+        logger.debug(`OAuth callback received: ${req.url}`);
+        if (parsedUrl.pathname === OAUTH_CONFIG.CALLBACK_PATH) {
+          const { code, state, error, error_description } = parsedUrl.query;
+          if (error) {
+            const errorMsg = error_description || error;
+            logger.debug(`OAuth error: ${errorMsg}`);
+            res.writeHead(400, { "Content-Type": "text/html" });
+            res.end(ERROR_HTML(String(errorMsg)));
+            cleanup();
+            rejectResult(new OAuthError(`OAuth error: ${errorMsg}`));
+            return;
+          }
+          if (!code || !state) {
+            const errorMsg = "Missing code or state parameter";
+            logger.debug(errorMsg);
+            res.writeHead(400, { "Content-Type": "text/html" });
+            res.end(ERROR_HTML(errorMsg));
+            cleanup();
+            rejectResult(new OAuthError(errorMsg));
+            return;
+          }
+          if (state !== expectedState) {
+            const errorMsg = "Invalid state parameter (possible CSRF attack)";
+            logger.debug(errorMsg);
+            res.writeHead(400, { "Content-Type": "text/html" });
+            res.end(ERROR_HTML(errorMsg));
+            cleanup();
+            rejectResult(new OAuthError(errorMsg));
+            return;
+          }
+          res.writeHead(200, { "Content-Type": "text/html" });
+          res.end(SUCCESS_HTML);
+          globalThis.setTimeout(() => {
+            cleanup();
+            resolveResult({
+              code: String(code),
+              state: String(state),
+              port
+            });
+          }, 100);
           return;
         }
-        res.writeHead(200, { "Content-Type": "text/html" });
-        res.end(SUCCESS_HTML);
-        globalThis.setTimeout(() => {
-          cleanup();
-          resolve({
-            code: String(code),
-            state: String(state),
-            port
-          });
-        }, 100);
-        return;
-      }
-      res.writeHead(404, { "Content-Type": "text/plain" });
-      res.end("Not Found");
-    };
-    server = createServer(handleRequest);
-    server.on("error", (error) => {
-      logger.debug(`OAuth server error: ${error.message}`);
-      cleanup();
-      reject(new OAuthError(`OAuth server error: ${error.message}`));
-    });
-    server.listen(port, "127.0.0.1", () => {
-      logger.debug(
-        `OAuth callback server listening on http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`
-      );
+        res.writeHead(404, { "Content-Type": "text/plain" });
+        res.end("Not Found");
+      };
+      server = createServer(handleRequest);
+      server.on("error", (error) => {
+        logger.debug(`OAuth server error: ${error.message}`);
+        cleanup();
+        rejectResult(new OAuthError(`OAuth server error: ${error.message}`));
+        rejectHandle(new OAuthError(`OAuth server error: ${error.message}`));
+      });
+      server.listen(port, "127.0.0.1", () => {
+        logger.debug(
+          `OAuth callback server listening on http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`
+        );
+        resolveHandle({ callbackUrl, resultPromise });
+      });
+      timeoutId = globalThis.setTimeout(() => {
+        logger.debug("OAuth callback timeout");
+        cleanup();
+        rejectResult(
+          new OAuthError("Authentication timeout - no callback received within 2 minutes")
+        );
+      }, timeout);
     });
-    timeoutId = globalThis.setTimeout(() => {
-      logger.debug("OAuth callback timeout");
-      cleanup();
-      reject(new OAuthError("Authentication timeout - no callback received within 2 minutes"));
-    }, timeout);
   });
 }
-async function getCallbackUrl() {
-  const port = await findAvailablePort();
-  return `http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`;
-}
 var SUCCESS_HTML, ERROR_HTML;
 var init_oauth_server = __esm({
   "src/utils/oauth-server.ts"() {
@@ -1077,7 +1080,7 @@ var init_auth_service = __esm({
       async login() {
         logger.debug("Starting OAuth login flow");
         const state = this.generateState();
-        const callbackUrl = await getCallbackUrl();
+        const { callbackUrl, resultPromise } = await startOAuthCallbackServer(state);
         storageService.setOAuthState({
           state,
           createdAt: Date.now()
@@ -1086,7 +1089,6 @@ var init_auth_service = __esm({
         logger.debug(`Callback URL: ${callbackUrl}`);
         const authUrl = await this.buildAuthUrl(state, callbackUrl);
         logger.debug(`Authorization URL: ${authUrl}`);
-        const serverPromise = startOAuthCallbackServer(state);
         try {
           await openBrowser(authUrl);
         } catch {
@@ -1096,7 +1098,7 @@ var init_auth_service = __esm({
         }
         let callbackResult;
         try {
-          callbackResult = await serverPromise;
+          callbackResult = await resultPromise;
         } catch (error) {
           storageService.deleteOAuthState();
           throw error;