Merge pull request #952 from hydralauncher/feat/process-profile-image

feat: process profile image

package.json

@@ -53,7 +53,6 @@
     "electron-log": "^5.1.4",
     "electron-updater": "^6.1.8",
     "fetch-cookie": "^3.0.1",
-    "file-type": "^19.0.0",
     "flexsearch": "^0.7.43",
     "i18next": "^23.11.2",
     "i18next-browser-languagedetector": "^7.2.1",

requirements.txt

@@ -4,3 +4,4 @@ cx_Logging; sys_platform == 'win32'
 lief; sys_platform == 'win32'
 pywin32; sys_platform == 'win32'
 psutil
+Pillow

src/locales/en/translation.json

@@ -273,6 +273,7 @@
     "no_pending_invites": "You have no pending invites",
     "no_blocked_users": "You have no blocked users",
     "friend_code_copied": "Friend code copied",
-    "undo_friendship_modal_text": "This will undo your friendship with {{displayName}}"
+    "undo_friendship_modal_text": "This will undo your friendship with {{displayName}}",
+    "image_process_failure": "Failure while processing the image"
   }
 }

src/locales/pt-BR/translation.json

@@ -276,6 +276,7 @@
     "no_pending_invites": "Você não possui convites de amizade pendentes",
     "no_blocked_users": "Você não tem nenhum usuário bloqueado",
     "friend_code_copied": "Código de amigo copiado",
-    "undo_friendship_modal_text": "Isso irá remover sua amizade com {{displayName}}"
+    "undo_friendship_modal_text": "Isso irá remover sua amizade com {{displayName}}",
+    "image_process_failure": "Falha ao processar a imagem"
   }
 }

src/locales/pt-PT/translation.json

@@ -277,6 +277,7 @@
     "pending": "Pendentes",
     "no_pending_invites": "Não tens convites de amizade pendentes",
     "no_blocked_users": "Não tens nenhum utilizador bloqueado",
-    "friend_code_copied": "Código de amigo copiado"
+    "friend_code_copied": "Código de amigo copiado",
+    "image_process_failure": "Falha ao processar a imagem"
   }
 }

src/main/events/index.ts

@@ -53,6 +53,7 @@ import "./profile/get-me";
 import "./profile/undo-friendship";
 import "./profile/update-friend-request";
 import "./profile/update-profile";
+import "./profile/process-profile-image";
 import "./profile/send-friend-request";
 import { isPortableVersion } from "@main/helpers";
 

src/main/events/profile/process-profile-image.ts

@@ -0,0 +1,11 @@
+import { registerEvent } from "../register-event";
+import { PythonInstance } from "@main/services";
+
+const processProfileImage = async (
+  _event: Electron.IpcMainInvokeEvent,
+  path: string
+) => {
+  return PythonInstance.processProfileImage(path);
+};
+
+registerEvent("processProfileImage", processProfileImage);

src/main/events/profile/update-profile.ts

@@ -1,46 +1,54 @@
 import { registerEvent } from "../register-event";
-import { HydraApi } from "@main/services";
+import { HydraApi, PythonInstance } from "@main/services";
-import axios from "axios";
 import fs from "node:fs";
 import path from "node:path";
-import { fileTypeFromFile } from "file-type";
+import type { UpdateProfileProps, UserProfile } from "@types";
-import { UpdateProfileProps, UserProfile } from "@types";
+import { omit } from "lodash-es";
+import axios from "axios";
+
+interface PresignedResponse {
+  presignedUrl: string;
+  profileImageUrl: string;
+}
 
 const patchUserProfile = async (updateProfile: UpdateProfileProps) => {
-  return HydraApi.patch("/profile", updateProfile);
+  return HydraApi.patch<UserProfile>("/profile", updateProfile);
+};
+
+const getNewProfileImageUrl = async (localImageUrl: string) => {
+  const { imagePath, mimeType } =
+    await PythonInstance.processProfileImage(localImageUrl);
+
+  const stats = fs.statSync(imagePath);
+  const fileBuffer = fs.readFileSync(imagePath);
+  const fileSizeInBytes = stats.size;
+
+  const { presignedUrl, profileImageUrl } =
+    await HydraApi.post<PresignedResponse>(`/presigned-urls/profile-image`, {
+      imageExt: path.extname(imagePath).slice(1),
+      imageLength: fileSizeInBytes,
+    });
+
+  await axios.put(presignedUrl, fileBuffer, {
+    headers: {
+      "Content-Type": mimeType,
+    },
+  });
+
+  return profileImageUrl;
 };
 
 const updateProfile = async (
   _event: Electron.IpcMainInvokeEvent,
   updateProfile: UpdateProfileProps
-): Promise<UserProfile> => {
+) => {
   if (!updateProfile.profileImageUrl) {
-    return patchUserProfile(updateProfile);
+    return patchUserProfile(omit(updateProfile, "profileImageUrl"));
   }
 
-  const newProfileImagePath = updateProfile.profileImageUrl;
+  const profileImageUrl = await getNewProfileImageUrl(
-
+    updateProfile.profileImageUrl
-  const stats = fs.statSync(newProfileImagePath);
+  ).catch(() => undefined);
-  const fileBuffer = fs.readFileSync(newProfileImagePath);
-  const fileSizeInBytes = stats.size;
-
-  const profileImageUrl = await HydraApi.post(`/presigned-urls/profile-image`, {
-    imageExt: path.extname(newProfileImagePath).slice(1),
-    imageLength: fileSizeInBytes,
-  })
-    .then(async (preSignedResponse) => {
-      const { presignedUrl, profileImageUrl } = preSignedResponse;
-
-      const mimeType = await fileTypeFromFile(newProfileImagePath);
-
-      await axios.put(presignedUrl, fileBuffer, {
-        headers: {
-          "Content-Type": mimeType?.mime,
-        },
-      });
-      return profileImageUrl as string;
-    })
-    .catch(() => undefined);
 
   return patchUserProfile({ ...updateProfile, profileImageUrl });
 };

