@social-mail/social-mail-client 1.2.575 → 1.2.577

package/src/services/files/LocalFileService.tsx

@@ -16,6 +16,7 @@ import EntityService from "../EntityService";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import FileUploader, { IUploadRequest, IUploadResult } from "../../common/FileUploader";
 import { apiPath } from "../../common/apiPath";
+import FFService from "../ffmpeg/FFService";
 
 export const acceptDocumentAndMedia = ".doc, .docx, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, video/*, application/pdf, .pdf, .txt, audio/*, image/*, .csv, text/csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, text/plain, text/html";
 
@@ -79,10 +80,10 @@ export default class LocalFileService extends TaskManager {
     constructor() {
         super();
         document.body.addEventListener("uploadRequested", (ce: CustomEvent) => {
-            const { target, detail: { files, extra, uploadEvent } } = ce;
+            const { target, detail: { files, extra, uploadEvent, convert } } = ce;
             ce.preventDefault();
             this.app.runAsync(async () => {
-                const detail = await FileUploadWindow.showModal<IUploadedFile>({ parameters: { files, extra }});
+                const detail = await FileUploadWindow.showModal<IUploadedFile>({ parameters: ce.detail});
                 target.dispatchEvent(
                     new CustomEvent( StringHelper.fromHyphenToCamel(uploadEvent),
                         { detail, bubbles: true }));
@@ -170,6 +171,8 @@ export default class LocalFileService extends TaskManager {
             extra = JSON.parse(extra);
         }
 
+
+
         const sha256 = await this.sha256(file);
 
         if (extra?.parentID) {
@@ -250,7 +253,7 @@ export default class LocalFileService extends TaskManager {
         });
     }
 
-    upload(files: File[], extra: any, ct?: CancelToken) {
+    upload({ files, extra, convert, uploadEvent, maxSize  }: { files: File[], extra: any, convert: boolean, uploadEvent, maxSize }, ct?: CancelToken) {
 
         const tasks = [] as IFileUpload[];
         const upload = {
@@ -267,6 +270,15 @@ export default class LocalFileService extends TaskManager {
                 progress: 0
             };
             uploadFile.promise = this.run(async () => {
+
+                let targetFile = file;
+
+                if (convert) {
+                    if(/video/i.test(targetFile.type) && targetFile.size > maxSize ) {
+                        targetFile = await FFService.convert(targetFile);
+                    }
+                }
+
                 let lastError: string;
                 for(let i=0; i<3; i++) {
                     try {
@@ -274,7 +286,7 @@ export default class LocalFileService extends TaskManager {
 
                         // we will check if file exists and has same sha256?
 
-                        const r = await this.uploadFile(file, extra, ct, (n) => uploadFile.progress = n);
+                        const r = await this.uploadFile(targetFile, extra, ct, (n) => uploadFile.progress = n);
                         upload.progress += r.file.size;
                         setTimeout(() => tasks.remove(uploadFile), 500);
                         upload.error = "";
@@ -298,7 +310,7 @@ export default class LocalFileService extends TaskManager {
 
 
 class FileUploadWindow extends PopupWindow {
-    public parameters: { files?: File[], uploadEvent?: string, extra?: any } = {};
+    public parameters: any = {};
 
     @InjectProperty
     private localFileService: LocalFileService;
@@ -316,7 +328,7 @@ class FileUploadWindow extends PopupWindow {
             await this.requestCancel();
         }, null, { capture: true });
 
-        const task = this.localFileService.upload(this.parameters.files, this.parameters.extra, this.cancelToken);
+        const task = this.localFileService.upload(this.parameters, this.cancelToken);
         this.files = task.tasks;
 
         this.footerRenderer = () => <div data-layout="command-row">

package/src/web/page/mails/mini-compose/Attach.tsx

@@ -17,6 +17,7 @@ export default function Attach({ alignment = "above" as IPopupOptions["alignment
             <MenuItem
                 { ... UploadEvent.AttachUploadAction({
                     accept: "image/*",
+                    maxSize: 20*1024*1024,
                     multiple: true,
                     extra: {
                     }
@@ -27,6 +28,7 @@ export default function Attach({ alignment = "above" as IPopupOptions["alignment
             <MenuItem
                 { ... UploadEvent.AttachUploadAction({
                     accept: "image/*",
+                    maxSize: 20*1024*1024,
                     capture: "user",
                     extra: {
                     }
@@ -38,6 +40,8 @@ export default function Attach({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "video/*",
                     multiple: false,
+                    maxSize: 20*1024*1024,
+                    convert: true,
                     extra: {
                     }
                 })}
@@ -48,6 +52,8 @@ export default function Attach({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "video/*",
                     capture: "user",
+                    maxSize: 20*1024*1024,
+                    convert: true,
                     extra: {
                     }
                 })}

package/src/web/page/mails/mini-compose/Insert.tsx

@@ -36,6 +36,7 @@ export default function Insert({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "image/*",
                     multiple: true,
+                    maxSize: 20*1024*1024,
                     extra: {
                         insert: true
                     }
@@ -48,6 +49,7 @@ export default function Insert({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "image/*",
                     capture: "user",
+                    maxSize: 20*1024*1024,
                     extra: {
                         insert: true
                     }
@@ -60,6 +62,8 @@ export default function Insert({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "video/*",
                     multiple: false,
+                    maxSize: 20*1024*1024,
+                    convert: true,
                     extra: {
                         insert: true
                     }
@@ -72,6 +76,8 @@ export default function Insert({ alignment = "above" as IPopupOptions["alignment
                 { ... UploadEvent.AttachUploadAction({
                     accept: "video/*",
                     capture: "user",
+                    convert: true,
+                    maxSize: 20*1024*1024,
                     extra: {
                         insert: true
                     }