Compare commits

..
Author SHA1 Message Date
Alexander Holliday 5ad82d1e02 Merge pull request #3953 from bluewave-labs/develop
develop -> demo
2026-09-12 15:04:34 -07:00
Alexander Holliday 54eaef725a Merge pull request #3888 from bluewave-labs/develop
develop -> demo
2026-08-26 12:08:23 -07:00
Alexander Holliday 2a2226456c Merge pull request #3884 from bluewave-labs/develop
develop -> demo
2026-08-26 10:42:45 -07:00
Alexander Holliday b8d4e4fc59 Merge pull request #3874 from bluewave-labs/develop
develop -> demo
2026-08-26 10:37:20 -07:00
Alexander Holliday 24cf1ec6c8 Merge pull request #3806 from bluewave-labs/develop
develop -> demo
2026-07-28 09:49:24 -07:00
Alexander Holliday a76f837803 Merge pull request #3759 from bluewave-labs/develop
develop -> demo
2026-07-07 10:19:16 -07:00
Alexander Holliday 9da2653d7b Merge pull request #3752 from bluewave-labs/develop
develop -> demo
2026-07-02 11:07:25 -07:00
Alexander Holliday 0092c9c006 Merge pull request #3746 from bluewave-labs/develop
develop -> demo
2026-07-02 10:15:41 -07:00
Alexander Holliday 348502834c Merge pull request #3745 from bluewave-labs/develop
develop -> demo
2026-07-02 08:50:31 -07:00
Alexander Holliday 1e007551ef Merge pull request #3706 from bluewave-labs/develop
develop -> demo
2026-06-05 12:03:44 -07:00
Alexander Holliday 07c62970b5 Merge pull request #3701 from bluewave-labs/develop
develop -> demo
2026-06-05 10:38:35 -07:00
Alexander Holliday f0123d8052 Merge pull request #3698 from bluewave-labs/develop
develop -> demo
2026-06-05 10:32:50 -07:00
Alexander Holliday de7d5b38ef Merge pull request #3608 from bluewave-labs/develop
develop -> demo
2026-04-29 13:03:15 -07:00
Alexander Holliday e51a55b14d Merge pull request #3562 from bluewave-labs/develop
develop -> demo
2026-04-23 10:13:33 -07:00
Alexander Holliday 1a5e8dc77d Merge pull request #3393 from bluewave-labs/develop
develop->demo 3.5.1 staging
2026-03-06 12:50:53 -08:00
Alexander Holliday 3b9e162315 Merge pull request #3367 from bluewave-labs/develop
develop -> demo
2026-03-04 10:30:22 -08:00
Alexander Holliday 89dec1c82b Merge pull request #3318 from bluewave-labs/develop
develop -> demo
2026-02-20 12:05:30 -08:00
Alexander Holliday 1a44080b84 Merge pull request #3317 from bluewave-labs/develop
develop -> demo
2026-02-20 10:32:55 -08:00
Alexander Holliday 762615b258 Merge pull request #3210 from bluewave-labs/develop
develop -> demo
2026-01-28 12:59:50 -08:00
Alexander Holliday f9036f0863 Merge pull request #3206 from bluewave-labs/develop
develop -> demo
2026-01-27 13:19:44 -08:00
Alexander Holliday 990f353040 Merge pull request #3203 from bluewave-labs/develop
develop -> demo
2026-01-27 13:05:13 -08:00
Alexander Holliday 37836e56b8 Merge pull request #3201 from bluewave-labs/develop
develop -> demo
2026-01-27 12:52:48 -08:00
Alexander Holliday 5e4060cfe3 Merge pull request #3198 from bluewave-labs/develop
develop -> demo
2026-01-26 20:08:38 -08:00
Alexander Holliday c90bef4cf8 Merge pull request #3196 from bluewave-labs/develop
develop->demo
2026-01-26 19:40:56 -08:00
Alexander Holliday 61bcae9aff Merge pull request #3194 from bluewave-labs/develop
develop -> demo
2026-01-26 15:58:39 -08:00
Alexander Holliday aa8dec6ca1 Merge pull request #3192 from bluewave-labs/develop
develop -> demo
2026-01-26 15:48:07 -08:00
Alexander Holliday e9bd8150fa Merge pull request #2965 from bluewave-labs/develop
develop -> demo
2025-09-18 13:41:13 -07:00
Alexander Holliday ce2808ccbc Merge pull request #2961 from bluewave-labs/develop
develop -> demo
2025-09-18 12:04:14 -07:00
Alexander Holliday 58692f8b72 Merge pull request #2934 from bluewave-labs/develop
develop -> demo
2025-09-08 20:32:53 -07:00
Alexander Holliday 421f1635ef Merge pull request #2930 from bluewave-labs/develop
develop->demo
2025-09-08 07:24:53 -07:00
Alexander Holliday b9f24f290d Merge pull request #2922 from bluewave-labs/develop
develop -> demo
2025-09-04 15:47:24 -07:00
Alexander Holliday a84cb95c50 Merge pull request #2903 from bluewave-labs/develop
develop -> demo
2025-09-01 09:00:47 -07:00
Alexander Holliday ac6e4ded73 Merge pull request #2891 from bluewave-labs/develop
develop -> demo
2025-08-30 19:32:05 -07:00
Alexander Holliday 5a6d59576a Merge pull request #2886 from bluewave-labs/develop
develop->demo
2025-08-30 16:24:11 -07:00
Alexander Holliday 3a34ee89d4 Merge pull request #2859 from bluewave-labs/develop
develop -> demo
2025-08-27 15:11:13 -07:00
Alexander Holliday ba2218490b Merge pull request #2856 from bluewave-labs/develop
develop -> demo
2025-08-25 14:38:31 -07:00
Alexander Holliday 188966db49 Merge pull request #2835 from bluewave-labs/develop
develop -> demo
2025-08-21 10:13:59 -07:00
Alexander Holliday 35b10b0a23 Merge pull request #2832 from bluewave-labs/develop
develop -> demo
2025-08-21 09:16:12 -07:00
Alexander Holliday 082d44cac7 Merge pull request #2825 from bluewave-labs/develop
develop->demo
2025-08-20 14:05:17 -07:00
Alexander Holliday a88f5def87 Merge pull request #2796 from bluewave-labs/develop
develop -> demo
2025-08-15 09:19:00 -07:00
Alexander Holliday 033a8e6ca1 Merge pull request #2786 from bluewave-labs/develop
develop -> demo
2025-08-14 12:49:50 -07:00
Alexander Holliday bd7016483d Merge pull request #2783 from bluewave-labs/develop
develop -> demo
2025-08-14 11:27:49 -07:00
Alexander Holliday 6bb885c98b Merge pull request #2781 from bluewave-labs/develop
develop -> demo
2025-08-14 10:53:11 -07:00
Alexander Holliday 2ca441548b Merge pull request #2779 from bluewave-labs/develop
develop -> Demo
2025-08-14 10:07:26 -07:00
Alexander Holliday 53461bbb59 Merge pull request #2776 from bluewave-labs/develop
Develop -> Demo
2025-08-14 09:56:38 -07:00
Alexander Holliday 82ad0bee9d Merge pull request #2648 from bluewave-labs/develop
develop -> demo
2025-07-20 19:50:19 -07:00
Alexander Holliday 250793ccdd Merge pull request #2611 from bluewave-labs/develop
Develop -> Demo
2025-07-14 14:23:10 -07:00
Alexander Holliday 93b3cc8b68 Merge pull request #2585 from bluewave-labs/develop
bump version
2025-07-08 09:51:51 -07:00
Alexander Holliday 19f7c30876 Merge pull request #2583 from bluewave-labs/develop
develop -> demo
2025-07-07 15:39:20 -07:00
Alexander Holliday c3cfdb68a5 Merge pull request #2546 from bluewave-labs/master
Master -> Demo
2025-06-25 12:43:06 +08:00
Alexander Holliday bad7a3c7ea Merge pull request #2537 from bluewave-labs/master
Master -> Demo for demo deploy
2025-06-25 09:40:06 +08:00
Alexander Holliday 4ef0ef53ed Merge pull request #2521 from bluewave-labs/develop
develop -> demo
2025-06-24 10:11:15 +08:00
Alexander Holliday 07da6ce4ce Merge pull request #2507 from bluewave-labs/develop
develop -> demo
2025-06-23 09:21:52 +08:00
Alexander Holliday 48b604bef9 Merge pull request #2377 from bluewave-labs/develop
Develop -> Demo
2025-05-30 15:12:06 -07:00
Alexander Holliday f14cd68fcc Merge pull request #2371 from bluewave-labs/develop
develop -> demo
2025-05-30 14:05:08 -07:00
Alexander Holliday b06aa07b3d Merge pull request #2364 from bluewave-labs/develop
develop -> demo
2025-05-28 09:50:13 -07:00
Alexander Holliday 1ba63985dd Merge pull request #2341 from bluewave-labs/develop
Develop -> Demo
2025-05-26 16:38:10 -07:00
Alexander Holliday 8968d01781 Merge pull request #2337 from bluewave-labs/develop
Develop -> Demo
2025-05-26 16:12:42 -07:00
Alexander Holliday daa63e7c54 Merge pull request #2310 from bluewave-labs/develop
develop -> demo
2025-05-19 12:45:04 -07:00
Alexander Holliday 305586d55b Merge pull request #2266 from bluewave-labs/develop
hotfix: remove version from returned settings
2025-05-13 13:53:23 -07:00
Alexander Holliday 881fbdeeb4 Merge pull request #2263 from bluewave-labs/develop
develop->demo
2025-05-13 13:35:45 -07:00
Alexander Holliday dd109c0e5c Merge pull request #2228 from bluewave-labs/develop
Demo deploy
2025-05-09 09:39:55 -07:00
10 changed files with 23 additions and 157 deletions

