wrangler 2.12.2 → 2.12.3

package/src/pages/upload.tsx

@@ -200,7 +200,7 @@ export const upload = async (
 	let attempts = 0;
 	const getMissingHashes = async (skipCaching: boolean): Promise<string[]> => {
 		if (skipCaching) {
-			console.debug("Force skipping cache");
+			logger.debug("Force skipping cache");
 			return files.map(({ hash }) => hash);
 		}
 
@@ -276,9 +276,7 @@ export const upload = async (
 	}
 
 	let counter = fileMap.size - sortedFiles.length;
-	const { rerender, unmount } = render(
-		<Progress done={counter} total={fileMap.size} />
-	);
+	const { rerender, unmount } = renderProgress(counter, fileMap.size);
 
 	const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
 
@@ -302,7 +300,7 @@ export const upload = async (
 			);
 
 			try {
-				console.debug("POST /pages/assets/upload");
+				logger.debug("POST /pages/assets/upload");
 				const res = await fetchResult(`/pages/assets/upload`, {
 					method: "POST",
 					headers: {
@@ -311,10 +309,10 @@ export const upload = async (
 					},
 					body: JSON.stringify(payload),
 				});
-				console.debug("result:", res);
+				logger.debug("result:", res);
 			} catch (e) {
 				if (attempts < MAX_UPLOAD_ATTEMPTS) {
-					console.debug("failed:", e, "retrying...");
+					logger.debug("failed:", e, "retrying...");
 					// Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
 					await new Promise((resolvePromise) =>
 						setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
@@ -326,7 +324,7 @@ export const upload = async (
 					}
 					return doUpload();
 				} else {
-					console.debug("failed:", e);
+					logger.debug("failed:", e);
 					throw e;
 				}
 			}
@@ -336,7 +334,7 @@ export const upload = async (
 			doUpload().then(
 				() => {
 					counter += bucket.files.length;
-					rerender(<Progress done={counter} total={fileMap.size} />);
+					rerender(counter, fileMap.size);
 				},
 				(error) => {
 					return Promise.reject(
@@ -437,6 +435,28 @@ function formatTime(duration: number) {
 	return `(${(duration / 1000).toFixed(2)} sec)`;
 }
 
+function renderProgress(done: number, total: number) {
+	if (isInteractive()) {
+		const { rerender, unmount } = render(
+			<Progress done={done} total={total} />
+		);
+		return {
+			// eslint-disable-next-line no-shadow
+			rerender(done: number, total: number) {
+				rerender(<Progress done={done} total={total} />);
+			},
+			unmount,
+		};
+	} else {
+		// eslint-disable-next-line no-shadow
+		const rerender = (done: number, total: number) => {
+			logger.log(`Uploading... (${done}/${total})`);
+		};
+		rerender(done, total);
+		return { rerender, unmount() {} };
+	}
+}
+
 function Progress({ done, total }: { done: number; total: number }) {
 	return (
 		<>

package/src/utils/render.ts

@@ -0,0 +1,93 @@
+import { EventEmitter } from "events";
+import { render as inkRender } from "ink";
+import type { ReactElement } from "react";
+import type { WriteStream } from "tty";
+
+export function renderToString(tree: ReactElement): string {
+	const { output, cleanup } = render(tree);
+	cleanup();
+	return output;
+}
+
+// The code below is mostly copied from ink-render-string.
+// See https://github.com/zhanwang626/ink-render-string.git.
+
+// MIT License
+
+// Copyright (c) 2021 Zhan Wang
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+interface Instance {
+	output: string;
+	unmount: () => void;
+	cleanup: () => void;
+	stdout: OutputStream;
+	stderr: OutputStream;
+	frames: string[];
+}
+
+const LASTFRAME_UNDEFINED = "value of stdout.lastframe() is undefined";
+
+export class OutputStream extends EventEmitter {
+	readonly frames: string[] = [];
+	private _lastFrame?: string;
+
+	get columns(): number {
+		return this._originalStream.columns;
+	}
+	get rows(): number {
+		return this._originalStream.rows;
+	}
+
+	constructor(private _originalStream: WriteStream) {
+		super();
+	}
+
+	write = (frame: string) => {
+		this.frames.push(frame);
+		this._lastFrame = frame;
+	};
+
+	lastFrame = () => {
+		return this._lastFrame;
+	};
+}
+
+export const render = (tree: ReactElement): Instance => {
+	const stdout = new OutputStream(process.stdout);
+	const stderr = new OutputStream(process.stderr);
+
+	const instance = inkRender(tree, {
+		stdout: stdout as unknown as WriteStream,
+		stderr: stderr as unknown as WriteStream,
+		debug: true,
+		exitOnCtrlC: false,
+		patchConsole: false,
+	});
+
+	return {
+		output: stdout.lastFrame() || LASTFRAME_UNDEFINED,
+		stdout,
+		stderr,
+		cleanup: instance.cleanup,
+		unmount: instance.unmount,
+		frames: stdout.frames,
+	};
+};

package/templates/d1-beta-facade.js

@@ -237,5 +237,8 @@ var shim_default = {
 	async trace(traces, env, ctx) {
 		return worker.trace(traces, getMaskedEnv(env), ctx);
 	},
+	async email(message, env, ctx) {
+		return worker.email(message, getMaskedEnv(env), ctx);
+	},
 };
 export { shim_default as default };