importer-storage 1.0.21 → 1.0.26

package/dist/index.cjs

@@ -241,12 +241,14 @@ var S3Storage = class {
       return { result, errored };
     });
   }
-  removeTag(savePath, tags) {
+  removeTag(savePath, tags, options) {
     return __async(this, null, function* () {
       var _a;
+      const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+      console.info(`RemoveTag to bucket ${Bucket}`);
       const list = yield s3.send(
         new import_client_s3.ListObjectsCommand({
-          Bucket: BUCKET_NAME,
+          Bucket,
           Prefix: savePath + "/",
           MaxKeys: 1e3
         })
@@ -256,7 +258,7 @@ var S3Storage = class {
         if (!obj.Key) continue;
         const currentTags = yield s3.send(
           new import_client_s3.GetObjectTaggingCommand({
-            Bucket: BUCKET_NAME,
+            Bucket,
             Key: obj.Key
           })
         );
@@ -265,7 +267,7 @@ var S3Storage = class {
         )) || [];
         yield s3.send(
           new import_client_s3.PutObjectTaggingCommand({
-            Bucket: BUCKET_NAME,
+            Bucket,
             Key: obj.Key,
             Tagging: { TagSet: filteredTags }
           })
@@ -273,6 +275,57 @@ var S3Storage = class {
       }
     });
   }
+  addTag(savePath, tags, options) {
+    return __async(this, null, function* () {
+      var _a;
+      if (!tags.length) return;
+      const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+      console.info(`addTag to bucket ${Bucket}`);
+      const list = yield s3.send(
+        new import_client_s3.ListObjectsCommand({
+          Bucket,
+          Prefix: savePath + "/",
+          MaxKeys: 1e3
+        })
+      );
+      if (!list.Contents) return;
+      const tagsToAdd = tags.map((tag) => {
+        const [key, value] = tag.split(":");
+        if (!key || value === void 0) return null;
+        return { Key: key, Value: value };
+      }).filter((t) => t !== null);
+      if (!tagsToAdd.length) return;
+      for (const obj of list.Contents) {
+        if (!obj.Key) continue;
+        const currentTags = yield s3.send(
+          new import_client_s3.GetObjectTaggingCommand({
+            Bucket,
+            Key: obj.Key
+          })
+        );
+        const existing = (_a = currentTags.TagSet) != null ? _a : [];
+        const tagMap = /* @__PURE__ */ new Map();
+        for (const t of existing) {
+          if (!t.Key || t.Value === void 0) continue;
+          tagMap.set(t.Key, t.Value);
+        }
+        for (const t of tagsToAdd) {
+          tagMap.set(t.Key, t.Value);
+        }
+        const mergedTags = Array.from(tagMap.entries()).map(([Key, Value]) => ({
+          Key,
+          Value
+        }));
+        yield s3.send(
+          new import_client_s3.PutObjectTaggingCommand({
+            Bucket,
+            Key: obj.Key,
+            Tagging: { TagSet: mergedTags }
+          })
+        );
+      }
+    });
+  }
 };
 
 // src/index.ts

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-type StorageTag = "delete:60d" | "delete:1d";
+type StorageTag = "delete:60d" | "delete:1d" | "voted";
 
 interface IStorage {
     saveFiles(keys: Array<{
@@ -49,7 +49,12 @@ declare class S3Storage implements IStorage {
             message: string;
         }[];
     }>;
-    removeTag(savePath: string, tags: Array<StorageTag>): Promise<void>;
+    removeTag(savePath: string, tags: Array<StorageTag>, options?: {
+        bucketName: string;
+    }): Promise<void>;
+    addTag(savePath: string, tags: Array<StorageTag>, options?: {
+        bucketName: string;
+    }): Promise<void>;
 }
 
 declare const Storage: {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-type StorageTag = "delete:60d" | "delete:1d";
+type StorageTag = "delete:60d" | "delete:1d" | "voted";
 
 interface IStorage {
     saveFiles(keys: Array<{
@@ -49,7 +49,12 @@ declare class S3Storage implements IStorage {
             message: string;
         }[];
     }>;
-    removeTag(savePath: string, tags: Array<StorageTag>): Promise<void>;
+    removeTag(savePath: string, tags: Array<StorageTag>, options?: {
+        bucketName: string;
+    }): Promise<void>;
+    addTag(savePath: string, tags: Array<StorageTag>, options?: {
+        bucketName: string;
+    }): Promise<void>;
 }
 
 declare const Storage: {

package/dist/index.global.js

@@ -77051,12 +77051,14 @@ For more information please go to https://github.com/aws/aws-sdk-js-v3#functiona
         return { result, errored };
       });
     }
-    removeTag(savePath, tags) {
+    removeTag(savePath, tags, options) {
       return __async(this, null, function* () {
         var _a2;
+        const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+        console.info(`RemoveTag to bucket ${Bucket}`);
         const list = yield s32.send(
           new ListObjectsCommand({
-            Bucket: BUCKET_NAME,
+            Bucket,
             Prefix: savePath + "/",
             MaxKeys: 1e3
           })
@@ -77066,7 +77068,7 @@ For more information please go to https://github.com/aws/aws-sdk-js-v3#functiona
           if (!obj.Key) continue;
           const currentTags = yield s32.send(
             new GetObjectTaggingCommand({
-              Bucket: BUCKET_NAME,
+              Bucket,
               Key: obj.Key
             })
           );
@@ -77075,7 +77077,7 @@ For more information please go to https://github.com/aws/aws-sdk-js-v3#functiona
           )) || [];
           yield s32.send(
             new PutObjectTaggingCommand({
-              Bucket: BUCKET_NAME,
+              Bucket,
               Key: obj.Key,
               Tagging: { TagSet: filteredTags }
             })
@@ -77083,6 +77085,57 @@ For more information please go to https://github.com/aws/aws-sdk-js-v3#functiona
         }
       });
     }
+    addTag(savePath, tags, options) {
+      return __async(this, null, function* () {
+        var _a2;
+        if (!tags.length) return;
+        const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+        console.info(`addTag to bucket ${Bucket}`);
+        const list = yield s32.send(
+          new ListObjectsCommand({
+            Bucket,
+            Prefix: savePath + "/",
+            MaxKeys: 1e3
+          })
+        );
+        if (!list.Contents) return;
+        const tagsToAdd = tags.map((tag) => {
+          const [key, value] = tag.split(":");
+          if (!key || value === void 0) return null;
+          return { Key: key, Value: value };
+        }).filter((t5) => t5 !== null);
+        if (!tagsToAdd.length) return;
+        for (const obj of list.Contents) {
+          if (!obj.Key) continue;
+          const currentTags = yield s32.send(
+            new GetObjectTaggingCommand({
+              Bucket,
+              Key: obj.Key
+            })
+          );
+          const existing = (_a2 = currentTags.TagSet) != null ? _a2 : [];
+          const tagMap = /* @__PURE__ */ new Map();
+          for (const t5 of existing) {
+            if (!t5.Key || t5.Value === void 0) continue;
+            tagMap.set(t5.Key, t5.Value);
+          }
+          for (const t5 of tagsToAdd) {
+            tagMap.set(t5.Key, t5.Value);
+          }
+          const mergedTags = Array.from(tagMap.entries()).map(([Key, Value]) => ({
+            Key,
+            Value
+          }));
+          yield s32.send(
+            new PutObjectTaggingCommand({
+              Bucket,
+              Key: obj.Key,
+              Tagging: { TagSet: mergedTags }
+            })
+          );
+        }
+      });
+    }
   };
 
   // src/index.ts

package/dist/index.js

@@ -212,12 +212,14 @@ var S3Storage = class {
       return { result, errored };
     });
   }
