LumeWeb
/
skynet-webportal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #241 from NebulousLabs/gracefully-handle-429 

Gracefully handle upload 429 Too Many Requests
This commit is contained in:
Karol Wypchło 2020-05-29 15:30:42 +02:00 committed by GitHub
parent ef659c2528 1c08c60304
commit d5ca68d273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/HomeUpload/HomeUpload.js
View File

@ -105,7 +105,7 @@ export default function HomeUpload() {
});
};
acceptedFiles.forEach(async (file) => {
acceptedFiles.forEach((file) => {
const onUploadProgress = ({ loaded, total }) => {
const progress = loaded / total;
const status = progress === 1 ? "processing" : "uploading";
@ -120,21 +120,31 @@ export default function HomeUpload() {
return;
}
try {
let response;
const upload = async () => {
try {
let response;
if (file.directory) {
const directory = file.files.reduce((acc, file) => ({ ...acc, [getRelativeFilePath(file)]: file }), {});
if (file.directory) {
const directory = file.files.reduce((acc, file) => ({ ...acc, [getRelativeFilePath(file)]: file }), {});
response = await client.uploadDirectory(directory, encodeURIComponent(file.name), { onUploadProgress });
} else {
response = await client.upload(file, { onUploadProgress });
response = await client.uploadDirectory(directory, encodeURIComponent(file.name), { onUploadProgress });
} else {
response = await client.upload(file, { onUploadProgress });
}
onFileStateChange(file, { status: "complete", url: client.getUrl(response.skylink) });
} catch (error) {
if (error.response && error.response.status === HttpStatus.TOO_MANY_REQUESTS) {
onFileStateChange(file, { progress: -1 });
return new Promise((resolve) => setTimeout(() => resolve(upload()), 3000));
}
onFileStateChange(file, { status: "error", error: createUploadErrorMessage(error) });
}
};
onFileStateChange(file, { status: "complete", url: client.getUrl(response.skylink) });
} catch (error) {
onFileStateChange(file, { status: "error", error: createUploadErrorMessage(error) });
}
upload();
});
};

10
src/components/UploadFile/UploadFile.js
View File

@ -36,6 +36,14 @@ export default function UploadFile({ file, url, status, progress, error }) {
};
const copyText = copied ? "Copied!" : "Copy to clipboard";
const getProgressText = (progress) => {
if (progress === -1) {
return "Waiting...";
} else if (progress > 0) {
return `Uploading ${Math.round(progress * 100)}%`;
}
return "Uploading...";
};
return (
<div className="upload-file">
@ -43,7 +51,7 @@ export default function UploadFile({ file, url, status, progress, error }) {
<div className="upload-file-text">
<h3>{file.name}</h3>
<p>
{status === "uploading" && (progress ? `Uploading ${Math.round(progress * 100)}%` : "Uploading...")}
{status === "uploading" && getProgressText(progress)}
{status === "processing" && "Processing..."}
{status === "error" && <span className="red-text">{error || "Upload failed."}</span>}
{status === "complete" && (