fix: apply review

playground/pages/blob.vue

@@ -49,46 +49,51 @@ async function uploadFiles(files: File[]) {
     const chunks = Math.ceil(file.size / chunkSize)
     const uploaded: BlobUploadedPart[] = []
 
-    const { pathname, uploadId } = await $fetch<{pathname: string, uploadId: string}>('/api/blob/mpu', {
-      method: 'POST',
-      query: {
-        action: 'create',
-        pathname: file.name,
+    const { pathname, uploadId } = await $fetch<{pathname: string, uploadId: string}>(
+      `/api/blob/multipart/${file.name}`,
+      {
+        method: 'POST',
       }
-    })
+    )
 
     for (let i = 0; i < chunks; i += 1) {
       const start = i * chunkSize
       const end = Math.min(start + chunkSize, file.size)
       const partNumber = i + 1
       const chunk = file.slice(start, end)
 
-      const part = await $fetch<BlobUploadedPart>(`/api/blob/mpu/${pathname}`, {
-        params: {},
-        method: 'PUT',
-        body: await chunk.arrayBuffer(),
-        query: {
-          partNumber,
-          uploadId,
+      const part = await $fetch<BlobUploadedPart>(
+        `/api/blob/multipart/${pathname}`,
+        {
+          method: 'PUT',
+          query: {
+            uploadId,
+            partNumber,
+          },
+          body: chunk,
         }
-      })
+      )
 
       // optional: verify the etag and reupload if not match
 
       uploaded.push(part)
     }
 
-    const complete = await $fetch<SerializeObject<BlobObject>>('/api/blob/mpu', {
-      method: 'POST',
-      query: {
-        action: 'complete',
-        pathname,
-        uploadId,
-      },
-      body: {
-        parts: uploaded,
-      },
-    })
+    const complete = await $fetch<SerializeObject<BlobObject>>(
+      '/api/blob/multipart/complete',
+      {
+        method: 'POST',
+        query: {
+          pathname,
+          uploadId,
+        },
+        body: {
+          parts: uploaded,
+        },
+      }
+    )
+
+    console.log(complete)
 
     uploadedFiles.push(complete)
   }

playground/server/api/blob/mpu/[...pathname].delete.ts → playground/server/api/blob/multipart/[...pathname].delete.ts

@@ -1,8 +1,6 @@
 import { z } from 'zod'
 
 export default eventHandler(async (event) => {
-  const hub = hubBlob()
-
   const { pathname } = await getValidatedRouterParams(event, z.object({
     pathname: z.string().min(1)
   }).parse)
@@ -11,12 +9,15 @@ export default eventHandler(async (event) => {
     uploadId: z.string(),
   }).parse)
 
-  const mpu = hub.resumeMultipartUpload(pathname, uploadId)
+  const { resumeMultipartUpload } = hubBlob()
+  const mpu = resumeMultipartUpload(pathname, uploadId)
 
   try {
-    return await mpu.abort()
+    await mpu.abort()
   }
   catch (e: any) {
     throw createError({ status: 400, message: e.message })
   }
+
+  return sendNoContent(event)
 })

playground/server/api/blob/multipart/[...pathname].post.ts

@@ -0,0 +1,23 @@
+import { z } from 'zod'
+
+export default eventHandler(async (event) => {
+  const { pathname } = await getValidatedRouterParams(event, z.object({
+    pathname: z.string().min(1)
+  }).parse)
+
+  const options = await readValidatedBody(event, z.record(z.string(), z.any()).optional().parse)
+
+  const { createMultipartUpload } = hubBlob()
+  try {
+    const object = await createMultipartUpload(pathname, options)
+    return {
+      uploadId: object.uploadId,
+      pathname: object.pathname,
+    }
+  } catch (e: any) {
+    throw createError({
+      statusCode: 400,
+      message: e.message
+    })
+  }
+})

playground/server/api/blob/mpu/[...pathname].put.ts → playground/server/api/blob/multipart/[...pathname].put.ts

@@ -1,21 +1,5 @@
 import { z } from 'zod'
 
-async function streamToArrayBuffer(stream: ReadableStream, streamSize: number) {
-  const result = new Uint8Array(streamSize)
-  let bytesRead = 0
-  const reader = stream.getReader()
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    const { done, value } = await reader.read()
-    if (done) {
-      break
-    }
-    result.set(value, bytesRead)
-    bytesRead += value.length
-  }
-  return result
-}
-
 export default eventHandler(async (event) => {
   const { pathname } = await getValidatedRouterParams(event, z.object({
     pathname: z.string().min(1)
@@ -32,8 +16,8 @@ export default eventHandler(async (event) => {
   const body = await streamToArrayBuffer(stream, contentLength)
 
 
-  const hub = hubBlob()
-  const mpu = hub.resumeMultipartUpload(pathname, uploadId)
+  const { resumeMultipartUpload } = hubBlob()
+  const mpu = resumeMultipartUpload(pathname, uploadId)
 
   try {
     return await mpu.uploadPart(partNumber, body)

playground/server/api/blob/multipart/complete.post.ts

@@ -0,0 +1,27 @@
+import { z } from 'zod'
+
+export default eventHandler(async (event) => {
+  const { pathname, uploadId } = await getValidatedQuery(event, z.object({
+    pathname: z.string().min(1),
+    uploadId: z.string().min(1),
+  }).parse)
+
+  const { parts } = await readValidatedBody(event,z.object({
+    parts: z.array(z.object({
+      partNumber: z.number(),
+      etag: z.string(),
+    }))
+  }).parse)
+
+  const { resumeMultipartUpload } = hubBlob()
+  const mpu = resumeMultipartUpload(pathname, uploadId)
+  try {
+    const object = await mpu.complete(parts)
+    return object
+  } catch (e: any) {
+    throw createError({
+      statusCode: 400,
+      message: e.message
+    })
+  }
+})

playground/server/utils/stream.ts

@@ -0,0 +1,15 @@
+export async function streamToArrayBuffer(stream: ReadableStream, streamSize: number) {
+  const result = new Uint8Array(streamSize)
+  let bytesRead = 0
+  const reader = stream.getReader()
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const { done, value } = await reader.read()
+    if (done) {
+      break
+    }
+    result.set(value, bytesRead)
+    bytesRead += value.length
+  }
+  return result
+}

src/runtime/server/api/_hub/blob/[...pathname].put.ts

@@ -3,27 +3,12 @@ import { z } from 'zod'
 import { hubBlob } from '../../../utils/blob'
 import { requireNuxtHubAuthorization } from '../../../utils/auth'
 import { requireNuxtHubFeature } from '../../../utils/features'
-
-async function streamToArrayBuffer(stream: ReadableStream, streamSize: number) {
-  const result = new Uint8Array(streamSize)
-  let bytesRead = 0
-  const reader = stream.getReader()
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    const { done, value } = await reader.read()
-    if (done) {
-      break
-    }
-    result.set(value, bytesRead)
-    bytesRead += value.length
-  }
-  return result
-}
+import { streamToArrayBuffer } from '../../../internal/utils/stream'
 
 export default eventHandler(async (event) => {
   await requireNuxtHubAuthorization(event)
   requireNuxtHubFeature('blob')
-  
+
   const { pathname } = await getValidatedRouterParams(event, z.object({
     pathname: z.string().min(1)
   }).parse)

src/runtime/server/api/_hub/blob/mpu/[...pathname].delete.ts → src/runtime/server/api/_hub/blob/multipart/[...pathname].delete.ts

@@ -1,4 +1,4 @@
-import { createError, eventHandler } from 'h3'
+import { createError, eventHandler, sendNoContent } from 'h3'
 import { z } from 'zod'
 import { hubBlob } from '../../../../utils/blob'
 import { requireNuxtHubAuthorization } from '../../../../utils/auth'
@@ -17,15 +17,18 @@ export default eventHandler(async (event) => {
   }).parse)
 
 
-  const blob = hubBlob()
-  const mpu = blob.resumeMultipartUpload(pathname, uploadId)
+  const { resumeMultipartUpload } = hubBlob()
+  const { abort } = resumeMultipartUpload(pathname, uploadId)
 
   try {
-    await mpu.abort()
-  } catch (e: any) {
+    await abort()
+  }
+  catch (e: any) {
     throw createError({
       statusCode: 500,
       message: `Storage error: ${e.message}`
     })
   }
+
+  return sendNoContent(event)
 })