Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-25 11:04:00 +00:00
Code Issues Projects Releases Wiki Activity

Add timeout when processing user uploads

Browse source
This commit is contained in:
Jordan Eldredge 2021-01-18 13:11:31 -05:00
parent 06bd83897f
commit fcfb1ce94d
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
packages/skin-database/api/processUserUploads.ts
View file

@ -7,6 +7,7 @@ async function* reportedUploads() {
const seen = new Set();
while (true) {
const upload = await Skins.getReportedUpload();
console.log("Found one", { upload });
if (upload == null) {
return;
}
@ -26,6 +27,17 @@ function log(...args: any[]) {
console.log(...args);
}
const ONE_MINUTE_IN_MS = 1000 * 60;
function timeout<T>(p: Promise<T>, duration: number): Promise<T> {
return Promise.race([
p,
new Promise<never>((resolve, reject) =>
setTimeout(() => reject("timeout"), duration)
),
]);
}
export async function processUserUploads(eventHandler: EventHandler) {
log("process user uploads");
// Ensure we only have one worker processing requests.
@ -34,16 +46,15 @@ export async function processUserUploads(eventHandler: EventHandler) {
}
processing = true;
const uploads = reportedUploads();
log("Uploads to process: ", uploads);
log("Uploads to process...");
for await (const upload of uploads) {
log("Going to try: ", upload);
try {
const buffer = await S3.getUploadedSkin(upload.id);
log("Got buffer: ", upload);
const result = await addSkinFromBuffer(
buffer,
upload.filename,
"Web API"
const result = await timeout(
addSkinFromBuffer(buffer, upload.filename, "Web API"),
ONE_MINUTE_IN_MS
);
log("Added skin from buffer: ", upload, result);
await Skins.recordUserUploadArchived(upload.id);
@ -73,6 +84,7 @@ export async function processUserUploads(eventHandler: EventHandler) {
console.error(e);
}
}
log("Done processing uploads.");
processing = false;
}