deepspace 0.19.4 → 0.20.0

package/dist/index.js

@@ -3548,13 +3548,13 @@ var MAX_UPLOAD_REQUEST_BYTES = 25 * 1024 * 1024;
 var UPLOAD_PART_BYTES = 20 * 1024 * 1024;
 var MAX_UPLOAD_PARTS = Math.ceil(MAX_APP_FILE_BYTES / UPLOAD_PART_BYTES);
 var MAX_BASE64_UPLOAD_BYTES = Math.floor(MAX_UPLOAD_REQUEST_BYTES * 3 / 4);
-function planUploadParts(totalBytes, partSize) {
+function planUploadParts(totalBytes) {
   const parts = [];
-  for (let start = 0; start < totalBytes; start += partSize) {
+  for (let start = 0; start < totalBytes; start += UPLOAD_PART_BYTES) {
     parts.push({
       partNumber: parts.length + 1,
       start,
-      end: Math.min(start + partSize, totalBytes)
+      end: Math.min(start + UPLOAD_PART_BYTES, totalBytes)
     });
   }
   return parts;
@@ -3630,21 +3630,35 @@ function resolveFile(fileOrKey) {
 async function uploadInParts(file, name, scopeParams, authHeaders, onProgress) {
   const headers = await authHeaders();
   const json = { ...headers, "Content-Type": "application/json" };
-  const initResponse = await fetch(`/api/files/multipart?${scopeParams}`, {
+  const requestId = crypto.randomUUID();
+  const initBody = JSON.stringify({
+    requestId,
+    name,
+    mimeType: file.type || "application/octet-stream",
+    size: file.size
+  });
+  const sendInit = () => fetch(`/api/files/multipart?${scopeParams}`, {
     method: "POST",
     headers: json,
-    body: JSON.stringify({ name, mimeType: file.type || "application/octet-stream", size: file.size })
+    body: initBody
   });
+  let initResponse = await sendInit().catch(() => null);
+  if (!initResponse || initResponse.status === 429 || initResponse.status >= 500) {
+    initResponse = await sendInit().catch(() => null);
+  }
+  if (!initResponse) {
+    return { success: false, error: "The files service could not be reached." };
+  }
   if (!initResponse.ok) return await readUploadResult(initResponse);
   const session = await initResponse.json();
-  if (!Number.isSafeInteger(session.partSize) || session.partSize < 1) {
+  if (!session.uploadId || !session.uploadKey || !session.reservationId || session.partSize !== UPLOAD_PART_BYTES) {
     return {
       success: false,
-      error: `The files service advertised an unusable part size (${session.partSize}).`
+      error: `The files service returned an unusable part size or multipart session (${session.partSize}).`
     };
   }
-  const query = `${scopeParams}&uploadKey=${encodeKeyPath(session.uploadKey)}&uploadId=${encodeURIComponent(session.uploadId)}`;
-  const plan = planUploadParts(file.size, session.partSize);
+  const query = `${scopeParams}&uploadKey=${encodeKeyPath(session.uploadKey)}&uploadId=${encodeURIComponent(session.uploadId)}&reservationId=${encodeURIComponent(session.reservationId)}`;
+  const plan = planUploadParts(file.size);
   const parts = [];
   let assembled = false;
   try {
@@ -3727,10 +3741,7 @@ function useR2Files(options) {
     async (base64Data, name, mimeType) => {
       setIsUploading(true);
       try {
-        const tooBig = oversize(
-          Math.floor(base64Data.length * 3 / 4),
-          MAX_BASE64_UPLOAD_BYTES
-        );
+        const tooBig = oversize(Math.floor(base64Data.length * 3 / 4), MAX_BASE64_UPLOAD_BYTES);
         if (tooBig) return tooBig;
         const headers = await authHeaders();
         const response = await fetch(`/api/files/upload?${scopeParams}`, {