wrangler 2.2.1 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.2.1",
+	"version": "2.2.2",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/deployments.test.ts

@@ -66,7 +66,7 @@ describe("deployments", () => {
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
 		Source: Wrangler
-		🟩Active"
+		🟩 Active"
 	`);
 	});
 
@@ -85,7 +85,7 @@ describe("deployments", () => {
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
 		Source: Wrangler
-		🟩Active"
+		🟩 Active"
 	`);
 	});
 });

package/src/__tests__/publish.test.ts

@@ -7607,7 +7607,7 @@ function mockGetQueueMissing(expectedQueueName: string) {
 		`/accounts/:accountId/workers/queues/${expectedQueueName}`,
 		"GET",
 		([_url, _accountId]) => {
-			throw { code: 100123 };
+			throw { code: 11000 };
 		}
 	);
 	return requests;

package/src/__tests__/r2.test.ts

@@ -1,5 +1,7 @@
 import * as fs from "node:fs";
 import { rest } from "msw";
+import prettyBytes from "pretty-bytes";
+import { MAX_UPLOAD_SIZE } from "../r2/constants";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { msw, mswSuccessR2handlers } from "./helpers/msw";
@@ -276,7 +278,7 @@ describe("r2", () => {
 		`);
 		});
 
-		it("should upload R2 object from bucket", async () => {
+		it("should upload R2 object to bucket", async () => {
 			fs.writeFileSync("wormhole-img.png", "passageway");
 			await runWrangler(
 				`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
@@ -288,6 +290,21 @@ describe("r2", () => {
 		`);
 		});
 
+		it("should fail to upload R2 object to bucket if too large", async () => {
+			const TOO_BIG_FILE_SIZE = MAX_UPLOAD_SIZE + 1024 * 1024;
+			fs.writeFileSync("wormhole-img.png", Buffer.alloc(TOO_BIG_FILE_SIZE));
+			await expect(
+				runWrangler(
+					`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
+				)
+			).rejects.toThrowErrorMatchingInlineSnapshot(`
+			"Error: Wrangler only supports uploading files up to ${prettyBytes(
+				MAX_UPLOAD_SIZE
+			)} in size
+			wormhole-img.png is ${prettyBytes(TOO_BIG_FILE_SIZE)} in size"
+		`);
+		});
+
 		it("should pass all fetch option flags into requestInit & check request inputs", async () => {
 			msw.use(
 				rest.put(

package/src/__tests__/type-generation.test.ts

@@ -100,8 +100,8 @@ describe("generateTypes()", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 		"interface Env {
 			TEST_KV_NAMESPACE: KVNamespace;
-			SOMETHING: asdasdfasdf;
-			ANOTHER: thing;
+			SOMETHING: \\"asdasdfasdf\\";
+			ANOTHER: \\"thing\\";
 			OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
 			DURABLE_TEST1: DurableObjectNamespace;
 			DURABLE_TEST2: DurableObjectNamespace;

package/src/deployments.ts

@@ -52,7 +52,7 @@ Author: ${versions.metadata.author_email}
 Source: ${sourceStr(versions.metadata.source)}\n`
 	);
 
-	versionMessages[0] += "🟩Active";
+	versionMessages[0] += "🟩 Active";
 	logger.log(...versionMessages.reverse());
 }
 

package/src/publish/publish.ts

@@ -997,7 +997,7 @@ async function ensureQueuesExist(config: Config) {
 			await getQueue(config, queue);
 		} catch (err) {
 			const queueErr = err as FetchError;
-			if (queueErr.code === 100123) {
+			if (queueErr.code === 11000) {
 				// queue_not_found
 				throw new Error(
 					`Queue "${queue}" does not exist. To create it, run: wrangler queues create ${queue}`

package/src/r2/constants.ts

@@ -0,0 +1,4 @@
+/**
+ * The maximum file size we can upload using the V4 API.
+ */
+export const MAX_UPLOAD_SIZE = 300 * 1024 * 1024;

package/src/r2/index.ts

@@ -1,11 +1,14 @@
 import * as fs from "node:fs";
 import * as stream from "node:stream";
 
+import prettyBytes from "pretty-bytes";
 import { readConfig } from "../config";
+import { FatalError } from "../errors";
 import { CommandLineArgsError, printWranglerBanner } from "../index";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { requireAuth } from "../user";
+import { MAX_UPLOAD_SIZE } from "./constants";
 import {
 	bucketAndKeyFromObjectPath,
 	createR2Bucket,
@@ -176,6 +179,15 @@ export const r2: BuilderCallback<unknown, unknown> = (r2Yargs) => {
 							objectSize = object.byteLength;
 						}
 
+						if (objectSize > MAX_UPLOAD_SIZE) {
+							throw new FatalError(
+								`Error: Wrangler only supports uploading files up to ${prettyBytes(
+									MAX_UPLOAD_SIZE
+								)} in size\n${key} is ${prettyBytes(objectSize)} in size`,
+								1
+							);
+						}
+
 						logger.log(`Creating object "${key}" in bucket "${bucket}".`);
 						await putR2Object(accountId, bucket, key, object, {
 							...options,

package/src/type-generation.ts

@@ -30,7 +30,7 @@ export async function generateTypes(
 				typeof varValue === "number" ||
 				typeof varValue === "boolean"
 			) {
-				envTypeStructure.push(`	${varName}: ${varValue};`);
+				envTypeStructure.push(`	${varName}: "${varValue}";`);
 			}
 			if (typeof varValue === "object" && varValue !== null) {
 				envTypeStructure.push(`	${varName}: ${JSON.stringify(varValue)};`);

package/wrangler-dist/cli.js

@@ -141159,7 +141159,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.2.1";
+var version = "2.2.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -154154,7 +154154,7 @@ Author: ${versions.metadata.author_email}
 Source: ${sourceStr(versions.metadata.source)}
 `
   );
-  versionMessages[0] += "\u{1F7E9}Active";
+  versionMessages[0] += "\u{1F7E9} Active";
   logger.log(...versionMessages.reverse());
 }
 function sourceStr(source) {
@@ -159879,7 +159879,7 @@ async function ensureQueuesExist(config) {
       await getQueue(config, queue);
     } catch (err2) {
       const queueErr = err2;
-      if (queueErr.code === 100123) {
+      if (queueErr.code === 11e3) {
         throw new Error(
           `Queue "${queue}" does not exist. To create it, run: wrangler queues create ${queue}`
         );
@@ -160881,6 +160881,10 @@ init_import_meta_url();
 var fs13 = __toESM(require("node:fs"));
 var stream = __toESM(require("node:stream"));
 
+// src/r2/constants.ts
+init_import_meta_url();
+var MAX_UPLOAD_SIZE = 300 * 1024 * 1024;
+
 // src/r2/helpers.ts
 init_import_meta_url();
 var import_node_stream = require("node:stream");
@@ -161084,6 +161088,15 @@ var r2 = (r2Yargs) => {
           });
           objectSize = object.byteLength;
         }
+        if (objectSize > MAX_UPLOAD_SIZE) {
+          throw new FatalError(
+            `Error: Wrangler only supports uploading files up to ${prettyBytes(
+              MAX_UPLOAD_SIZE
+            )} in size
+${key2} is ${prettyBytes(objectSize)} in size`,
+            1
+          );
+        }
         logger.log(`Creating object "${key2}" in bucket "${bucket}".`);
         await putR2Object(accountId, bucket, key2, object, {
           ...options6,
@@ -161786,7 +161799,7 @@ async function generateTypes(configToDTS, config) {
     for (const varName in configToDTS.vars) {
       const varValue = configToDTS.vars[varName];
       if (typeof varValue === "string" || typeof varValue === "number" || typeof varValue === "boolean") {
-        envTypeStructure.push(`	${varName}: ${varValue};`);
+        envTypeStructure.push(`	${varName}: "${varValue}";`);
       }
       if (typeof varValue === "object" && varValue !== null) {
         envTypeStructure.push(`	${varName}: ${JSON.stringify(varValue)};`);