Skip to content

Open-source status page, incident response and uptime monitoring

chore: convert timeone to gmt (#550)

Maximilian Kaskeb36fe1c3fab5
diff --git a/apps/web/package.json b/apps/web/package.json
index d31a2382a..db4289129 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -49,6 +49,7 @@
"cobe": "0.6.3",
"contentlayer": "0.3.4",
"date-fns": "2.30.0",
+ "date-fns-tz": "2.0.0",
"lucide-react": "0.279.0",
"luxon": "3.3.0",
"micro": "10.0.1",
diff --git a/apps/web/src/app/api/og/route.tsx b/apps/web/src/app/api/og/route.tsx
index 00be764c1..6341bd8d8 100644
--- a/apps/web/src/app/api/og/route.tsx
+++ b/apps/web/src/app/api/og/route.tsx
@@ -1,8 +1,8 @@
-import { headers } from "next/headers";
import { ImageResponse } from "next/server";
import { DESCRIPTION, TITLE } from "@/app/shared-metadata";
import { getMonitorListData } from "@/lib/tb";
+import { convertTimezoneToGMT } from "@/lib/timezone";
import {
addBlackListInfo,
getStatus,
@@ -18,7 +18,6 @@ const size = {
};
const LIMIT = 40;
-const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const interRegular = fetch(
new URL("../../../public/fonts/Inter-Regular.ttf", import.meta.url),
@@ -47,8 +46,7 @@ export async function GET(req: Request) {
? searchParams.get("monitorId")
: undefined;
- const headersList = headers();
- const timezone = headersList.get("x-vercel-ip-timezone") || currentTimezone;
+ const timezone = convertTimezoneToGMT();
// currently, we only show the tracker for a single(!) monitor
const data =
diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/play/page.tsx
index 9bc407e26..55da07916 100644
--- a/apps/web/src/app/play/page.tsx
+++ b/apps/web/src/app/play/page.tsx
@@ -1,14 +1,14 @@
-import { headers } from "next/headers";
+import { notFound } from "next/navigation";
import * as z from "zod";
import { Label } from "@openstatus/ui";
import { Tracker } from "@/components/tracker";
import { getHomeMonitorListData } from "@/lib/tb";
+import { convertTimezoneToGMT, getRequestHeaderTimezone } from "@/lib/timezone";
import { TimezoneCombobox } from "./_components/timezone-combobox";
const supportedTimezones = Intl.supportedValuesOf("timeZone");
-const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
/**
* allowed URL search params
@@ -22,25 +22,23 @@ export default async function PlayPage({
}: {
searchParams: { [key: string]: string | string[] | undefined };
}) {
- const headersList = headers();
- const timezone = headersList.get("x-vercel-ip-timezone") || currentTimezone;
-
const search = searchParamsSchema.safeParse(searchParams);
+ const requestTimezone = getRequestHeaderTimezone();
+
+ if (!search.success) {
+ return notFound();
+ }
- function getDefaultValue() {
- if (
- search.success &&
- search.data.timezone &&
- supportedTimezones.includes(search.data.timezone)
- ) {
- return search.data.timezone;
- }
- return timezone;
+ if (
+ search.data.timezone &&
+ !supportedTimezones.includes(search.data.timezone)
+ ) {
+ return notFound();
}
- const defaultValue = getDefaultValue();
+ const gmt = convertTimezoneToGMT(search.data.timezone);
- const data = await getHomeMonitorListData({ timezone: defaultValue });
+ const data = await getHomeMonitorListData({ timezone: gmt });
return (
<div className="relative grid gap-4">
@@ -58,14 +56,15 @@ export default async function PlayPage({
name="Ping"
url="https://www.openstatus.dev/api/ping"
context="play"
- timezone={defaultValue}
/>
)}
</div>
<div className="mt-6 flex justify-start">
<div className="grid items-center gap-1">
<Label className="text-muted-foreground text-xs">Timezone</Label>
- <TimezoneCombobox defaultValue={defaultValue} />
+ <TimezoneCombobox
+ defaultValue={search.data.timezone || requestTimezone || undefined}
+ />
</div>
</div>
</div>
diff --git a/apps/web/src/components/marketing/status-page/tracker-example.tsx b/apps/web/src/components/marketing/status-page/tracker-example.tsx
index 8da9f24cb..ede39e899 100644
--- a/apps/web/src/components/marketing/status-page/tracker-example.tsx
+++ b/apps/web/src/components/marketing/status-page/tracker-example.tsx
@@ -1,13 +1,11 @@
import { Suspense } from "react";
-import { headers } from "next/headers";
import Link from "next/link";
import { Button } from "@openstatus/ui";
import { Tracker } from "@/components/tracker";
import { getHomeMonitorListData } from "@/lib/tb";
-
-const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+import { convertTimezoneToGMT } from "@/lib/timezone";
export async function TrackerExample() {
return (
@@ -36,9 +34,8 @@ function ExampleTrackerFallback() {
}
async function ExampleTracker() {
- const headersList = headers();
- const timezone = headersList.get("x-vercel-ip-timezone") || currentTimezone;
- const data = await getHomeMonitorListData({ timezone });
+ const gmt = convertTimezoneToGMT();
+ const data = await getHomeMonitorListData({ timezone: gmt });
if (!data) return null;
return (
<Tracker
@@ -47,7 +44,6 @@ async function ExampleTracker() {
name="Ping"
context="play"
url="https://www.openstatus.dev/api/ping"
- timezone={timezone}
/>
);
}
diff --git a/apps/web/src/components/status-page/monitor.tsx b/apps/web/src/components/status-page/monitor.tsx
index 64e7c971e..8ee7ea3e6 100644
--- a/apps/web/src/components/status-page/monitor.tsx
+++ b/apps/web/src/components/status-page/monitor.tsx
@@ -1,4 +1,3 @@
-import { headers } from "next/headers";
import type { z } from "zod";
import type {
@@ -7,10 +6,9 @@ import type {
} from "@openstatus/db/src/schema";
import { getMonitorListData } from "@/lib/tb";
+import { convertTimezoneToGMT } from "@/lib/timezone";
import { Tracker } from "../tracker";
-const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
export const Monitor = async ({
monitor,
statusReports,
@@ -18,12 +16,10 @@ export const Monitor = async ({
monitor: z.infer<typeof selectPublicMonitorSchema>;
statusReports: z.infer<typeof selectPublicStatusReportSchemaWithRelation>[];
}) => {
- const headersList = headers();
- const timezone = headersList.get("x-vercel-ip-timezone") || currentTimezone;
-
+ const gmt = convertTimezoneToGMT();
const data = await getMonitorListData({
monitorId: String(monitor.id),
- timezone,
+ timezone: gmt,
});
// TODO: we could handle the `statusReports` here instead of passing it down to the tracker
diff --git a/apps/web/src/components/tracker.tsx b/apps/web/src/components/tracker.tsx
index 301c46cca..a03756c5a 100644
--- a/apps/web/src/components/tracker.tsx
+++ b/apps/web/src/components/tracker.tsx
@@ -57,7 +57,6 @@ interface TrackerProps {
name: string;
description?: string;
context?: "play" | "status-page"; // TODO: we might need to extract those two different use cases - for now it's ok I'd say.
- timezone?: string;
reports?: (StatusReport & { statusReportUpdates: StatusReportUpdate[] })[];
}
diff --git a/apps/web/src/lib/timezone.ts b/apps/web/src/lib/timezone.ts
new file mode 100644
index 000000000..b90f6952c
--- /dev/null
+++ b/apps/web/src/lib/timezone.ts
@@ -0,0 +1,38 @@
+import { headers } from "next/headers";
+import { getTimezoneOffset } from "date-fns-tz";
+
+export function getRequestHeaderTimezone() {
+ const headersList = headers();
+
+ /**
+ * Vercel includes ip timezone to request header
+ */
+ const requestTimezone = headersList.get("x-vercel-ip-timezone");
+
+ return requestTimezone;
+}
+
+export function convertTimezoneToGMT(timezone?: string) {
+ const requestTimezone = getRequestHeaderTimezone();
+
+ /**
+ * Server region timezone as fallback
+ */
+ const clientTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+ const msOffset = getTimezoneOffset(
+ timezone || requestTimezone || clientTimezone,
+ );
+
+ if (isNaN(msOffset)) return "Etc/UTC";
+
+ const hrOffset = msOffset / (1000 * 60 * 60);
+ const offset = hrOffset >= 0 ? `-${hrOffset}` : `+${Math.abs(hrOffset)}`;
+
+ return `Etc/GMT${offset}` as const;
+}
+
+/**
+ * All supported browser / node timezones
+ */
+export const supportedTimezones = Intl.supportedValuesOf("timeZone");
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a2a246724..5d74f98ad 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -221,6 +221,9 @@ importers:
date-fns:
specifier: 2.30.0
version: 2.30.0
+ date-fns-tz:
+ specifier: 2.0.0
+ version: 2.0.0([email protected])
lucide-react:
specifier: 0.279.0
version: 0.279.0([email protected])
@@ -6559,6 +6562,14 @@ packages:
whatwg-url: 11.0.0
dev: false
+ resolution: {integrity: sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==}
+ peerDependencies:
+ date-fns: '>=2.0.0'
+ dependencies:
+ date-fns: 2.30.0
+ dev: false
+
resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
engines: {node: '>=0.11'}