chore(blob): up

Author: smarroufin

_nuxthub/server/api/_hub/blob/[...pathname].put.ts

@@ -1,18 +1,3 @@
-async function streamToArrayBuffer(stream: ReadableStream, streamSize: number) {
-  const result = new Uint8Array(streamSize)
-  let bytesRead = 0
-  const reader = stream.getReader()
-  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)
@@ -21,17 +6,12 @@ export default eventHandler(async (event) => {
 
   const contentType = getHeader(event, 'content-type')
   const contentLength = Number(getHeader(event, 'content-length') || '0')
-  if (!query.contentType) {
-    query.contentType = contentType
-  }
-  if (!query.contentLength) {
-    query.contentLength = contentLength
-  }
 
-  // FIXME: find a way to re-stream the readable stream
-  // const body = getRequestWebStream(event)!
-  const stream = getRequestWebStream(event)!
-  const body = await streamToArrayBuffer(stream, contentLength)
+  const options = { ...query }
+  if (!options.contentType) { options.contentType = contentType }
+  if (!options.contentLength) { options.contentLength = contentLength }
+
+  const body = getRequestWebStream(event)!
 
-  return useBlob().put(pathname, body, query)
+  return useBlob().put(pathname, body, options)
 })

_nuxthub/server/utils/blob.ts

@@ -89,11 +89,13 @@ export function useBlob () {
       pathname = decodeURI(pathname)
       if (proxyURL) {
         const { contentType, contentLength, ...query } = options
+        const headers: Record<string, string> = {}
+        if (contentType) { headers['content-type'] = contentType }
+        if (contentLength) { headers['content-length'] = contentLength }
         return await $fetch<BlobObject>(joinURL('/api/_hub/blob', pathname), {
           baseURL: proxyURL,
           method: 'PUT',
-          // duplex: 'half',
-          // responseType: 'stream',
+          headers,
           body,
           query
         })
@@ -112,9 +114,7 @@ export function useBlob () {
         httpMetadata.contentLength = contentLength
       }
 
-      console.log('Pushing object on remote server...')
       const object = await bucket.put(pathname, body as any, { httpMetadata, customMetadata })
-      console.log('Object pushed on remote server!')
 
       return mapR2ObjectToBlob(object)
     },