use new batch api for setting global alerts

beszel/internal/hub/hub.go

@@ -70,6 +70,10 @@ func (h *Hub) Run() {
 		if err != nil {
 			log.Fatal(err)
 		}
+		// set general settings
+		settings := h.app.Settings()
+		// batch requests (for global alerts)
+		settings.Batch.Enabled = true
 		// set auth settings
 		usersCollection, err := h.app.FindCollectionByNameOrId("users")
 		if err != nil {

beszel/site/src/components/alerts/alerts-system.tsx

@@ -5,7 +5,6 @@ import { AlertInfo, AlertRecord, SystemRecord } from "@/types"
 import { lazy, Suspense, useRef, useState } from "react"
 import { toast } from "../ui/use-toast"
 import { RecordOptions } from "pocketbase"
-import { newQueue, Queue } from "@henrygd/queue"
 import { Trans, t, Plural } from "@lingui/macro"
 
 interface AlertData {
@@ -20,8 +19,6 @@ interface AlertData {
 
 const Slider = lazy(() => import("@/components/ui/slider"))
 
-let queue: Queue
-
 const failedUpdateToast = () =>
 	toast({
 		title: t`Failed to update alert`,
@@ -49,7 +46,7 @@ export function SystemAlert({
 			} else if (checked) {
 				pb.collection("alerts").create({
 					system: system.id,
-					user: pb.authStore.model!.id,
+					user: pb.authStore.record!.id,
 					name: data.key,
 					value: value,
 					min: min,
@@ -88,11 +85,7 @@ export function SystemAlertGlobal({
 	data.checked = false
 	data.val = data.min = 0
 
-	data.updateAlert = (checked: boolean, value: number, min: number) => {
+	data.updateAlert = async (checked: boolean, value: number, min: number) => {
-		if (!queue) {
-			queue = newQueue(5)
-		}
-
 		const { set, populatedSet } = systemsWithExistingAlerts.current
 
 		// if overwrite checked, make sure all alerts will be overwritten
@@ -105,7 +98,16 @@ export function SystemAlertGlobal({
 			min,
 			triggered: false,
 		}
-		for (let system of systems) {
+
+		// we can only send 50 in one batch
+		let done = 0
+
+		while (done < systems.length) {
+			const batch = pb.createBatch()
+			let batchSize = 0
+
+			for (let i = done; i < Math.min(done + 50, systems.length); i++) {
+				const system = systems[i]
 				// if overwrite is false and system is in set (alert existed), skip
 				if (!overwrite && set.has(system.id)) {
 					continue
@@ -117,6 +119,7 @@ export function SystemAlertGlobal({
 					set.add(system.id)
 					continue
 				}
+				batchSize++
 				const requestOptions: RecordOptions = {
 					requestKey: system.id,
 				}
@@ -124,29 +127,28 @@ export function SystemAlertGlobal({
 				// checked - make sure alert is created or updated
 				if (checked) {
 					if (existingAlert) {
-					// console.log('updating', system.name)
+						batch.collection("alerts").update(existingAlert.id, recordData, requestOptions)
-					queue
-						.add(() => pb.collection("alerts").update(existingAlert.id, recordData, requestOptions))
-						.catch(failedUpdateToast)
 					} else {
-					// console.log('creating', system.name)
+						batch.collection("alerts").create(
-					queue
-						.add(() =>
-							pb.collection("alerts").create(
 							{
 								system: system.id,
-									user: pb.authStore.model!.id,
+								user: pb.authStore.record!.id,
 								name: data.key,
 								...recordData,
 							},
 							requestOptions
 						)
-						)
-						.catch(failedUpdateToast)
 					}
 				} else if (existingAlert) {
-				// console.log('deleting', system.name)
+					batch.collection("alerts").delete(existingAlert.id)
-				queue.add(() => pb.collection("alerts").delete(existingAlert.id)).catch(failedUpdateToast)
+				}
+			}
+			try {
+				batchSize && batch.send()
+			} catch (e) {
+				failedUpdateToast()
+			} finally {
+				done += 50
 			}
 		}
 		systemsWithExistingAlerts.current.populatedSet = true