support project background + user avatar

2025-08-04 21:15:25 +02:00 · 2024-11-10 00:26:49 +07:00 · 2024-11-10 00:26:49 +07:00 · e84a2837ab
commit e84a2837ab
parent 84b0f91b44
13 changed files with 223 additions and 46 deletions
--- a/server/api/helpers/attachments/delete-one.js
+++ b/server/api/helpers/attachments/delete-one.js
@ -53,19 +53,26 @@ module.exports = {
      try {
        const type = attachment.type || 'local';
        if (type === 's3') {
-          const client = await sails.helpers.attachments.getSimpleStorageServiceClient();
+          const client = await sails.helpers.utils.getSimpleStorageServiceClient();
          if (client) {
-            const file1 = `${attachment.dirname}/${attachment.filename}`;
-            const file2 = `${attachment.dirname}/thumbnails/cover-256.png`;
-            await client.delete({ Key: file1 });
-            await client.delete({ Key: file2 });
+            if (attachment.url) {
+              const parsedUrl = new URL(attachment.url);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
+            if (attachment.thumb) {
+              const parsedUrl = new URL(attachment.thumb);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
          }
-        } else {
-          rimraf.sync(path.join(sails.config.custom.attachmentsPath, attachment.dirname));
        }
      } catch (error) {
        console.warn(error.stack); // eslint-disable-line no-console
      }
+      try {
+        rimraf.sync(path.join(sails.config.custom.attachmentsPath, attachment.dirname));
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }

      sails.sockets.broadcast(
        `board:${inputs.board.id}`,
--- a/server/api/helpers/attachments/process-uploaded-file.js
+++ b/server/api/helpers/attachments/process-uploaded-file.js
@ -23,11 +23,11 @@ module.exports = {
    const rootPath = path.join(sails.config.custom.attachmentsPath, dirname);
    const filePath = path.join(rootPath, filename);

-    if (sails.config.custom.attachmentsS3) {
-      const client = await sails.helpers.attachments.getSimpleStorageServiceClient();
+    if (sails.config.custom.s3Config) {
+      const client = await sails.helpers.utils.getSimpleStorageServiceClient();
      const s3Image = await client.upload({
        Body: fs.createReadStream(inputs.file.fd),
-        Key: `${dirname}/${filename}`,
+        Key: `attachments/${dirname}/${filename}`,
        ContentType: inputs.file.type,
      });

@ -72,7 +72,7 @@ module.exports = {
            )
            .toBuffer();
          const s3Thumb = await client.upload({
-            Key: `${dirname}/thumbnails/cover-256.${thumbnailsExtension}`,
+            Key: `attachments/${dirname}/thumbnails/cover-256.${thumbnailsExtension}`,
            Body: resizeBuffer,
            ContentType: inputs.file.type,
          });
@ -83,6 +83,12 @@ module.exports = {
        }
      }

+      try {
+        rimraf.sync(inputs.file.fd);
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }
+
      return fileData;
    }

--- a/server/api/helpers/projects/process-uploaded-background-image-file.js
+++ b/server/api/helpers/projects/process-uploaded-background-image-file.js
@ -33,9 +33,6 @@ module.exports = {
    }

    const dirname = uuid();
-    const rootPath = path.join(sails.config.custom.projectBackgroundImagesPath, dirname);
-
-    fs.mkdirSync(rootPath);

    let { width, pageHeight: height = metadata.height } = metadata;
    if (metadata.orientation && metadata.orientation > 4) {
@ -44,6 +41,64 @@ module.exports = {

    const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;

+    if (sails.config.custom.s3Config) {
+      const client = await sails.helpers.utils.getSimpleStorageServiceClient();
+      let originalUrl = '';
+      let thumbUrl = '';
+
+      try {
+        const s3Original = await client.upload({
+          Body: await image.toBuffer(),
+          Key: `project-background-images/${dirname}/original.${extension}`,
+          ContentType: inputs.file.type,
+        });
+        originalUrl = s3Original.Location;
+
+        const resizeBuffer = await image
+          .resize(
+            336,
+            200,
+            width < 336 || height < 200
+              ? {
+                  kernel: sharp.kernel.nearest,
+                }
+              : undefined,
+          )
+          .toBuffer();
+        const s3Thumb = await client.upload({
+          Body: resizeBuffer,
+          Key: `project-background-images/${dirname}/cover-336.${extension}`,
+          ContentType: inputs.file.type,
+        });
+        thumbUrl = s3Thumb.Location;
+      } catch (error1) {
+        try {
+          client.delete({ Key: `project-background-images/${dirname}/original.${extension}` });
+        } catch (error2) {
+          console.warn(error2.stack); // eslint-disable-line no-console
+        }
+
+        throw 'fileIsNotImage';
+      }
+
+      try {
+        rimraf.sync(inputs.file.fd);
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }
+
+      return {
+        dirname,
+        extension,
+        original: originalUrl,
+        thumb: thumbUrl,
+      };
+    }
+
+    const rootPath = path.join(sails.config.custom.projectBackgroundImagesPath, dirname);
+
+    fs.mkdirSync(rootPath);
+
    try {
      await image.toFile(path.join(rootPath, `original.${extension}`));

--- a/server/api/helpers/projects/update-one.js
+++ b/server/api/helpers/projects/update-one.js
@ -86,6 +86,21 @@ module.exports = {
        (!project.backgroundImage ||
          project.backgroundImage.dirname !== inputs.record.backgroundImage.dirname)
      ) {
+        try {
+          if (sails.config.custom.s3Config) {
+            const client = await sails.helpers.utils.getSimpleStorageServiceClient();
+            if (client && inputs.record.backgroundImage && inputs.record.backgroundImage.original) {
+              const parsedUrl = new URL(inputs.record.backgroundImage.original);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
+            if (client && inputs.record.backgroundImage && inputs.record.backgroundImage.thumb) {
+              const parsedUrl = new URL(inputs.record.backgroundImage.thumb);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
+          }
+        } catch (error) {
+          console.warn(error.stack); // eslint-disable-line no-console
+        }
        try {
          rimraf.sync(
            path.join(
--- a/server/api/helpers/users/process-uploaded-avatar-file.js
+++ b/server/api/helpers/users/process-uploaded-avatar-file.js
@ -33,9 +33,6 @@ module.exports = {
    }

    const dirname = uuid();
-    const rootPath = path.join(sails.config.custom.userAvatarsPath, dirname);
-
-    fs.mkdirSync(rootPath);

    let { width, pageHeight: height = metadata.height } = metadata;
    if (metadata.orientation && metadata.orientation > 4) {
@ -44,6 +41,64 @@ module.exports = {

    const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;

+    if (sails.config.custom.s3Config) {
+      const client = await sails.helpers.utils.getSimpleStorageServiceClient();
+      let originalUrl = '';
+      let squareUrl = '';
+
+      try {
+        const s3Original = await client.upload({
+          Body: await image.toBuffer(),
+          Key: `user-avatars/${dirname}/original.${extension}`,
+          ContentType: inputs.file.type,
+        });
+        originalUrl = s3Original.Location;
+
+        const resizeBuffer = await image
+          .resize(
+            100,
+            100,
+            width < 100 || height < 100
+              ? {
+                  kernel: sharp.kernel.nearest,
+                }
+              : undefined,
+          )
+          .toBuffer();
+        const s3Square = await client.upload({
+          Body: resizeBuffer,
+          Key: `user-avatars/${dirname}/square-100.${extension}`,
+          ContentType: inputs.file.type,
+        });
+        squareUrl = s3Square.Location;
+      } catch (error1) {
+        try {
+          client.delete({ Key: `user-avatars/${dirname}/original.${extension}` });
+        } catch (error2) {
+          console.warn(error2.stack); // eslint-disable-line no-console
+        }
+
+        throw 'fileIsNotImage';
+      }
+
+      try {
+        rimraf.sync(inputs.file.fd);
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }
+
+      return {
+        dirname,
+        extension,
+        original: originalUrl,
+        square: squareUrl,
+      };
+    }
+
+    const rootPath = path.join(sails.config.custom.userAvatarsPath, dirname);
+
+    fs.mkdirSync(rootPath);
+
    try {
      await image.toFile(path.join(rootPath, `original.${extension}`));

--- a/server/api/helpers/users/update-one.js
+++ b/server/api/helpers/users/update-one.js
@ -101,6 +101,21 @@ module.exports = {
        inputs.record.avatar &&
        (!user.avatar || user.avatar.dirname !== inputs.record.avatar.dirname)
      ) {
+        try {
+          if (sails.config.custom.s3Config) {
+            const client = await sails.helpers.utils.getSimpleStorageServiceClient();
+            if (client && inputs.record.avatar && inputs.record.avatar.original) {
+              const parsedUrl = new URL(inputs.record.avatar.original);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
+            if (client && inputs.record.avatar && inputs.record.avatar.square) {
+              const parsedUrl = new URL(inputs.record.avatar.square);
+              await client.delete({ Key: parsedUrl.pathname.replace(/^\/+/, '') });
+            }
+          }
+        } catch (error) {
+          console.warn(error.stack); // eslint-disable-line no-console
+        }
        try {
          rimraf.sync(path.join(sails.config.custom.userAvatarsPath, inputs.record.avatar.dirname));
        } catch (error) {
--- a/server/api/helpers/attachments/get-simple-storage-service-client.js
+++ b/server/api/helpers/attachments/get-simple-storage-service-client.js
@ -37,8 +37,8 @@ class S3Client {

 module.exports = {
  fn() {
-    if (sails.config.custom.attachmentsS3) {
-      return new S3Client(sails.config.custom.attachmentsS3);
+    if (sails.config.custom.s3Config) {
+      return new S3Client(sails.config.custom.s3Config);
    }
    return null;
  },