wrangler 2.15.1 → 2.16.0

package/miniflare-dist/index.mjs

@@ -179,6 +179,9 @@ function mergeHeaders(base, extra) {
     ...Object.fromEntries(extra.entries())
   });
 }
+function stripLeadingDoubleSlashes(location) {
+  return location.replace(/^(\/|%2F|%2f|%5C|%5c|\\)+(.*)/, "/$2");
+}
 var OkResponse, MovedPermanentlyResponse, FoundResponse, NotModifiedResponse, PermanentRedirectResponse, NotFoundResponse, MethodNotAllowedResponse, NotAcceptableResponse, InternalServerErrorResponse, SeeOtherResponse, TemporaryRedirectResponse;
 var init_responses = __esm({
   "../pages-shared/asset-server/responses.ts"() {
@@ -192,7 +195,12 @@ var init_responses = __esm({
       }
     };
     MovedPermanentlyResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 301,
@@ -204,7 +212,12 @@ var init_responses = __esm({
       }
     };
     FoundResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 302,
@@ -224,7 +237,12 @@ var init_responses = __esm({
       }
     };
     PermanentRedirectResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(void 0, {
           ...init,
           status: 308,
@@ -278,7 +296,12 @@ ${err.stack}`;
       }
     };
     SeeOtherResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 303,
@@ -288,7 +311,12 @@ ${err.stack}`;
       }
     };
     TemporaryRedirectResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 307,
@@ -351,15 +379,6 @@ var init_rulesEngine = __esm({
   }
 });
 
-// ../pages-shared/asset-server/url.ts
-function stringifyURLToRootRelativePathname(url) {
-  return `${url.pathname}${url.search}${url.hash}`;
-}
-var init_url = __esm({
-  "../pages-shared/asset-server/url.ts"() {
-  }
-});
-
 // ../pages-shared/asset-server/handler.ts
 var handler_exports = {};
 __export(handler_exports, {
@@ -370,7 +389,6 @@ __export(handler_exports, {
   HEADERS_VERSION_V1: () => HEADERS_VERSION_V1,
   REDIRECTS_VERSION: () => REDIRECTS_VERSION2,
   generateHandler: () => generateHandler,
-  getResponseFromMatch: () => getResponseFromMatch,
   normaliseHeaders: () => normaliseHeaders,
   parseQualityWeightedList: () => parseQualityWeightedList
 });
@@ -441,7 +459,32 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      return getResponseFromMatch(match, url);
+      const { status, to } = match;
+      const destination = new URL(to, request.url);
+      const location = destination.origin === new URL(request.url).origin ? `${destination.pathname}${destination.search || search}${destination.hash}` : `${destination.href}${destination.search ? "" : search}${destination.hash}`;
+      switch (status) {
+        case 301:
+          return new MovedPermanentlyResponse(location, void 0, {
+            preventLeadingDoubleSlash: false
+          });
+        case 303:
+          return new SeeOtherResponse(location, void 0, {
+            preventLeadingDoubleSlash: false
+          });
+        case 307:
+          return new TemporaryRedirectResponse(location, void 0, {
+            preventLeadingDoubleSlash: false
+          });
+        case 308:
+          return new PermanentRedirectResponse(location, void 0, {
+            preventLeadingDoubleSlash: false
+          });
+        case 302:
+        default:
+          return new FoundResponse(location, void 0, {
+            preventLeadingDoubleSlash: false
+          });
+      }
     }
     if (!request.method.match(/^(get|head)$/i)) {
       return new MethodNotAllowedResponse();
@@ -720,27 +763,6 @@ async function generateHandler({
     );
   }
 }
-function getResponseFromMatch({
-  status,
-  to
-}, requestUrl) {
-  const destination = new URL(to, requestUrl);
-  destination.search = destination.search || requestUrl.search;
-  const location = destination.origin === requestUrl.origin ? stringifyURLToRootRelativePathname(destination) : destination.toString();
-  switch (status) {
-    case 301:
-      return new MovedPermanentlyResponse(location);
-    case 303:
-      return new SeeOtherResponse(location);
-    case 307:
-      return new TemporaryRedirectResponse(location);
-    case 308:
-      return new PermanentRedirectResponse(location);
-    case 302:
-    default:
-      return new FoundResponse(location);
-  }
-}
 function parseQualityWeightedList(list = "") {
   const items = {};
   list.replace(/\s/g, "").split(",").forEach((el) => {
@@ -766,7 +788,6 @@ var init_handler = __esm({
   "../pages-shared/asset-server/handler.ts"() {
     init_responses();
     init_rulesEngine();
-    init_url();
     ASSET_PRESERVATION_CACHE = "assetPreservationCache";
     CACHE_CONTROL_PRESERVATION = "public, s-maxage=604800";
     CACHE_CONTROL_BROWSER = "public, max-age=0, must-revalidate";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.15.1",
+	"version": "2.16.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -120,7 +120,7 @@
 		"@cloudflare/workers-types": "^4.20221111.1",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "3.0.0-next.12",
+		"@miniflare/tre": "3.0.0-next.13",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",

package/src/__tests__/d1/migrate.test.ts

@@ -1,8 +1,13 @@
 import { cwd } from "process";
+import { rest } from "msw";
 import { reinitialiseAuthTokens } from "../../user";
 import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
 import { mockConsoleMethods } from "../helpers/mock-console";
+import { mockConfirm } from "../helpers/mock-dialogs";
 import { useMockIsTTY } from "../helpers/mock-istty";
+import { mockGetMemberships, mockOAuthFlow } from "../helpers/mock-oauth-flow";
+import { mockSetTimeout } from "../helpers/mock-set-timeout";
+import { msw } from "../helpers/msw";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
 import writeWranglerToml from "../helpers/write-wrangler-toml";
@@ -10,6 +15,8 @@ import writeWranglerToml from "../helpers/write-wrangler-toml";
 describe("migrate", () => {
 	runInTempDir();
 	mockConsoleMethods();
+	mockSetTimeout();
+
 	const { setIsTTY } = useMockIsTTY();
 
 	describe("create", () => {
@@ -28,6 +35,9 @@ describe("migrate", () => {
 	});
 
 	describe("apply", () => {
+		mockAccountId({ accountId: null });
+		mockApiToken();
+		const { mockOAuthServerCallback } = mockOAuthFlow();
 		it("should not attempt to login in local mode", async () => {
 			setIsTTY(false);
 			writeWranglerToml({
@@ -77,6 +87,96 @@ describe("migrate", () => {
 				runWrangler("d1 migrations apply --local db --preview")
 			).rejects.toThrowError(`Error: can't use --preview with --local`);
 		});
+
+		it("multiple accounts: should throw when trying to apply migrations without an account_id in config", async () => {
+			setIsTTY(false);
+
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`More than one account available but unable to select one in non-interactive mode.`
+			);
+		});
+		it("multiple accounts: should let the user apply migrations with an account_id in config", async () => {
+			setIsTTY(false);
+			msw.use(
+				rest.post(
+					"*/accounts/:accountId/d1/database/:databaseId/query",
+					async (req, res, ctx) => {
+						return res(
+							ctx.status(200),
+							ctx.json({
+								result: [
+									{
+										results: [],
+										success: true,
+										meta: {},
+									},
+								],
+								success: true,
+								errors: [],
+								messages: [],
+							})
+						);
+					}
+				)
+			);
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "/tmp/my-migrations-go-here",
+					},
+				],
+				account_id: "nx01",
+			});
+			mockOAuthServerCallback();
+			mockGetMemberships([
+				{ id: "IG-88", account: { id: "1701", name: "enterprise" } },
+				{ id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+			]);
+			mockConfirm({
+				text: `No migrations folder found.
+Ok to create /tmp/my-migrations-go-here?`,
+				result: true,
+			});
+			await runWrangler("d1 migrations create db test");
+			mockConfirm({
+				text: `About to apply 1 migration(s)
+Your database may not be available to serve requests during the migration, continue?`,
+				result: true,
+			});
+			//if we get to this point, wrangler knows the account_id
+			await expect(runWrangler("d1 migrations apply db")).rejects.toThrowError(
+				`request to https://api.cloudflare.com/client/v4/accounts/nx01/d1/database/xxxx/backup failed`
+			);
+		});
 	});
 
 	describe("list", () => {