Merge remote-tracking branch 'origin/develop' into feat/pagespeed-mobile-strat

client/src/Types/Monitor.ts

@@ -3,6 +3,8 @@ import type { PageSpeedGroupedCheck } from "@/Types/Check";
 import type { GeoContinent } from "@/Types/GeoCheck";
 export type { GeoContinent } from "@/Types/GeoCheck";
 
+export const MAX_RECENT_CHECKS = 50;
+
 export const MonitorTypes = [
 	"http",
 	"ping",
@@ -13,10 +15,14 @@ export const MonitorTypes = [
 	"game",
 	"grpc",
 	"websocket",
+	"dns",
 	"unknown",
 ] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
+export const DnsRecordTypes = ["A", "AAAA", "CNAME", "MX", "TXT", "NS"] as const;
+export type DnsRecordType = (typeof DnsRecordTypes)[number];
+
 export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
 
 export const supportsGeoCheck = (type: MonitorType | undefined): boolean => {
@@ -81,6 +87,8 @@ export interface Monitor {
 	geoCheckEnabled?: boolean;
 	geoCheckLocations?: GeoContinent[];
 	geoCheckInterval?: number;
+	dnsServer?: string;
+	dnsRecordType?: DnsRecordType;
 	recentChecks: CheckSnapshot[];
 	createdAt: string;
 	updatedAt: string;

client/src/Types/Notification.ts

@@ -7,6 +7,8 @@ export const NotificationChannels = [
 	"matrix",
 	"teams",
 	"telegram",
+	"pushover",
+	"twilio",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 
@@ -21,6 +23,8 @@ export interface Notification {
 	homeserverUrl?: string;
 	roomId?: string;
 	accessToken?: string;
+	accountSid?: string;
+	twilioPhoneNumber?: string;
 	createdAt: string;
 	updatedAt: string;
 }

client/src/Types/Queue.ts

@@ -23,6 +23,8 @@ export interface QueueJobSummary {
 	monitorUrl: string | null;
 	monitorType: MonitorType | null;
 	monitorInterval: number | null;
+	monitorGeoInterval: number | null;
+	monitorActive: boolean | null;
 	active: boolean;
 	lockedAt: number | null;
 	runCount: number;
@@ -32,6 +34,7 @@ export interface QueueJobSummary {
 	lastFinishedAt: number | null;
 	lastRunTook: number | null;
 	lastFailedAt: number | null;
+	repeat: number | null;
 }
 
 export interface QueueData {

client/src/Types/Settings.ts

@@ -12,6 +12,7 @@ export interface Settings {
 	systemEmailHost?: string;
 	systemEmailPort?: number;
 	systemEmailAddress?: string;
+	systemEmailDisplayName?: string;
 	systemEmailUser?: string;
 	systemEmailConnectionHost?: string;
 	systemEmailTLSServername?: string;

client/src/Types/StatusPage.ts

@@ -21,6 +21,25 @@ export const getMonitorTypeLabel = (
 	return key ? t(key) : type;
 };
 
+export const STATUS_PAGE_THEMES = ["refined", "modern", "bold", "editorial"] as const;
+export type StatusPageTheme = (typeof STATUS_PAGE_THEMES)[number];
+export const DEFAULT_STATUS_PAGE_THEME: StatusPageTheme = "refined";
+
+export const STATUS_PAGE_THEME_MODES = ["auto", "light", "dark"] as const;
+export type StatusPageThemeMode = (typeof STATUS_PAGE_THEME_MODES)[number];
+export const DEFAULT_STATUS_PAGE_THEME_MODE: StatusPageThemeMode = "auto";
+
+export const resolveStatusPageTheme = (
+	value: string | null | undefined
+): StatusPageTheme =>
+	STATUS_PAGE_THEMES.find((t) => t === value) ?? DEFAULT_STATUS_PAGE_THEME;
+
+export const resolveStatusPageThemeMode = (
+	value: string | null | undefined
+): StatusPageThemeMode =>
+	STATUS_PAGE_THEME_MODES.find((m) => m === value) ?? DEFAULT_STATUS_PAGE_THEME_MODE;
+export const PUBLIC_STATUS_PAGE_PREFIX = "/status/public";
+
 export interface StatusPage {
 	id: string;
 	userId: string;
@@ -43,6 +62,8 @@ export interface StatusPage {
 	showAdminLoginLink: boolean;
 	showInfrastructure: boolean;
 	customCSS: string;
+	theme: StatusPageTheme;
+	themeMode: StatusPageThemeMode;
 	createdAt: string;
 	updatedAt: string;
 }