Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend:files): limit concurrent uploads
johaven81a95bc7ea1b
diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-editable-base.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-editable-base.tsindex 42d02e5b..48c11f1a 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-editable-base.ts+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-editable-base.ts@@ -86,7 +86,7 @@ export abstract class FilesViewerEditableBase implements OnDestroy {if (!this.canSave()) returnthis.isSaving.set(true)const content = this.currentFileContent()- this.filesUpload.uploadOneFile(this.file(), content, true).subscribe({+ this.filesUpload.uploadFileContent(this.file(), content, true).subscribe({next: () => {this.onContentSaved(content)this.isModified.set(false)diff --git a/frontend/src/app/applications/files/interfaces/file-upload.interface.ts b/frontend/src/app/applications/files/interfaces/file-upload.interface.tsindex 16ee3901..daf9740e 100644--- a/frontend/src/app/applications/files/interfaces/file-upload.interface.ts+++ b/frontend/src/app/applications/files/interfaces/file-upload.interface.ts@@ -6,9 +6,11 @@ export interface FileUpload extends File {}export interface FileUploadTaskRequest {+ completed: Promise<void>controller: AbortControllerdone: booleanreq: Observable<any>+ resolveCompleted: () => voidstarted: booleantask: FileTask}diff --git a/frontend/src/app/applications/files/services/files-upload.service.ts b/frontend/src/app/applications/files/services/files-upload.service.tsindex 0092a1bf..a245543c 100644--- a/frontend/src/app/applications/files/services/files-upload.service.ts+++ b/frontend/src/app/applications/files/services/files-upload.service.ts@@ -16,6 +16,9 @@ export class FilesUploadService {private readonly http = inject(HttpClient)private readonly filesService = inject(FilesService)private readonly filesTasksService = inject(FilesTasksService)+ private readonly maxConcurrentUploads = 3+ private queuedUploads: FileUploadTaskRequest[] = []+ private runningUploads = 0async addFiles(files: FileUpload[], overwrite: boolean) {const apiRoute = `${API_FILES_OPERATION_UPLOAD}/${this.filesService.currentRoute}`@@ -25,43 +28,13 @@ export class FilesUploadService {const path = `${this.filesService.currentRoute}/${key}`.split('/').slice(0, -1).join('/')const name = `${this.filesService.currentRoute}/${key}`.split('/').slice(-1)[0]const task: FileTask = this.filesTasksService.createUploadTask(path, name, data.size)- const controller = new AbortController()- const taskReq = {- controller,- done: false,- req: this.uploadFiles(`${apiRoute}/${key}`, data.form, overwrite),- started: false,- task- }+ const taskReq = this.createUploadTaskRequest(task, this.uploadFiles(`${apiRoute}/${key}`, data.form, overwrite))this.filesTasksService.registerUploadCancellation(task.id, () => this.cancelUploadTask(taskReq))taskReqs.unshift(taskReq)}- for (const taskReq of taskReqs) {- const { controller, req, task } = taskReq- if (taskReq.done) continue- taskReq.started = true- try {- await this.runUpload(task, req, controller.signal)- task.props.progress = 100- task.status = FileTaskStatus.SUCCESS- } catch (e: any) {- if (this.isUploadCancelled(e)) {- task.status = FileTaskStatus.CANCELLED- task.result = 'Cancelled'- } else {- task.status = FileTaskStatus.ERROR- if (e.status === 0) {- task.result = e.statusText- } else {- task.result = e.error?.message || e.message- }- }- } finally {- taskReq.done = true- this.filesTasksService.unregisterUploadCancellation(task.id)- this.filesTasksService.updateTask(task)- }- }+ this.queuedUploads.push(...taskReqs)+ this.drainUploadQueue()+ await Promise.all(taskReqs.map((taskReq: FileUploadTaskRequest) => taskReq.completed))}onDropFiles(ev: any, exist: FileModel[]) {@@ -76,7 +49,7 @@ export class FilesUploadService {}}- uploadOneFile(file: FileModel, content: string, updateContent = false, overwrite = false) {+ uploadFileContent(file: FileModel, content: string, updateContent = false, overwrite = false) {const url = `${API_FILES_OPERATION_UPLOAD}/${file.path}`const fileName = (file?.root?.alias || file.name).normalize()const fileContent = new File([new Blob([content])], fileName, { type: file.mime.replace('-', '/') })@@ -93,6 +66,61 @@ export class FilesUploadService {})}+ private createUploadTaskRequest(task: FileTask, req: Observable<any>): FileUploadTaskRequest {+ let resolveCompleted: () => void = () => undefined+ const completed = new Promise<void>((resolve) => {+ resolveCompleted = () => resolve()+ })+ return {+ completed,+ controller: new AbortController(),+ done: false,+ req,+ resolveCompleted,+ started: false,+ task+ }+ }++ private drainUploadQueue() {+ while (this.runningUploads < this.maxConcurrentUploads && this.queuedUploads.length) {+ const taskReq = this.queuedUploads.shift()+ if (!taskReq || taskReq.done) continue+ this.runningUploads+++ void this.runUploadTask(taskReq).finally(() => {+ this.runningUploads--+ this.drainUploadQueue()+ })+ }+ }++ private async runUploadTask(taskReq: FileUploadTaskRequest): Promise<void> {+ const { controller, req, task } = taskReq+ if (taskReq.done) return+ taskReq.started = true+ try {+ await this.runUpload(task, req, controller.signal)+ task.props.progress = 100+ task.status = FileTaskStatus.SUCCESS+ } catch (e: any) {+ if (this.isUploadCancelled(e)) {+ this.setUploadCancelled(task)+ } else {+ this.setUploadError(task, e)+ }+ } finally {+ this.finishUploadTask(taskReq)+ }+ }++ private finishUploadTask(taskReq: FileUploadTaskRequest) {+ if (taskReq.done) return+ taskReq.done = true+ this.filesTasksService.unregisterUploadCancellation(taskReq.task.id)+ this.filesTasksService.updateTask(taskReq.task)+ taskReq.resolveCompleted()+ }+private runUpload(task: FileTask, req: Observable<any>, signal: AbortSignal): Promise<void> {return new Promise((resolve, reject) => {if (signal.aborted) {@@ -127,19 +155,28 @@ export class FilesUploadService {}private cancelUploadTask(taskReq: FileUploadTaskRequest) {+ if (taskReq.done) returntaskReq.controller.abort(new Error('Cancelled'))- if (taskReq.started || taskReq.done) return- taskReq.done = true- taskReq.task.status = FileTaskStatus.CANCELLED- taskReq.task.result = 'Cancelled'- this.filesTasksService.unregisterUploadCancellation(taskReq.task.id)- this.filesTasksService.updateTask(taskReq.task)+ if (taskReq.started) return+ this.queuedUploads = this.queuedUploads.filter((queuedTaskReq: FileUploadTaskRequest) => queuedTaskReq !== taskReq)+ this.setUploadCancelled(taskReq.task)+ this.finishUploadTask(taskReq)}private isUploadCancelled(e: any): boolean {return e?.message === 'Cancelled'}+ private setUploadCancelled(task: FileTask) {+ task.status = FileTaskStatus.CANCELLED+ task.result = 'Cancelled'+ }++ private setUploadError(task: FileTask, e: any) {+ task.status = FileTaskStatus.ERROR+ task.result = e.status === 0 ? e.statusText : e.error?.message || e.message+ }+private updateProgress(task: FileTask, ev: HttpUploadProgressEvent) {task.props.size = ev.loadedtask.props.progress = Math.round((100 * ev.loaded) / ev.total)