ag-common 0.0.737 → 0.0.739

package/dist/api/helpers/s3.d.ts

@@ -7,13 +7,16 @@ export type StorageConfig = {
     region?: string;
     endpoint?: string;
     accountId?: string;
+    accessKeyId?: string;
+    secretAccessKey?: string;
 } | {
     provider: 'r2';
     accountId: string;
+    accessKeyId?: string;
+    secretAccessKey?: string;
 };
 export declare const createStorageClient: (config: StorageConfig) => S3Client;
-export declare const setS3: (config: StorageConfig) => S3Client;
-export declare const s3: S3Client;
+export declare const setS3: (config: StorageConfig) => void;
 export declare const getS3Object: ({ fileurl: { Bucket, Key }, }: {
     fileurl: {
         Bucket: string;

package/dist/api/helpers/s3.js

@@ -22,7 +22,7 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyFile = exports.deleteFiles = exports.deleteFile = exports.putS3Object = exports.getS3Object = exports.s3 = exports.setS3 = exports.createStorageClient = void 0;
+exports.copyFile = exports.deleteFiles = exports.deleteFile = exports.putS3Object = exports.getS3Object = exports.setS3 = exports.createStorageClient = void 0;
 exports.getS3Objects = getS3Objects;
 exports.listFiles = listFiles;
 exports.getPresignedPostURL = getPresignedPostURL;
@@ -59,10 +59,14 @@ const createStorageClient = (config) => {
         if (!accountId) {
             throw new Error('Account ID is required for R2. Set CLOUDFLARE_ACCOUNT_ID env var or provide accountId in config');
         }
-        client = new client_s3_1.S3Client({
-            endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
-            forcePathStyle: true,
-        });
+        client = new client_s3_1.S3Client(Object.assign({ endpoint: `https://${accountId}.r2.cloudflarestorage.com`, forcePathStyle: true }, (config.accessKeyId && config.secretAccessKey
+            ? {
+                credentials: {
+                    accessKeyId: config.accessKeyId,
+                    secretAccessKey: config.secretAccessKey,
+                },
+            }
+            : {})));
     }
     else {
         client = new client_s3_1.S3Client({
@@ -73,15 +77,18 @@ const createStorageClient = (config) => {
     return client;
 };
 exports.createStorageClient = createStorageClient;
-const setS3 = (config) => (0, exports.createStorageClient)(config);
+let s3;
+const setS3 = (config) => {
+    s3 = (0, exports.createStorageClient)(config);
+};
 exports.setS3 = setS3;
-exports.s3 = (0, exports.setS3)({
+(0, exports.setS3)({
     provider: 's3',
     region: 'ap-southeast-2',
 });
 const getS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ fileurl: { Bucket, Key }, }) {
     try {
-        const r = yield exports.s3.send(new client_s3_1.GetObjectCommand({ Bucket, Key }));
+        const r = yield s3.send(new client_s3_1.GetObjectCommand({ Bucket, Key }));
         if (!r.Body) {
             throw new Error('no body returned');
         }
@@ -120,7 +127,7 @@ function getS3Objects(_a) {
 }
 const putS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Body, Bucket, Key, ContentType, CacheControl = 'public, max-age=300', }) {
     try {
-        yield exports.s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType, CacheControl }));
+        yield s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType, CacheControl }));
         return {};
     }
     catch (e) {
@@ -130,7 +137,7 @@ const putS3Object = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Body, B
 exports.putS3Object = putS3Object;
 const deleteFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, Key, }) {
     try {
-        yield exports.s3.send(new client_s3_1.DeleteObjectCommand({ Bucket, Key }));
+        yield s3.send(new client_s3_1.DeleteObjectCommand({ Bucket, Key }));
         return {};
     }
     catch (e) {
@@ -146,7 +153,7 @@ const deleteFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket,
         while (toDelete.length > 0) {
             const { part, rest } = (0, array_1.take)(toDelete, 900);
             toDelete = rest;
-            const res = yield exports.s3.send(new client_s3_1.DeleteObjectsCommand({
+            const res = yield s3.send(new client_s3_1.DeleteObjectsCommand({
                 Bucket,
                 Delete: { Objects: part },
             }));
@@ -166,7 +173,7 @@ exports.deleteFiles = deleteFiles;
 const copyFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Bucket, fromKey, toKey, deleteSource = false, }) {
     try {
         (0, log_1.debug)(`copying s3 file from ${Bucket}- ${fromKey} to ${toKey}`);
-        yield exports.s3.send(new client_s3_1.CopyObjectCommand({
+        yield s3.send(new client_s3_1.CopyObjectCommand({
             //incl bucket
             CopySource: Bucket + '/' + fromKey,
             //dest
@@ -193,7 +200,7 @@ function listFiles(bucketName, opt) {
             const ret = [];
             let response;
             do {
-                response = yield exports.s3.send(new client_s3_1.ListObjectsV2Command({
+                response = yield s3.send(new client_s3_1.ListObjectsV2Command({
                     Bucket: bucketName,
                     ContinuationToken: response === null || response === void 0 ? void 0 : response.NextContinuationToken,
                     Prefix: opt === null || opt === void 0 ? void 0 : opt.prefix,
@@ -226,7 +233,7 @@ function listFiles(bucketName, opt) {
 function getPresignedPostURL(_a) {
     return __awaiter(this, arguments, void 0, function* ({ bucket, key, maxMb = 5, }) {
         try {
-            const ps = yield (0, s3_presigned_post_1.createPresignedPost)(exports.s3, {
+            const ps = yield (0, s3_presigned_post_1.createPresignedPost)(s3, {
                 Bucket: bucket,
                 Key: key,
                 Expires: 600,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.737",
+  "version": "0.0.739",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",