No files matched your search

@@ -8,11 +8,8 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
import useMediaQuery from "@mui/material/useMediaQuery";
import { LAYOUT } from "@/Utils/Theme/constants";
import { formatDuration } from "@/Utils/TimeUtils";
import { useTranslation } from "react-i18next";
export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
const theme = useTheme();
const { t, i18n } = useTranslation();
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
if (!monitor) {
@@ -55,12 +52,7 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
<>
<Dot />
<Typography>
{t("pages.common.monitors.statBoxes.checkingEvery", {
interval: formatDuration(monitor.interval, {
long: true,
locale: i18n.resolvedLanguage,
}),
})}
Checking every {formatDuration(monitor?.interval, true)}
</Typography>
</>
)}
@@ -5,10 +5,9 @@ import {
type FieldValues,
} from "react-hook-form";
import { Autocomplete } from "@/Components/inputs";
import type { AutocompleteProps } from "@mui/material/Autocomplete";
export interface AutocompleteOption {
id: string | number;
id: string;
name: string;
}
@@ -17,9 +16,6 @@ interface FormAutocompleteProps<T extends FieldValues, O extends AutocompleteOpt
options: O[];
fieldLabel?: string;
placeholder?: string;
filterOptions?: AutocompleteProps<O, false, false, false>["filterOptions"];
getOptionDisabled?: AutocompleteProps<O, false, false, false>["getOptionDisabled"];
disableClearable?: boolean;
}
export const FormAutocompleteField = <
@@ -30,9 +26,6 @@ export const FormAutocompleteField = <
options,
fieldLabel,
placeholder,
filterOptions,
getOptionDisabled,
disableClearable,
}: FormAutocompleteProps<T, O>) => {
const { control } = useFormContext<T>();
return (
@@ -46,14 +39,10 @@ export const FormAutocompleteField = <
isOptionEqualToValue={(option, value) => option.id === value.id}
value={options.find((o) => o.id === field.value) ?? null}
onChange={(_: unknown, newValue: O | null) => {
if (newValue === null && disableClearable) return;
field.onChange(newValue?.id ?? "");
}}
fieldLabel={fieldLabel}
placeholder={placeholder}
filterOptions={filterOptions}
getOptionDisabled={getOptionDisabled}
disableClearable={disableClearable}
error={!!fieldState.error}
helperText={fieldState.error?.message ?? ""}
/>
@@ -21,7 +21,7 @@ export const MonitorStatBoxes = ({
domainExpiry,
}: MonitorStatBoxesProps) => {
const theme = useTheme();
const { t, i18n } = useTranslation();
const { t } = useTranslation();
if (!monitorStats || !monitor) {
return null;
}
@@ -29,16 +29,13 @@ export const MonitorStatBoxes = ({
const timeOfLastFailure = monitorStats?.timeOfLastFailure || 0;
const timeSinceLastFailure = timeOfLastFailure > 0 ? Date.now() - timeOfLastFailure : 0;
// Determine time since last check
const timeOfLastCheck = monitorStats?.lastCheckTimestamp || 0;
const timeSinceLastCheck = Date.now() - timeOfLastCheck || 0;
const streakTime = formatDuration(timeSinceLastFailure);
const lastCheckTime = timeOfLastCheck
? formatDuration(Date.now() - timeOfLastCheck, {
long: true,
relative: true,
locale: i18n.resolvedLanguage,
})
: t("common.labels.na");
const lastCheckTime = formatDuration(timeSinceLastCheck);
const isActive =
monitor?.status === "up" ||
monitor?.status === "paused" ||
+12 -60
View File
@@ -38,7 +38,6 @@ import {
PageSpeedStrategies,
DnsRecordTypes,
MonitorIntervalOptions,
MIN_MONITOR_INTERVAL_MS,
DefaultMonitorMatchMethod,
MonitorMatchMethods,
GeoCheckIntervalOptions,
@@ -59,14 +58,9 @@ import { FormTextField } from "@/Components/inputs/forms/FormTextField";
import { FormRadioGroup } from "@/Components/inputs/forms/FormRadioGroupField";
import { FormMultiSelectField } from "@/Components/inputs/forms/FormMultiSelectField";
import { FormSelectField } from "@/Components/inputs/forms/FormSelectField";
import {
FormAutocompleteField,
type AutocompleteOption,
} from "@/Components/inputs/forms/FormAutoCompleteField";
import { FormSliderField } from "@/Components/inputs/forms/FormSliderField";
import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
import type { ProxyResponse } from "@/Types/Proxy";
import { formatDuration } from "@/Utils/TimeUtils";
const httpMethodOptions = HttpMethods.map((method) => ({
value: method,
@@ -81,40 +75,6 @@ const maskedInputSx = {
"&:not(.Mui-focused) textarea": { WebkitTextSecurity: "disc" },
};
interface IntervalOption extends AutocompleteOption {
id: number;
}
const INTERVAL_UNIT_MULTIPLIERS = [1000, 60000, 3600000, 86400000] as const;
const toIntervalOption = (
intervalMs: number,
locale: string | undefined
): IntervalOption => ({
id: intervalMs,
name: formatDuration(intervalMs, { long: true, locale }),
});
const filterIntervalOptions = (
options: IntervalOption[],
inputValue: string,
locale: string | undefined
): IntervalOption[] => {
const input = inputValue.trim();
if (input === "" || options.some((option) => option.name === input)) {
return options;
}
const amount = Number(input);
if (!Number.isFinite(amount) || amount <= 0) {
return [];
}
return INTERVAL_UNIT_MULTIPLIERS.map((multiplier) => amount * multiplier)
.filter(Number.isSafeInteger)
.map((ms) => toIntervalOption(ms, locale));
};
interface GeneralSettingsConfig {
urlLabel: string;
urlPlaceholder: string;
@@ -292,7 +252,7 @@ const getGeneralSettingsConfig = (
const CreateMonitorPage = () => {
const theme = useTheme();
const { t, i18n } = useTranslation();
const { t } = useTranslation();
const { monitorId } = useParams();
const location = useLocation();
const navigate = useNavigate();
@@ -354,7 +314,6 @@ const CreateMonitorPage = () => {
const watchedProxyMode = watch("proxyMode") as ProxyMode | undefined;
const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
const watchGeoCheckEnabled = watch("geoCheckEnabled") as boolean;
const watchedInterval = watch("interval");
// Steps without an advanced section drop it, so the last step is the form's.
const totalSteps = monitorStepCount(watchedType);
@@ -512,18 +471,16 @@ const CreateMonitorPage = () => {
[t]
);
const intervalOptions = useMemo(() => {
const options = MonitorIntervalOptions.map(({ value }) =>
toIntervalOption(value, i18n.resolvedLanguage)
);
if (
typeof watchedInterval === "number" &&
!options.some((option) => option.id === watchedInterval)
) {
options.push(toIntervalOption(watchedInterval, i18n.resolvedLanguage));
}
return options;
}, [watchedInterval, i18n.resolvedLanguage]);
const intervalOptions = useMemo(
() =>
MonitorIntervalOptions.map((option) => ({
value: option.value,
label: t(
`pages.createMonitor.form.frequency.option.frequency.value.${option.labelKey}`
),
})),
[t]
);
const matchMethodOptions = useMemo(
() =>
@@ -807,17 +764,12 @@ const CreateMonitorPage = () => {
title={t("pages.createMonitor.form.frequency.title")}
subtitle={t("pages.createMonitor.form.frequency.description")}
rightContent={
<FormAutocompleteField
<FormSelectField
name="interval"
fieldLabel={t(
"pages.createMonitor.form.frequency.option.frequency.label"
)}
options={intervalOptions}
filterOptions={(options, { inputValue }) =>
filterIntervalOptions(options, inputValue, i18n.resolvedLanguage)
}
getOptionDisabled={(option) => option.id < MIN_MONITOR_INTERVAL_MS}
disableClearable
/>
}
/>
-2
View File
@@ -60,8 +60,6 @@ export const monitorTypeLabelKey: Record<SelectableMonitorType, string> &
pagespeed: "optionPagespeed",
};
export const MIN_MONITOR_INTERVAL_MS = 10000;
export const MonitorIntervalOptions = [
{ value: 15000, labelKey: "fifteenSeconds" },
{ value: 30000, labelKey: "thirtySeconds" },
+3 -46
View File
@@ -104,52 +104,9 @@ export const formatMs = (ms: number, hasSpace: boolean = true): string => {
return formatted;
};
type DurationUnit = "day" | "hour" | "minute" | "second";
interface FormatDurationOptions {
long?: boolean;
relative?: boolean;
hasSpace?: boolean;
locale?: string;
}
const DURATION_UNITS: Array<{ unit: DurationUnit; milliseconds: number }> = [
{ unit: "day", milliseconds: MS_PER_DAY },
{ unit: "hour", milliseconds: MS_PER_HOUR },
{ unit: "minute", milliseconds: MS_PER_MINUTE },
{ unit: "second", milliseconds: MS_PER_SECOND },
];
const FALLBACK_DURATION_UNIT = DURATION_UNITS[DURATION_UNITS.length - 1];
const getDurationUnit = (ms: number) =>
DURATION_UNITS.find(({ milliseconds }) => Math.abs(ms) >= milliseconds) ??
FALLBACK_DURATION_UNIT;
const getExactDurationUnit = (ms: number) =>
DURATION_UNITS.find(({ milliseconds }) => ms !== 0 && ms % milliseconds === 0) ??
FALLBACK_DURATION_UNIT;
export const formatDuration = (
ms: number,
{ long = false, relative = false, hasSpace = true, locale }: FormatDurationOptions = {}
): string => {
if (relative) {
const { unit, milliseconds } = getDurationUnit(ms);
const value = Math.sign(ms) * Math.floor(Math.abs(ms) / milliseconds);
return new Intl.RelativeTimeFormat(locale, {
numeric: "always",
style: long ? "long" : "narrow",
}).format(-value, unit);
}
if (long) {
const { unit, milliseconds } = getExactDurationUnit(ms);
return new Intl.NumberFormat(locale, {
style: "unit",
unit,
unitDisplay: "long",
}).format(ms / milliseconds);
export const formatDuration = (ms: number, verbose: boolean = false, hasSpace = true) => {
if (verbose) {
return prettyMilliseconds(ms, { verbose: true });
}
const formatted = prettyMilliseconds(ms, {
+1 -3
View File
@@ -6,7 +6,6 @@ import {
HttpMethods,
PageSpeedStrategies,
ProxyModes,
MIN_MONITOR_INTERVAL_MS,
type MonitorType,
} from "@/Types/Monitor";
import { ALL_HTTP_STATUS_CODES } from "@/Utils/statusCode";
@@ -28,8 +27,7 @@ const baseSchema = z.object({
description: z.string().optional(),
interval: z
.number()
.int("Interval must be a whole number of milliseconds")
.min(MIN_MONITOR_INTERVAL_MS, "Interval must be at least 10 seconds")
.min(15000, "Interval must be at least 15 seconds")
.register(monitorStepRegistry, { step: 1 }),
notifications: z.array(z.string()).register(monitorStepRegistry, { step: 1 }),
tags: z.array(z.string()).register(monitorStepRegistry, { step: 1 }),
-1
View File
@@ -448,7 +448,6 @@
},
"statBoxes": {
"activeFor": "Aktiv seit",
"checkingEvery": "Check alle {{interval}}",
"certificateExpiry": "Zertifikatablauf",
"lastCheck": "Letzter Check",
"lastResponseTime": "Letzte Antwortzeit",
-1
View File
@@ -547,7 +547,6 @@
},
"statBoxes": {
"activeFor": "Active for",
"checkingEvery": "Checking every {{interval}}",
"certificateExpiry": "Certificate expiry",
"domainExpiry": "Domain expiry",
"lastCheck": "Last check",
@@ -143,21 +143,6 @@ describe("JobScheduler", () => {
});
});
describe("addJob", () => {
it("preserves an arbitrary monitor interval in the scheduled job", async () => {
const { scheduler, mocks } = createScheduler();
await scheduler.addJob("m1", makeMonitor({ interval: 75000 }));
expect(mocks.jobsRepository.upsertJob).toHaveBeenCalledWith(
expect.objectContaining({
id: "check:m1",
intervalMs: 75000,
})
);
});
});
// Regression: a heartbeat upsert racing shutdown's deleteById could resurrect the
// registry row, leaving a ghost worker that inflates the alive count until TTL.
// shutdown() must await the in-flight beat and issue the delete as the LAST write.