Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@ import { Either, left, right } from '../../../shared/domain/Either';
import { DriveDesktopError } from '../../../shared/domain/errors/DriveDesktopError';
import { deleteFileContentIPC } from '../../../../infra/ipc/files-ipc';
import { logger } from '@internxt/drive-desktop-core/build/backend';
import { MULTIPART_UPLOAD_SIZE_THRESHOLD } from '../../../shared/domain/UploadConstants';

@Service()
export class EnvironmentLocalFileUploader implements LocalFileHandler {
private static MULTIPART_UPLOAD_SIZE_THRESHOLD = 100 * 1024 * 1024; // 100MB

constructor(
private readonly environment: Environment,
private readonly bucket: string,
) {}

upload(path: AbsolutePath, size: number, abortSignal: AbortSignal): Promise<Either<DriveDesktopError, string>> {
const fn: UploadStrategyFunction =
size > EnvironmentLocalFileUploader.MULTIPART_UPLOAD_SIZE_THRESHOLD
size > MULTIPART_UPLOAD_SIZE_THRESHOLD
? this.environment.uploadMultipartFile.bind(this.environment)
: this.environment.upload.bind(this.environment);

Expand All @@ -35,7 +34,7 @@ export class EnvironmentLocalFileUploader implements LocalFileHandler {
const state = fn(this.bucket, {
source: readable,
fileSize: size,
finishedCallback: (err: Error | null, contentsId: string) => {
finishedCallback: (err, contentsId) => {
readable.close();
stopwatch.finish();

Expand All @@ -47,6 +46,11 @@ export class EnvironmentLocalFileUploader implements LocalFileHandler {
return resolve(left(new DriveDesktopError('UNKNOWN')));
}

if (!contentsId) {
logger.error({ tag: 'SYNC-ENGINE', msg: '[ENVLFU UPLOAD ERROR] No contentsId returned' });
return resolve(left(new DriveDesktopError('UNKNOWN')));
}

resolve(right(contentsId));
},
progressCallback: (progress: number) => {
Expand Down
1 change: 1 addition & 0 deletions src/context/shared/domain/UploadConstants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const MULTIPART_UPLOAD_SIZE_THRESHOLD = 100 * 1024 * 1024;
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { EnvironmentTemporalFileUploader } from '../upload/EnvironmentTemporalFi
import { TemporalFileUploaderFactory } from '../../domain/upload/TemporalFileUploaderFactory';
import { Replaces } from '../../domain/upload/Replaces';
import { TemporalFile } from '../../domain/TemporalFile';
import { MULTIPART_UPLOAD_SIZE_THRESHOLD } from '../../../../shared/domain/UploadConstants';

@Service()
export class TemporalFileDownloaderFactory implements TemporalFileUploaderFactory {
Expand All @@ -15,8 +16,6 @@ export class TemporalFileDownloaderFactory implements TemporalFileUploaderFactor
private _replaces: Replaces | undefined = undefined;
private _abortController: AbortController | undefined = undefined;

private static MULTIPART_UPLOAD_SIZE_THRESHOLD = 100 * 1024 * 1024; // 100MB

constructor(
private readonly environment: Environment,
private readonly bucket: string,
Expand Down Expand Up @@ -94,7 +93,7 @@ export class TemporalFileDownloaderFactory implements TemporalFileUploaderFactor
}

const fn =
document.size.value > TemporalFileDownloaderFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
document.size.value > MULTIPART_UPLOAD_SIZE_THRESHOLD
? this.environment.uploadMultipartFile
: this.environment.upload;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { EnvironmentTemporalFileUploader } from './EnvironmentTemporalFileUpload
import { TemporalFileUploaderFactory } from '../../domain/upload/TemporalFileUploaderFactory';
import { Replaces } from '../../domain/upload/Replaces';
import { TemporalFile } from '../../domain/TemporalFile';
import { MULTIPART_UPLOAD_SIZE_THRESHOLD } from '../../../../shared/domain/UploadConstants';

@Service()
export class EnvironmentTemporalFileUploaderFactory implements TemporalFileUploaderFactory {
Expand All @@ -15,8 +16,6 @@ export class EnvironmentTemporalFileUploaderFactory implements TemporalFileUploa
private _replaces: Replaces | undefined = undefined;
private _abortController: AbortController | undefined = undefined;

private static MULTIPART_UPLOAD_SIZE_THRESHOLD = 100 * 1024 * 1024; // 100MB

constructor(
private readonly environment: Environment,
private readonly bucket: string,
Expand Down Expand Up @@ -94,7 +93,7 @@ export class EnvironmentTemporalFileUploaderFactory implements TemporalFileUploa
}

const fn =
document.size.value > EnvironmentTemporalFileUploaderFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
document.size.value > MULTIPART_UPLOAD_SIZE_THRESHOLD
? this.environment.uploadMultipartFile.bind(this.environment)
: this.environment.upload.bind(this.environment);

Expand Down
Loading