use isInteractive() instead of !isNonIteractiveOrCI()

cloudflare · Jul 2, 2024 · 4b4d56a · 4b4d56a
1 parent 9b7e52f
commit 4b4d56a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/packages/wrangler/src/cli-hotkeys.ts b/packages/wrangler/src/cli-hotkeys.ts
@@ -1,6 +1,7 @@
 import readline from "readline";
 import { Log } from "miniflare";
 import { unwrapHook } from "./api/startDevWorker/utils";
+import isInteractive from "./is-interactive";
 import { Logger, logger } from "./logger";
 import { onKeyPress } from "./utils/onKeyPress";
 import type { Hook } from "./api";
@@ -13,6 +14,10 @@ export default function (
 		handler: () => void | Promise<void>;
 	}>
 ) {
+	if (!isInteractive()) {
+		return;
+	}
+
 	/**
 	 * Formats all options, comma-separated, prefixed by the first key in square brackets.
 	 *
@@ -87,7 +92,7 @@ export default function (
 	printInstructions();
 
 	return () => {
-		unregisterKeyPress();
+		unregisterKeyPress?.();
 		clearPreviousInstructions();
 		Logger.registerBeforeLogHook(undefined);
 		Logger.registerAfterLogHook(undefined);

diff --git a/packages/wrangler/src/dev.tsx b/packages/wrangler/src/dev.tsx
@@ -22,7 +22,6 @@ import { maybeRegisterLocalWorker } from "./dev/local";
 import { startDevServer } from "./dev/start-server";
 import { UserError } from "./errors";
 import { run } from "./experimental-flags";
-import { isNonInteractiveOrCI } from "./is-interactive";
 import { logger } from "./logger";
 import * as metrics from "./metrics";
 import { getAssetPaths, getSiteAssetPaths } from "./sites";
@@ -584,8 +583,8 @@ export async function startDev(args: StartDevOptions) {
 				});
 			}
 
-			let unregisterHotKeys: () => void;
-			if (!isNonInteractiveOrCI() && args.showInteractiveDevSession !== false) {
+			let unregisterHotKeys: (() => void) | undefined = undefined;
+			if (args.showInteractiveDevSession !== false) {
 				unregisterHotKeys = registerDevHotKeys(devEnv, args);
 			}
 

diff --git a/packages/wrangler/src/dev/hotkeys.ts b/packages/wrangler/src/dev/hotkeys.ts
@@ -55,7 +55,7 @@ export default function registerDevHotKeys(
 			keys: ["x", "q", "ctrl+c"],
 			label: "to exit",
 			handler: async () => {
-				unregisterHotKeys();
+				unregisterHotKeys?.();
 				await devEnv.teardown();
 			},
 		},

diff --git a/packages/wrangler/src/utils/onKeyPress.ts b/packages/wrangler/src/utils/onKeyPress.ts
@@ -1,6 +1,6 @@
 import readline from "readline";
 import { PassThrough } from "stream";
-import { isNonInteractiveOrCI } from "../is-interactive";
+import isInteractive from "../is-interactive";
 
 export type KeypressEvent = {
 	name: string;
@@ -11,6 +11,10 @@ export type KeypressEvent = {
 };
 
 export function onKeyPress(callback: (key: KeypressEvent) => void) {
+	if (!isInteractive()) {
+		return;
+	}
+
 	// Listening for events on process.stdin (eg .on('keypress')) causes it to go into 'old mode'
 	// which keeps this nodejs process alive even after calling .off('keypress')
 	// WORKAROUND: piping stdin via a transform stream allows us to call stream.destroy()
@@ -19,10 +23,8 @@ export function onKeyPress(callback: (key: KeypressEvent) => void) {
 	const stream = new PassThrough();
 	process.stdin.pipe(stream);
 
-	if (!isNonInteractiveOrCI()) {
-		readline.emitKeypressEvents(stream);
-		process.stdin.setRawMode(true);
-	}
+	readline.emitKeypressEvents(stream);
+	process.stdin.setRawMode(true);
 
 	const handler = async (_char: string, key: KeypressEvent) => {
 		if (key) {
@@ -33,9 +35,7 @@ export function onKeyPress(callback: (key: KeypressEvent) => void) {
 	stream.on("keypress", handler);
 
 	return () => {
-		if (!isNonInteractiveOrCI()) {
-			process.stdin.setRawMode(false);
-		}
+		process.stdin.setRawMode(false);
 		stream.off("keypress", handler);
 		stream.destroy();
 	};