wrangler 2.0.12 → 2.0.16

package/src/logger.ts

@@ -1,59 +1,66 @@
 import { format } from "node:util";
 import { formatMessagesSync } from "esbuild";
+import { getEnvironmentVariableFactory } from "./environment-variables";
 
 const LOGGER_LEVELS = {
-  error: 0,
-  warn: 1,
-  log: 2,
-  debug: 3,
+	error: 0,
+	warn: 1,
+	log: 2,
+	debug: 3,
 } as const;
 
 type LoggerLevel = keyof typeof LOGGER_LEVELS;
 
 /** A map from LOGGER_LEVEL to the error `kind` needed by `formatMessagesSync()`. */
 const LOGGER_LEVEL_FORMAT_TYPE_MAP = {
-  error: "error",
-  warn: "warning",
-  log: undefined,
-  debug: undefined,
+	error: "error",
+	warn: "warning",
+	log: undefined,
+	debug: undefined,
 } as const;
 
+const getLogLevelFromEnv = getEnvironmentVariableFactory({
+	variableName: "WRANGLER_LOG",
+	defaultValue: "log",
+});
+
 class Logger {
-  constructor(public loggerLevel: LoggerLevel = "log") {}
+	constructor() {}
 
-  columns = process.stdout.columns;
+	loggerLevel: LoggerLevel = (getLogLevelFromEnv() as LoggerLevel) ?? "log";
+	columns = process.stdout.columns;
 
-  debug = (...args: unknown[]) => this.doLog("debug", args);
-  log = (...args: unknown[]) => this.doLog("log", args);
-  warn = (...args: unknown[]) => this.doLog("warn", args);
-  error = (...args: unknown[]) => this.doLog("error", args);
+	debug = (...args: unknown[]) => this.doLog("debug", args);
+	log = (...args: unknown[]) => this.doLog("log", args);
+	warn = (...args: unknown[]) => this.doLog("warn", args);
+	error = (...args: unknown[]) => this.doLog("error", args);
 
-  private doLog(messageLevel: LoggerLevel, args: unknown[]) {
-    if (LOGGER_LEVELS[this.loggerLevel] >= LOGGER_LEVELS[messageLevel]) {
-      console[messageLevel](this.formatMessage(messageLevel, format(...args)));
-    }
-  }
+	private doLog(messageLevel: LoggerLevel, args: unknown[]) {
+		if (LOGGER_LEVELS[this.loggerLevel] >= LOGGER_LEVELS[messageLevel]) {
+			console[messageLevel](this.formatMessage(messageLevel, format(...args)));
+		}
+	}
 
-  private formatMessage(level: LoggerLevel, message: string): string {
-    const kind = LOGGER_LEVEL_FORMAT_TYPE_MAP[level];
-    if (kind) {
-      // Format the message using the esbuild formatter.
-      // The first line of the message is the main `text`,
-      // subsequent lines are put into the `notes`.
-      const [firstLine, ...otherLines] = message.split("\n");
-      const notes =
-        otherLines.length > 0
-          ? otherLines.map((text) => ({ text }))
-          : undefined;
-      return formatMessagesSync([{ text: firstLine, notes }], {
-        color: true,
-        kind,
-        terminalWidth: this.columns,
-      })[0];
-    } else {
-      return message;
-    }
-  }
+	private formatMessage(level: LoggerLevel, message: string): string {
+		const kind = LOGGER_LEVEL_FORMAT_TYPE_MAP[level];
+		if (kind) {
+			// Format the message using the esbuild formatter.
+			// The first line of the message is the main `text`,
+			// subsequent lines are put into the `notes`.
+			const [firstLine, ...otherLines] = message.split("\n");
+			const notes =
+				otherLines.length > 0
+					? otherLines.map((text) => ({ text }))
+					: undefined;
+			return formatMessagesSync([{ text: firstLine, notes }], {
+				color: true,
+				kind,
+				terminalWidth: this.columns,
+			})[0];
+		} else {
+			return message;
+		}
+	}
 }
 
 /**

package/src/miniflare-cli/enum-keys.ts

@@ -1,17 +1,17 @@
 export type EnumKeys<Enum> = Exclude<keyof Enum, number>;
 
 export const enumObject = <Enum extends Record<string, number | string>>(
-  e: Enum
+	e: Enum
 ) => {
-  const copy = { ...e } as { [K in EnumKeys<Enum>]: Enum[K] };
-  Object.values(e).forEach(
-    (value) => typeof value === "number" && delete copy[value]
-  );
-  return copy;
+	const copy = { ...e } as { [K in EnumKeys<Enum>]: Enum[K] };
+	Object.values(e).forEach(
+		(value) => typeof value === "number" && delete copy[value]
+	);
+	return copy;
 };
 
 export const enumKeys = <Enum extends Record<string, number | string>>(
-  e: Enum
+	e: Enum
 ) => {
-  return Object.keys(enumObject(e)) as EnumKeys<Enum>[];
+	return Object.keys(enumObject(e)) as EnumKeys<Enum>[];
 };

package/src/miniflare-cli/index.ts

@@ -4,38 +4,49 @@ import { hideBin } from "yargs/helpers";
 import { enumKeys } from "./enum-keys";
 import { getRequestContextCheckOptions } from "./request-context";
 
+// miniflare defines this but importing it throws:
+// Dynamic require of "path" is not supported
+class NoOpLog extends Log {
+	log(): void {}
+
+	error(message: Error): void {
+		throw message;
+	}
+}
+
 async function main() {
-  const args = await yargs(hideBin(process.argv))
-    .help(false)
-    .version(false)
-    .option("log", {
-      choices: enumKeys(LogLevel),
-    }).argv;
-
-  const logLevel = LogLevel[args.log ?? "INFO"];
-  const requestContextCheckOptions = await getRequestContextCheckOptions();
-  const config = {
-    ...JSON.parse((args._[0] as string) ?? "{}"),
-    ...requestContextCheckOptions,
-    log: new Log(logLevel),
-  };
-
-  if (logLevel > LogLevel.INFO) {
-    console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
-  }
-
-  const mf = new Miniflare(config);
-
-  try {
-    // Start Miniflare development server
-    await mf.startServer();
-    await mf.startScheduler();
-  } catch (e) {
-    mf.log.error(e as Error);
-    process.exitCode = 1;
-    // Unmount any mounted workers
-    await mf.dispose();
-  }
+	const args = await yargs(hideBin(process.argv))
+		.help(false)
+		.version(false)
+		.option("log", {
+			choices: enumKeys(LogLevel),
+		}).argv;
+
+	const logLevel = LogLevel[args.log ?? "INFO"];
+	const requestContextCheckOptions = await getRequestContextCheckOptions();
+	const config = {
+		...JSON.parse((args._[0] as string) ?? "{}"),
+		...requestContextCheckOptions,
+	};
+	//miniflare's logLevel 0 still logs routes, so lets override the logger
+	config.log = config.disableLogs ? new NoOpLog() : new Log(logLevel);
+
+	if (logLevel > LogLevel.INFO) {
+		console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
+	}
+
+	const mf = new Miniflare(config);
+
+	try {
+		// Start Miniflare development server
+		await mf.startServer();
+		await mf.startScheduler();
+	} catch (e) {
+		mf.log.error(e as Error);
+		process.exitCode = 1;
+		// Unmount any mounted workers
+		await mf.dispose();
+	}
 }
 
 await main();

package/src/miniflare-cli/request-context.ts

@@ -16,25 +16,25 @@ import type { MiniflareOptions } from "miniflare";
  * that indicate to miniflare whether to run the checks or not.
  */
 export const getRequestContextCheckOptions = async (): Promise<
