From b46d43797169c02334970d1efd32c1b075a759df Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 10 Jul 2023 23:44:31 +0200
Subject: [PATCH] Fix Postgres error loop when indexing notes

---
 .../processors/background/index-all-notes.ts  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/queue/processors/background/index-all-notes.ts b/packages/backend/src/queue/processors/background/index-all-notes.ts
index 1dce4406a..fc453eb26 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -1,4 +1,5 @@
 import type Bull from "bull";
+import type { DoneCallback } from "bull";
 
 import { queueLogger } from "../../logger.js";
 import { Notes } from "@/models/index.js";
@@ -11,7 +12,7 @@ const logger = queueLogger.createSubLogger("index-all-notes");
 
 export default async function indexAllNotes(
 	job: Bull.Job<Record<string, unknown>>,
-	done: () => void,
+	done: DoneCallback,
 ): Promise<void> {
 	logger.info("Indexing all notes...");
 
@@ -20,7 +21,7 @@ export default async function indexAllNotes(
 	let total: number = (job.data.total as number) ?? 0;
 
 	let running = true;
-	const take = 100000;
+	const take = 10000;
 	const batch = 100;
 	while (running) {
 		logger.info(
@@ -41,13 +42,14 @@ export default async function indexAllNotes(
 				},
 				relations: ["user"],
 			});
-		} catch (e) {
+		} catch (e: any) {
 			logger.error(`Failed to query notes ${e}`);
-			continue;
+			done(e);
+			break;
 		}
 
 		if (notes.length === 0) {
-			job.progress(100);
+			await job.progress(100);
 			running = false;
 			break;
 		}
@@ -55,7 +57,7 @@ export default async function indexAllNotes(
 		try {
 			const count = await Notes.count();
 			total = count;
-			job.update({ indexedCount, cursor, total });
+			await job.update({indexedCount, cursor, total});
 		} catch (e) {}
 
 		for (let i = 0; i < notes.length; i += batch) {
@@ -69,12 +71,12 @@ export default async function indexAllNotes(
 
 			indexedCount += chunk.length;
 			const pct = (indexedCount / total) * 100;
-			job.update({ indexedCount, cursor, total });
-			job.progress(+pct.toFixed(1));
+			await job.update({ indexedCount, cursor, total });
+			await job.progress(+pct.toFixed(1));
 			logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
 		}
 		cursor = notes[notes.length - 1].id;
-		job.update({ indexedCount, cursor, total });
+		await job.update({ indexedCount, cursor, total });
 
 		if (notes.length < take) {
 			running = false;