@empiricalrun/r2-uploader 0.3.5 → 0.3.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/r2-uploader
 
+## 0.3.7
+
+### Patch Changes
+
+- 5231c86: fix: print full path for files in log
+
+## 0.3.6
+
+### Patch Changes
+
+- a1e8599: feat: add log levels for r2 uploader
+
 ## 0.3.5
 
 ### Patch Changes

package/dist/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../src/delete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,mEAqBvE"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../src/delete.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,mEAqBvE"}

package/dist/delete.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFile = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
+const logger_1 = require("./logger");
 async function deleteFile(fileKey, config) {
     const s3Client = new client_s3_1.S3Client({
         region: "auto",
@@ -21,7 +22,7 @@ async function deleteFile(fileKey, config) {
         return response;
     }
     catch (error) {
-        console.error(`Error deleting file from R2: ${error}`);
+        logger_1.logger.error(`Error deleting file from R2: ${error}`);
         throw error;
     }
 }

package/dist/logger.d.ts

@@ -0,0 +1,3 @@
+import Logger from "console-log-level";
+export declare const logger: Logger.Logger;
+//# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAyB,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,MAAM,eAGjB,CAAC"}

package/dist/logger.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = void 0;
+const console_log_level_1 = __importDefault(require("console-log-level"));
+exports.logger = (0, console_log_level_1.default)({
+    prefix: "r2-uploader",
+    level: process.env.LOG_LEVEL || "info",
+});

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

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

package/dist/upload/buffer.js

@@ -9,6 +9,7 @@ const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const async_retry_1 = __importDefault(require("async-retry"));
 const md5_1 = __importDefault(require("md5"));
 const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
 const uploadFileBuffers = async (config) => {
     const map = new Map();
     const urls = {};
@@ -69,16 +70,16 @@ const uploadFileBuffers = async (config) => {
                 onRetry: (err, i) => {
                     if (err) {
                         const error = err;
-                        console.log("Upload retry attempt:", i, ":", file.fileName);
-                        console.log("Response status:", error.$response?.statusCode);
+                        logger_1.logger.warn("Upload retry attempt:", i, ":", file.fileName);
+                        logger_1.logger.warn("Response status:", error.$response?.statusCode);
                     }
                 },
             });
         }
         catch (err) {
             const error = err;
-            console.log(`R2 Error - ${file.fileName} \nError: ${error}`);
-            console.log("Upload response", error.$response, "with status", error.$metadata.httpStatusCode);
+            logger_1.logger.error(`R2 Error - ${file.fileName} \nError: ${error}`);
+            logger_1.logger.error("Upload response", error.$response, "with status", error.$metadata.httpStatusCode);
         }
         return;
     }));

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upload/index.ts"],"names":[],"mappings":";AAIA,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

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadInMemoryFiles = exports.uploadDirectory = void 0;
 const fs = __importStar(require("fs"));
 const mime_1 = __importDefault(require("mime"));
+const logger_1 = require("../logger");
 const buffer_1 = require("./buffer");
 const stream_1 = require("./stream");
 const getFileList = (dir) => {
@@ -55,7 +56,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));
+    logger_1.logger.debug("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,qBA+GnE,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,WAAkB,oBAAoB,qBAkHnE,CAAC"}

package/dist/upload/stream.js

@@ -9,6 +9,7 @@ const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const async_retry_1 = __importDefault(require("async-retry"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
 const uploadFileStreams = async (config) => {
     const urls = {};
     const S3 = new client_s3_1.S3Client({
@@ -31,13 +32,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);
+        logger_1.logger.debug("sending a multipart upload command for file", file.fullPath);
         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);
+        logger_1.logger.debug("file stream created successfully for file", file.fullPath);
         let partNumber = 1;
         const parts = [];
         for await (const chunk of fileStream) {
@@ -52,7 +53,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);
+                    logger_1.logger.debug("upload part command sent successfully for file", file.fullPath);
                     parts.push({ ETag: ETag, PartNumber: partNumber });
                     partNumber++;
                 }, {
@@ -62,12 +63,12 @@ const uploadFileStreams = async (config) => {
                     maxTimeout: 60000,
                     randomize: true,
                     onRetry: (err, i) => {
-                        console.log("Upload part retry attempt:", i, ":", file.fileName);
+                        logger_1.logger.debug("Upload part retry attempt:", i, ":", file.fullPath);
                     },
                 });
             }
             catch (err) {
-                console.log(`R2 Error - ${file.fileName} \nError: ${err}`);
+                logger_1.logger.error(`R2 Error - ${file.fullPath} \nError: ${err}`);
             }
         }
         const completeMultipartUploadParams = {
@@ -79,16 +80,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);
+        logger_1.logger.debug("file uploaded successfully for file. sending complete multipart request", file.fullPath);
         await S3.send(completeMultipartUploadCommand);
-        console.log("multipart upload complete for file", file.fileName);
+        logger_1.logger.debug("multipart upload complete for file", file.fullPath);
         const getObjectCommand = new client_s3_1.GetObjectCommand({
             Bucket: config.bucket,
             Key: fileKey,
         });
-        console.log("getting a signed url for file", file.fileName);
+        logger_1.logger.debug("getting a signed url for file", file.fullPath);
         const fileUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, getObjectCommand);
-        console.log("signed url successfully fetched for file", file.fileName);
+        logger_1.logger.debug("signed url successfully fetched for file", file.fullPath);
         urls[file.fileName] = fileUrl;
     }));
     return urls;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/r2-uploader",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -18,9 +18,13 @@
     "@types/md5": "^2.3.5",
     "@types/mime": "3.0.0",
     "async-retry": "^1.3.3",
+    "console-log-level": "^1.4.1",
     "md5": "^2.3.0",
     "mime": "3.0.0"
   },
+  "devDependencies": {
+    "@types/console-log-level": "^1.4.5"
+  },
   "scripts": {
     "dev": "tsc --build --watch",
     "build": "tsc --build",