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
17 changes: 17 additions & 0 deletions src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,23 @@ export function sendS3LikeCompleteUpload(policyType: string, sessionId: string,
};
}

export function sendObsCompleteUpload(sessionId: string, sessionKey: string): ThunkResponse {
return async (dispatch, _getState) => {
return await dispatch(
send(
`/callback/obs/${sessionId}/${sessionKey}`,
{
method: "POST",
},
{
...defaultOpts,
bypassSnackbar: (_e) => true,
},
),
);
};
}

export function sendOneDriveCompleteUpload(sessionId: string, sessionKey: string): ThunkResponse {
return async (dispatch, _getState) => {
return await dispatch(
Expand Down
13 changes: 13 additions & 0 deletions src/component/Uploader/core/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { CancelToken } from "axios";
import {
sendCreateUploadSession,
sendDeleteUploadSession,
sendObsCompleteUpload,
sendOneDriveCompleteUpload,
sendS3LikeCompleteUpload,
sendUploadChunk,
Expand Down Expand Up @@ -384,6 +385,18 @@ export async function s3LikeUploadCallback(sessionID: string, sessionKey: string
}
}

export async function obsUploadCallback(sessionID: string, sessionKey: string): Promise<any> {
try {
return await store.dispatch(sendObsCompleteUpload(sessionID, sessionKey));
} catch (e) {
if (e instanceof AppError) {
throw new S3LikeUploadCallbackError(e.response);
}

throw e;
}
}

const encodePartsXML = (chunks: ChunkProgress[]): string => {
let body = "";
body += "<CompleteMultipartUpload>";
Expand Down
7 changes: 5 additions & 2 deletions src/component/Uploader/core/uploader/obs.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Chunk, { ChunkInfo } from "./chunk";
import { obsFinishUpload, s3LikeUploadChunk } from "../api";
import { obsFinishUpload, obsUploadCallback, s3LikeUploadChunk } from "../api";
import { Status } from "./base";

export default class OBS extends Chunk {
Expand All @@ -19,6 +19,9 @@ export default class OBS extends Chunk {
protected async afterUpload(): Promise<any> {
this.logger.info(`Finishing multipart upload...`);
this.transit(Status.finishing);
return obsFinishUpload(this.task.session!.completeURL, this.task.chunkProgress, this.cancelToken.token);
await obsFinishUpload(this.task.session!.completeURL, this.task.chunkProgress, this.cancelToken.token);

this.logger.info(`Sending OBS upload callback...`);
return obsUploadCallback(this.task.session!.session_id, this.task.session!.callback_secret);
}
}