0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More

Browse source
This commit is contained in:
Manav Rathi 2024-04-23 20:20:14 +05:30
parent 7940ef53b5
commit 2eef50a849
No known key found for this signature in database
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
web/apps/photos/src/services/upload/uploadService.ts
View file

@ -838,7 +838,7 @@ const uploadToBucket = async (
);
} else {
const progressTracker = makeProgessTracker(file.localID);
const fileUploadURL = await this.getUploadURL();
const fileUploadURL = await uploadService.getUploadURL();
if (!isCFUploadProxyDisabled) {
fileObjectKey = await UploadHttpClient.putFileV2(
fileUploadURL,
@ -895,7 +895,7 @@ interface PartEtag {
ETag: string;
}
export async function uploadStreamUsingMultipart(
async function uploadStreamUsingMultipart(
fileLocalID: number,
dataStream: DataStream,
makeProgessTracker: MakeProgressTracker,
@ -910,7 +910,8 @@ export async function uploadStreamUsingMultipart(
const { stream } = dataStream;
const streamReader = stream.getReader();
const percentPerPart = getRandomProgressPerPartUpload(uploadPartCount);
const percentPerPart =
RANDOM_PERCENTAGE_PROGRESS_FOR_PUT() / uploadPartCount;
const partEtags: PartEtag[] = [];
for (const [
index,
@ -945,14 +946,19 @@ export async function uploadStreamUsingMultipart(
if (!done) {
throw Error(CustomError.CHUNK_MORE_THAN_EXPECTED);
}
await completeMultipartUpload(partEtags, multipartUploadURLs.completeURL);
return multipartUploadURLs.objectKey;
}
function getRandomProgressPerPartUpload(uploadPartCount: number) {
const percentPerPart =
RANDOM_PERCENTAGE_PROGRESS_FOR_PUT() / uploadPartCount;
return percentPerPart;
const completeURL = multipartUploadURLs.completeURL;
const cBody = convert.js2xml(
{ CompleteMultipartUpload: { Part: partEtags } },
{ compact: true, ignoreComment: true, spaces: 4 },
);
if (!isCFUploadProxyDisabled) {
await UploadHttpClient.completeMultipartUploadV2(completeURL, cBody);
} else {
await UploadHttpClient.completeMultipartUpload(completeURL, cBody);
}
return multipartUploadURLs.objectKey;
}
async function combineChunksToFormUploadPart(
@ -970,19 +976,3 @@ async function combineChunksToFormUploadPart(
}
return Uint8Array.from(combinedChunks);
}
async function completeMultipartUpload(
partEtags: PartEtag[],
completeURL: string,
) {
const options = { compact: true, ignoreComment: true, spaces: 4 };
const body = convert.js2xml(
{ CompleteMultipartUpload: { Part: partEtags } },
options,
);
if (!uploadService.getIsCFUploadProxyDisabled()) {
await UploadHttpClient.completeMultipartUploadV2(completeURL, body);
} else {
await UploadHttpClient.completeMultipartUpload(completeURL, body);
}
}