@social-mail/social-mail-client 1.2.27 → 1.2.28

package/src/services/files/LocalFileService.tsx

@@ -13,6 +13,8 @@ import PopupService from "@web-atoms/core/dist/web/services/PopupService";
 import { AppFile, IAppFile } from "../../model/model";
 import TaskManager from "@web-atoms/entity/dist/models/TaskManager";
 import EntityService from "../EntityService";
+import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
+import FileUploader, { IUploadRequest, IUploadResult } from "../../common/FileUploader";
 
 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";
 
@@ -65,6 +67,8 @@ export interface IFileUpload {
 @DISingleton()
 export default class LocalFileService extends TaskManager {
 
+    rateLimit = 4;
+
     @Inject
     private app: App;
 
@@ -101,16 +105,74 @@ export default class LocalFileService extends TaskManager {
         return hashHex;
     }
 
+    async uploadFileParts(file: File, extra, cancelToken?: CancelToken, progress?: (n) => void): Promise<IUploadedFile> {
+
+        let size = file.size;
+        const parts = [] as IUploadRequest[];
+        const tasks = [] as Promise<IUploadResult>[];
+        const maxSize = 4 * 1024 * 1024;
+        let start = 0;
+        const fud = new FileUploader();
+        while(size > 0) {
+            const blobSize = Math.min(maxSize, file.size - start);
+            const part = new File([file.slice( start, start + blobSize)], "file.dat");
+            size -= blobSize;
+            start += blobSize;
+            const uploadRequest = fud.upload({
+                url: "/api/tmp/upload",
+                file:part,
+                cancelToken,
+                progress: () => {
+                    const done = (parts.reduce((pv, cv) => pv + cv.done, 0) || 0);
+                    progress?.( done/ parts.length);
+                }
+            });
+            parts.push(uploadRequest);
+            tasks.push(uploadRequest.promise);
+        }
+        const tempUrls = await Promise.all(tasks);
+        const tempKeys = tempUrls.map((x) => x.key);
+        const name = file.name;
+        const { parentID, appFileID, folder } = extra;
+        const appFile = await FetchBuilder.post("/api/upload")
+            .form("name", name)
+            .form("tempKeys", JSON.stringify(tempKeys))
+            .form("contentType", file.type)
+            .query("parentID", parentID)
+            .query("appFileID", appFileID)
+            .query("folder", folder)
+            .responseAsJson<any>();
+        return {
+            url: appFile.url,
+            downloadUrl: appFile.url,
+            file,
+            contentType: appFile.contentType,
+            fileContentID: appFile.fileContentID,
+            appFileID: appFile.appFileID
+        };
+    }
+
     async uploadFile(file: File, extra: any, ct?: CancelToken, progress?: (n) => void): Promise<IUploadedFile> {
-        const sha256 = await this.sha256(file);
+
+        let folder = void 0;
+
+        if (file.webkitRelativePath) {
+            const folders = file.webkitRelativePath.split("/");
+            folders.pop();
+            if (folders.length) {
+                folder = folders.join("/");
+            }
+        }
 
         // check if file exists???
         if (typeof extra === "string") {
             extra = JSON.parse(extra);
         }
 
+        const sha256 = await this.sha256(file);
+
         if (extra.parentID) {
-            const existing = await this.entityService.query(AppFile, "children", extra.parentID, file.name, sha256)
+            const existing = await this.entityService.query(AppFile, "children", extra.parentID, folder ? folder + "/" + file.name : file.name, sha256)
                 .firstOrDefault();
             if (existing) {
                 const { appFileID, url } = existing;
@@ -122,6 +184,10 @@ export default class LocalFileService extends TaskManager {
             }
         }
 
+        if (file.size > 4 * 1024 * 1024) {
+            return await this.uploadFileParts(file, extra, ct, progress);
+        }
+
         return new Promise<IUploadedFile>((resolve, reject) => {
             const body = new FormData();
             body.append(file.name, file, file.name);
@@ -168,13 +234,8 @@ export default class LocalFileService extends TaskManager {
                 }
             }
 
-            if (file.webkitRelativePath) {
-                const folders = file.webkitRelativePath.split("/");
-                folders.pop();
-                if (folders.length) {
-                    const folder = folders.join("/");
-                    s.append("folder", folder);
-                }
+            if (folder) {
+                s.append("folder", folder);
             }
 
             postUrl += "?" + s.toString();

package/src/style/GlobalStyle.ts

@@ -32,6 +32,7 @@ function addLinkTag(href, integrity?, rel = "stylesheet") {
 addLinkTag("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&display=swap");
 addLinkTag("https://npm-git.azureedge.net/npm/package/@c8private/fa-icons@6.5.1/css/all.min.css");
 addLinkTag("https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0");
+addLinkTag("https://cdn.jsdelivr.net/npm/file-icon-vectors@1.0.0/dist/file-icon-vivid.min.css");
 
     styled.css `