@empiricalrun/r2-uploader 0.3.3 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/r2-uploader
 
+## 0.3.5
+
+### Patch Changes
+
+- 5901db5: fix: add logs for uploader
+
+## 0.3.4
+
+### Patch Changes
+
+- ff77220: chore: return empty list when fetching a file that does not exist
+
 ## 0.3.3
 
 ### Patch Changes

package/dist/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,eAAO,MAAM,UAAU,WAAkB,aAAa;;;;gBAsBrD,CAAC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,eAAO,MAAM,UAAU,WAAkB,aAAa;;;;gBA2BrD,CAAC"}

package/dist/fetch.js

@@ -17,12 +17,18 @@ const fetchFiles = async (config) => {
     };
     const cmd = new client_s3_1.ListObjectsV2Command(params);
     const data = await S3.send(cmd);
-    return data.Contents?.map((c) => {
-        return {
-            key: c.Key,
-            lastModified: c.LastModified,
-            size: c.Size,
-        };
-    });
+    const { KeyCount, Contents } = data;
+    if (KeyCount === 0) {
+        return [];
+    }
+    else {
+        return Contents?.map((c) => {
+            return {
+                key: c.Key,
+                lastModified: c.LastModified,
+                size: c.Size,
+            };
+        });
+    }
 };
 exports.fetchFiles = fetchFiles;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upload/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAA8C,MAAM,UAAU,CAAC;AAqB/E,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAChB,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBnB;AAED,wBAAsB,mBAAmB,CAAC,EACxC,KAAK,EACL,cAAc,EACd,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAChB,EAAE;IACD,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjE,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,OAAO,CAAC,CAUnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upload/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAA8C,MAAM,UAAU,CAAC;AAqB/E,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAChB,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBnB;AAED,wBAAsB,mBAAmB,CAAC,EACxC,KAAK,EACL,cAAc,EACd,YAAY,EACZ,SAAS,EACT,WAAW,EACX,eAAe,GAChB,EAAE;IACD,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjE,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,OAAO,CAAC,CAUnB"}

package/dist/upload/index.js

@@ -55,6 +55,7 @@ async function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBuck
         fileName: filePath.replace(sourceDir, ""), // relative path
         mimeType: mime_1.default.getType(filePath) || "application/octet-stream",
     }));
+    console.log("Got request to upload following files:", JSON.stringify(files, null, 2));
     const config = {
         accountId: accountId || process.env.R2_ACCOUNT_ID,
         accessKeyId: accessKeyId || process.env.R2_ACCESS_KEY_ID,

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

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/upload/stream.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEzD,eAAO,MAAM,iBAAiB,WAAkB,oBAAoB,qBAkGnE,CAAC"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/upload/stream.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEzD,eAAO,MAAM,iBAAiB,WAAkB,oBAAoB,qBA+GnE,CAAC"}

package/dist/upload/stream.js

@@ -31,11 +31,13 @@ const uploadFileStreams = async (config) => {
             ContentType: mimeType,
         };
         const createMultipartUploadCommand = new client_s3_1.CreateMultipartUploadCommand(createMultipartUploadParams);
+        console.log("sending a multipart upload command for file", file.fileName);
         const { UploadId } = await S3.send(createMultipartUploadCommand);
         const partSize = 5 * 1024 * 1024; // 5MB
         const fileStream = fs_1.default.createReadStream(file.fullPath, {
             highWaterMark: partSize,
         });
+        console.log("file stream created successfully for file", file.fileName);
         let partNumber = 1;
         const parts = [];
         for await (const chunk of fileStream) {
@@ -50,6 +52,7 @@ const uploadFileStreams = async (config) => {
             try {
                 await (0, async_retry_1.default)(async () => {
                     const { ETag } = await S3.send(uploadPartCommand);
+                    console.log("upload part command sent successfully for file", file.fileName);
                     parts.push({ ETag: ETag, PartNumber: partNumber });
                     partNumber++;
                 }, {
@@ -76,12 +79,16 @@ const uploadFileStreams = async (config) => {
             },
         };
         const completeMultipartUploadCommand = new client_s3_1.CompleteMultipartUploadCommand(completeMultipartUploadParams);
+        console.log("file uploaded successfully for file. sending complete multipart request", file.fileName);
         await S3.send(completeMultipartUploadCommand);
+        console.log("multipart upload complete for file", file.fileName);
         const getObjectCommand = new client_s3_1.GetObjectCommand({
             Bucket: config.bucket,
             Key: fileKey,
         });
+        console.log("getting a signed url for file", file.fileName);
         const fileUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, getObjectCommand);
+        console.log("signed url successfully fetched for file", file.fileName);
         urls[file.fileName] = fileUrl;
     }));
     return urls;

package/package.json

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