src/main/services/download/python-instance.ts

@@ -166,6 +166,14 @@ export class PythonInstance {
     this.downloadingGameId = -1;
   }
 
+  static async processProfileImage(imagePath: string) {
+    return this.rpc
+      .post<{ imagePath: string; mimeType: string }>("/profile-image", {
+        image_path: imagePath,
+      })
+      .then((response) => response.data);
+  }
+
   private static async handleRpcError(_error: unknown) {
     await this.rpc.get("/healthcheck").catch(() => {
       logger.error(

src/preload/index.ts

@@ -141,6 +141,8 @@ contextBridge.exposeInMainWorld("electron", {
     ipcRenderer.invoke("undoFriendship", userId),
   updateProfile: (updateProfile: UpdateProfileProps) =>
     ipcRenderer.invoke("updateProfile", updateProfile),
+  processProfileImage: (imagePath: string) =>
+    ipcRenderer.invoke("processProfileImage", imagePath),
   getFriendRequests: () => ipcRenderer.invoke("getFriendRequests"),
   updateFriendRequest: (userId: string, action: FriendRequestAction) =>
     ipcRenderer.invoke("updateFriendRequest", userId, action),

src/renderer/src/declaration.d.ts

@@ -144,6 +144,9 @@ declare global {
     getMe: () => Promise<UserProfile | null>;
     undoFriendship: (userId: string) => Promise<void>;
     updateProfile: (updateProfile: UpdateProfileProps) => Promise<UserProfile>;
+    processProfileImage: (
+      path: string
+    ) => Promise<{ imagePath: string; mimeType: string }>;
     getFriendRequests: () => Promise<FriendRequest[]>;
     updateFriendRequest: (
       userId: string,

src/renderer/src/pages/user/user-profile-settings-modal/user-edit-profile.tsx

@@ -5,7 +5,8 @@ import { UserProfile } from "@types";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import * as styles from "../user.css";
-import { SPACING_UNIT } from "@renderer/theme.css";
+import { SPACING_UNIT, vars } from "@renderer/theme.css";
+import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
 
 export interface UserEditProfileProps {
   userProfile: UserProfile;
@@ -21,9 +22,10 @@ export const UserEditProfile = ({
   const [form, setForm] = useState({
     displayName: userProfile.displayName,
     profileVisibility: userProfile.profileVisibility,
-    imageProfileUrl: null as string | null,
+    profileImageUrl: null as string | null,
   });
   const [isSaving, setIsSaving] = useState(false);
+  const [isLoadingImage, setIsLoadingImage] = useState(false);
 
   const { patchUser } = useUserDetails();
 
@@ -53,9 +55,17 @@ export const UserEditProfile = ({
     });
 
     if (filePaths && filePaths.length > 0) {
-      const path = filePaths[0];
+      setIsLoadingImage(true);
 
-      setForm({ ...form, imageProfileUrl: path });
+      const { imagePath } = await window.electron
+        .processProfileImage(filePaths[0])
+        .catch(() => {
+          showErrorToast(t("image_process_failure"));
+          return { imagePath: null };
+        })
+        .finally(() => setIsLoadingImage(false));
+
+      setForm({ ...form, profileImageUrl: imagePath });
     }
   };
 
@@ -85,13 +95,32 @@ export const UserEditProfile = ({
       });
   };
 
-  const avatarUrl = useMemo(() => {
+  const profileImageUrl = useMemo(() => {
-    if (form.imageProfileUrl) return `local:${form.imageProfileUrl}`;
+    if (form.profileImageUrl) return `local:${form.profileImageUrl}`;
     if (userProfile.profileImageUrl) return userProfile.profileImageUrl;
     return null;
   }, [form, userProfile]);
 
+  const profileImageContent = () => {
+    if (isLoadingImage) {
+      return <Skeleton className={styles.profileAvatar} />;
+    }
+
+    if (profileImageUrl) {
       return (
+        <img
+          className={styles.profileAvatar}
+          alt={userProfile.displayName}
+          src={profileImageUrl}
+        />
+      );
+    }
+
+    return <PersonIcon size={96} />;
+  };
+
+  return (
+    <SkeletonTheme baseColor={vars.color.background} highlightColor="#444">
       <form
         onSubmit={handleSaveProfile}
         style={{
@@ -107,15 +136,7 @@ export const UserEditProfile = ({
           className={styles.profileAvatarEditContainer}
           onClick={handleChangeProfileAvatar}
         >
-        {avatarUrl ? (
+          {profileImageContent()}
-          <img
-            className={styles.profileAvatar}
-            alt={userProfile.displayName}
-            src={avatarUrl}
-          />
-        ) : (
-          <PersonIcon size={96} />
-        )}
           <div className={styles.editProfileImageBadge}>
             <DeviceCameraIcon size={16} />
           </div>
@@ -146,5 +167,6 @@ export const UserEditProfile = ({
           {isSaving ? t("saving") : t("save")}
         </Button>
       </form>
+    </SkeletonTheme>
   );
 };

torrent-client/main.py

@@ -4,6 +4,7 @@ import json
 import urllib.parse
 import psutil
 from torrent_downloader import TorrentDownloader
+from profile_image_processor import ProfileImageProcessor
 
 torrent_port = sys.argv[1]
 http_port = sys.argv[2]
@@ -73,7 +74,6 @@ class Handler(BaseHTTPRequestHandler):
     def do_POST(self):
         global torrent_downloader
 
-        if self.path == "/action":
         if self.headers.get(self.rpc_password_header) != rpc_password:
             self.send_response(401)
             self.end_headers()
@@ -83,6 +83,21 @@ class Handler(BaseHTTPRequestHandler):
         post_data = self.rfile.read(content_length)
         data = json.loads(post_data.decode('utf-8'))
 
+        if self.path == "/profile-image":
+            parsed_image_path = data['image_path']
+            
+            try:
+                parsed_image_path, mime_type = ProfileImageProcessor.process_image(parsed_image_path)
+                self.send_response(200)
+                self.send_header("Content-type", "application/json")
+                self.end_headers()
+                
+                self.wfile.write(json.dumps({'imagePath': parsed_image_path, 'mimeType': mime_type}).encode('utf-8'))
+            except:
+                self.send_response(400)
+                self.end_headers()
+
+        elif self.path == "/action":
             if torrent_downloader is None:
                 torrent_downloader = TorrentDownloader(torrent_port)
 
@@ -99,6 +114,10 @@ class Handler(BaseHTTPRequestHandler):
             self.send_response(200)
             self.end_headers()
 
+        else:
+            self.send_response(404)
+            self.end_headers()
+
 
 if __name__ == "__main__":
     httpd = HTTPServer(("", int(http_port)), Handler)

torrent-client/profile_image_processor.py

@@ -0,0 +1,31 @@
+from PIL import Image
+import tempfile
+import os, uuid
+
+class ProfileImageProcessor:
+    
+    @staticmethod
+    def get_parsed_image_data(image_path):
+        Image.MAX_IMAGE_PIXELS = 933120000
+        
+        image = Image.open(image_path)
+        
+        try:
+            image.seek(1)
+        except EOFError:
+            mime_type = image.get_format_mimetype()
+            return image_path, mime_type
+        else:
+            newUUID = str(uuid.uuid4())
+            new_image_path = os.path.join(tempfile.gettempdir(), newUUID) + ".webp"
+            image.save(new_image_path)
+            
+            new_image = Image.open(new_image_path)
+            mime_type = new_image.get_format_mimetype()
+            
+            return new_image_path, mime_type
+                
+    
+    @staticmethod
+    def process_image(image_path):
+        return ProfileImageProcessor.get_parsed_image_data(image_path)

yarn.lock

@@ -4342,15 +4342,6 @@ file-type@^18.7.0:
     strtok3 "^7.0.0"
     token-types "^5.0.1"
 
-file-type@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.npmjs.org/file-type/-/file-type-19.0.0.tgz"
-  integrity sha512-s7cxa7/leUWLiXO78DVVfBVse+milos9FitauDLG1pI7lNaJ2+5lzPnr2N24ym+84HVwJL6hVuGfgVE+ALvU8Q==
-  dependencies:
-    readable-web-to-node-stream "^3.0.2"
-    strtok3 "^7.0.0"
-    token-types "^5.0.1"
-
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"