Skip to content

Open-source status page, incident response and uptime monitoring

🚑 oupsi

Thibault Le Ouay157a41d6b311
diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.ts
index fc7ea284d..8cf6f46d2 100644
--- a/apps/web/src/app/api/checker/cron/_cron.ts
+++ b/apps/web/src/app/api/checker/cron/_cron.ts
@@ -1,6 +1,5 @@
import type { NextRequest } from "next/server";
import type { SignedInAuthObject } from "@clerk/nextjs/api";
-import { Client } from "@upstash/qstash";
import type { z } from "zod";
import { createTRPCContext } from "@openstatus/api";
@@ -9,6 +8,8 @@ import { flyRegions, selectMonitorSchema } from "@openstatus/db/src/schema";
import { env } from "@/env";
import type { payloadSchema } from "../schema";
+import { CloudTasksClient } from "@google-cloud/tasks";
+import type { google } from "@google-cloud/tasks/build/protos/protos";
const periodicityAvailable = selectMonitorSchema.pick({ periodicity: true });
@@ -27,9 +28,19 @@ export const cron = async ({
periodicity,
req,
}: z.infer<typeof periodicityAvailable> & { req: NextRequest }) => {
- const c = new Client({
- token: env.QSTASH_TOKEN,
+ const client = new CloudTasksClient({
+ projectId: env.GCP_PROJECT_ID,
+ credentials: {
+ client_email: process.env.GCP_CLIENT_EMAIL,
+ private_key: env.GCP_PRIVATE_KEY.replaceAll("\\n", "\n"),
+ },
});
+ const parent = client.queuePath(
+ env.GCP_PROJECT_ID,
+ env.GCP_LOCATION,
+ periodicity,
+ );
+
console.log(`Start cron for ${periodicity}`);
const timestamp = Date.now();
@@ -61,15 +72,22 @@ export const cron = async ({
status: row.status,
};
- const result = c.publishJSON({
- url: `https://api.openstatus.dev/checker`,
- body: payload,
- delay: Math.random() * 90,
- headers: {
- "Upstash-Forward-fly-prefer-region": region,
+ const task: google.cloud.tasks.v2beta3.ITask = {
+ httpRequest: {
+ headers: {
+ "Content-Type": "application/json", // Set content type to ensure compatibility your application's request parsing
+ "fly-prefer-region": region,
+ Authorization: `Basic ${env.CRON_SECRET}`,
+ },
+ httpMethod: "POST",
+ url: "https://api.openstatus.dev/checkerV2",
+ body: Buffer.from(JSON.stringify(payload)).toString("base64"),
},
- });
- allResult.push(result);
+ };
+ const request = { parent: parent, task: task };
+ const [response] = await client.createTask(request);
+
+ allResult.push(response);
}
}
// our first legacy monitor
@@ -86,16 +104,24 @@ export const cron = async ({
status: "active",
};
- // TODO: fetch + try - catch + retry once
- const result = c.publishJSON({
- url: `https://api.openstatus.dev/checker`,
- body: payload,
- headers: {
- "Upstash-Forward-fly-prefer-region": region,
+ const task: google.cloud.tasks.v2beta3.ITask = {
+ httpRequest: {
+ headers: {
+ "Content-Type": "application/json", // Set content type to ensure compatibility your application's request parsing
+ "fly-prefer-region": region,
+ Authorization: `Basic ${env.CRON_SECRET}`,
+ },
+ httpMethod: "POST",
+ url: "https://api.openstatus.dev/checkerV2",
+ body: Buffer.from(JSON.stringify(payload)).toString("base64"),
},
- delay: Math.random() * 90,
- });
- allResult.push(result);
+ };
+
+ // TODO: fetch + try - catch + retry once
+ const request = { parent, task };
+ const [response] = await client.createTask(request);
+
+ allResult.push(response);
}
}
await Promise.all(allResult);