From a069e12135a32a33d1376f9eded20d7b527e6b21 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:36:46 +0700 Subject: [PATCH 1/3] fix: unintended commented rabbitmq for local server --- Services/server/src/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Services/server/src/app.ts b/Services/server/src/app.ts index 6d1030c..d0d7c7b 100644 --- a/Services/server/src/app.ts +++ b/Services/server/src/app.ts @@ -35,4 +35,4 @@ app.listen(PORT, "0.0.0.0", () => console.log(`[APP] Application is running on http://localhost:${PORT}`), ); -// rabbitmq.init(amqHandler).catch((e) => console.error(e)); +rabbitmq.init(amqHandler).catch((e) => console.error(e)); From ba1d9e794abd27dfbd17954676830edbc41d8be8 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:37:31 +0700 Subject: [PATCH 2/3] fix: remove queued if file not exist --- Services/server/src/rabbitmq/handler.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Services/server/src/rabbitmq/handler.ts b/Services/server/src/rabbitmq/handler.ts index f02d48b..382da34 100644 --- a/Services/server/src/rabbitmq/handler.ts +++ b/Services/server/src/rabbitmq/handler.ts @@ -21,9 +21,18 @@ export async function handler(key: string, event: string): Promise { } if (!cachedBuffer[key]) { - const stream = await minioClient.getObject(bucket, pathname); - const buffer = Buffer.concat(await stream.toArray()); - cachedBuffer[key] = buffer; + try { + const stream = await minioClient.getObject(bucket, pathname); + const buffer = Buffer.concat(await stream.toArray()); + cachedBuffer[key] = buffer; + } catch (e: any) { + if (e.code === "NoSuchKey") { + delete cachedBuffer[key]; + delete cachedMetadata[key]; + await ensureDelete(pathname); + return true; + } + } } if (!cachedMetadata[key]) { From 4394c9cfb63cd8761481eb2d2054af737f9e2d29 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:46:41 +0700 Subject: [PATCH 3/3] chore: add log --- Services/server/src/rabbitmq/handler.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/Services/server/src/rabbitmq/handler.ts b/Services/server/src/rabbitmq/handler.ts index 382da34..720f0f3 100644 --- a/Services/server/src/rabbitmq/handler.ts +++ b/Services/server/src/rabbitmq/handler.ts @@ -27,6 +27,7 @@ export async function handler(key: string, event: string): Promise { cachedBuffer[key] = buffer; } catch (e: any) { if (e.code === "NoSuchKey") { + console.info(`[AMQ] Key: ${key} received but cannot be found.`) delete cachedBuffer[key]; delete cachedMetadata[key]; await ensureDelete(pathname);