-  removeTag(savePath, tags) {
+  removeTag(savePath, tags, options) {
     return __async(this, null, function* () {
       var _a;
+      const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+      console.info(`RemoveTag to bucket ${Bucket}`);
       const list = yield s3.send(
         new ListObjectsCommand({
-          Bucket: BUCKET_NAME,
+          Bucket,
           Prefix: savePath + "/",
           MaxKeys: 1e3
         })
@@ -227,7 +229,7 @@ var S3Storage = class {
         if (!obj.Key) continue;
         const currentTags = yield s3.send(
           new GetObjectTaggingCommand({
-            Bucket: BUCKET_NAME,
+            Bucket,
             Key: obj.Key
           })
         );
@@ -236,7 +238,7 @@ var S3Storage = class {
         )) || [];
         yield s3.send(
           new PutObjectTaggingCommand({
-            Bucket: BUCKET_NAME,
+            Bucket,
             Key: obj.Key,
             Tagging: { TagSet: filteredTags }
           })
@@ -244,6 +246,57 @@ var S3Storage = class {
       }
     });
   }
+  addTag(savePath, tags, options) {
+    return __async(this, null, function* () {
+      var _a;
+      if (!tags.length) return;
+      const Bucket = (options == null ? void 0 : options.bucketName) || BUCKET_NAME;
+      console.info(`addTag to bucket ${Bucket}`);
+      const list = yield s3.send(
+        new ListObjectsCommand({
+          Bucket,
+          Prefix: savePath + "/",
+          MaxKeys: 1e3
+        })
+      );
+      if (!list.Contents) return;
+      const tagsToAdd = tags.map((tag) => {
+        const [key, value] = tag.split(":");
+        if (!key || value === void 0) return null;
+        return { Key: key, Value: value };
+      }).filter((t) => t !== null);
+      if (!tagsToAdd.length) return;
+      for (const obj of list.Contents) {
+        if (!obj.Key) continue;
+        const currentTags = yield s3.send(
+          new GetObjectTaggingCommand({
+            Bucket,
+            Key: obj.Key
+          })
+        );
+        const existing = (_a = currentTags.TagSet) != null ? _a : [];
+        const tagMap = /* @__PURE__ */ new Map();
+        for (const t of existing) {
+          if (!t.Key || t.Value === void 0) continue;
+          tagMap.set(t.Key, t.Value);
+        }
+        for (const t of tagsToAdd) {
+          tagMap.set(t.Key, t.Value);
+        }
+        const mergedTags = Array.from(tagMap.entries()).map(([Key, Value]) => ({
+          Key,
+          Value
+        }));
+        yield s3.send(
+          new PutObjectTaggingCommand({
+            Bucket,
+            Key: obj.Key,
+            Tagging: { TagSet: mergedTags }
+          })
+        );
+      }
+    });
+  }
 };
 
 // src/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "importer-storage",
   "private": false,
-  "version": "1.0.21",
+  "version": "1.0.26",
   "main": "dist/index.js",
   "files": [
     "dist",