simplify

Andarist · Andarist · commit b14e1604a075 · 2026-02-22T23:55:12.000+01:00
diff --git a/packages/cli/src/commands/publish/npm-utils.ts b/packages/cli/src/commands/publish/npm-utils.ts
@@ -21,8 +21,12 @@ interface PublishOptions {
 const NPM_REQUEST_CONCURRENCY_LIMIT = 40;
 const NPM_PUBLISH_CONCURRENCY_LIMIT = 10;
 
-const npmRequestQueue = createPromiseQueue(NPM_REQUEST_CONCURRENCY_LIMIT);
-const npmPublishQueue = createPromiseQueue(NPM_PUBLISH_CONCURRENCY_LIMIT);
+export const npmRequestQueue = createPromiseQueue(
+  NPM_REQUEST_CONCURRENCY_LIMIT
+);
+export const npmPublishQueue = createPromiseQueue(
+  NPM_PUBLISH_CONCURRENCY_LIMIT
+);
 
 function jsonParse(input: string) {
   try {
@@ -204,7 +208,7 @@ async function internalPublish(
     [scope ? `npm_config_${scope}:registry` : "npm_config_registry"]: registry,
   };
 
-  if (await requiresDelegatedAuth(twoFactorState)) {
+  if (requiresDelegatedAuth(twoFactorState)) {
     const result =
       publishTool.name === "pnpm"
         ? spawnSync("pnpm", ["publish", ...publishFlags], {
@@ -271,9 +275,9 @@ async function internalPublish(
         process.stdin.isTTY
       ) {
         // the current otp code must be invalid since it errored
-        twoFactorState.token = null;
+        twoFactorState.token = undefined;
         // just in case this isn't already true
-        twoFactorState.isRequired = Promise.resolve(true);
+        twoFactorState.isRequired = true;
         twoFactorState.allowConcurrency = false;
         npmPublishQueue.setConcurrency(1);
         return {
@@ -303,10 +307,6 @@ export function publish(
   twoFactorState: TwoFactorState
 ): Promise<{ published: boolean }> {
   return npmRequestQueue.add(async () => {
-    if (await requiresDelegatedAuth(twoFactorState)) {
-      npmPublishQueue.setConcurrency(1);
-    }
-
     let result: { published: boolean; allowRetry?: boolean };
     do {
       result = await npmPublishQueue.add(() =>
diff --git a/packages/cli/src/commands/publish/publishPackages.ts b/packages/cli/src/commands/publish/publishPackages.ts
@@ -11,6 +11,7 @@ import {
   getTokenIsRequired,
   publish,
   infoAllow404,
+  npmPublishQueue,
 } from "./npm-utils";
 import { TwoFactorState } from "../../utils/types";
 
@@ -39,17 +40,17 @@ function getReleaseTag(pkgInfo: PkgInfo, preState?: PreState, tag?: string) {
   return "latest";
 }
 
-const getTwoFactorState = ({
+const getTwoFactorState = async ({
   otp,
   publicPackages,
 }: {
   otp?: string;
   publicPackages: Package[];
-}): TwoFactorState => {
+}): Promise<TwoFactorState> => {
   if (otp) {
     return {
       token: otp,
-      isRequired: Promise.resolve(true),
+      isRequired: true,
     };
   }
 
@@ -61,24 +62,23 @@ const getTwoFactorState = ({
     isCustomRegistry(process.env.npm_config_registry)
   ) {
     return {
-      token: null,
-      isRequired: Promise.resolve(false),
+      token: undefined,
+      isRequired: false,
     };
   }
 
   return {
-    token: null,
-    // note: we're not awaiting this here, we want this request to happen in parallel with getUnpublishedPackages
-    isRequired: getTokenIsRequired(),
+    token: undefined,
+    isRequired: await getTokenIsRequired(),
   };
 };
 
-export const requiresDelegatedAuth = async (twoFactorState: TwoFactorState) => {
+export const requiresDelegatedAuth = (twoFactorState: TwoFactorState) => {
   return (
     process.stdin.isTTY &&
     !twoFactorState.token &&
     !twoFactorState.allowConcurrency &&
-    (await twoFactorState.isRequired)
+    twoFactorState.isRequired
   );
 };
 
@@ -106,11 +106,15 @@ export default async function publishPackages({
     return [];
   }
 
-  const twoFactorState = getTwoFactorState({
+  const twoFactorState = await getTwoFactorState({
     otp,
     publicPackages,
   });
 
+  if (requiresDelegatedAuth(twoFactorState)) {
+    npmPublishQueue.setConcurrency(1);
+  }
+
   return Promise.all(
     unpublishedPackagesInfo.map((pkgInfo) => {
       let pkg = packagesByName.get(pkgInfo.name)!;
diff --git a/packages/cli/src/utils/types.ts b/packages/cli/src/utils/types.ts
@@ -1,5 +1,5 @@
 export type TwoFactorState = {
-  token: string | null;
-  isRequired: Promise<boolean>;
+  token: string | undefined;
+  isRequired: boolean;
   allowConcurrency?: boolean;
 };