-  Pick<MiniflareOptions, "globalAsyncIO" | "globalTimers" | "globalRandom">
+	Pick<MiniflareOptions, "globalAsyncIO" | "globalTimers" | "globalRandom">
 > => {
-  // check that there's an implementation of AsyncLocalStorage
-  let hasAsyncLocalStorage = true;
-  try {
-    // ripped from  the example here https://nodejs.org/api/async_context.html#class-asynclocalstorage
-    const { AsyncLocalStorage } = await import("node:async_hooks");
-    const storage = new AsyncLocalStorage<string>();
+	// check that there's an implementation of AsyncLocalStorage
+	let hasAsyncLocalStorage = true;
+	try {
+		// ripped from  the example here https://nodejs.org/api/async_context.html#class-asynclocalstorage
+		const { AsyncLocalStorage } = await import("node:async_hooks");
+		const storage = new AsyncLocalStorage<string>();
 
-    hasAsyncLocalStorage = storage.run("some-value", () => {
-      return storage.getStore() === "some-value";
-    });
-  } catch (e) {
-    hasAsyncLocalStorage = false;
-  }
+		hasAsyncLocalStorage = storage.run("some-value", () => {
+			return storage.getStore() === "some-value";
+		});
+	} catch (e) {
+		hasAsyncLocalStorage = false;
+	}
 
-  return {
-    globalAsyncIO: hasAsyncLocalStorage,
-    globalRandom: hasAsyncLocalStorage,
-    globalTimers: hasAsyncLocalStorage,
-  };
+	return {
+		globalAsyncIO: hasAsyncLocalStorage,
+		globalRandom: hasAsyncLocalStorage,
+		globalTimers: hasAsyncLocalStorage,
+	};
 };