Merge pull request cloudflare#142 from xiaolanglanglang/fix-decode-ur…

…l-path

bugfix: Fix decode path issue.

src/index.ts

@@ -106,8 +106,15 @@ const getAssetFromKV = async (event: FetchEvent, options?: Partial<Options>): Pr
     pathIsEncoded = true;
     requestKey = request
   } else {
-    // use default mapRequestToAsset
-    requestKey = mapRequestToAsset(request)
+    const mappedRequest = mapRequestToAsset(request)
+    const mappedRawPathKey = new URL(mappedRequest.url).pathname.replace(/^\/+/, '')
+    if (ASSET_MANIFEST[decodeURIComponent(mappedRawPathKey)]) {
+      pathIsEncoded = true;
+      requestKey = mappedRequest
+    } else {
+      // use default mapRequestToAsset
+      requestKey = mapRequestToAsset(request)
+    }
   }
 
   const SUPPORTED_METHODS = ['GET', 'HEAD']

src/mocks.ts

@@ -26,6 +26,7 @@ const store: any = {
   'sub/index.123HASHBROWN.html': 'picturedis',
   'client.123HASHBROWN': 'important file',
   'client.123HASHBROWN/index.html': 'Im here but serve my big bro above',
+  '你好/index.123HASHBROWN.html': 'My path is non-ascii',
 }
 export const mockKV = (store: any) => {
   return {
@@ -48,6 +49,7 @@ export const mockManifest = () => {
     'sub/index.html': `sub/index.${HASH}.html`,
     'client': `client.${HASH}`,
     'client/index.html': `client.${HASH}`,
+    '你好/index.html': `你好/index.${HASH}.html`
   })
 }
 

src/test/getAssetFromKV.ts

@@ -127,6 +127,21 @@ test('getAssetFromKV only decode URL when necessary', async t => {
   }
 })
 
+test('getAssetFromKV Support for user decode url path', async t => {
+  mockGlobal()
+  const event1 = getEvent(new Request('https://blah.com/%E4%BD%A0%E5%A5%BD/'))
+  const event2 = getEvent(new Request('https://blah.com/你好/'))
+  const res1 = await getAssetFromKV(event1)
+  const res2 = await getAssetFromKV(event2)
+
+  if (res1 && res2) {
+    t.is(await res1.text(), 'My path is non-ascii')
+    t.is(await res2.text(), 'My path is non-ascii')
+  } else {
+    t.fail('Response was undefined')
+  }
+})
+
 test('getAssetFromKV custom key modifier', async t => {
   mockGlobal()
   const event = getEvent(new Request('https://blah.com/docs/sub/blah.png'))