@vocoder/cli 0.13.3 → 0.14.0

package/dist/bin.mjs

@@ -13,7 +13,7 @@ import {
   readAuthData,
   verifyStoredAuth,
   writeAuthData
-} from "./chunk-ZHRKJ2KZ.mjs";
+} from "./chunk-T4BLNDJ3.mjs";
 
 // src/bin.ts
 import { Command } from "commander";
@@ -1494,46 +1494,71 @@ async function runAuthFlow(api, options, reauth = false, repoCanonical) {
   let rawToken = null;
   let callbackOrganizationId;
   let callbackDiscoveryReady = false;
-  if (server) {
-    try {
-      const deadline = Math.min(expiresAt, Date.now() + 10 * 60 * 1e3);
-      const timeoutMs = deadline - Date.now();
-      const params = await Promise.race([
-        server.waitForCallback(),
-        new Promise(
-          (resolve2) => setTimeout(() => resolve2(null), timeoutMs)
-        )
-      ]);
-      if (params && typeof params.token === "string") {
-        rawToken = params.token;
-        if (typeof params.organizationId === "string" && params.organizationId) {
-          callbackOrganizationId = params.organizationId;
-        }
-        if (params.discovery_ready === "1") {
-          callbackDiscoveryReady = true;
+  const deadline = Math.min(expiresAt, Date.now() + 10 * 60 * 1e3);
+  let stopPolling = false;
+  const serverCallback = server ? server.waitForCallback().catch(() => null) : Promise.resolve(null);
+  const sessionPoll = (async () => {
+    while (!stopPolling && Date.now() < expiresAt) {
+      try {
+        const result = await api.pollCliAuthSession(session.sessionId);
+        if (result.status === "complete" || result.status === "failed") {
+          return result;
         }
+      } catch {
       }
-    } catch {
-    } finally {
-      server.close();
+      if (!stopPolling) await sleep(2e3);
     }
-  }
-  if (!rawToken) {
-    while (Date.now() < expiresAt) {
-      const result = await api.pollCliAuthSession(session.sessionId);
-      if (result.status === "complete") {
-        rawToken = result.token;
-        if (result.organizationId) {
-          callbackOrganizationId = result.organizationId;
+    return null;
+  })();
+  const winner = await new Promise((resolve2) => {
+    let done = false;
+    serverCallback.then((params) => {
+      if (done || params === null || typeof params.token !== "string") return;
+      done = true;
+      resolve2({ kind: "server", params });
+    }).catch(() => {
+    });
+    sessionPoll.then((result) => {
+      if (done || result === null) return;
+      if (result.status === "complete" || result.status === "failed") {
+        done = true;
+        resolve2({
+          kind: "poll",
+          result
+        });
+      }
+    }).catch(() => {
+    });
+    setTimeout(
+      () => {
+        if (!done) {
+          done = true;
+          resolve2(null);
         }
-        break;
+      },
+      Math.max(0, deadline - Date.now())
+    );
+  });
+  stopPolling = true;
+  server?.close();
+  if (winner !== null) {
+    if (winner.kind === "server") {
+      rawToken = winner.params.token;
+      if (typeof winner.params.organizationId === "string" && winner.params.organizationId) {
+        callbackOrganizationId = winner.params.organizationId;
       }
-      if (result.status === "failed") {
-        authSpinner.stop();
-        p5.log.error(result.reason);
-        return null;
+      if (winner.params.discovery_ready === "1") {
+        callbackDiscoveryReady = true;
       }
-      await sleep(2e3);
+    } else if (winner.result.status === "complete") {
+      rawToken = winner.result.token;
+      if (winner.result.organizationId) {
+        callbackOrganizationId = winner.result.organizationId;
+      }
+    } else {
+      authSpinner.stop();
+      p5.log.error(winner.result.reason);
+      return null;
     }
   }
   if (!rawToken) {