miniflare 0.0.0-e4fe35cc5 → 0.0.0-e7ea6005c

package/dist/src/workers/assets/assets-kv.worker.js

@@ -10,7 +10,11 @@ var assets_kv_worker_default = {
     if (entry === void 0)
       return new Response("Not Found", { status: 404 });
     let { filePath, contentType } = entry, response = await env[SharedBindings.MAYBE_SERVICE_BLOBS].fetch(
-      new URL(filePath, "http://placeholder")
+      new URL(
+        // somewhere in blobservice I think this is being decoded again
+        filePath.split("/").map((x) => encodeURIComponent(x)).join("/"),
+        "http://placeholder"
+      )
     ), newResponse = new Response(response.body, response);
     return newResponse.headers.append(
       "cf-kv-metadata",

package/dist/src/workers/assets/assets-kv.worker.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/workers/assets/assets-kv.worker.ts"],
-  "mappings": ";AAAA,SAAS,sBAAsB;AAW/B,IAAO,2BAA8B;AAAA,EACpC,MAAM,MAAM,SAAS,KAAK;AAEzB,QAAI,QAAQ,WAAW,OAAO;AAC7B,UAAM,UAAU,UAAU,QAAQ,OAAO,YAAY;AACrD,aAAO,IAAI,SAAS,SAAS,EAAE,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAAA;AAGlE,QAAM,WAAW,IAAI,IAAI,QAAQ,GAAG,EAAE,SAAS,UAAU,CAAC,GACpD,QAAQ,IAAI,mBAAmB,QAAQ;AAC7C,QAAI,UAAU;AACb,aAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,IAAI,CAAC;AAGjD,QAAM,EAAE,UAAU,YAAY,IAAI,OAE5B,WAAW,MADI,IAAI,eAAe,mBAAmB,EACvB;AAAA,MACnC,IAAI,IAAI,UAAU,oBAAoB;AAAA,IACvC,GACM,cAAc,IAAI,SAAS,SAAS,MAAM,QAAQ;AAExD,uBAAY,QAAQ;AAAA,MACnB;AAAA,MACA,oBAAoB;AAAA,IACrB,GACO;AAAA,EACR;AACD;",
+  "mappings": ";AAAA,SAAS,sBAAsB;AAW/B,IAAO,2BAA8B;AAAA,EACpC,MAAM,MAAM,SAAS,KAAK;AAEzB,QAAI,QAAQ,WAAW,OAAO;AAC7B,UAAM,UAAU,UAAU,QAAQ,OAAO,YAAY;AACrD,aAAO,IAAI,SAAS,SAAS,EAAE,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAAA;AAGlE,QAAM,WAAW,IAAI,IAAI,QAAQ,GAAG,EAAE,SAAS,UAAU,CAAC,GACpD,QAAQ,IAAI,mBAAmB,QAAQ;AAC7C,QAAI,UAAU;AACb,aAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,IAAI,CAAC;AAGjD,QAAM,EAAE,UAAU,YAAY,IAAI,OAE5B,WAAW,MADI,IAAI,eAAe,mBAAmB,EACvB;AAAA,MACnC,IAAI;AAAA;AAAA,QAEH,SACE,MAAM,GAAG,EACT,IAAI,CAAC,MAAM,mBAAmB,CAAC,CAAC,EAChC,KAAK,GAAG;AAAA,QACV;AAAA,MACD;AAAA,IACD,GACM,cAAc,IAAI,SAAS,SAAS,MAAM,QAAQ;AAExD,uBAAY,QAAQ;AAAA,MACnB;AAAA,MACA,oBAAoB;AAAA,IACrB,GACO;AAAA,EACR;AACD;",
   "names": []
 }

package/dist/src/workers/assets/assets.worker.js

@@ -8789,14 +8789,15 @@ function isCacheable(request) {
 
 // ../workers-shared/asset-worker/src/handler.ts
 var handleRequest = async (request, configuration, exists, getByETag) => {
-  let { pathname, search } = new URL(request.url), intent = await getIntent(pathname, configuration, exists);
+  let { pathname, search } = new URL(request.url), decodedPathname = decodePath(pathname), intent = await getIntent(decodedPathname, configuration, exists);
   if (!intent)
     return new NotFoundResponse();
   let method = request.method.toUpperCase();
   if (!["GET", "HEAD"].includes(method))
     return new MethodNotAllowedResponse();
-  if (intent.redirect)
-    return new TemporaryRedirectResponse(intent.redirect + search);
+  let decodedDestination = intent.redirect ?? decodedPathname, encodedDestination = encodePath(decodedDestination);
+  if (encodedDestination !== pathname || intent.redirect)
+    return new TemporaryRedirectResponse(encodedDestination + search);
   if (!intent.asset)
     return new InternalServerErrorResponse(new Error("Unknown action"));
   let asset = await getByETag(intent.asset.eTag), headers = getHeaders(intent.asset.eTag, asset.contentType, request), strongETag = `"${intent.asset.eTag}"`, weakETag = `W/${strongETag}`, ifNoneMatch = request.headers.get("If-None-Match") || "";
@@ -8839,7 +8840,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
       pathname.slice(0, -5),
@@ -8875,7 +8879,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       return redirectResult;
   } else if (pathname.endsWith("/")) {
     if (eTagResult = await exists(`${pathname}index.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -1)}.html`,
       pathname.slice(0, -1),
@@ -8902,7 +8909,13 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : (redirectResult = await safeRedirect(
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : (redirectResult = await safeRedirect(
     `${pathname}/index.html`,
     `${pathname}/`,
     configuration,
@@ -8913,7 +8926,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname}.html`,
       pathname.slice(0, -5),
@@ -8949,9 +8965,15 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       return redirectResult;
   } else if (pathname.endsWith("/")) {
     if (eTagResult = await exists(`${pathname}index.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
     if (eTagResult = await exists(`${pathname.slice(0, -1)}.html`))
-      return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: eTagResult, status: 200 },
+        redirect: null
+      };
   } else if (pathname.endsWith(".html")) {
     if (redirectResult = await safeRedirect(
       pathname,
@@ -8962,7 +8984,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (redirectResult = await safeRedirect(
       `${pathname.slice(0, -5)}/index.html`,
       `${pathname.slice(0, -5)}/`,
@@ -8972,7 +8997,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (redirectResult = await safeRedirect(
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (redirectResult = await safeRedirect(
     `${pathname}.html`,
     `${pathname}/`,
     configuration,
@@ -8989,7 +9017,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   let redirectResult = null, eTagResult = null, exactETag = await exists(pathname);
   if (pathname.endsWith("/index")) {
     if (exactETag)
-      return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+      return {
+        asset: { eTag: exactETag, status: 200 },
+        redirect: null
+      };
     if (pathname === "/index") {
       if (redirectResult = await safeRedirect(
         "/index.html",
@@ -9037,7 +9068,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       ))
         return redirectResult;
       if (exactETag)
-        return { asset: { eTag: exactETag, status: 200 }, redirect: null };
+        return {
+          asset: { eTag: exactETag, status: 200 },
+          redirect: null
+        };
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -11)}.html`,
         pathname.slice(0, -11),
@@ -9050,7 +9084,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
   else if (pathname.endsWith("/"))
     if (pathname === "/") {
       if (eTagResult = await exists("/index.html"))
-        return { asset: { eTag: eTagResult, status: 200 }, redirect: null };
+        return {
+          asset: { eTag: eTagResult, status: 200 },
+          redirect: null
+        };
     } else {
       if (redirectResult = await safeRedirect(
         `${pathname.slice(0, -1)}.html`,
@@ -9087,15 +9124,30 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
     ))
       return redirectResult;
   }
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : (eTagResult = await exists(`${pathname}/index.html`)) ? { asset: { eTag: eTagResult, status: 200 }, redirect: null } : notFound(pathname, configuration, exists);
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : (eTagResult = await exists(`${pathname}/index.html`)) ? {
+    asset: { eTag: eTagResult, status: 200 },
+    redirect: null
+  } : notFound(pathname, configuration, exists);
 }, htmlHandlingNone = async (pathname, configuration, exists) => {
   let exactETag = await exists(pathname);
-  return exactETag ? { asset: { eTag: exactETag, status: 200 }, redirect: null } : notFound(pathname, configuration, exists);
+  return exactETag ? {
+    asset: { eTag: exactETag, status: 200 },
+    redirect: null
+  } : notFound(pathname, configuration, exists);
 }, notFound = async (pathname, configuration, exists) => {
   switch (configuration.not_found_handling) {
     case "single-page-application": {
       let eTag = await exists("/index.html");
-      return eTag ? { asset: { eTag, status: 200 }, redirect: null } : null;
+      return eTag ? {
+        asset: { eTag, status: 200 },
+        redirect: null
+      } : null;
     }
     case "404-page": {
       let cwd = pathname;
@@ -9103,7 +9155,10 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
         cwd = cwd.slice(0, cwd.lastIndexOf("/"));
         let eTag = await exists(`${cwd}/404.html`);
         if (eTag)
-          return { asset: { eTag, status: 404 }, redirect: null };
+          return {
+            asset: { eTag, status: 404 },
+            redirect: null
+          };
       }
       return null;
     }
@@ -9123,7 +9178,7 @@ var handleRequest = async (request, configuration, exists, getByETag) => {
       };
   }
   return null;
-};
+}, decodePath = (pathname) => pathname.split("/").map((x) => decodeURIComponent(x)).join("/"), encodePath = (pathname) => pathname.split("/").map((x) => encodeURIComponent(x)).join("/");
 
 // ../workers-shared/asset-worker/src/utils/kv.ts
 async function getAssetWithMetadataFromKV(assetsKVNamespace, assetKey, retries = 1) {
@@ -9169,8 +9224,8 @@ var src_default = class extends WorkerEntrypoint {
     }
   }
   async unstable_canFetch(request) {
-    let url = new URL(request.url), method = request.method.toUpperCase(), intent = await getIntent(
-      url.pathname,
+    let url = new URL(request.url), method = request.method.toUpperCase(), decodedPathname = decodePath(url.pathname), intent = await getIntent(
+      decodedPathname,
       {
         ...applyConfigurationDefaults(this.env.CONFIG),
         not_found_handling: "none"