@empiricalrun/r2-uploader 0.4.0 → 0.5.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @empiricalrun/r2-uploader
 
+## 0.5.0
+
+### Minor Changes
+
+- a94a7f7: fix: resolve multipart upload retry failures
+
 ## 0.4.0
 
 ### Minor Changes

package/dist/upload/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/upload/stream.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEzD,eAAO,MAAM,iBAAiB,GAAU,QAAQ,oBAAoB,qBAkHnE,CAAC"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/upload/stream.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEzD,eAAO,MAAM,iBAAiB,GAAU,QAAQ,oBAAoB,qBA0GnE,CAAC"}

package/dist/upload/stream.js

@@ -42,34 +42,30 @@ const uploadFileStreams = async (config) => {
         let partNumber = 1;
         const parts = [];
         for await (const chunk of fileStream) {
-            const uploadPartParams = {
-                Bucket: config.bucket,
-                Key: fileKey,
-                PartNumber: partNumber,
-                UploadId,
-                Body: chunk,
-            };
-            const uploadPartCommand = new client_s3_1.UploadPartCommand(uploadPartParams);
-            try {
-                await (0, async_retry_1.default)(async () => {
-                    const { ETag } = await S3.send(uploadPartCommand);
-                    logger_1.logger.debug("upload part command sent successfully for file", file.fullPath);
-                    parts.push({ ETag: ETag, PartNumber: partNumber });
-                    partNumber++;
-                }, {
-                    retries: 5,
-                    factor: 3,
-                    minTimeout: 1_000,
-                    maxTimeout: 60_000,
-                    randomize: true,
-                    onRetry: (err, i) => {
-                        logger_1.logger.debug("Upload part retry attempt:", i, ":", file.fullPath);
-                    },
+            const currentPartNumber = partNumber;
+            const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+            const { ETag } = await (0, async_retry_1.default)(async () => {
+                const uploadPartCommand = new client_s3_1.UploadPartCommand({
+                    Bucket: config.bucket,
+                    Key: fileKey,
+                    PartNumber: currentPartNumber,
+                    UploadId,
+                    Body: chunkBuffer,
                 });
-            }
-            catch (err) {
-                logger_1.logger.error(`R2 Error - ${file.fullPath} \nError: ${err}`);
-            }
+                return await S3.send(uploadPartCommand);
+            }, {
+                retries: 5,
+                factor: 3,
+                minTimeout: 1_000,
+                maxTimeout: 60_000,
+                randomize: true,
+                onRetry: (err, i) => {
+                    logger_1.logger.debug("Upload part retry attempt:", i, ":", file.fullPath);
+                },
+            });
+            logger_1.logger.debug("upload part command sent successfully for file", file.fullPath);
+            parts.push({ ETag: ETag, PartNumber: currentPartNumber });
+            partNumber++;
         }
         const completeMultipartUploadParams = {
             Bucket: config.bucket,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/r2-uploader",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"