fix[worker]: contentLength and etag handling

Author: SharzyL

worker/handlers/handleMPU.ts

@@ -85,7 +85,7 @@ export async function handleMPUResume(request: Request, env: Env): Promise<Respo
 // formdata same as POST/PUT a normal paste, but
 //   - field `c` is interpreted as JSON { partNumber: number, etag: string }[]
 //   - field `n` is ignored
-export async function handleMPUComplete(request: Request, env: Env, completeBody: R2UploadedPart[]): Promise<string> {
+export async function handleMPUComplete(request: Request, env: Env, completeBody: R2UploadedPart[]): Promise<R2Object> {
   const url = new URL(request.url)
   const uploadId = url.searchParams.get("uploadId")
   const key = url.searchParams.get("key")
@@ -104,5 +104,5 @@ export async function handleMPUComplete(request: Request, env: Env, completeBody
     await env.R2.delete(object.key)
     throw new WorkerError(413, `payload too large (max ${parseSize(env.R2_MAX_ALLOWED)!} bytes allowed)`)
   }
-  return object.httpEtag
+  return object
 }

worker/handlers/handleRead.ts

@@ -236,6 +236,10 @@ export async function handleGet(request: Request, env: Env, ctx: ExecutionContex
     exposeHeaders.push("X-PB-Highlight-Language")
   }
 
+  if (item.httpEtag) {
+    headers["etag"] = item.httpEtag
+  }
+
   if (returnFilename) {
     const encodedFilename = encodeURIComponent(returnFilename)
     headers["Content-Disposition"] = `${disp}; filename*=UTF-8''${encodedFilename}`

worker/handlers/handleWrite.ts

@@ -176,7 +176,7 @@ export async function handlePostOrPut(
       }
     }
 
-    const etag = isMPUComplete ? await handleMPUComplete(request, env, uploadedParts!) : undefined
+    const r2Object = isMPUComplete ? await handleMPUComplete(request, env, uploadedParts!) : undefined
 
     const originalMetadata = await getPasteMetadata(env, pasteName)
     if (originalMetadata === null) {
@@ -193,7 +193,7 @@ export async function handlePostOrPut(
       expirationSeconds,
       now,
       passwd: newPasswd,
-      contentLength,
+      contentLength: r2Object?.size || contentLength,
       filename,
       highlightLanguage,
       encryptionScheme,
@@ -206,7 +206,7 @@ export async function handlePostOrPut(
         expirationSeconds,
         expireAt: new Date(now.getTime() + 1000 * expirationSeconds).toISOString(),
       },
-      { etag },
+      { etag: r2Object?.httpEtag },
     )
   } else {
     let pasteName: string | undefined
@@ -225,7 +225,7 @@ export async function handlePostOrPut(
       pasteName = genRandStr(isPrivate ? PRIVATE_PASTE_NAME_LEN : PASTE_NAME_LEN)
     }
 
-    const etag = isMPUComplete ? await handleMPUComplete(request, env, uploadedParts!) : undefined
+    const r2Object = isMPUComplete ? await handleMPUComplete(request, env, uploadedParts!) : undefined
 
     const password = passwdFromForm || genRandStr(DEFAULT_PASSWD_LEN)
     await createPaste(env, pasteName, content, {
@@ -234,7 +234,7 @@ export async function handlePostOrPut(
       passwd: password,
       filename,
       highlightLanguage,
-      contentLength,
+      contentLength: r2Object?.size || contentLength,
       encryptionScheme,
       isMPUComplete,
     })
@@ -246,7 +246,7 @@ export async function handlePostOrPut(
         expirationSeconds,
         expireAt: new Date(now.getTime() + 1000 * expirationSeconds).toISOString(),
       },
-      { etag },
+      { etag: r2Object?.httpEtag },
     )
   }
 }

worker/storage/storage.ts

@@ -66,6 +66,7 @@ function migratePasteMetadata(original: PasteMetadataInStorage): PasteMetadata {
 export type PasteWithMetadata = {
   paste: ArrayBuffer | ReadableStream
   metadata: PasteMetadata
+  httpEtag?: string
 }
 
 async function updateAccessCounter(env: Env, short: string, value: ArrayBuffer, metadata: PasteMetadata) {
@@ -117,8 +118,7 @@ export async function getPaste(env: Env, short: string, ctx: ExecutionContext):
       if (object === null) {
         return null
       }
-      // TODO: how Content-Length handled?
-      return { paste: object.body, metadata }
+      return { paste: object.body, metadata, httpEtag: object.httpEtag }
     } else {
       return { paste: item.value, metadata }
     }

worker/test/mpu.spec.ts

@@ -1,9 +1,10 @@
 import { uploadMPU } from "../../shared/uploadPaste"
 import { vi, test, describe, it, expect, afterAll, beforeEach } from "vitest"
 import { createExecutionContext } from "cloudflare:test"
-import { areBlobsEqual, BASE_URL, genRandomBlob, workerFetch } from "./testUtils"
+import { addRole, areBlobsEqual, BASE_URL, genRandomBlob, workerFetch } from "./testUtils"
 import { PRIVATE_PASTE_NAME_LEN } from "../../shared/constants"
 import { parsePath } from "../../shared/parsers"
+import { MetaResponse } from "../../shared/interfaces"
 
 const ctx = createExecutionContext()
 beforeEach(() => {
@@ -45,8 +46,12 @@ test("uploadMPU", async () => {
     callBack,
   )
 
+  const reGetMetaResp: MetaResponse = await (await workerFetch(ctx, addRole(uploadResp.url, "m"))).json()
+  expect(reGetMetaResp.sizeBytes).toStrictEqual(content.size)
+
   const reGetResp = await workerFetch(ctx, uploadResp.url)
   expect(await areBlobsEqual(await reGetResp.blob(), newContent)).toStrictEqual(true)
+  expect(reGetResp.headers.has("etag")).toStrictEqual(true)
 })
 
 describe("uploadMPU with variant parameters", () => {