@empiricalrun/r2-uploader 0.3.8 → 0.3.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/r2-uploader
 
+## 0.3.10
+
+### Patch Changes
+
+- 9f33a7a: chore: fetch r2 files with suffix, add created_at to summary
+
+## 0.3.9
+
+### Patch Changes
+
+- 21b0768: feat: add send invoice and signed url capability to r2-uploader
+
 ## 0.3.8
 
 ### Patch Changes

package/dist/delete.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteFile = void 0;
+exports.deleteFile = deleteFile;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const logger_1 = require("./logger");
 async function deleteFile(fileKey, config) {
@@ -26,4 +26,3 @@ async function deleteFile(fileKey, config) {
         throw error;
     }
 }
-exports.deleteFile = deleteFile;

package/dist/fetch.d.ts

@@ -3,5 +3,11 @@ export declare const fetchFiles: (config: R2FetchConfig) => Promise<{
     key: string;
     lastModified: Date;
     size: number;
-}[] | undefined>;
+    signedUrl: string;
+}[] | {
+    key: string;
+    lastModified: Date;
+    size: number;
+    signedUrl: undefined;
+}[]>;
 //# sourceMappingURL=fetch.d.ts.map

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;;;;gBA2BrD,CAAC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,eAAO,MAAM,UAAU,GAAU,QAAQ,aAAa;;;;;;;;;;IAmDrD,CAAC"}

package/dist/fetch.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchFiles = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
+const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const fetchFiles = async (config) => {
     const S3 = new client_s3_1.S3Client({
         region: "auto",
@@ -14,6 +15,7 @@ const fetchFiles = async (config) => {
     const params = {
         Bucket: config.bucket,
         Prefix: config.prefix,
+        MaxKeys: 20_000,
     };
     const cmd = new client_s3_1.ListObjectsV2Command(params);
     const data = await S3.send(cmd);
@@ -21,12 +23,32 @@ const fetchFiles = async (config) => {
     if (KeyCount === 0) {
         return [];
     }
+    const filteredContents = config.suffix
+        ? Contents?.filter((c) => c.Key.endsWith(config.suffix)) || []
+        : Contents || [];
+    if (config.withSignedUrl) {
+        return Promise.all(filteredContents.map(async (c) => {
+            const key = c.Key;
+            const getObjectCmd = new client_s3_1.GetObjectCommand({
+                Bucket: config.bucket,
+                Key: key,
+            });
+            const signedUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, getObjectCmd);
+            return {
+                key,
+                lastModified: c.LastModified,
+                size: c.Size,
+                signedUrl,
+            };
+        }));
+    }
     else {
-        return Contents?.map((c) => {
+        return filteredContents.map((c) => {
             return {
                 key: c.Key,
                 lastModified: c.LastModified,
                 size: c.Size,
+                signedUrl: undefined,
             };
         });
     }

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 interface R2BaseConfig {
     accountId: string;
     accessKeyId: string;
@@ -23,6 +22,8 @@ export interface R2UploadBufferConfig extends R2BaseConfig {
 }
 export interface R2FetchConfig extends R2BaseConfig {
     prefix: string;
+    withSignedUrl?: boolean;
+    suffix?: string;
 }
 export interface R2DeleteConfig extends R2BaseConfig {
 }

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACpE;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAClE;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;CAAG;AAEvD,MAAM,WAAW,OAAO;IACtB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACpE;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAClE;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;CAAG;AAEvD,MAAM,WAAW,OAAO;IACtB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB"}

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

@@ -1 +1 @@
-{"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"}
+{"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,GAAU,QAAQ,oBAAoB,qBA+FnE,CAAC"}

package/dist/upload/buffer.js

@@ -64,13 +64,14 @@ const uploadFileBuffers = async (config) => {
             }, {
                 retries: 5,
                 factor: 3,
-                minTimeout: 1000,
-                maxTimeout: 60000,
+                minTimeout: 1_000,
+                maxTimeout: 60_000,
                 randomize: true,
                 onRetry: (err, i) => {
                     if (err) {
                         const error = err;
                         logger_1.logger.warn("Upload retry attempt:", i, ":", file.fileName);
+                        // TODO: r2-uploader Response status: undefined
                         logger_1.logger.warn("Response status:", error.$response?.statusCode);
                     }
                 },
@@ -79,6 +80,7 @@ const uploadFileBuffers = async (config) => {
         catch (err) {
             const error = err;
             logger_1.logger.error(`R2 Error - ${file.fileName} \nError: ${error}`);
+            // TODO: r2-uploader Upload response undefined with status undefined
             logger_1.logger.error("Upload response", error.$response, "with status", error.$metadata.httpStatusCode);
         }
         return;

package/dist/upload/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FileMap } from "../types";
 export declare function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBucket, accountId, accessKeyId, secretAccessKey, }: {
     sourceDir: string;

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

@@ -1 +1 @@
-{"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"}
+{"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

@@ -15,18 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadInMemoryFiles = exports.uploadDirectory = void 0;
+exports.uploadDirectory = uploadDirectory;
+exports.uploadInMemoryFiles = uploadInMemoryFiles;
 const fs = __importStar(require("fs"));
 const mime_1 = __importDefault(require("mime"));
 const logger_1 = require("../logger");
@@ -68,7 +79,6 @@ async function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBuck
     const uploadedFiles = await (0, stream_1.uploadFileStreams)(config);
     return uploadedFiles;
 }
-exports.uploadDirectory = uploadDirectory;
 async function uploadInMemoryFiles({ files, destinationDir, uploadBucket, accountId, accessKeyId, secretAccessKey, }) {
     const config = {
         accountId: accountId || process.env.R2_ACCOUNT_ID,
@@ -80,4 +90,3 @@ async function uploadInMemoryFiles({ files, destinationDir, uploadBucket, accoun
     };
     return await (0, buffer_1.uploadFileBuffers)(config);
 }
-exports.uploadInMemoryFiles = uploadInMemoryFiles;

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,WAAkB,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,qBAkHnE,CAAC"}

package/dist/upload/stream.js

@@ -59,8 +59,8 @@ const uploadFileStreams = async (config) => {
                 }, {
                     retries: 5,
                     factor: 3,
-                    minTimeout: 1000,
-                    maxTimeout: 60000,
+                    minTimeout: 1_000,
+                    maxTimeout: 60_000,
                     randomize: true,
                     onRetry: (err, i) => {
                         logger_1.logger.debug("Upload part retry attempt:", i, ":", file.fullPath);

package/eslint.config.mjs

@@ -0,0 +1,16 @@
+import libraryConfig from "../eslint-config/library.mjs";
+import tsParser from "@typescript-eslint/parser";
+
+export default [
+  ...libraryConfig,
+  {
+    files: ["src/**/*.ts", "src/**/*.tsx"],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        project: "./tsconfig.lint.json",
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+];

package/package.json

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

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/delete.ts","./src/fetch.ts","./src/index.ts","./src/logger.ts","./src/types.ts","./src/upload/buffer.ts","./src/upload/index.ts","./src/upload/stream.ts"],"version":"5.8.3"}